summaryrefslogtreecommitdiff
path: root/maps/Route8.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-07-16 18:10:10 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-07-16 18:10:10 -0400
commit894955f9d922de5fc33e6c0aa7af9795dbcbc158 (patch)
tree67dd99bdc03ba493937ed00876d5cd0229a83369 /maps/Route8.asm
parent7054bfe71718d5b327bbd3725c82d2431c7fcfb1 (diff)
Special script annotation, trainer constant enumeration, person-event structure update
Diffstat (limited to 'maps/Route8.asm')
-rw-r--r--maps/Route8.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route8.asm b/maps/Route8.asm
index c0bf7e8a2..377aa8f58 100644
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -258,14 +258,14 @@ Route8_MapEventHeader:
; signposts
db 2
- signpost 7, 11, $0, MapRoute8Signpost0Script
- signpost 5, 10, $0, MapRoute8Signpost1Script
+ signpost 7, 11, SIGNPOST_READ, MapRoute8Signpost0Script
+ signpost 5, 10, SIGNPOST_READ, MapRoute8Signpost1Script
; people-events
db 6
- person_event SPRITE_BIKER, 12, 14, $8, $0, 255, 255, $82, 5, TrainerBikerDwayne, -1
- person_event SPRITE_BIKER, 13, 14, $8, $0, 255, 255, $a2, 5, TrainerBikerHarris, -1
- person_event SPRITE_BIKER, 14, 14, $8, $0, 255, 255, $92, 5, TrainerBikerZeke, -1
- person_event SPRITE_SUPER_NERD, 6, 27, $6, $0, 255, 255, $b2, 3, TrainerSupernerdSam, -1
- person_event SPRITE_SUPER_NERD, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, -1
- person_event SPRITE_FRUIT_TREE, 9, 37, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x6c06c, -1
+ person_event SPRITE_BIKER, 12, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerBikerDwayne, -1
+ person_event SPRITE_BIKER, 13, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 5, TrainerBikerHarris, -1
+ person_event SPRITE_BIKER, 14, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerBikerZeke, -1
+ person_event SPRITE_SUPER_NERD, 6, 27, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerSupernerdSam, -1
+ person_event SPRITE_SUPER_NERD, 16, 35, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 4, TrainerSupernerdTom, -1
+ person_event SPRITE_FRUIT_TREE, 9, 37, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x6c06c, -1