Rename wDisableBallGravityAndTilt to wEnableBallGravityAndTilt. The meaning was flipped.

12 files changed, 37 insertions, 37 deletions

diff --git a/engine/pinball_game.asm b/engine/pinball_game.asm
index 6eb40be..2e2021b 100755
--- a/engine/pinball_game.asm
+++ b/engine/pinball_game.asm
@@ -180,7 +180,7 @@ GameScreenFunction_HandleBallLoss: ; 0xda36
 	xor a

 	ld [wd7e9], a

 	ld [wd548], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	call HandleTilts

 	ld a, [wCurrentStage]

 	bit 0, a

diff --git a/engine/pinball_game/ball_init/ball_init.asm b/engine/pinball_game/ball_init/ball_init.asm
index 29dbf64..73cb5a4 100755
--- a/engine/pinball_game/ball_init/ball_init.asm
+++ b/engine/pinball_game/ball_init/ball_init.asm
@@ -24,7 +24,7 @@ InitBallForStage: ; 0x83ba
 	ld [wBallRotation], a

 	inc a

 	ld [wd548], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ld a, $20

 	ld [wSCX], a

 	ld a, [wCurrentStage]

diff --git a/engine/pinball_game/ball_init/ball_init_blue_field.asm b/engine/pinball_game/ball_init/ball_init_blue_field.asm
index 6d33e83..b265880 100755
--- a/engine/pinball_game/ball_init/ball_init_blue_field.asm
+++ b/engine/pinball_game/ball_init/ball_init_blue_field.asm
@@ -11,7 +11,7 @@ InitBallBlueField: ; 0x1c08d
 	ld a, $98

 	ld [wBallYPos + 1], a

 	xor a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ld [wd580], a

 	call InitBlueFieldCollisionAttributes

 	ld a, [wd4c9]

diff --git a/engine/pinball_game/ball_init/ball_init_red_field.asm b/engine/pinball_game/ball_init/ball_init_red_field.asm
index 5411ac8..4ae79bf 100755
--- a/engine/pinball_game/ball_init/ball_init_red_field.asm
+++ b/engine/pinball_game/ball_init/ball_init_red_field.asm
@@ -11,7 +11,7 @@ InitBallRedField: ; 0x3007d
 	ld a, $98

 	ld [wBallYPos + 1], a

 	xor a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ld [wd580], a

 	ld a, [wd7ad]

 	bit 7, a

diff --git a/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm
index 6fc76fe..631a882 100755
--- a/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm
@@ -15,7 +15,7 @@ HandleBallLossGengarBonus: ; 0xdf1a
 	and a

 	ret nz

 	ld [wd548], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ld [wBallSpin], a

 	ld [wBallRotation], a

 	ld hl, wBallXVelocity

diff --git a/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm
index d4a5fe5..90cc448 100755
--- a/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm
@@ -15,7 +15,7 @@ HandleBallLossMewtwoBonus: ; 0xdf7e
 	and a

 	ret nz

 	ld [wd548], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ld [wBallSpin], a

 	ld [wBallRotation], a

 	ld hl, wBallXVelocity

diff --git a/engine/pinball_game/catchem_mode.asm b/engine/pinball_game/catchem_mode.asm
index 632e145..3fb9ed3 100755
--- a/engine/pinball_game/catchem_mode.asm
+++ b/engine/pinball_game/catchem_mode.asm
@@ -691,7 +691,7 @@ BallCaptureInit: ; 0x10496
 	ld [wBallYVelocity + 1], a

 	xor a

 	ld [wd548], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	lb de, $00, $0b

 	call PlaySoundEffect

 	ret

@@ -789,7 +789,7 @@ CapturePokemon: ; 0x1052d
 	ld [wCapturingMon], a

 	ld a, $1

 	ld [wd548], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	callba RestoreBallSaverAfterCatchEmMode

 	call ConcludeCatchEmMode

 	ld de, $0001

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 01fbbb6..ecd555c 100755
--- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
@@ -76,7 +76,7 @@ ResolveBlueStagePinballLaunchCollision: ; 0x1c7d7
 	ld a, $fa

 	ld [wBallYVelocity + 1], a

 	ld a, $1

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	lb de, $00, $0a

 	call PlaySoundEffect

 .dontLaunch

@@ -1640,7 +1640,7 @@ ResolveBlueStagePikachuCollision: ; 0x1d0a1
 	ld [wBallYVelocity + 1], a

 	ld [wBallSpin], a

 	ld [wBallRotation], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	call FillBottomMessageBufferWithBlackTile

 	jr .asm_1d110

 

@@ -1712,7 +1712,7 @@ Func_1d133: ; 0x1d133
 	ld a, $fc

 	ld [wBallYVelocity + 1], a

 	ld a, $1

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ld bc, FiveThousandPoints

 	callba AddBigBCD6FromQueueWithBallMultiplier

 	xor a

@@ -1805,7 +1805,7 @@ ResolveSlowpokeCollision: ; 0x1d216
 	ld [wBallXPos], a

 	ld [wBallYPos], a

 	xor a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 .asm_1d253

 	ld hl, SlowpokeCollisionAnimationData ; 0x1d312

 	ld de, wSlowpokeAnimation

@@ -1861,7 +1861,7 @@ ResolveSlowpokeCollision: ; 0x1d216
 	cp $5

 	ret nz

 	ld a, $1

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ld a, $b0

 	ld [wBallXVelocity], a

 	ld a, $0

@@ -1927,7 +1927,7 @@ ResolveCloysterCollision: ; 0x1d32d
 	ld [wBallXPos], a

 	ld [wBallYPos], a

 	xor a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 .asm_1d36a

 	ld hl, CloysterCollisionAnimationData

 	ld de, wCloysterAnimation

@@ -1983,7 +1983,7 @@ ResolveCloysterCollision: ; 0x1d32d
 	cp $5

 	ret nz

 	ld a, $1

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ld a, $4f

 	ld [wBallXVelocity], a

 	ld a, $ff

@@ -5753,7 +5753,7 @@ Func_1e757: ; 0x1e757
 	ld [hli], a

 	ld [hli], a

 	ld [hli], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ld [wBallXPos], a

 	ld [wBallYPos], a

 	ld a, $50

@@ -5844,7 +5844,7 @@ Func_1e830: ; 0x1e830
 	jr nc, .asm_1e84b

 	ld a, $1

 	ld [wd548], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ret

 

 .asm_1e84b

@@ -5892,7 +5892,7 @@ Func_1e830: ; 0x1e830
 	jr nc, .asm_1e858

 	ld a, $1

 	ld [wd548], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ld a, [wCatchEmOrEvolutionSlotRewardActive]

 	cp EVOLUTION_MODE_SLOT_REWARD

 	ret nz

diff --git a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
index 3a4d7cc..c3482d6 100755
--- a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
@@ -878,7 +878,7 @@ Func_1894c: ; 0x1894c
 	inc a

 	ld [wd6a5], a

 	ld a, [wd548]

-	ld hl, wDisableBallGravityAndTilt

+	ld hl, wEnableBallGravityAndTilt

 	and [hl]

 	jr z, .asm_18973

 	ld a, [wBallYPos + 1]

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 b60060b..75ba3ea 100755
--- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
@@ -4477,7 +4477,7 @@ ResolveBellsproutCollision: ; 0x15e93
 	ld a, $78

 	ld [wBallYPos + 1], a

 	xor a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 .asm_15eda

 	ld hl, BellsproutAnimationData

 	ld de, wBellsproutAnimation

@@ -4531,7 +4531,7 @@ ResolveBellsproutCollision: ; 0x15e93
 	cp $5

 	ret nz

 	ld a, $1

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	xor a

 	ld [wBallXVelocity + 1], a

 	ld a, $2

@@ -4875,7 +4875,7 @@ ResolveDittoSlotCollision: ; 0x160f0
 	ld [hli], a

 	ld [hli], a

 	ld [hli], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ld [wBallXPos], a

 	ld [wBallYPos], a

 	ld a, $11

@@ -4920,7 +4920,7 @@ ResolveDittoSlotCollision: ; 0x160f0
 	callba Func_10ab3

 	ld a, $1

 	ld [wd548], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ld a, $5

 	ld [wd803], a

 	ld a, $8

@@ -5092,7 +5092,7 @@ Func_16279: ; 0x16279
 	ld [hli], a

 	ld [hli], a

 	ld [hli], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ld [wBallXPos], a

 	ld [wBallYPos], a

 	ld a, $50

@@ -5183,7 +5183,7 @@ Func_16352: ; 0x16352
 	jr nc, .asm_1636d

 	ld a, $1

 	ld [wd548], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ret

 

 .asm_1636d

@@ -5231,7 +5231,7 @@ Func_16352: ; 0x16352
 	jr nc, .asm_1637a

 	ld a, $1

 	ld [wd548], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ld a, [wCatchEmOrEvolutionSlotRewardActive]

 	cp EVOLUTION_MODE_SLOT_REWARD

 	ret nz

@@ -5504,7 +5504,7 @@ ResolveRedStagePinballLaunchCollision: ; 0x1652d
 	ld a, $fa

 	ld [wBallYVelocity + 1], a

 	ld a, $1

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	lb de, $00, $0a

 	call PlaySoundEffect

 .notLaunchedYet

@@ -5627,7 +5627,7 @@ ResolveRedStagePikachuCollision: ; 0x1660c
 	ld [wBallYVelocity + 1], a

 	ld [wBallSpin], a

 	ld [wBallRotation], a

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	call FillBottomMessageBufferWithBlackTile

 	jr .asm_1667b

 

@@ -5699,7 +5699,7 @@ Func_1669e: ; 0x1669e
 	ld a, $fc

 	ld [wBallYVelocity + 1], a

 	ld a, $1

-	ld [wDisableBallGravityAndTilt], a

+	ld [wEnableBallGravityAndTilt], a

 	ld bc, FiveThousandPoints

 	callba AddBigBCD6FromQueueWithBallMultiplier

 	xor a

diff --git a/home.asm b/home.asm
index 75de979..d9bb7c3 100755
--- a/home.asm
+++ b/home.asm
@@ -4218,7 +4218,7 @@ Sine: ; 0x2149
 
 ApplyGravityToBall: ; 0x2168
 ; Adds a constant to the pinball's y velocity.
-	ld a, [wDisableBallGravityAndTilt]
+	ld a, [wEnableBallGravityAndTilt]
 	and a
 	ret z
 	ld de, $000b  ; gravity added to y velocity every frame
@@ -5243,7 +5243,7 @@ HandleLeftTilt: ; 0x358c
 	call PlaySoundEffect
 .skipSoundEffect
 	ld a, [wd548]
-	ld hl, wDisableBallGravityAndTilt
+	ld hl, wEnableBallGravityAndTilt
 	and [hl]
 	jr z, .skipBallMovement
 	ld a, [wBallXPos + 1]
@@ -5299,7 +5299,7 @@ HandleRightTilt: ; 0x35f3
 	call PlaySoundEffect
 .skipSoundEffect
 	ld a, [wd548]
-	ld hl, wDisableBallGravityAndTilt
+	ld hl, wEnableBallGravityAndTilt
 	and [hl]
 	jr z, .skipBallMovement
 	ld a, [wBallXPos + 1]
@@ -5355,7 +5355,7 @@ HandleUpperTilt: ; 0x365a
 	call PlaySoundEffect
 .skipSoundEffect
 	ld a, [wd548]
-	ld hl, wDisableBallGravityAndTilt
+	ld hl, wEnableBallGravityAndTilt
 	and [hl]
 	jr z, .skipBallMovement
 	ld a, [wBallYPos + 1]
@@ -5395,7 +5395,7 @@ HandleUpperTilt: ; 0x365a
 
 ApplyTiltForces: ; 0x36c1
 	ld a, [wd548]
-	ld hl, wDisableBallGravityAndTilt
+	ld hl, wEnableBallGravityAndTilt
 	and [hl]
 	ret z
 	ld c, $0
diff --git a/wram.asm b/wram.asm
index 56dd18e..656e219 100755
--- a/wram.asm
+++ b/wram.asm
@@ -532,9 +532,9 @@ wSecondaryLeftAlleyTrigger:: ; 0xd546
 wd548:: ; 0xd548
 	ds $1
 
-wDisableBallGravityAndTilt:: ; 0xd549
-; Set to 1 to disable any affect gravity or tilt has on the pinball.
-; Used for things likes the initial pinball launch or to hold the ball stationary.
+wEnableBallGravityAndTilt:: ; 0xd549
+; Set to 1 to enable the effect of gravity and tilt on the pinball.
+; 0 disables these forces. Used for things likes the initial pinball launch or to hold the ball stationary.
 	ds $1
 
 wCurrentMap:: ; 0xd54a