diff options
| author | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
| commit | a2242e1b9d95dcaf21ecdb5ae27a497c6ee6c27a (patch) | |
| tree | a30798efa48b616dc655387ba8f3c1cdd8afd466 /maps/MahoganyGym.asm | |
| parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
| parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) | |
Merge branch 'sprites'
Diffstat (limited to 'maps/MahoganyGym.asm')
| -rw-r--r-- | maps/MahoganyGym.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 8b9895269..ed98ad765 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -6,7 +6,7 @@ MahoganyGym_MapScriptHeader: ; 0x199a9c db 0 ; 0x199a9e -UnknownScript_0x199a9e: ; 0x199a9e +PryceScript_0x199a9e: ; 0x199a9e faceplayer loadfont checkbit1 $04c3 @@ -450,12 +450,12 @@ MahoganyGym_MapEventHeader: ; 0x19a2df ; people-events db 7 - person_event $18, 7, 9, $6, $0, 255, 255, $b0, 0, UnknownScript_0x199a9e, $ffff - person_event $2a, 10, 8, $6, $0, 255, 255, $82, 1, TrainerSkierRoxanne, $ffff - person_event $2c, 21, 4, $7, $0, 255, 255, $92, 1, TrainerBoarderRonald, $ffff - person_event $2a, 21, 13, $7, $0, 255, 255, $82, 1, TrainerSkierClarissa, $ffff - person_event $2c, 13, 9, $6, $0, 255, 255, $92, 1, TrainerBoarderBrad, $ffff - person_event $2c, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, $ffff - person_event $48, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, $ffff + person_event SPRITE_PRYCE, 7, 9, $6, $0, 255, 255, $b0, 0, PryceScript_0x199a9e, $ffff + person_event SPRITE_BUENA, 10, 8, $6, $0, 255, 255, $82, 1, TrainerSkierRoxanne, $ffff + person_event SPRITE_ROCKER, 21, 4, $7, $0, 255, 255, $92, 1, TrainerBoarderRonald, $ffff + person_event SPRITE_BUENA, 21, 13, $7, $0, 255, 255, $82, 1, TrainerSkierClarissa, $ffff + person_event SPRITE_ROCKER, 13, 9, $6, $0, 255, 255, $92, 1, TrainerBoarderBrad, $ffff + person_event SPRITE_ROCKER, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, $ffff + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, $ffff ; 0x19a354 |