improve goto_if macros

This commit is contained in:
Melody
2018-12-21 20:28:24 -05:00
parent 87fd6b8dc2
commit ac2e4adf2d
273 changed files with 2555 additions and 3036 deletions
@@ -34,7 +34,7 @@ Route121_SafariZoneEntrance_EventScript_22BBEF:: @ 822BBEF
faceplayer
msgbox Route121_SafariZoneEntrance_Text_2A4E46, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route121_SafariZoneEntrance_EventScript_22BC0E
goto_if_eq Route121_SafariZoneEntrance_EventScript_22BC0E
msgbox Route121_SafariZoneEntrance_Text_2A4E7E, MSGBOX_DEFAULT
release
end
@@ -51,7 +51,7 @@ Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18
showmoneybox 0, 0, 0
msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route121_SafariZoneEntrance_EventScript_22BC48
goto_if_eq Route121_SafariZoneEntrance_EventScript_22BC48
msgbox Route121_SafariZoneEntrance_Text_2A4FD7, MSGBOX_DEFAULT
goto Route121_SafariZoneEntrance_EventScript_22BD06
end
@@ -59,11 +59,11 @@ Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18
Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48
checkitem ITEM_POKEBLOCK_CASE, 1
compare VAR_RESULT, 0
goto_eq Route121_SafariZoneEntrance_EventScript_22BCEA
goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCEA
call Route121_SafariZoneEntrance_EventScript_22BCBF
checkmoney 0x1f4, 0
compare VAR_RESULT, 0
goto_eq Route121_SafariZoneEntrance_EventScript_22BCF8
goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCF8
playse SE_REGI
msgbox Route121_SafariZoneEntrance_Text_2A501B, MSGBOX_DEFAULT
takemoney 0x1f4, 0
@@ -90,10 +90,10 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48
Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF
getpartysize
compare VAR_RESULT, 6
goto_if 5, Route121_SafariZoneEntrance_EventScript_22BCE9
goto_if_ne Route121_SafariZoneEntrance_EventScript_22BCE9
specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace
compare VAR_RESULT, 1
goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9
goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCE9
msgbox Route121_SafariZoneEntrance_Text_2A50E5, MSGBOX_DEFAULT
goto Route121_SafariZoneEntrance_EventScript_22BD06
end