summaryrefslogtreecommitdiff
path: root/maps/CherrygroveCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CherrygroveCity.asm')
-rw-r--r--maps/CherrygroveCity.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index 1c0d24386..0429f25a8 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -563,15 +563,15 @@ CherrygroveCity_MapEventHeader:
; signposts
db 4
- signpost 8, 30, $0, CherrygroveCitySign
- signpost 9, 23, $0, GuideGentsHouseSign
- signpost 3, 24, $0, CherrygroveCityMartSign
- signpost 3, 30, $0, CherrygroveCityPokeCenterSign
+ signpost 8, 30, SIGNPOST_READ, CherrygroveCitySign
+ signpost 9, 23, SIGNPOST_READ, GuideGentsHouseSign
+ signpost 3, 24, SIGNPOST_READ, CherrygroveCityMartSign
+ signpost 3, 30, SIGNPOST_READ, CherrygroveCityPokeCenterSign
; people-events
db 5
- person_event SPRITE_GRAMPS, 10, 36, $6, $0, 255, 255, $0, 0, CherrygroveCityGuideGent, EVENT_6FE
- person_event SPRITE_SILVER, 10, 43, $3, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6BE
- person_event SPRITE_TEACHER, 16, 31, $5, $1, 255, 255, $90, 0, TeacherScript_0x19c146, -1
- person_event SPRITE_YOUNGSTER, 11, 27, $5, $1, 255, 255, $80, 0, YoungsterScript_0x19c15a, -1
- person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, MysticWaterGuy, -1
+ person_event SPRITE_GRAMPS, 10, 36, UP << 2 | $2, $0, -1, -1, $0, 0, CherrygroveCityGuideGent, EVENT_6FE
+ person_event SPRITE_SILVER, 10, 43, DOWN << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6BE
+ person_event SPRITE_TEACHER, 16, 31, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x19c146, -1
+ person_event SPRITE_YOUNGSTER, 11, 27, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x19c15a, -1
+ person_event SPRITE_FISHER, 16, 11, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, MysticWaterGuy, -1