diff options
Diffstat (limited to 'maps/Route45.asm')
| -rw-r--r-- | maps/Route45.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route45.asm b/maps/Route45.asm index 64371a20..6a077e90 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE45_POKEFAN_M1 const ROUTE45_POKEFAN_M2 const ROUTE45_POKEFAN_M3 @@ -13,9 +13,9 @@ const ROUTE45_POKE_BALL4 Route45_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerBlackbeltKenji: trainer BLACKBELT_T, KENJI3, EVENT_BEAT_BLACKBELT_KENJI, BlackbeltKenjiSeenText, BlackbeltKenjiBeatenText, 0, .Script @@ -399,16 +399,16 @@ Route45SignText: Route45_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 2, 5, DARK_CAVE_BLACKTHORN_ENTRANCE, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 10, 4, BGEVENT_READ, Route45Sign bg_event 13, 80, BGEVENT_ITEM, Route45HiddenPpUp - db 12 ; object events + def_object_events object_event 10, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerErik, -1 object_event 15, 64, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerMichael, -1 object_event 5, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerParry, -1 |