summaryrefslogtreecommitdiff
path: root/maps/VioletGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/VioletGym.asm')
-rw-r--r--maps/VioletGym.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index c2ca899e..5eb857e8 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -1,13 +1,13 @@
- object_const_def ; object_event constants
+ object_const_def
const VIOLETGYM_FALKNER
const VIOLETGYM_YOUNGSTER1
const VIOLETGYM_YOUNGSTER2
const VIOLETGYM_GYM_GUIDE
VioletGym_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
VioletGymFalknerScript:
faceplayer
@@ -282,17 +282,17 @@ VioletGymGuideWinText:
VioletGym_MapEvents:
db 0, 0 ; filler
- db 2 ; warp events
+ def_warp_events
warp_event 4, 15, VIOLET_CITY, 2
warp_event 5, 15, VIOLET_CITY, 2
- db 0 ; coord events
+ def_coord_events
- db 2 ; bg events
+ def_bg_events
bg_event 3, 13, BGEVENT_READ, VioletGymStatue
bg_event 6, 13, BGEVENT_READ, VioletGymStatue
- db 4 ; object events
+ def_object_events
object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletGymFalknerScript, -1
object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1
object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1