diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
| commit | d2ed7674f499b1fd6c4059da40b8b42c6bf96995 (patch) | |
| tree | f581489b522fc647477d7b36dee072d553c44fd1 /engine/bank3d | |
| parent | 3394d8320f35f524231aa13bd9cae34e22246a6d (diff) | |
| parent | 1a987d1e1ab96ca9553d4253c72858057332a03a (diff) | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Doesn't build.
Diffstat (limited to 'engine/bank3d')
| -rw-r--r-- | engine/bank3d/bank3d_battle.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/bank3d/bank3d_battle.asm b/engine/bank3d/bank3d_battle.asm index 9ce82f5e..ac4cd849 100644 --- a/engine/bank3d/bank3d_battle.asm +++ b/engine/bank3d/bank3d_battle.asm @@ -226,15 +226,15 @@ Func_f61a6: ; f61a6 (3d:f61a6) add hl, bc ld a, [H_DOWNARROWBLINKCNT1] add $31 - jr asm_f6203 + jr CopyUncompressedPicToHL -Func_f61f9: ; 3f0c6 (f:70c6) +Func_f61f9: ; f61f9 (3d:61f9) ld a, [wPredefRegisters] ld h, a ld a, [wPredefRegisters + 1] ld l, a ld a, [$ffe1] -asm_f6203: ; f6203 (3d:6203) +CopyUncompressedPicToHL: ; f6203 (3d:6203) ld bc, $707 ld de, $14 push af |