dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #991 from GriffinRichards/fix-eventticket

Browse Source 
Clarify event ticket flag names
This commit is contained in:
PikalaxALT
2020-03-03 16:15:27 -05:00
committed by GitHub
parent 0eae6d0d07 4637085390
commit 9259b378ef
6 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/record_mixing.c
View File

@@ -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
{

18
src/script_menu.c
View File

@@ -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);
}
}