Merge branch 'master' of github.com:pret/pokefirered into script_menu

src/fame_checker.c

@@ -27,6 +27,7 @@
 #include "text_window.h"
 #include "fame_checker.h"
 #include "strings.h"
+#include "constants/trainers.h"
 
 #define SPRITETAG_SELECTOR_CURSOR 1000
 #define SPRITETAG_QUESTION_MARK 1001
@@ -867,7 +868,7 @@ static void FC_DestroyWindow(u8 windowId)
 
 static u8 AdjustGiovanniIndexIfBeatenInGym(u8 a0)
 {
-    if (HasTrainerAlreadyBeenFought(0x15e) == TRUE)
+    if (HasTrainerBeenFought(TRAINER_LEADER_GIOVANNI) == TRUE)
     {
         if (a0 == 9)
             return FAMECHECKER_GIOVANNI;