diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-07-08 17:48:39 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-07-08 17:48:39 -0700 |
| commit | 7c97dcbc6c8fc8aeeabb9629bc98af05a4d8e8de (patch) | |
| tree | ba29ae51782379261fc7329fa7c5c8499be90c35 /engine/pinball_game/evolution_mode | |
| parent | 519111415056983f3955bc8847283e675dc61280 (diff) | |
| parent | 75f8a8fdeb7b85c649d954aee6d0ed6bb3e90232 (diff) | |
Merge branch 'chaos_requests'
Diffstat (limited to 'engine/pinball_game/evolution_mode')
| -rw-r--r-- | engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm | 10 | ||||
| -rw-r--r-- | engine/pinball_game/evolution_mode/evolution_mode_red_field.asm | 10 |
2 files changed, 10 insertions, 10 deletions
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 a1af8f5..f0523d8 100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm @@ -72,7 +72,7 @@ Func_20c08: ; 0x20c08 call FillBottomMessageBufferWithBlackTile
call Func_30db
ld de, YeahYouGotItText
- ld hl, wd5cc
+ ld hl, wScrollingTextStruct1
call LoadTextHeader
ld a, [hGameBoyColorFlag]
and a
@@ -257,7 +257,7 @@ Func_20da0: ; 0x20da0 callba StopTimer
call FillBottomMessageBufferWithBlackTile
call Func_30db
- ld hl, wd5cc
+ ld hl, wScrollingTextStruct1
ld de, EvolutionFailedText
call LoadTextHeader
ret
@@ -494,7 +494,7 @@ Func_20f75: ; 0x20f75 ld e, a
ld a, [hl]
ld d, a
- ld hl, wd5cc
+ ld hl, wScrollingTextStruct1
call LoadTextHeader
scf
ret
@@ -527,7 +527,7 @@ Func_20fef: ; 0x20fef callba AddBigBCD6FromQueue
call FillBottomMessageBufferWithBlackTile
call Func_30db
- ld hl, wd5cc
+ ld hl, wScrollingTextStruct1
ld a, [wCurrentEvolutionType]
cp EVO_EXPERIENCE
ld de, PokemonIsTiredText
@@ -631,7 +631,7 @@ asm_210c7: jr z, .asm_21115
ld de, TryNextPlaceText
.asm_21115
- ld hl, wd5cc
+ ld hl, wScrollingTextStruct1
call LoadTextHeader
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 a1149c1..fed675f 100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm @@ -75,7 +75,7 @@ Func_205e0: ; 0x205e0 call FillBottomMessageBufferWithBlackTile
call Func_30db
ld de, YeahYouGotItText
- ld hl, wd5cc
+ ld hl, wScrollingTextStruct1
call LoadTextHeader
ld a, [hGameBoyColorFlag]
and a
@@ -260,7 +260,7 @@ Func_2077b: ; 0x2077b callba StopTimer
call FillBottomMessageBufferWithBlackTile
call Func_30db
- ld hl, wd5cc
+ ld hl, wScrollingTextStruct1
ld de, EvolutionFailedText
call LoadTextHeader
ret
@@ -517,7 +517,7 @@ Func_20977: ; 0x20977 ld e, a
ld a, [hl]
ld d, a
- ld hl, wd5cc
+ ld hl, wScrollingTextStruct1
call LoadTextHeader
scf
ret
@@ -549,7 +549,7 @@ Func_209eb: ; 0x209eb callba AddBigBCD6FromQueue
call FillBottomMessageBufferWithBlackTile
call Func_30db
- ld hl, wd5cc
+ ld hl, wScrollingTextStruct1
ld a, [wCurrentEvolutionType]
cp EVO_EXPERIENCE
ld de, PokemonIsTiredText
@@ -633,7 +633,7 @@ asm_20a9f: jr z, .asm_20aed
ld de, TryNextPlaceText
.asm_20aed
- ld hl, wd5cc
+ ld hl, wScrollingTextStruct1
call LoadTextHeader
scf
ret
|