Fully document flipper collision system

pret · May 15, 2021 · f565e31 · f565e31
1 parent 2296487
commit f565e31
Show file tree

Hide file tree

Showing 11 changed files with 224 additions and 200 deletions.
diff --git a/.../collision/flippers/vertical_attributes_0 → data/collision/flippers/normal_angles_0 b/.../collision/flippers/vertical_attributes_0 → data/collision/flippers/normal_angles_0
diff --git a/.../collision/flippers/vertical_attributes_1 → data/collision/flippers/normal_angles_1 b/.../collision/flippers/vertical_attributes_1 → data/collision/flippers/normal_angles_1
diff --git a/...ollision/flippers/horizontal_attributes_0 → data/collision/flippers/radii_0 b/...ollision/flippers/horizontal_attributes_0 → data/collision/flippers/radii_0
diff --git a/...ollision/flippers/horizontal_attributes_1 → data/collision/flippers/radii_1 b/...ollision/flippers/horizontal_attributes_1 → data/collision/flippers/radii_1
diff --git a/engine/pinball_game/ball_init/ball_init.asm b/engine/pinball_game/ball_init/ball_init.asm
@@ -12,14 +12,14 @@ InitBallForStage: ; 0x83ba
 	ld [wBallXVelocity + 1], a
 	ld [wBallYVelocity], a
 	ld [wBallYVelocity + 1], a
-	ld [wd7ae], a
 	ld [wLeftFlipperState], a
-	ld [wd7b2], a
+	ld [wLeftFlipperState + 1], a
 	ld [wRightFlipperState], a
-	ld [wd7b0], a
-	ld [wd7b1], a
-	ld [wd7b4], a
-	ld [wd7b4 + 1], a
+	ld [wRightFlipperState + 1], a
+	ld [wLeftFlipperStateChange], a
+	ld [wLeftFlipperStateChange + 1], a
+	ld [wRightFlipperStateChange], a
+	ld [wRightFlipperStateChange + 1], a
 	ld [wBallSpin], a
 	ld [wBallRotation], a
 	inc a