summaryrefslogtreecommitdiff
path: root/home.asm
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2021-05-15 11:00:06 -0500
committerMarcus Huderle <huderlem@gmail.com>2021-05-15 11:00:06 -0500
commitf565e31d51a241e4b98eb566d4ce6459f56e673c (patch)
tree5b909c07c10065de755d04df4594ad0c01382740 /home.asm
parent22964879cfadf73916e27c219fc52001f773c144 (diff)
Fully document flipper collision system
Diffstat (limited to 'home.asm')
-rw-r--r--home.asm9
1 files changed, 5 insertions, 4 deletions
diff --git a/home.asm b/home.asm
index ec56948..ea4bd0c 100644
--- a/home.asm
+++ b/home.asm
@@ -3001,11 +3001,11 @@ TryLoadSpecialCollisionMask: ; 0x248a
jr nc, .bonusStage
bit 4, b
ld hl, BottomLeftCollisionMasks
- ld a, [wLeftFlipperState]
+ ld a, [wLeftFlipperState + 1]
jr z, .checkFlipperPosition
res 4, b
ld hl, BottomRightCollisionMasks
- ld a, [wRightFlipperState]
+ ld a, [wRightFlipperState + 1]
.checkFlipperPosition
ld de, $0080
cp 7
@@ -3027,11 +3027,11 @@ TryLoadSpecialCollisionMask: ; 0x248a
.bonusStage
bit 4, b
ld hl, BottomLeftBonusStageCollisionMasks
- ld a, [wLeftFlipperState]
+ ld a, [wLeftFlipperState + 1]
jr z, .checkFlipperPosition2
res 4, b
ld hl, BottomRightBonusStageCollisionMasks
- ld a, [wRightFlipperState]
+ ld a, [wRightFlipperState + 1]
.checkFlipperPosition2
ld de, $0080
cp 7
@@ -3299,6 +3299,7 @@ BottomLeftBonusStageCollisionMasks:
BottomRightBonusStageCollisionMasks:
INCBIN "data/collision/masks/bottom_right_bonus_stage_masks.masks"
+; These two squares data arrays must be aligned to $100 bytes and appear contiguously.
SquaresLow:
x = 0
rept 256