summaryrefslogtreecommitdiff
path: root/wram.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 /wram.asm
parent22964879cfadf73916e27c219fc52001f773c144 (diff)
Fully document flipper collision system
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm29
1 files changed, 10 insertions, 19 deletions
diff --git a/wram.asm b/wram.asm
index 09c7d7d..fc20d3f 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1748,34 +1748,25 @@ wDisableHorizontalScrollForBallStart:: ; 0xd7ac
wd7ad:: ; 0xd7ad
ds $1
-wd7ae:: ; 0xd7ae
- ds $1
-
-wLeftFlipperState:: ; 0xd7af
- ds $1
-
-wd7b0:: ; 0xd7b0
- ds $1
-
-wd7b1:: ; 0xd7b1
- ds $1
+wLeftFlipperState:: ; 0xd7ae
+ ds $2
-wd7b2:: ; 0xd7b2
- ds $1
+wLeftFlipperStateChange:: ; 0xd7b0
+ ds $2
-wRightFlipperState:: ; 0xd7b3
- ds $1
+wRightFlipperState:: ; 0xd7b2
+ ds $2
-wd7b4:: ; 0xd7b4
+wRightFlipperStateChange:: ; 0xd7b4
ds $2
-wLeftFlipperAnimationState:: ; 0xd7b6
+wPreviousLeftFlipperState:: ; 0xd7b6
ds $1
-wRightFlipperAnimationState:: ; 0xd7b7
+wPreviousRightFlipperState:: ; 0xd7b7
ds $1
-wFlipperXCollisionAttribute:: ; 0xd7b8
+wFlipperCollisionNormalAngle:: ; 0xd7b8
ds $1
wFlipperCollision:: ; 0xd7b9