From 2f7383f03d9e7368d744690be93e811a052d0d42 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 8 Jul 2017 18:34:44 -0700 Subject: Cleanup scrolling text labels. Use macro for the wram locations. Move text.asm -> text/scrolling_text.asm --- engine/pinball_game.asm | 4 +-- .../ball_loss/ball_loss_diglett_bonus.asm | 4 +-- .../ball_loss/ball_loss_gengar_bonus.asm | 4 +-- .../ball_loss/ball_loss_meowth_bonus.asm | 4 +-- .../ball_loss/ball_loss_mewtwo_bonus.asm | 4 +-- .../ball_loss/ball_loss_seel_bonus.asm | 4 +-- engine/pinball_game/catchem_mode.asm | 32 +++++++++++----------- .../evolution_mode/evolution_mode_blue_field.asm | 20 +++++++------- .../evolution_mode/evolution_mode_red_field.asm | 20 +++++++------- engine/pinball_game/extra_ball.asm | 10 +++---- .../blue_stage_resolve_collision.asm | 18 ++++++------ .../diglett_bonus_resolve_collision.asm | 4 +-- .../gengar_bonus_resolve_collision.asm | 4 +-- .../meowth_bonus_resolve_collision.asm | 4 +-- .../mewtwo_bonus_resolve_collision.asm | 4 +-- .../red_stage_resolve_collision.asm | 18 ++++++------ .../seel_bonus_resolve_collision.asm | 4 +-- engine/pinball_game/slot.asm | 10 +++---- 18 files changed, 86 insertions(+), 86 deletions(-) (limited to 'engine') diff --git a/engine/pinball_game.asm b/engine/pinball_game.asm index 0229035..c0da4a9 100644 --- a/engine/pinball_game.asm +++ b/engine/pinball_game.asm @@ -206,9 +206,9 @@ GameScreenFunction_HandleBallLoss: ; 0xda36 ld [wDrawBottomMessageBox], a call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct3 + ld hl, wScrollingText3 ld de, ShootAgainText - call LoadTextHeader + call LoadScrollingText ret .asm_daa9 diff --git a/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm index e0c1094..2dd8117 100644 --- a/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm @@ -18,7 +18,7 @@ HandleBallLossDiglettBonus: ; 0xe056 ret nz call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct3 + ld hl, wScrollingText3 ld de, EndDiglettStageText - call LoadTextHeader + call LoadScrollingText ret diff --git a/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm index c80e0c5..59a40da 100644 --- a/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm @@ -44,7 +44,7 @@ HandleBallLossGengarBonus: ; 0xdf1a ret nz call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct3 + ld hl, wScrollingText3 ld de, EndGengarStageText - call LoadTextHeader + call LoadScrollingText ret 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 52eb582..f80e758 100644 --- a/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm @@ -51,7 +51,7 @@ HandleBallLossMeowthBonus: ; 0xdfe2 ret nz call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct3 + ld hl, wScrollingText3 ld de, EndMeowthStageText - call LoadTextHeader + call LoadScrollingText ret diff --git a/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm index f8921b1..2cd165e 100644 --- a/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm @@ -44,7 +44,7 @@ HandleBallLossMewtwoBonus: ; 0xdf7e ret nz call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct3 + ld hl, wScrollingText3 ld de, EndMewtwoStageText - call LoadTextHeader + call LoadScrollingText ret 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 a3c829e..0c86084 100644 --- a/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm @@ -50,7 +50,7 @@ HandleBallLossSeelBonus: ; 0xe08b ret nz call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct3 + ld hl, wScrollingText3 ld de, EndSeelStageText - call LoadTextHeader + call LoadScrollingText ret diff --git a/engine/pinball_game/catchem_mode.asm b/engine/pinball_game/catchem_mode.asm index 879b5b0..095a877 100644 --- a/engine/pinball_game/catchem_mode.asm +++ b/engine/pinball_game/catchem_mode.asm @@ -930,17 +930,17 @@ ShowAnimatedWildMon: ; 0x10678 Func_10696: ; 0x10696 call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct1 + ld hl, wScrollingText1 ld de, LetsGetPokemonText - call LoadTextHeader + call LoadScrollingText ret Func_106a6: ; 0x106a6 call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct1 + ld hl, wScrollingText1 ld de, PokemonRanAwayText - call LoadTextHeader + call LoadScrollingText ret Func_106b6: ; 0x106b6 @@ -979,12 +979,12 @@ Func_106b6: ; 0x106b6 push de call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct1 + ld hl, wScrollingText1 pop de - call LoadTextHeader - ld hl, wScrollingTextStruct2 + call LoadScrollingText + ld hl, wScrollingText2 pop de - call LoadTextHeader + call LoadScrollingText pop hl ld de, wBottomMessageText + $20 ld b, $0 ; count the number of letters in mon's name in register b @@ -1003,16 +1003,16 @@ Func_106b6: ; 0x106b6 inc de xor a ld [de], a - ld a, [wd5db] + ld a, [wScrollingText2ScrollStepsRemaining] add b - ld [wd5db], a + ld [wScrollingText2ScrollStepsRemaining], a ld a, $14 sub b srl a ld b, a - ld a, [wd5d8] + ld a, [wScrollingText2StopOffset] add b - ld [wd5d8], a + ld [wScrollingText2StopOffset], a ret Func_10732: ; 0x10732 @@ -1178,12 +1178,12 @@ Func_10848: ; 0x10848 callba AddBigBCD6FromQueue call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct2 + ld hl, wScrollingText2 ld de, OneBillionText - call LoadTextHeader - ld hl, wScrollingTextStruct1 + call LoadScrollingText + ld hl, wScrollingText1 ld de, PokemonCaughtSpecialBonusText - call LoadTextHeader + call LoadScrollingText call Func_3475 ret diff --git a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm index f0523d8..efdbe83 100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm @@ -72,8 +72,8 @@ Func_20c08: ; 0x20c08 call FillBottomMessageBufferWithBlackTile call Func_30db ld de, YeahYouGotItText - ld hl, wScrollingTextStruct1 - call LoadTextHeader + ld hl, wScrollingText1 + call LoadScrollingText ld a, [hGameBoyColorFlag] and a jr z, .asm_20c74 @@ -257,9 +257,9 @@ Func_20da0: ; 0x20da0 callba StopTimer call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct1 + ld hl, wScrollingText1 ld de, EvolutionFailedText - call LoadTextHeader + call LoadScrollingText ret Func_20e34: ; 0x20e34 @@ -494,8 +494,8 @@ Func_20f75: ; 0x20f75 ld e, a ld a, [hl] ld d, a - ld hl, wScrollingTextStruct1 - call LoadTextHeader + ld hl, wScrollingText1 + call LoadScrollingText scf ret @@ -527,14 +527,14 @@ Func_20fef: ; 0x20fef callba AddBigBCD6FromQueue call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct1 + ld hl, wScrollingText1 ld a, [wCurrentEvolutionType] cp EVO_EXPERIENCE ld de, PokemonIsTiredText jr z, .asm_21057 ld de, ItemNotFoundText .asm_21057 - call LoadTextHeader + call LoadScrollingText scf ret @@ -631,8 +631,8 @@ asm_210c7: jr z, .asm_21115 ld de, TryNextPlaceText .asm_21115 - ld hl, wScrollingTextStruct1 - call LoadTextHeader + ld hl, wScrollingText1 + call LoadScrollingText scf ret diff --git a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm index fed675f..384e958 100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm @@ -75,8 +75,8 @@ Func_205e0: ; 0x205e0 call FillBottomMessageBufferWithBlackTile call Func_30db ld de, YeahYouGotItText - ld hl, wScrollingTextStruct1 - call LoadTextHeader + ld hl, wScrollingText1 + call LoadScrollingText ld a, [hGameBoyColorFlag] and a jr z, .asm_2064f @@ -260,9 +260,9 @@ Func_2077b: ; 0x2077b callba StopTimer call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct1 + ld hl, wScrollingText1 ld de, EvolutionFailedText - call LoadTextHeader + call LoadScrollingText ret Func_2080f: ; 0x2080f @@ -517,8 +517,8 @@ Func_20977: ; 0x20977 ld e, a ld a, [hl] ld d, a - ld hl, wScrollingTextStruct1 - call LoadTextHeader + ld hl, wScrollingText1 + call LoadScrollingText scf ret @@ -549,14 +549,14 @@ Func_209eb: ; 0x209eb callba AddBigBCD6FromQueue call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct1 + ld hl, wScrollingText1 ld a, [wCurrentEvolutionType] cp EVO_EXPERIENCE ld de, PokemonIsTiredText jr z, .asm_20a50 ld de, ItemNotFoundText .asm_20a50 - call LoadTextHeader + call LoadScrollingText scf ret @@ -633,8 +633,8 @@ asm_20a9f: jr z, .asm_20aed ld de, TryNextPlaceText .asm_20aed - ld hl, wScrollingTextStruct1 - call LoadTextHeader + ld hl, wScrollingText1 + call LoadScrollingText scf ret diff --git a/engine/pinball_game/extra_ball.asm b/engine/pinball_game/extra_ball.asm index becdd78..2436763 100644 --- a/engine/pinball_game/extra_ball.asm +++ b/engine/pinball_game/extra_ball.asm @@ -10,9 +10,9 @@ HandleExtraBall: ; 0x30188 jr nz, .asm_301a7 call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct1 + ld hl, wScrollingText1 ld de, ExtraBallText - call LoadTextHeader + call LoadScrollingText jr .asm_301c9 .asm_301a7 @@ -22,14 +22,14 @@ HandleExtraBall: ; 0x30188 push de call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wScrollingTextStruct2 + ld hl, wScrollingText2 ld de, DigitsText1to9 call Func_32cc pop de pop bc - ld hl, wScrollingTextStruct1 + ld hl, wScrollingText1 ld de, ExtraBallSpecialBonusText - call LoadTextHeader + call LoadScrollingText .asm_301c9 xor a ld [wd4ca], a 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 diff --git a/engine/pinball_game/slot.asm b/engine/pinball_game/slot.asm index ab84c61..5acb4b1 100644 --- a/engine/pinball_game/slot.asm +++ b/engine/pinball_game/slot.asm @@ -369,8 +369,8 @@ SlotRewardUpgradeBall: ; 0xf040 call FillBottomMessageBufferWithBlackTile call Func_30db ld de, FieldMultiplierText - ld hl, wScrollingTextStruct1 - call LoadTextHeader + ld hl, wScrollingText1 + call LoadScrollingText ; upgrade ball type ld a, [wBallType] ld c, a @@ -394,14 +394,14 @@ SlotRewardUpgradeBall: ; 0xf040 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_f0b0 callba Func_155bb ret -- cgit v1.2.3