diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-28 02:00:02 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-28 02:00:02 +0800 |
| commit | 6e570a107f6425068902e4ad077ab8c7b6e15ed3 (patch) | |
| tree | 1c6063b3578146df4807ca336dd9802a6f27b771 /asm/battle_1.s | |
| parent | 9260240931d7584a8a2007f0f24a33ba9d82140c (diff) | |
| parent | c27f8d2d9ee63deaf9de9f7c3689e072400ab5c3 (diff) | |
Merge branch 'decompress' into misc
Diffstat (limited to 'asm/battle_1.s')
| -rw-r--r-- | asm/battle_1.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index 753d31a20..310d1a791 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -1197,7 +1197,7 @@ sub_800FAE0: @ 800FAE0 ldr r0, _0800FB8C @ =gBattle_BG2_Y strh r1, [r0] ldr r0, _0800FB90 @ =gUnknown_8248318 - bl sub_800F034 + bl LoadCompressedSpriteSheetUsingHeap b _0800FC26 .align 2, 0 _0800FB64: .4byte gBattleTypeFlags |