From f565e31d51a241e4b98eb566d4ce6459f56e673c Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 15 May 2021 11:00:06 -0500 Subject: Fully document flipper collision system --- home.asm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'home.asm') 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 -- cgit v1.2.3