summaryrefslogtreecommitdiff
path: root/maps/TinTower4F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/TinTower4F.asm')
-rw-r--r--maps/TinTower4F.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm
index 5abc17a22..e04404c5d 100644
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -4,7 +4,7 @@ const_value set 2
const TINTOWER4F_POKE_BALL3
TinTower4F_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
@@ -34,15 +34,15 @@ TinTower4F_MapEventHeader:
warp_def $e, $2, 3, TIN_TOWER_5F
warp_def $f, $11, 4, TIN_TOWER_5F
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 1
- signpost 6, 11, SIGNPOST_ITEM, TinTower4FHiddenMaxPotion
+ bg_event 6, 11, BGEVENT_ITEM, TinTower4FHiddenMaxPotion
-.PersonEvents:
+.ObjectEvents:
db 3
- person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL
- person_event SPRITE_POKE_BALL, 14, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP
- person_event SPRITE_POKE_BALL, 12, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
+ object_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL
+ object_event SPRITE_POKE_BALL, 14, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP
+ object_event SPRITE_POKE_BALL, 12, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE