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
data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
+13 -26
View File
@@ -9,8 +9,7 @@ LittlerootTown_MaysHouse_1F_MapScripts::
.byte 0
LittlerootTown_MaysHouse_1F_OnLoad:
compare VAR_LITTLEROOT_INTRO_STATE, 6
call_if_lt LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes
call_if_lt VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes
call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual
end
@@ -21,8 +20,7 @@ LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes::
LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual::
checkplayergender
compare VAR_RESULT, FEMALE
goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual
goto_if_eq VAR_RESULT, FEMALE, LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual
return
LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual::
@@ -30,12 +28,9 @@ LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual::
return
LittlerootTown_MaysHouse_1F_OnTransition:
compare VAR_LITTLEROOT_INTRO_STATE, 3
call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor
compare VAR_LITTLEROOT_INTRO_STATE, 5
call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs
compare VAR_LITTLEROOT_INTRO_STATE, 6
call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV
call_if_eq VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor
call_if_eq VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs
call_if_eq VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV
end
LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs::
@@ -123,8 +118,7 @@ RivalsHouse_1F_EventScript_RivalMom::
faceplayer
goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, RivalsHouse_1F_EventScript_GoHomeEverySoOften
goto_if_set FLAG_SYS_POKEMON_GET, RivalsHouse_1F_EventScript_RivalIsOnRoute103
compare VAR_LITTLEROOT_RIVAL_STATE, 3
goto_if_eq RivalsHouse_1F_EventScript_RivalTooBusy
goto_if_eq VAR_LITTLEROOT_RIVAL_STATE, 3, RivalsHouse_1F_EventScript_RivalTooBusy
special GetRivalSonDaughterString
msgbox RivalsHouse_1F_Text_LikeChildLikeFather, MSGBOX_DEFAULT
release
@@ -190,23 +184,16 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival::
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_Delay48
waitmovement 0
compare VAR_0x8008, 1
call_if_ne LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay
call_if_ne VAR_0x8008, 1, LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay
playbgm MUS_ENCOUNTER_MAY, TRUE
compare VAR_0x8008, 0
call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0
compare VAR_0x8008, 1
call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer1
compare VAR_0x8008, 2
call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer2
call_if_eq VAR_0x8008, 0, LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0
call_if_eq VAR_0x8008, 1, LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer1
call_if_eq VAR_0x8008, 2, LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer2
msgbox RivalsHouse_1F_Text_MayWhoAreYou, MSGBOX_DEFAULT
closemessage
compare VAR_0x8008, 0
call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs0
compare VAR_0x8008, 1
call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1
compare VAR_0x8008, 2
call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2
call_if_eq VAR_0x8008, 0, LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs0
call_if_eq VAR_0x8008, 1, LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1
call_if_eq VAR_0x8008, 2, LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2
playse SE_EXIT
removeobject LOCALID_RIVAL
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY