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

48
data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
View File

@@ -137,21 +137,18 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter::
case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver
case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver
goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver
msgbox BattleFrontier_BattlePikeRoomNormal_Text_ImThePikeQueen, MSGBOX_DEFAULT
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver::
msgbox BattleFrontier_BattlePikeRoomNormal_Text_HopeYouDidntUseUpLuck, MSGBOX_DEFAULT
call BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver
goto_if_eq VAR_RESULT, 1, BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver
goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver::
frontier_getsymbols
compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
goto_if_ne VAR_RESULT, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyShowMeFrontierPass, MSGBOX_DEFAULT
waitmessage
playfanfare MUS_OBTAIN_SYMBOL
@@ -165,21 +162,18 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver::
BattleFrontier_BattlePikeRoomNormal_EventScript_IntroLucyGold::
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold
goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold
msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyYouAgain, MSGBOX_DEFAULT
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold::
msgbox BattleFrontier_BattlePikeRoomNormal_Text_NowComeOn, MSGBOX_DEFAULT
call BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold
goto_if_eq VAR_RESULT, 1, BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold
goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold::
frontier_getsymbols
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
goto_if_eq VAR_RESULT, 2, BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyFrontierPass, MSGBOX_DEFAULT
waitmessage
playfanfare MUS_OBTAIN_SYMBOL
@@ -290,10 +284,8 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterStatusRoom::
waitmovement 0
pike_getstatusmon
copyvar VAR_0x8004, VAR_RESULT
compare VAR_0x8004, PIKE_STATUSMON_KIRLIA
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack
compare VAR_0x8004, PIKE_STATUSMON_DUSCLOPS
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack
call_if_eq VAR_0x8004, PIKE_STATUSMON_KIRLIA, BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack
call_if_eq VAR_0x8004, PIKE_STATUSMON_DUSCLOPS, BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack
msgbox BattleFrontier_BattlePikeRoomNormal_Text_AttacksWhenStartled, MSGBOX_DEFAULT
closemessage
releaseall
@@ -306,14 +298,10 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack::
playmoncry SPECIES_KIRLIA, CRY_MODE_NORMAL
waitmoncry
pike_getstatus
compare VAR_RESULT, PIKE_STATUS_TOXIC
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedToxic
compare VAR_RESULT, PIKE_STATUS_BURN
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedWillOWisp
compare VAR_RESULT, PIKE_STATUS_PARALYSIS
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedThunderWave
compare VAR_RESULT, PIKE_STATUS_SLEEP
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedHypnosis
call_if_eq VAR_RESULT, PIKE_STATUS_TOXIC, BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedToxic
call_if_eq VAR_RESULT, PIKE_STATUS_BURN, BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedWillOWisp
call_if_eq VAR_RESULT, PIKE_STATUS_PARALYSIS, BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedThunderWave
call_if_eq VAR_RESULT, PIKE_STATUS_SLEEP, BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedHypnosis
pike_flashscreen
waitstate
applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon
@@ -341,10 +329,8 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack::
playmoncry SPECIES_DUSCLOPS, CRY_MODE_NORMAL
waitmoncry
pike_getstatus
compare VAR_RESULT, PIKE_STATUS_FREEZE
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedIceBeam
compare VAR_RESULT, PIKE_STATUS_BURN
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedWillOWisp
call_if_eq VAR_RESULT, PIKE_STATUS_FREEZE, BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedIceBeam
call_if_eq VAR_RESULT, PIKE_STATUS_BURN, BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedWillOWisp
pike_flashscreen
waitstate
applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon
@@ -569,10 +555,8 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_StatusNPC::
BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC::
pike_healonetwomons
compare VAR_RESULT, 2
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreOneMon
call_if_eq VAR_RESULT, 2, BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons
call_if_eq VAR_RESULT, 1, BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreOneMon
playfanfare MUS_HEAL
waitfanfare
msgbox BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell, MSGBOX_DEFAULT