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/Route40BattleTowerGate.asm | |
parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) |
Merge branch 'sprites'
Diffstat (limited to 'maps/Route40BattleTowerGate.asm')
-rw-r--r-- | maps/Route40BattleTowerGate.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 720f3f903..6ea576cbd 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -15,11 +15,11 @@ UnknownScript_0x9f665: ; 0x9f665 return ; 0x9f669 -UnknownScript_0x9f669: ; 0x9f669 +RockerScript_0x9f669: ; 0x9f669 jumptextfaceplayer UnknownText_0x9f716 ; 0x9f66c -UnknownScript_0x9f66c: ; 0x9f66c +TwinScript_0x9f66c: ; 0x9f66c jumptextfaceplayer UnknownText_0x9f7c8 ; 0x9f66f @@ -84,7 +84,7 @@ Route40BattleTowerGate_MapEventHeader: ; 0x9f81e ; people-events db 2 - person_event $2c, 7, 7, $3, $0, 255, 255, $a0, 0, UnknownScript_0x9f669, $07cf - person_event $26, 9, 11, $4, $10, 255, 255, $80, 0, UnknownScript_0x9f66c, $ffff + person_event SPRITE_ROCKER, 7, 7, $3, $0, 255, 255, $a0, 0, RockerScript_0x9f669, $07cf + person_event SPRITE_TWIN, 9, 11, $4, $10, 255, 255, $80, 0, TwinScript_0x9f66c, $ffff ; 0x9f852 |