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/AzaleaGym.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/AzaleaGym.asm')
| -rw-r--r-- | maps/AzaleaGym.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index eec4cb56b..73bb27e3c 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -6,7 +6,7 @@ AzaleaGym_MapScriptHeader: ; 0x18ec1c db 0 ; 0x18ec1e -UnknownScript_0x18ec1e: ; 0x18ec1e +BugsyScript_0x18ec1e: ; 0x18ec1e faceplayer loadfont checkbit1 $04be @@ -443,13 +443,13 @@ AzaleaGym_MapEventHeader: ; 0x18f3cc ; people-events db 7 - person_event $14, 11, 9, $3, $0, 255, 255, $a0, 0, UnknownScript_0x18ec1e, $ffff - person_event $25, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, $ffff - person_event $25, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, $ffff - person_event $25, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, $ffff - person_event $26, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, $ffff - person_event $26, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, $ffff - person_event $48, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, $ffff + person_event SPRITE_BUGSY, 11, 9, $3, $0, 255, 255, $a0, 0, BugsyScript_0x18ec1e, $ffff + person_event SPRITE_BUG_CATCHER, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, $ffff + person_event SPRITE_BUG_CATCHER, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, $ffff + person_event SPRITE_BUG_CATCHER, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, $ffff + person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, $ffff + person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, $ffff + person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, $ffff ; 0x18f441 |