diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-03 16:15:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-03 16:15:27 -0500 |
| commit | 9259b378ef2f412ceb609909b8648750350c3e18 (patch) | |
| tree | 5833a4abcf187b0a1360aad0d57b2115c1e0aea6 /src | |
| parent | 0eae6d0d07997b8a3f7c8b68ddc4077534a814a6 (diff) | |
| parent | 46370853904b9218422033e83afa5f1b4ab028c6 (diff) | |
Merge pull request #991 from GriffinRichards/fix-eventticket
Clarify event ticket flag names
Diffstat (limited to 'src')
| -rw-r--r-- | src/record_mixing.c | 2 | ||||
| -rw-r--r-- | src/script_menu.c | 18 |
2 files changed, 10 insertions, 10 deletions
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); } } |