summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-12 11:51:59 -0700
committerGitHub <noreply@github.com>2016-06-12 11:51:59 -0700
commitbfaabd08be0a790dff961276d76af3e1af4e6e24 (patch)
tree60742e693805fd75031079e8d3b8a87847452d1e /main.asm
parent2b2c6fefd311101c87845c8c498746dc74bd725f (diff)
parent3ab3f4273b1288883a43b64cae4191dfa6d2313e (diff)
Merge pull request #135 from YamaArashi/master
sync tileset WRAM labels
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index 6c51de59..53d2dfdb 100755
--- a/main.asm
+++ b/main.asm
@@ -2435,7 +2435,7 @@ GetTileTwoStepsInFrontOfPlayer:
CheckForCollisionWhenPushingBoulder:
call GetTileTwoStepsInFrontOfPlayer
- ld hl, wTileSetCollisionPtr
+ ld hl, wTilesetCollisionPtr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -2665,7 +2665,7 @@ LoadTilesetHeader:
ld e, a
ld hl, Tilesets
add hl, de
- ld de, wTileSetBank
+ ld de, wTilesetBank
ld c, $b
.copyTilesetHeaderLoop
ld a, [hli]