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 --- .../evolution_mode/evolution_mode_blue_field.asm | 20 ++++++++++---------- .../evolution_mode/evolution_mode_red_field.asm | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'engine/pinball_game/evolution_mode') 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 -- cgit v1.2.3