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
data/maps/FarawayIsland_Interior/scripts.inc
+10 -11
View File
@@ -13,13 +13,13 @@ FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F
FarawayIsland_Interior_EventScript_267D19:: @ 8267D19
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq FarawayIsland_Interior_EventScript_267D4B
goto_if_eq FarawayIsland_Interior_EventScript_267D4B
compare VAR_RESULT, 4
goto_eq FarawayIsland_Interior_EventScript_267D4B
goto_if_eq FarawayIsland_Interior_EventScript_267D4B
compare VAR_RESULT, 5
goto_eq FarawayIsland_Interior_EventScript_267D4B
goto_if_eq FarawayIsland_Interior_EventScript_267D4B
compare VAR_RESULT, 10
goto_eq FarawayIsland_Interior_EventScript_267D4B
goto_if_eq FarawayIsland_Interior_EventScript_267D4B
return
FarawayIsland_Interior_EventScript_267D4B:: @ 8267D4B
@@ -35,7 +35,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54
FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, FarawayIsland_Interior_EventScript_27374E
goto_if_ne FarawayIsland_Interior_EventScript_27374E
removeobject VAR_LAST_TALKED
return
@@ -47,8 +47,7 @@ FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
end
FarawayIsland_Interior_EventScript_267D86:: @ 8267D86
checkflag FLAG_0x1C7
goto_eq FarawayIsland_Interior_EventScript_27374E
goto_if_set FLAG_0x1C7, FarawayIsland_Interior_EventScript_27374E
clearflag FLAG_HIDE_MEW
setvar VAR_TEMP_1, 0
return
@@ -150,13 +149,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq FarawayIsland_Interior_EventScript_267E96
goto_if_eq FarawayIsland_Interior_EventScript_267E96
compare VAR_RESULT, 4
goto_eq FarawayIsland_Interior_EventScript_267EA4
goto_if_eq FarawayIsland_Interior_EventScript_267EA4
compare VAR_RESULT, 5
goto_eq FarawayIsland_Interior_EventScript_267EA4
goto_if_eq FarawayIsland_Interior_EventScript_267EA4
compare VAR_RESULT, 10
goto_eq FarawayIsland_Interior_EventScript_267EA4
goto_if_eq FarawayIsland_Interior_EventScript_267EA4
setflag FLAG_0x1CA
release
end