summaryrefslogtreecommitdiff
path: root/maps/AzaleaGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/AzaleaGym.asm')
-rw-r--r--maps/AzaleaGym.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index a39010e4e..54f9432d1 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -8,7 +8,7 @@ const_value set 2
const AZALEAGYM_GYM_GUY
AzaleaGym_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
@@ -33,7 +33,7 @@ AzaleaGymBugsyScript:
waitsfx
setflag ENGINE_HIVEBADGE
checkcode VAR_BADGES
- scall AzaleaGymTriggerRockets
+ scall AzaleaGymActivateRockets
.FightDone:
checkevent EVENT_GOT_TM49_FURY_CUTTER
iftrue .GotFuryCutter
@@ -58,7 +58,7 @@ AzaleaGymBugsyScript:
closetext
end
-AzaleaGymTriggerRockets:
+AzaleaGymActivateRockets:
if_equal 7, .RadioTowerRockets
if_equal 6, .GoldenrodRockets
end
@@ -370,20 +370,20 @@ AzaleaGym_MapEventHeader:
warp_def $f, $4, 5, AZALEA_TOWN
warp_def $f, $5, 5, AZALEA_TOWN
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 2
- signpost 13, 3, SIGNPOST_READ, AzaleaGymStatue
- signpost 13, 6, SIGNPOST_READ, AzaleaGymStatue
+ bg_event 13, 3, BGEVENT_READ, AzaleaGymStatue
+ bg_event 13, 6, BGEVENT_READ, AzaleaGymStatue
-.PersonEvents:
+.ObjectEvents:
db 7
- person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
- person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1
- person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherAl, -1
- person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1
- person_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1
- person_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1
- person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1
+ object_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
+ object_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1
+ object_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherAl, -1
+ object_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1
+ object_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1
+ object_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1
+ object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1