diff options
Diffstat (limited to 'maps/Route21.asm')
-rw-r--r-- | maps/Route21.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route21.asm b/maps/Route21.asm index c2edff08..a5c13fc1 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ROUTE21_SWIMMER_GIRL const ROUTE21_SWIMMER_GUY const ROUTE21_FISHER Route21_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerSwimmermSeth: trainer SWIMMERM, SETH, EVENT_BEAT_SWIMMERM_SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script @@ -92,13 +92,13 @@ FisherArnoldAfterBattleText: Route21_MapEvents: db 0, 0 ; filler - db 0 ; warp events + def_warp_events - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 11, 16, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1 object_event 2, 30, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1 object_event 14, 22, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherArnold, -1 |