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

Document remaining routes (104, 119-123)

Browse Source
This commit is contained in:
GriffinR
2019-11-12 11:07:43 -05:00
committed by huderlem
parent 525ec2025d
commit 00f22b6400
21 changed files with 1142 additions and 1141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/field_control_avatar.c
View File

@@ -571,12 +571,12 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
ScriptContext1_SetupScript(MauvilleCity_EventScript_RegisterWallyCall);
return TRUE;
}
if (ShouldDoWinonaCall() == TRUE)
if (ShouldDoScottFortreeCall() == TRUE)
{
ScriptContext1_SetupScript(Route119_EventScript_1F49EC);
ScriptContext1_SetupScript(Route119_EventScript_ScottWonAtFortreeGymCall);
return TRUE;
}
if (ShouldDoScottCall() == TRUE)
if (ShouldDoScottBattleFrontierCall() == TRUE)
{
ScriptContext1_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall);
return TRUE;

12
src/field_specials.c
View File

@@ -395,9 +395,9 @@ bool32 ShouldDoWallyCall(void)
return TRUE;
}
bool32 ShouldDoWinonaCall(void)
bool32 ShouldDoScottFortreeCall(void)
{
if (FlagGet(FLAG_REGISTER_WINONA_POKENAV))
if (FlagGet(FLAG_SCOTT_CALL_FORTREE_GYM))
{
switch (gMapHeader.mapType)
{
@@ -405,7 +405,7 @@ bool32 ShouldDoWinonaCall(void)
case MAP_TYPE_CITY:
case MAP_TYPE_ROUTE:
case MAP_TYPE_OCEAN_ROUTE:
if (++(*GetVarPointer(VAR_WINONA_CALL_STEP_COUNTER)) < 10)
if (++(*GetVarPointer(VAR_SCOTT_FORTREE_CALL_STEP_COUNTER)) < 10)
{
return FALSE;
}
@@ -422,9 +422,9 @@ bool32 ShouldDoWinonaCall(void)
return TRUE;
}
bool32 ShouldDoScottCall(void)
bool32 ShouldDoScottBattleFrontierCall(void)
{
if (FlagGet(FLAG_SCOTT_CALL_NATIONAL_DEX))
if (FlagGet(FLAG_SCOTT_CALL_BATTLE_FRONTIER))
{
switch (gMapHeader.mapType)
{
@@ -432,7 +432,7 @@ bool32 ShouldDoScottCall(void)
case MAP_TYPE_CITY:
case MAP_TYPE_ROUTE:
case MAP_TYPE_OCEAN_ROUTE:
if (++(*GetVarPointer(VAR_SCOTT_CALL_STEP_COUNTER)) < 10)
if (++(*GetVarPointer(VAR_SCOTT_BF_CALL_STEP_COUNTER)) < 10)
{
return FALSE;
}