summaryrefslogtreecommitdiff
path: root/maps/Route13.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route13.asm')
-rw-r--r--maps/Route13.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route13.asm b/maps/Route13.asm
index 30371002..6815e152 100644
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -1,4 +1,4 @@
- object_const_def ; object_event constants
+ object_const_def
const ROUTE13_YOUNGSTER1
const ROUTE13_YOUNGSTER2
const ROUTE13_POKEFAN_M1
@@ -6,9 +6,9 @@
const ROUTE13_POKEFAN_M3
Route13_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
TrainerPokefanmAlex:
trainer POKEFANM, ALEX, EVENT_BEAT_POKEFANM_ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script
@@ -192,17 +192,17 @@ Route13DirectionsSignText:
Route13_MapEvents:
db 0, 0 ; filler
- db 0 ; warp events
+ def_warp_events
- db 0 ; coord events
+ def_coord_events
- db 4 ; bg events
+ def_bg_events
bg_event 29, 13, BGEVENT_READ, Route13TrainerTips
bg_event 41, 11, BGEVENT_READ, Route13Sign
bg_event 17, 13, BGEVENT_READ, Route13DirectionsSign
bg_event 30, 13, BGEVENT_ITEM, Route13HiddenCalcium
- db 5 ; object events
+ def_object_events
object_event 42, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1
object_event 43, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1
object_event 32, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1