diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-02-10 19:08:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-10 19:08:27 -0800 |
| commit | b281e6f6b685045960a5deba2244d13a1963a9b6 (patch) | |
| tree | 04816e5a26540fd5cd99061d6911c6fc3360574c /asm/ghost.s | |
| parent | 6eaadfc62e89a25c2de674aebf69f077c491580f (diff) | |
| parent | c59acc702458caa610ce856ce20ac6dc12d16621 (diff) | |
Merge pull request #567 from huderlem/anim
Start documenting battle anims
Diffstat (limited to 'asm/ghost.s')
| -rw-r--r-- | asm/ghost.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/ghost.s b/asm/ghost.s index 2934f6dbd..928d940b5 100644 --- a/asm/ghost.s +++ b/asm/ghost.s @@ -3257,7 +3257,7 @@ sub_80DF49C: @ 80DF49C movs r2, 0x4 orrs r1, r2 strb r1, [r3] - ldr r2, _080DF4E0 @ =gObjectBankIDs + ldr r2, _080DF4E0 @ =gBankSpriteIds ldr r1, _080DF4E4 @ =gAnimBankAttacker ldrb r1, [r1] adds r1, r2 @@ -3286,7 +3286,7 @@ sub_80DF49C: @ 80DF49C strh r1, [r0, 0x22] bx lr .align 2, 0 -_080DF4E0: .4byte gObjectBankIDs +_080DF4E0: .4byte gBankSpriteIds _080DF4E4: .4byte gAnimBankAttacker _080DF4E8: .4byte gBattleAnimArgs _080DF4EC: .4byte sub_80DF4F4 |