Cleanup scrolling text labels. Use macro for the wram locations. Move text.asm -> text/scrolling_text.asm

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

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wScrollingTextStruct1

+	ld hl, wScrollingText1

 	ld de, BonusMultiplierText

-	call LoadTextHeader

+	call LoadScrollingText

 	ld hl, wBottomMessageText + $12

 	ld a, [wd614]

 	and $7f

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

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wScrollingTextStruct1

+	ld hl, wScrollingText1

 	ld de, FieldMultiplierText

-	call LoadTextHeader

+	call LoadScrollingText

 	ld a, [wBallType]

 	ld c, a

 	ld b, $0

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

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wScrollingTextStruct2

+	ld hl, wScrollingText2

 	ld de, DigitsText1to8

 	call Func_32cc

 	pop de

 	pop bc

-	ld hl, wScrollingTextStruct1

+	ld hl, wScrollingText1

 	ld de, FieldMultiplierSpecialBonusText

-	call LoadTextHeader

+	call LoadScrollingText

 .asm_1e465

 	callba TransitionPinballUpgrade

 	jr asm_1e475

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

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wScrollingTextStruct3

+	ld hl, wScrollingText3

 	ld a, [wd497]

 	ld de, GoToMeowthStageText

 	cp STAGE_MEOWTH_BONUS

@@ -2906,7 +2906,7 @@ Func_1e8c3: ; 0x1e8c3
 	jr z, .loadText

 	ld de, GoToMewtwoStageText

 .loadText

-	call LoadTextHeader

+	call LoadScrollingText

 	ld de, $0000

 	call PlaySong

 	rst AdvanceFrame

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

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wScrollingTextStruct3

+	ld hl, wScrollingText3

 	ld de, DiglettStageClearedText

-	call LoadTextHeader

+	call LoadScrollingText

 	lb de, $4b, $2a

 	call PlaySoundEffect

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

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wScrollingTextStruct3

+	ld hl, wScrollingText3

 	ld de, GengarStageClearedText

-	call LoadTextHeader

+	call LoadScrollingText

 	lb de, $4b, $2a

 	call PlaySoundEffect

 	ret

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

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wScrollingTextStruct3

+	ld hl, wScrollingText3

 	ld de, MeowthStageClearedText

-	call LoadTextHeader

+	call LoadScrollingText

 	lb de, $4b, $2a

 	call PlaySoundEffect

 .asm_24498

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

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wScrollingTextStruct3

+	ld hl, wScrollingText3

 .asm_1966b

 	ld de, MewtwoStageClearedText

-	call LoadTextHeader

+	call LoadScrollingText

 	lb de, $4b, $2a

 	call PlaySoundEffect

 	ret

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

 	call Func_30db

 	ld de, FieldMultiplierText

-	ld hl, wScrollingTextStruct1

-	call LoadTextHeader

+	ld hl, wScrollingText1

+	call LoadScrollingText

 	ld a, [wBallType]

 	ld c, a

 	ld b, $0

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

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wScrollingTextStruct2

+	ld hl, wScrollingText2

 	ld de, DigitsText1to8

 	call Func_32cc

 	pop de

 	pop bc

-	ld hl, wScrollingTextStruct1

+	ld hl, wScrollingText1

 	ld de, FieldMultiplierSpecialBonusText

-	call LoadTextHeader

+	call LoadScrollingText

 .asm_15447

 	call TransitionPinballUpgrade

 	jr Func_15450

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

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wScrollingTextStruct3

+	ld hl, wScrollingText3

 	ld a, [wd497]

 	ld de, GoToDiglettStageText

 	cp STAGE_DIGLETT_BONUS

@@ -3622,7 +3622,7 @@ Func_163f2: ; 0x163f2
 	jr z, .asm_1640f

 	ld de, GoToMewtwoStageText

 .asm_1640f

-	call LoadTextHeader

+	call LoadScrollingText

 	ld de, $0000

 	call PlaySong

 	rst AdvanceFrame

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

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wScrollingTextStruct1

+	ld hl, wScrollingText1

 	ld de, BonusMultiplierText

-	call LoadTextHeader

+	call LoadScrollingText

 	ld hl, wBottomMessageText + $12

 	ld a, [wd614]

 	and $7f

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

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

-	ld hl, wScrollingTextStruct3

+	ld hl, wScrollingText3

 	ld de, SeelStageClearedText

-	call LoadTextHeader

+	call LoadScrollingText

 	ld a, $2

 	ld [wd794], a

 	lb de, $4b, $2a