summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_anim.s22
-rw-r--r--asm/battle_anim_8170478.s26
-rw-r--r--asm/credits.s58
-rw-r--r--asm/evolution_graphics.s22
-rw-r--r--asm/field_effect.s36
-rw-r--r--asm/field_region_map.s10
-rw-r--r--asm/hall_of_fame.s40
-rw-r--r--asm/intro.s6
-rw-r--r--asm/intro_credits_graphics.s48
9 files changed, 134 insertions, 134 deletions
diff --git a/asm/battle_anim.s b/asm/battle_anim.s
index 18e09542a..f7dfc1ed0 100644
--- a/asm/battle_anim.s
+++ b/asm/battle_anim.s
@@ -1330,14 +1330,14 @@ _080A44B0:
movs r0, 0x16
bl SetGpuReg
lsls r4, r6, 5
- ldr r0, =gUnknown_02037914
+ ldr r0, =gPlttBufferUnfaded + 0x200
adds r4, r0
add r0, sp, 0x10
ldrb r1, [r0, 0x8]
lsls r1, 4
adds r0, r4, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
add r0, sp, 0x10
ldrb r1, [r0, 0x8]
lsls r1, 5
@@ -1471,12 +1471,12 @@ _080A460E:
movs r0, 0x1A
bl SetGpuReg
lsls r4, r6, 5
- ldr r0, =gUnknown_02037914
+ ldr r0, =gPlttBufferUnfaded + 0x200
adds r4, r0
adds r0, r4, 0
movs r1, 0x90
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r1, =0x05000120
ldr r2, =0x04000008
adds r0, r4, 0
@@ -1727,7 +1727,7 @@ task_pA_ma0A_obj_to_bg_pal: @ 80A47D8
adds r0, r5
strh r0, [r1]
lsls r0, r6, 5
- ldr r2, =gUnknown_02037D14
+ ldr r2, =gPlttBufferFaded + 0x200
adds r0, r2
mov r1, sp
ldrb r1, [r1, 0x8]
@@ -1753,7 +1753,7 @@ _080A4870:
adds r0, r5
strh r0, [r1]
lsls r0, r6, 5
- ldr r1, =gUnknown_02037D14
+ ldr r1, =gPlttBufferFaded + 0x200
adds r0, r1
subs r1, 0xE0
ldr r2, =0x04000008
@@ -2582,14 +2582,14 @@ task_p5_load_battle_screen_elements: @ 80A4EF4
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A27B0
+ bl BeginHardwarePaletteFade
ldrh r0, [r4, 0x1C]
adds r0, 0x1
strh r0, [r4, 0x1C]
b _080A4FBC
.pool
_080A4F2C:
- ldr r2, =gUnknown_02037FD4
+ ldr r2, =gPaletteFade
ldrb r1, [r2, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2626,7 +2626,7 @@ _080A4F6E:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A27B0
+ bl BeginHardwarePaletteFade
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -2713,7 +2713,7 @@ sub_80A4FC8: @ 80A4FC8
lsrs r1, 20
adds r0, r4, 0
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
b _080A507E
.pool
_080A5050:
@@ -2736,7 +2736,7 @@ _080A5050:
ldr r0, [r4]
movs r1, 0x20
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
_080A507E:
pop {r4-r7}
pop {r0}
diff --git a/asm/battle_anim_8170478.s b/asm/battle_anim_8170478.s
index 4b170be29..608e5d200 100644
--- a/asm/battle_anim_8170478.s
+++ b/asm/battle_anim_8170478.s
@@ -167,7 +167,7 @@ sub_8170478: @ 8170478
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r1, =gUnknown_02022E18
ldrh r0, [r7, 0x20]
negs r0, r0
@@ -471,7 +471,7 @@ sub_8170834: @ 8170834
lsls r4, 4
orrs r4, r3
lsls r0, 1
- ldr r1, =gUnknown_02037714
+ ldr r1, =gPlttBufferUnfaded
mov r8, r1
add r0, r8
mov r2, r9
@@ -480,7 +480,7 @@ sub_8170834: @ 8170834
adds r1, r3, r1
movs r2, 0x20
str r3, [sp]
- bl gpu_pal_apply
+ bl LoadPalette
lsls r4, 1
add r4, r8
ldrb r0, [r7]
@@ -490,7 +490,7 @@ sub_8170834: @ 8170834
adds r0, r4, 0
adds r1, r3, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
mov r0, r9
ldrb r1, [r0]
lsls r1, 4
@@ -2352,7 +2352,7 @@ sub_81717F8: @ 81717F8
lsls r0, r1
movs r1, 0x6
movs r2, 0
- bl sub_80A2A20
+ bl BlendPalettes
adds r0, r6, 0
bl sub_81719EC
b _081718BC
@@ -2370,7 +2370,7 @@ _0817183C:
movs r1, 0x2
movs r2, 0x6
movs r3, 0
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
b _081718BC
_0817185A:
cmp r1, 0x5F
@@ -2473,7 +2473,7 @@ _081718F6:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
b _08171982
.pool
_08171944:
@@ -2514,7 +2514,7 @@ _08171982:
strh r0, [r4, 0x2E]
b _081719B0
_0817198A:
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4553,7 +4553,7 @@ _08172A7E:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
mov r0, r8
add sp, 0x4
pop {r3,r4}
@@ -4608,7 +4608,7 @@ sub_8172AB0: @ 8172AB0
b _08172B30
.pool
_08172B08:
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4623,7 +4623,7 @@ _08172B08:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
adds r0, r5, 0
bl DestroyTask
_08172B30:
@@ -4640,7 +4640,7 @@ sub_8172B40: @ 8172B40
sub sp, 0x4
lsls r0, 24
lsrs r2, r0, 24
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4660,7 +4660,7 @@ sub_8172B40: @ 8172B40
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
ldr r0, =sub_8172B90
str r0, [r4]
_08172B78:
diff --git a/asm/credits.s b/asm/credits.s
index 0365a34d7..c9a6072ff 100644
--- a/asm/credits.s
+++ b/asm/credits.s
@@ -10,7 +10,7 @@ sub_81754C8: @ 81754C8
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
- bl copy_pal_bg_faded_to_pal_ram
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_81754C8
@@ -49,7 +49,7 @@ sub_81754DC: @ 81754DC
strb r0, [r1]
_08175522:
bl PrepareSpritesForOamLoad
- bl fade_and_return_progress_probably
+ bl UpdatePaletteFade
pop {r0}
bx r0
.pool
@@ -73,7 +73,7 @@ sub_8175548: @ 8175548
ldr r0, =gUnknown_085E56F0
movs r1, 0x80
movs r2, 0x40
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, =gUnknown_085E6F6C
bl InitWindows
bl DeactivateAllTextPrinters
@@ -169,7 +169,7 @@ sub_8175620: @ 8175620
movs r1, 0xE0
lsls r1, 9
bl InitHeap
- bl sub_80A1A74
+ bl ResetPaletteFade
bl ResetTasks
bl sub_8175548
ldr r0, =sub_8175744
@@ -231,7 +231,7 @@ _0817566A:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
movs r0, 0x1
bl EnableInterrupts
ldr r0, =sub_81754C8
@@ -273,7 +273,7 @@ sub_8175744: @ 8175744
push {lr}
lsls r0, 24
lsrs r2, r0, 24
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -337,7 +337,7 @@ _081757B0:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
ldr r0, =sub_8175808
b _081757FA
.pool
@@ -352,7 +352,7 @@ _081757E0:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
ldr r0, =sub_81758A4
_081757FA:
str r0, [r4]
@@ -369,7 +369,7 @@ sub_8175808: @ 8175808
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -420,7 +420,7 @@ c2_080C9BFC: @ 8175848
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
movs r0, 0x1
bl EnableInterrupts
ldr r0, =sub_81754C8
@@ -440,7 +440,7 @@ sub_81758A4: @ 81758A4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -501,7 +501,7 @@ _08175906:
ldr r0, =gUnknown_085B0A02
movs r1, 0x1
movs r2, 0x3E
- bl gpu_pal_apply
+ bl LoadPalette
movs r1, 0
ldr r4, =0x0201c000
movs r3, 0x11
@@ -608,7 +608,7 @@ _081759F0:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
movs r0, 0x1C
movs r1, 0
bl SetGpuReg
@@ -667,7 +667,7 @@ _08175AC4:
movs r1, 0xC
movs r2, 0
movs r3, 0x10
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
ldr r0, =sub_8175AE4
str r0, [r4]
_08175AD8:
@@ -683,7 +683,7 @@ sub_8175AE4: @ 8175AE4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -713,7 +713,7 @@ sub_8175B1C: @ 8175B1C
lsls r4, 24
lsrs r4, 24
bl sub_8175CE4
- bl sub_80A1A74
+ bl ResetPaletteFade
movs r1, 0xE0
lsls r1, 6
movs r0, 0
@@ -728,7 +728,7 @@ sub_8175B1C: @ 8175B1C
movs r1, 0x8
movs r2, 0x10
movs r3, 0
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
movs r1, 0xE0
lsls r1, 3
movs r0, 0x8
@@ -782,7 +782,7 @@ _08175BB8:
movs r1, 0x6
movs r2, 0
movs r3, 0x10
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
ldr r0, =sub_8175BD8
str r0, [r4]
_08175BCC:
@@ -799,7 +799,7 @@ sub_8175BD8: @ 8175BD8
sub sp, 0x4
lsls r0, 24
lsrs r5, r0, 24
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -817,7 +817,7 @@ sub_8175BD8: @ 8175BD8
movs r1, 0
movs r2, 0
movs r3, 0
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -842,7 +842,7 @@ sub_8175C34: @ 8175C34
sub sp, 0x4
lsls r0, 24
lsrs r2, r0, 24
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -871,7 +871,7 @@ _08175C62:
movs r1, 0x8
movs r2, 0
movs r3, 0x10
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
ldr r0, =sub_8175CC8
str r0, [r4]
b _08175CB8
@@ -906,7 +906,7 @@ _08175CB8:
thumb_func_start sub_8175CC8
sub_8175CC8: @ 8175CC8
push {lr}
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1035,7 +1035,7 @@ _08175DD4:
.4byte _08175E00
.4byte _08175FFC
_08175E00:
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1173,7 +1173,7 @@ _08175F1A:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
b _0817602A
.pool
_08175F2C:
@@ -1185,7 +1185,7 @@ _08175F32:
strh r0, [r5, 0x24]
b _0817602A
_08175F38:
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1254,11 +1254,11 @@ _08175FB6:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
b _0817602A
.pool
_08175FC8:
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2866,7 +2866,7 @@ sub_8176D1C: @ 8176D1C
ldr r0, =gIntroCopyright_Pal
adds r1, r5, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
lsrs r4, 20
lsls r4, 28
lsrs r4, 16
diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s
index 600363266..166407983 100644
--- a/asm/evolution_graphics.s
+++ b/asm/evolution_graphics.s
@@ -620,7 +620,7 @@ sub_817BEC4: @ 817BEC4
movs r1, 0xA
movs r2, 0
movs r3, 0x10
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
ldr r0, =sub_817BF14
str r0, [r5]
movs r0, 0x8C
@@ -966,8 +966,8 @@ sub_817C174: @ 817C174
adds r5, r0
movs r0, 0
strh r0, [r5, 0x26]
- ldr r0, =gUnknown_02037B54
- ldr r1, =gUnknown_02037754
+ ldr r0, =gPlttBufferFaded + 0x40
+ ldr r1, =gPlttBufferUnfaded + 0x40
movs r2, 0x30
bl CpuSet
ldr r0, =0xfff9041c
@@ -976,7 +976,7 @@ sub_817C174: @ 817C174
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
ldr r0, =sub_817C1D4
str r0, [r5]
movs r0, 0xCA
@@ -1034,7 +1034,7 @@ _0817C224:
movs r1, 0x10
movs r2, 0x10
movs r3, 0
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
_0817C234:
ldr r0, =gTasks
adds r1, r5, r6
@@ -1061,7 +1061,7 @@ sub_817C260: @ 817C260
push {lr}
lsls r0, 24
lsrs r2, r0, 24
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1113,8 +1113,8 @@ sub_817C2B0: @ 817C2B0
adds r5, r0
movs r0, 0
strh r0, [r5, 0x26]
- ldr r0, =gUnknown_02037B54
- ldr r1, =gUnknown_02037754
+ ldr r0, =gPlttBufferFaded + 0x40
+ ldr r1, =gPlttBufferUnfaded + 0x40
movs r2, 0x30
bl CpuSet
ldr r0, =0xfff90400
@@ -1123,7 +1123,7 @@ sub_817C2B0: @ 817C2B0
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
ldr r0, =sub_817C310
str r0, [r5]
movs r0, 0xCA
@@ -1181,7 +1181,7 @@ _0817C360:
movs r1, 0x10
movs r2, 0x10
movs r3, 0
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
_0817C370:
ldr r0, =gTasks
adds r1, r5, r6
@@ -1312,7 +1312,7 @@ _0817C3BA:
ldrb r1, [r2, 0x5]
lsrs r1, 4
lsls r1, 5
- ldr r0, =gUnknown_02037D14
+ ldr r0, =gPlttBufferFaded + 0x200
mov r10, r0
add r1, r10
add r0, sp, 0x4
diff --git a/asm/field_effect.s b/asm/field_effect.s
index 3d704b2f2..370fdf283 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -587,7 +587,7 @@ sub_80B5F0C: @ 80B5F0C
ldr r0, [r4]
adds r1, r5, 0
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
pop {r4,r5}
pop {r0}
bx r0
@@ -777,7 +777,7 @@ sub_80B609C: @ 80B609C
lsrs r2, 24
lsls r3, 24
lsrs r3, 24
- ldr r4, =gUnknown_02037714
+ ldr r4, =gPlttBufferUnfaded
lsrs r0, 15
adds r4, r0, r4
ldrh r4, [r4]
@@ -822,7 +822,7 @@ sub_80B609C: @ 80B609C
lsls r4, 26
orrs r4, r6
lsrs r4, 16
- ldr r1, =gUnknown_02037B14
+ ldr r1, =gPlttBufferFaded
adds r0, r1
strh r4, [r0]
pop {r3,r4}
@@ -846,7 +846,7 @@ sub_80B6128: @ 80B6128
lsrs r2, 24
lsls r3, 24
lsrs r3, 24
- ldr r4, =gUnknown_02037714
+ ldr r4, =gPlttBufferUnfaded
lsrs r0, 15
adds r4, r0, r4
ldrh r4, [r4]
@@ -883,7 +883,7 @@ sub_80B6128: @ 80B6128
lsls r4, 26
orrs r4, r5
lsrs r4, 16
- ldr r1, =gUnknown_02037B14
+ ldr r1, =gPlttBufferFaded
adds r0, r1
strh r4, [r0]
pop {r3}
@@ -2082,7 +2082,7 @@ c3_080843F8: @ 80B6B0C
ldrsh r0, [r4, r1]
cmp r0, 0
bne _080B6B3E
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -2748,7 +2748,7 @@ sub_80B7050: @ 80B7050
thumb_func_start sub_80B7060
sub_80B7060: @ 80B7060
push {lr}
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -3715,7 +3715,7 @@ sub_80B77F8: @ 80B77F8
thumb_func_start sub_80B7814
sub_80B7814: @ 80B7814
push {lr}
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4190,7 +4190,7 @@ _080B7BEA:
thumb_func_start sub_80B7BF4
sub_80B7BF4: @ 80B7BF4
push {lr}
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4381,7 +4381,7 @@ _080B7D86:
ldrsh r0, [r4, r1]
cmp r0, 0
bne _080B7DF8
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -4862,7 +4862,7 @@ _080B817E:
sub_80B8198: @ 80B8198
push {r4,lr}
adds r4, r0, 0
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -5389,7 +5389,7 @@ sub_80B85F8: @ 80B85F8
ldr r0, =gUnknown_0855B050
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
bl sub_80B8874
ldrh r0, [r6, 0x8]
@@ -5783,7 +5783,7 @@ sub_80B8920: @ 80B8920
ldr r0, =gUnknown_0855B370
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
@@ -6596,7 +6596,7 @@ sub_80B8F98: @ 80B8F98
ldr r0, =gUnknown_0855B610
movs r1, 0xC0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
movs r0, 0x12
movs r1, 0x78
bl SetGpuReg
@@ -7142,7 +7142,7 @@ _080B948E:
thumb_func_start sub_80B9494
sub_80B9494: @ 80B9494
push {lr}
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -8141,13 +8141,13 @@ sub_80B9C54: @ 80B9C54
adds r0, r6, 0
movs r1, 0x10
adds r2, r5, 0
- bl sub_80A2A20
+ bl BlendPalettes
str r5, [sp]
adds r0, r6, 0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
adds r0, r4, 0
bl sub_80B9D24
movs r0, 0x57
@@ -8173,7 +8173,7 @@ sub_80B9CDC: @ 80B9CDC
adds r4, r0, 0
lsls r1, 24
lsrs r5, r1, 24
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
diff --git a/asm/field_region_map.s b/asm/field_region_map.s
index 67fc08a2b..12411dbf5 100644
--- a/asm/field_region_map.s
+++ b/asm/field_region_map.s
@@ -89,7 +89,7 @@ sub_8170260: @ 8170260
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
- bl copy_pal_bg_faded_to_pal_ram
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_8170260
@@ -100,7 +100,7 @@ sub_8170274: @ 8170274
bl sub_8170290
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
- bl fade_and_return_progress_probably
+ bl UpdatePaletteFade
bl do_scheduled_bg_tilemap_copies_to_vram
pop {r0}
bx r0
@@ -205,7 +205,7 @@ _08170358:
b _081703D8
.pool
_08170380:
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -241,7 +241,7 @@ _081703C0:
movs r2, 0
movs r3, 0x10
_081703CC:
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
ldr r0, =gUnknown_0203BCD0
ldr r1, [r0]
_081703D4:
@@ -254,7 +254,7 @@ _081703D8:
b _08170416
.pool
_081703E8:
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s
index 8c73e42e5..43a1a86c8 100644
--- a/asm/hall_of_fame.s
+++ b/asm/hall_of_fame.s
@@ -10,7 +10,7 @@ sub_817354C: @ 817354C
push {lr}
bl LoadOamFromSprites
bl ProcessObjectCopyRequests
- bl copy_pal_bg_faded_to_pal_ram
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_817354C
@@ -22,7 +22,7 @@ sub_8173560: @ 8173560
bl RunTextPrinters
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
- bl fade_and_return_progress_probably
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_8173560
@@ -104,7 +104,7 @@ _08173620:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
_08173642:
ldr r1, =gMain
movs r0, 0x87
@@ -116,8 +116,8 @@ _08173642:
b _08173688
.pool
_0817365C:
- bl fade_and_return_progress_probably
- ldr r0, =gUnknown_02037FD4
+ bl UpdatePaletteFade
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -873,7 +873,7 @@ _08173C78:
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
@@ -922,7 +922,7 @@ sub_8173D24: @ 8173D24
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
@@ -1059,7 +1059,7 @@ _08173E40:
movs r1, 0
movs r2, 0xC
movs r3, 0xC
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
movs r0, 0
movs r1, 0
bl FillWindowPixelBuffer
@@ -1171,7 +1171,7 @@ sub_8173EE4: @ 8173EE4
bl stdpal_get
movs r1, 0xE0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
movs r0, 0x78
strh r0, [r4, 0xE]
ldr r0, =sub_8173F84
@@ -1294,8 +1294,8 @@ sub_8174060: @ 8174060
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, =gUnknown_02037B14
- ldr r1, =gUnknown_02037714
+ ldr r0, =gPlttBufferFaded
+ ldr r1, =gPlttBufferUnfaded
movs r2, 0x80
lsls r2, 2
bl CpuSet
@@ -1306,7 +1306,7 @@ sub_8174060: @ 8174060
movs r1, 0x8
movs r2, 0
movs r3, 0x10
- bl pal_fade_maybe
+ bl BeginNormalPaletteFade
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -1329,7 +1329,7 @@ sub_81740B0: @ 81740B0
push {r6,r7}
lsls r0, 24
lsrs r7, r0, 24
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -1515,7 +1515,7 @@ _08174280:
bl RunTasks
bl CallObjectCallbacks
bl PrepareSpritesForOamLoad
- bl fade_and_return_progress_probably
+ bl UpdatePaletteFade
bl sub_80F9C1C
lsls r0, 24
cmp r0, 0
@@ -1845,7 +1845,7 @@ _0817454E:
ldr r0, =0xffff0000
ldr r2, =0x000063b0
movs r1, 0xC
- bl sub_80A2A20
+ bl BlendPalettes
ldr r0, =gStringVar1
ldr r1, =gTasks
ldr r4, [sp, 0x14]
@@ -2001,7 +2001,7 @@ _0817466C:
str r0, [r2]
ldr r2, =0x000063b0
movs r1, 0xC
- bl sub_80A2A5C
+ bl BlendPalettesUnfaded
movs r0, 0xC
ldrsh r1, [r6, r0]
lsls r0, r1, 2
@@ -2209,8 +2209,8 @@ sub_8174898: @ 8174898
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, =gUnknown_02037B14
- ldr r1, =gUnknown_02037714
+ ldr r0, =gPlttBufferFaded
+ ldr r1, =gPlttBufferUnfaded
movs r2, 0x80
lsls r2, 2
bl CpuSet
@@ -2958,11 +2958,11 @@ _08174EEA:
orrs r3, r0
str r3, [r2, 0x8]
ldr r0, [r2, 0x8]
- bl sub_80A1A74
+ bl ResetPaletteFade
ldr r0, =gUnknown_085E54E8
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
add sp, 0x8
pop {r3}
mov r8, r3
diff --git a/asm/intro.s b/asm/intro.s
index aff010d54..c7bbbc41f 100644
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -5619,7 +5619,7 @@ _0816FBB4:
lsls r0, 1
ldr r4, =gUnknown_08D85C50
adds r0, r4
- ldr r5, =gUnknown_02037D52
+ ldr r5, =gPlttBufferFaded + 0x23E
adds r1, r5, 0
movs r2, 0x1
bl CpuSet
@@ -5653,7 +5653,7 @@ _0816FC14:
lsls r0, 1
ldr r4, =gUnknown_08D85C50
adds r0, r4
- ldr r5, =gUnknown_02037D52
+ ldr r5, =gPlttBufferFaded + 0x23E
adds r1, r5, 0
movs r2, 0x1
bl CpuSet
@@ -5698,7 +5698,7 @@ _0816FC6C:
lsls r0, 1
ldr r4, =gUnknown_08D85C50
adds r0, r4
- ldr r5, =gUnknown_02037D52
+ ldr r5, =gPlttBufferFaded + 0x23E
adds r1, r5, 0
movs r2, 0x1
bl CpuSet
diff --git a/asm/intro_credits_graphics.s b/asm/intro_credits_graphics.s
index 9a933c66b..9748ca4b5 100644
--- a/asm/intro_credits_graphics.s
+++ b/asm/intro_credits_graphics.s
@@ -19,7 +19,7 @@ load_intro_part2_graphics: @ 817B064
ldr r0, =gUnknown_085F06E0
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
cmp r4, 0
beq _0817B08C
cmp r4, 0x1
@@ -35,14 +35,14 @@ _0817B08C:
ldr r0, =gUnknown_085F0CFC
movs r1, 0
movs r2, 0x60
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, =gUnknown_085F5064
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085F1668
movs r1, 0x80
lsls r1, 1
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_817B76C
b _0817B11E
.pool
@@ -57,14 +57,14 @@ _0817B0EC:
ldr r0, =gUnknown_085F17E4
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, =gUnknown_085F50EC
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085F21B0
movs r1, 0x80
lsls r1, 1
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_817B788
_0817B11E:
ldr r1, =gUnknown_0203BD28
@@ -156,7 +156,7 @@ _0817B214:
ldr r0, =gUnknown_085F06E0
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, =gUnknown_085F0DBC
movs r1, 0xC0
lsls r1, 19
@@ -167,7 +167,7 @@ _0817B214:
ldr r0, =gUnknown_085F0CFC
movs r1, 0
movs r2, 0x60
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, =gUnknown_085F5064
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085F16A8
@@ -180,7 +180,7 @@ _0817B270:
ldr r0, =gUnknown_085F0700
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, =gUnknown_085F0DBC
movs r1, 0xC0
lsls r1, 19
@@ -191,7 +191,7 @@ _0817B270:
ldr r0, =gUnknown_085F0D5C
movs r1, 0
movs r2, 0x60
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, =gUnknown_085F5064
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085F16A8
@@ -202,7 +202,7 @@ _0817B2A6:
movs r1, 0x80
lsls r1, 1
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_817B76C
b _0817B370
.pool
@@ -210,7 +210,7 @@ _0817B2DC:
ldr r0, =gUnknown_085F0700
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, =gUnknown_085F1824
movs r1, 0xC0
lsls r1, 19
@@ -222,14 +222,14 @@ _0817B2DC:
adds r0, r4, 0
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, =gUnknown_085F50EC
bl LoadCompressedObjectPic
movs r1, 0x80
lsls r1, 1
adds r0, r4, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_817B788
b _0817B370
.pool
@@ -237,7 +237,7 @@ _0817B334:
ldr r0, =gUnknown_085F0720
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, =gUnknown_085F235C
movs r1, 0xC0
lsls r1, 19
@@ -248,14 +248,14 @@ _0817B334:
ldr r0, =gUnknown_085F231C
movs r1, 0
movs r2, 0x40
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, =gUnknown_085F5180
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085F2548
movs r1, 0x80
lsls r1, 1
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_817B7A4
_0817B370:
ldr r1, =gUnknown_0300301C
@@ -479,7 +479,7 @@ _0817B554:
ands r0, r2
cmp r0, 0
bne _0817B620
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -489,7 +489,7 @@ _0817B554:
ands r2, r0
cmp r2, 0
beq _0817B58C
- ldr r2, =gUnknown_02037714
+ ldr r2, =gPlttBufferUnfaded
ldrh r1, [r2, 0x12]
mov r0, sp
strh r1, [r0]
@@ -497,7 +497,7 @@ _0817B554:
b _0817B596
.pool
_0817B58C:
- ldr r2, =gUnknown_02037714
+ ldr r2, =gPlttBufferUnfaded
ldrh r1, [r2, 0x14]
mov r0, sp
strh r1, [r0]
@@ -509,11 +509,11 @@ _0817B596:
mov r0, sp
movs r1, 0x9
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0xA
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
b _0817B620
.pool
_0817B5B8:
@@ -523,7 +523,7 @@ _0817B5B8:
ands r0, r2
cmp r0, 0
bne _0817B620
- ldr r0, =gUnknown_02037FD4
+ ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -556,11 +556,11 @@ _0817B606:
mov r0, sp
movs r1, 0xC
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0xD
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
_0817B620:
add sp, 0x4
pop {r4}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 11:28:34 +0000