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

improve goto_if macros

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

11
data/maps/BattleFrontier_OutsideEast/scripts.inc
View File

@@ -11,7 +11,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E
goto_if_ne BattleFrontier_OutsideEast_EventScript_27374E
removeobject VAR_LAST_TALKED
return
@@ -136,11 +136,11 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq BattleFrontier_OutsideEast_EventScript_242D60
goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
compare VAR_RESULT, 4
goto_eq BattleFrontier_OutsideEast_EventScript_242D60
goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
compare VAR_RESULT, 5
goto_eq BattleFrontier_OutsideEast_EventScript_242D60
goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
setflag FLAG_0x1C6
release
end
@@ -223,8 +223,7 @@ BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0
BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9
lock
faceplayer
checkflag FLAG_0x1C6
goto_eq BattleFrontier_OutsideEast_EventScript_242DFE
goto_if_set FLAG_0x1C6, BattleFrontier_OutsideEast_EventScript_242DFE
msgbox BattleFrontier_OutsideEast_Text_243C2C, MSGBOX_DEFAULT
release
end