Merge branch 'chaos_requests'

7 files changed, 15 insertions, 15 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 7b79312..f33cd7a 100644
--- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
@@ -1340,7 +1340,7 @@ ShowBonusMultiplierMessage_BlueField: ; 0x1d5bf
 	ld [wd613], a

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wd5cc

+	ld hl, wScrollingTextStruct1

 	ld de, BonusMultiplierText

 	call LoadTextHeader

 	ld hl, wBottomMessageText + $12

@@ -2081,7 +2081,7 @@ ResolveBlueStagePinballUpgradeTriggersCollision: ; 0x1e356
 	call PlaySoundEffect

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wd5cc

+	ld hl, wScrollingTextStruct1

 	ld de, FieldMultiplierText

 	call LoadTextHeader

 	ld a, [wBallType]

@@ -2106,12 +2106,12 @@ ResolveBlueStagePinballUpgradeTriggersCollision: ; 0x1e356
 	push de

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wd5d4

+	ld hl, wScrollingTextStruct2

 	ld de, DigitsText1to8

 	call Func_32cc

 	pop de

 	pop bc

-	ld hl, wd5cc

+	ld hl, wScrollingTextStruct1

 	ld de, FieldMultiplierSpecialBonusText

 	call LoadTextHeader

 .asm_1e465

@@ -2896,7 +2896,7 @@ Func_1e830: ; 0x1e830
 Func_1e8c3: ; 0x1e8c3

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wd5dc

+	ld hl, wScrollingTextStruct3

 	ld a, [wd497]

 	ld de, GoToMeowthStageText

 	cp STAGE_MEOWTH_BONUS

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 303cbe7..3255deb 100644
--- a/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm
@@ -677,7 +677,7 @@ Func_1ab30: ; 0x1ab30
 	ld [wCompletedBonusStage], a

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wd5dc

+	ld hl, wScrollingTextStruct3

 	ld de, DiglettStageClearedText

 	call LoadTextHeader

 	lb de, $4b, $2a

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 c73bacf..daf3c5c 100644
--- a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
@@ -1005,7 +1005,7 @@ Func_189af: ; 0x189af
 	ld [wCompletedBonusStage], a

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wd5dc

+	ld hl, wScrollingTextStruct3

 	ld de, GengarStageClearedText

 	call LoadTextHeader

 	lb de, $4b, $2a

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 9aa3d36..a8284f2 100644
--- a/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm
@@ -202,7 +202,7 @@ ResolveMeowthBonusGameObjectCollisions: ; 0x2442a
 	ld [wCompletedBonusStage], a

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wd5dc

+	ld hl, wScrollingTextStruct3

 	ld de, MeowthStageClearedText

 	call LoadTextHeader

 	lb de, $4b, $2a

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 1717126..eb47047 100644
--- a/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm
@@ -351,7 +351,7 @@ Func_19638: ; 0x19638
 	ld [wCompletedBonusStage], a

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wd5dc

+	ld hl, wScrollingTextStruct3

 .asm_1966b

 	ld de, MewtwoStageClearedText

 	call LoadTextHeader

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 12da6fa..f9726f6 100644
--- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
@@ -1141,7 +1141,7 @@ ResolveRedStagePinballUpgradeTriggersCollision: ; 0x1535d
 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

 	ld de, FieldMultiplierText

-	ld hl, wd5cc

+	ld hl, wScrollingTextStruct1

 	call LoadTextHeader

 	ld a, [wBallType]

 	ld c, a

@@ -1165,12 +1165,12 @@ ResolveRedStagePinballUpgradeTriggersCollision: ; 0x1535d
 	push de

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wd5d4

+	ld hl, wScrollingTextStruct2

 	ld de, DigitsText1to8

 	call Func_32cc

 	pop de

 	pop bc

-	ld hl, wd5cc

+	ld hl, wScrollingTextStruct1

 	ld de, FieldMultiplierSpecialBonusText

 	call LoadTextHeader

 .asm_15447

@@ -3612,7 +3612,7 @@ Func_16352: ; 0x16352
 Func_163f2: ; 0x163f2

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wd5dc

+	ld hl, wScrollingTextStruct3

 	ld a, [wd497]

 	ld de, GoToDiglettStageText

 	cp STAGE_DIGLETT_BONUS

@@ -5596,7 +5596,7 @@ ShowBonusMultiplierMessage_RedField: ; 0x16ef5
 	ld [wd613], a

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wd5cc

+	ld hl, wScrollingTextStruct1

 	ld de, BonusMultiplierText

 	call LoadTextHeader

 	ld hl, wBottomMessageText + $12

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 81861a4..48dbde4 100644
--- a/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm
@@ -15,7 +15,7 @@ ResolveSeelBonusGameObjectCollisions: ; 0x25c5a
 	ld [wCompletedBonusStage], a

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wd5dc

+	ld hl, wScrollingTextStruct3

 	ld de, SeelStageClearedText

 	call LoadTextHeader

 	ld a, $2