summaryrefslogtreecommitdiff
path: root/maps/Route3.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route3.asm')
-rw-r--r--maps/Route3.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route3.asm b/maps/Route3.asm
index d7bf26a6..b5a3ed17 100644
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -1,13 +1,13 @@
- object_const_def ; object_event constants
+ object_const_def
const ROUTE3_FISHER1
const ROUTE3_YOUNGSTER1
const ROUTE3_YOUNGSTER2
const ROUTE3_FISHER2
Route3_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
TrainerFirebreatherOtis:
trainer FIREBREATHER, OTIS, EVENT_BEAT_FIREBREATHER_OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script
@@ -133,15 +133,15 @@ Route3MtMoonSquareSignText:
Route3_MapEvents:
db 0, 0 ; filler
- db 1 ; warp events
+ def_warp_events
warp_event 52, 1, MOUNT_MOON, 1
- db 0 ; coord events
+ def_coord_events
- db 1 ; bg events
+ def_bg_events
bg_event 49, 13, BGEVENT_READ, Route3MtMoonSquareSign
- db 4 ; object events
+ def_object_events
object_event 26, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1
object_event 11, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerYoungsterWarren, -1
object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJimmy, -1