diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-12 15:16:23 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-12 15:16:23 -0500 |
| commit | 1cb19a03a3c57c85d27495f95483b30ae37f0976 (patch) | |
| tree | 0f798841fdf32e9ee4fdee93fb0b43d8cb73fa5b /maps/CeladonGym.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/CeladonGym.asm')
| -rw-r--r-- | maps/CeladonGym.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 857b09dba..20fffeacf 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -6,7 +6,7 @@ CeladonGym_MapScriptHeader: ; 0x72a68 db 0 ; 0x72a6a -UnknownScript_0x72a6a: ; 0x72a6a +ErikaScript_0x72a6a: ; 0x72a6a faceplayer loadfont checkbit2 $0026 @@ -356,11 +356,11 @@ CeladonGym_MapEventHeader: ; 0x72fdf ; people-events db 6 - person_event $20, 7, 9, $6, $0, 255, 255, $a0, 0, UnknownScript_0x72a6a, $ffff - person_event $28, 12, 11, $8, $0, 255, 255, $92, 2, TrainerLassMichelle, $ffff - person_event $28, 12, 6, $9, $0, 255, 255, $a2, 2, TrainerPicnickerTanya, $ffff - person_event $2a, 9, 7, $9, $0, 255, 255, $92, 2, TrainerBeautyJulia, $ffff - person_event $26, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, $ffff - person_event $26, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, $ffff + person_event SPRITE_ERIKA, 7, 9, $6, $0, 255, 255, $a0, 0, ErikaScript_0x72a6a, $ffff + person_event SPRITE_LASS, 12, 11, $8, $0, 255, 255, $92, 2, TrainerLassMichelle, $ffff + person_event SPRITE_LASS, 12, 6, $9, $0, 255, 255, $a2, 2, TrainerPicnickerTanya, $ffff + person_event SPRITE_BUENA, 9, 7, $9, $0, 255, 255, $92, 2, TrainerBeautyJulia, $ffff + person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, $ffff + person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, $ffff ; 0x73047 |