summaryrefslogtreecommitdiff
path: root/data/scripts/maps/SootopolisCity.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/SootopolisCity.inc')
-rw-r--r--data/scripts/maps/SootopolisCity.inc156
1 files changed, 78 insertions, 78 deletions
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
index d9eaee6eb..793b6f4fd 100644
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/scripts/maps/SootopolisCity.inc
@@ -36,31 +36,31 @@ SootopolisCity_EventScript_1E56E5:: @ 81E56E5
SootopolisCity_MapScript1_1E56EF: @ 81E56EF
setflag FLAG_VISITED_SOOTOPOLIS_CITY
- compare_var_to_value VAR_0x405E, 1
+ compare VAR_0x405E, 1
call_if 1, SootopolisCity_EventScript_1E5781
- compare_var_to_value VAR_0x40CA, 1
+ compare VAR_0x40CA, 1
call_if 1, SootopolisCity_EventScript_1E5781
call SootopolisCity_EventScript_1E5805
call SootopolisCity_EventScript_1E57B2
- compare_var_to_value VAR_0x405E, 1
+ compare VAR_0x405E, 1
call_if 1, SootopolisCity_EventScript_1E5785
- compare_var_to_value VAR_0x405E, 2
+ compare VAR_0x405E, 2
call_if 1, SootopolisCity_EventScript_1E5785
- compare_var_to_value VAR_0x405E, 3
+ compare VAR_0x405E, 3
call_if 1, SootopolisCity_EventScript_1E5785
- compare_var_to_value VAR_0x405E, 4
+ compare VAR_0x405E, 4
call_if 1, SootopolisCity_EventScript_1E5785
- compare_var_to_value VAR_0x405E, 5
+ compare VAR_0x405E, 5
call_if 1, SootopolisCity_EventScript_1E5785
- compare_var_to_value VAR_0x405E, 2
+ compare VAR_0x405E, 2
call_if 1, SootopolisCity_EventScript_1E5842
- compare_var_to_value VAR_0x405E, 3
+ compare VAR_0x405E, 3
call_if 1, SootopolisCity_EventScript_1E5842
- compare_var_to_value VAR_0x405E, 4
+ compare VAR_0x405E, 4
call_if 1, SootopolisCity_EventScript_1E585B
- compare_var_to_value VAR_0x405E, 5
+ compare VAR_0x405E, 5
call_if 1, SootopolisCity_EventScript_1E5871
- compare_var_to_value VAR_0x405E, 6
+ compare VAR_0x405E, 6
call_if 1, SootopolisCity_EventScript_1E58D3
end
@@ -80,19 +80,19 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785
return
SootopolisCity_EventScript_1E57B2:: @ 81E57B2
- compare_var_to_value VAR_0x405E, 0
+ compare VAR_0x405E, 0
goto_eq SootopolisCity_EventScript_1E5800
- compare_var_to_value VAR_0x405E, 6
+ compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E5800
- compare_var_to_value VAR_0x405E, 1
+ compare VAR_0x405E, 1
goto_eq SootopolisCity_EventScript_1E5801
- compare_var_to_value VAR_0x405E, 2
+ compare VAR_0x405E, 2
goto_eq SootopolisCity_EventScript_1E5801
- compare_var_to_value VAR_0x405E, 3
+ compare VAR_0x405E, 3
goto_eq SootopolisCity_EventScript_1E5801
- compare_var_to_value VAR_0x405E, 4
+ compare VAR_0x405E, 4
goto_eq SootopolisCity_EventScript_1E5801
- compare_var_to_value VAR_0x40CA, 1
+ compare VAR_0x40CA, 1
goto_if 3, SootopolisCity_EventScript_1E5801
return
@@ -104,15 +104,15 @@ SootopolisCity_EventScript_1E5801:: @ 81E5801
return
SootopolisCity_EventScript_1E5805:: @ 81E5805
- compare_var_to_value VAR_0x405E, 0
+ compare VAR_0x405E, 0
goto_eq SootopolisCity_EventScript_1E583D
- compare_var_to_value VAR_0x405E, 6
+ compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E583D
- compare_var_to_value VAR_0x405E, 1
+ compare VAR_0x405E, 1
goto_eq SootopolisCity_EventScript_1E583E
- compare_var_to_value VAR_0x40CA, 1
+ compare VAR_0x40CA, 1
goto_eq SootopolisCity_EventScript_1E583E
- compare_var_to_value VAR_0x40CA, 1
+ compare VAR_0x40CA, 1
goto_if 3, SootopolisCity_EventScript_27207A
return
@@ -144,11 +144,11 @@ SootopolisCity_EventScript_1E5871:: @ 81E5871
setobjectxyperm 7, 29, 33
setobjectxyperm 16, 33, 35
setobjectxyperm 17, 34, 35
- compare_var_to_value VAR_0x40D8, 0
+ compare VAR_0x40D8, 0
call_if 1, SootopolisCity_EventScript_1E58AF
- compare_var_to_value VAR_0x40D8, 1
+ compare VAR_0x40D8, 1
call_if 1, SootopolisCity_EventScript_1E58BB
- compare_var_to_value VAR_0x40D8, 2
+ compare VAR_0x40D8, 2
call_if 1, SootopolisCity_EventScript_1E58C7
return
@@ -176,9 +176,9 @@ SootopolisCity_MapScript2_1E58DB: @ 81E58DB
.2byte 0
SootopolisCity_EventScript_1E58E5:: @ 81E58E5
- compare_var_to_value VAR_0x40CA, 1
+ compare VAR_0x40CA, 1
call_if 1, SootopolisCity_EventScript_1E58FC
- compare_var_to_value VAR_0x40CA, 2
+ compare VAR_0x40CA, 2
call_if 1, SootopolisCity_EventScript_1E5901
end
@@ -202,10 +202,10 @@ SootopolisCity_MapScript2_1E5914: @ 81E5914
SootopolisCity_EventScript_1E5926:: @ 81E5926
lockall
- special sub_8138AD0
- compare_var_to_value VAR_0x8004, 43
+ special StorePlayerCoordsInVars
+ compare VAR_0x8004, 43
goto_if 5, SootopolisCity_EventScript_1E5A82
- compare_var_to_value VAR_0x8005, 32
+ compare VAR_0x8005, 32
goto_if 5, SootopolisCity_EventScript_1E5A82
goto SootopolisCity_EventScript_1E5946
end
@@ -492,10 +492,10 @@ SootopolisCity_Movement_1E5BF7: @ 81E5BF7
SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE
lockall
- special sub_8138AD0
- compare_var_to_value VAR_0x8004, 43
+ special StorePlayerCoordsInVars
+ compare VAR_0x8004, 43
goto_if 5, SootopolisCity_EventScript_1E5CCE
- compare_var_to_value VAR_0x8005, 32
+ compare VAR_0x8005, 32
goto_if 5, SootopolisCity_EventScript_1E5CCE
goto SootopolisCity_EventScript_1E5C1E
end
@@ -541,12 +541,12 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
applymovement 11, SootopolisCity_Movement_1E5E5B
waitmovement 0
removeobject 11
- special sub_81379F8
+ special WaitWeather
waitstate
clearflag FLAG_SYS_WEATHER_CTRL
setvar VAR_0x40CA, 3
clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
- fadenewbgm BGM_RUNECITY
+ fadenewbgm MUS_RUNECITY
delay 120
clearflag FLAG_SPECIAL_FLAG_0x4000
warp8 SOOTOPOLIS_CITY, 255, 43, 32
@@ -594,12 +594,12 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
applymovement 11, SootopolisCity_Movement_1E5E5B
waitmovement 0
removeobject 11
- special sub_81379F8
+ special WaitWeather
waitstate
clearflag FLAG_SYS_WEATHER_CTRL
setvar VAR_0x40CA, 2
clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
- fadenewbgm BGM_NAMINORI
+ fadenewbgm MUS_NAMINORI
delay 120
clearflag FLAG_SPECIAL_FLAG_0x4000
warp8 SOOTOPOLIS_CITY, 255, 29, 53
@@ -698,11 +698,11 @@ SootopolisCity_Movement_1E5E7F: @ 81E5E7F
SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D
lock
faceplayer
- compare_var_to_value VAR_0x405E, 6
+ compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E5EC4
- compare_var_to_value VAR_0x405E, 5
+ compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E5ECE
- compare_var_to_value VAR_0x405E, 2
+ compare VAR_0x405E, 2
goto_if 4, SootopolisCity_EventScript_1E5EBA
msgbox SootopolisCity_Text_1E6D77, 4
release
@@ -726,11 +726,11 @@ SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE
SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8
lock
faceplayer
- compare_var_to_value VAR_0x405E, 1
+ compare VAR_0x405E, 1
goto_if 3, SootopolisCity_EventScript_1E5F1B
- compare_var_to_value VAR_0x405E, 6
+ compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E5F1B
- compare_var_to_value VAR_0x405E, 5
+ compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E5F10
msgbox SootopolisCity_Text_1E6BFF, 4
closemessage
@@ -747,7 +747,7 @@ SootopolisCity_EventScript_1E5F10:: @ 81E5F10
SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
dodailyevents
- special sub_8138B10
+ special GetPlayerBigGuyGirlString
checkflag FLAG_0x932
goto_eq SootopolisCity_EventScript_1E5FBB
msgbox SootopolisCity_Text_2A7BB0, 4
@@ -755,20 +755,20 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
addvar VAR_RESULT, 20
addvar VAR_RESULT, 133
giveitem_std VAR_RESULT
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq SootopolisCity_EventScript_272054
setflag FLAG_0x932
msgbox SootopolisCity_Text_2A7C7C, 4
random 2
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq SootopolisCity_EventScript_1E5F79
- compare_var_to_value VAR_RESULT, 1
+ compare VAR_RESULT, 1
goto_eq SootopolisCity_EventScript_1E5F9A
end
SootopolisCity_EventScript_1E5F79:: @ 81E5F79
giveitem_std ITEM_FIGY_BERRY
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq SootopolisCity_EventScript_272054
msgbox SootopolisCity_Text_2A7CB7, 4
release
@@ -776,7 +776,7 @@ SootopolisCity_EventScript_1E5F79:: @ 81E5F79
SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A
giveitem_std ITEM_IAPAPA_BERRY
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq SootopolisCity_EventScript_272054
msgbox SootopolisCity_Text_2A7CB7, 4
release
@@ -784,7 +784,7 @@ SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A
SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB
msgbox SootopolisCity_Text_2A7CEC, 5
- compare_var_to_value VAR_RESULT, 1
+ compare VAR_RESULT, 1
goto_eq SootopolisCity_EventScript_1E5FD8
msgbox SootopolisCity_Text_2A7DD2, 4
release
@@ -799,7 +799,7 @@ SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2
lockall
applymovement 2, SootopolisCity_Movement_27259E
waitmovement 0
- compare_var_to_value VAR_0x405E, 5
+ compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E600D
msgbox SootopolisCity_Text_1E71A1, 4
closemessage
@@ -816,7 +816,7 @@ SootopolisCity_EventScript_1E600D:: @ 81E600D
SootopolisCity_EventScript_1E6017:: @ 81E6017
lock
faceplayer
- compare_var_to_value VAR_0x405E, 6
+ compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E602E
msgbox SootopolisCity_Text_1E6CCA, 4
release
@@ -830,11 +830,11 @@ SootopolisCity_EventScript_1E602E:: @ 81E602E
SootopolisCity_EventScript_1E6038:: @ 81E6038
lock
faceplayer
- compare_var_to_value VAR_0x405E, 6
+ compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E607A
- compare_var_to_value VAR_0x405E, 5
+ compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E6084
- compare_var_to_value VAR_0x405E, 2
+ compare VAR_0x405E, 2
goto_if 4, SootopolisCity_EventScript_1E6065
msgbox SootopolisCity_Text_1E6F90, 4
release
@@ -862,11 +862,11 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E
lockall
applymovement 4, SootopolisCity_Movement_27259E
waitmovement 0
- compare_var_to_value VAR_0x405E, 5
+ compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E60D9
- compare_var_to_value VAR_0x405E, 6
+ compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E60CF
- compare_var_to_value VAR_0x405E, 1
+ compare VAR_0x405E, 1
goto_if 3, SootopolisCity_EventScript_1E60CF
msgbox SootopolisCity_Text_1E690B, 4
closemessage
@@ -889,13 +889,13 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3
lockall
applymovement 5, SootopolisCity_Movement_27259E
waitmovement 0
- compare_var_to_value VAR_0x405E, 5
+ compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E612D
checkflag FLAG_SYS_GAME_CLEAR
goto_eq SootopolisCity_EventScript_1E6137
- compare_var_to_value VAR_0x405E, 6
+ compare VAR_0x405E, 6
goto_if 4, SootopolisCity_EventScript_1E6141
- compare_var_to_value VAR_0x405E, 1
+ compare VAR_0x405E, 1
goto_if 3, SootopolisCity_EventScript_1E6141
msgbox SootopolisCity_Text_1E6692, 4
closemessage
@@ -937,11 +937,11 @@ SootopolisCity_EventScript_1E6166:: @ 81E6166
waitmovement 0
checkflag FLAG_0x133
call_if 0, SootopolisCity_EventScript_1E61CC
- compare_var_to_value VAR_0x405E, 2
+ compare VAR_0x405E, 2
goto_eq SootopolisCity_EventScript_1E61AE
- compare_var_to_value VAR_0x405E, 3
+ compare VAR_0x405E, 3
goto_eq SootopolisCity_EventScript_1E61C2
- compare_var_to_value VAR_0x405E, 4
+ compare VAR_0x405E, 4
goto_eq SootopolisCity_EventScript_1E61C2
checkflag FLAG_0x09E
goto_eq SootopolisCity_EventScript_1E61B8
@@ -967,9 +967,9 @@ SootopolisCity_EventScript_1E61C2:: @ 81E61C2
SootopolisCity_EventScript_1E61CC:: @ 81E61CC
msgbox SootopolisCity_Text_1E75CB, 4
closemessage
- compare_var_to_value VAR_FACING, 3
+ compare VAR_FACING, 3
call_if 1, SootopolisCity_EventScript_1E6243
- compare_var_to_value VAR_FACING, 2
+ compare VAR_FACING, 2
call_if 1, SootopolisCity_EventScript_1E6255
msgbox SootopolisCity_Text_1E7737, 4
closemessage
@@ -1271,7 +1271,7 @@ SootopolisCity_EventScript_1E635D:: @ 81E635D
lockall
applymovement 15, SootopolisCity_Movement_27259E
waitmovement 0
- compare_var_to_value VAR_0x405E, 5
+ compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E6388
msgbox SootopolisCity_Text_1E67DC, 4
closemessage
@@ -1288,7 +1288,7 @@ SootopolisCity_EventScript_1E6388:: @ 81E6388
SootopolisCity_EventScript_1E6393:: @ 81E6393
lockall
- compare_var_to_value VAR_0x405E, 5
+ compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E63C7
msgbox SootopolisCity_Text_1E6936, 4
closemessage
@@ -1312,7 +1312,7 @@ SootopolisCity_EventScript_1E63DB:: @ 81E63DB
lockall
applymovement 13, SootopolisCity_Movement_27259E
waitmovement 0
- compare_var_to_value VAR_0x405E, 5
+ compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E6406
msgbox SootopolisCity_Text_1E6C7C, 4
closemessage
@@ -1331,7 +1331,7 @@ SootopolisCity_EventScript_1E6411:: @ 81E6411
lockall
applymovement 12, SootopolisCity_Movement_27259E
waitmovement 0
- compare_var_to_value VAR_0x405E, 5
+ compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E643C
msgbox SootopolisCity_Text_1E6A50, 4
closemessage
@@ -1348,7 +1348,7 @@ SootopolisCity_EventScript_1E643C:: @ 81E643C
SootopolisCity_EventScript_1E6446:: @ 81E6446
lock
faceplayer
- compare_var_to_value VAR_0x405E, 4
+ compare VAR_0x405E, 4
goto_eq SootopolisCity_EventScript_1E64D8
checkflag FLAG_0x138
goto_eq SootopolisCity_EventScript_1E64E2
@@ -1364,11 +1364,11 @@ SootopolisCity_EventScript_1E646F:: @ 81E646F
setflag FLAG_0x138
msgbox SootopolisCity_Text_1E7B86, 4
closemessage
- compare_var_to_value VAR_FACING, 2
+ compare VAR_FACING, 2
call_if 1, SootopolisCity_EventScript_1E64B2
- compare_var_to_value VAR_FACING, 4
+ compare VAR_FACING, 4
call_if 1, SootopolisCity_EventScript_1E64B2
- compare_var_to_value VAR_FACING, 3
+ compare VAR_FACING, 3
call_if 1, SootopolisCity_EventScript_1E64C5
release
end
@@ -1409,7 +1409,7 @@ SootopolisCity_Movement_1E64EF: @ 81E64EF
SootopolisCity_EventScript_1E64F2:: @ 81E64F2
lockall
- compare_var_to_value VAR_0x405E, 5
+ compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E6509
msgbox SootopolisCity_Text_1E72DB, 4
closemessage
@@ -1426,7 +1426,7 @@ SootopolisCity_EventScript_1E6509:: @ 81E6509
SootopolisCity_EventScript_1E651F:: @ 81E651F
lockall
- compare_var_to_value VAR_0x405E, 5
+ compare VAR_0x405E, 5
goto_eq SootopolisCity_EventScript_1E6536
msgbox SootopolisCity_Text_1E7460, 4
closemessage