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/SaffronGym.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/SaffronGym.asm')
| -rw-r--r-- | maps/SaffronGym.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 6efabb80f..f2ce9daa5 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -6,7 +6,7 @@ SaffronGym_MapScriptHeader: ; 0x189c2c db 0 ; 0x189c2e -UnknownScript_0x189c2e: ; 0x189c2e +SabrinaScript_0x189c2e: ; 0x189c2e faceplayer loadfont checkbit2 $0028 @@ -386,11 +386,11 @@ SaffronGym_MapEventHeader: ; 0x18a2c4 ; people-events db 6 - person_event $22, 12, 13, $6, $0, 255, 255, $80, 0, UnknownScript_0x189c2e, $ffff - person_event $30, 20, 21, $a, $0, 255, 255, $b2, 3, TrainerMediumRebecca, $ffff - person_event $27, 20, 7, $a, $0, 255, 255, $92, 3, TrainerPsychicFranklin, $ffff - person_event $30, 8, 7, $a, $0, 255, 255, $b2, 2, TrainerMediumDoris, $ffff - person_event $27, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, $ffff - person_event $48, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, $ffff + person_event SPRITE_SABRINA, 12, 13, $6, $0, 255, 255, $80, 0, SabrinaScript_0x189c2e, $ffff + person_event SPRITE_GRANNY, 20, 21, $a, $0, 255, 255, $b2, 3, TrainerMediumRebecca, $ffff + person_event SPRITE_YOUNGSTER, 20, 7, $a, $0, 255, 255, $92, 3, TrainerPsychicFranklin, $ffff + person_event SPRITE_GRANNY, 8, 7, $a, $0, 255, 255, $b2, 2, TrainerMediumDoris, $ffff + person_event SPRITE_YOUNGSTER, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, $ffff + person_event SPRITE_GYM_GUY, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, $ffff ; 0x18a3bd |