summaryrefslogtreecommitdiff
path: root/maps/AzaleaGym.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/AzaleaGym.asm
parent7054bfe71718d5b327bbd3725c82d2431c7fcfb1 (diff)
Special script annotation, trainer constant enumeration, person-event structure update
Diffstat (limited to 'maps/AzaleaGym.asm')
-rw-r--r--maps/AzaleaGym.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index df0034df8..f1f78ba9a 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -446,15 +446,15 @@ AzaleaGym_MapEventHeader:
; signposts
db 2
- signpost 13, 3, $0, AzaleaGymStatue
- signpost 13, 6, $0, AzaleaGymStatue
+ signpost 13, 3, SIGNPOST_READ, AzaleaGymStatue
+ signpost 13, 6, SIGNPOST_READ, AzaleaGymStatue
; people-events
db 7
- person_event SPRITE_BUGSY, 11, 9, $3, $0, 255, 255, $a0, 0, BugsyScript_0x18ec1e, -1
- person_event SPRITE_BUG_CATCHER, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, -1
- person_event SPRITE_BUG_CATCHER, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, -1
- person_event SPRITE_BUG_CATCHER, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, -1
- person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, -1
- person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, -1
- person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, -1
+ person_event SPRITE_BUGSY, 11, 9, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugsyScript_0x18ec1e, -1
+ person_event SPRITE_BUG_CATCHER, 7, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherBug_catcher_benny, -1
+ person_event SPRITE_BUG_CATCHER, 12, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherAl, -1
+ person_event SPRITE_BUG_CATCHER, 6, 4, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherJosh, -1
+ person_event SPRITE_TWIN, 14, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay1, -1
+ person_event SPRITE_TWIN, 14, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay2, -1
+ person_event SPRITE_GYM_GUY, 17, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, AzaleaGymGuyScript, -1