diff options
Diffstat (limited to 'maps/OlivinePunishmentSpeechHouse.asm')
| -rw-r--r-- | maps/OlivinePunishmentSpeechHouse.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index 8628ef005..9d9c784e1 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -1,8 +1,8 @@ OlivinePunishmentSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OlivinePunishmentSpeechHouseDad: @@ -39,20 +39,20 @@ OlivinePunishmentSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $3, 5, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, OlivinePunishmentSpeechHouseBookshelf1 - signpost 1, 1, $0, OlivinePunishmentSpeechHouseBookshelf2 + signpost 1, 0, SIGNPOST_READ, OlivinePunishmentSpeechHouseBookshelf1 + signpost 1, 1, SIGNPOST_READ, OlivinePunishmentSpeechHouseBookshelf2 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_POKEFAN_M, 6, 5, $3, $0, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDad, -1 - person_event SPRITE_LASS, 9, 9, $5, $2, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDaughter, -1 + person_event SPRITE_POKEFAN_M, 6, 5, OW_DOWN | $3, $0, -1, -1, $0, 0, OlivinePunishmentSpeechHouseDad, -1 + person_event SPRITE_LASS, 9, 9, OW_UP | $1, $2, -1, -1, $0, 0, OlivinePunishmentSpeechHouseDaughter, -1 |