summaryrefslogtreecommitdiff
path: root/maps/ElmsHouse.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 13:46:34 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 14:33:17 -0500
commitc05b7f41dd5783315e9e4032b63ca84c6ed05893 (patch)
tree0c1995c8a928a297f842a75c2e009003534b3ec8 /maps/ElmsHouse.asm
parent20d6c1d876cde19061c458761c7283163e316d8a (diff)
Renaming: (fix #412)
- MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
Diffstat (limited to 'maps/ElmsHouse.asm')
-rw-r--r--maps/ElmsHouse.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm
index dbd8d270a..c8dcb1b29 100644
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -3,7 +3,7 @@ const_value set 2
const ELMSHOUSE_ELMS_SON
ElmsHouse_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
@@ -92,16 +92,16 @@ ElmsHouse_MapEventHeader:
warp_def $7, $2, 4, NEW_BARK_TOWN
warp_def $7, $3, 4, NEW_BARK_TOWN
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 3
- signpost 1, 0, SIGNPOST_READ, ElmsHousePC
- signpost 1, 6, SIGNPOST_READ, ElmsHouseBookshelf
- signpost 1, 7, SIGNPOST_READ, ElmsHouseBookshelf
+ bg_event 1, 0, BGEVENT_READ, ElmsHousePC
+ bg_event 1, 6, BGEVENT_READ, ElmsHouseBookshelf
+ bg_event 1, 7, BGEVENT_READ, ElmsHouseBookshelf
-.PersonEvents:
+.ObjectEvents:
db 2
- person_event SPRITE_TEACHER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ElmsWife, -1
- person_event SPRITE_BUG_CATCHER, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ElmsSon, -1
+ object_event SPRITE_TEACHER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1
+ object_event SPRITE_BUG_CATCHER, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1