summaryrefslogtreecommitdiff
path: root/maps/VioletCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/VioletCity.asm')
-rw-r--r--maps/VioletCity.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index 2b238af6b..38c13a4df 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -292,21 +292,21 @@ VioletCity_MapEventHeader:
; signposts
db 7
- signpost 20, 24, $0, VioletCitySign
- signpost 17, 15, $0, VioletGymSign
- signpost 8, 24, $0, SproutTowerSign
- signpost 17, 27, $0, EarlsPokemonAcademySign
- signpost 25, 32, $0, VioletCityPokeCenterSign
- signpost 17, 10, $0, VioletCityMartSign
- signpost 14, 37, $7, MapVioletCitySignpostItem6
+ signpost 20, 24, SIGNPOST_READ, VioletCitySign
+ signpost 17, 15, SIGNPOST_READ, VioletGymSign
+ signpost 8, 24, SIGNPOST_READ, SproutTowerSign
+ signpost 17, 27, SIGNPOST_READ, EarlsPokemonAcademySign
+ signpost 25, 32, SIGNPOST_READ, VioletCityPokeCenterSign
+ signpost 17, 10, SIGNPOST_READ, VioletCityMartSign
+ signpost 14, 37, SIGNPOST_ITEMIFSET, MapVioletCitySignpostItem6
; people-events
db 8
- person_event SPRITE_FISHER, 20, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x1a83bb, EVENT_6CA
- person_event SPRITE_LASS, 32, 32, $2, $22, 255, 255, $a0, 0, LassScript_0x1a8403, -1
- person_event SPRITE_SUPER_NERD, 18, 28, $2, $21, 255, 255, $80, 0, SuperNerdScript_0x1a8406, -1
- person_event SPRITE_GRAMPS, 24, 21, $5, $1, 255, 255, $0, 0, GrampsScript_0x1a8409, -1
- person_event SPRITE_YOUNGSTER, 22, 9, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x1a840c, -1
- person_event SPRITE_FRUIT_TREE, 33, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8425, -1
- person_event SPRITE_POKE_BALL, 5, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8421, EVENT_643
- person_event SPRITE_POKE_BALL, 9, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8423, EVENT_644
+ person_event SPRITE_FISHER, 20, 17, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a83bb, EVENT_6CA
+ person_event SPRITE_LASS, 32, 32, DOWN << 2 | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x1a8403, -1
+ person_event SPRITE_SUPER_NERD, 18, 28, DOWN << 2 | $2, $21, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a8406, -1
+ person_event SPRITE_GRAMPS, 24, 21, UP << 2 | $1, $1, -1, -1, $0, 0, GrampsScript_0x1a8409, -1
+ person_event SPRITE_YOUNGSTER, 22, 9, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a840c, -1
+ person_event SPRITE_FRUIT_TREE, 33, 18, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8425, -1
+ person_event SPRITE_POKE_BALL, 5, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a8421, EVENT_643
+ person_event SPRITE_POKE_BALL, 9, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a8423, EVENT_644