summaryrefslogtreecommitdiff
path: root/data/maps/MauvilleCity/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/MauvilleCity/scripts.inc')
-rw-r--r--data/maps/MauvilleCity/scripts.inc114
1 files changed, 57 insertions, 57 deletions
diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc
index c3c6834e4..efbb52755 100644
--- a/data/maps/MauvilleCity/scripts.inc
+++ b/data/maps/MauvilleCity/scripts.inc
@@ -1,5 +1,5 @@
MauvilleCity_MapScripts:: @ 814C032
- map_script 3, MauvilleCity_MapScript1_14C038
+ map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_MapScript1_14C038
.byte 0
MauvilleCity_MapScript1_14C038:: @ 814C038
@@ -17,48 +17,48 @@ MauvilleCity_EventScript_14C053:: @ 814C053
return
MauvilleCity_EventScript_14C05A:: @ 814C05A
- msgbox MauvilleCity_Text_1664DF, 2
+ msgbox MauvilleCity_Text_1664DF, MSGBOX_NPC
end
MauvilleCity_EventScript_14C063:: @ 814C063
- msgbox MauvilleCity_Text_16655C, 2
+ msgbox MauvilleCity_Text_16655C, MSGBOX_NPC
end
MauvilleCity_EventScript_14C06C:: @ 814C06C
- msgbox MauvilleCity_Text_1665DB, 2
+ msgbox MauvilleCity_Text_1665DB, MSGBOX_NPC
end
MauvilleCity_EventScript_14C075:: @ 814C075
- msgbox MauvilleCity_Text_16662A, 2
+ msgbox MauvilleCity_Text_16662A, MSGBOX_NPC
end
MauvilleCity_EventScript_14C07E:: @ 814C07E
- msgbox MauvilleCity_Text_166665, 3
+ msgbox MauvilleCity_Text_166665, MSGBOX_SIGN
end
MauvilleCity_EventScript_14C087:: @ 814C087
- msgbox MauvilleCity_Text_166697, 3
+ msgbox MauvilleCity_Text_166697, MSGBOX_SIGN
end
MauvilleCity_EventScript_14C090:: @ 814C090
- msgbox MauvilleCity_Text_1666E4, 3
+ msgbox MauvilleCity_Text_1666E4, MSGBOX_SIGN
end
MauvilleCity_EventScript_14C099:: @ 814C099
- msgbox MauvilleCity_Text_16671C, 3
+ msgbox MauvilleCity_Text_16671C, MSGBOX_SIGN
end
MauvilleCity_EventScript_14C0A2:: @ 814C0A2
lock
faceplayer
goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_14C0BA
- msgbox MauvilleCity_Text_16674A, 4
+ msgbox MauvilleCity_Text_16674A, MSGBOX_DEFAULT
setflag FLAG_TV_EXPLAINED
release
end
MauvilleCity_EventScript_14C0BA:: @ 814C0BA
- msgbox MauvilleCity_Text_166879, 4
+ msgbox MauvilleCity_Text_166879, MSGBOX_DEFAULT
release
end
@@ -66,17 +66,17 @@ MauvilleCity_EventScript_14C0C4:: @ 814C0C4
lock
faceplayer
goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C0E4
- msgbox MauvilleCity_Text_165B76, 4
+ msgbox MauvilleCity_Text_165B76, MSGBOX_DEFAULT
closemessage
- applymovement 7, MauvilleCity_Movement_1A083D
+ applymovement 7, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
MauvilleCity_EventScript_14C0E4:: @ 814C0E4
- msgbox MauvilleCity_Text_165E45, 4
+ msgbox MauvilleCity_Text_165E45, MSGBOX_DEFAULT
closemessage
- applymovement 7, MauvilleCity_Movement_1A083D
+ applymovement 7, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -84,17 +84,17 @@ MauvilleCity_EventScript_14C0E4:: @ 814C0E4
MauvilleCity_EventScript_14C0F9:: @ 814C0F9
lockall
goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C292
- applymovement 6, MauvilleCity_Movement_1A0843
+ applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
- msgbox MauvilleCity_Text_165BE3, 4
- msgbox MauvilleCity_Text_165C57, 4
- msgbox MauvilleCity_Text_165D01, 4
- applymovement 6, MauvilleCity_Movement_1A0839
+ msgbox MauvilleCity_Text_165BE3, MSGBOX_DEFAULT
+ msgbox MauvilleCity_Text_165C57, MSGBOX_DEFAULT
+ msgbox MauvilleCity_Text_165D01, MSGBOX_DEFAULT
+ applymovement 6, Common_Movement_FacePlayer
waitmovement 0
playse SE_PIN
- applymovement 6, MauvilleCity_Movement_1A0833
+ applymovement 6, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 6, MauvilleCity_Movement_1A0835
+ applymovement 6, Common_Movement_Delay48
waitmovement 0
msgbox MauvilleCity_Text_165D50, MSGBOX_YESNO
goto MauvilleCity_EventScript_14C154
@@ -115,14 +115,14 @@ MauvilleCity_EventScript_14C187:: @ 814C187
applymovement 6, MauvilleCity_Movement_14C2AA
applymovement 7, MauvilleCity_Movement_14C2CC
waitmovement 0
- applymovement 6, MauvilleCity_Movement_1A0843
+ applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
delay 30
applymovement 7, MauvilleCity_Movement_14C2D8
waitmovement 0
- applymovement 255, MauvilleCity_Movement_1A0845
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
- msgbox MauvilleCity_Text_1660FA, 4
+ msgbox MauvilleCity_Text_1660FA, MSGBOX_DEFAULT
closemessage
applymovement 6, MauvilleCity_Movement_14C2B6
applymovement 7, MauvilleCity_Movement_14C2DF
@@ -134,14 +134,14 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9
applymovement 6, MauvilleCity_Movement_14C2B0
applymovement 7, MauvilleCity_Movement_14C2D2
waitmovement 0
- applymovement 6, MauvilleCity_Movement_1A0843
+ applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
delay 30
applymovement 7, MauvilleCity_Movement_14C2DC
waitmovement 0
- applymovement 255, MauvilleCity_Movement_1A0845
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
- msgbox MauvilleCity_Text_1660FA, 4
+ msgbox MauvilleCity_Text_1660FA, MSGBOX_DEFAULT
closemessage
applymovement 6, MauvilleCity_Movement_14C2C1
applymovement 7, MauvilleCity_Movement_14C2E8
@@ -159,27 +159,27 @@ MauvilleCity_EventScript_14C22B:: @ 814C22B
end
MauvilleCity_EventScript_14C23C:: @ 814C23C
- msgbox MauvilleCity_Text_165F0D, 4
- trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_165F38
- applymovement 6, MauvilleCity_Movement_1A0843
+ msgbox MauvilleCity_Text_165F0D, MSGBOX_DEFAULT
+ trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_165F38
+ applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
- msgbox MauvilleCity_Text_165F85, 4
- applymovement 6, MauvilleCity_Movement_1A0839
+ msgbox MauvilleCity_Text_165F85, MSGBOX_DEFAULT
+ applymovement 6, Common_Movement_FacePlayer
waitmovement 0
- msgbox MauvilleCity_Text_165FB3, 4
- applymovement 6, MauvilleCity_Movement_1A0843
+ msgbox MauvilleCity_Text_165FB3, MSGBOX_DEFAULT
+ applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
- msgbox MauvilleCity_Text_166050, 4
+ msgbox MauvilleCity_Text_166050, MSGBOX_DEFAULT
return
MauvilleCity_EventScript_14C285:: @ 814C285
setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
- msgbox MauvilleCity_Text_165DE8, 4
+ msgbox MauvilleCity_Text_165DE8, MSGBOX_DEFAULT
release
end
MauvilleCity_EventScript_14C292:: @ 814C292
- applymovement 6, MauvilleCity_Movement_1A0839
+ applymovement 6, Common_Movement_FacePlayer
waitmovement 0
msgbox MauvilleCity_Text_165EE2, MSGBOX_YESNO
goto MauvilleCity_EventScript_14C154
@@ -191,7 +191,7 @@ MauvilleCity_Movement_14C2AA:: @ 814C2AA
walk_down
walk_down
walk_left
- end_movement
+ step_end
MauvilleCity_Movement_14C2B0:: @ 814C2B0
walk_down
@@ -199,7 +199,7 @@ MauvilleCity_Movement_14C2B0:: @ 814C2B0
walk_left
walk_left
walk_left
- end_movement
+ step_end
MauvilleCity_Movement_14C2B6:: @ 814C2B6
delay_16
@@ -212,7 +212,7 @@ MauvilleCity_Movement_14C2B6:: @ 814C2B6
walk_left
walk_left
walk_left
- end_movement
+ step_end
MauvilleCity_Movement_14C2C1:: @ 814C2C1
delay_16
@@ -225,7 +225,7 @@ MauvilleCity_Movement_14C2C1:: @ 814C2C1
walk_left
walk_left
walk_left
- end_movement
+ step_end
MauvilleCity_Movement_14C2CC:: @ 814C2CC
walk_left
@@ -233,7 +233,7 @@ MauvilleCity_Movement_14C2CC:: @ 814C2CC
walk_left
walk_down
walk_down
- end_movement
+ step_end
MauvilleCity_Movement_14C2D2:: @ 814C2D2
walk_left
@@ -241,18 +241,18 @@ MauvilleCity_Movement_14C2D2:: @ 814C2D2
walk_down
walk_left
walk_left
- end_movement
+ step_end
MauvilleCity_Movement_14C2D8:: @ 814C2D8
walk_right
walk_right
walk_in_place_fastest_up
- end_movement
+ step_end
MauvilleCity_Movement_14C2DC:: @ 814C2DC
walk_right
walk_up
- end_movement
+ step_end
MauvilleCity_Movement_14C2DF:: @ 814C2DF
walk_left
@@ -263,7 +263,7 @@ MauvilleCity_Movement_14C2DF:: @ 814C2DF
walk_left
walk_left
walk_left
- end_movement
+ step_end
MauvilleCity_Movement_14C2E8:: @ 814C2E8
walk_down
@@ -275,7 +275,7 @@ MauvilleCity_Movement_14C2E8:: @ 814C2E8
walk_left
walk_left
walk_left
- end_movement
+ step_end
MauvilleCity_EventScript_14C2F2:: @ 814C2F2
lock
@@ -284,29 +284,29 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2
compare VAR_NEW_MAUVILLE_STATE, 2
goto_if_eq MauvilleCity_EventScript_14C33C
goto_if_set FLAG_RECEIVED_BASEMENT_KEY, MauvilleCity_EventScript_14C332
- msgbox MauvilleCity_Text_1661C1, 4
- giveitem_std ITEM_BASEMENT_KEY
+ msgbox MauvilleCity_Text_1661C1, MSGBOX_DEFAULT
+ giveitem ITEM_BASEMENT_KEY
setflag FLAG_RECEIVED_BASEMENT_KEY
- msgbox MauvilleCity_Text_166331, 4
+ msgbox MauvilleCity_Text_166331, MSGBOX_DEFAULT
release
end
MauvilleCity_EventScript_14C332:: @ 814C332
- msgbox MauvilleCity_Text_166331, 4
+ msgbox MauvilleCity_Text_166331, MSGBOX_DEFAULT
release
end
MauvilleCity_EventScript_14C33C:: @ 814C33C
- msgbox MauvilleCity_Text_1663EB, 4
- giveitem_std ITEM_TM24_THUNDERBOLT
+ msgbox MauvilleCity_Text_1663EB, MSGBOX_DEFAULT
+ giveitem ITEM_TM24_THUNDERBOLT
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_EventScript_1A029B
+ goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_TM24
- msgbox MauvilleCity_Text_166488, 4
+ msgbox MauvilleCity_Text_166488, MSGBOX_DEFAULT
release
end
MauvilleCity_EventScript_14C368:: @ 814C368
- msgbox MauvilleCity_Text_166488, 4
+ msgbox MauvilleCity_Text_166488, MSGBOX_DEFAULT
release
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 04:09:12 +0000