diff options
Diffstat (limited to 'maps/MrFujisHouse.asm')
| -rw-r--r-- | maps/MrFujisHouse.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 7923cc77c..ad6fd7526 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -1,8 +1,8 @@ MrFujisHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SuperNerdScript_0x7e8ca: @@ -76,23 +76,23 @@ MrFujisHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $3, 2, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, MrFujisHouseBookshelf - signpost 1, 1, $0, MrFujisHouseBookshelf + signpost 1, 0, SIGNPOST_READ, MrFujisHouseBookshelf + signpost 1, 1, SIGNPOST_READ, MrFujisHouseBookshelf - ; people-events +.PersonEvents: db 5 - person_event SPRITE_SUPER_NERD, 5, 8, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x7e8ca, -1 - person_event SPRITE_LASS, 8, 7, $2, $11, 255, 255, $0, 0, LassScript_0x7e8cd, -1 - person_event SPRITE_RHYDON, 8, 11, $16, $0, 255, 255, $0, 0, MrFujisPsyduck, -1 - person_event SPRITE_GROWLITHE, 9, 9, $16, $0, 255, 255, $90, 0, MrFujisNidorino, -1 - person_event SPRITE_MOLTRES, 7, 5, $16, $0, 255, 255, $b0, 0, MrFujisPidgey, -1 + person_event SPRITE_SUPER_NERD, 5, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x7e8ca, -1 + person_event SPRITE_LASS, 8, 7, OW_DOWN | $2, $11, -1, -1, $0, 0, LassScript_0x7e8cd, -1 + person_event SPRITE_RHYDON, 8, 11, OW_UP | $12, $0, -1, -1, $0, 0, MrFujisPsyduck, -1 + person_event SPRITE_GROWLITHE, 9, 9, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, MrFujisNidorino, -1 + person_event SPRITE_MOLTRES, 7, 5, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MrFujisPidgey, -1 |