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 /main.asm | |
| parent | 519111415056983f3955bc8847283e675dc61280 (diff) | |
| parent | 75f8a8fdeb7b85c649d954aee6d0ed6bb3e90232 (diff) | |
Merge branch 'chaos_requests'
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -118,7 +118,7 @@ Func_dc6d: ; 0xdc6d push de call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wd5dc + ld hl, wScrollingTextStruct3 pop de call LoadTextHeader ret @@ -307,7 +307,7 @@ VideoData_10b2a: ; 0x10b2a Func_10b3f: ; 0x10b3f call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wd5cc + ld hl, wScrollingTextStruct1 ld a, [wCurrentEvolutionType] cp EVO_EXPERIENCE ld de, StartTrainingText @@ -763,10 +763,10 @@ Func_10e0a: ; 0x10e0a push de call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wd5cc + ld hl, wScrollingTextStruct1 pop de call LoadTextHeader - ld hl, wd5d4 + ld hl, wScrollingTextStruct2 pop de call LoadTextHeader pop hl @@ -808,12 +808,12 @@ Func_10e8b: ; 0x10e8b push de call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wd5d4 + ld hl, wScrollingTextStruct2 ld de, Data_2b6b call Func_32cc pop de pop bc - ld hl, wd5cc + ld hl, wScrollingTextStruct1 ld de, EvolutionSpecialBonusText call LoadTextHeader ret @@ -1534,10 +1534,10 @@ LoadScrollingMapNameText: ; 0x3118f ld e, a ld a, [hli] ld d, a - ld hl, wd5d4 + ld hl, wScrollingTextStruct2 call LoadTextHeader pop de - ld hl, wd5cc + ld hl, wScrollingTextStruct1 call LoadTextHeader ret @@ -1970,7 +1970,7 @@ Func_3151f: ; 0x3151f callba StopTimer call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wd5cc + ld hl, wScrollingTextStruct1 ld de, MapMoveFailedText call LoadTextHeader ret @@ -2124,7 +2124,7 @@ Func_3168c: ; 0x3168c callba StopTimer call FillBottomMessageBufferWithBlackTile call Func_30db - ld hl, wd5cc + ld hl, wScrollingTextStruct1 ld de, MapMoveFailedText call LoadTextHeader ret |