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

Reformat compare + goto_if/call_if to single statements

Browse Source
This commit is contained in:
GriffinR
2021-11-18 23:06:30 -05:00
parent c57efdba5d
commit e66ea0cb99
293 changed files with 2990 additions and 5978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
data/maps/Route111/scripts.inc
View File

@@ -15,8 +15,7 @@ Route111_MapScripts::
Route111_OnLoad:
call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_CloseDesertRuins
compare VAR_MIRAGE_TOWER_STATE, 1
call_if_eq Route111_EventScript_ShowTemporaryMirageTower
call_if_eq VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_ShowTemporaryMirageTower
end
Route111_EventScript_CloseDesertRuins::
@@ -50,10 +49,8 @@ Route111_OnTransition:
setvar VAR_TRAINER_HILL_IS_ACTIVE, 0
special SetMirageTowerVisibility
call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_SetLayoutNoMirageTower
compare VAR_MIRAGE_TOWER_STATE, 1
call_if_eq Route111_EventScript_SetFallingPlayerGfx
compare VAR_MIRAGE_TOWER_STATE, 2
call_if_eq Route111_EventScript_SetMirageTowerGone
call_if_eq VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_SetFallingPlayerGfx
call_if_eq VAR_MIRAGE_TOWER_STATE, 2, Route111_EventScript_SetMirageTowerGone
call Route111_EventScript_CheckSetSandstorm
call GabbyAndTy_EventScript_UpdateLocation
goto_if_not_defeated TRAINER_VICKY, Route111_EventScript_SetWinstratesNotDefeated
@@ -61,10 +58,8 @@ Route111_OnTransition:
Route111_EventScript_SetFallingPlayerGfx::
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq Route111_EventScript_SetFallingPlayerGfxMale
compare VAR_RESULT, FEMALE
goto_if_eq Route111_EventScript_SetFallingPlayerGfxFemale
goto_if_eq VAR_RESULT, MALE, Route111_EventScript_SetFallingPlayerGfxMale
goto_if_eq VAR_RESULT, FEMALE, Route111_EventScript_SetFallingPlayerGfxFemale
return
Route111_EventScript_SetFallingPlayerGfxMale::
@@ -77,16 +72,11 @@ Route111_EventScript_SetFallingPlayerGfxFemale::
Route111_EventScript_CheckSetSandstorm::
getplayerxy VAR_TEMP_0, VAR_TEMP_1
compare VAR_TEMP_1, 34
goto_if_lt Route111_EventScript_EndCheckSetSandstorm
compare VAR_TEMP_1, 107
goto_if_gt Route111_EventScript_EndCheckSetSandstorm
compare VAR_TEMP_1, 72
goto_if_gt Route111_EventScript_SetSandstorm
compare VAR_TEMP_0, 2000
goto_if_gt Route111_EventScript_EndCheckSetSandstorm
compare VAR_TEMP_0, 8
goto_if_lt Route111_EventScript_EndCheckSetSandstorm
goto_if_lt VAR_TEMP_1, 34, Route111_EventScript_EndCheckSetSandstorm
goto_if_gt VAR_TEMP_1, 107, Route111_EventScript_EndCheckSetSandstorm
goto_if_gt VAR_TEMP_1, 72, Route111_EventScript_SetSandstorm
goto_if_gt VAR_TEMP_0, 2000, Route111_EventScript_EndCheckSetSandstorm
goto_if_lt VAR_TEMP_0, 8, Route111_EventScript_EndCheckSetSandstorm
Route111_EventScript_SetSandstorm::
setweather WEATHER_SANDSTORM
Route111_EventScript_EndCheckSetSandstorm::
@@ -170,8 +160,7 @@ Route111_EventScript_Girl::
goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_ReceivedBerry
msgbox Route111_Text_WateredPlantsEveryDayTakeBerry, MSGBOX_DEFAULT
giveitem ITEM_RAZZ_BERRY
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_DAILY_ROUTE_111_RECEIVED_BERRY
special GetPlayerBigGuyGirlString
msgbox Route111_Text_GoingToTryToMakeDifferentColorBerries, MSGBOX_DEFAULT
@@ -211,8 +200,7 @@ Route111_EventScript_ViciousSandstormTriggerRight::
Route111_EventScript_ViciousSandstormTrigger::
checkitem ITEM_GO_GOGGLES
compare VAR_RESULT, FALSE
goto_if_eq Route111_EventScript_PreventRouteAccess
goto_if_eq VAR_RESULT, FALSE, Route111_EventScript_PreventRouteAccess
setvar VAR_TEMP_3, 1
releaseall
end
@@ -220,14 +208,10 @@ Route111_EventScript_ViciousSandstormTrigger::
Route111_EventScript_PreventRouteAccess::
msgbox gText_SandstormIsVicious, MSGBOX_DEFAULT
closemessage
compare VAR_0x8004, 0
call_if_eq Route111_EventScript_PushUpFromRoute
compare VAR_0x8004, 1
call_if_eq Route111_EventScript_PushDownFromRoute
compare VAR_0x8004, 2
call_if_eq Route111_EventScript_PushLeftFromRoute
compare VAR_0x8004, 3
call_if_eq Route111_EventScript_PushRightFromRoute
call_if_eq VAR_0x8004, 0, Route111_EventScript_PushUpFromRoute
call_if_eq VAR_0x8004, 1, Route111_EventScript_PushDownFromRoute
call_if_eq VAR_0x8004, 2, Route111_EventScript_PushLeftFromRoute
call_if_eq VAR_0x8004, 3, Route111_EventScript_PushRightFromRoute
releaseall
end
@@ -285,8 +269,7 @@ Route111_EventScript_Victor::
faceplayer
setflag FLAG_LANDMARK_WINSTRATE_FAMILY
msgbox Route111_Text_BattleOurFamily, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route111_EventScript_BattleWinstrates
goto_if_eq VAR_RESULT, YES, Route111_EventScript_BattleWinstrates
msgbox Route111_Text_IsThatSo, MSGBOX_DEFAULT
release
end
@@ -420,10 +403,8 @@ Route111_EventScript_Man2::
Route111_EventScript_Hiker::
lock
faceplayer
compare VAR_MIRAGE_TOWER_STATE, 3
goto_if_eq Route111_EventScript_HikerMirageTowerGone
compare VAR_MIRAGE_TOWER_STATE, 2
goto_if_eq Route111_EventScript_HikerMirageTowerDisintegrated
goto_if_eq VAR_MIRAGE_TOWER_STATE, 3, Route111_EventScript_HikerMirageTowerGone
goto_if_eq VAR_MIRAGE_TOWER_STATE, 2, Route111_EventScript_HikerMirageTowerDisintegrated
goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_HikerMirageTowerVisible
msgbox Route111_Text_ShouldBeMirageTowerAroundHere, MSGBOX_DEFAULT
release
@@ -478,8 +459,7 @@ Route111_EventScript_Becky::
Route111_EventScript_Dusty::
trainerbattle_single TRAINER_DUSTY_1, Route111_Text_DustyIntro, Route111_Text_DustyDefeat, Route111_EventScript_RegisterDusty
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route111_EventScript_RematchDusty
goto_if_eq VAR_RESULT, TRUE, Route111_EventScript_RematchDusty
msgbox Route111_Text_DustyPostBattle, MSGBOX_DEFAULT
release
end
@@ -515,8 +495,7 @@ Route111_EventScript_Daisuke::
Route111_EventScript_Wilton::
trainerbattle_single TRAINER_WILTON_1, Route111_Text_WiltonIntro, Route111_Text_WiltonDefeat, Route111_EventScript_RegisterWilton
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route111_EventScript_RematchWilton
goto_if_eq VAR_RESULT, TRUE, Route111_EventScript_RematchWilton
msgbox Route111_Text_WiltonPostBattle, MSGBOX_DEFAULT
release
end
@@ -537,8 +516,7 @@ Route111_EventScript_RematchWilton::
Route111_EventScript_Brooke::
trainerbattle_single TRAINER_BROOKE_1, Route111_Text_BrookeIntro, Route111_Text_BrookeDefeat, Route111_EventScript_RegisterBrooke
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq Route111_EventScript_RematchBrooke
goto_if_eq VAR_RESULT, TRUE, Route111_EventScript_RematchBrooke
msgbox Route111_Text_BrookePostBattle, MSGBOX_DEFAULT
release
end