summaryrefslogtreecommitdiff
path: root/data/maps/RustboroCity/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/RustboroCity/scripts.inc')
-rw-r--r--data/maps/RustboroCity/scripts.inc170
1 files changed, 85 insertions, 85 deletions
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
index 710b8c700..a2c231fde 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -1,47 +1,47 @@
RustboroCity_MapScripts:: @ 814C372
- map_script 3, RustboroCity_MapScript1_14C378
+ map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_MapScript1_14C378
.byte 0
RustboroCity_MapScript1_14C378:: @ 814C378
setflag FLAG_VISITED_RUSTBORO_CITY
- call RustboroCity_EventScript_1A0196
- call RustboroCity_EventScript_1A014E
+ call Common_EventScript_SetupEvilTeamGfxIds
+ call Common_EventScript_SetupRivalGfxId
end
RustboroCity_EventScript_14C386:: @ 814C386
lock
faceplayer
goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_14C39B
- msgbox RustboroCity_Text_16689D, 4
+ msgbox RustboroCity_Text_16689D, MSGBOX_DEFAULT
release
end
RustboroCity_EventScript_14C39B:: @ 814C39B
- msgbox RustboroCity_Text_16690C, 4
+ msgbox RustboroCity_Text_16690C, MSGBOX_DEFAULT
release
end
RustboroCity_EventScript_14C3A5:: @ 814C3A5
lock
faceplayer
- msgbox RustboroCity_Text_166A67, 4
+ msgbox RustboroCity_Text_166A67, MSGBOX_DEFAULT
release
end
RustboroCity_EventScript_14C3B1:: @ 814C3B1
- msgbox RustboroCity_Text_166AE0, 2
+ msgbox RustboroCity_Text_166AE0, MSGBOX_NPC
end
RustboroCity_EventScript_14C3BA:: @ 814C3BA
lock
faceplayer
goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_14C3CF
- msgbox RustboroCity_Text_16696D, 4
+ msgbox RustboroCity_Text_16696D, MSGBOX_DEFAULT
release
end
RustboroCity_EventScript_14C3CF:: @ 814C3CF
- msgbox RustboroCity_Text_1669FE, 4
+ msgbox RustboroCity_Text_1669FE, MSGBOX_DEFAULT
release
end
@@ -49,56 +49,56 @@ RustboroCity_EventScript_14C3D9:: @ 814C3D9
lock
faceplayer
goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_14C3EE
- msgbox RustboroCity_Text_166B86, 4
+ msgbox RustboroCity_Text_166B86, MSGBOX_DEFAULT
release
end
RustboroCity_EventScript_14C3EE:: @ 814C3EE
- msgbox RustboroCity_Text_166BEF, 4
+ msgbox RustboroCity_Text_166BEF, MSGBOX_DEFAULT
release
end
RustboroCity_EventScript_14C3F8:: @ 814C3F8
- msgbox RustboroCity_Text_166C98, 2
+ msgbox RustboroCity_Text_166C98, MSGBOX_NPC
end
RustboroCity_EventScript_14C401:: @ 814C401
- msgbox RustboroCity_Text_166CFA, 3
+ msgbox RustboroCity_Text_166CFA, MSGBOX_SIGN
end
RustboroCity_EventScript_14C40A:: @ 814C40A
- msgbox RustboroCity_Text_167374, 3
+ msgbox RustboroCity_Text_167374, MSGBOX_SIGN
end
RustboroCity_EventScript_14C413:: @ 814C413
- msgbox RustboroCity_Text_1673FA, 3
+ msgbox RustboroCity_Text_1673FA, MSGBOX_SIGN
end
RustboroCity_EventScript_14C41C:: @ 814C41C
- msgbox RustboroCity_Text_167439, 3
+ msgbox RustboroCity_Text_167439, MSGBOX_SIGN
end
@ 814C425
- msgbox RustboroCity_Text_167485, 3
+ msgbox RustboroCity_Text_167485, MSGBOX_SIGN
end
RustboroCity_EventScript_14C42E:: @ 814C42E
- msgbox RustboroCity_Text_1674DD, 3
+ msgbox RustboroCity_Text_1674DD, MSGBOX_SIGN
end
RustboroCity_EventScript_14C437:: @ 814C437
- msgbox RustboroCity_Text_167525, 3
+ msgbox RustboroCity_Text_167525, MSGBOX_SIGN
end
RustboroCity_EventScript_14C440:: @ 814C440
- msgbox RustboroCity_Text_167568, 3
+ msgbox RustboroCity_Text_167568, MSGBOX_SIGN
end
RustboroCity_EventScript_14C449:: @ 814C449
lock
faceplayer
- msgbox RustboroCity_Text_166D59, 4
- applymovement 7, RustboroCity_Movement_1A083D
+ msgbox RustboroCity_Text_166D59, MSGBOX_DEFAULT
+ applymovement 7, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -106,8 +106,8 @@ RustboroCity_EventScript_14C449:: @ 814C449
RustboroCity_EventScript_14C45F:: @ 814C45F
lock
faceplayer
- msgbox RustboroCity_Text_166DB0, 4
- applymovement 8, RustboroCity_Movement_1A083D
+ msgbox RustboroCity_Text_166DB0, MSGBOX_DEFAULT
+ applymovement 8, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -115,7 +115,7 @@ RustboroCity_EventScript_14C45F:: @ 814C45F
RustboroCity_EventScript_14C475:: @ 814C475
lock
faceplayer
- msgbox RustboroCity_Text_166DEE, 4
+ msgbox RustboroCity_Text_166DEE, MSGBOX_DEFAULT
release
end
@@ -160,7 +160,7 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD
end
RustboroCity_EventScript_14C4F4:: @ 814C4F4
- msgbox RustboroCity_Text_166E65, 4
+ msgbox RustboroCity_Text_166E65, MSGBOX_DEFAULT
closemessage
addobject 10
addobject 9
@@ -169,7 +169,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4
removeobject 10
applymovement 9, RustboroCity_Movement_14C5D3
waitmovement 0
- msgbox RustboroCity_Text_166E7E, 4
+ msgbox RustboroCity_Text_166E7E, MSGBOX_DEFAULT
closemessage
applymovement 9, RustboroCity_Movement_14C5DB
waitmovement 0
@@ -189,11 +189,11 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4
end
@ 814C55D
- msgbox RustboroCity_Text_166F6B, 4
+ msgbox RustboroCity_Text_166F6B, MSGBOX_DEFAULT
return
@ 814C566
- msgbox RustboroCity_Text_166FB4, 4
+ msgbox RustboroCity_Text_166FB4, MSGBOX_DEFAULT
return
@ 814C56F
@@ -219,7 +219,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4
@ 814C59B
applymovement 9, RustboroCity_Movement_14C5F7
waitmovement 0
- applymovement 255, RustboroCity_Movement_1A0841
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
@@ -241,7 +241,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4
walk_fast_up
walk_fast_up
walk_fast_up
- end_movement
+ step_end
RustboroCity_Movement_14C5C2:: @ 814C5C2
walk_fastest_right
@@ -260,7 +260,7 @@ RustboroCity_Movement_14C5C2:: @ 814C5C2
walk_fast_up
walk_fast_up
walk_fast_up
- end_movement
+ step_end
RustboroCity_Movement_14C5D3:: @ 814C5D3
walk_right
@@ -270,7 +270,7 @@ RustboroCity_Movement_14C5D3:: @ 814C5D3
walk_right
walk_right
walk_in_place_fastest_up
- end_movement
+ step_end
RustboroCity_Movement_14C5DB:: @ 814C5DB
walk_up
@@ -280,27 +280,27 @@ RustboroCity_Movement_14C5DB:: @ 814C5DB
walk_up
walk_up
walk_up
- end_movement
+ step_end
RustboroCity_Movement_14C5E3:: @ 814C5E3
walk_down
walk_right
walk_right
- end_movement
+ step_end
RustboroCity_Movement_14C5E7:: @ 814C5E7
walk_down
walk_down
walk_right
walk_right
- end_movement
+ step_end
RustboroCity_Movement_14C5EC:: @ 814C5EC
walk_down
walk_down
walk_right
walk_right
- end_movement
+ step_end
RustboroCity_Movement_14C5F1:: @ 814C5F1
walk_down
@@ -308,7 +308,7 @@ RustboroCity_Movement_14C5F1:: @ 814C5F1
walk_down
walk_right
walk_right
- end_movement
+ step_end
RustboroCity_Movement_14C5F7:: @ 814C5F7
walk_down
@@ -318,13 +318,13 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7
walk_right
walk_right
walk_in_place_fastest_down
- end_movement
+ step_end
RustboroCity_EventScript_14C5FF:: @ 814C5FF
lock
faceplayer
goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_14C614
- msgbox RustboroCity_Text_166F6B, 4
+ msgbox RustboroCity_Text_166F6B, MSGBOX_DEFAULT
release
end
@@ -370,63 +370,63 @@ RustboroCity_EventScript_14C650:: @ 814C650
setflag FLAG_UNKNOWN_9F
setvar VAR_RUSTBORO_STATE, 3
moveobjectoffscreen 9
- msgbox RustboroCity_Text_166EA5, 4
+ msgbox RustboroCity_Text_166EA5, MSGBOX_DEFAULT
releaseall
end
RustboroCity_EventScript_14C691:: @ 814C691
- applymovement 9, RustboroCity_Movement_1A0841
+ applymovement 9, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_1A0833
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_1A0835
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
- applymovement 255, RustboroCity_Movement_1A0845
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
RustboroCity_EventScript_14C6BD:: @ 814C6BD
- applymovement 9, RustboroCity_Movement_1A083F
+ applymovement 9, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_1A0833
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_1A0835
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
- applymovement 255, RustboroCity_Movement_1A0843
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
RustboroCity_EventScript_14C6E9:: @ 814C6E9
- applymovement 9, RustboroCity_Movement_1A0845
+ applymovement 9, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_1A0833
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_1A0835
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
- applymovement 255, RustboroCity_Movement_1A0841
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
RustboroCity_EventScript_14C715:: @ 814C715
- applymovement 9, RustboroCity_Movement_1A0845
+ applymovement 9, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_1A0833
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_1A0835
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
applymovement 9, RustboroCity_Movement_14C74B
waitmovement 0
- applymovement 255, RustboroCity_Movement_1A0841
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
RustboroCity_Movement_14C74B:: @ 814C74B
walk_down
- end_movement
+ step_end
RustboroCity_EventScript_14C74D:: @ 814C74D
lockall
@@ -463,11 +463,11 @@ RustboroCity_EventScript_14C77D:: @ 814C77D
call_if_eq RustboroCity_EventScript_14C882
compare VAR_TEMP_1, 4
call_if_eq RustboroCity_EventScript_14C8B8
- msgbox RustboroCity_Text_166FB4, 4
- giveitem_std ITEM_GREAT_BALL
+ msgbox RustboroCity_Text_166FB4, MSGBOX_DEFAULT
+ giveitem ITEM_GREAT_BALL
compare VAR_RESULT, 0
call_if_eq RustboroCity_EventScript_14C7F5
- msgbox RustboroCity_Text_16707F, 4
+ msgbox RustboroCity_Text_16707F, MSGBOX_DEFAULT
closemessage
setflag FLAG_RETURNED_DEVON_GOODS
setflag FLAG_HIDE_DEVON_RUSTBORO
@@ -479,66 +479,66 @@ RustboroCity_EventScript_14C77D:: @ 814C77D
end
RustboroCity_EventScript_14C7F5:: @ 814C7F5
- msgbox RustboroCity_Text_16704C, 4
+ msgbox RustboroCity_Text_16704C, MSGBOX_DEFAULT
return
RustboroCity_EventScript_14C7FE:: @ 814C7FE
- applymovement 9, RustboroCity_Movement_1A0841
+ applymovement 9, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_1A0833
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_1A0835
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
- applymovement 255, RustboroCity_Movement_1A0845
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
RustboroCity_EventScript_14C82A:: @ 814C82A
- applymovement 9, RustboroCity_Movement_1A0843
+ applymovement 9, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_1A0833
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_1A0835
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
- applymovement 255, RustboroCity_Movement_1A083F
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
RustboroCity_EventScript_14C856:: @ 814C856
- applymovement 9, RustboroCity_Movement_1A0845
+ applymovement 9, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_1A0833
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_1A0835
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
- applymovement 255, RustboroCity_Movement_1A0841
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
RustboroCity_EventScript_14C882:: @ 814C882
- applymovement 9, RustboroCity_Movement_1A0845
+ applymovement 9, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_1A0833
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_1A0835
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
applymovement 9, RustboroCity_Movement_14C74B
waitmovement 0
- applymovement 255, RustboroCity_Movement_1A0841
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
RustboroCity_EventScript_14C8B8:: @ 814C8B8
- applymovement 9, RustboroCity_Movement_1A083F
+ applymovement 9, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
playse SE_PIN
- applymovement 9, RustboroCity_Movement_1A0833
+ applymovement 9, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 9, RustboroCity_Movement_1A0835
+ applymovement 9, Common_Movement_Delay48
waitmovement 0
return
@@ -555,13 +555,13 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA
RustboroCity_EventScript_14C8FD:: @ 814C8FD
setflag FLAG_MET_RIVAL_RUSTBORO
- msgbox RustboroCity_Text_1670A7, 4
+ msgbox RustboroCity_Text_1670A7, MSGBOX_DEFAULT
release
end
RustboroCity_EventScript_14C90A:: @ 814C90A
setflag FLAG_MET_RIVAL_RUSTBORO
- msgbox RustboroCity_Text_167213, 4
+ msgbox RustboroCity_Text_167213, MSGBOX_DEFAULT
release
end
@@ -574,11 +574,11 @@ RustboroCity_EventScript_14C917:: @ 814C917
end
RustboroCity_EventScript_14C92F:: @ 814C92F
- msgbox RustboroCity_Text_16713C, 4
+ msgbox RustboroCity_Text_16713C, MSGBOX_DEFAULT
release
end
RustboroCity_EventScript_14C939:: @ 814C939
- msgbox RustboroCity_Text_1672B8, 4
+ msgbox RustboroCity_Text_1672B8, MSGBOX_DEFAULT
release
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 01:29:37 +0000