diff options
| author | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
| commit | 7aef59841489ea449b9a34d424c681a4b48b88ab (patch) | |
| tree | 72d46f1cc076564f62b11f5379960cd745a7fc9a /engine/unown_puzzle.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'engine/unown_puzzle.asm')
| -rwxr-xr-x | engine/unown_puzzle.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm index cf8b78618..ada5244a7 100755 --- a/engine/unown_puzzle.asm +++ b/engine/unown_puzzle.asm @@ -188,7 +188,7 @@ endr ; e12d9 .Jumptable: ; e12d9 - + dw .Function ; e12db @@ -321,7 +321,7 @@ UnownPuzzle_A: ; e1376 ld [wHoldingUnownPuzzlePiece], a ret -.TryPlacePiece +.TryPlacePiece: call UnownPuzzle_CheckCurrentTileOccupancy and a jr nz, UnownPuzzle_InvalidAction @@ -546,7 +546,7 @@ RedrawUnownPuzzlePieces: ; e14d9 ld hl, .OAM_HoldingPiece jr .load -.NoPiece +.NoPiece: ld hl, .OAM_NotHoldingPiece .load |