Label evolution, joypad, message box things

3 files changed, 19 insertions, 19 deletions

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 ecd555c..1cabbd8 100755
--- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
@@ -1827,11 +1827,11 @@ ResolveSlowpokeCollision: ; 0x1d216
 	cp $1

 	jr nz, .asm_1d2b6

 	xor a

-	ld [wd548], a

+	ld [wPinballIsVisible], a

 	ld a, [wLeftAlleyCount]

 	cp $3

 	jr nz, .asm_1d299

-	callba Func_10ab3

+	callba StartEvolutionMode

 	ld a, [wd643]

 	and a

 	ret z

@@ -1853,7 +1853,7 @@ ResolveSlowpokeCollision: ; 0x1d216
 	cp $4

 	jr nz, .asm_1d2c3

 	ld a, $1

-	ld [wd548], a

+	ld [wPinballIsVisible], a

 	ret

 

 .asm_1d2c3

@@ -1949,7 +1949,7 @@ ResolveCloysterCollision: ; 0x1d32d
 	cp $1

 	jr nz, .asm_1d3cb

 	xor a

-	ld [wd548], a

+	ld [wPinballIsVisible], a

 	ld a, [wRightAlleyCount]

 	cp $2

 	jr c, .noCatchEmMode

@@ -1975,7 +1975,7 @@ ResolveCloysterCollision: ; 0x1d32d
 	cp $4

 	jr nz, .asm_1d3d8

 	ld a, $1

-	ld [wd548], a

+	ld [wPinballIsVisible], a

 	ret

 

 .asm_1d3d8

@@ -5788,7 +5788,7 @@ Func_1e757: ; 0x1e757
 	cp $c

 	jr nz, .asm_1e7d0

 	xor a

-	ld [wd548], a

+	ld [wPinballIsVisible], a

 	ld [wBallSpin], a

 	ld [wBallRotation], a

 	ret

@@ -5843,7 +5843,7 @@ Func_1e830: ; 0x1e830
 	callba Func_10000

 	jr nc, .asm_1e84b

 	ld a, $1

-	ld [wd548], a

+	ld [wPinballIsVisible], a

 	ld [wEnableBallGravityAndTilt], a

 	ret

 

@@ -5891,12 +5891,12 @@ Func_1e830: ; 0x1e830
 	cp $d

 	jr nc, .asm_1e858

 	ld a, $1

-	ld [wd548], a

+	ld [wPinballIsVisible], a

 	ld [wEnableBallGravityAndTilt], a

 	ld a, [wCatchEmOrEvolutionSlotRewardActive]

 	cp EVOLUTION_MODE_SLOT_REWARD

 	ret nz

-	callba Func_10ab3

+	callba StartEvolutionMode

 	xor a

 	ld [wCatchEmOrEvolutionSlotRewardActive], a

 	ret

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 c3482d6..c73bacf 100755
--- a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
@@ -877,7 +877,7 @@ Func_1894c: ; 0x1894c
 	jr z, .asm_18980

 	inc a

 	ld [wd6a5], a

-	ld a, [wd548]

+	ld a, [wPinballIsVisible]

 	ld hl, wEnableBallGravityAndTilt

 	and [hl]

 	jr z, .asm_18973

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 2647c0a..ac5ead8 100755
--- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
@@ -4499,7 +4499,7 @@ ResolveBellsproutCollision: ; 0x15e93
 	cp $1

 	jr nz, .asm_15f35

 	xor a

-	ld [wd548], a

+	ld [wPinballIsVisible], a

 	ld a, [wRightAlleyCount]

 	cp $2

 	jr c, .noCatchEmMode

@@ -4523,7 +4523,7 @@ ResolveBellsproutCollision: ; 0x15e93
 	cp $4

 	jr nz, .asm_15f42

 	ld a, $1

-	ld [wd548], a

+	ld [wPinballIsVisible], a

 	ret

 

 .asm_15f42

@@ -4909,7 +4909,7 @@ ResolveDittoSlotCollision: ; 0x160f0
 	cp $9

 	jr nz, .asm_1616d

 	xor a

-	ld [wd548], a

+	ld [wPinballIsVisible], a

 	ld [wBallSpin], a

 	ld [wBallRotation], a

 	ret

@@ -4917,9 +4917,9 @@ ResolveDittoSlotCollision: ; 0x160f0
 .asm_1616d

 	cp $6

 	jr nz, .asm_1618e

-	callba Func_10ab3

+	callba StartEvolutionMode

 	ld a, $1

-	ld [wd548], a

+	ld [wPinballIsVisible], a

 	ld [wEnableBallGravityAndTilt], a

 	ld a, $5

 	ld [wd803], a

@@ -5127,7 +5127,7 @@ Func_16279: ; 0x16279
 	cp $c

 	jr nz, .asm_162f2

 	xor a

-	ld [wd548], a

+	ld [wPinballIsVisible], a

 	ld [wBallSpin], a

 	ld [wBallRotation], a

 	ret

@@ -5182,7 +5182,7 @@ Func_16352: ; 0x16352
 	callba Func_10000

 	jr nc, .asm_1636d

 	ld a, $1

-	ld [wd548], a

+	ld [wPinballIsVisible], a

 	ld [wEnableBallGravityAndTilt], a

 	ret

 

@@ -5230,12 +5230,12 @@ Func_16352: ; 0x16352
 	cp $d

 	jr nc, .asm_1637a

 	ld a, $1

-	ld [wd548], a

+	ld [wPinballIsVisible], a

 	ld [wEnableBallGravityAndTilt], a

 	ld a, [wCatchEmOrEvolutionSlotRewardActive]

 	cp EVOLUTION_MODE_SLOT_REWARD

 	ret nz

-	callba Func_10ab3

+	callba StartEvolutionMode

 	ld a, [wd7ad]

 	ld c, a

 	ld a, [wStageCollisionState]