summaryrefslogtreecommitdiff
path: root/maps/Route6.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/Route6.asm
parent7054bfe71718d5b327bbd3725c82d2431c7fcfb1 (diff)
Special script annotation, trainer constant enumeration, person-event structure update
Diffstat (limited to 'maps/Route6.asm')
-rw-r--r--maps/Route6.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route6.asm b/maps/Route6.asm
index 0b6787dd5..86be6b7d9 100644
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -132,10 +132,10 @@ Route6_MapEventHeader:
; signposts
db 1
- signpost 5, 19, $0, MapRoute6Signpost0Script
+ signpost 5, 19, SIGNPOST_READ, MapRoute6Signpost0Script
; people-events
db 3
- person_event SPRITE_POKEFAN_M, 8, 21, $6, $0, 255, 255, $b0, 2, PokefanMScript_0x1ad951, EVENT_771
- person_event SPRITE_POKEFAN_M, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, -1
- person_event SPRITE_POKEFAN_M, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, -1
+ person_event SPRITE_POKEFAN_M, 8, 21, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 2, PokefanMScript_0x1ad951, EVENT_771
+ person_event SPRITE_POKEFAN_M, 16, 13, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerPokefanmRex, -1
+ person_event SPRITE_POKEFAN_M, 16, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerPokefanmAllan, -1