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

31
data/maps/SSTidalCorridor/scripts.inc
View File

@@ -43,9 +43,9 @@ SSTidalRooms_EventScript_23C03C:: @ 823C03C
SSTidalCorridor_EventScript_23C050:: @ 823C050
compare VAR_PORTHOLE_STATE, 2
goto_eq SSTidalCorridor_EventScript_23C067
goto_if_eq SSTidalCorridor_EventScript_23C067
compare VAR_PORTHOLE_STATE, 7
goto_eq SSTidalCorridor_EventScript_23C07D
goto_if_eq SSTidalCorridor_EventScript_23C07D
end
SSTidalCorridor_EventScript_23C067:: @ 823C067
@@ -115,9 +115,9 @@ SSTidalCorridor_EventScript_23C119:: @ 823C119
lock
faceplayer
compare VAR_PORTHOLE_STATE, 4
goto_eq SSTidalCorridor_EventScript_23C13B
goto_if_eq SSTidalCorridor_EventScript_23C13B
compare VAR_PORTHOLE_STATE, 8
goto_eq SSTidalCorridor_EventScript_23C15A
goto_if_eq SSTidalCorridor_EventScript_23C15A
msgbox SSTidalCorridor_Text_23C596, MSGBOX_DEFAULT
release
end
@@ -149,9 +149,9 @@ SSTidalCorridor_EventScript_23C179:: @ 823C179
SSTidalCorridor_EventScript_23C17D:: @ 823C17D
lockall
compare VAR_PORTHOLE_STATE, 2
goto_eq SSTidalCorridor_EventScript_23C19E
goto_if_eq SSTidalCorridor_EventScript_23C19E
compare VAR_PORTHOLE_STATE, 7
goto_eq SSTidalCorridor_EventScript_23C19E
goto_if_eq SSTidalCorridor_EventScript_23C19E
msgbox SSTidalCorridor_Text_23C6C3, MSGBOX_DEFAULT
releaseall
end
@@ -164,8 +164,7 @@ SSTidalCorridor_EventScript_23C19E:: @ 823C19E
SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3
lock
faceplayer
checkflag FLAG_0x0F7
goto_eq SSTidalCorridor_EventScript_23C1BD
goto_if_set FLAG_0x0F7, SSTidalCorridor_EventScript_23C1BD
call SSTidalCorridor_EventScript_23C1C7
msgbox SSTidalCorridor_Text_23C65E, MSGBOX_DEFAULT
release
@@ -178,21 +177,21 @@ SSTidalCorridor_EventScript_23C1BD:: @ 823C1BD
SSTidalCorridor_EventScript_23C1C7:: @ 823C1C7
checktrainerflag TRAINER_PHILLIP
goto_if 0, SSTidalCorridor_EventScript_23C218
goto_if_lt SSTidalCorridor_EventScript_23C218
checktrainerflag TRAINER_LEONARD
goto_if 0, SSTidalCorridor_EventScript_23C218
goto_if_lt SSTidalCorridor_EventScript_23C218
checktrainerflag TRAINER_COLTON
goto_if 0, SSTidalCorridor_EventScript_23C218
goto_if_lt SSTidalCorridor_EventScript_23C218
checktrainerflag TRAINER_MICAH
goto_if 0, SSTidalCorridor_EventScript_23C218
goto_if_lt SSTidalCorridor_EventScript_23C218
checktrainerflag TRAINER_THOMAS
goto_if 0, SSTidalCorridor_EventScript_23C218
goto_if_lt SSTidalCorridor_EventScript_23C218
checktrainerflag TRAINER_LEA_AND_JED
goto_if 0, SSTidalCorridor_EventScript_23C218
goto_if_lt SSTidalCorridor_EventScript_23C218
checktrainerflag TRAINER_GARRET
goto_if 0, SSTidalCorridor_EventScript_23C218
goto_if_lt SSTidalCorridor_EventScript_23C218
checktrainerflag TRAINER_NAOMI
goto_if 0, SSTidalCorridor_EventScript_23C218
goto_if_lt SSTidalCorridor_EventScript_23C218
setflag FLAG_0x0F7
goto SSTidalCorridor_EventScript_23C1BD
return