summaryrefslogtreecommitdiff
path: root/maps/EcruteakCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/EcruteakCity.asm')
-rw-r--r--maps/EcruteakCity.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm
index d7cbf3234..ce7d15d97 100644
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -280,21 +280,21 @@ EcruteakCity_MapEventHeader:
; signposts
db 8
- signpost 21, 15, $0, EcruteakCitySign
- signpost 10, 38, $0, TinTowerSign
- signpost 28, 8, $0, EcruteakGymSign
- signpost 21, 21, $0, EcruteakDanceTheaterSign
- signpost 10, 2, $0, BurnedTowerSign
- signpost 27, 24, $0, EcruteakCityPokeCenterSign
- signpost 21, 30, $0, EcruteakCityMartSign
- signpost 14, 23, $7, MapEcruteakCitySignpostItem7
+ signpost 21, 15, SIGNPOST_READ, EcruteakCitySign
+ signpost 10, 38, SIGNPOST_READ, TinTowerSign
+ signpost 28, 8, SIGNPOST_READ, EcruteakGymSign
+ signpost 21, 21, SIGNPOST_READ, EcruteakDanceTheaterSign
+ signpost 10, 2, SIGNPOST_READ, BurnedTowerSign
+ signpost 27, 24, SIGNPOST_READ, EcruteakCityPokeCenterSign
+ signpost 21, 30, SIGNPOST_READ, EcruteakCityMartSign
+ signpost 14, 23, SIGNPOST_ITEMIFSET, MapEcruteakCitySignpostItem7
; people-events
db 7
- person_event SPRITE_GRAMPS, 19, 22, $2, $11, 255, 255, $0, 0, GrampsScript_0x1a4009, -1
- person_event SPRITE_GRAMPS, 25, 24, $3, $0, 255, 255, $0, 0, GrampsScript_0x1a400c, -1
- person_event SPRITE_LASS, 33, 25, $5, $2, 255, 255, $90, 0, LassScript_0x1a4012, -1
- person_event SPRITE_LASS, 13, 7, $7, $0, 255, 255, $0, 0, LassScript_0x1a4015, -1
- person_event SPRITE_FISHER, 26, 13, $5, $1, 255, 255, $a0, 0, FisherScript_0x1a4029, -1
- person_event SPRITE_YOUNGSTER, 18, 14, $2, $11, 255, 255, $80, 0, YoungsterScript_0x1a403d, -1
- person_event SPRITE_GRAMPS, 11, 7, $2, $11, 255, 255, $a0, 0, GrampsScript_0x1a400f, EVENT_7A9
+ person_event SPRITE_GRAMPS, 19, 22, DOWN << 2 | $2, $11, -1, -1, $0, 0, GrampsScript_0x1a4009, -1
+ person_event SPRITE_GRAMPS, 25, 24, DOWN << 2 | $3, $0, -1, -1, $0, 0, GrampsScript_0x1a400c, -1
+ person_event SPRITE_LASS, 33, 25, UP << 2 | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x1a4012, -1
+ person_event SPRITE_LASS, 13, 7, UP << 2 | $3, $0, -1, -1, $0, 0, LassScript_0x1a4015, -1
+ person_event SPRITE_FISHER, 26, 13, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a4029, -1
+ person_event SPRITE_YOUNGSTER, 18, 14, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x1a403d, -1
+ person_event SPRITE_GRAMPS, 11, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x1a400f, EVENT_7A9