From 01ba6dc960b7b5f08f6f599a1d7ecc52d4260359 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Sun, 2 May 2021 10:20:10 -0500
Subject: Correct force amplication name

---
 engine/pinball_game.asm                                               | 4 ++--
 engine/pinball_game/flippers.asm                                      | 2 +-
 engine/pinball_game/object_collision/blue_stage_resolve_collision.asm | 2 +-
 engine/pinball_game/object_collision/red_stage_resolve_collision.asm  | 2 +-
 home.asm                                                              | 2 +-
 wram.asm                                                              | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/engine/pinball_game.asm b/engine/pinball_game.asm
index 86fd199..f0bec06 100644
--- a/engine/pinball_game.asm
+++ b/engine/pinball_game.asm
@@ -70,7 +70,7 @@ GameScreenFunction_HandleBallPhysics: ; 0xd909
 ; main loop for stage logic
 	xor a
 	ld [wFlipperCollision], a
-	ld [wSpinForceAmplification], a
+	ld [wCollisionForceAmplification], a
 	call ApplyGravityToBall
 	call LimitBallVelocity
 	xor a
@@ -181,7 +181,7 @@ GameScreenFunction_HandleBallLoss: ; 0xda36
 	ld [hNewlyPressedButtons], a
 	ld [hPressedButtons], a
 	ld [wFlipperCollision], a
-	ld [wSpinForceAmplification], a
+	ld [wCollisionForceAmplification], a
 	xor a
 	ld [wIsBallColliding], a
 	ld [wPinballIsVisible], a
diff --git a/engine/pinball_game/flippers.asm b/engine/pinball_game/flippers.asm
index 4ecc0b1..57475e4 100644
--- a/engine/pinball_game/flippers.asm
+++ b/engine/pinball_game/flippers.asm
@@ -640,7 +640,7 @@ HandleFlipperCollision: ; 0xe442
 .asm_e48b
 	ld [wCollisionNormalAngle], a
 	ld a, 1
-	ld [wSpinForceAmplification], a
+	ld [wCollisionForceAmplification], a
 	ld a, [wFlipperYForce + 1]
 	bit 7, a
 	ret z
diff --git a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
index 3bcc995..da35c15 100644
--- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
@@ -1811,7 +1811,7 @@ AddScorePsyduckOrPoliwag: ; 0x1de22
 	ld a, 4
 	ld [wRumbleDuration], a
 	ld a, 2
-	ld [wSpinForceAmplification], a
+	ld [wCollisionForceAmplification], a
 	ld bc, FiveHundredPoints
 	callba AddBigBCD6FromQueueWithBallMultiplier
 	lb de, $00, $0f
diff --git a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
index d79411c..d370618 100644
--- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
@@ -463,7 +463,7 @@ AddScoreForHittingDiglett: ; 0x1496d
 	ld a, 4
 	ld [wRumbleDuration], a
 	ld a, 2
-	ld [wSpinForceAmplification], a
+	ld [wCollisionForceAmplification], a
 	ld bc, FiveHundredPoints
 	callba AddBigBCD6FromQueueWithBallMultiplier
 	lb de, $00, $0f
diff --git a/home.asm b/home.asm
index 9f88398..54010b6 100644
--- a/home.asm
+++ b/home.asm
@@ -2559,7 +2559,7 @@ ApplyCollisionForces: ; 0x222b
 	ld l, e  ; hl = yVelocity / 4
 	srl d
 	rr e  ; de = yVelocity / 8
-	ld a, [wSpinForceAmplification]
+	ld a, [wCollisionForceAmplification]
 	and a
 	jr z, .updateYVelocity
 .amplify
diff --git a/wram.asm b/wram.asm
index 7fc2c9b..120e667 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1845,7 +1845,7 @@ wCollisionNormalAngle:: ; 0xd7ea
 ; $C0 = directly left on the Game Boy screen
 	ds $1
 
-wSpinForceAmplification:: ; 0xd7eb
+wCollisionForceAmplification:: ; 0xd7eb
 	ds $1
 
 wStageCollisionMapPointer:: ; 0xd7ec
-- 
cgit v1.2.3