summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-07-18 01:32:24 -0500
committerdannye <corrnondacqb@yahoo.com>2016-07-18 01:32:24 -0500
commit7c01509b6b69b4dc33f5d739589d50f26ffd65b0 (patch)
tree89b4000a56c9e3d942666639c83416100f360f88 /main.asm
parent80bae03975a84dadf080c79f52216866dd410cf8 (diff)
parentfc474c8ee740acbe662b06db0d9cab8edc6680e9 (diff)
Merge branch 'master' of https://github.com/pret/pokered
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 9ec59437..06e32463 100755
--- a/main.asm
+++ b/main.asm
@@ -2442,7 +2442,7 @@ GetTileTwoStepsInFrontOfPlayer:
CheckForCollisionWhenPushingBoulder:
call GetTileTwoStepsInFrontOfPlayer
- ld hl, wTileSetCollisionPtr
+ ld hl, wTilesetCollisionPtr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -2672,7 +2672,7 @@ LoadTilesetHeader:
ld e, a
ld hl, Tilesets
add hl, de
- ld de, wTileSetBank
+ ld de, wTilesetBank
ld c, $b
.copyTilesetHeaderLoop
ld a, [hli]