diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /engine/unown_puzzle.asm | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'engine/unown_puzzle.asm')
| -rwxr-xr-x | engine/unown_puzzle.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm index 36f6dacd2..dcad1ce20 100755 --- a/engine/unown_puzzle.asm +++ b/engine/unown_puzzle.asm @@ -549,7 +549,7 @@ RedrawUnownPuzzlePieces: ; e14d9 ld hl, .OAM_NotHoldingPiece .load - ld de, Sprite01 + ld de, wVirtualOAMSprite00 .loop ld a, [hli] cp -1 @@ -834,7 +834,7 @@ PuzzlePieceBorderData: ; e1703 INCBIN "gfx/unown_puzzle/tile_borders.2bpp" LoadUnownPuzzlePiecesGFX: ; e17a3 - ld a, [ScriptVar] + ld a, [wScriptVar] maskbits NUM_UNOWN_PUZZLES ld e, a ld d, 0 |