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.inc168
1 files changed, 84 insertions, 84 deletions
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
index 0c22fbc37..bddc5965d 100644
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/scripts/maps/SootopolisCity.inc
@@ -6,19 +6,19 @@ SootopolisCity_MapScripts:: @ 814D07D
SootopolisCity_MapScript1_14D08D:: @ 814D08D
checkflag 129
- callif 0, SootopolisCity_EventScript_14D0A0
+ call_if 0, SootopolisCity_EventScript_14D0A0
checkflag 129
- callif 1, SootopolisCity_EventScript_14D0B1
+ call_if 1, SootopolisCity_EventScript_14D0B1
end
SootopolisCity_EventScript_14D0A0:: @ 814D0A0
- movespriteperm 3, 31, 18
+ setobjectxyperm 3, 31, 18
setmaptile 31, 32, 592, 1
return
SootopolisCity_EventScript_14D0B1:: @ 814D0B1
checkflag 113
- callif 0, SootopolisCity_EventScript_14D0BB
+ call_if 0, SootopolisCity_EventScript_14D0BB
return
SootopolisCity_EventScript_14D0BB:: @ 814D0BB
@@ -36,40 +36,40 @@ SootopolisCity_EventScript_14D0BB:: @ 814D0BB
SootopolisCity_MapScript1_14D10D:: @ 814D10D
setflag 2077
checkflag 113
- callif 1, SootopolisCity_EventScript_14D159
+ call_if 1, SootopolisCity_EventScript_14D159
checkflag 2090
- callif 1, SootopolisCity_EventScript_14D123
+ call_if 1, SootopolisCity_EventScript_14D123
end
SootopolisCity_EventScript_14D123:: @ 814D123
call SootopolisCity_EventScript_1A02C1
- movespriteperm 1, 29, 19
- movespriteperm 2, 33, 19
+ setobjectxyperm 1, 29, 19
+ setobjectxyperm 2, 33, 19
compare 0x405e, 1
- callif 1, SootopolisCity_EventScript_14D142
+ call_if 1, SootopolisCity_EventScript_14D142
return
SootopolisCity_EventScript_14D142:: @ 814D142
- movespriteperm 10, 29, 6
- spritebehave 10, 10
- movespriteperm 5, 30, 6
- spritebehave 5, 9
+ setobjectxyperm 10, 29, 6
+ setobjectmovementtype 10, 10
+ setobjectxyperm 5, 30, 6
+ setobjectmovementtype 5, 9
return
SootopolisCity_EventScript_14D159:: @ 814D159
- movespriteperm 10, 31, 33
- spritebehave 10, 8
+ setobjectxyperm 10, 31, 33
+ setobjectmovementtype 10, 8
return
SootopolisCity_MapScript1_14D165:: @ 814D165
- warp4 Underwater_SootopolisCity, 255, 9, 6
+ setdivewarp Underwater_SootopolisCity, 255, 9, 6
end
SootopolisCity_EventScript_14D16E:: @ 814D16E
lock
faceplayer
checkflag 113
- jumpeq SootopolisCity_EventScript_14D183
+ goto_if_eq SootopolisCity_EventScript_14D183
msgbox SootopolisCity_Text_1696A4, 4
release
end
@@ -90,30 +90,30 @@ SootopolisCity_EventScript_14D196:: @ 814D196
SootopolisCity_EventScript_14D19F:: @ 814D19F
lock
faceplayer
- checkdailyflags
+ dodailyevents
special GetPlayerBigGuyGirlString
checkflag 2258
- jumpeq SootopolisCity_EventScript_14D241
+ goto_if_eq SootopolisCity_EventScript_14D241
msgbox SootopolisCity_Text_1C63F2, 4
random 10
addvar RESULT, 20
addvar RESULT, 133
giveitem RESULT
compare RESULT, 0
- jumpeq SootopolisCity_EventScript_1A029B
+ goto_if_eq SootopolisCity_EventScript_1A029B
setflag 2258
msgbox SootopolisCity_Text_1C64D0, 4
random 2
compare RESULT, 0
- jumpeq SootopolisCity_EventScript_14D1FF
+ goto_if_eq SootopolisCity_EventScript_14D1FF
compare RESULT, 1
- jumpeq SootopolisCity_EventScript_14D220
+ goto_if_eq SootopolisCity_EventScript_14D220
end
SootopolisCity_EventScript_14D1FF:: @ 814D1FF
giveitem ITEM_FIGY_BERRY
compare RESULT, 0
- jumpeq SootopolisCity_EventScript_1A029B
+ goto_if_eq SootopolisCity_EventScript_1A029B
msgbox SootopolisCity_Text_1C650B, 4
release
end
@@ -121,7 +121,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF
SootopolisCity_EventScript_14D220:: @ 814D220
giveitem ITEM_IAPAPA_BERRY
compare RESULT, 0
- jumpeq SootopolisCity_EventScript_1A029B
+ goto_if_eq SootopolisCity_EventScript_1A029B
msgbox SootopolisCity_Text_1C650B, 4
release
end
@@ -129,7 +129,7 @@ SootopolisCity_EventScript_14D220:: @ 814D220
SootopolisCity_EventScript_14D241:: @ 814D241
msgbox SootopolisCity_Text_1C6540, 5
compare RESULT, 1
- jumpeq SootopolisCity_EventScript_14D25E
+ goto_if_eq SootopolisCity_EventScript_14D25E
msgbox SootopolisCity_Text_1C6626, 4
release
end
@@ -143,7 +143,7 @@ SootopolisCity_EventScript_14D268:: @ 814D268
lock
faceplayer
checkflag 1236
- jumpeq SootopolisCity_EventScript_14D27D
+ goto_if_eq SootopolisCity_EventScript_14D27D
msgbox SootopolisCity_Text_16A4D6, 4
release
end
@@ -157,7 +157,7 @@ SootopolisCity_EventScript_14D287:: @ 814D287
lock
faceplayer
checkflag 113
- jumpeq SootopolisCity_EventScript_14D29C
+ goto_if_eq SootopolisCity_EventScript_14D29C
msgbox SootopolisCity_Text_169813, 4
release
end
@@ -171,7 +171,7 @@ SootopolisCity_EventScript_14D2A6:: @ 814D2A6
lock
faceplayer
checkflag 113
- jumpeq SootopolisCity_EventScript_14D2BB
+ goto_if_eq SootopolisCity_EventScript_14D2BB
msgbox SootopolisCity_Text_1698A0, 4
release
end
@@ -185,7 +185,7 @@ SootopolisCity_EventScript_14D2C5:: @ 814D2C5
lock
faceplayer
checkflag 113
- jumpeq SootopolisCity_EventScript_14D2DA
+ goto_if_eq SootopolisCity_EventScript_14D2DA
msgbox SootopolisCity_Text_1697A7, 4
release
end
@@ -213,81 +213,81 @@ ClosedSootopolisGymDoorScript:: @ 814D2FF
SootopolisCity_EventScript_14D308:: @ 814D308
lockall
- move 10, SootopolisCity_Movement_1A083F
- move 255, SootopolisCity_Movement_1A0843
- waitmove 0
- playsfx 21
- move 10, SootopolisCity_Movement_1A0833
- waitmove 0
- move 10, SootopolisCity_Movement_1A0835
- waitmove 0
- move 10, SootopolisCity_Movement_14D413
- waitmove 0
+ applymovement 10, SootopolisCity_Movement_1A083F
+ applymovement 255, SootopolisCity_Movement_1A0843
+ waitmovement 0
+ playse 21
+ applymovement 10, SootopolisCity_Movement_1A0833
+ waitmovement 0
+ applymovement 10, SootopolisCity_Movement_1A0835
+ waitmovement 0
+ applymovement 10, SootopolisCity_Movement_14D413
+ waitmovement 0
.ifdef SAPPHIRE
msgbox SootopolisCity_Text_169988, 4
.else
msgbox SootopolisCity_Text_169E0F, 4
.endif
- closebutton
- move 10, SootopolisCity_Movement_14D417
- move 255, SootopolisCity_Movement_14D440
- waitmove 10
+ closemessage
+ applymovement 10, SootopolisCity_Movement_14D417
+ applymovement 255, SootopolisCity_Movement_14D440
+ waitmovement 10
.ifdef SAPPHIRE
msgbox SootopolisCity_Text_1699FD, 4
.else
msgbox SootopolisCity_Text_169E82, 4
.endif
- playsfx 21
- move 5, SootopolisCity_Movement_1A0833
- waitmove 0
- move 5, SootopolisCity_Movement_1A0835
- waitmove 0
+ playse 21
+ applymovement 5, SootopolisCity_Movement_1A0833
+ waitmovement 0
+ applymovement 5, SootopolisCity_Movement_1A0835
+ waitmovement 0
.ifdef SAPPHIRE
msgbox SootopolisCity_Text_169AB7, 4
.else
msgbox SootopolisCity_Text_169F3C, 4
.endif
- closebutton
- pause 30
- move 5, SootopolisCity_Movement_14D46A
- move 10, SootopolisCity_Movement_14D41D
- move 255, SootopolisCity_Movement_14D445
- waitmove 0
- move 5, SootopolisCity_Movement_1A0843
- move 255, SootopolisCity_Movement_1A0843
- waitmove 0
- pause 30
- move 10, SootopolisCity_Movement_1A0845
- waitmove 0
+ closemessage
+ delay 30
+ applymovement 5, SootopolisCity_Movement_14D46A
+ applymovement 10, SootopolisCity_Movement_14D41D
+ applymovement 255, SootopolisCity_Movement_14D445
+ waitmovement 0
+ applymovement 5, SootopolisCity_Movement_1A0843
+ applymovement 255, SootopolisCity_Movement_1A0843
+ waitmovement 0
+ delay 30
+ applymovement 10, SootopolisCity_Movement_1A0845
+ waitmovement 0
.ifdef SAPPHIRE
msgbox SootopolisCity_Text_169AE7, 4
.else
msgbox SootopolisCity_Text_169F6B, 4
.endif
- closebutton
- pause 30
- move 5, SootopolisCity_Movement_14D47C
- move 255, SootopolisCity_Movement_14D457
- move 10, SootopolisCity_Movement_14D42D
- waitmove 0
- move 5, SootopolisCity_Movement_1A083F
- waitmove 0
+ closemessage
+ delay 30
+ applymovement 5, SootopolisCity_Movement_14D47C
+ applymovement 255, SootopolisCity_Movement_14D457
+ applymovement 10, SootopolisCity_Movement_14D42D
+ waitmovement 0
+ applymovement 5, SootopolisCity_Movement_1A083F
+ waitmovement 0
.ifdef SAPPHIRE
msgbox SootopolisCity_Text_169BC7, 4
.else
msgbox SootopolisCity_Text_16A06C, 4
.endif
- move 255, SootopolisCity_Movement_1A083F
- waitmove 0
+ applymovement 255, SootopolisCity_Movement_1A083F
+ waitmovement 0
.ifdef SAPPHIRE
msgbox SootopolisCity_Text_169C99, 4
.else
msgbox SootopolisCity_Text_16A13E, 4
.endif
- moveoffscreen 5
- spritebehave 5, 9
- moveoffscreen 10
- spritebehave 10, 10
+ moveobjectoffscreen 5
+ setobjectmovementtype 5, 9
+ moveobjectoffscreen 10
+ setobjectmovementtype 10, 10
setvar 0x405e, 2
releaseall
end
@@ -446,7 +446,7 @@ SootopolisCity_EventScript_14D498:: @ 814D498
lock
faceplayer
checkflag 113
- jumpeq SootopolisCity_EventScript_14D4AD
+ goto_if_eq SootopolisCity_EventScript_14D4AD
.ifdef SAPPHIRE
msgbox SootopolisCity_Text_169DA6, 4
.else
@@ -457,14 +457,14 @@ SootopolisCity_EventScript_14D498:: @ 814D498
SootopolisCity_EventScript_14D4AD:: @ 814D4AD
msgbox SootopolisCity_Text_16A33E, 4
- closebutton
- move LAST_TALKED, SootopolisCity_Movement_1A0845
- waitmove 0
- pause 50
- setanimation 0, 1
- doanimation 30
- pause 15
- disappear LAST_TALKED
- checkanimation 30
+ closemessage
+ applymovement LAST_TALKED, SootopolisCity_Movement_1A0845
+ waitmovement 0
+ delay 50
+ setfieldeffect 0, 1
+ dofieldeffect 30
+ delay 15
+ removeobject LAST_TALKED
+ waitfieldeffect 30
release
end