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/PetalburgCity_Gym/scripts.inc
+58 -70
View File
@@ -7,7 +7,7 @@ PetalburgCity_Gym_MapScripts:: @ 8204889
PetalburgCity_Gym_MapScript1_20489E: @ 820489E
compare VAR_0x4085, 6
goto_eq PetalburgCity_Gym_EventScript_2048B5
goto_if_eq PetalburgCity_Gym_EventScript_2048B5
compare VAR_0x4085, 7
call_if 4, PetalburgCity_Gym_EventScript_2048FF
end
@@ -64,9 +64,9 @@ PetalburgCity_Gym_EventScript_20495D:: @ 820495D
setorcopyvar 0x8015, 269
specialvar VAR_RESULT, IsTrainerReadyForRematch
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_204985
goto_if_eq PetalburgCity_Gym_EventScript_204985
compare VAR_0x4085, 8
goto_eq PetalburgCity_Gym_EventScript_204985
goto_if_eq PetalburgCity_Gym_EventScript_204985
setobjectxyperm 1, 4, 107
return
@@ -364,11 +364,9 @@ PetalburgCity_Gym_EventScript_204D7F:: @ 8204D7F
PetalburgCity_Gym_EventScript_204D80:: @ 8204D80
call PetalburgCity_Gym_EventScript_204DCE
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_204E1D
checkflag FLAG_0x0A9
goto_if 0, PetalburgCity_Gym_EventScript_204DAC
checkflag FLAG_SYS_GAME_CLEAR
goto_eq PetalburgCity_Gym_EventScript_20512D
goto_if_eq PetalburgCity_Gym_EventScript_204E1D
goto_if_unset FLAG_0x0A9, PetalburgCity_Gym_EventScript_204DAC
goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20512D
msgbox PetalburgCity_Gym_Text_206417, MSGBOX_DEFAULT
release
end
@@ -386,15 +384,15 @@ PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3
PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE
specialvar VAR_RESULT, IsEnigmaBerryValid
compare VAR_RESULT, 0
goto_eq PetalburgCity_Gym_EventScript_204E17
goto_if_eq PetalburgCity_Gym_EventScript_204E17
checkitem ITEM_ENIGMA_BERRY, 1
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_204E17
goto_if_eq PetalburgCity_Gym_EventScript_204E17
checkpcitem ITEM_ENIGMA_BERRY, 1
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_204E17
goto_if_eq PetalburgCity_Gym_EventScript_204E17
compare VAR_ENIGMA_BERRY_AVAILABLE, 0
goto_eq PetalburgCity_Gym_EventScript_204E17
goto_if_eq PetalburgCity_Gym_EventScript_204E17
msgbox PetalburgCity_Gym_Text_2A6D3D, MSGBOX_DEFAULT
setvar VAR_RESULT, 1
return
@@ -406,7 +404,7 @@ PetalburgCity_Gym_EventScript_204E17:: @ 8204E17
PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D
giveitem_std ITEM_ENIGMA_BERRY
compare VAR_RESULT, 0
goto_eq PetalburgCity_Gym_EventScript_272054
goto_if_eq PetalburgCity_Gym_EventScript_272054
setvar VAR_ENIGMA_BERRY_AVAILABLE, 0
release
end
@@ -447,7 +445,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2
giveitem_std ITEM_TM42
compare VAR_RESULT, 0
goto_eq PetalburgCity_Gym_EventScript_27205E
goto_if_eq PetalburgCity_Gym_EventScript_27205E
setflag FLAG_0x0A9
msgbox PetalburgCity_Gym_Text_206254, MSGBOX_DEFAULT
return
@@ -787,14 +785,14 @@ PetalburgCity_Gym_EventScript_20512D:: @ 820512D
PetalburgCity_Gym_EventScript_205137:: @ 8205137
lockall
compare VAR_0x4085, 6
goto_if 0, PetalburgCity_Gym_EventScript_20517D
goto_if_lt PetalburgCity_Gym_EventScript_20517D
setvar VAR_0x8008, 7
setvar VAR_0x8009, 85
msgbox PetalburgCity_Gym_Text_20721E, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_20516C
goto_if_eq PetalburgCity_Gym_EventScript_20516C
compare VAR_RESULT, 0
goto_eq PetalburgCity_Gym_EventScript_20517B
goto_if_eq PetalburgCity_Gym_EventScript_20517B
end
PetalburgCity_Gym_EventScript_20516C:: @ 820516C
@@ -817,150 +815,149 @@ PetalburgCity_Gym_EventScript_20517D:: @ 820517D
PetalburgCity_Gym_EventScript_205187:: @ 8205187
lockall
compare VAR_0x4085, 6
goto_if 0, PetalburgCity_Gym_EventScript_20517D
goto_if_lt PetalburgCity_Gym_EventScript_20517D
setvar VAR_0x8008, 1
setvar VAR_0x8009, 98
msgbox PetalburgCity_Gym_Text_207280, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_20516C
goto_if_eq PetalburgCity_Gym_EventScript_20516C
compare VAR_RESULT, 0
goto_eq PetalburgCity_Gym_EventScript_20517B
goto_if_eq PetalburgCity_Gym_EventScript_20517B
end
PetalburgCity_Gym_EventScript_2051BC:: @ 82051BC
lockall
checktrainerflag TRAINER_RANDALL
goto_if 0, PetalburgCity_Gym_EventScript_20517D
goto_if_lt PetalburgCity_Gym_EventScript_20517D
setvar VAR_0x8008, 7
setvar VAR_0x8009, 46
msgbox PetalburgCity_Gym_Text_2072BB, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_20516C
goto_if_eq PetalburgCity_Gym_EventScript_20516C
compare VAR_RESULT, 0
goto_eq PetalburgCity_Gym_EventScript_20517B
goto_if_eq PetalburgCity_Gym_EventScript_20517B
end
PetalburgCity_Gym_EventScript_2051EF:: @ 82051EF
lockall
checktrainerflag TRAINER_RANDALL
goto_if 0, PetalburgCity_Gym_EventScript_20517D
goto_if_lt PetalburgCity_Gym_EventScript_20517D
setvar VAR_0x8008, 1
setvar VAR_0x8009, 59
msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_20516C
goto_if_eq PetalburgCity_Gym_EventScript_20516C
compare VAR_RESULT, 0
goto_eq PetalburgCity_Gym_EventScript_20517B
goto_if_eq PetalburgCity_Gym_EventScript_20517B
end
PetalburgCity_Gym_EventScript_205222:: @ 8205222
lockall
checktrainerflag TRAINER_MARY
goto_if 0, PetalburgCity_Gym_EventScript_20517D
goto_if_lt PetalburgCity_Gym_EventScript_20517D
setvar VAR_0x8008, 7
setvar VAR_0x8009, 59
msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_20516C
goto_if_eq PetalburgCity_Gym_EventScript_20516C
compare VAR_RESULT, 0
goto_eq PetalburgCity_Gym_EventScript_20517B
goto_if_eq PetalburgCity_Gym_EventScript_20517B
end
PetalburgCity_Gym_EventScript_205255:: @ 8205255
lockall
checktrainerflag TRAINER_MARY
goto_if 0, PetalburgCity_Gym_EventScript_20517D
goto_if_lt PetalburgCity_Gym_EventScript_20517D
setvar VAR_0x8008, 1
setvar VAR_0x8009, 72
msgbox PetalburgCity_Gym_Text_207331, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_20516C
goto_if_eq PetalburgCity_Gym_EventScript_20516C
compare VAR_RESULT, 0
goto_eq PetalburgCity_Gym_EventScript_20517B
goto_if_eq PetalburgCity_Gym_EventScript_20517B
end
PetalburgCity_Gym_EventScript_205288:: @ 8205288
lockall
checktrainerflag TRAINER_PARKER
goto_if 0, PetalburgCity_Gym_EventScript_20517D
goto_if_lt PetalburgCity_Gym_EventScript_20517D
setvar VAR_0x8008, 1
setvar VAR_0x8009, 20
msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_20516C
goto_if_eq PetalburgCity_Gym_EventScript_20516C
compare VAR_RESULT, 0
goto_eq PetalburgCity_Gym_EventScript_20517B
goto_if_eq PetalburgCity_Gym_EventScript_20517B
end
PetalburgCity_Gym_EventScript_2052BB:: @ 82052BB
lockall
checktrainerflag TRAINER_ALEXIA
goto_if 0, PetalburgCity_Gym_EventScript_20517D
goto_if_lt PetalburgCity_Gym_EventScript_20517D
setvar VAR_0x8008, 7
setvar VAR_0x8009, 20
msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_20516C
goto_if_eq PetalburgCity_Gym_EventScript_20516C
compare VAR_RESULT, 0
goto_eq PetalburgCity_Gym_EventScript_20517B
goto_if_eq PetalburgCity_Gym_EventScript_20517B
end
PetalburgCity_Gym_EventScript_2052EE:: @ 82052EE
lockall
checktrainerflag TRAINER_ALEXIA
goto_if 0, PetalburgCity_Gym_EventScript_20517D
goto_if_lt PetalburgCity_Gym_EventScript_20517D
setvar VAR_0x8008, 1
setvar VAR_0x8009, 33
msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_20516C
goto_if_eq PetalburgCity_Gym_EventScript_20516C
compare VAR_RESULT, 0
goto_eq PetalburgCity_Gym_EventScript_20517B
goto_if_eq PetalburgCity_Gym_EventScript_20517B
end
PetalburgCity_Gym_EventScript_205321:: @ 8205321
lockall
checktrainerflag TRAINER_GEORGE
goto_if 0, PetalburgCity_Gym_EventScript_20517D
goto_if_lt PetalburgCity_Gym_EventScript_20517D
setvar VAR_0x8008, 7
setvar VAR_0x8009, 33
msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_20516C
goto_if_eq PetalburgCity_Gym_EventScript_20516C
compare VAR_RESULT, 0
goto_eq PetalburgCity_Gym_EventScript_20517B
goto_if_eq PetalburgCity_Gym_EventScript_20517B
end
PetalburgCity_Gym_EventScript_205354:: @ 8205354
lockall
checktrainerflag TRAINER_JODY
goto_if 0, PetalburgCity_Gym_EventScript_20517D
goto_if_lt PetalburgCity_Gym_EventScript_20517D
setvar VAR_0x8008, 1
setvar VAR_0x8009, 7
msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_20516C
goto_if_eq PetalburgCity_Gym_EventScript_20516C
compare VAR_RESULT, 0
goto_eq PetalburgCity_Gym_EventScript_20517B
goto_if_eq PetalburgCity_Gym_EventScript_20517B
end
PetalburgCity_Gym_EventScript_205387:: @ 8205387
lockall
checktrainerflag TRAINER_BERKE
goto_if 0, PetalburgCity_Gym_EventScript_20517D
goto_if_lt PetalburgCity_Gym_EventScript_20517D
setvar VAR_0x8008, 7
setvar VAR_0x8009, 7
msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq PetalburgCity_Gym_EventScript_20516C
goto_if_eq PetalburgCity_Gym_EventScript_20516C
compare VAR_RESULT, 0
goto_eq PetalburgCity_Gym_EventScript_20517B
goto_if_eq PetalburgCity_Gym_EventScript_20517B
end
PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA
trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE
checkflag FLAG_0x4F4
goto_eq PetalburgCity_Gym_EventScript_2053ED
goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_2053ED
msgbox PetalburgCity_Gym_Text_2067D8, MSGBOX_AUTOCLOSE
end
@@ -977,8 +974,7 @@ PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED
PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6
trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A
checkflag FLAG_0x4F4
goto_eq PetalburgCity_Gym_EventScript_205429
goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205429
msgbox PetalburgCity_Gym_Text_206996, MSGBOX_AUTOCLOSE
end
@@ -995,8 +991,7 @@ PetalburgCity_Gym_EventScript_205429:: @ 8205429
PetalburgCity_Gym_EventScript_205432:: @ 8205432
trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456
checkflag FLAG_0x4F4
goto_eq PetalburgCity_Gym_EventScript_205465
goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205465
msgbox PetalburgCity_Gym_Text_206AE9, MSGBOX_AUTOCLOSE
end
@@ -1013,8 +1008,7 @@ PetalburgCity_Gym_EventScript_205465:: @ 8205465
PetalburgCity_Gym_EventScript_20546E:: @ 820546E
trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492
checkflag FLAG_0x4F4
goto_eq PetalburgCity_Gym_EventScript_2054A1
goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_2054A1
msgbox PetalburgCity_Gym_Text_206C9F, MSGBOX_AUTOCLOSE
end
@@ -1031,8 +1025,7 @@ PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1
PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA
trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE
checkflag FLAG_0x4F4
goto_eq PetalburgCity_Gym_EventScript_2054DD
goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_2054DD
msgbox PetalburgCity_Gym_Text_206E26, MSGBOX_AUTOCLOSE
end
@@ -1049,8 +1042,7 @@ PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD
PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6
trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A
checkflag FLAG_0x4F4
goto_eq PetalburgCity_Gym_EventScript_205519
goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205519
msgbox PetalburgCity_Gym_Text_206F9F, MSGBOX_AUTOCLOSE
end
@@ -1067,8 +1059,7 @@ PetalburgCity_Gym_EventScript_205519:: @ 8205519
PetalburgCity_Gym_EventScript_205522:: @ 8205522
trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546
checkflag FLAG_0x4F4
goto_eq PetalburgCity_Gym_EventScript_205555
goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205555
msgbox PetalburgCity_Gym_Text_2070FB, MSGBOX_AUTOCLOSE
end
@@ -1215,8 +1206,7 @@ PetalburgCity_Gym_EventScript_20574B:: @ 820574B
PetalburgCity_Gym_EventScript_20574F:: @ 820574F
lock
faceplayer
checkflag FLAG_0x4F4
goto_eq PetalburgCity_Gym_EventScript_205764
goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205764
msgbox PetalburgCity_Gym_Text_206542, MSGBOX_DEFAULT
release
end
@@ -1228,15 +1218,13 @@ PetalburgCity_Gym_EventScript_205764:: @ 8205764
PetalburgCity_Gym_EventScript_20576E:: @ 820576E
lockall
checkflag FLAG_BADGE05_GET
goto_eq PetalburgCity_Gym_EventScript_20578E
goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_20578E
goto PetalburgCity_Gym_EventScript_205798
end
PetalburgCity_Gym_EventScript_20577E:: @ 820577E
lockall
checkflag FLAG_BADGE05_GET
goto_eq PetalburgCity_Gym_EventScript_20578E
goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_20578E
goto PetalburgCity_Gym_EventScript_205798
end