diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
| commit | 8cdf73265f95e9a55112f373804867244512878d (patch) | |
| tree | 64f4263b86839e1eb9770688ad890683fa89c503 /engine/battle | |
| parent | Update extras with fixed gbz80disasm.py (diff) | |
| parent | Fix tileset incbin statement alignment (diff) | |
| download | pokeyellow-8cdf73265f95e9a55112f373804867244512878d.tar.gz pokeyellow-8cdf73265f95e9a55112f373804867244512878d.tar.xz pokeyellow-8cdf73265f95e9a55112f373804867244512878d.zip | |
Merge pull request #10 from PikalaxALT/master
Next batch of scripts, etc.
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/bank3d_battle.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/bank3d_battle.asm b/engine/battle/bank3d_battle.asm index 7f8854a4..4fd37bc4 100644 --- a/engine/battle/bank3d_battle.asm +++ b/engine/battle/bank3d_battle.asm @@ -187,7 +187,7 @@ LoadMonBackPic: ; f6178 (3d:6178) ld b, a jp CopyVideoData -Func_f61a6: ; f61a6 (3d:f61a6) +AnimateSendingOutMon: ; f61a6 (3d:f61a6) ld a, [wPredefRegisters] ld h, a ld a, [wPredefRegisters + 1] @@ -227,7 +227,7 @@ Func_f61a6: ; f61a6 (3d:f61a6) add $31 jr CopyUncompressedPicToHL -Func_f61f9: ; f61f9 (3d:61f9) +CopyUncompressedPicToTilemap: ; f61f9 (3d:61f9) ld a, [wPredefRegisters] ld h, a ld a, [wPredefRegisters + 1] |