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/PewterGym.asm | |
| parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
| parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) | |
Merge branch 'sprites'
Diffstat (limited to 'maps/PewterGym.asm')
| -rw-r--r-- | maps/PewterGym.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index fd85cbecf..608c6886c 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -6,7 +6,7 @@ PewterGym_MapScriptHeader: ; 0x1a2862 db 0 ; 0x1a2864 -UnknownScript_0x1a2864: ; 0x1a2864 +BrockScript_0x1a2864: ; 0x1a2864 faceplayer loadfont checkbit2 $0023 @@ -221,8 +221,8 @@ PewterGym_MapEventHeader: ; 0x1a2d88 ; people-events db 3 - person_event $1a, 5, 9, $6, $0, 255, 255, $b0, 0, UnknownScript_0x1a2864, $ffff - person_event $27, 9, 6, $9, $0, 255, 255, $a2, 3, TrainerCamperJerry, $ffff - person_event $48, 15, 10, $6, $0, 255, 255, $90, 1, PewterGymGuyScript, $ffff + person_event SPRITE_BROCK, 5, 9, $6, $0, 255, 255, $b0, 0, BrockScript_0x1a2864, $ffff + person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $a2, 3, TrainerCamperJerry, $ffff + person_event SPRITE_GYM_GUY, 15, 10, $6, $0, 255, 255, $90, 1, PewterGymGuyScript, $ffff ; 0x1a2dc9 |