Move some code out of home.asm

17 files changed, 40 insertions, 40 deletions

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 9728be0..ec486c7 100644
--- a/engine/pinball_game/ball_init/ball_init_blue_field.asm
+++ b/engine/pinball_game/ball_init/ball_init_blue_field.asm
@@ -80,7 +80,7 @@ StartBallAfterBonusStageBlueField: ; 0x1c129
 	ld [wBallXVelocity + 1], a

 	ld [wReturningFromBonusStage], a

 	ld [wSCX], a

-	ld [wd7be], a

+	ld [wFlippersDisabled], a

 	ld a, [wBallTypeBackup]

 	ld [wBallType], a

 	ld a, $10

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 c37e21c..1f0d531 100644
--- a/engine/pinball_game/ball_init/ball_init_red_field.asm
+++ b/engine/pinball_game/ball_init/ball_init_red_field.asm
@@ -85,7 +85,7 @@ StartBallAfterBonusStageRedField: ; 0x30128
 	ld [wBallXVelocity + 1], a

 	ld [wReturningFromBonusStage], a

 	ld [wSCX], a

-	ld [wd7be], a

+	ld [wFlippersDisabled], a

 	ld a, [wBallTypeBackup]

 	ld [wBallType], a

 	ld a, $f

diff --git a/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm
index cfd12b5..6e9f994 100644
--- a/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm
@@ -1,13 +1,13 @@
 HandleBallLossMeowthBonus: ; 0xdfe2

 	xor a

 	ld [wd64e], a

-	ld a, [wd7be]

+	ld a, [wFlippersDisabled]

 	and a

-	jr z, .asm_dff2

+	jr z, .flippersEnabled

 	ld a, [wCompletedBonusStage]

 	and a

 	jr z, .asm_e00f

-.asm_dff2

+.flippersEnabled

 	ld a, [wMeowthStageScore]

 	cp 20

 	jr nc, .asm_e00f

diff --git a/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm
index 18baa5a..6fbce47 100644
--- a/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm
@@ -1,13 +1,13 @@
 HandleBallLossSeelBonus: ; 0xe08b

 	xor a

 	ld [wd64e], a

-	ld a, [wd7be]

+	ld a, [wFlippersDisabled]

 	and a

-	jr z, .asm_e09b

+	jr z, .flippersEnabled

 	ld a, [wCompletedBonusStage]

 	and a

 	jr z, .asm_e0b8

-.asm_e09b

+.flippersEnabled

 	ld a, [wd793]

 	cp $14

 	jr nc, .asm_e0b8

diff --git a/engine/pinball_game/flippers.asm b/engine/pinball_game/flippers.asm
index 466975e..c6bd5ab 100644
--- a/engine/pinball_game/flippers.asm
+++ b/engine/pinball_game/flippers.asm
@@ -21,7 +21,7 @@ Func_e118: ; 0xe118
 	call IsKeyPressed2

 	ld hl, -$0333

 	jr z, .asm_e13b

-	ld a, [wd7be]

+	ld a, [wFlippersDisabled]

 	and a

 	jr nz, .asm_e13b

 	ld hl,  $0333

@@ -67,7 +67,7 @@ Func_e118: ; 0xe118
 	call IsKeyPressed2

 	ld hl, -$0333

 	jr z, .asm_e18e

-	ld a, [wd7be]

+	ld a, [wFlippersDisabled]

 	and a

 	jr nz, .asm_e18e

 	ld hl,  $0333

@@ -112,7 +112,7 @@ Func_e118: ; 0xe118
 	ret

 

 PlayFlipperSoundIfPressed: ; 0xe1ce

-	ld a, [wd7be]

+	ld a, [wFlippersDisabled]

 	and a

 	ret nz

 	ld hl, wKeyConfigLeftFlipper

@@ -676,7 +676,7 @@ DrawFlippers: ; 0xe4a1
 	ld a, [hGameBoyColorFlag]

 	and a

 	jr nz, .asm_e4d4

-	ld a, [wd7be]

+	ld a, [wFlippersDisabled]

 	and a

 	jr z, .asm_e4d4

 	ld a, $18

@@ -708,7 +708,7 @@ DrawFlippers: ; 0xe4a1
 	ld a, [hGameBoyColorFlag]

 	and a

 	jr nz, .asm_e504

-	ld a, [wd7be]

+	ld a, [wFlippersDisabled]

 	and a

 	jr z, .asm_e504

 	ld a, $17

diff --git a/engine/pinball_game/load_stage_data/load_diglett_bonus.asm b/engine/pinball_game/load_stage_data/load_diglett_bonus.asm
index 6be87a9..6fbb02b 100644
--- a/engine/pinball_game/load_stage_data/load_diglett_bonus.asm
+++ b/engine/pinball_game/load_stage_data/load_diglett_bonus.asm
@@ -1,6 +1,6 @@
 _LoadStageDataDiglettBonus: ; 0x19a76

 	callba Func_142fc

-	call Func_2862

+	call LoadFlippersPalette

 	ld a, [wd7c1]

 	and a

 	ret z

diff --git a/engine/pinball_game/load_stage_data/load_gengar_bonus.asm b/engine/pinball_game/load_stage_data/load_gengar_bonus.asm
index b6d30fd..31a26a7 100644
--- a/engine/pinball_game/load_stage_data/load_gengar_bonus.asm
+++ b/engine/pinball_game/load_stage_data/load_gengar_bonus.asm
@@ -1,6 +1,6 @@
 _LoadStageDataGengarBonus: ; 0x1818b

 	callba Func_142fc

-	call Func_2862

+	call LoadFlippersPalette

 	call Func_18d72

 	ld a, [wd7c1]

 	callba LoadTimerGraphics

diff --git a/engine/pinball_game/load_stage_data/load_meowth_bonus.asm b/engine/pinball_game/load_stage_data/load_meowth_bonus.asm
index e51c8af..fd53f2a 100644
--- a/engine/pinball_game/load_stage_data/load_meowth_bonus.asm
+++ b/engine/pinball_game/load_stage_data/load_meowth_bonus.asm
@@ -1,6 +1,6 @@
 _LoadStageDataMeowthBonus: ; 0x24128

 	callba Func_142fc

-	call Func_2862

+	call LoadFlippersPalette

 	callba Func_24fa3

 	call Func_24516

 	callba LoadTimerGraphics

diff --git a/engine/pinball_game/load_stage_data/load_mewtwo_bonus.asm b/engine/pinball_game/load_stage_data/load_mewtwo_bonus.asm
index 567576a..9c89fb6 100644
--- a/engine/pinball_game/load_stage_data/load_mewtwo_bonus.asm
+++ b/engine/pinball_game/load_stage_data/load_mewtwo_bonus.asm
@@ -1,6 +1,6 @@
 _LoadStageDataMewtwoBonus: ; 0x19310

 	callba Func_142fc

-	call Func_2862

+	call LoadFlippersPalette

 	callba LoadTimerGraphics

 	ld a, [wd7c1]

 	and a

diff --git a/engine/pinball_game/load_stage_data/load_seel_bonus.asm b/engine/pinball_game/load_stage_data/load_seel_bonus.asm
index 45dcf75..ab3fca4 100644
--- a/engine/pinball_game/load_stage_data/load_seel_bonus.asm
+++ b/engine/pinball_game/load_stage_data/load_seel_bonus.asm
@@ -1,6 +1,6 @@
 _LoadStageDataSeelBonus: ; 0x25b97

 	callba Func_142fc

-	call Func_2862

+	call LoadFlippersPalette

 	callba Func_262f4

 	call Func_25d0e

 	callba LoadTimerGraphics

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 902fd69..3e1b663 100644
--- a/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm
@@ -683,8 +683,8 @@ Func_1ab30: ; 0x1ab30
 	lb de, $4b, $2a

 	call PlaySoundEffect

 	ld a, $1

-	ld [wd7be], a

-	call Func_2862

+	ld [wFlippersDisabled], a

+	call LoadFlippersPalette

 	ld hl, Data_1ac56

 	jr asm_1ac2f

 

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 69dac96..9aa99c3 100644
--- a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
@@ -11,8 +11,8 @@ ResolveGengarBonusGameObjectCollisions: ; 0x18377
 	xor a

 	ld [wTimeRanOut], a

 	ld a, $1

-	ld [wd7be], a

-	call Func_2862

+	ld [wFlippersDisabled], a

+	call LoadFlippersPalette

 	callba StopTimer

 	ld a, [wd6a2]

 	cp $5

@@ -176,7 +176,7 @@ Func_18464: ; 0x18464
 	jr z, .asm_184d5

 	xor a

 	ld [wd657], a

-	ld a, [wd7be]

+	ld a, [wFlippersDisabled]

 	and a

 	jr nz, .asm_184d5

 	ld a, [wd658]

@@ -424,7 +424,7 @@ Func_1860b: ; 0x1860b
 	jr z, .asm_1867c

 	xor a

 	ld [wd67c], a

-	ld a, [wd7be]

+	ld a, [wFlippersDisabled]

 	and a

 	jr nz, .asm_1867c

 	ld a, [wd67d]

@@ -674,7 +674,7 @@ Func_187b1: ; 0x187b1
 	jp z, .asm_1885d

 	xor a

 	ld [wd696], a

-	ld a, [wd7be]

+	ld a, [wFlippersDisabled]

 	and a

 	jp nz, .asm_1885d

 	ld a, [wd697]

@@ -718,8 +718,8 @@ Func_187b1: ; 0x187b1
 	ld a, $3

 	ld [de], a

 	ld a, $1

-	ld [wd7be], a

-	call Func_2862

+	ld [wFlippersDisabled], a

+	call LoadFlippersPalette

 	callba StopTimer

 	ld de, $0000

 	call PlaySong

@@ -1423,7 +1423,7 @@ Func_18d34: ; 0x18d34
 	jr z, .asm_18d71

 	xor a

 	ld [wWhichGravestone], a

-	ld a, [wd7be]

+	ld a, [wFlippersDisabled]

 	and a

 	jr nz, .asm_18d71

 	ld bc, OneHundredPoints

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 fe9b7a9..1c7e194 100644
--- a/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm
@@ -230,8 +230,8 @@ ResolveMeowthBonusGameObjectCollisions: ; 0x2442a
 	xor a

 	ld [wTimeRanOut], a

 	ld a, $1

-	ld [wd7be], a

-	call Func_2862

+	ld [wFlippersDisabled], a

+	call LoadFlippersPalette

 	callba StopTimer

 	ld a, $1

 	ld [wd713], a

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 0d8dd5a..1e1a925 100644
--- a/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm
@@ -9,8 +9,8 @@ ResolveMewtwoBonusGameObjectCollisions: ; 0x19451
 	xor a

 	ld [wTimeRanOut], a

 	ld a, $1

-	ld [wd7be], a

-	call Func_2862

+	ld [wFlippersDisabled], a

+	call LoadFlippersPalette

 	callba StopTimer

 	ld a, [wd6b1]

 	cp $8

@@ -170,7 +170,7 @@ Func_19531: ; 0x19531
 	jr z, .asm_195a2

 	xor a

 	ld [wd6aa], a

-	ld a, [wd7be]

+	ld a, [wFlippersDisabled]

 	and a

 	jr nz, .asm_195a2

 	ld a, [wd6af]

@@ -204,8 +204,8 @@ Func_19531: ; 0x19531
 	ld de, wd6ae

 	call Func_19679

 	ld a, $1

-	ld [wd7be], a

-	call Func_2862

+	ld [wFlippersDisabled], a

+	call LoadFlippersPalette

 	callba StopTimer

 	ld de, $0000

 	call PlaySong

@@ -411,7 +411,7 @@ Func_19701: ; 0x19701
 	jr z, .asm_19742

 	xor a

 	ld [wd6b4], a

-	ld a, [wd7be]

+	ld a, [wFlippersDisabled]

 	and a

 	jr nz, .asm_19742

 	ld a, [wd6b5]

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 a545eca..4eb7406 100644
--- a/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm
@@ -45,8 +45,8 @@ ResolveSeelBonusGameObjectCollisions: ; 0x25c5a
 	xor a

 	ld [wTimeRanOut], a

 	ld a, $1

-	ld [wd7be], a

-	call Func_2862

+	ld [wFlippersDisabled], a

+	call LoadFlippersPalette

 	callba StopTimer

 	ld a, $3

 	ld [wd791], a

diff --git a/engine/pinball_game/stage_init/init_blue_field.asm b/engine/pinball_game/stage_init/init_blue_field.asm
index ed624c5..24730dc 100644
--- a/engine/pinball_game/stage_init/init_blue_field.asm
+++ b/engine/pinball_game/stage_init/init_blue_field.asm
@@ -20,7 +20,7 @@ InitBlueField: ; 0x1c000
 	ld [hli], a ; wNumPokeballs

 	ld [hli], a ; wPokeballBlinkingCounter

 	ld [wDisableHorizontalScrollForBallStart], a

-	ld [wd7be], a

+	ld [wFlippersDisabled], a

 	ld [wCurrentMap], a  ; PALLET_TOWN

 	ld a, $1

 	ld [wd49d], a

diff --git a/engine/pinball_game/stage_init/init_red_field.asm b/engine/pinball_game/stage_init/init_red_field.asm
index 82778c3..fe98569 100644
--- a/engine/pinball_game/stage_init/init_red_field.asm
+++ b/engine/pinball_game/stage_init/init_red_field.asm
@@ -20,7 +20,7 @@ InitRedField: ; 0x30000
 	ld [hli], a ; wNumPokeballs

 	ld [hli], a ; wPokeballBlinkingCounter

 	ld [wDisableHorizontalScrollForBallStart], a

-	ld [wd7be], a

+	ld [wFlippersDisabled], a

 	ld [wCurrentMap], a  ; PALLET_TOWN

 	ld a, $1

 	ld [wd49d], a