summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2015-11-07 12:24:56 -0800
committerMarcus Huderle <huderlem@gmail.com>2015-11-07 12:24:56 -0800
commit2723de08f8d9249b247ce46ee4ecddc637d7d116 (patch)
treeecaf73cc68679bfd45d2513fb8eda9f889e36499 /wram.asm
parenta009d2821ee9cf290f8d73c289e2e819a0acd408 (diff)
Flipper collisions routines and data.
Diffstat (limited to 'wram.asm')
-rwxr-xr-xwram.asm13
1 files changed, 12 insertions, 1 deletions
diff --git a/wram.asm b/wram.asm
index 2b804f6..2b4deb1 100755
--- a/wram.asm
+++ b/wram.asm
@@ -398,7 +398,18 @@ wUpperTiltPushing:: ; 0xd7a9
; Set to $1 when the upper tilt is in the first half of its animation
ds 1
- ds 15
+ ds 12
+
+wLeftFlipperAnimationState:: ; 0xd7b6
+; Counts from $0 to $f when using the left flipper.
+ ds 1
+wRightFlipperAnimationState:: ; 0xd7b7
+; Counts from $0 to $f when using the right flipper.
+ ds 1
+
+wFlipperXCollisionAttribute:: ; 0xd7b8
+; Goes with hFlipperYCollisionAttribute
+ ds 1
wFlipperCollision:: ; 0xd7b9
; Set to $1 when the ball is colliding with a flipper