diff options
Diffstat (limited to 'maps/ElmsHouse.asm')
| -rw-r--r-- | maps/ElmsHouse.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 17d3c91fa..ff0c971a7 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -1,8 +1,8 @@ ElmsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ElmsWife: @@ -83,21 +83,21 @@ ElmsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN warp_def $7, $3, 4, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 1, 0, $0, ElmsHousePC - signpost 1, 6, $0, ElmsHouseBookshelf - signpost 1, 7, $0, ElmsHouseBookshelf + signpost 1, 0, SIGNPOST_READ, ElmsHousePC + signpost 1, 6, SIGNPOST_READ, ElmsHouseBookshelf + signpost 1, 7, SIGNPOST_READ, ElmsHouseBookshelf - ; people-events +.PersonEvents: db 2 - person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, ElmsWife, $ffff - person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, ElmsSon, $ffff + person_event SPRITE_TEACHER, 9, 5, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ElmsWife, -1 + person_event SPRITE_BUG_CATCHER, 8, 9, OW_UP | $3, $0, -1, -1, $0, 0, ElmsSon, -1 |