summaryrefslogtreecommitdiff
path: root/main.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 /main.asm
parent22964879cfadf73916e27c219fc52001f773c144 (diff)
Fully document flipper collision system
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/main.asm b/main.asm
index 02657ad..ece09cf 100644
--- a/main.asm
+++ b/main.asm
@@ -1098,18 +1098,18 @@ TiltLeftOnlyForce:
SECTION "bank3d", ROMX
-FlipperHorizontalCollisionAttributes: ; 0xf4000
- INCBIN "data/collision/flippers/horizontal_attributes_0"
+FlipperCollisionRadii: ; 0xf4000
+ INCBIN "data/collision/flippers/radii_0"
SECTION "bank3e", ROMX
-FlipperHorizontalCollisionAttributes2: ; 0xf8000
- INCBIN "data/collision/flippers/horizontal_attributes_1"
+FlipperCollisionRadii2: ; 0xf8000
+ INCBIN "data/collision/flippers/radii_1"
-FlipperVerticalCollisionAttributes: ; 0xfa000
- INCBIN "data/collision/flippers/vertical_attributes_0"
+FlipperCollisionNormalAngles: ; 0xfa000
+ INCBIN "data/collision/flippers/normal_angles_0"
SECTION "bank3f", ROMX
-FlipperVerticalCollisionAttributes2: ; 0xfc000
- INCBIN "data/collision/flippers/vertical_attributes_1"
+FlipperCollisionNormalAngles2: ; 0xfc000
+ INCBIN "data/collision/flippers/normal_angles_1"