diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-09 17:03:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 17:03:02 -0600 |
| commit | 1877ba24ca489827f1093858ed58c38ff00a4576 (patch) | |
| tree | 502c26ec51aa55df4eb1ff4324ab90c3b0a0610a /asm/battle_1.s | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
| parent | 03b167a73e2f18fa79bbf0e6ffe11e0c35c12ad8 (diff) | |
Merge pull request #518 from camthesaxman/menu_refactor
re-label some window and text code
Diffstat (limited to 'asm/battle_1.s')
| -rw-r--r-- | asm/battle_1.s | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index f0a883ec4..da604c6b6 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -448,16 +448,16 @@ _0800D748: .4byte 0x0000bf40 sub_800D74C: @ 800D74C push {r4,lr} movs r0, 0x12 - bl SetTextWindowBaseTileNum + bl TextWindow_SetBaseTileNum ldr r4, _0800D79C @ =gUnknown_03004210 adds r0, r4, 0 movs r1, 0x1 - bl LoadTextWindowGraphics_OverridePalSlot + bl TextWindow_LoadStdFrameGraphicsOverridePal movs r0, 0x22 - bl SetTextWindowBaseTileNum + bl TextWindow_SetBaseTileNum adds r0, r4, 0 movs r1, 0x1 - bl LoadTextWindowGraphics_OverridePalSlot + bl TextWindow_LoadStdFrameGraphicsOverridePal ldr r3, _0800D7A0 @ =gPlttBufferUnfaded adds r0, r3, 0 adds r0, 0xB8 @@ -1055,9 +1055,9 @@ _0800DE88: str r0, [sp, 0x4] adds r0, r1, 0 adds r1, r7, 0 - bl sub_8002E4C + bl Text_InitWindow8002E4C ldr r0, [sp, 0xC] - bl sub_8002F44 + bl Text_PrintWindow8002F44 ldr r2, _0800DEDC @ =gUnknown_081F9680 + 0x8 adds r4, r2 ldr r2, [r4] @@ -1111,9 +1111,9 @@ _0800DF04: movs r5, 0x1 str r5, [sp, 0x4] adds r0, r4, 0 - bl sub_8002E4C + bl Text_InitWindow8002E4C adds r0, r4, 0 - bl sub_8002F44 + bl Text_PrintWindow8002F44 mov r0, r8 ldr r2, [r0, 0x38] mov r0, r9 @@ -1134,9 +1134,9 @@ _0800DF04: str r0, [sp] str r5, [sp, 0x4] adds r0, r4, 0 - bl sub_8002E4C + bl Text_InitWindow8002E4C adds r0, r4, 0 - bl sub_8002F44 + bl Text_PrintWindow8002F44 mov r5, r8 ldr r2, [r5, 0x44] mov r0, r9 |