Merge pull request #991 from GriffinRichards/fix-eventticket

Clarify event ticket flag names

6 files changed, 27 insertions, 28 deletions

diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc
index 28e68da9d..023f530fb 100644
--- a/data/maps/LilycoveCity_Harbor/scripts.inc
+++ b/data/maps/LilycoveCity_Harbor/scripts.inc
@@ -108,12 +108,12 @@ LilycoveCity_Harbor_EventScript_GoToBattleFrontier:: @ 821E171
 
 LilycoveCity_Harbor_EventScript_GetEonTicketState:: @ 821E194
 	setvar VAR_TEMP_E, 0
-	goto_if_unset FLAG_SYS_HAS_EON_TICKET, Common_EventScript_NopReturn
+	goto_if_unset FLAG_ENABLE_SHIP_SOUTHERN_ISLAND, Common_EventScript_NopReturn
 	checkitem ITEM_EON_TICKET, 1
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_NopReturn
 	setvar VAR_TEMP_E, 1
-	goto_if_set FLAG_HAS_EON_TICKET, Common_EventScript_NopReturn
+	goto_if_set FLAG_SHOWN_EON_TICKET, Common_EventScript_NopReturn
 	setvar VAR_TEMP_E, 2
 	return
 
@@ -124,7 +124,7 @@ LilycoveCity_Harbor_EventScript_GetAuroraTicketState:: @ 821E1C6
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_NopReturn
 	setvar VAR_TEMP_D, 1
-	goto_if_set FLAG_HAS_AURORA_TICKET, Common_EventScript_NopReturn
+	goto_if_set FLAG_SHOWN_AURORA_TICKET, Common_EventScript_NopReturn
 	setvar VAR_TEMP_D, 2
 	return
 
@@ -135,7 +135,7 @@ LilycoveCity_Harbor_EventScript_GetOldSeaMapState:: @ 821E1F8
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_NopReturn
 	setvar VAR_TEMP_C, 1
-	goto_if_set FLAG_HAS_OLD_SEA_MAP, Common_EventScript_NopReturn
+	goto_if_set FLAG_SHOWN_OLD_SEA_MAP, Common_EventScript_NopReturn
 	setvar VAR_TEMP_C, 2
 	return
 
@@ -146,7 +146,7 @@ LilycoveCity_Harbor_EventScript_GetMysticTicketState:: @ 821E22A
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_NopReturn
 	setvar VAR_TEMP_9, 1
-	goto_if_set FLAG_HAS_MYSTIC_TICKET, Common_EventScript_NopReturn
+	goto_if_set FLAG_SHOWN_MYSTIC_TICKET, Common_EventScript_NopReturn
 	setvar VAR_TEMP_9, 2
 	return
 
@@ -207,7 +207,7 @@ LilycoveCity_Harbor_EventScript_SetHasMysticTicket:: @ 821E2EA
 	return
 
 LilycoveCity_Harbor_EventScript_EonTicketFirstTime:: @ 821E2F0
-	setflag FLAG_HAS_EON_TICKET
+	setflag FLAG_SHOWN_EON_TICKET
 	msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT
 	closemessage
 	call LilycoveCity_Harbor_EventScript_GetEventTicketSailor
@@ -224,7 +224,7 @@ LilycoveCity_Harbor_EventScript_GoToSouthernIslandFirstTime:: @ 821E30F
 	end
 
 LilycoveCity_Harbor_EventScript_AuroraTicketFirstTime:: @ 821E320
-	setflag FLAG_HAS_AURORA_TICKET
+	setflag FLAG_SHOWN_AURORA_TICKET
 	msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT
 	closemessage
 	call LilycoveCity_Harbor_EventScript_GetEventTicketSailor
@@ -241,7 +241,7 @@ LilycoveCity_Harbor_EventScript_GoToBirthIslandFirstTime:: @ 821E33F
 	end
 
 LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime:: @ 821E350
-	setflag FLAG_HAS_OLD_SEA_MAP
+	setflag FLAG_SHOWN_OLD_SEA_MAP
 	msgbox EventTicket_Text_ShowOldSeaMap, MSGBOX_DEFAULT
 	closemessage
 	call LilycoveCity_Harbor_EventScript_GetEventTicketSailor
@@ -290,7 +290,7 @@ LilycoveCity_Harbor_EventScript_GoToFarawayIslandFirstTime:: @ 821E40C
 	end
 
 LilycoveCity_Harbor_EventScript_MysticTicketFirstTime:: @ 821E41D
-	setflag FLAG_HAS_MYSTIC_TICKET
+	setflag FLAG_SHOWN_MYSTIC_TICKET
 	msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT
 	closemessage
 	call LilycoveCity_Harbor_EventScript_GetEventTicketSailor
diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc
index 78f468dbe..486f00029 100644
--- a/data/maps/SouthernIsland_Interior/scripts.inc
+++ b/data/maps/SouthernIsland_Interior/scripts.inc
@@ -58,7 +58,7 @@ SouthernIsland_Interior_EventScript_Lati:: @ 8242AD0
 	goto_if_set FLAG_TEMP_2, SouthernIsland_Interior_EventScript_Sign
 	goto_if_set FLAG_DEFEATED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_Sign
 	goto_if_set FLAG_CAUGHT_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_Sign
-	goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_Sign
+	goto_if_unset FLAG_ENABLE_SHIP_SOUTHERN_ISLAND, SouthernIsland_Interior_EventScript_Sign
 	setflag FLAG_ENCOUNTERED_LATIAS_OR_LATIOS
 	setflag FLAG_TEMP_2
 	special SpawnCameraObject
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index d671dc95b..6d5702f74 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -39,10 +39,10 @@ CableClub_EventScript_DistributeEonTicket:: @ 8276B23
 	checkitem ITEM_EON_TICKET, 1
 	compare VAR_RESULT, TRUE
 	goto_if_eq CableClub_EventScript_AlreadyGotEonTicket
-	goto_if_set FLAG_SYS_HAS_EON_TICKET, CableClub_EventScript_AlreadyGotEonTicket
+	goto_if_set FLAG_ENABLE_SHIP_SOUTHERN_ISLAND, CableClub_EventScript_AlreadyGotEonTicket
 	msgbox Mevent_Text_TheresATicketForYou, MSGBOX_DEFAULT
 	giveitem ITEM_EON_TICKET
-	setflag FLAG_SYS_HAS_EON_TICKET
+	setflag FLAG_ENABLE_SHIP_SOUTHERN_ISLAND
 	setvar VAR_DISTRIBUTE_EON_TICKET, 0
 	msgbox Mevent_Text_TryUsingItAtLilycovePort, MSGBOX_DEFAULT
 	release
diff --git a/include/constants/flags.h b/include/constants/flags.h
index e0b383d7b..4dd18880f 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -459,9 +459,9 @@
 
 #define FLAG_DEFEATED_DEOXYS                 0x1AC
 #define FLAG_BATTLED_DEOXYS                  0x1AD
-#define FLAG_HAS_EON_TICKET                  0x1AE
-#define FLAG_HAS_AURORA_TICKET               0x1AF
-#define FLAG_HAS_OLD_SEA_MAP                 0x1B0
+#define FLAG_SHOWN_EON_TICKET                0x1AE
+#define FLAG_SHOWN_AURORA_TICKET             0x1AF
+#define FLAG_SHOWN_OLD_SEA_MAP               0x1B0
 #define FLAG_MOVE_TUTOR_TAUGHT_SWAGGER       0x1B1
 #define FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT       0x1B2
 #define FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER   0x1B3
@@ -506,7 +506,7 @@
 
 #define FLAG_UNUSED_0x1DA                    0x1DA // Unused Flag
 
-#define FLAG_HAS_MYSTIC_TICKET               0x1DB
+#define FLAG_SHOWN_MYSTIC_TICKET             0x1DB
 #define FLAG_DEFEATED_HO_OH                  0x1DC
 #define FLAG_DEFEATED_LUGIA                  0x1DD
 
@@ -1448,10 +1448,9 @@
 #define FLAG_SYS_REGIROCK_PUZZLE_COMPLETED          (SYSTEM_FLAGS + 0x50)
 #define FLAG_SYS_BRAILLE_REGICE_COMPLETED           (SYSTEM_FLAGS + 0x51)
 #define FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED         (SYSTEM_FLAGS + 0x52)
-#define FLAG_SYS_HAS_EON_TICKET                     (SYSTEM_FLAGS + 0x53)
+#define FLAG_ENABLE_SHIP_SOUTHERN_ISLAND            (SYSTEM_FLAGS + 0x53)
 
 #define FLAG_LANDMARK_POKEMON_LEAGUE                (SYSTEM_FLAGS + 0x54)
-
 #define FLAG_LANDMARK_ISLAND_CAVE                   (SYSTEM_FLAGS + 0x55)
 #define FLAG_LANDMARK_DESERT_RUINS                  (SYSTEM_FLAGS + 0x56)
 #define FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE          (SYSTEM_FLAGS + 0x57)
diff --git a/src/record_mixing.c b/src/record_mixing.c
index f290c8554..3a93d72f8 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -932,7 +932,7 @@ static void ReceiveGiftItem(u16 *item, u8 which)
             VarSet(VAR_TEMP_1, *item);
             StringCopy(gStringVar1, gLinkPlayers[0].name);
             if (*item == ITEM_EON_TICKET)
-                FlagSet(FLAG_SYS_HAS_EON_TICKET);
+                FlagSet(FLAG_ENABLE_SHIP_SOUTHERN_ISLAND);
         }
         else
         {
diff --git a/src/script_menu.c b/src/script_menu.c
index 7afe30080..9ff63e357 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -428,7 +428,7 @@ static void CreateLilycoveSSTidalMultichoice(void)
         }
     }
 
-    if (CheckBagHasItem(ITEM_EON_TICKET, 1) == TRUE && FlagGet(FLAG_SYS_HAS_EON_TICKET) == TRUE)
+    if (CheckBagHasItem(ITEM_EON_TICKET, 1) == TRUE && FlagGet(FLAG_ENABLE_SHIP_SOUTHERN_ISLAND) == TRUE)
     {
         if (gSpecialVar_0x8004 == 0)
         {
@@ -436,11 +436,11 @@ static void CreateLilycoveSSTidalMultichoice(void)
             selectionCount++;
         }
 
-        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_HAS_EON_TICKET) == FALSE)
+        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_SHOWN_EON_TICKET) == FALSE)
         {
             sLilycoveSSTidalSelections[selectionCount] = SSTIDAL_SELECTION_SOUTHERN_ISLAND;
             selectionCount++;
-            FlagSet(FLAG_HAS_EON_TICKET);
+            FlagSet(FLAG_SHOWN_EON_TICKET);
         }
     }
 
@@ -452,11 +452,11 @@ static void CreateLilycoveSSTidalMultichoice(void)
             selectionCount++;
         }
 
-        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_HAS_MYSTIC_TICKET) == FALSE)
+        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_SHOWN_MYSTIC_TICKET) == FALSE)
         {
             sLilycoveSSTidalSelections[selectionCount] = SSTIDAL_SELECTION_NAVEL_ROCK;
             selectionCount++;
-            FlagSet(FLAG_HAS_MYSTIC_TICKET);
+            FlagSet(FLAG_SHOWN_MYSTIC_TICKET);
         }
     }
 
@@ -468,11 +468,11 @@ static void CreateLilycoveSSTidalMultichoice(void)
             selectionCount++;
         }
 
-        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_HAS_AURORA_TICKET) == FALSE)
+        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_SHOWN_AURORA_TICKET) == FALSE)
         {
             sLilycoveSSTidalSelections[selectionCount] = SSTIDAL_SELECTION_BIRTH_ISLAND;
             selectionCount++;
-            FlagSet(FLAG_HAS_AURORA_TICKET);
+            FlagSet(FLAG_SHOWN_AURORA_TICKET);
         }
     }
 
@@ -484,11 +484,11 @@ static void CreateLilycoveSSTidalMultichoice(void)
             selectionCount++;
         }
 
-        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_HAS_OLD_SEA_MAP) == FALSE)
+        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_SHOWN_OLD_SEA_MAP) == FALSE)
         {
             sLilycoveSSTidalSelections[selectionCount] = SSTIDAL_SELECTION_FARAWAY_ISLAND;
             selectionCount++;
-            FlagSet(FLAG_HAS_OLD_SEA_MAP);
+            FlagSet(FLAG_SHOWN_OLD_SEA_MAP);
         }
     }