Move some code out of home.asm

5 files changed, 20 insertions, 20 deletions

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