Cleanup references to wBallXPos and wBallYPos

10 files changed, 21 insertions, 21 deletions

diff --git a/engine/pinball_game/catchem_mode.asm b/engine/pinball_game/catchem_mode.asm
index 34f98dc..83a1dfa 100755
--- a/engine/pinball_game/catchem_mode.asm
+++ b/engine/pinball_game/catchem_mode.asm
@@ -786,9 +786,9 @@ CapturePokemon: ; 0x1052d
 	and a

 	call z, Func_10848

 	ld a, $50

-	ld [wd4b4], a

+	ld [wBallXPos + 1], a

 	ld a, $40

-	ld [wd4b6], a

+	ld [wBallYPos + 1], a

 	ld a, $80

 	ld [wBallXVelocity], a

 	xor a

diff --git a/engine/pinball_game/draw_sprites/draw_blue_field_sprites.asm b/engine/pinball_game/draw_sprites/draw_blue_field_sprites.asm
index 78f69af..002aaad 100755
--- a/engine/pinball_game/draw_sprites/draw_blue_field_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_blue_field_sprites.asm
@@ -162,7 +162,7 @@ DrawPikachuSavers_BlueStage: ; 0x1f448
 	jr .asm_1f473

 

 .asm_1f469

-	ld a, [wd4b4]

+	ld a, [wBallXPos + 1]

 	cp $50

 	ld a, $1

 	jr nc, .asm_1f473

diff --git a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
index 6d983bd..dbea5c0 100755
--- a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
@@ -446,7 +446,7 @@ DrawPikachuSavers_RedStage: ; 0x17e08
 	jr .asm_17e33

 

 .asm_17e29

-	ld a, [wd4b4]

+	ld a, [wBallXPos + 1]

 	cp $50

 	ld a, $1

 	jr nc, .asm_17e33

diff --git a/engine/pinball_game/load_stage_data/load_blue_field.asm b/engine/pinball_game/load_stage_data/load_blue_field.asm
index 2fc03a4..9ab3423 100755
--- a/engine/pinball_game/load_stage_data/load_blue_field.asm
+++ b/engine/pinball_game/load_stage_data/load_blue_field.asm
@@ -53,9 +53,9 @@ Func_1c203: ; 0x1c203
 	ld a, $ff

 	ld [wd4d7], a

 	ld [wd4db], a

-	ld a, [wd4b4]

+	ld a, [wBallXPos + 1]

 	ld [wd4c5], a

-	ld a, [wd4b6]

+	ld a, [wBallYPos + 1]

 	ld [wd4c6], a

 	ld a, [wBallRotation]

 	ld [wd4c7], a

diff --git a/engine/pinball_game/load_stage_data/load_red_field.asm b/engine/pinball_game/load_stage_data/load_red_field.asm
index 11c1106..60b81b9 100755
--- a/engine/pinball_game/load_stage_data/load_red_field.asm
+++ b/engine/pinball_game/load_stage_data/load_red_field.asm
@@ -69,9 +69,9 @@ Func_14091: ; 0x14091
 	ld a, $ff

 	ld [wd4d7], a

 	ld [wd4db], a

-	ld a, [wd4b4]

+	ld a, [wBallXPos + 1]

 	ld [wd4c5], a

-	ld a, [wd4b6]

+	ld a, [wBallYPos + 1]

 	ld [wd4c6], a

 	ld a, [wBallRotation]

 	ld [wd4c7], a

diff --git a/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm
index 6596d37..bdad4ab 100755
--- a/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm
@@ -8,7 +8,7 @@ Func_19b92: ; 0x19b92
 	ld a, [wd73a]

 	and a

 	ret nz

-	ld a, [wd4b4]

+	ld a, [wBallXPos + 1]

 	cp $8a

 	ret nc

 	ld a, $1

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 5d37c22..aae04b1 100755
--- a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
@@ -25,7 +25,7 @@ Func_183b7: ; 0x183b7
 	ld a, [wd653]

 	and a

 	ret nz

-	ld a, [wd4b4]

+	ld a, [wBallXPos + 1]

 	cp $8a

 	ret nc

 	ld a, $1

@@ -881,9 +881,9 @@ Func_1894c: ; 0x1894c
 	ld hl, wd549

 	and [hl]

 	jr z, .asm_18973

-	ld a, [wd4b6]

+	ld a, [wBallYPos + 1]

 	inc a

-	ld [wd4b6], a

+	ld [wBallYPos + 1], a

 .asm_18973

 	ld a, [wd7a0]

 	dec a

diff --git a/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm
index 3d911eb..62d5815 100755
--- a/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm
@@ -88,7 +88,7 @@ Func_244f5: ; 0x244f5
 	ld a, [wd6e6]

 	and a

 	ret nz

-	ld a, [wd4b4]

+	ld a, [wBallXPos + 1]

 	cp $8a

 	ret nc

 	ld a, $1

@@ -578,7 +578,7 @@ Func_247d9: ; 0x247d9
 	ld a, [wMeowthXPosition]

 	add $14

 	ld b, a

-	ld a, [wd4b4]

+	ld a, [wBallXPos + 1]

 	cp b

 	jr nc, .asm_2481d

 	ld a, $0

@@ -612,7 +612,7 @@ Func_247d9: ; 0x247d9
 	ld a, [wMeowthXPosition]

 	add $14

 	ld b, a

-	ld a, [wd4b4]

+	ld a, [wBallXPos + 1]

 	cp b

 	jr nc, .asm_24862

 	ld a, $0

@@ -646,7 +646,7 @@ Func_247d9: ; 0x247d9
 	ld a, [wMeowthXPosition]

 	add $14

 	ld b, a

-	ld a, [wd4b4]

+	ld a, [wBallXPos + 1]

 	cp b

 	jr nc, .asm_248a6

 	ld a, $0

@@ -1206,7 +1206,7 @@ Func_24c28: ; 0x24c28
 	ld a, [wMeowthXPosition]

 	add $14

 	ld b, a

-	ld a, [wd4b4]

+	ld a, [wBallXPos + 1]

 	cp b

 	jr nc, .asm_24c70

 	ld a, $0

@@ -1242,7 +1242,7 @@ Func_24c28: ; 0x24c28
 	ld a, [wd6f7]

 	add $14

 	ld b, a

-	ld a, [wd4b4]

+	ld a, [wBallXPos + 1]

 	cp b

 	jr nc, .asm_24cb9

 	ld a, $0

@@ -1278,7 +1278,7 @@ Func_24c28: ; 0x24c28
 	ld a, [wMeowthXPosition]

 	add $14

 	ld b, a

-	ld a, [wd4b4]

+	ld a, [wBallXPos + 1]

 	cp b

 	jr nc, .asm_24d01

 	ld a, $0

diff --git a/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm
index 86df2f3..e23850e 100755
--- a/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm
@@ -23,7 +23,7 @@ Func_1948b: ; 0x1948b
 	ld a, [wd6a9]

 	and a

 	ret nz

-	ld a, [wd4b4]

+	ld a, [wBallXPos + 1]

 	cp $8a

 	ret nc

 	ld a, $1

diff --git a/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm
index 19f87cc..58135cb 100755
--- a/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm
@@ -61,7 +61,7 @@ Func_25ced: ; 0x25ced
 	ld a, [wd766]

 	and a

 	ret nz

-	ld a, [wd4b4]

+	ld a, [wBallXPos + 1]

 	cp $8a

 	ret nc

 	ld a, $1