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/ShoalCave_LowTideEntranceRoom/scripts.inc
+10 -11
View File
@@ -4,8 +4,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA
ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0
special UpdateShoalTideFlag
checkflag FLAG_SYS_SHOAL_TIDE
goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236DD1
goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_236DD1
goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5
ShoalCave_LowTideEntranceRoom_EventScript_236DD1:: @ 8236DD1
@@ -24,24 +23,24 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9
call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236ED9
checkitem ITEM_SHOAL_SALT, 4
compare VAR_RESULT, 0
goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B
goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B
checkitem ITEM_SHOAL_SHELL, 4
compare VAR_RESULT, 0
goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B
goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B
msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF
goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF
checkitemspace ITEM_SHELL_BELL, 1
compare VAR_RESULT, 0
call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236E69
compare VAR_RESULT, 2
goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91
goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91
msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, MSGBOX_DEFAULT
takeitem ITEM_SHOAL_SALT, 4
takeitem ITEM_SHOAL_SHELL, 4
giveitem_std ITEM_SHELL_BELL
compare VAR_RESULT, 0
goto_eq ShoalCave_LowTideEntranceRoom_EventScript_272054
goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_272054
msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, MSGBOX_DEFAULT
setflag FLAG_TEMP_2
release
@@ -50,13 +49,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9
ShoalCave_LowTideEntranceRoom_EventScript_236E69:: @ 8236E69
checkitem ITEM_SHOAL_SALT, 5
compare VAR_RESULT, 1
goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E7A
goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E7A
return
ShoalCave_LowTideEntranceRoom_EventScript_236E7A:: @ 8236E7A
checkitem ITEM_SHOAL_SHELL, 5
compare VAR_RESULT, 1
goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E8B
goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E8B
return
ShoalCave_LowTideEntranceRoom_EventScript_236E8B:: @ 8236E8B
@@ -71,10 +70,10 @@ ShoalCave_LowTideEntranceRoom_EventScript_236E91:: @ 8236E91
ShoalCave_LowTideEntranceRoom_EventScript_236E9B:: @ 8236E9B
checkitem ITEM_SHOAL_SALT, 1
compare VAR_RESULT, 1
goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5
goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5
checkitem ITEM_SHOAL_SHELL, 1
compare VAR_RESULT, 1
goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5
goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5
msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, MSGBOX_DEFAULT
release
end