summaryrefslogtreecommitdiff
path: root/maps/AzaleaGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/AzaleaGym.asm')
-rw-r--r--maps/AzaleaGym.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index 40fcaa61..0e25aeec 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -1,4 +1,4 @@
- object_const_def ; object_event constants
+ object_const_def
const AZALEAGYM_BUGSY
const AZALEAGYM_BUG_CATCHER1
const AZALEAGYM_BUG_CATCHER2
@@ -8,9 +8,9 @@
const AZALEAGYM_GYM_GUIDE
AzaleaGym_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
AzaleaGymBugsyScript:
faceplayer
@@ -360,17 +360,17 @@ AzaleaGymGuideWinText:
AzaleaGym_MapEvents:
db 0, 0 ; filler
- db 2 ; warp events
+ def_warp_events
warp_event 4, 15, AZALEA_TOWN, 5
warp_event 5, 15, AZALEA_TOWN, 5
- db 0 ; coord events
+ def_coord_events
- db 2 ; bg events
+ def_bg_events
bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue
bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue
- db 7 ; object events
+ def_object_events
object_event 5, 7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
object_event 5, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1
object_event 8, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1