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/FightingDojo.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
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 |