diff options
author | dannye <corrnondacqb@yahoo.com> | 2016-07-18 01:32:24 -0500 |
---|---|---|
committer | dannye <corrnondacqb@yahoo.com> | 2016-07-18 01:32:24 -0500 |
commit | 7c01509b6b69b4dc33f5d739589d50f26ffd65b0 (patch) | |
tree | 89b4000a56c9e3d942666639c83416100f360f88 /main.asm | |
parent | 80bae03975a84dadf080c79f52216866dd410cf8 (diff) | |
parent | fc474c8ee740acbe662b06db0d9cab8edc6680e9 (diff) |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'main.asm')
-rwxr-xr-x | main.asm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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] |