summaryrefslogtreecommitdiff
path: root/data/maps/Route101/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route101/scripts.inc')
-rw-r--r--data/maps/Route101/scripts.inc35
1 files changed, 19 insertions, 16 deletions
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index e1805b73d..66ce4abc8 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -1,3 +1,6 @@
+.set LOCALID_BIRCH, 2
+.set LOCALID_ZIGZAGOON, 4
+
Route101_MapScripts:: @ 81EBCBA
map_script MAP_SCRIPT_ON_TRANSITION, Route101_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_OnFrame
@@ -18,22 +21,22 @@ Route101_EventScript_HideMapNamePopup:: @ 81EBCD5
Route101_EventScript_StartBirchRescue:: @ 81EBCDE
lockall
- playbgm MUS_EVENT0, 1
+ playbgm MUS_HELP, 1
msgbox Route101_Text_HelpMe, MSGBOX_DEFAULT
closemessage
- setobjectxy 2, 0, 15
- setobjectxy 4, 0, 16
+ setobjectxy LOCALID_BIRCH, 0, 15
+ setobjectxy LOCALID_ZIGZAGOON, 0, 16
applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_EnterScene
- applymovement 2, Route101_Movement_BirchRunAway1
- applymovement 4, Route101_Movement_PoochyenaChase1
+ applymovement LOCALID_BIRCH, Route101_Movement_BirchRunAway1
+ applymovement LOCALID_ZIGZAGOON, Route101_Movement_ZigzagoonChase1
waitmovement 0
- applymovement 4, Route101_Movement_PoochyenaChaseInCircles
- applymovement 2, Route101_Movement_BirchRunInCircles
+ applymovement LOCALID_ZIGZAGOON, Route101_Movement_ZigzagoonChaseInCircles
+ applymovement LOCALID_BIRCH, Route101_Movement_BirchRunInCircles
waitmovement 0
- applymovement 2, Common_Movement_WalkInPlaceFastestRight
+ applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
- applymovement 4, Route101_Movement_PoochyenaFaceBirch
- applymovement 2, Route101_Movement_BirchFacePoochyena
+ applymovement LOCALID_ZIGZAGOON, Route101_Movement_ZigzagoonFaceBirch
+ applymovement LOCALID_BIRCH, Route101_Movement_BirchFaceZigzagoon
waitmovement 0
msgbox Route101_Text_PleaseHelp, MSGBOX_DEFAULT
closemessage
@@ -80,7 +83,7 @@ Route101_Movement_PreventExitNorth: @ 81EBD94
walk_down
step_end
-Route101_Movement_PoochyenaChaseInCircles: @ 81EBD96
+Route101_Movement_ZigzagoonChaseInCircles: @ 81EBD96
walk_fast_up
walk_fast_up
walk_fast_up
@@ -113,7 +116,7 @@ Route101_Movement_PoochyenaChaseInCircles: @ 81EBD96
walk_fast_left
step_end
-Route101_Movement_PoochyenaChase1: @ 81EBDB5
+Route101_Movement_ZigzagoonChase1: @ 81EBDB5
walk_fast_up
walk_fast_right
walk_fast_right
@@ -125,7 +128,7 @@ Route101_Movement_PoochyenaChase1: @ 81EBDB5
@ Leftover data? This command is unused.
step_end
-Route101_Movement_PoochyenaFaceBirch: @ 81EBDBD
+Route101_Movement_ZigzagoonFaceBirch: @ 81EBDBD
walk_in_place_fast_left
walk_in_place_fast_left
walk_in_place_fast_left
@@ -185,7 +188,7 @@ Route101_Movement_BirchRunAway1: @ 81EBDE7
@ Leftover data? This command is unused.
step_end
-Route101_Movement_BirchFacePoochyena: @ 81EBDEF
+Route101_Movement_BirchFaceZigzagoon: @ 81EBDEF
walk_in_place_fast_right
walk_in_place_fast_right
walk_in_place_fast_right
@@ -221,13 +224,13 @@ Route101_EventScript_BirchsBag:: @ 81EBE16
setflag FLAG_SYS_POKEMON_GET
setflag FLAG_RESCUED_BIRCH
fadescreen FADE_TO_BLACK
- removeobject 4
+ removeobject LOCALID_ZIGZAGOON
setobjectxy OBJ_EVENT_ID_PLAYER, 6, 13
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
special ChooseStarter
waitstate
- applymovement 2, Route101_Movement_BirchApproachPlayer
+ applymovement LOCALID_BIRCH, Route101_Movement_BirchApproachPlayer
waitmovement 0
msgbox Route101_Text_YouSavedMe, MSGBOX_DEFAULT
special HealPlayerParty