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/FightingDojo.asm | |
parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) |
Merge branch 'sprites'
Diffstat (limited to 'maps/FightingDojo.asm')
-rw-r--r-- | maps/FightingDojo.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 2d2380a53..bc3f9b151 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -6,7 +6,7 @@ FightingDojo_MapScriptHeader: ; 0x189b5f db 0 ; 0x189b61 -UnknownScript_0x189b61: ; 0x189b61 +BlackBeltScript_0x189b61: ; 0x189b61 jumptextfaceplayer UnknownText_0x189b6c ; 0x189b64 @@ -60,7 +60,7 @@ FightingDojo_MapEventHeader: ; 0x189bf8 ; people-events db 2 - person_event $41, 8, 8, $6, $0, 255, 255, $90, 0, UnknownScript_0x189b61, $ffff - person_event $54, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x189b6a, $077d + person_event SPRITE_BLACK_BELT, 8, 8, $6, $0, 255, 255, $90, 0, BlackBeltScript_0x189b61, $ffff + person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x189b6a, $077d ; 0x189c2c |