summaryrefslogtreecommitdiff
path: root/maps/Route33.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route33.asm')
-rw-r--r--maps/Route33.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route33.asm b/maps/Route33.asm
index 383f32e67..e92e0cbb1 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -4,7 +4,7 @@ const_value set 2
const ROUTE33_FRUIT_TREE
Route33_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
@@ -202,15 +202,15 @@ Route33_MapEventHeader:
db 1
warp_def $9, $b, 3, UNION_CAVE_1F
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 1
- signpost 11, 11, SIGNPOST_READ, Route33Sign
+ bg_event 11, 11, BGEVENT_READ, Route33Sign
-.PersonEvents:
+.ObjectEvents:
db 3
- person_event SPRITE_POKEFAN_M, 13, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerAnthony, -1
- person_event SPRITE_LASS, 16, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Route33LassScript, -1
- person_event SPRITE_FRUIT_TREE, 16, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route33FruitTreeScript, -1
+ object_event SPRITE_POKEFAN_M, 13, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1
+ object_event SPRITE_LASS, 16, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1
+ object_event SPRITE_FRUIT_TREE, 16, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1