summaryrefslogtreecommitdiff
path: root/maps/CeruleanCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeruleanCity.asm')
-rw-r--r--maps/CeruleanCity.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index 24d67e23e..3a60b2230 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -288,21 +288,21 @@ CeruleanCity_MapEventHeader:
; signposts
db 9
- signpost 23, 23, $0, CeruleanCitySign
- signpost 25, 27, $0, CeruleanGymSign
- signpost 29, 11, $0, CeruleanBikeShopSign
- signpost 17, 25, $0, CeruleanPoliceSign
- signpost 7, 23, $0, CeruleanCapeSign
- signpost 29, 14, $0, CeruleanLockedDoor
- signpost 21, 20, $0, CeruleanCityPokeCenterSign
- signpost 29, 26, $0, CeruleanCityMartSign
- signpost 12, 2, $7, MapCeruleanCitySignpostItem8
+ signpost 23, 23, SIGNPOST_READ, CeruleanCitySign
+ signpost 25, 27, SIGNPOST_READ, CeruleanGymSign
+ signpost 29, 11, SIGNPOST_READ, CeruleanBikeShopSign
+ signpost 17, 25, SIGNPOST_READ, CeruleanPoliceSign
+ signpost 7, 23, SIGNPOST_READ, CeruleanCapeSign
+ signpost 29, 14, SIGNPOST_READ, CeruleanLockedDoor
+ signpost 21, 20, SIGNPOST_READ, CeruleanCityPokeCenterSign
+ signpost 29, 26, SIGNPOST_READ, CeruleanCityMartSign
+ signpost 12, 2, SIGNPOST_ITEMIFSET, MapCeruleanCitySignpostItem8
; people-events
db 6
- person_event SPRITE_COOLTRAINER_M, 27, 19, $2, $22, 255, 255, $90, 0, CooltrainerMScript_0x184009, -1
- person_event SPRITE_SUPER_NERD, 19, 27, $2, $11, 255, 255, $90, 0, SuperNerdScript_0x18401d, -1
- person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, CeruleanCitySlowbro, -1
- person_event SPRITE_COOLTRAINER_F, 28, 25, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x18402a, -1
- person_event SPRITE_FISHER, 30, 34, $5, $1, 255, 255, $80, 0, FisherScript_0x18404a, -1
- person_event SPRITE_YOUNGSTER, 16, 10, $3, $1, 255, 255, $80, 0, YoungsterScript_0x184064, -1
+ person_event SPRITE_COOLTRAINER_M, 27, 19, DOWN << 2 | $2, $22, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CooltrainerMScript_0x184009, -1
+ person_event SPRITE_SUPER_NERD, 19, 27, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x18401d, -1
+ person_event SPRITE_SLOWPOKE, 28, 24, DOWN << 2 | $1, $0, -1, -1, $0, 0, CeruleanCitySlowbro, -1
+ person_event SPRITE_COOLTRAINER_F, 28, 25, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x18402a, -1
+ person_event SPRITE_FISHER, 30, 34, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x18404a, -1
+ person_event SPRITE_YOUNGSTER, 16, 10, DOWN << 2 | $3, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x184064, -1