summaryrefslogtreecommitdiff
path: root/maps/Route38.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route38.asm')
-rw-r--r--maps/Route38.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route38.asm b/maps/Route38.asm
index 01545547..0b081aca 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -1,4 +1,4 @@
- object_const_def ; object_event constants
+ object_const_def
const ROUTE38_STANDING_YOUNGSTER1
const ROUTE38_LASS
const ROUTE38_STANDING_YOUNGSTER2
@@ -7,9 +7,9 @@
const ROUTE38_FRUIT_TREE
Route38_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
TrainerBirdKeeperToby:
trainer BIRD_KEEPER, TOBY, EVENT_BEAT_BIRD_KEEPER_TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script
@@ -349,17 +349,17 @@ Route38TrainerTipsText:
Route38_MapEvents:
db 0, 0 ; filler
- db 2 ; warp events
+ def_warp_events
warp_event 35, 8, ROUTE_38_ECRUTEAK_GATE, 1
warp_event 35, 9, ROUTE_38_ECRUTEAK_GATE, 2
- db 0 ; coord events
+ def_coord_events
- db 2 ; bg events
+ def_bg_events
bg_event 33, 7, BGEVENT_READ, Route38Sign
bg_event 5, 13, BGEVENT_READ, Route38TrainerTips
- db 6 ; object events
+ def_object_events
object_event 4, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyChad1, -1
object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1
object_event 15, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperToby, -1