diff options
author | Marcus Huderle <huderlem@gmail.com> | 2015-09-22 12:11:54 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2015-09-22 12:11:54 -0700 |
commit | a4188b4ea36bdc4545e394219995ccb9e964fdbe (patch) | |
tree | 113e33b14daeee9e61bcaa224b0566747cac47c1 | |
parent | 1cd5c259c2cd642e752a66b7cb93b4b263455589 (diff) |
Label collision masks pointer in wram.
-rwxr-xr-x | main.asm | 4 | ||||
-rwxr-xr-x | wram.asm | 9 |
2 files changed, 10 insertions, 3 deletions
@@ -4857,7 +4857,7 @@ Func_22b5: ; 0x22b5 ld [$2000], a ld a, [hLoadedROMBank] push af - ld a, [$d7f1] + ld a, [wStageCollisionMasksBank] ld [hLoadedROMBank], a ld [$2000], a ld a, [wSubTileBallXPos] @@ -4903,7 +4903,7 @@ Func_22b5: ; 0x22b5 rl b sla c rl b - ld hl, $d7ef + ld hl, wStageCollisionMasksPointer ld a, [hli] ld h, [hl] ld l, a @@ -396,7 +396,14 @@ wStageCollisionMapBank:: ; 0xd7ee ; holds bank of current collision map (always $00, except when loading new attributes) ds 1 - ds $a +wStageCollisionMasksPointer:: ; 0xd7ef +; Pointer to the current collision masks array + ds 2 +wStageCollisionMasksBank:: ; 0xd7f1 +; Holds bank of current collision masks array + ds 1 + + ds 7 wInGameMenuIndex:: ; 0xd7f9 ds 1 |