summaryrefslogtreecommitdiff
path: root/maps/Route43.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route43.asm')
-rw-r--r--maps/Route43.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route43.asm b/maps/Route43.asm
index 712e9fcc6..8dde5cca4 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -1,4 +1,4 @@
- object_const_def ; object_event constants
+ object_const_def
const ROUTE43_SUPER_NERD1
const ROUTE43_SUPER_NERD2
const ROUTE43_SUPER_NERD3
@@ -9,9 +9,9 @@
const ROUTE43_POKE_BALL
Route43_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 1 ; callbacks
+ def_callbacks
callback MAPCALLBACK_NEWMAP, .CheckIfRockets
.CheckIfRockets:
@@ -501,21 +501,21 @@ Route43TrainerTipsText:
Route43_MapEvents:
db 0, 0 ; filler
- db 5 ; warp events
+ def_warp_events
warp_event 9, 51, ROUTE_43_MAHOGANY_GATE, 1
warp_event 10, 51, ROUTE_43_MAHOGANY_GATE, 2
warp_event 17, 35, ROUTE_43_GATE, 3
warp_event 17, 31, ROUTE_43_GATE, 1
warp_event 18, 31, ROUTE_43_GATE, 2
- db 0 ; coord events
+ def_coord_events
- db 3 ; bg events
+ def_bg_events
bg_event 13, 3, BGEVENT_READ, Route43Sign1
bg_event 11, 49, BGEVENT_READ, Route43Sign2
bg_event 16, 38, BGEVENT_READ, Route43TrainerTips
- db 8 ; object events
+ def_object_events
object_event 13, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1
object_event 13, 20, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent, -1
object_event 14, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1