summaryrefslogtreecommitdiff
path: root/maps/Route36.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route36.asm')
-rw-r--r--maps/Route36.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 34764ed7..7f60bb72 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -1,4 +1,4 @@
- object_const_def ; object_event constants
+ object_const_def
const ROUTE36_YOUNGSTER1
const ROUTE36_YOUNGSTER2
const ROUTE36_WEIRD_TREE
@@ -8,9 +8,9 @@
const ROUTE36_ARTHUR
Route36_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 1 ; callbacks
+ def_callbacks
callback MAPCALLBACK_OBJECTS, .ArthurCallback
.ArthurCallback:
@@ -466,21 +466,21 @@ Route36TrainerTips2Text:
Route36_MapEvents:
db 0, 0 ; filler
- db 4 ; warp events
+ def_warp_events
warp_event 18, 8, ROUTE_36_NATIONAL_PARK_GATE, 3
warp_event 18, 9, ROUTE_36_NATIONAL_PARK_GATE, 4
warp_event 47, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 1
warp_event 48, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 2
- db 0 ; coord events
+ def_coord_events
- db 4 ; bg events
+ def_bg_events
bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2
bg_event 45, 11, BGEVENT_READ, RuinsOfAlphNorthSign
bg_event 55, 7, BGEVENT_READ, Route36Sign
bg_event 21, 7, BGEVENT_READ, Route36TrainerTips1
- db 7 ; object events
+ def_object_events
object_event 20, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicMark, -1
object_event 31, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1
object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO