summaryrefslogtreecommitdiff
path: root/maps/DanceTheatre.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/DanceTheatre.asm')
-rw-r--r--maps/DanceTheatre.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm
index 0f1e99069..ae6732323 100644
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -420,17 +420,17 @@ DanceTheatre_MapEventHeader:
; signposts
db 2
- signpost 6, 5, $1, MapDanceTheatreSignpost1Script
- signpost 6, 6, $1, MapDanceTheatreSignpost1Script
+ signpost 6, 5, SIGNPOST_UP, MapDanceTheatreSignpost1Script
+ signpost 6, 6, SIGNPOST_UP, MapDanceTheatreSignpost1Script
; people-events
db 9
- person_event SPRITE_KIMONO_GIRL, 6, 4, $1e, $0, 255, 255, $a2, 0, TrainerKimono_girlNaoko2, -1
- person_event SPRITE_KIMONO_GIRL, 5, 6, $a, $0, 255, 255, $92, 0, TrainerKimono_girlSayo, -1
- person_event SPRITE_KIMONO_GIRL, 6, 10, $3, $0, 255, 255, $82, 0, TrainerKimono_girlZuki, -1
- person_event SPRITE_KIMONO_GIRL, 5, 13, $a, $0, 255, 255, $92, 0, TrainerKimono_girlKuni, -1
- person_event SPRITE_KIMONO_GIRL, 6, 15, $1f, $0, 255, 255, $a2, 0, TrainerKimono_girlMiki, -1
- person_event SPRITE_GENTLEMAN, 14, 11, $7, $0, 255, 255, $0, 0, GentlemanScript_0x994c6, -1
- person_event SPRITE_RHYDON, 12, 10, $16, $0, 255, 255, $90, 0, RhydonScript_0x9951b, -1
- person_event SPRITE_COOLTRAINER_M, 14, 14, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x99525, -1
- person_event SPRITE_GRANNY, 10, 7, $7, $0, 255, 255, $0, 0, GrannyScript_0x99528, -1
+ person_event SPRITE_KIMONO_GIRL, 6, 4, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerKimono_girlNaoko2, -1
+ person_event SPRITE_KIMONO_GIRL, 5, 6, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerKimono_girlSayo, -1
+ person_event SPRITE_KIMONO_GIRL, 6, 10, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerKimono_girlZuki, -1
+ person_event SPRITE_KIMONO_GIRL, 5, 13, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerKimono_girlKuni, -1
+ person_event SPRITE_KIMONO_GIRL, 6, 15, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerKimono_girlMiki, -1
+ person_event SPRITE_GENTLEMAN, 14, 11, UP << 2 | $3, $0, -1, -1, $0, 0, GentlemanScript_0x994c6, -1
+ person_event SPRITE_RHYDON, 12, 10, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, RhydonScript_0x9951b, -1
+ person_event SPRITE_COOLTRAINER_M, 14, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x99525, -1
+ person_event SPRITE_GRANNY, 10, 7, UP << 2 | $3, $0, -1, -1, $0, 0, GrannyScript_0x99528, -1