summaryrefslogtreecommitdiff
path: root/data/maps/OldaleTown/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/OldaleTown/scripts.inc')
-rw-r--r--data/maps/OldaleTown/scripts.inc78
1 files changed, 39 insertions, 39 deletions
diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc
index ad30b2014..ba3a1868e 100644
--- a/data/maps/OldaleTown/scripts.inc
+++ b/data/maps/OldaleTown/scripts.inc
@@ -1,9 +1,9 @@
OldaleTown_MapScripts:: @ 814DD62
- map_script 3, OldaleTown_MapScript1_14DD68
+ map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_MapScript1_14DD68
.byte 0
OldaleTown_MapScript1_14DD68:: @ 814DD68
- call OldaleTown_EventScript_1A014E
+ call Common_EventScript_SetupRivalGfxId
setflag FLAG_VISITED_OLDALE_TOWN
call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD92
call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DD9E
@@ -25,11 +25,11 @@ OldaleTown_EventScript_14DD9E:: @ 814DD9E
return
OldaleTown_EventScript_14DDAA:: @ 814DDAA
- msgbox OldaleTown_Text_16B20E, 3
+ msgbox OldaleTown_Text_16B20E, MSGBOX_SIGN
end
OldaleTown_EventScript_14DDB3:: @ 814DDB3
- msgbox OldaleTown_Text_16AEC0, 2
+ msgbox OldaleTown_Text_16AEC0, MSGBOX_NPC
end
OldaleTown_EventScript_14DDBC:: @ 814DDBC
@@ -39,7 +39,7 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC
goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_14DE79
setflag FLAG_TEMP_1
playbgm MUS_TSURETEK, FALSE
- msgbox OldaleTown_Text_16AEF2, 4
+ msgbox OldaleTown_Text_16AEF2, MSGBOX_DEFAULT
closemessage
switch VAR_FACING
case 1, OldaleTown_EventScript_14DE07
@@ -49,43 +49,43 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC
OldaleTown_EventScript_14DE07:: @ 814DE07
applymovement 2, OldaleTown_Movement_14DE97
- applymovement 255, OldaleTown_Movement_14DEC1
+ applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_14DEC1
waitmovement 0
goto OldaleTown_EventScript_14DE4C
end
OldaleTown_EventScript_14DE1E:: @ 814DE1E
applymovement 2, OldaleTown_Movement_14DEA2
- applymovement 255, OldaleTown_Movement_14DECB
+ applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_14DECB
waitmovement 0
goto OldaleTown_EventScript_14DE4C
end
OldaleTown_EventScript_14DE35:: @ 814DE35
- applymovement 255, OldaleTown_Movement_14DEB9
+ applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_14DEB9
applymovement 2, OldaleTown_Movement_14DE8E
waitmovement 0
goto OldaleTown_EventScript_14DE4C
end
OldaleTown_EventScript_14DE4C:: @ 814DE4C
- msgbox OldaleTown_Text_16AF2F, 4
- giveitem_std ITEM_POTION
+ msgbox OldaleTown_Text_16AF2F, MSGBOX_DEFAULT
+ giveitem ITEM_POTION
compare VAR_RESULT, 0
goto_if_eq OldaleTown_EventScript_14DE83
- msgbox OldaleTown_Text_16AFE1, 4
+ msgbox OldaleTown_Text_16AFE1, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_POTION_OLDALE
fadedefaultbgm
release
end
OldaleTown_EventScript_14DE79:: @ 814DE79
- msgbox OldaleTown_Text_16AFE1, 4
+ msgbox OldaleTown_Text_16AFE1, MSGBOX_DEFAULT
release
end
OldaleTown_EventScript_14DE83:: @ 814DE83
- msgbox OldaleTown_Text_1A0CC2, 4
+ msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT
fadedefaultbgm
release
end
@@ -99,7 +99,7 @@ OldaleTown_Movement_14DE8E:: @ 814DE8E
walk_up
walk_up
walk_in_place_fastest_down
- end_movement
+ step_end
OldaleTown_Movement_14DE97:: @ 814DE97
walk_left
@@ -112,7 +112,7 @@ OldaleTown_Movement_14DE97:: @ 814DE97
walk_up
walk_up
walk_in_place_fastest_down
- end_movement
+ step_end
OldaleTown_Movement_14DEA2:: @ 814DEA2
walk_up
@@ -123,7 +123,7 @@ OldaleTown_Movement_14DEA2:: @ 814DEA2
walk_up
walk_up
walk_in_place_fastest_down
- end_movement
+ step_end
@ 814DEAB
walk_up
@@ -139,7 +139,7 @@ OldaleTown_Movement_14DEA2:: @ 814DEA2
walk_up
delay_8
walk_in_place_fastest_down
- end_movement
+ step_end
OldaleTown_Movement_14DEB9:: @ 814DEB9
walk_right
@@ -149,7 +149,7 @@ OldaleTown_Movement_14DEB9:: @ 814DEB9
walk_up
walk_up
walk_up
- end_movement
+ step_end
OldaleTown_Movement_14DEC1:: @ 814DEC1
delay_16
@@ -161,7 +161,7 @@ OldaleTown_Movement_14DEC1:: @ 814DEC1
walk_up
walk_up
walk_up
- end_movement
+ step_end
OldaleTown_Movement_14DECB:: @ 814DECB
walk_up
@@ -171,7 +171,7 @@ OldaleTown_Movement_14DECB:: @ 814DECB
walk_up
walk_up
walk_up
- end_movement
+ step_end
@ 814DED3
walk_left
@@ -185,25 +185,25 @@ OldaleTown_Movement_14DECB:: @ 814DECB
walk_up
walk_up
walk_up
- end_movement
+ step_end
OldaleTown_EventScript_14DEDF:: @ 814DEDF
lock
faceplayer
goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DF26
- msgbox OldaleTown_Text_16B0CC, 4
+ msgbox OldaleTown_Text_16B0CC, MSGBOX_DEFAULT
closemessage
- applymovement 3, OldaleTown_Movement_1A083D
+ applymovement 3, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
OldaleTown_EventScript_14DEFF:: @ 814DEFF
lockall
- applymovement 255, OldaleTown_Movement_14DFEC
+ applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_14DFEC
applymovement 3, OldaleTown_Movement_14DFEF
waitmovement 0
- msgbox OldaleTown_Text_16B045, 4
+ msgbox OldaleTown_Text_16B045, MSGBOX_DEFAULT
closemessage
applymovement 3, OldaleTown_Movement_14DFF5
waitmovement 0
@@ -211,13 +211,13 @@ OldaleTown_EventScript_14DEFF:: @ 814DEFF
end
OldaleTown_EventScript_14DF26:: @ 814DF26
- msgbox OldaleTown_Text_16B12A, 4
+ msgbox OldaleTown_Text_16B12A, MSGBOX_DEFAULT
release
end
OldaleTown_EventScript_14DF30:: @ 814DF30
lockall
- applymovement 4, OldaleTown_Movement_1A0839
+ applymovement 4, Common_Movement_FacePlayer
waitmovement 0
goto OldaleTown_EventScript_14DF92
end
@@ -226,7 +226,7 @@ OldaleTown_EventScript_14DF41:: @ 814DF41
lockall
applymovement 4, OldaleTown_Movement_14DFDE
waitmovement 0
- applymovement 255, OldaleTown_Movement_1A0843
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
goto OldaleTown_EventScript_14DF92
end
@@ -235,7 +235,7 @@ OldaleTown_EventScript_14DF5C:: @ 814DF5C
lockall
applymovement 4, OldaleTown_Movement_14DFE1
waitmovement 0
- applymovement 255, OldaleTown_Movement_1A0843
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
goto OldaleTown_EventScript_14DF92
end
@@ -244,7 +244,7 @@ OldaleTown_EventScript_14DF77:: @ 814DF77
lockall
applymovement 4, OldaleTown_Movement_14DFE3
waitmovement 0
- applymovement 255, OldaleTown_Movement_1A0843
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
goto OldaleTown_EventScript_14DF92
end
@@ -258,12 +258,12 @@ OldaleTown_EventScript_14DF92:: @ 814DF92
end
OldaleTown_EventScript_14DFAA:: @ 814DFAA
- msgbox OldaleTown_Text_16B196, 4
+ msgbox OldaleTown_Text_16B196, MSGBOX_DEFAULT
goto OldaleTown_EventScript_14DFC6
end
OldaleTown_EventScript_14DFB8:: @ 814DFB8
- msgbox OldaleTown_Text_16B1BE, 4
+ msgbox OldaleTown_Text_16B1BE, MSGBOX_DEFAULT
goto OldaleTown_EventScript_14DFC6
end
@@ -280,15 +280,15 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6
OldaleTown_Movement_14DFDE:: @ 814DFDE
walk_left
walk_left
- end_movement
+ step_end
OldaleTown_Movement_14DFE1:: @ 814DFE1
walk_left
- end_movement
+ step_end
OldaleTown_Movement_14DFE3:: @ 814DFE3
face_left
- end_movement
+ step_end
OldaleTown_Movement_14DFE5:: @ 814DFE5
walk_down
@@ -297,12 +297,12 @@ OldaleTown_Movement_14DFE5:: @ 814DFE5
walk_down
walk_down
walk_down
- end_movement
+ step_end
OldaleTown_Movement_14DFEC:: @ 814DFEC
delay_8
walk_right
- end_movement
+ step_end
OldaleTown_Movement_14DFEF:: @ 814DFEF
walk_fast_up
@@ -310,9 +310,9 @@ OldaleTown_Movement_14DFEF:: @ 814DFEF
lock_facing_direction
walk_right
unlock_facing_direction
- end_movement
+ step_end
OldaleTown_Movement_14DFF5:: @ 814DFF5
walk_down
walk_left
- end_movement
+ step_end
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 10:50:18 +0000