summaryrefslogtreecommitdiff
path: root/maps/Route44.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route44.asm')
-rw-r--r--maps/Route44.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route44.asm b/maps/Route44.asm
index 6e6fbcec..2b897783 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -1,4 +1,4 @@
- object_const_def ; object_event constants
+ object_const_def
const ROUTE44_FISHER1
const ROUTE44_FISHER2
const ROUTE44_YOUNGSTER1
@@ -11,9 +11,9 @@
const ROUTE44_POKE_BALL2
Route44_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
TrainerBirdKeeperVance1:
trainer BIRD_KEEPER, VANCE1, EVENT_BEAT_BIRD_KEEPER_VANCE, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script
@@ -404,17 +404,17 @@ Route44Sign2Text:
Route44_MapEvents:
db 0, 0 ; filler
- db 1 ; warp events
+ def_warp_events
warp_event 56, 7, ICE_PATH_1F, 1
- db 0 ; coord events
+ def_coord_events
- db 3 ; bg events
+ def_bg_events
bg_event 53, 7, BGEVENT_READ, Route44Sign1
bg_event 6, 10, BGEVENT_READ, Route44Sign2
bg_event 32, 9, BGEVENT_ITEM, Route44HiddenElixer
- db 10 ; object events
+ def_object_events
object_event 42, 5, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1
object_event 19, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1
object_event 10, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1