diff options
Diffstat (limited to 'maps/CeladonMansion1F.asm')
| -rw-r--r-- | maps/CeladonMansion1F.asm | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index d27e7db89..f7d0836d0 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -1,10 +1,9 @@ -CeladonMansion1F_MapScriptHeader: ; 0x713ed - ; trigger count +CeladonMansion1F_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x713ef CeladonMansionManager: jumptextfaceplayer CeladonMansionManagerText @@ -69,11 +68,11 @@ CeladonMansionManagersSuiteSignText: line "MANAGER'S SUITE" done -CeladonMansion1F_MapEventHeader: ; 0x714cc +CeladonMansion1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $9, $6, 2, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $9, $7, 2, GROUP_CELADON_CITY, MAP_CELADON_CITY @@ -81,18 +80,18 @@ CeladonMansion1F_MapEventHeader: ; 0x714cc warp_def $0, $0, 1, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F warp_def $0, $7, 4, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 8, 5, $1, CeladonMansionManagersSuiteSign - signpost 3, 0, $0, CeladonMansion1fBookshelf - signpost 3, 2, $0, CeladonMansion1fBookshelf + signpost 8, 5, SIGNPOST_UP, CeladonMansionManagersSuiteSign + signpost 3, 0, SIGNPOST_READ, CeladonMansion1fBookshelf + signpost 3, 2, SIGNPOST_READ, CeladonMansion1fBookshelf - ; people-events +.PersonEvents: db 4 - person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, CeladonMansionManager, $ffff - person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, CeladonMansion1FMeowth, $ffff - person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, CeladonMansion1FClefairy, $ffff - person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, CeladonMansion1FNidoranF, $ffff + person_event SPRITE_GRANNY, 9, 5, OW_DOWN | $3, $0, -1, -1, $0, 0, CeladonMansionManager, -1 + person_event SPRITE_GROWLITHE, 10, 6, OW_UP | $12, $0, -1, -1, $0, 0, CeladonMansion1FMeowth, -1 + person_event SPRITE_CLEFAIRY, 8, 7, OW_UP | $12, $0, -1, -1, $0, 0, CeladonMansion1FClefairy, -1 + person_event SPRITE_GROWLITHE, 8, 8, OW_UP | $12, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeladonMansion1FNidoranF, -1 |