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

125
data/maps/SootopolisCity/scripts.inc
View File

@@ -9,8 +9,7 @@ SootopolisCity_MapScripts:: @ 81E565C
SootopolisCity_MapScript1_1E5676: @ 81E5676
checkflag FLAG_0x09E
call_if 0, SootopolisCity_EventScript_1E56E5
checkflag FLAG_0x081
goto_if 0, SootopolisCity_EventScript_1E5692
goto_if_unset FLAG_0x081, SootopolisCity_EventScript_1E5692
checkflag FLAG_0x09E
call_if 0, SootopolisCity_EventScript_1E5693
end
@@ -81,19 +80,19 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785
SootopolisCity_EventScript_1E57B2:: @ 81E57B2
compare VAR_0x405E, 0
goto_eq SootopolisCity_EventScript_1E5800
goto_if_eq SootopolisCity_EventScript_1E5800
compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E5800
goto_if_ge SootopolisCity_EventScript_1E5800
compare VAR_0x405E, 1
goto_eq SootopolisCity_EventScript_1E5801
goto_if_eq SootopolisCity_EventScript_1E5801
compare VAR_0x405E, 2
goto_eq SootopolisCity_EventScript_1E5801
goto_if_eq SootopolisCity_EventScript_1E5801
compare VAR_0x405E, 3
goto_eq SootopolisCity_EventScript_1E5801
goto_if_eq SootopolisCity_EventScript_1E5801
compare VAR_0x405E, 4
goto_eq SootopolisCity_EventScript_1E5801
goto_if_eq SootopolisCity_EventScript_1E5801
compare VAR_0x40CA, 1
goto_if 3, SootopolisCity_EventScript_1E5801
goto_if_le SootopolisCity_EventScript_1E5801
return
SootopolisCity_EventScript_1E5800:: @ 81E5800
@@ -105,15 +104,15 @@ SootopolisCity_EventScript_1E5801:: @ 81E5801
SootopolisCity_EventScript_1E5805:: @ 81E5805
compare VAR_0x405E, 0
goto_eq SootopolisCity_EventScript_1E583D
goto_if_eq SootopolisCity_EventScript_1E583D
compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E583D
goto_if_ge SootopolisCity_EventScript_1E583D
compare VAR_0x405E, 1
goto_eq SootopolisCity_EventScript_1E583E
goto_if_eq SootopolisCity_EventScript_1E583E
compare VAR_0x40CA, 1
goto_eq SootopolisCity_EventScript_1E583E
goto_if_eq SootopolisCity_EventScript_1E583E
compare VAR_0x40CA, 1
goto_if 3, SootopolisCity_EventScript_27207A
goto_if_le SootopolisCity_EventScript_27207A
return
SootopolisCity_EventScript_1E583D:: @ 81E583D
@@ -124,8 +123,7 @@ SootopolisCity_EventScript_1E583E:: @ 81E583E
return
SootopolisCity_EventScript_1E5842:: @ 81E5842
checkflag FLAG_0x133
goto_eq SootopolisCity_EventScript_1E584C
goto_if_set FLAG_0x133, SootopolisCity_EventScript_1E584C
return
SootopolisCity_EventScript_1E584C:: @ 81E584C
@@ -204,9 +202,9 @@ SootopolisCity_EventScript_1E5926:: @ 81E5926
lockall
special StorePlayerCoordsInVars
compare VAR_0x8004, 43
goto_if 5, SootopolisCity_EventScript_1E5A82
goto_if_ne SootopolisCity_EventScript_1E5A82
compare VAR_0x8005, 32
goto_if 5, SootopolisCity_EventScript_1E5A82
goto_if_ne SootopolisCity_EventScript_1E5A82
goto SootopolisCity_EventScript_1E5946
end
@@ -494,9 +492,9 @@ SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE
lockall
special StorePlayerCoordsInVars
compare VAR_0x8004, 43
goto_if 5, SootopolisCity_EventScript_1E5CCE
goto_if_ne SootopolisCity_EventScript_1E5CCE
compare VAR_0x8005, 32
goto_if 5, SootopolisCity_EventScript_1E5CCE
goto_if_ne SootopolisCity_EventScript_1E5CCE
goto SootopolisCity_EventScript_1E5C1E
end
@@ -699,11 +697,11 @@ SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D
lock
faceplayer
compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E5EC4
goto_if_ge SootopolisCity_EventScript_1E5EC4
compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E5ECE
goto_if_eq SootopolisCity_EventScript_1E5ECE
compare VAR_0x405E, 2
goto_if 4, SootopolisCity_EventScript_1E5EBA
goto_if_ge SootopolisCity_EventScript_1E5EBA
msgbox SootopolisCity_Text_1E6D77, MSGBOX_DEFAULT
release
end
@@ -727,11 +725,11 @@ SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8
lock
faceplayer
compare VAR_0x405E, 1
goto_if 3, SootopolisCity_EventScript_1E5F1B
goto_if_le SootopolisCity_EventScript_1E5F1B
compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E5F1B
goto_if_ge SootopolisCity_EventScript_1E5F1B
compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E5F10
goto_if_eq SootopolisCity_EventScript_1E5F10
msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT
closemessage
applymovement 3, SootopolisCity_Movement_2725A2
@@ -748,28 +746,27 @@ SootopolisCity_EventScript_1E5F10:: @ 81E5F10
SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
dodailyevents
special GetPlayerBigGuyGirlString
checkflag FLAG_0x932
goto_eq SootopolisCity_EventScript_1E5FBB
goto_if_set FLAG_0x932, SootopolisCity_EventScript_1E5FBB
msgbox SootopolisCity_Text_2A7BB0, MSGBOX_DEFAULT
random 10
addvar VAR_RESULT, 20
addvar VAR_RESULT, 133
giveitem_std VAR_RESULT
compare VAR_RESULT, 0
goto_eq SootopolisCity_EventScript_272054
goto_if_eq SootopolisCity_EventScript_272054
setflag FLAG_0x932
msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT
random 2
compare VAR_RESULT, 0
goto_eq SootopolisCity_EventScript_1E5F79
goto_if_eq SootopolisCity_EventScript_1E5F79
compare VAR_RESULT, 1
goto_eq SootopolisCity_EventScript_1E5F9A
goto_if_eq SootopolisCity_EventScript_1E5F9A
end
SootopolisCity_EventScript_1E5F79:: @ 81E5F79
giveitem_std ITEM_FIGY_BERRY
compare VAR_RESULT, 0
goto_eq SootopolisCity_EventScript_272054
goto_if_eq SootopolisCity_EventScript_272054
msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT
release
end
@@ -777,7 +774,7 @@ SootopolisCity_EventScript_1E5F79:: @ 81E5F79
SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A
giveitem_std ITEM_IAPAPA_BERRY
compare VAR_RESULT, 0
goto_eq SootopolisCity_EventScript_272054
goto_if_eq SootopolisCity_EventScript_272054
msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT
release
end
@@ -785,7 +782,7 @@ SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A
SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB
msgbox SootopolisCity_Text_2A7CEC, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq SootopolisCity_EventScript_1E5FD8
goto_if_eq SootopolisCity_EventScript_1E5FD8
msgbox SootopolisCity_Text_2A7DD2, MSGBOX_DEFAULT
release
end
@@ -800,7 +797,7 @@ SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2
applymovement 2, SootopolisCity_Movement_27259E
waitmovement 0
compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E600D
goto_if_eq SootopolisCity_EventScript_1E600D
msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT
closemessage
applymovement 2, SootopolisCity_Movement_2725A2
@@ -817,7 +814,7 @@ SootopolisCity_EventScript_1E6017:: @ 81E6017
lock
faceplayer
compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E602E
goto_if_ge SootopolisCity_EventScript_1E602E
msgbox SootopolisCity_Text_1E6CCA, MSGBOX_DEFAULT
release
end
@@ -831,11 +828,11 @@ SootopolisCity_EventScript_1E6038:: @ 81E6038
lock
faceplayer
compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E607A
goto_if_ge SootopolisCity_EventScript_1E607A
compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E6084
goto_if_eq SootopolisCity_EventScript_1E6084
compare VAR_0x405E, 2
goto_if 4, SootopolisCity_EventScript_1E6065
goto_if_ge SootopolisCity_EventScript_1E6065
msgbox SootopolisCity_Text_1E6F90, MSGBOX_DEFAULT
release
end
@@ -863,11 +860,11 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E
applymovement 4, SootopolisCity_Movement_27259E
waitmovement 0
compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E60D9
goto_if_eq SootopolisCity_EventScript_1E60D9
compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E60CF
goto_if_ge SootopolisCity_EventScript_1E60CF
compare VAR_0x405E, 1
goto_if 3, SootopolisCity_EventScript_1E60CF
goto_if_le SootopolisCity_EventScript_1E60CF
msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT
closemessage
applymovement 4, SootopolisCity_Movement_2725A2
@@ -890,13 +887,12 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3
applymovement 5, SootopolisCity_Movement_27259E
waitmovement 0
compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E612D
checkflag FLAG_SYS_GAME_CLEAR
goto_eq SootopolisCity_EventScript_1E6137
goto_if_eq SootopolisCity_EventScript_1E612D
goto_if_set FLAG_SYS_GAME_CLEAR, SootopolisCity_EventScript_1E6137
compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E6141
goto_if_ge SootopolisCity_EventScript_1E6141
compare VAR_0x405E, 1
goto_if 3, SootopolisCity_EventScript_1E6141
goto_if_le SootopolisCity_EventScript_1E6141
msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT
closemessage
applymovement 5, SootopolisCity_Movement_2725A2
@@ -938,13 +934,12 @@ SootopolisCity_EventScript_1E6166:: @ 81E6166
checkflag FLAG_0x133
call_if 0, SootopolisCity_EventScript_1E61CC
compare VAR_0x405E, 2
goto_eq SootopolisCity_EventScript_1E61AE
goto_if_eq SootopolisCity_EventScript_1E61AE
compare VAR_0x405E, 3
goto_eq SootopolisCity_EventScript_1E61C2
goto_if_eq SootopolisCity_EventScript_1E61C2
compare VAR_0x405E, 4
goto_eq SootopolisCity_EventScript_1E61C2
checkflag FLAG_0x09E
goto_eq SootopolisCity_EventScript_1E61B8
goto_if_eq SootopolisCity_EventScript_1E61C2
goto_if_set FLAG_0x09E, SootopolisCity_EventScript_1E61B8
msgbox SootopolisCity_Text_1E78E5, MSGBOX_DEFAULT
releaseall
end
@@ -1272,7 +1267,7 @@ SootopolisCity_EventScript_1E635D:: @ 81E635D
applymovement 15, SootopolisCity_Movement_27259E
waitmovement 0
compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E6388
goto_if_eq SootopolisCity_EventScript_1E6388
msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT
closemessage
applymovement 15, SootopolisCity_Movement_2725A2
@@ -1289,7 +1284,7 @@ SootopolisCity_EventScript_1E6388:: @ 81E6388
SootopolisCity_EventScript_1E6393:: @ 81E6393
lockall
compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E63C7
goto_if_eq SootopolisCity_EventScript_1E63C7
msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT
closemessage
applymovement 14, SootopolisCity_Movement_27259E
@@ -1313,7 +1308,7 @@ SootopolisCity_EventScript_1E63DB:: @ 81E63DB
applymovement 13, SootopolisCity_Movement_27259E
waitmovement 0
compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E6406
goto_if_eq SootopolisCity_EventScript_1E6406
msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT
closemessage
applymovement 13, SootopolisCity_Movement_2725A2
@@ -1332,7 +1327,7 @@ SootopolisCity_EventScript_1E6411:: @ 81E6411
applymovement 12, SootopolisCity_Movement_27259E
waitmovement 0
compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E643C
goto_if_eq SootopolisCity_EventScript_1E643C
msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT
closemessage
applymovement 12, SootopolisCity_Movement_2725A2
@@ -1349,11 +1344,9 @@ SootopolisCity_EventScript_1E6446:: @ 81E6446
lock
faceplayer
compare VAR_0x405E, 4
goto_eq SootopolisCity_EventScript_1E64D8
checkflag FLAG_0x138
goto_eq SootopolisCity_EventScript_1E64E2
checkflag FLAG_0x09E
goto_eq SootopolisCity_EventScript_1E646F
goto_if_eq SootopolisCity_EventScript_1E64D8
goto_if_set FLAG_0x138, SootopolisCity_EventScript_1E64E2
goto_if_set FLAG_0x09E, SootopolisCity_EventScript_1E646F
msgbox SootopolisCity_Text_1E7A3E, MSGBOX_DEFAULT
release
end
@@ -1410,7 +1403,7 @@ SootopolisCity_Movement_1E64EF: @ 81E64EF
SootopolisCity_EventScript_1E64F2:: @ 81E64F2
lockall
compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E6509
goto_if_eq SootopolisCity_EventScript_1E6509
msgbox SootopolisCity_Text_1E72DB, MSGBOX_DEFAULT
closemessage
releaseall
@@ -1419,15 +1412,14 @@ SootopolisCity_EventScript_1E64F2:: @ 81E64F2
SootopolisCity_EventScript_1E6509:: @ 81E6509
msgbox SootopolisCity_Text_1E737E, MSGBOX_DEFAULT
setflag FLAG_0x135
checkflag FLAG_0x134
goto_eq SootopolisCity_EventScript_1E654C
goto_if_set FLAG_0x134, SootopolisCity_EventScript_1E654C
releaseall
end
SootopolisCity_EventScript_1E651F:: @ 81E651F
lockall
compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E6536
goto_if_eq SootopolisCity_EventScript_1E6536
msgbox SootopolisCity_Text_1E7460, MSGBOX_DEFAULT
closemessage
releaseall
@@ -1436,8 +1428,7 @@ SootopolisCity_EventScript_1E651F:: @ 81E651F
SootopolisCity_EventScript_1E6536:: @ 81E6536
msgbox SootopolisCity_Text_1E74F6, MSGBOX_DEFAULT
setflag FLAG_0x134
checkflag FLAG_0x135
goto_eq SootopolisCity_EventScript_1E654C
goto_if_set FLAG_0x135, SootopolisCity_EventScript_1E654C
releaseall
end