diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-10 03:32:55 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-06-10 18:37:25 -0700 |
| commit | a27cec41b55f1c780ee2be3041701b1f0e31e047 (patch) | |
| tree | 75c99e8ba39a9e3ea7b3965fbb33bdda76fd9b15 /asm/rom5.s | |
| parent | a37de9f76364f3ed95c49ca1417ee01cd4d617b1 (diff) | |
decompile palette.c
Diffstat (limited to 'asm/rom5.s')
| -rw-r--r-- | asm/rom5.s | 972 |
1 files changed, 486 insertions, 486 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 17e783f1c..e1d7c1da0 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -92,7 +92,7 @@ _0807AE20: ldr r4, _0807AE5C adds r0, r4, 0 bl SetUpWindowConfig - bl sub_8073B94 + bl ResetPaletteFade ldr r0, _0807AE60 adds r1, r4, 0 bl InitWindowFromConfig @@ -324,7 +324,7 @@ _0807B010: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl sub_80748D0 + bl BeginHardwarePaletteFade ldr r2, _0807B05C ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -1278,7 +1278,7 @@ sub_807B7E0: @ 807B7E0 ldrb r2, [r4, 0x10] ldrh r3, [r4, 0xA] movs r1, 0x10 - bl pal_fade_1 + bl BlendPalette ldrh r2, [r4, 0x12] movs r1, 0x12 ldrsh r0, [r4, r1] @@ -2431,7 +2431,7 @@ sub_807C0C8: @ 807C0C8 bl sub_8089668 bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer ldr r0, _0807C0E8 ldr r1, _0807C0EC ldrh r1, [r1] @@ -2534,7 +2534,7 @@ _0807C130: ldr r0, _0807C1D8 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - bl sub_8073B94 + bl ResetPaletteFade ldr r0, _0807C1DC ldr r1, _0807C1E0 adds r0, r1 @@ -2667,7 +2667,7 @@ _0807C308: movs r1, 0x1 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0807C330 bl SetVBlankCallback ldr r0, _0807C334 @@ -2775,7 +2775,7 @@ _0807C40C: .4byte 0x0000019d _0807C410: .4byte 0x03001770 _0807C414: .4byte 0x0000043c _0807C418: - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -2809,7 +2809,7 @@ sub_807C454: @ 807C454 bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_807C454 @@ -3088,7 +3088,7 @@ _0807C67A: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0807C6B0 bl SetMainCallback2 b _0807C74E @@ -3124,7 +3124,7 @@ _0807C6C4: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0807C6F8 bl SetMainCallback2 b _0807C74E @@ -3168,7 +3168,7 @@ _0807C728: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0807C770 bl SetMainCallback2 _0807C74E: @@ -3189,7 +3189,7 @@ _0807C770: .4byte sub_807C790 thumb_func_start sub_807C774 sub_807C774: @ 807C774 push {lr} - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _0807C786 @@ -3205,7 +3205,7 @@ _0807C78C: .4byte CB2_InitMainMenu thumb_func_start sub_807C790 sub_807C790: @ 807C790 push {lr} - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _0807C7A2 @@ -3221,7 +3221,7 @@ _0807C7A8: .4byte sub_813BA88 thumb_func_start sub_807C7AC sub_807C7AC: @ 807C7AC push {lr} - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _0807C7BE @@ -3237,7 +3237,7 @@ _0807C7C4: .4byte c2_clear_save_data_screen_2 thumb_func_start sub_807C7C8 sub_807C7C8: @ 807C7C8 push {lr} - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _0807C7DA @@ -4588,7 +4588,7 @@ _0807D214: adds r0, r6, 0 movs r1, 0x10 mov r2, r8 - bl pal_fade_1 + bl BlendPalette adds r0, r6, 0 adds r0, 0x10 lsls r0, 16 @@ -4743,7 +4743,7 @@ _0807D33C: adds r0, r5, 0 movs r1, 0x10 adds r2, r6, 0 - bl pal_fade_1 + bl BlendPalette adds r0, r5, 0 adds r0, 0x10 lsls r0, 16 @@ -4869,7 +4869,7 @@ sub_807D424: @ 807D424 lsls r1, 1 movs r0, 0 adds r2, r7, 0 - bl pal_fade_1 + bl BlendPalette ldr r0, [sp] lsls r1, r0, 27 lsrs r1, 27 @@ -4976,7 +4976,7 @@ _0807D510: ldrh r3, [r1] movs r1, 0x10 adds r2, r7, 0 - bl pal_fade_1 + bl BlendPalette adds r4, 0x1 mov r9, r4 _0807D524: @@ -5215,7 +5215,7 @@ _0807D6C2: str r4, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0807D6E8 ldr r3, _0807D6EC adds r0, r3 @@ -5251,7 +5251,7 @@ _0807D714: str r4, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade _0807D726: ldr r4, _0807D760 ldr r1, _0807D764 @@ -5397,7 +5397,7 @@ _0807D820: lsrs r3, 17 adds r0, r4, 0 movs r1, 0x10 - bl pal_fade_1 + bl BlendPalette b _0807D868 .align 2, 0 _0807D84C: .4byte 0x0202eec8 @@ -5410,7 +5410,7 @@ _0807D858: adds r0, r4, 0 movs r1, 0x10 movs r2, 0xC - bl pal_fade_1 + bl BlendPalette _0807D868: pop {r4-r6} pop {r0} @@ -14947,7 +14947,7 @@ _080821D4: .4byte sub_80821D8 thumb_func_start sub_80821D8 sub_80821D8: @ 80821D8 push {lr} - bl fade_and_return_progress_probably + bl UpdatePaletteFade bl RunTasks bl sub_811AAE8 lsls r0, 24 @@ -31138,7 +31138,7 @@ _08089D60: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _08089D8C lsls r0, r4, 2 adds r0, r4 @@ -31437,7 +31437,7 @@ sub_8089FCC: @ 8089FCC str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _08089FFC lsls r0, r4, 2 adds r0, r4 @@ -31740,7 +31740,7 @@ sub_808A228: @ 808A228 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0808A270 lsls r0, r4, 2 adds r0, r4 @@ -32225,7 +32225,7 @@ sub_808A630: @ 808A630 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0808A670 lsls r0, r4, 2 adds r0, r4 @@ -32451,7 +32451,7 @@ sub_808A810: @ 808A810 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0808A840 lsls r0, r4, 2 adds r0, r4 @@ -32727,7 +32727,7 @@ _0808AA2C: str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _0808AADA .align 2, 0 _0808AA78: .4byte gUnknown_0839F58C @@ -33629,7 +33629,7 @@ _0808B184: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r2, _0808B1DC ldrb r0, [r2] cmp r0, 0x1 @@ -33707,7 +33707,7 @@ sub_808B224: @ 808B224 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0808B254 lsls r0, r4, 2 adds r0, r4 @@ -33785,7 +33785,7 @@ sub_808B2B4: @ 808B2B4 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0808B2E4 lsls r0, r4, 2 adds r0, r4 @@ -33818,7 +33818,7 @@ sub_808B2EC: @ 808B2EC str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0808B320 lsls r0, r4, 2 adds r0, r4 @@ -34203,7 +34203,7 @@ sub_808B610: @ 808B610 bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_808B610 @@ -34213,7 +34213,7 @@ sub_808B628: @ 808B628 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_808B628 @@ -34349,7 +34349,7 @@ _0808B74C: .4byte 0x81000800 _0808B750: .4byte 0x03001770 _0808B754: .4byte 0x0000043c _0808B758: - bl sub_8073B94 + bl ResetPaletteFade bl remove_some_task bl ResetTasks bl ResetSpriteData @@ -34405,7 +34405,7 @@ _0808B7D0: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0808B7E8 ldr r2, _0808B7EC adds r1, r2 @@ -34893,7 +34893,7 @@ sub_808BB80: @ 808BB80 str r2, [sp] movs r1, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0808BC0C str r0, [r4] add sp, 0x4 @@ -35553,7 +35553,7 @@ sub_808C0B8: @ 808C0B8 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_808C0B8 @@ -35871,7 +35871,7 @@ _0808C344: bl remove_some_task bl ResetTasks bl ResetSpriteData - bl sub_8073B94 + bl ResetPaletteFade bl FreeAllSpritePalettes ldr r1, _0808C374 movs r0, 0x8 @@ -36093,7 +36093,7 @@ unref_sub_808C540: @ 808C540 bl sub_8091060 bl remove_some_task bl ResetTasks - bl sub_8073B94 + bl ResetPaletteFade ldr r3, _0808C59C ldrh r2, [r3] movs r0, 0 @@ -36163,7 +36163,7 @@ sub_808C5F0: @ 808C5F0 bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_808C5F0 @@ -36272,7 +36272,7 @@ _0808C68C: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, [r7] add r0, r8 ldrh r1, [r0] @@ -36353,7 +36353,7 @@ _0808C774: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade bl sub_8091E3C ldr r1, _0808C7F4 lsls r3, r6, 2 @@ -36419,7 +36419,7 @@ _0808C814: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0808C844 lsls r0, r6, 2 adds r0, r6 @@ -36607,7 +36607,7 @@ _0808C9A0: str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0808C9F0 lsls r0, r6, 2 adds r0, r6 @@ -37086,7 +37086,7 @@ _0808CD44: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0808CDC8 lsls r0, r5, 2 adds r0, r5 @@ -37155,7 +37155,7 @@ _0808CE20: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade bl sub_8091E3C ldr r2, _0808CE68 lsls r1, r5, 2 @@ -37192,7 +37192,7 @@ _0808CE78: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0808CEA8 lsls r0, r5, 2 adds r0, r5 @@ -37391,7 +37391,7 @@ _0808D024: str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0808D04C lsls r0, r6, 2 adds r0, r6 @@ -37412,7 +37412,7 @@ _0808D054: str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0808D0A4 lsls r0, r6, 2 adds r0, r6 @@ -37869,7 +37869,7 @@ _0808D438: ldr r1, _0808D460 bl LZ77UnCompVram _0808D440: - bl sub_8073B94 + bl ResetPaletteFade cmp r5, 0 bne _0808D46C ldr r0, _0808D464 @@ -37996,7 +37996,7 @@ _0808D564: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0808D584 bl SetVBlankCallback ldr r1, _0808D588 @@ -42053,7 +42053,7 @@ _0808F5B0: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0808F5D0 ldr r0, [r0] bl SetVBlankCallback @@ -42201,7 +42201,7 @@ sub_808F6CC: @ 808F6CC str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0808F708 str r0, [r5] movs r0, 0x6C @@ -42226,7 +42226,7 @@ _0808F70C: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0808F740 str r0, [r5] movs r0, 0x3 @@ -42271,7 +42271,7 @@ _0808F77C: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0808F790 b _0808F7DA .align 2, 0 @@ -42283,7 +42283,7 @@ _0808F794: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0808F7A8 b _0808F7DA .align 2, 0 @@ -42308,7 +42308,7 @@ _0808F7C8: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0808F7E4 _0808F7DA: str r0, [r5] @@ -42763,7 +42763,7 @@ _0808FB9C: bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C - bl sub_8073B94 + bl ResetPaletteFade ldr r1, _0808FBBC ldr r0, _0808FBC0 adds r1, r0 @@ -42943,7 +42943,7 @@ _0808FD40: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0808FD60 ldr r0, [r0] bl SetVBlankCallback @@ -43085,7 +43085,7 @@ _0808FE62: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0808FEAC bl m4aMPlayContinue ldr r0, _0808FEB0 @@ -43132,7 +43132,7 @@ _0808FEDA: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0808FF18 bl m4aMPlayContinue ldr r0, _0808FF1C @@ -43194,7 +43194,7 @@ _0808FF68: str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0808FFA8 bl m4aMPlayContinue ldr r0, _0808FFAC @@ -43455,7 +43455,7 @@ _080901B4: .4byte 0x02024ea4 _080901B8: .4byte 0x03001770 _080901BC: .4byte 0x0000043c _080901C0: - bl sub_8073B94 + bl ResetPaletteFade ldr r1, _080901CC ldr r0, _080901D0 adds r1, r0 @@ -43615,7 +43615,7 @@ _08090318: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _08090338 ldr r0, [r0] bl SetVBlankCallback @@ -43715,7 +43715,7 @@ sub_80903D0: @ 80903D0 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _08090420 ldr r0, [r0] ldr r1, _08090424 @@ -43759,7 +43759,7 @@ _0809044A: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _08090488 ldr r0, [r0] ldr r1, _0809048C @@ -44251,7 +44251,7 @@ _08090800: lsls r2, 2 movs r1, 0x2 bl sub_8091738 - bl sub_8073B94 + bl ResetPaletteFade ldr r0, _08090858 movs r1, 0x21 movs r2, 0x9E @@ -44401,7 +44401,7 @@ _08090960: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080909B0 ldr r0, [r0] bl SetVBlankCallback @@ -44502,7 +44502,7 @@ sub_8090A3C: @ 8090A3C str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r3, _08090A94 ldr r0, _08090A98 lsls r1, r6, 2 @@ -44582,7 +44582,7 @@ _08090B0C: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r2, _08090B38 movs r0, 0xE ldrsh r1, [r5, r0] @@ -47265,7 +47265,7 @@ _08091FC0: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _08091FD8 ldr r0, _08091FDC adds r1, r0 @@ -48247,7 +48247,7 @@ sub_80927B8: @ 80927B8 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _080927E8 lsls r0, r4, 2 adds r0, r4 @@ -49579,7 +49579,7 @@ sub_809323C: @ 809323C bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_809323C @@ -49589,7 +49589,7 @@ sub_8093254: @ 8093254 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer ldr r2, _0809329C ldrb r0, [r2, 0x6] adds r0, 0x1 @@ -50290,7 +50290,7 @@ _080937A0: .4byte 0x0000080e thumb_func_start sub_80937A4 sub_80937A4: @ 80937A4 push {lr} - bl sub_8073B94 + bl ResetPaletteFade bl ResetSpriteData bl FreeAllSpritePalettes bl ResetTasks @@ -50412,7 +50412,7 @@ sub_8093864: @ 8093864 movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -50540,7 +50540,7 @@ sub_8093954: @ 8093954 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0809397C ldrb r0, [r1] adds r0, 0x1 @@ -53860,7 +53860,7 @@ sub_809527C: @ 809527C str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _080952AC lsls r0, r4, 2 adds r0, r4 @@ -53924,7 +53924,7 @@ _08095300: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _08095328 lsls r0, r4, 2 adds r0, r4 @@ -54215,7 +54215,7 @@ sub_8095544: @ 8095544 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade add sp, 0x4 pop {r4} pop {r0} @@ -56585,7 +56585,7 @@ _08096800: .4byte 0x04000010 thumb_func_start sub_8096804 sub_8096804: @ 8096804 push {lr} - bl sub_8073B94 + bl ResetPaletteFade bl ResetSpriteData bl FreeSpriteTileRanges bl FreeAllSpritePalettes @@ -56884,7 +56884,7 @@ _08096AAC: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _08096AC4 bl SetVBlankCallback b _08096AD8 @@ -56933,7 +56933,7 @@ sub_8096AFC: @ 8096AFC bl LoadOam bl ProcessSpriteCopyRequests bl sub_809CFF0 - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 @@ -57073,7 +57073,7 @@ _08096C16: movs r1, 0 _08096C38: movs r2, 0 - bl sub_8074B3C + bl BlendPalettes ldrb r0, [r4, 0x4] adds r0, 0x1 strb r0, [r4, 0x4] @@ -57098,7 +57098,7 @@ _08096C64: .4byte sub_8096C84 thumb_func_start sub_8096C68 sub_8096C68: @ 8096C68 push {lr} - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _08096C7A @@ -58422,13 +58422,13 @@ _080977A0: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrb r0, [r5, 0x4] adds r0, 0x1 strb r0, [r5, 0x4] b _080977D4 _080977BC: - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 @@ -58866,13 +58866,13 @@ _08097B5C: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrb r0, [r5, 0x4] adds r0, 0x1 strb r0, [r5, 0x4] b _08097B8E _08097B78: - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _08097B8E @@ -63296,13 +63296,13 @@ _08099E36: movs r1, 0x1 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _08099E9A .align 2, 0 _08099E4C: .4byte 0x00000d08 _08099E50: .4byte 0x0000ffff _08099E54: - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _08099EA6 @@ -63320,13 +63320,13 @@ _08099E54: movs r1, 0x1 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _08099E9A .align 2, 0 _08099E88: .4byte 0x00000d08 _08099E8C: .4byte 0x0000ffff _08099E90: - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _08099EA6 @@ -70792,7 +70792,7 @@ sub_809D844: @ 809D844 bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_809D844 @@ -70826,7 +70826,7 @@ sub_809D85C: @ 809D85C strh r0, [r1] bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 @@ -71474,7 +71474,7 @@ _0809DE00: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl sub_80748D0 + bl BeginHardwarePaletteFade ldr r0, _0809DE30 bl SetMainCallback2 ldr r2, _0809DE34 @@ -71830,7 +71830,7 @@ sub_809E0FC: @ 809E0FC str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0809E134 lsls r0, r4, 2 adds r0, r4 @@ -82086,7 +82086,7 @@ sub_80A3118: @ 80A3118 bl BuildOamBuffer bl RunTasks bl sub_80A740C - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_80A3118 @@ -82096,7 +82096,7 @@ sub_80A3134: @ 80A3134 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer ldr r1, _080A3168 ldr r2, _080A316C ldr r0, _080A3170 @@ -82191,7 +82191,7 @@ _080A320E: _080A3220: .4byte 0x02000000 _080A3224: .4byte 0x0001ffff _080A3228: - bl sub_8073B94 + bl ResetPaletteFade ldr r2, _080A3240 ldrb r0, [r2, 0x8] movs r1, 0x80 @@ -82408,7 +82408,7 @@ _080A3404: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r2, _080A3450 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -87328,7 +87328,7 @@ sub_80A5AAC: @ 80A5AAC str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _080A5ADC lsls r0, r4, 2 adds r0, r4 @@ -88148,7 +88148,7 @@ _080A6128: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _080A616E .align 2, 0 _080A6158: .4byte 0x03004b20 @@ -90049,7 +90049,7 @@ sub_80A7094: @ 80A7094 movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade add sp, 0x4 pop {r0} bx r0 @@ -90345,7 +90345,7 @@ _080A72F4: str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _080A735E .align 2, 0 _080A7344: .4byte 0x020219cc @@ -95902,7 +95902,7 @@ sub_80A9BBC: @ 80A9BBC str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080A9BE0 movs r1, 0xFF bl CreateTask @@ -96503,7 +96503,7 @@ sub_80AA064: @ 80AA064 bl AnimateSprites bl BuildOamBuffer bl RunTasks - bl fade_and_return_progress_probably + bl UpdatePaletteFade ldr r0, _080AA088 ldrh r0, [r0, 0x2E] cmp r0, 0x4 @@ -96555,7 +96555,7 @@ sub_80AA090: @ 80AA090 strh r0, [r1] bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer bl sub_8089668 pop {r0} bx r0 @@ -96586,7 +96586,7 @@ sub_80AA10C: @ 80AA10C bl SetVBlankCallback bl sub_80A9F50 bl dp12_8087EA4 - bl sub_8073B94 + bl ResetPaletteFade bl ResetSpriteData bl ResetTasks bl FreeAllSpritePalettes @@ -98066,7 +98066,7 @@ _080AACC0: .4byte 0x0203869c thumb_func_start sub_80AACC4 sub_80AACC4: @ 80AACC4 push {lr} - bl fade_and_return_progress_probably + bl UpdatePaletteFade ldr r0, _080AACF8 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -98116,7 +98116,7 @@ sub_80AAD08: @ 80AAD08 movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade _080AAD32: add sp, 0x4 pop {r4} @@ -99052,7 +99052,7 @@ _080AB4AA: bl sub_80AB320 bl sub_80AB1BC bl dp12_8087EA4 - bl sub_8073B94 + bl ResetPaletteFade ldr r0, _080AB538 ldrb r1, [r0, 0x8] movs r2, 0x80 @@ -99144,7 +99144,7 @@ _080AB578: ldr r0, _080AB5BC strh r1, [r0] movs r0, 0x2 - bl sub_80744B0 + bl BeginFastPaletteFade ldr r2, _080AB5C0 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -99773,7 +99773,7 @@ sub_80ABAAC: @ 80ABAAC bl AnimateSprites bl RunTasks bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_80ABAAC @@ -99829,7 +99829,7 @@ sub_80ABAC4: @ 80ABAC4 ldr r0, _080ABB6C ldrh r0, [r0] strh r0, [r1] - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer bl LoadOam bl ProcessSpriteCopyRequests bl sub_8089668 @@ -104172,7 +104172,7 @@ _080ADF2C: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080ADF48 _080ADF3E: str r0, [r4] @@ -104233,7 +104233,7 @@ sub_80ADF98: @ 80ADF98 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r2, _080ADFCC ldr r0, _080ADFD0 ldrb r1, [r0, 0x8] @@ -109061,7 +109061,7 @@ _080B040C: ldr r3, _080B0454 movs r1, 0x2 movs r2, 0 - bl pal_fade_1 + bl BlendPalette adds r0, r5, 0 bl DestroyTask _080B0444: @@ -109158,7 +109158,7 @@ _080B04DA: ldrb r2, [r1] movs r1, 0x2 ldr r3, _080B0514 - bl pal_fade_1 + bl BlendPalette _080B04F6: adds r0, r6, 0x1 lsls r0, 24 @@ -109395,14 +109395,14 @@ _080B069C: ldrb r2, [r5] movs r1, 0x1 mov r3, r10 - bl pal_fade_1 + bl BlendPalette adds r4, 0xC adds r4, r7 ldrb r2, [r5] adds r0, r4, 0 movs r1, 0x1 mov r3, r10 - bl pal_fade_1 + bl BlendPalette _080B06C2: adds r0, r7, 0x1 lsls r0, 24 @@ -109556,7 +109556,7 @@ _080B07D2: movs r1, 0x3 adds r2, r5, 0 ldr r3, _080B07FC - bl pal_fade_1 + bl BlendPalette cmp r5, 0 bne _080B0800 mov r0, r8 @@ -109603,7 +109603,7 @@ _080B0820: ldrh r3, [r1] movs r1, 0x3 adds r2, r5, 0 - bl pal_fade_1 + bl BlendPalette cmp r5, 0 bne _080B0858 mov r2, r8 @@ -109636,13 +109636,13 @@ _080B0858: movs r1, 0x1 movs r2, 0x4 movs r3, 0 - bl pal_fade_1 + bl BlendPalette adds r4, 0x5 adds r0, r4, 0 movs r1, 0x1 movs r2, 0x4 movs r3, 0 - bl pal_fade_1 + bl BlendPalette b _080B08EA _080B0896: cmp r7, 0x3 @@ -109660,7 +109660,7 @@ _080B0896: movs r1, 0x3 adds r2, r5, 0 movs r3, 0 - bl pal_fade_1 + bl BlendPalette adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -112014,7 +112014,7 @@ _080B1AA4: ldrb r2, [r4, 0x10] ldr r3, _080B1B0C movs r1, 0x1 - bl pal_fade_1 + bl BlendPalette movs r1, 0x10 ldrsh r0, [r4, r1] cmp r0, 0 @@ -112041,7 +112041,7 @@ _080B1AD6: movs r1, 0x1 movs r2, 0 movs r3, 0x1F - bl pal_fade_1 + bl BlendPalette adds r0, r5, 0 bl DestroyTask _080B1B06: @@ -112654,12 +112654,12 @@ _080B1F84: ldrh r3, [r4, 0x8] movs r0, 0x11 movs r1, 0x1 - bl pal_fade_1 + bl BlendPalette ldrb r2, [r4, 0xA] ldrh r3, [r4, 0x8] movs r0, 0x1A movs r1, 0x1 - bl pal_fade_1 + bl BlendPalette movs r2, 0xA ldrsh r1, [r4, r2] movs r2, 0xE @@ -114838,7 +114838,7 @@ sub_80B3094: @ 80B3094 bl AnimateSprites bl BuildOamBuffer bl RunTasks - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_80B3094 @@ -114848,7 +114848,7 @@ sub_80B30AC: @ 80B30AC push {r4,lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer ldr r3, _080B30F0 ldr r1, _080B30F4 ldr r0, _080B30F8 @@ -114935,7 +114935,7 @@ BuyMenuDrawGraphics: @ 80B3108 movs r2, 0x20 bl LoadCompressedPalette bl FreeAllSpritePalettes - bl sub_8073B94 + bl ResetPaletteFade bl ResetSpriteData bl ResetTasks ldr r4, _080B3228 @@ -114975,7 +114975,7 @@ BuyMenuDrawGraphics: @ 80B3108 movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade mov r2, r8 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -117230,7 +117230,7 @@ sub_80B43F0: @ 80B43F0 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _080B4430 lsls r0, r4, 2 adds r0, r4 @@ -120237,7 +120237,7 @@ sub_80B5AA0: @ 80B5AA0 bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_80B5AA0 @@ -120247,7 +120247,7 @@ sub_80B5AB8: @ 80B5AB8 push {r4,lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer ldr r1, _080B5B00 ldr r4, _080B5B04 ldrh r0, [r4, 0x4] @@ -120651,7 +120651,7 @@ _080B5DE0: .4byte gWindowConfig_81E6E88 thumb_func_start NamingScreen_ResetObjects NamingScreen_ResetObjects: @ 80B5DE4 push {lr} - bl sub_8073B94 + bl ResetPaletteFade bl ResetSpriteData bl FreeAllSpritePalettes bl ResetTasks @@ -120752,7 +120752,7 @@ sub_80B5EA8: @ 80B5EA8 str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _080B5ECC ldrb r0, [r1] adds r0, 0x1 @@ -120980,7 +120980,7 @@ sub_80B606C: @ 80B606C str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _080B6090 ldrb r0, [r1] adds r0, 0x1 @@ -129636,7 +129636,7 @@ sub_80BA0A8: @ 80BA0A8 bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_80BA0A8 @@ -129646,7 +129646,7 @@ sub_80BA0C0: @ 80BA0C0 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer ldr r0, _080BA0E8 ldrb r0, [r0] cmp r0, 0 @@ -129718,7 +129718,7 @@ unref_sub_80BA0EC: @ 80BA0EC ldr r0, _080BA21C str r0, [r1, 0x8] ldr r0, [r1, 0x8] - bl sub_8073B94 + bl ResetPaletteFade bl ResetTasks bl ResetSpriteData ldr r0, _080BA220 @@ -129731,7 +129731,7 @@ unref_sub_80BA0EC: @ 80BA0EC movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080BA228 strh r4, [r0] adds r0, 0x4 @@ -130169,7 +130169,7 @@ _080BA538: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _080BA568 lsls r0, r4, 2 adds r0, r4 @@ -131891,7 +131891,7 @@ _080BB306: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080BB398 strh r4, [r0] adds r0, 0x2 @@ -146002,7 +146002,7 @@ sub_80C2358: @ 80C2358 bl SetVBlankCallback bl sub_80C2020 bl dp12_8087EA4 - bl sub_8073B94 + bl ResetPaletteFade bl ResetSpriteData bl ResetTasks bl FreeAllSpritePalettes @@ -146029,7 +146029,7 @@ sub_80C2358: @ 80C2358 str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrb r1, [r5, 0x8] movs r0, 0x7F ands r0, r1 @@ -146078,7 +146078,7 @@ sub_80C2430: @ 80C2430 bl AnimateSprites bl BuildOamBuffer bl RunTasks - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_80C2430 @@ -146136,7 +146136,7 @@ sub_80C2448: @ 80C2448 strh r0, [r1] bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer bl sub_8089668 pop {r0} bx r0 @@ -147340,7 +147340,7 @@ sub_80C2E14: @ 80C2E14 movs r1, 0 movs r2, 0 movs r3, 0x10 - bl sub_80748D0 + bl BeginHardwarePaletteFade ldr r1, _080C2E98 lsls r0, r5, 2 adds r0, r5 @@ -147403,7 +147403,7 @@ _080C2EE8: _080C2EEE: movs r1, 0x10 movs r2, 0 - bl sub_8074B3C + bl BlendPalettes ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] @@ -147521,17 +147521,17 @@ _080C2FB8: ldr r3, _080C3004 movs r0, 0x6B movs r1, 0x1 - bl pal_fade_1 + bl BlendPalette ldrb r2, [r4, 0xA] ldr r3, _080C3008 movs r0, 0x68 movs r1, 0x1 - bl pal_fade_1 + bl BlendPalette ldrb r2, [r4, 0xA] ldr r3, _080C300C movs r0, 0x6E movs r1, 0x1 - bl pal_fade_1 + bl BlendPalette _080C2FE6: ldr r1, _080C3000 lsls r0, r5, 2 @@ -149091,7 +149091,7 @@ sub_80C3BD8: @ 80C3BD8 ldr r3, _080C3C28 movs r0, 0x91 movs r1, 0x1 - bl pal_fade_1 + bl BlendPalette movs r1, 0x22 ldrsh r0, [r4, r1] cmp r0, 0 @@ -150775,7 +150775,7 @@ sub_80C48C8: @ 80C48C8 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade add sp, 0x4 pop {r0} bx r0 @@ -150837,7 +150837,7 @@ sub_80C4940: @ 80C4940 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade add sp, 0x4 pop {r0} bx r0 @@ -153526,7 +153526,7 @@ sub_80C5DCC: @ 80C5DCC ldr r0, [r1, 0x10] ldr r2, _080C5E14 movs r1, 0x10 - bl sub_8074B3C + bl BlendPalettes ldr r0, _080C5E18 bl sub_80C61B0 ldr r1, [r4] @@ -153774,7 +153774,7 @@ _080C5FBA: ldr r0, [r2, 0x10] ldr r2, _080C5FE4 movs r1, 0x10 - bl sub_8074B3C + bl BlendPalettes ldr r0, _080C5FE8 bl SetHBlankCallback ldr r1, [r4] @@ -153792,7 +153792,7 @@ _080C5FEC: negs r0, r0 movs r1, 0x10 movs r2, 0 - bl sub_8074B3C + bl BlendPalettes ldr r1, [r4] _080C6000: ldrh r0, [r1, 0x8] @@ -153940,7 +153940,7 @@ sub_80C60CC: @ 80C60CC ldr r0, [r0, 0x10] ldr r2, _080C6128 movs r1, 0 - bl sub_8074B3C + bl BlendPalettes ldr r0, _080C612C bl SetHBlankCallback _080C611C: @@ -160005,7 +160005,7 @@ unknown_ItemMenu_Confirm: @ 80C9014 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade add sp, 0x4 pop {r0} bx r0 @@ -160210,7 +160210,7 @@ ItemUseOutOfBattle_Mail: @ 80C9194 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _080C91C4 lsls r0, r4, 2 adds r0, r4 @@ -161675,7 +161675,7 @@ sub_80C9C7C: @ 80C9C7C movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _080C9CF4 .align 2, 0 _080C9CC8: .4byte 0x03005d00 @@ -162579,7 +162579,7 @@ sub_80CA3C0: @ 80CA3C0 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade add sp, 0x4 pop {r0} bx r0 @@ -167026,7 +167026,7 @@ _080CC650: adds r1, r4 ldrh r3, [r1] movs r1, 0x10 - bl pal_fade_1 + bl BlendPalette ldrh r0, [r5, 0x20] ldrb r2, [r5, 0x1C] movs r3, 0x1E @@ -167035,7 +167035,7 @@ _080CC650: adds r1, r4 ldrh r3, [r1] movs r1, 0x10 - bl pal_fade_1 + bl BlendPalette ldrh r0, [r5, 0x1C] adds r0, 0x1 strh r0, [r5, 0x1C] @@ -169058,7 +169058,7 @@ _080CD5D8: lsls r1, 24 lsrs r1, 24 ldr r2, _080CD634 - bl sub_8074B3C + bl BlendPalettes movs r3, 0x30 ldrsh r0, [r4, r3] cmp r0, 0x10 @@ -171018,7 +171018,7 @@ sub_80CE3EC: @ 80CE3EC movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _080CE4D0 str r1, [r6] adds r0, r7, 0 @@ -171230,7 +171230,7 @@ _080CE618: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade _080CE640: ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -171504,7 +171504,7 @@ _080CE838: movs r1, 0x10 movs r2, 0xB movs r3, 0 - bl pal_fade_1 + bl BlendPalette movs r0, 0 strh r0, [r6, 0xE] movs r5, 0 @@ -177056,7 +177056,7 @@ sub_80D1318: @ 80D1318 ldrb r2, [r1, 0xA] ldrh r3, [r1, 0x8] movs r1, 0xF - bl pal_fade_1 + bl BlendPalette _080D133E: adds r0, r4, 0 movs r1, 0x1 @@ -178467,7 +178467,7 @@ sub_80D1D9C: @ 80D1D9C bl sub_80791A8 ldr r2, _080D1DF4 movs r1, 0x10 - bl sub_8074B3C + bl BlendPalettes b _080D1E1E .align 2, 0 _080D1DEC: .4byte 0x03004b20 @@ -187119,7 +187119,7 @@ sub_80D6080: @ 80D6080 ldrb r2, [r1] ldrh r3, [r1, 0x2] movs r1, 0x10 - bl pal_fade_1 + bl BlendPalette adds r0, r4, 0 bl move_anim_task_del add sp, 0xC @@ -204250,7 +204250,7 @@ _080DE500: ldr r3, _080DE540 movs r1, 0x10 movs r2, 0xA - bl pal_fade_1 + bl BlendPalette b _080DE604 .align 2, 0 _080DE534: .4byte 0x0202eac8 @@ -204514,7 +204514,7 @@ _080DE72C: ldr r3, _080DE73C movs r1, 0x10 movs r2, 0 - bl pal_fade_1 + bl BlendPalette b _080DE7AA .align 2, 0 _080DE73C: .4byte 0x00003c0d @@ -205439,7 +205439,7 @@ _080DEE8C: movs r1, 0 movs r2, 0x10 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080DEEDC str r0, [r4] _080DEEBA: @@ -209243,7 +209243,7 @@ _080E0C88: ldrh r3, [r2, 0x4] movs r1, 0x10 movs r2, 0xB - bl pal_fade_1 + bl BlendPalette _080E0C94: ldr r1, _080E0CC4 mov r2, r9 @@ -211462,7 +211462,7 @@ sub_80E1D84: @ 80E1D84 ldrb r3, [r4, 0x6] ldrh r4, [r4, 0x8] str r4, [sp] - bl pal_fade_maybe + bl BeginNormalPaletteFade adds r2, r5, 0 adds r2, 0x3E ldrb r0, [r2] @@ -211563,7 +211563,7 @@ sub_80E1E2C: @ 80E1E2C bl sub_80E1DC4 ldrb r1, [r4, 0x8] ldrh r2, [r4, 0x6] - bl sub_8074B3C + bl BlendPalettes adds r2, r5, 0 adds r2, 0x3E ldrb r0, [r2] @@ -211625,7 +211625,7 @@ _080E1EB8: lsrs r1, 24 ldrh r2, [r4, 0x34] adds r0, r3, 0 - bl sub_8074B3C + bl BlendPalettes b _080E1EEC _080E1EDE: ldrh r1, [r4, 0x3A] @@ -211633,7 +211633,7 @@ _080E1EDE: lsrs r1, 24 ldrh r2, [r4, 0x38] adds r0, r3, 0 - bl sub_8074B3C + bl BlendPalettes _080E1EEC: ldrh r0, [r4, 0x30] movs r2, 0x80 @@ -211668,7 +211668,7 @@ sub_80E1F0C: @ 80E1F0C bl sub_80E1DC4 movs r1, 0 movs r2, 0 - bl sub_8074B3C + bl BlendPalettes adds r0, r4, 0 bl move_anim_8072740 _080E1F32: @@ -211785,7 +211785,7 @@ sub_80E1FDC: @ 80E1FDC str r2, [sp] adds r2, r5, 0 adds r3, r6, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrh r0, [r4, 0xC] subs r0, 0x1 strh r0, [r4, 0xC] @@ -211930,7 +211930,7 @@ sub_80E20E4: @ 80E20E4 adds r0, r2, 0 adds r2, r5, 0 adds r3, r6, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrh r0, [r4, 0xC] subs r0, 0x1 strh r0, [r4, 0xC] @@ -212045,7 +212045,7 @@ sub_80E21A8: @ 80E21A8 adds r0, r1, 0 movs r1, 0 adds r2, r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080E2210 str r0, [r4] add sp, 0x4 @@ -212116,7 +212116,7 @@ _080E2260: adds r0, r2, 0 movs r1, 0 adds r2, r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _080E229E _080E228E: ldrb r3, [r4, 0x14] @@ -212125,7 +212125,7 @@ _080E228E: adds r0, r2, 0 movs r1, 0 adds r2, r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade _080E229E: ldr r0, _080E22C8 lsls r1, r5, 2 @@ -212184,7 +212184,7 @@ sub_80E22CC: @ 80E22CC movs r1, 0 movs r2, 0 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade adds r0, r4, 0 bl move_anim_task_del _080E2312: @@ -212249,7 +212249,7 @@ _080E2370: orrs r2, r0 _080E2382: adds r0, r2, 0 - bl sub_8074338 + bl InvertPlttBuffer mov r0, r8 bl move_anim_task_del add sp, 0xC @@ -212371,7 +212371,7 @@ _080E2464: movs r3, 0x16 ldrsb r3, [r4, r3] adds r0, r5, 0 - bl sub_8074380 + bl TintPlttBuffer movs r2, 0x8 ldrsh r1, [r4, r2] movs r2, 0xA @@ -212379,7 +212379,7 @@ _080E2464: cmp r1, r0 bne _080E248E adds r0, r5, 0 - bl sub_8074454 + bl UnfadePlttBuffer mov r0, r8 bl move_anim_task_del _080E248E: @@ -213486,7 +213486,7 @@ _080E2D10: ldrh r3, [r5, 0x12] adds r0, r6, 0 movs r1, 0x10 - bl pal_fade_1 + bl BlendPalette _080E2D24: adds r0, r6, 0 adds r0, 0x10 @@ -213550,7 +213550,7 @@ sub_80E2D78: @ 80E2D78 ldrb r3, [r4, 0x6] ldrb r4, [r4, 0x8] str r4, [sp] - bl sub_80748D0 + bl BeginHardwarePaletteFade ldr r1, _080E2DB0 lsls r0, r5, 2 adds r0, r5 @@ -215029,7 +215029,7 @@ _080E3958: ldrb r2, [r4, 0xC] movs r1, 0x10 ldr r3, _080E39AC - bl pal_fade_1 + bl BlendPalette _080E3972: movs r1, 0x24 ldrsh r0, [r4, r1] @@ -215045,7 +215045,7 @@ _080E3972: ldrb r2, [r4, 0xC] movs r1, 0x10 movs r3, 0 - bl pal_fade_1 + bl BlendPalette _080E3992: adds r0, r5, 0x1 lsls r0, 16 @@ -220514,7 +220514,7 @@ _080E6344: strh r0, [r1] movs r0, 0 bl SetVBlankCallback - bl sub_8073B94 + bl ResetPaletteFade bl ResetSpriteData bl dp12_8087EA4 bl remove_some_task @@ -220572,7 +220572,7 @@ _080E63D8: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _080E6402 _080E63EA: movs r1, 0x80 @@ -221430,7 +221430,7 @@ sub_80E6A6C: @ 80E6A6C bl LoadOam bl ProcessSpriteCopyRequests bl sub_80EAC5C - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer bl sub_8089668 pop {r0} bx r0 @@ -221454,7 +221454,7 @@ _080E6AA4: .4byte 0x02001000 thumb_func_start sub_80E6AA8 sub_80E6AA8: @ 80E6AA8 push {lr} - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _080E6ABA @@ -222785,13 +222785,13 @@ _080E7544: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrh r0, [r4, 0x24] adds r0, 0x1 strh r0, [r4, 0x24] b _080E756C _080E755C: - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _080E756C @@ -231921,7 +231921,7 @@ _080EBB08: bl SetVBlankCallback b _080EBBC0 _080EBB10: - bl sub_8073B94 + bl ResetPaletteFade b _080EBBC0 _080EBB16: bl ResetSpriteData @@ -232171,7 +232171,7 @@ sub_80EBD18: @ 80EBD18 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer bl sub_80F1FF0 pop {r0} bx r0 @@ -232182,7 +232182,7 @@ sub_80EBD30: @ 80EBD30 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer bl sub_80FB260 bl sub_80EFE7C pop {r0} @@ -232194,7 +232194,7 @@ sub_80EBD4C: @ 80EBD4C push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer bl sub_80F5BF0 bl sub_8089668 pop {r0} @@ -232206,7 +232206,7 @@ sub_80EBD68: @ 80EBD68 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer bl sub_80F6F64 pop {r0} bx r0 @@ -232233,7 +232233,7 @@ sub_80EBD90: @ 80EBD90 bl AnimateSprites bl BuildOamBuffer bl RunTasks - bl fade_and_return_progress_probably + bl UpdatePaletteFade bl sub_80F19FC pop {r0} bx r0 @@ -232439,7 +232439,7 @@ _080EBF54: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _080EBF70 movs r0, 0xC1 lsls r0, 2 @@ -232664,7 +232664,7 @@ _080EC12A: str r2, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080EC150 bl SetVBlankCallback movs r2, 0xC1 @@ -233175,7 +233175,7 @@ _080EC552: str r2, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r2, 0xC1 lsls r2, 2 adds r1, r4, r2 @@ -233271,7 +233271,7 @@ _080EC61E: str r2, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r2, 0xC1 lsls r2, 2 adds r1, r4, r2 @@ -233459,7 +233459,7 @@ _080EC7A0: movs r2, 0 str r2, [sp] movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade _080EC7B6: movs r0, 0xC1 lsls r0, 2 @@ -233896,7 +233896,7 @@ _080ECB2E: str r2, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080ECB54 bl SetVBlankCallback movs r2, 0xC1 @@ -234224,7 +234224,7 @@ _080ECDFC: movs r2, 0 str r2, [sp] movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r0, 0xC1 lsls r0, 2 adds r1, r4, r0 @@ -234364,7 +234364,7 @@ _080ECF10: str r2, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080ECF38 bl SetVBlankCallback movs r2, 0xC1 @@ -234574,7 +234574,7 @@ _080ED0E2: str r2, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r2, 0xC1 lsls r2, 2 adds r1, r4, r2 @@ -234730,7 +234730,7 @@ _080ED220: str r2, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080ED248 bl SetVBlankCallback movs r2, 0xC1 @@ -235010,7 +235010,7 @@ _080ED462: str r2, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080ED494 bl SetVBlankCallback movs r0, 0xC1 @@ -235097,7 +235097,7 @@ _080ED524: movs r2, 0 str r2, [sp] movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r2, 0xC1 lsls r2, 2 adds r1, r4, r2 @@ -235162,7 +235162,7 @@ _080ED5A4: str r2, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080ED5DC bl SetVBlankCallback movs r2, 0xC1 @@ -235286,7 +235286,7 @@ _080ED6C6: str r2, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r2, 0xC1 lsls r2, 2 adds r1, r4, r2 @@ -235379,7 +235379,7 @@ _080ED78A: str r2, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080ED7BC bl SetVBlankCallback movs r2, 0xC1 @@ -235792,7 +235792,7 @@ _080EDAE8: str r4, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r2, 0xC1 lsls r2, 2 adds r1, r5, r2 @@ -235923,7 +235923,7 @@ _080EDC32: str r2, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r2, 0xC1 lsls r2, 2 adds r1, r4, r2 @@ -236061,7 +236061,7 @@ _080EDD52: str r2, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080EDD78 bl SetVBlankCallback movs r2, 0xC1 @@ -236224,7 +236224,7 @@ _080EDE96: str r2, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _080EDEC4 _080EDEAE: ldr r0, _080EDECC @@ -236300,7 +236300,7 @@ _080EDF38: movs r2, 0 str r2, [sp] movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _080EE03C _080EDF50: ldr r0, _080EDF78 @@ -236390,7 +236390,7 @@ _080EDFF8: str r2, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080EE018 bl SetVBlankCallback b _080EE03C @@ -236741,7 +236741,7 @@ _080EE2E0: movs r2, 0 str r2, [sp] movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r2, 0xC1 lsls r2, 2 adds r1, r4, r2 @@ -236811,7 +236811,7 @@ _080EE37A: str r2, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r2, 0xC1 lsls r2, 2 adds r1, r4, r2 @@ -236920,7 +236920,7 @@ _080EE466: str r2, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r0, 0xC1 lsls r0, 2 adds r1, r4, r0 @@ -237004,7 +237004,7 @@ _080EE516: str r2, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080EE548 bl SetVBlankCallback movs r0, 0xC1 @@ -237481,7 +237481,7 @@ _080EE91A: str r2, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _080EE94C _080EE932: ldr r0, _080EE954 @@ -237532,7 +237532,7 @@ sub_80EE96C: @ 80EE96C movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] @@ -258207,7 +258207,7 @@ _080F8AB0: .align 2, 0 _080F8AC4: .4byte 0x01000200 _080F8AC8: - bl sub_8073B94 + bl ResetPaletteFade b _080F8D30 _080F8ACE: bl ResetTasks @@ -258475,7 +258475,7 @@ _080F8CC6: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r2, _080F8D24 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -258752,7 +258752,7 @@ sub_80F8F18: @ 80F8F18 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_80F8F18 @@ -258783,7 +258783,7 @@ _080F8F54: .4byte 0x02000000 thumb_func_start sub_80F8F58 sub_80F8F58: @ 80F8F58 push {lr} - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _080F8F6C @@ -258815,7 +258815,7 @@ sub_80F8F78: @ 80F8F78 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _080F8FAC adds r0, 0xF0 ldr r1, _080F8FB0 @@ -258833,7 +258833,7 @@ _080F8FB0: .4byte sub_80F8FB4 thumb_func_start sub_80F8FB4 sub_80F8FB4: @ 80F8FB4 push {r4,lr} - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _080F9012 @@ -258872,7 +258872,7 @@ _080F9002: lsls r2, 1 movs r1, 0 bl memset - bl sub_8073B94 + bl ResetPaletteFade _080F9012: pop {r4} pop {r0} @@ -260234,7 +260234,7 @@ sub_80F99CC: @ 80F99CC str r2, [sp] movs r1, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade add sp, 0x4 pop {r0} bx r0 @@ -260265,7 +260265,7 @@ sub_80F9A0C: @ 80F9A0C str r2, [sp] movs r1, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade add sp, 0x4 pop {r0} bx r0 @@ -260296,7 +260296,7 @@ sub_80F9A4C: @ 80F9A4C str r2, [sp] movs r1, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade add sp, 0x4 pop {r0} bx r0 @@ -265313,7 +265313,7 @@ _080FC0C4: strh r1, [r0] adds r0, 0x2 strh r1, [r0] - bl sub_8073B94 + bl ResetPaletteFade bl ResetSpriteData bl FreeSpriteTileRanges bl FreeAllSpritePalettes @@ -265395,7 +265395,7 @@ _080FC1AA: negs r0, r0 movs r1, 0x10 movs r2, 0 - bl sub_8074B3C + bl BlendPalettes ldr r0, _080FC1C0 bl SetVBlankCallback b _080FC1E6 @@ -265443,7 +265443,7 @@ sub_80FC214: @ 80FC214 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_80FC214 @@ -265926,13 +265926,13 @@ _080FC5CC: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrh r0, [r4, 0x4] adds r0, 0x1 strh r0, [r4, 0x4] b _080FC5F4 _080FC5E4: - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _080FC5F4 @@ -266039,13 +266039,13 @@ _080FC6B4: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrh r0, [r4, 0x4] adds r0, 0x1 strh r0, [r4, 0x4] b _080FC792 _080FC6CC: - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _080FC792 @@ -276793,7 +276793,7 @@ sub_8101954: @ 8101954 bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_8101954 @@ -276803,7 +276803,7 @@ sub_810196C: @ 810196C push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer ldr r1, _081019A8 ldr r2, _081019AC adds r0, r2, 0 @@ -277211,7 +277211,7 @@ _08101C9C: .4byte gWindowConfig_81E7128 thumb_func_start sub_8101CA0 sub_8101CA0: @ 8101CA0 push {lr} - bl sub_8073B94 + bl ResetPaletteFade bl ResetSpriteData ldr r1, _08101CBC movs r0, 0x80 @@ -277313,7 +277313,7 @@ sub_8101D5C: @ 8101D5C str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r4, _08101D88 ldrb r0, [r4, 0x2] bl sub_810423C @@ -278249,7 +278249,7 @@ sub_8102424: @ 8102424 str r2, [sp] movs r1, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -283565,7 +283565,7 @@ sub_8104B3C: @ 8104B3C str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -283615,7 +283615,7 @@ sub_8104B80: @ 8104B80 str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -283645,7 +283645,7 @@ sub_8104BC8: @ 8104BC8 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -283678,7 +283678,7 @@ sub_8104BFC: @ 8104BFC str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -287245,7 +287245,7 @@ _081066B4: _081066D0: .4byte 0x03005e8c _081066D4: .4byte 0x02015de0 _081066D8: - bl sub_8073B94 + bl ResetPaletteFade movs r2, 0xC0 lsls r2, 19 movs r3, 0xC0 @@ -287350,7 +287350,7 @@ _0810678C: str r1, [r0, 0x8] ldr r0, [r0, 0x8] movs r0, 0x2 - bl sub_80744B0 + bl BeginFastPaletteFade ldr r0, _081067FC bl SetVBlankCallback ldr r0, _08106800 @@ -287383,7 +287383,7 @@ _08106804: .4byte sub_8106808 sub_8106808: @ 8106808 push {lr} bl sub_810682C - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_8106808 @@ -287461,7 +287461,7 @@ _08106892: str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade _081068A4: ldr r0, _081068B8 ldrb r0, [r0] @@ -287723,7 +287723,7 @@ sub_8106AAC: @ 8106AAC bl sub_8106A58 bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_8106AAC @@ -294615,7 +294615,7 @@ sub_8109E6C: @ 8109E6C push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_8109E6C @@ -294702,7 +294702,7 @@ sub_8109E80: @ 8109E80 bl remove_some_task bl ResetTasks bl ResetSpriteData - bl sub_8073B94 + bl ResetPaletteFade bl FreeAllSpritePalettes ldr r0, _0810A0BC movs r1, 0 @@ -294725,7 +294725,7 @@ sub_8109E80: @ 8109E80 movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r3, _0810A0D4 ldrh r2, [r3] mov r0, r9 @@ -294906,7 +294906,7 @@ sub_810A11C: @ 810A11C bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_810A11C @@ -295653,7 +295653,7 @@ sub_810A704: @ 810A704 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_810A704 @@ -295785,7 +295785,7 @@ _0810A816: bl remove_some_task bl ResetTasks bl ResetSpriteData - bl sub_8073B94 + bl ResetPaletteFade bl FreeAllSpritePalettes ldr r0, _0810A854 bl LoadCompressedObjectPic @@ -295820,7 +295820,7 @@ sub_810A864: @ 810A864 movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r3, _0810A8D0 ldrh r2, [r3] strh r5, [r3] @@ -296149,7 +296149,7 @@ sub_810AB3C: @ 810AB3C bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_810AB3C @@ -296433,7 +296433,7 @@ sub_810AD58: @ 810AD58 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0810AD98 str r0, [r4] add sp, 0x4 @@ -296535,7 +296535,7 @@ sub_810AE28: @ 810AE28 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0810AE58 lsls r0, r4, 2 adds r0, r4 @@ -297650,7 +297650,7 @@ sub_810B674: @ 810B674 bl AnimateSprites bl BuildOamBuffer bl RunTasks - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_810B674 @@ -297660,7 +297660,7 @@ sub_810B68C: @ 810B68C push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer ldr r1, _0810B6B0 ldr r2, _0810B6B4 ldr r0, _0810B6B8 @@ -297743,7 +297743,7 @@ _0810B764: bl remove_some_task b _0810B91C _0810B76A: - bl sub_8073B94 + bl ResetPaletteFade ldr r2, _0810B780 ldrb r0, [r2, 0x8] movs r1, 0x80 @@ -297952,7 +297952,7 @@ _0810B934: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r2, _0810B958 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -299215,7 +299215,7 @@ sub_810C31C: @ 810C31C movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0810C358 ldrb r0, [r0] cmp r0, 0x1 @@ -299443,7 +299443,7 @@ sub_810C508: @ 810C508 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0810C538 lsls r0, r4, 2 adds r0, r4 @@ -299808,7 +299808,7 @@ _0810C808: str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0810C84C mov r2, r8 lsls r0, r2, 2 @@ -299870,7 +299870,7 @@ sub_810C854: @ 810C854 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0810C8CC lsls r0, r5, 2 adds r0, r5 @@ -300394,7 +300394,7 @@ sub_810CC54: @ 810CC54 bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_810CC54 @@ -300404,7 +300404,7 @@ sub_810CC6C: @ 810CC6C push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_810CC6C @@ -300465,7 +300465,7 @@ sub_810CC80: @ 810CC80 ldr r0, _0810CD44 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - bl sub_8073B94 + bl ResetPaletteFade bl ResetTasks bl ResetSpriteData ldr r3, _0810CD48 @@ -301706,7 +301706,7 @@ mapldr_080CA5C0: @ 810D64C str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade bl sp109_CreatePCMenu bl sub_80B5838 ldr r0, _0810D680 @@ -307988,7 +307988,7 @@ _081106C8: lsls r2, 7 adds r0, r2, 0 strh r0, [r1] - bl sub_8073B94 + bl ResetPaletteFade bl ResetSpriteData bl ResetTasks bl FreeSpriteTileRanges @@ -308058,7 +308058,7 @@ _08110770: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _081107C0 _08110782: ldr r1, _0811079C @@ -308107,7 +308107,7 @@ sub_81107DC: @ 81107DC push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_81107DC @@ -308121,7 +308121,7 @@ sub_81107F0: @ 81107F0 bl sub_8111110 bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -309530,7 +309530,7 @@ _0811129C: strh r0, [r1, 0xC] b _081112B2 _081112A2: - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _081112B2 @@ -309608,13 +309608,13 @@ _0811132C: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] b _08111358 _08111344: - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _08111358 @@ -309648,13 +309648,13 @@ _08111378: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] b _081113A4 _08111390: - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _081113A4 @@ -309769,7 +309769,7 @@ _0811147C: .4byte 0x04000012 _08111480: .4byte 0x0000fff8 _08111484: .4byte 0x0400001a _08111488: - bl sub_8073B94 + bl ResetPaletteFade bl ResetSpriteData bl FreeAllSpritePalettes b _08111540 @@ -309822,7 +309822,7 @@ _081114F0: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _08111540 _08111502: ldr r1, _0811151C @@ -309959,7 +309959,7 @@ _081115F8: str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _0811163C _0811160A: ldr r0, _08111630 @@ -310289,7 +310289,7 @@ _0811188E: thumb_func_start sub_8111894 sub_8111894: @ 8111894 push {lr} - bl fade_and_return_progress_probably + bl UpdatePaletteFade bl RunTasks pop {r0} bx r0 @@ -310323,7 +310323,7 @@ _081118CC: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -310458,7 +310458,7 @@ evolution_cutscene: @ 8111984 ldr r4, _08111C18 adds r0, r4, 0 bl SetUpWindowConfig - bl sub_8073B94 + bl ResetPaletteFade ldr r0, _08111C1C strh r5, [r0] ldr r0, _08111C20 @@ -310797,7 +310797,7 @@ sub_8111C90: @ 8111C90 ldr r4, _08111E28 adds r0, r4, 0 bl SetUpWindowConfig - bl sub_8073B94 + bl ResetPaletteFade ldr r0, _08111E2C strh r5, [r0] ldr r0, _08111E30 @@ -310902,7 +310902,7 @@ sub_8111C90: @ 8111C90 movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade add sp, 0xC pop {r3-r5} mov r8, r3 @@ -311064,7 +311064,7 @@ _08111F88: adds r0, 0x4 bl sub_8064F08 bl sub_8071EF4 - bl sub_8073B94 + bl ResetPaletteFade ldr r1, _08111FCC ldr r0, _08111FD0 adds r1, r0 @@ -311183,7 +311183,7 @@ _081120B4: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _081120E0 bl SetMainCallback2 movs r1, 0x80 @@ -311381,7 +311381,7 @@ sub_8112270: @ 8112270 bl BuildOamBuffer ldr r0, _0811228C bl sub_800374C - bl fade_and_return_progress_probably + bl UpdatePaletteFade bl RunTasks pop {r0} bx r0 @@ -311398,7 +311398,7 @@ sub_8112290: @ 8112290 ldr r0, [r0] adds r0, 0x4 bl sub_80035AC - bl fade_and_return_progress_probably + bl UpdatePaletteFade bl RunTasks pop {r0} bx r0 @@ -311664,7 +311664,7 @@ _081124F8: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r2, _08112530 ldr r0, _08112534 ldrb r1, [r0] @@ -311767,7 +311767,7 @@ _081125CC: movs r1, 0x4 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade bl _08112FD0 .align 2, 0 _081125F4: .4byte 0x00000179 @@ -311961,7 +311961,7 @@ _08112762: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _08112992 .align 2, 0 _08112794: .4byte 0x03004b20 @@ -312100,7 +312100,7 @@ _081128C4: str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _081128E0 mov r3, r8 adds r1, r3, r7 @@ -312166,7 +312166,7 @@ _08112948: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -312572,7 +312572,7 @@ _08112CBC: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade _08112CE2: ldr r0, _08112D2C ldrh r1, [r0, 0x2E] @@ -313066,7 +313066,7 @@ _0811311C: movs r1, 0x4 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade bl _08113B3A .align 2, 0 _08113144: .4byte 0x00000179 @@ -313262,7 +313262,7 @@ _081132B6: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade _081132E2: ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -313852,7 +313852,7 @@ _081137E4: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade _0811380A: ldr r0, _0811386C ldrh r1, [r0, 0x2E] @@ -316901,7 +316901,7 @@ sub_8114FD4: @ 8114FD4 strh r0, [r1] bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer bl sub_8089668 pop {r0} bx r0 @@ -316955,7 +316955,7 @@ sub_811505C: @ 811505C strh r0, [r1] bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer bl sub_8089668 pop {r0} bx r0 @@ -317021,7 +317021,7 @@ sub_8115124: @ 8115124 sub sp, 0x4 bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer bl sub_8117434 ldr r2, _08115188 ldr r3, _0811518C @@ -317375,7 +317375,7 @@ _08115438: .4byte 0x06004000 _0811543C: .4byte 0x03001770 _08115440: .4byte 0x0000043c _08115444: - bl sub_8073B94 + bl ResetPaletteFade bl ResetSpriteData bl ResetTasks ldr r1, _08115458 @@ -317524,7 +317524,7 @@ _0811558C: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl sub_80748D0 + bl BeginHardwarePaletteFade ldr r0, _08115618 movs r1, 0 bl CreateTask @@ -317650,7 +317650,7 @@ sub_81156BC: @ 81156BC push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 @@ -320183,7 +320183,7 @@ _08116B0C: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl sub_80748D0 + bl BeginHardwarePaletteFade ldr r1, _08116B38 lsls r0, r5, 2 adds r0, r5 @@ -320206,7 +320206,7 @@ sub_8116B40: @ 8116B40 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -320224,7 +320224,7 @@ sub_8116B40: @ 8116B40 strh r4, [r1] bl sub_80F9368 bl FreeAllSpritePalettes - bl sub_8073B94 + bl ResetPaletteFade bl ResetSpriteData bl sub_80F9020 ldr r0, _08116BB0 @@ -321525,7 +321525,7 @@ sub_811755C: @ 811755C str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r2, _081175B4 ldrb r1, [r2, 0x8] lsls r1, 26 @@ -321536,7 +321536,7 @@ sub_811755C: @ 811755C ands r0, r3 orrs r0, r1 strb r0, [r2, 0x4] - bl fade_and_return_progress_probably + bl UpdatePaletteFade ldr r1, _081175B8 lsls r0, r4, 2 adds r0, r4 @@ -328667,7 +328667,7 @@ _0811AD32: adds r0, r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade _0811AD54: ldr r2, _0811AD7C ldrh r0, [r4, 0xC] @@ -328760,7 +328760,7 @@ sub_811ADE4: @ 811ADE4 movs r1, 0x4 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0811AE54 ldr r1, _0811AE58 movs r2, 0x14 @@ -328958,7 +328958,7 @@ sub_811AF7C: @ 811AF7C movs r1, 0x4 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0811AFE4 ldr r0, _0811AFE8 movs r2, 0x16 @@ -330789,7 +330789,7 @@ _0811BD9E: movs r2, 0 str r2, [sp] movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade _0811BDEC: movs r5, 0x10 ldrsh r0, [r6, r5] @@ -331818,7 +331818,7 @@ sub_811C5B4: @ 811C5B4 negs r0, r0 ldr r2, _0811C5E4 movs r1, 0x10 - bl sub_8074B3C + bl BlendPalettes movs r0, 0xFF strh r0, [r4, 0xE] strh r6, [r5, 0xE] @@ -332902,7 +332902,7 @@ sub_811CE14: @ 811CE14 negs r0, r0 ldr r2, _0811CE48 movs r1, 0x10 - bl sub_8074B3C + bl BlendPalettes ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -333895,7 +333895,7 @@ _0811D5B4: negs r0, r0 ldrb r1, [r4, 0x16] ldr r2, _0811D5DC - bl sub_8074B3C + bl BlendPalettes _0811D5C0: movs r2, 0x16 ldrsh r0, [r4, r2] @@ -333946,7 +333946,7 @@ _0811D60E: negs r0, r0 ldrb r1, [r4, 0x16] ldr r2, _0811D640 - bl sub_8074B3C + bl BlendPalettes _0811D61A: movs r0, 0x16 ldrsh r1, [r4, r0] @@ -334001,7 +334001,7 @@ sub_811D67C: @ 811D67C push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_811D67C @@ -334054,7 +334054,7 @@ sub_811D6D4: @ 811D6D4 negs r0, r0 movs r1, 0x10 movs r2, 0 - bl sub_8074B3C + bl BlendPalettes pop {r0} bx r0 thumb_func_end sub_811D6D4 @@ -340409,7 +340409,7 @@ sub_8120A58: @ 8120A58 movs r0, 0x5 bl sub_8074D28 movs r0, 0x3 - bl sub_80744B0 + bl BeginFastPaletteFade bl dp01_tbl3_exec_completed ldr r1, _08120A9C ldrb r0, [r4] @@ -343508,7 +343508,7 @@ _08122354: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _08122384 lsls r0, r4, 2 adds r0, r4 @@ -343699,7 +343699,7 @@ _081224D0: str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _081224FC lsls r0, r4, 2 adds r0, r4 @@ -343886,7 +343886,7 @@ sub_812265C: @ 812265C str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0812268C lsls r0, r4, 2 adds r0, r4 @@ -344631,7 +344631,7 @@ sub_8122C18: @ 8122C18 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _08122C5C str r0, [r4] _08122C4E: @@ -345186,7 +345186,7 @@ sub_81230BC: @ 81230BC str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _081230EC lsls r0, r4, 2 adds r0, r4 @@ -345248,7 +345248,7 @@ sub_8123138: @ 8123138 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _08123168 lsls r0, r4, 2 adds r0, r4 @@ -345365,7 +345365,7 @@ sub_8123218: @ 8123218 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade add sp, 0x4 pop {r0} bx r0 @@ -345524,7 +345524,7 @@ _08123384: bl ResetSpriteData bl ResetTasks bl FreeAllSpritePalettes - bl sub_8073B94 + bl ResetPaletteFade bl sub_807C828 movs r4, 0 ldr r0, _081233D4 @@ -345855,7 +345855,7 @@ _08123678: movs r1, 0x3 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _081236A4 movs r1, 0x1 bl sub_8074F6C @@ -345931,7 +345931,7 @@ mainloop: @ 8123724 bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade bl sound_something pop {r0} bx r0 @@ -345967,7 +345967,7 @@ _08123766: bls _08123766 bl ResetTasks bl ResetSpriteData - bl sub_8073B94 + bl ResetPaletteFade ldr r2, _0812385C movs r3, 0x80 lsls r3, 10 @@ -346240,7 +346240,7 @@ _0812397E: movs r1, 0x3 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r0, 0x4 bl play_sound_effect b _081239D6 @@ -346620,7 +346620,7 @@ sub_8123C40: @ 8123C40 strh r0, [r1] bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r4} pop {r0} bx r0 @@ -363671,7 +363671,7 @@ sub_812BC14: @ 812BC14 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0812BC44 ldr r2, _0812BC48 ldrb r0, [r2] @@ -364138,7 +364138,7 @@ sub_812BF54: @ 812BF54 movs r0, 0x5 bl sub_8074D28 movs r0, 0x3 - bl sub_80744B0 + bl BeginFastPaletteFade bl dp01_tbl6_exec_completed ldr r0, _0812BFA4 ldrh r1, [r0] @@ -364251,7 +364251,7 @@ sub_812C01C: @ 812C01C movs r1, 0x4 movs r2, 0 movs r3, 0x8 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0812C07C movs r1, 0 bl CreateTask @@ -364333,7 +364333,7 @@ _0812C0D0: movs r1, 0x4 movs r2, 0x8 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _0812C110 .align 2, 0 _0812C104: .4byte sub_812C118 @@ -372541,7 +372541,7 @@ sub_813003C: @ 813003C ldrh r3, [r1] movs r1, 0x10 movs r2, 0x8 - bl pal_fade_1 + bl BlendPalette ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -372564,7 +372564,7 @@ _0813008C: movs r1, 0x10 movs r2, 0 movs r3, 0 - bl pal_fade_1 + bl BlendPalette adds r0, r5, 0 bl move_anim_task_del _0813009E: @@ -376126,7 +376126,7 @@ _08131B94: ldr r3, _08131C18 movs r1, 0x10 movs r2, 0x6 - bl pal_fade_1 + bl BlendPalette _08131BF2: ldr r0, _08131C1C mov r3, r8 @@ -377465,7 +377465,7 @@ sub_813265C: @ 813265C push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_813265C @@ -377484,7 +377484,7 @@ sub_8132670: @ 8132670 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade add sp, 0x4 pop {r0} bx r0 @@ -377575,7 +377575,7 @@ sub_81326D8: @ 81326D8 bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade ldr r0, _081327A0 bl SetMainCallback2 pop {r4,r5} @@ -377651,7 +377651,7 @@ sub_81327A4: @ 81327A4 bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade ldr r0, _0813286C bl SetMainCallback2 pop {r4,r5} @@ -377719,7 +377719,7 @@ _081328C8: bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r4} pop {r0} bx r0 @@ -377830,7 +377830,7 @@ _081329BC: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r1, 0x80 lsls r1, 19 movs r2, 0x9A @@ -378256,7 +378256,7 @@ _08132D4C: str r2, [sp] movs r1, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _08132FD6 .align 2, 0 _08132D64: .4byte 0x030007b0 @@ -378311,7 +378311,7 @@ _08132DC6: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _08132FD6 _08132DD8: movs r0, 0x1 @@ -378320,7 +378320,7 @@ _08132DD8: str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _08132DF4 ldr r1, [r0] ldrb r0, [r1] @@ -378350,7 +378350,7 @@ _08132E18: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r5, _08132E74 ldr r1, [r5] ldrb r0, [r1] @@ -385013,7 +385013,7 @@ sub_81361E4: @ 81361E4 bl _call_via_r0 bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade ldr r4, [r4] ldr r1, [r4] ldr r0, _08136224 @@ -385044,7 +385044,7 @@ sub_813622C: @ 813622C bl sub_81368A4 bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_813622C @@ -385058,7 +385058,7 @@ sub_8136244: @ 8136244 bl _call_via_r0 bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 .align 2, 0 @@ -385070,7 +385070,7 @@ sub_8136264: @ 8136264 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer movs r0, 0x6 bl sub_80F5CDC bl sub_8089668 @@ -385483,7 +385483,7 @@ _081365E4: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _08136608 bl SetVBlankCallback ldr r1, [r4] @@ -385771,7 +385771,7 @@ _08136824: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, [r5] adds r1, 0x50 ldrb r0, [r1] @@ -385889,7 +385889,7 @@ _0813694C: negs r0, r0 movs r1, 0x10 movs r2, 0 - bl sub_8074B3C + bl BlendPalettes b _08136982 _0813695A: movs r1, 0x80 @@ -385910,7 +385910,7 @@ _0813696C: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade _08136982: ldr r0, _08136994 ldr r1, [r0] @@ -386148,7 +386148,7 @@ _08136B6E: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _08136B9C _08136B80: ldr r0, _08136B94 @@ -391110,7 +391110,7 @@ sub_81393EC: @ 81393EC str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0813941C ldr r2, _08139420 ldrb r0, [r2] @@ -392111,7 +392111,7 @@ sub_8139BB8: @ 8139BB8 movs r0, 0x5 bl sub_8074D28 movs r0, 0x3 - bl sub_80744B0 + bl BeginFastPaletteFade bl dp01_tbl5_exec_completed ldr r0, _08139C08 ldrh r1, [r0] @@ -395606,7 +395606,7 @@ sub_813B784: @ 813B784 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_813B784 @@ -395617,7 +395617,7 @@ CB2_813B798: @ 813B798 bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade ldr r0, _0813B7C8 ldrh r0, [r0, 0x2E] cmp r0, 0 @@ -395654,7 +395654,7 @@ _0813B7E8: .4byte 0x03005ed0 thumb_func_start CB2_813B7EC CB2_813B7EC: @ 813B7EC push {lr} - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _0813B7FE @@ -395789,7 +395789,7 @@ _0813B890: ldr r0, _0813B998 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - bl sub_8073B94 + bl ResetPaletteFade movs r1, 0xE0 lsls r1, 6 movs r0, 0 @@ -395806,7 +395806,7 @@ _0813B890: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0813B9A0 movs r2, 0xE0 lsls r2, 3 @@ -395837,7 +395837,7 @@ _0813B890: ldr r0, _0813B9B8 bl GameCubeMultiBoot_Init _0813B962: - bl fade_and_return_progress_probably + bl UpdatePaletteFade ldr r0, _0813B9BC ldr r2, _0813B9C0 adds r0, r2 @@ -395879,7 +395879,7 @@ _0813B9C4: str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] @@ -395887,7 +395887,7 @@ _0813B9C4: .align 2, 0 _0813B9EC: .4byte 0x03005ee0 _0813B9F0: - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _0813BA38 @@ -396187,7 +396187,7 @@ task_intro_2: @ 813BC8C movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0813BCE0 bl SetVBlankCallback movs r1, 0x80 @@ -396444,7 +396444,7 @@ _0813BEAC: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0813BEE4 lsls r0, r4, 2 adds r0, r4 @@ -396614,7 +396614,7 @@ _0813BFDA: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _0813C078 bl SetVBlankCallback movs r1, 0x80 @@ -396665,7 +396665,7 @@ sub_813C080: @ 813C080 movs r1, 0x10 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0813C1C8 lsls r0, r4, 2 adds r0, r4 @@ -396902,7 +396902,7 @@ task_intro_10: @ 813C230 movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0813C2D8 ldr r2, _0813C2DC adds r0, r2, 0 @@ -396999,7 +396999,7 @@ _0813C330: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade _0813C36E: add sp, 0x4 pop {r4,r5} @@ -397526,7 +397526,7 @@ _0813C790: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade _0813C7AE: mov r3, r8 ldr r1, [r3] @@ -397885,7 +397885,7 @@ _0813CA88: movs r1, 0x4 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade _0813CAA4: mov r3, r8 ldr r1, [r3] @@ -397995,7 +397995,7 @@ _0813CB60: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0813CBB4 ldr r2, _0813CBB8 adds r0, r2, 0 @@ -398041,7 +398041,7 @@ _0813CBC4: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0813CC18 ldr r2, _0813CC1C adds r0, r2, 0 @@ -398087,7 +398087,7 @@ _0813CC28: movs r1, 0x5 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0813CC9C ldr r2, _0813CCA0 adds r0, r2, 0 @@ -400762,7 +400762,7 @@ _0813DF54: movs r1, 0 movs r2, 0x10 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade mov r2, r8 strh r2, [r7, 0x2E] b _0813E0F8 @@ -402724,7 +402724,7 @@ sub_813EEE4: @ 813EEE4 str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade add sp, 0x4 pop {r4} pop {r0} @@ -402743,7 +402743,7 @@ sub_813EFB0: @ 813EFB0 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_813EFB0 @@ -402754,7 +402754,7 @@ sub_813EFC4: @ 813EFC4 bl sub_813EFDC bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_813EFC4 @@ -402838,7 +402838,7 @@ _0813F078: str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _0813F098 ldr r2, _0813F09C adds r1, r2 @@ -403659,7 +403659,7 @@ _0813F732: ldrb r2, [r4, 0xC] ldr r3, _0813F758 movs r1, 0x1 - bl pal_fade_1 + bl BlendPalette movs r3, 0xC ldrsh r0, [r4, r3] cmp r0, 0x10 @@ -403687,7 +403687,7 @@ _0813F76A: ldrb r2, [r4, 0xC] ldr r3, _0813F794 movs r1, 0x1 - bl pal_fade_1 + bl BlendPalette movs r3, 0xC ldrsh r0, [r4, r3] cmp r0, 0 @@ -405452,7 +405452,7 @@ _08140502: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _0814058C .align 2, 0 _08140548: .4byte 0x04000050 @@ -407246,7 +407246,7 @@ sub_8141314: @ 8141314 ldrh r3, [r1] movs r1, 0x10 movs r2, 0 - bl pal_fade_1 + bl BlendPalette movs r0, 0x1 strh r0, [r5, 0xA] b _081413AA @@ -407266,7 +407266,7 @@ _08141384: ldrh r3, [r1] movs r1, 0x10 movs r2, 0x10 - bl pal_fade_1 + bl BlendPalette movs r0, 0x10 strh r0, [r5, 0x8] ldr r0, _081413D0 @@ -407280,7 +407280,7 @@ _081413AA: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade mov r0, r8 add sp, 0x4 pop {r3,r4} @@ -407328,7 +407328,7 @@ sub_81413DC: @ 81413DC adds r1, r3 ldrh r3, [r1] movs r1, 0x10 - bl pal_fade_1 + bl BlendPalette ldrh r0, [r4, 0xA] ldrh r1, [r4, 0x8] adds r0, r1 @@ -407356,7 +407356,7 @@ _08141434: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade adds r0, r5, 0 bl DestroyTask _0814145C: @@ -407395,7 +407395,7 @@ sub_814146C: @ 814146C movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _081414B8 str r0, [r4] _081414A4: @@ -407440,7 +407440,7 @@ sub_81414BC: @ 81414BC adds r1, r3 ldrh r3, [r1] movs r1, 0x10 - bl pal_fade_1 + bl BlendPalette ldrh r0, [r4, 0xA] ldrh r1, [r4, 0x8] adds r0, r1 @@ -408630,7 +408630,7 @@ sub_8141E38: @ 8141E38 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_8141E38 @@ -408641,7 +408641,7 @@ sub_8141E4C: @ 8141E4C bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_8141E4C @@ -408696,7 +408696,7 @@ _08141EC6: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _08141F04 bl SetVBlankCallback ldr r3, _08141F08 @@ -408753,7 +408753,7 @@ _08141F4C: .4byte 0x00003f42 _08141F50: .4byte 0x03001770 _08141F54: .4byte 0x0000043c _08141F58: - bl fade_and_return_progress_probably + bl UpdatePaletteFade ldr r0, _08141F7C ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -409492,7 +409492,7 @@ _081424C4: movs r1, 0 movs r2, 0xC movs r3, 0xC - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r0, 0 ldrsh r1, [r6, r0] lsls r0, r1, 4 @@ -409547,7 +409547,7 @@ sub_8142570: @ 8142570 str r1, [sp] movs r2, 0 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r3, 0 lsls r1, r4, 2 adds r0, r1, r4 @@ -409695,7 +409695,7 @@ _08142698: movs r1, 0 movs r2, 0xC movs r3, 0xC - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r0, 0 movs r1, 0xE movs r2, 0x1D @@ -409922,7 +409922,7 @@ sub_8142850: @ 8142850 movs r1, 0x8 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _08142898 lsls r0, r4, 2 adds r0, r4 @@ -410071,7 +410071,7 @@ _081429BC: .4byte 0x0000043c _081429C0: bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade bl sub_80C5DCC lsls r0, 24 cmp r0, 0 @@ -410393,7 +410393,7 @@ _08142C3C: ldr r0, _08142CB0 ldr r2, _08142CB4 movs r1, 0xC - bl sub_8074B3C + bl BlendPalettes ldr r3, _08142CB8 ldr r1, _08142CBC adds r0, r3, 0 @@ -410545,7 +410545,7 @@ _08142D36: str r0, [r2] ldr r2, _08142DE8 movs r1, 0xC - bl sub_8074B78 + bl BlendPalettesUnfaded movs r0, 0xC ldrsh r1, [r5, r0] lsls r0, r1, 2 @@ -411502,7 +411502,7 @@ _0814350A: orrs r0, r2 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - bl sub_8073B94 + bl ResetPaletteFade ldr r0, _0814356C movs r1, 0 movs r2, 0x20 @@ -412023,7 +412023,7 @@ sub_8143948: @ 8143948 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_8143948 @@ -412034,7 +412034,7 @@ sub_814395C: @ 814395C bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade ldr r0, _081439B8 ldrh r1, [r0, 0x2C] movs r0, 0x2 @@ -412060,7 +412060,7 @@ sub_814395C: @ 814395C bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade ldr r1, _081439CC movs r0, 0x1 strb r0, [r1] @@ -412086,7 +412086,7 @@ sub_81439D0: @ 81439D0 bl sub_8144130 movs r0, 0 bl SetVBlankCallback - bl sub_8073B94 + bl ResetPaletteFade bl ResetTasks ldr r0, _08143AF0 movs r1, 0 @@ -412163,7 +412163,7 @@ _08143A0E: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r3, _08143B14 ldrh r2, [r3] mov r0, r8 @@ -412302,7 +412302,7 @@ _08143BA4: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _08143BD0 b _08143BEE .align 2, 0 @@ -412319,7 +412319,7 @@ _08143BD4: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _08143BF8 _08143BEE: str r0, [r4] @@ -412394,7 +412394,7 @@ c2_080C9BFC: @ 8143C40 movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r3, _08143CAC ldrh r2, [r3] strh r4, [r3] @@ -412619,7 +412619,7 @@ _08143E0C: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _08143EA8 strh r5, [r0] ldr r1, _08143EAC @@ -412687,7 +412687,7 @@ _08143EE4: movs r1, 0xC movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _08143F00 str r0, [r4] _08143EF8: @@ -412737,7 +412737,7 @@ sub_8143F3C: @ 8143F3C lsls r5, 24 lsrs r5, 24 bl sub_8144130 - bl sub_8073B94 + bl ResetPaletteFade movs r1, 0xE0 lsls r1, 6 movs r0, 0 @@ -412752,7 +412752,7 @@ sub_8143F3C: @ 8143F3C movs r1, 0x8 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _08143FC4 movs r2, 0xE0 lsls r2, 3 @@ -412829,7 +412829,7 @@ _08144004: movs r1, 0x6 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _08144020 str r0, [r4] _08144018: @@ -412865,7 +412865,7 @@ sub_8144024: @ 8144024 movs r1, 0 movs r2, 0 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _08144078 lsls r0, r5, 2 adds r0, r5 @@ -412922,7 +412922,7 @@ _081440AE: movs r1, 0x8 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _081440DC str r0, [r4] b _08144104 @@ -413235,7 +413235,7 @@ _0814433A: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _08144446 .align 2, 0 _08144348: .4byte 0x00001967 @@ -413327,7 +413327,7 @@ _081443E6: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade b _08144446 .align 2, 0 _081443F4: .4byte 0x00001967 @@ -416576,7 +416576,7 @@ sub_8145D74: @ 8145D74 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_8145D74 @@ -416655,7 +416655,7 @@ sub_8145D88: @ 8145D88 bl remove_some_task bl ResetTasks bl ResetSpriteData - bl sub_8073B94 + bl ResetPaletteFade bl FreeAllSpritePalettes ldr r0, _08145ED0 movs r1, 0 @@ -416672,7 +416672,7 @@ sub_8145D88: @ 8145D88 movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r3, _08145EDC ldrh r2, [r3] strh r5, [r3] @@ -416742,7 +416742,7 @@ sub_8145EFC: @ 8145EFC bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_8145EFC @@ -416792,7 +416792,7 @@ sub_8145F44: @ 8145F44 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _08145F84 lsls r0, r4, 2 adds r0, r4 @@ -416881,7 +416881,7 @@ sub_8146014: @ 8146014 bl AnimateSprites bl BuildOamBuffer bl RunTasks - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_8146014 @@ -416897,7 +416897,7 @@ sub_814602C: @ 814602C strh r1, [r0] bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 .align 2, 0 @@ -416953,7 +416953,7 @@ _081460B4: .align 2, 0 _081460C8: .4byte 0x04000050 _081460CC: - bl sub_8073B94 + bl ResetPaletteFade ldr r2, _081460E4 ldrb r0, [r2, 0x8] movs r1, 0x80 @@ -417115,7 +417115,7 @@ _08146224: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r2, _08146248 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -417386,7 +417386,7 @@ sub_8146440: @ 8146440 str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _08146478 lsls r0, r4, 2 adds r0, r4 @@ -417986,7 +417986,7 @@ sub_8146900: @ 8146900 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_8146900 @@ -418039,7 +418039,7 @@ CB2_InitMysteryEventMenu: @ 8146930 bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade movs r0, 0 movs r1, 0 movs r2, 0x2 @@ -418487,7 +418487,7 @@ _08146D6C: movs r2, 0 movs r3, 0x10 _08146D78: - bl pal_fade_maybe + bl BeginNormalPaletteFade _08146D7C: ldr r1, _08146D8C ldr r0, _08146D90 @@ -418540,7 +418540,7 @@ _08146DE4: bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl fade_and_return_progress_probably + bl UpdatePaletteFade add sp, 0x8 pop {r4-r6} pop {r0} @@ -418580,7 +418580,7 @@ sub_8146E3C: @ 8146E3C push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_8146E3C @@ -418676,7 +418676,7 @@ _08146E6C: bl LZ77UnCompVram bl ResetSpriteData bl ResetTasks - bl sub_8073B94 + bl ResetPaletteFade ldr r0, _08146FEC movs r1, 0 movs r2, 0x40 @@ -418710,7 +418710,7 @@ _08146E6C: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r3, _08147000 ldrh r2, [r3] strh r4, [r3] @@ -418775,7 +418775,7 @@ _08147010: .4byte 0x00000703 _08147014: .4byte 0x00000602 _08147018: .4byte 0x00001f08 _0814701C: - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 cmp r0, 0 bne _08147032 @@ -418970,7 +418970,7 @@ sub_81471A4: @ 81471A4 str r2, [sp] movs r1, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _081471E4 bl SetVBlankCallback ldr r0, _081471E8 @@ -418989,7 +418989,7 @@ _081471E8: .4byte sub_81471EC thumb_func_start sub_81471EC sub_81471EC: @ 81471EC push {r4,r5,lr} - bl fade_and_return_progress_probably + bl UpdatePaletteFade lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -419833,7 +419833,7 @@ sub_8147890: @ 8147890 bl AnimateSprites bl BuildOamBuffer bl RunTasks - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_8147890 @@ -419843,7 +419843,7 @@ sub_81478A8: @ 81478A8 push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_81478A8 @@ -419897,7 +419897,7 @@ _0814791C: _08147930: .4byte 0x03001770 _08147934: .4byte 0x0000043c _08147938: - bl sub_8073B94 + bl ResetPaletteFade ldr r2, _08147948 ldrb r0, [r2, 0x8] movs r1, 0x80 @@ -420060,7 +420060,7 @@ _08147A8C: str r1, [sp] movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r2, _08147AC8 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -420638,7 +420638,7 @@ sub_8147F4C: @ 8147F4C str r1, [sp] movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r1, _08147F7C lsls r0, r4, 2 adds r0, r4 @@ -421676,7 +421676,7 @@ sub_814881C: @ 814881C push {lr} bl LoadOam bl ProcessSpriteCopyRequests - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_814881C @@ -421821,7 +421821,7 @@ _08148950: .4byte sub_8148B34 sub_8148954: @ 8148954 push {lr} bl RunTasks - bl fade_and_return_progress_probably + bl UpdatePaletteFade pop {r0} bx r0 thumb_func_end sub_8148954 @@ -421829,7 +421829,7 @@ sub_8148954: @ 8148954 thumb_func_start sub_8148964 sub_8148964: @ 8148964 push {lr} - bl copy_pal_bg_faded_to_pal_ram + bl TransferPlttBuffer pop {r0} bx r0 thumb_func_end sub_8148964 @@ -421904,7 +421904,7 @@ _08148986: ldr r0, _08148ABC str r0, [r1, 0x8] ldr r0, [r1, 0x8] - bl sub_8073B94 + bl ResetPaletteFade ldr r2, _08148AC0 ldr r0, _08148AC4 strh r0, [r2] @@ -421952,7 +421952,7 @@ _08148A2C: movs r1, 0 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r2, _08148AEC ldrh r1, [r2] movs r0, 0 @@ -422010,7 +422010,7 @@ _08148AF8: .4byte sub_8148964 _08148AFC: .4byte 0x0400000e _08148B00: .4byte 0x00000703 _08148B04: - bl fade_and_return_progress_probably + bl UpdatePaletteFade ldr r0, _08148B20 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -422053,7 +422053,7 @@ _08148B48: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade movs r0, 0x1 strb r0, [r4] b _08148B80 @@ -422062,7 +422062,7 @@ _08148B60: .4byte 0x03001770 _08148B64: .4byte 0x0000043c _08148B68: .4byte 0x0000ffff _08148B6C: - bl fade_and_return_progress_probably + bl UpdatePaletteFade ldr r0, _08148B88 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -423868,7 +423868,7 @@ sub_81499A0: @ 81499A0 movs r1, 0xA movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _081499EC str r0, [r5] movs r0, 0x8C @@ -424242,7 +424242,7 @@ sub_8149C50: @ 8149C50 movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _08149CAC str r0, [r5] movs r0, 0xCA @@ -424307,7 +424307,7 @@ _08149D00: movs r1, 0x10 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade _08149D10: ldr r0, _08149D28 adds r1, r5, r6 @@ -424403,7 +424403,7 @@ sub_8149D8C: @ 8149D8C movs r1, 0 movs r2, 0 movs r3, 0x10 - bl pal_fade_maybe + bl BeginNormalPaletteFade ldr r0, _08149DE8 str r0, [r5] movs r0, 0xCA @@ -424468,7 +424468,7 @@ _08149E3C: movs r1, 0x10 movs r2, 0x10 movs r3, 0 - bl pal_fade_maybe + bl BeginNormalPaletteFade _08149E4C: ldr r0, _08149E64 adds r1, r5, r6 |