diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 15:29:43 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 15:29:43 -0400 |
commit | a4000de4bc94c21ee91295727c605b90ce2f7397 (patch) | |
tree | 09c5ba55a2698d9bb082c2b46039008823ec2844 | |
parent | 67cbc482982245c8cdd0466f59d73ab89d09b633 (diff) |
sub_81121D8
34 files changed, 353 insertions, 430 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index db55d2dcb..bb29b3aab 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -228,7 +228,7 @@ sub_800F380: @ 800F380 movs r1, 0x22 movs r2, 0x10 bl sub_815001C - ldr r4, _0800F3F0 @ =gUnknown_20371F8 + ldr r4, _0800F3F0 @ =gPlttBufferUnfaded adds r0, r4, 0 adds r0, 0xB8 ldr r1, _0800F3F4 @ =0x00002529 @@ -271,7 +271,7 @@ _0800F3EA: pop {r0} bx r0 .align 2, 0 -_0800F3F0: .4byte gUnknown_20371F8 +_0800F3F0: .4byte gPlttBufferUnfaded _0800F3F4: .4byte 0x00002529 _0800F3F8: .4byte 0x00007fff _0800F3FC: .4byte 0x0000675a @@ -838,12 +838,12 @@ _0800F850: ldr r0, _0800F8CC @ =0x00002710 bl AllocSpritePalette lsls r0, 24 - ldr r2, _0800F8D0 @ =gUnknown_20371F8 + ldr r2, _0800F8D0 @ =gPlttBufferUnfaded lsrs r0, 19 ldr r3, _0800F8D4 @ =0x0000021e adds r0, r3 adds r2, r0, r2 - ldr r1, _0800F8D8 @ =gUnknown_20375F8 + ldr r1, _0800F8D8 @ =gPlttBufferFaded adds r0, r1 ldr r1, _0800F8DC @ =0x00007fff strh r1, [r0] @@ -895,9 +895,9 @@ _0800F850: b _0800FAC4 .align 2, 0 _0800F8CC: .4byte 0x00002710 -_0800F8D0: .4byte gUnknown_20371F8 +_0800F8D0: .4byte gPlttBufferUnfaded _0800F8D4: .4byte 0x0000021e -_0800F8D8: .4byte gUnknown_20375F8 +_0800F8D8: .4byte gPlttBufferFaded _0800F8DC: .4byte 0x00007fff _0800F8E0: .4byte gUnknown_82482E8 _0800F8E4: .4byte gBattleStruct diff --git a/asm/battle_anim_8074480.s b/asm/battle_anim_8074480.s index 5e4dfecb0..2d11fc6e1 100644 --- a/asm/battle_anim_8074480.s +++ b/asm/battle_anim_8074480.s @@ -3149,8 +3149,8 @@ sub_8075B48: @ 8075B48 lsrs r0, 16 cmp r1, 0 bne _08075BC4 - ldr r2, _08075BB8 @ =gUnknown_20371F8 - ldr r1, _08075BBC @ =gUnknown_20375F8 + ldr r2, _08075BB8 @ =gPlttBufferUnfaded + ldr r1, _08075BBC @ =gPlttBufferFaded lsls r0, 1 adds r4, r0, r1 adds r5, r0, r2 @@ -3200,14 +3200,14 @@ _08075B60: bge _08075B60 b _08075BD4 .align 2, 0 -_08075BB8: .4byte gUnknown_20371F8 -_08075BBC: .4byte gUnknown_20375F8 +_08075BB8: .4byte gPlttBufferUnfaded +_08075BBC: .4byte gPlttBufferFaded _08075BC0: .4byte 0xfffffc1f _08075BC4: lsls r1, r0, 1 - ldr r0, _08075BDC @ =gUnknown_20371F8 + ldr r0, _08075BDC @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _08075BE0 @ =gUnknown_20375F8 + ldr r2, _08075BE0 @ =gPlttBufferFaded adds r1, r2 ldr r2, _08075BE4 @ =0x04000008 bl CpuSet @@ -3216,8 +3216,8 @@ _08075BD4: pop {r0} bx r0 .align 2, 0 -_08075BDC: .4byte gUnknown_20371F8 -_08075BE0: .4byte gUnknown_20375F8 +_08075BDC: .4byte gPlttBufferUnfaded +_08075BE0: .4byte gPlttBufferFaded _08075BE4: .4byte 0x04000008 thumb_func_end sub_8075B48 @@ -5967,10 +5967,10 @@ _080770D4: _080770D6: strh r0, [r5, 0x14] lsls r0, r4, 1 - ldr r1, _08077104 @ =gUnknown_20371F8 + ldr r1, _08077104 @ =gPlttBufferUnfaded adds r0, r1 lsls r1, r6, 1 - ldr r2, _08077108 @ =gUnknown_20375F8 + ldr r2, _08077108 @ =gPlttBufferFaded adds r1, r2 ldr r2, _0807710C @ =0x04000008 bl CpuSet @@ -5986,8 +5986,8 @@ _080770D6: pop {r0} bx r0 .align 2, 0 -_08077104: .4byte gUnknown_20371F8 -_08077108: .4byte gUnknown_20375F8 +_08077104: .4byte gPlttBufferUnfaded +_08077108: .4byte gPlttBufferFaded _0807710C: .4byte 0x04000008 _08077110: .4byte gUnknown_2037F02 _08077114: .4byte sub_8077118 diff --git a/asm/battle_anim_8078178.s b/asm/battle_anim_8078178.s index e4f15971d..1080351b3 100644 --- a/asm/battle_anim_8078178.s +++ b/asm/battle_anim_8078178.s @@ -505,7 +505,7 @@ sub_8078528: @ 8078528 asrs r0, 16 cmp r0, 0x3 bne _080785B8 - ldr r3, _080785C8 @ =gUnknown_20375F8 + ldr r3, _080785C8 @ =gPlttBufferFaded lsls r2, 4 mov r12, r2 ldr r1, _080785CC @ =0x0000010d @@ -555,7 +555,7 @@ _080785B8: .align 2, 0 _080785C0: .4byte 0x0000271a _080785C4: .4byte gTasks -_080785C8: .4byte gUnknown_20375F8 +_080785C8: .4byte gPlttBufferFaded _080785CC: .4byte 0x0000010d _080785D0: .4byte 0x0000010f _080785D4: .4byte sub_80785D8 diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index e38fc6501..2b522ffe8 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -5084,7 +5084,7 @@ sub_80A49D4: @ 80A49D4 ble _080A4A32 movs r0, 0 strh r0, [r4, 0x30] - ldr r1, _080A4A7C @ =gUnknown_20375F8 + ldr r1, _080A4A7C @ =gPlttBufferFaded movs r2, 0x32 ldrsh r0, [r4, r2] adds r0, 0x1 @@ -5153,7 +5153,7 @@ _080A4A6C: strh r0, [r4, 0x2E] b _080A4AC2 .align 2, 0 -_080A4A7C: .4byte gUnknown_20375F8 +_080A4A7C: .4byte gPlttBufferFaded _080A4A80: ldrh r0, [r4, 0x3A] adds r0, 0x1 @@ -8192,7 +8192,7 @@ _080A614C: cmp r0, 0 beq _080A6178 movs r1, 0x1 - ldr r2, _080A6190 @ =gUnknown_20375F8 + ldr r2, _080A6190 @ =gPlttBufferFaded _080A6164: adds r0, r3, r1 lsls r0, 1 @@ -8216,7 +8216,7 @@ _080A6178: b _080A6232 .align 2, 0 _080A618C: .4byte 0x00007fbb -_080A6190: .4byte gUnknown_20375F8 +_080A6190: .4byte gPlttBufferFaded _080A6194: ldr r0, _080A61DC @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -8534,7 +8534,7 @@ sub_80A63B4: @ 80A63B4 adds r0, 0x10 lsls r4, r0, 4 movs r5, 0x1 - ldr r2, _080A6450 @ =gUnknown_20371F8 + ldr r2, _080A6450 @ =gPlttBufferUnfaded _080A640C: adds r1, r3, r5 lsls r1, 1 @@ -8566,7 +8566,7 @@ _080A640C: _080A6444: .4byte gTasks _080A6448: .4byte 0x00002771 _080A644C: .4byte gSprites -_080A6450: .4byte gUnknown_20371F8 +_080A6450: .4byte gPlttBufferUnfaded _080A6454: lsls r2, r0, 4 adds r2, r0 @@ -8796,7 +8796,7 @@ sub_80A65E8: @ 80A65E8 adds r0, r1 lsrs r3, r0, 16 movs r2, 0x1 - ldr r5, _080A669C @ =gUnknown_20375F8 + ldr r5, _080A669C @ =gPlttBufferFaded _080A6614: adds r1, r3, r2 lsls r1, 1 @@ -8834,7 +8834,7 @@ _080A6632: adds r0, r1 lsrs r3, r0, 16 movs r2, 0x1 - ldr r7, _080A669C @ =gUnknown_20375F8 + ldr r7, _080A669C @ =gPlttBufferFaded ldr r6, _080A6698 @ =gUnknown_83E3898 adds r4, r5, 0 _080A6660: @@ -8867,7 +8867,7 @@ _080A667A: bx r0 .align 2, 0 _080A6698: .4byte gUnknown_83E3898 -_080A669C: .4byte gUnknown_20375F8 +_080A669C: .4byte gPlttBufferFaded thumb_func_end sub_80A65E8 thumb_func_start sub_80A66A0 @@ -11414,7 +11414,7 @@ sub_80A7A18: @ 80A7A18 movs r0, 0 strh r0, [r4, 0x30] ldrh r5, [r4, 0x2E] - ldr r1, _080A7A84 @ =gUnknown_20375F8 + ldr r1, _080A7A84 @ =gPlttBufferFaded adds r0, r5, 0 adds r0, 0x8 lsls r0, 1 @@ -11457,7 +11457,7 @@ _080A7A7C: pop {r0} bx r0 .align 2, 0 -_080A7A84: .4byte gUnknown_20375F8 +_080A7A84: .4byte gPlttBufferFaded thumb_func_end sub_80A7A18 thumb_func_start sub_80A7A88 @@ -18331,7 +18331,7 @@ sub_80AAFA4: @ 80AAFA4 adds r0, 0x1 lsls r0, 16 lsrs r5, r0, 16 - ldr r1, _080AB020 @ =gUnknown_20375F8 + ldr r1, _080AB020 @ =gPlttBufferFaded lsls r0, r5, 1 adds r0, r1 ldrh r6, [r0] @@ -18373,7 +18373,7 @@ _080AB016: bx r0 .align 2, 0 _080AB01C: .4byte gTasks -_080AB020: .4byte gUnknown_20375F8 +_080AB020: .4byte gPlttBufferFaded thumb_func_end sub_80AAFA4 thumb_func_start sub_80AB024 @@ -19110,7 +19110,7 @@ sub_80AB5C8: @ 80AB5C8 asrs r0, 16 cmp r0, 0x4 bne _080AB65C - ldr r1, _080AB700 @ =gUnknown_20375F8 + ldr r1, _080AB700 @ =gPlttBufferFaded mov r0, sp ldrb r0, [r0, 0x8] lsls r0, 4 @@ -19236,7 +19236,7 @@ _080AB6EC: _080AB6F4: .4byte gUnknown_2022978 _080AB6F8: .4byte gUnknown_202297A _080AB6FC: .4byte gTasks -_080AB700: .4byte gUnknown_20375F8 +_080AB700: .4byte gPlttBufferFaded _080AB704: .4byte sub_80AB708 thumb_func_end sub_80AB5C8 @@ -32037,7 +32037,7 @@ sub_80B198C: @ 80B198C movs r0, 0 strh r0, [r3, 0x1C] ldrb r0, [r3, 0xC] - ldr r2, _080B1A10 @ =gUnknown_20375F8 + ldr r2, _080B1A10 @ =gPlttBufferFaded lsls r0, 4 movs r3, 0x84 lsls r3, 1 @@ -32083,7 +32083,7 @@ _080B1A04: bx r0 .align 2, 0 _080B1A0C: .4byte gTasks -_080B1A10: .4byte gUnknown_20375F8 +_080B1A10: .4byte gPlttBufferFaded _080B1A14: .4byte 0x00000107 _080B1A18: .4byte 0x00000101 thumb_func_end sub_80B198C @@ -35026,7 +35026,7 @@ sub_80B3044: @ 80B3044 movs r0, 0 strh r0, [r3, 0x30] ldrh r4, [r3, 0x2E] - ldr r1, _080B30A8 @ =gUnknown_20375F8 + ldr r1, _080B30A8 @ =gPlttBufferFaded adds r0, r4, 0 adds r0, 0x8 lsls r0, 1 @@ -35067,7 +35067,7 @@ _080B30A2: pop {r0} bx r0 .align 2, 0 -_080B30A8: .4byte gUnknown_20375F8 +_080B30A8: .4byte gPlttBufferFaded _080B30AC: .4byte sub_80B30B0 thumb_func_end sub_80B3044 @@ -40643,12 +40643,12 @@ _080B5C2C: movs r2, 0x10 ldrsh r0, [r5, r2] lsls r0, 1 - ldr r1, _080B5C60 @ =gUnknown_20371F8 + ldr r1, _080B5C60 @ =gPlttBufferUnfaded adds r0, r1 movs r2, 0x24 ldrsh r1, [r5, r2] lsls r1, 1 - ldr r2, _080B5C64 @ =gUnknown_20375F8 + ldr r2, _080B5C64 @ =gPlttBufferFaded adds r1, r2 ldr r2, _080B5C68 @ =0x04000008 bl CpuSet @@ -40659,8 +40659,8 @@ _080B5C2C: bl BlendPalette b _080B5D22 .align 2, 0 -_080B5C60: .4byte gUnknown_20371F8 -_080B5C64: .4byte gUnknown_20375F8 +_080B5C60: .4byte gPlttBufferUnfaded +_080B5C64: .4byte gPlttBufferFaded _080B5C68: .4byte 0x04000008 _080B5C6C: .4byte 0x00003c0d _080B5C70: @@ -52261,7 +52261,7 @@ _080BB79A: adds r0, 0x10 cmp r2, r0 bge _080BB7C6 - ldr r1, _080BB7D8 @ =gUnknown_20375F8 + ldr r1, _080BB7D8 @ =gPlttBufferFaded adds r3, r0, 0 _080BB7B6: lsls r0, r2, 1 @@ -52282,7 +52282,7 @@ _080BB7C6: pop {r0} bx r0 .align 2, 0 -_080BB7D8: .4byte gUnknown_20375F8 +_080BB7D8: .4byte gPlttBufferFaded thumb_func_end sub_80BB790 thumb_func_start sub_80BB7DC @@ -53173,7 +53173,7 @@ _080BBEC8: lsls r0, 5 adds r0, r1 lsls r1, r4, 5 - ldr r2, _080BBF04 @ =gUnknown_20371F8 + ldr r2, _080BBF04 @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x20 bl memcpy @@ -53187,7 +53187,7 @@ _080BBEC8: _080BBEF8: .4byte gUnknown_2037F1B _080BBEFC: .4byte gUnknown_202401C _080BBF00: .4byte gUnknown_2037F02 -_080BBF04: .4byte gUnknown_20371F8 +_080BBF04: .4byte gPlttBufferUnfaded thumb_func_end sub_80BBE6C thumb_func_start sub_80BBF08 @@ -53243,7 +53243,7 @@ _080BBF5E: adds r4, 0x10 _080BBF64: lsls r0, r4, 5 - ldr r1, _080BBF98 @ =gUnknown_20371F8 + ldr r1, _080BBF98 @ =gPlttBufferUnfaded adds r0, r1 ldr r1, _080BBF9C @ =gUnknown_202401C ldr r2, [r1] @@ -53266,7 +53266,7 @@ _080BBF64: bx r0 .align 2, 0 _080BBF94: .4byte gUnknown_2037F1B -_080BBF98: .4byte gUnknown_20371F8 +_080BBF98: .4byte gPlttBufferUnfaded _080BBF9C: .4byte gUnknown_202401C _080BBFA0: .4byte gUnknown_2037F02 thumb_func_end sub_80BBF08 @@ -53324,9 +53324,9 @@ _080BBFFA: adds r4, 0x10 _080BC000: lsls r1, r4, 5 - ldr r0, _080BC024 @ =gUnknown_20371F8 + ldr r0, _080BC024 @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _080BC028 @ =gUnknown_20375F8 + ldr r2, _080BC028 @ =gPlttBufferFaded adds r1, r2 movs r2, 0x20 bl memcpy @@ -53338,8 +53338,8 @@ _080BC000: bx r0 .align 2, 0 _080BC020: .4byte gUnknown_2037F1B -_080BC024: .4byte gUnknown_20371F8 -_080BC028: .4byte gUnknown_20375F8 +_080BC024: .4byte gPlttBufferUnfaded +_080BC028: .4byte gPlttBufferFaded thumb_func_end sub_80BBFA4 thumb_func_start sub_80BC02C diff --git a/asm/battle_anim_80DE2C0.s b/asm/battle_anim_80DE2C0.s index b80374308..f1e73503a 100644 --- a/asm/battle_anim_80DE2C0.s +++ b/asm/battle_anim_80DE2C0.s @@ -606,7 +606,7 @@ sub_80DE718: @ 80DE718 asrs r0, 16 cmp r0, 0x4 bne _080DE788 - ldr r0, _080DE7A8 @ =gUnknown_20375F8 + ldr r0, _080DE7A8 @ =gPlttBufferFaded lsls r2, r6, 4 adds r1, r2, 0 adds r1, 0xB @@ -658,7 +658,7 @@ _080DE798: bx r0 .align 2, 0 _080DE7A4: .4byte gTasks -_080DE7A8: .4byte gUnknown_20375F8 +_080DE7A8: .4byte gPlttBufferFaded _080DE7AC: .4byte gUnknown_2037F02 _080DE7B0: .4byte 0x0000ffff thumb_func_end sub_80DE718 @@ -711,7 +711,7 @@ sub_80DE7DC: @ 80DE7DC asrs r0, 16 cmp r0, 0x4 bne _080DE87E - ldr r0, _080DE8A0 @ =gUnknown_20375F8 + ldr r0, _080DE8A0 @ =gPlttBufferFaded lsls r2, r7, 4 adds r1, r2, 0 adds r1, 0xB @@ -722,7 +722,7 @@ sub_80DE7DC: @ 80DE7DC mov r10, r3 mov r9, r0 adds r5, r2, 0 - ldr r2, _080DE8A4 @ =gUnknown_20371F8 + ldr r2, _080DE8A4 @ =gPlttBufferUnfaded mov r12, r2 lsls r0, r7, 5 add r0, r9 @@ -787,8 +787,8 @@ _080DE88E: bx r0 .align 2, 0 _080DE89C: .4byte gTasks -_080DE8A0: .4byte gUnknown_20375F8 -_080DE8A4: .4byte gUnknown_20371F8 +_080DE8A0: .4byte gPlttBufferFaded +_080DE8A4: .4byte gPlttBufferUnfaded _080DE8A8: .4byte gUnknown_2037F02 _080DE8AC: .4byte 0x0000ffff thumb_func_end sub_80DE7DC diff --git a/asm/battle_anim_80EEC0C.s b/asm/battle_anim_80EEC0C.s index f79c453b6..5c0ba14b7 100644 --- a/asm/battle_anim_80EEC0C.s +++ b/asm/battle_anim_80EEC0C.s @@ -495,7 +495,7 @@ sub_80EEFC8: @ 80EEFC8 lsls r4, 4 orrs r4, r3 lsls r0, 1 - ldr r1, _080EF0B0 @ =gUnknown_20371F8 + ldr r1, _080EF0B0 @ =gPlttBufferUnfaded mov r8, r1 add r0, r8 mov r2, r9 @@ -557,7 +557,7 @@ _080EF0A0: .4byte gUnknown_3004FF0 _080EF0A4: .4byte gSprites _080EF0A8: .4byte 0x0000d709 _080EF0AC: .4byte 0x0000d70a -_080EF0B0: .4byte gUnknown_20371F8 +_080EF0B0: .4byte gPlttBufferUnfaded thumb_func_end sub_80EEFC8 thumb_func_start sub_80EF0B4 diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s index e56df1923..ab02894c0 100644 --- a/asm/battle_gfx_sfx_util.s +++ b/asm/battle_gfx_sfx_util.s @@ -854,9 +854,9 @@ _0803443C: movs r2, 0x6 bl BlendPalette lsls r1, r7, 1 - ldr r0, _0803448C @ =gUnknown_20375F8 + ldr r0, _0803448C @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _08034490 @ =gUnknown_20371F8 + ldr r2, _08034490 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _08034494 @ =0x04000008 bl CpuSet @@ -875,8 +875,8 @@ _0803447C: .4byte gBattleStruct _08034480: .4byte gUnknown_2024024 _08034484: .4byte gUnknown_2024018 _08034488: .4byte 0x00007fff -_0803448C: .4byte gUnknown_20375F8 -_08034490: .4byte gUnknown_20371F8 +_0803448C: .4byte gPlttBufferFaded +_08034490: .4byte gPlttBufferUnfaded _08034494: .4byte 0x04000008 thumb_func_end BattleLoadOpponentMonSpriteGfx @@ -1059,9 +1059,9 @@ _080345FC: movs r2, 0x6 bl BlendPalette lsls r1, r7, 1 - ldr r0, _0803464C @ =gUnknown_20375F8 + ldr r0, _0803464C @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _08034650 @ =gUnknown_20371F8 + ldr r2, _08034650 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _08034654 @ =0x04000008 bl CpuSet @@ -1080,8 +1080,8 @@ _0803463C: .4byte gBattleStruct _08034640: .4byte gUnknown_2024024 _08034644: .4byte gUnknown_2024018 _08034648: .4byte 0x00007fff -_0803464C: .4byte gUnknown_20375F8 -_08034650: .4byte gUnknown_20371F8 +_0803464C: .4byte gPlttBufferFaded +_08034650: .4byte gPlttBufferUnfaded _08034654: .4byte 0x04000008 thumb_func_end sub_8034498 @@ -2029,9 +2029,9 @@ _08034D88: bl BlendPalette mov r3, r10 lsls r1, r3, 1 - ldr r0, _08034E40 @ =gUnknown_20375F8 + ldr r0, _08034E40 @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _08034E44 @ =gUnknown_20371F8 + ldr r2, _08034E44 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _08034E48 @ =0x04000008 bl CpuSet @@ -2054,8 +2054,8 @@ _08034E30: .4byte gUnknown_2024018 _08034E34: .4byte gBattleStruct _08034E38: .4byte gUnknown_2024024 _08034E3C: .4byte 0x00007fff -_08034E40: .4byte gUnknown_20375F8 -_08034E44: .4byte gUnknown_20371F8 +_08034E40: .4byte gPlttBufferFaded +_08034E44: .4byte gPlttBufferUnfaded _08034E48: .4byte 0x04000008 _08034E4C: mov r0, r9 @@ -2263,9 +2263,9 @@ _08034FFC: bl BlendPalette mov r2, r10 lsls r1, r2, 1 - ldr r0, _080350AC @ =gUnknown_20375F8 + ldr r0, _080350AC @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _080350B0 @ =gUnknown_20371F8 + ldr r2, _080350B0 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _080350B4 @ =0x04000008 bl CpuSet @@ -2327,8 +2327,8 @@ _0803509C: .4byte 0x00000181 _080350A0: .4byte gBattleStruct _080350A4: .4byte gUnknown_2024024 _080350A8: .4byte 0x00007fff -_080350AC: .4byte gUnknown_20375F8 -_080350B0: .4byte gUnknown_20371F8 +_080350AC: .4byte gPlttBufferFaded +_080350B0: .4byte gPlttBufferUnfaded _080350B4: .4byte 0x04000008 _080350B8: .4byte gUnknown_2024018 thumb_func_end sub_8034BF4 diff --git a/asm/battle_message.s b/asm/battle_message.s index 9a9ca1f2f..042b130b0 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -2958,7 +2958,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC ldrb r1, [r1] bl GetCurrentPpToMaxPpState lsls r0, 24 - ldr r5, _080D8A48 @ =gUnknown_20371F8 + ldr r5, _080D8A48 @ =gPlttBufferUnfaded lsrs r0, 22 adds r0, r4 ldrh r1, [r0] @@ -2986,7 +2986,7 @@ _080D8A38: .4byte gActiveBattler _080D8A3C: .4byte gUnknown_2022BC8 _080D8A40: .4byte gUnknown_8D2FBB4 _080D8A44: .4byte gUnknown_2023FFC -_080D8A48: .4byte gUnknown_20371F8 +_080D8A48: .4byte gPlttBufferUnfaded _080D8A4C: .4byte gUnknown_20376B0 thumb_func_end SetPpNumbersPaletteInMoveSelection diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s index 58e7a405b..5d411bc70 100644 --- a/asm/battle_script_commands.s +++ b/asm/battle_script_commands.s @@ -32539,7 +32539,7 @@ _0802DAE0: bl sub_810C1CC str r4, [sp, 0x14] add r0, sp, 0x14 - ldr r1, _0802DB48 @ =gUnknown_20375F8 + ldr r1, _0802DB48 @ =gPlttBufferFaded ldr r2, _0802DB4C @ =0x05000080 bl CpuSet ldr r0, _0802DB50 @ =0x0001ffff @@ -32562,7 +32562,7 @@ _0802DB36: .align 2, 0 _0802DB40: .4byte gBattleMons _0802DB44: .4byte 0x0000ffff -_0802DB48: .4byte gUnknown_20375F8 +_0802DB48: .4byte gPlttBufferFaded _0802DB4C: .4byte 0x05000080 _0802DB50: .4byte 0x0001ffff _0802DB54: .4byte gUnknown_2023E82 diff --git a/asm/battle_transition.s b/asm/battle_transition.s index d3128f656..3d56e8fbc 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -138,8 +138,8 @@ Transition_Phase1: @ 80D09B0 push {r4,lr} adds r4, r0, 0 bl sub_807B05C - ldr r0, _080D09DC @ =gUnknown_20375F8 - ldr r1, _080D09E0 @ =gUnknown_20371F8 + ldr r0, _080D09DC @ =gPlttBufferFaded + ldr r1, _080D09E0 @ =gPlttBufferUnfaded ldr r2, _080D09E4 @ =0x04000100 bl CpuSet ldr r1, _080D09E8 @ =gUnknown_83FA320 @@ -155,8 +155,8 @@ Transition_Phase1: @ 80D09B0 movs r0, 0x1 b _080D09FA .align 2, 0 -_080D09DC: .4byte gUnknown_20375F8 -_080D09E0: .4byte gUnknown_20371F8 +_080D09DC: .4byte gPlttBufferFaded +_080D09E0: .4byte gPlttBufferUnfaded _080D09E4: .4byte 0x04000100 _080D09E8: .4byte gUnknown_83FA320 _080D09EC: diff --git a/asm/blend_palette.s b/asm/blend_palette.s index 5ef3cf070..7c95f18e9 100644 --- a/asm/blend_palette.s +++ b/asm/blend_palette.s @@ -26,9 +26,9 @@ BlendPalette: @ 8045274 movs r6, 0 cmp r6, r12 bcs _080452FA - ldr r0, _0804530C @ =gUnknown_20371F8 + ldr r0, _0804530C @ =gPlttBufferUnfaded mov r10, r0 - ldr r1, _08045310 @ =gUnknown_20375F8 + ldr r1, _08045310 @ =gPlttBufferFaded mov r9, r1 _080452A2: mov r0, r8 @@ -85,8 +85,8 @@ _080452FA: pop {r0} bx r0 .align 2, 0 -_0804530C: .4byte gUnknown_20371F8 -_08045310: .4byte gUnknown_20375F8 +_0804530C: .4byte gPlttBufferUnfaded +_08045310: .4byte gPlttBufferFaded thumb_func_end BlendPalette thumb_func_start sub_8045314 diff --git a/asm/credits.s b/asm/credits.s index af08d608f..bf8c5eeac 100644 --- a/asm/credits.s +++ b/asm/credits.s @@ -242,13 +242,13 @@ _080F3B5E: bl sub_80F3AA4 movs r0, 0xF0 bl sub_80F77CC - ldr r0, _080F3BC8 @ =gUnknown_20371F8 + ldr r0, _080F3BC8 @ =gPlttBufferUnfaded movs r2, 0xFF lsls r2, 1 adds r0, r2 movs r1, 0 strh r1, [r0] - ldr r0, _080F3BCC @ =gUnknown_20375F8 + ldr r0, _080F3BCC @ =gPlttBufferFaded adds r0, r2 strh r1, [r0] movs r0, 0x1 @@ -261,8 +261,8 @@ _080F3BB8: .4byte gUnknown_2031DD8 _080F3BBC: .4byte gUnknown_203AB40 _080F3BC0: .4byte gUnknown_8414588 _080F3BC4: .4byte 0x0000247c -_080F3BC8: .4byte gUnknown_20371F8 -_080F3BCC: .4byte gUnknown_20375F8 +_080F3BC8: .4byte gPlttBufferUnfaded +_080F3BCC: .4byte gPlttBufferFaded thumb_func_end sub_80F3B2C thumb_func_start sub_80F3BD0 @@ -326,13 +326,13 @@ _080F3C64: bl sub_80F3AC4 movs r0, 0xF0 bl sub_80F77CC - ldr r0, _080F3C8C @ =gUnknown_20371F8 + ldr r0, _080F3C8C @ =gPlttBufferUnfaded movs r2, 0xFF lsls r2, 1 adds r0, r2 movs r1, 0 strh r1, [r0] - ldr r0, _080F3C90 @ =gUnknown_20375F8 + ldr r0, _080F3C90 @ =gPlttBufferFaded adds r0, r2 strh r1, [r0] ldr r0, _080F3C94 @ =gUnknown_203AB40 @@ -340,8 +340,8 @@ _080F3C64: movs r0, 0x2 b _080F413C .align 2, 0 -_080F3C8C: .4byte gUnknown_20371F8 -_080F3C90: .4byte gUnknown_20375F8 +_080F3C8C: .4byte gPlttBufferUnfaded +_080F3C90: .4byte gPlttBufferFaded _080F3C94: .4byte gUnknown_203AB40 _080F3C98: movs r0, 0x44 diff --git a/asm/field_effect.s b/asm/field_effect.s index de1776e9d..502c36b00 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -218,38 +218,38 @@ _080835B4: .4byte gUnknown_2036E28 _080835B8: adds r4, 0x10 lsls r0, r4, 5 - ldr r1, _080835C8 @ =gUnknown_20371F8 + ldr r1, _080835C8 @ =gPlttBufferUnfaded adds r0, r1 movs r1, 0x10 bl TintPalette_GrayScale b _080835F6 .align 2, 0 -_080835C8: .4byte gUnknown_20371F8 +_080835C8: .4byte gPlttBufferUnfaded _080835CC: adds r4, 0x10 lsls r0, r4, 5 - ldr r1, _080835DC @ =gUnknown_20371F8 + ldr r1, _080835DC @ =gPlttBufferUnfaded adds r0, r1 movs r1, 0x10 bl TintPalette_SepiaTone b _080835F6 .align 2, 0 -_080835DC: .4byte gUnknown_20371F8 +_080835DC: .4byte gPlttBufferUnfaded _080835E0: adds r4, 0x10 lsls r0, r4, 4 movs r1, 0x10 bl sub_8111F38 lsls r0, r4, 5 - ldr r1, _0808360C @ =gUnknown_20371F8 + ldr r1, _0808360C @ =gPlttBufferUnfaded adds r0, r1 movs r1, 0x10 bl TintPalette_GrayScale _080835F6: lsls r1, r4, 5 - ldr r0, _0808360C @ =gUnknown_20371F8 + ldr r0, _0808360C @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _08083610 @ =gUnknown_20375F8 + ldr r2, _08083610 @ =gPlttBufferFaded adds r1, r2 movs r2, 0x8 bl CpuFastSet @@ -258,8 +258,8 @@ _08083606: pop {r0} bx r0 .align 2, 0 -_0808360C: .4byte gUnknown_20371F8 -_08083610: .4byte gUnknown_20375F8 +_0808360C: .4byte gPlttBufferUnfaded +_08083610: .4byte gPlttBufferFaded thumb_func_end sub_8083598 thumb_func_start sub_8083614 @@ -873,7 +873,7 @@ MultiplyInvertedPaletteRGBComponents: @ 8083A88 lsrs r2, 24 lsls r3, 24 lsrs r3, 24 - ldr r4, _08083B0C @ =gUnknown_20371F8 + ldr r4, _08083B0C @ =gPlttBufferUnfaded lsrs r0, 15 adds r4, r0, r4 ldrh r4, [r4] @@ -918,7 +918,7 @@ MultiplyInvertedPaletteRGBComponents: @ 8083A88 lsls r4, 26 orrs r4, r6 lsrs r4, 16 - ldr r1, _08083B10 @ =gUnknown_20375F8 + ldr r1, _08083B10 @ =gPlttBufferFaded adds r0, r1 strh r4, [r0] pop {r3,r4} @@ -928,8 +928,8 @@ MultiplyInvertedPaletteRGBComponents: @ 8083A88 pop {r0} bx r0 .align 2, 0 -_08083B0C: .4byte gUnknown_20371F8 -_08083B10: .4byte gUnknown_20375F8 +_08083B0C: .4byte gPlttBufferUnfaded +_08083B10: .4byte gPlttBufferFaded thumb_func_end MultiplyInvertedPaletteRGBComponents thumb_func_start MultiplyPaletteRGBComponents @@ -944,7 +944,7 @@ MultiplyPaletteRGBComponents: @ 8083B14 lsrs r2, 24 lsls r3, 24 lsrs r3, 24 - ldr r4, _08083B84 @ =gUnknown_20371F8 + ldr r4, _08083B84 @ =gPlttBufferUnfaded lsrs r0, 15 adds r4, r0, r4 ldrh r4, [r4] @@ -981,7 +981,7 @@ MultiplyPaletteRGBComponents: @ 8083B14 lsls r4, 26 orrs r4, r5 lsrs r4, 16 - ldr r1, _08083B88 @ =gUnknown_20375F8 + ldr r1, _08083B88 @ =gPlttBufferFaded adds r0, r1 strh r4, [r0] pop {r3} @@ -990,8 +990,8 @@ MultiplyPaletteRGBComponents: @ 8083B14 pop {r0} bx r0 .align 2, 0 -_08083B84: .4byte gUnknown_20371F8 -_08083B88: .4byte gUnknown_20375F8 +_08083B84: .4byte gPlttBufferUnfaded +_08083B88: .4byte gPlttBufferFaded thumb_func_end MultiplyPaletteRGBComponents thumb_func_start sub_8083B8C diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index b9a31bee4..6f1e42f48 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -11,7 +11,7 @@ palette_bg_faded_fill_white: @ 807DB14 sub sp, 0x4 ldr r0, _0807DB2C @ =0x7fff7fff str r0, [sp] - ldr r1, _0807DB30 @ =gUnknown_20375F8 + ldr r1, _0807DB30 @ =gPlttBufferFaded ldr r2, _0807DB34 @ =0x01000100 mov r0, sp bl CpuFastSet @@ -20,7 +20,7 @@ palette_bg_faded_fill_white: @ 807DB14 bx r0 .align 2, 0 _0807DB2C: .4byte 0x7fff7fff -_0807DB30: .4byte gUnknown_20375F8 +_0807DB30: .4byte gPlttBufferFaded _0807DB34: .4byte 0x01000100 thumb_func_end palette_bg_faded_fill_white @@ -30,7 +30,7 @@ palette_bg_faded_fill_black: @ 807DB38 sub sp, 0x4 movs r0, 0 str r0, [sp] - ldr r1, _0807DB50 @ =gUnknown_20375F8 + ldr r1, _0807DB50 @ =gPlttBufferFaded ldr r2, _0807DB54 @ =0x01000100 mov r0, sp bl CpuFastSet @@ -38,7 +38,7 @@ palette_bg_faded_fill_black: @ 807DB38 pop {r0} bx r0 .align 2, 0 -_0807DB50: .4byte gUnknown_20375F8 +_0807DB50: .4byte gPlttBufferFaded _0807DB54: .4byte 0x01000100 thumb_func_end palette_bg_faded_fill_black diff --git a/asm/field_weather.s b/asm/field_weather.s index 608f03109..36f7941c7 100644 --- a/asm/field_weather.s +++ b/asm/field_weather.s @@ -889,9 +889,9 @@ _0807A2CE: cmp r0, 0 bne _0807A30C lsls r1, r6, 1 - ldr r0, _0807A304 @ =gUnknown_20371F8 + ldr r0, _0807A304 @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _0807A308 @ =gUnknown_20375F8 + ldr r2, _0807A308 @ =gPlttBufferFaded adds r1, r2 movs r2, 0x8 bl CpuFastSet @@ -907,8 +907,8 @@ _0807A2CE: b _0807A38A .align 2, 0 _0807A300: .4byte gUnknown_20386A4 -_0807A304: .4byte gUnknown_20371F8 -_0807A308: .4byte gUnknown_20375F8 +_0807A304: .4byte gPlttBufferUnfaded +_0807A308: .4byte gPlttBufferFaded _0807A30C: cmp r0, 0x2 beq _0807A320 @@ -940,12 +940,12 @@ _0807A336: mov r8, r3 adds r4, 0x1 mov r12, r4 - ldr r0, _0807A398 @ =gUnknown_20375F8 + ldr r0, _0807A398 @ =gPlttBufferFaded mov r10, r0 _0807A34A: adds r2, r6, 0 lsls r0, r2, 1 - ldr r1, _0807A39C @ =gUnknown_20371F8 + ldr r1, _0807A39C @ =gPlttBufferUnfaded adds r0, r1 ldr r1, [r0] lsls r0, r1, 27 @@ -983,15 +983,15 @@ _0807A38A: bcc _0807A2CE b _0807A3B6 .align 2, 0 -_0807A398: .4byte gUnknown_20375F8 -_0807A39C: .4byte gUnknown_20371F8 +_0807A398: .4byte gPlttBufferFaded +_0807A39C: .4byte gPlttBufferUnfaded _0807A3A0: cmp r0, 0 blt _0807A3B6 lsls r1, r4, 5 - ldr r0, _0807A3C8 @ =gUnknown_20371F8 + ldr r0, _0807A3C8 @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _0807A3CC @ =gUnknown_20375F8 + ldr r2, _0807A3CC @ =gPlttBufferFaded adds r1, r2 mov r3, r9 lsls r2, r3, 3 @@ -1006,8 +1006,8 @@ _0807A3B6: pop {r0} bx r0 .align 2, 0 -_0807A3C8: .4byte gUnknown_20371F8 -_0807A3CC: .4byte gUnknown_20375F8 +_0807A3C8: .4byte gPlttBufferUnfaded +_0807A3CC: .4byte gPlttBufferFaded thumb_func_end sub_807A294 thumb_func_start sub_807A3D0 @@ -1104,7 +1104,7 @@ _0807A472: _0807A47E: adds r4, r6, 0 lsls r0, r4, 1 - ldr r1, _0807A510 @ =gUnknown_20371F8 + ldr r1, _0807A510 @ =gPlttBufferUnfaded adds r0, r1 ldr r1, [r0] lsls r0, r1, 27 @@ -1148,7 +1148,7 @@ _0807A47E: lsls r0, 16 lsrs r6, r0, 16 lsls r4, 1 - ldr r0, _0807A514 @ =gUnknown_20375F8 + ldr r0, _0807A514 @ =gPlttBufferFaded adds r4, r0 lsrs r1, 14 lsrs r2, 19 @@ -1177,8 +1177,8 @@ _0807A4FC: bx r0 .align 2, 0 _0807A50C: .4byte gUnknown_2038394 -_0807A510: .4byte gUnknown_20371F8 -_0807A514: .4byte gUnknown_20375F8 +_0807A510: .4byte gPlttBufferUnfaded +_0807A514: .4byte gPlttBufferFaded thumb_func_end sub_807A3D0 thumb_func_start sub_807A518 @@ -1231,12 +1231,12 @@ _0807A570: movs r7, 0 adds r4, 0x1 mov r12, r4 - ldr r0, _0807A5F0 @ =gUnknown_20375F8 + ldr r0, _0807A5F0 @ =gPlttBufferFaded mov r9, r0 _0807A57A: adds r4, r5, 0 lsls r0, r4, 1 - ldr r1, _0807A5F4 @ =gUnknown_20371F8 + ldr r1, _0807A5F4 @ =gPlttBufferUnfaded adds r0, r1 ldr r1, [r0] lsls r3, r1, 27 @@ -1294,8 +1294,8 @@ _0807A5D4: pop {r0} bx r0 .align 2, 0 -_0807A5F0: .4byte gUnknown_20375F8 -_0807A5F4: .4byte gUnknown_20371F8 +_0807A5F0: .4byte gPlttBufferFaded +_0807A5F4: .4byte gPlttBufferUnfaded thumb_func_end sub_807A518 thumb_func_start sub_807A5F8 @@ -1349,7 +1349,7 @@ _0807A634: mov r8, r0 _0807A658: lsls r5, r6, 1 - ldr r0, _0807A6DC @ =gUnknown_20371F8 + ldr r0, _0807A6DC @ =gPlttBufferUnfaded adds r0, r5, r0 ldr r2, [r0] lsls r4, r2, 27 @@ -1401,7 +1401,7 @@ _0807A658: asrs r0, 4 adds r2, r0 lsls r2, 24 - ldr r0, _0807A6E0 @ =gUnknown_20375F8 + ldr r0, _0807A6E0 @ =gPlttBufferFaded adds r5, r0 lsrs r2, 14 lsrs r3, 19 @@ -1415,8 +1415,8 @@ _0807A658: bcc _0807A658 b _0807A6F8 .align 2, 0 -_0807A6DC: .4byte gUnknown_20371F8 -_0807A6E0: .4byte gUnknown_20375F8 +_0807A6DC: .4byte gPlttBufferUnfaded +_0807A6E0: .4byte gPlttBufferFaded _0807A6E4: lsls r0, r4, 20 lsrs r0, 16 @@ -1650,8 +1650,8 @@ _0807A882: beq _0807A8C4 cmp r2, 0 beq _0807A896 - ldr r0, _0807A8B4 @ =gUnknown_20375F8 - ldr r1, _0807A8B8 @ =gUnknown_20371F8 + ldr r0, _0807A8B4 @ =gPlttBufferFaded + ldr r1, _0807A8B8 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -1671,8 +1671,8 @@ _0807A896: strb r1, [r0] b _0807A92C .align 2, 0 -_0807A8B4: .4byte gUnknown_20375F8 -_0807A8B8: .4byte gUnknown_20371F8 +_0807A8B4: .4byte gPlttBufferFaded +_0807A8B8: .4byte gPlttBufferUnfaded _0807A8BC: .4byte gUnknown_2037F34 _0807A8C0: .4byte 0x000006c6 _0807A8C4: @@ -1804,8 +1804,8 @@ _0807A9AE: beq _0807A9F0 cmp r2, 0 beq _0807A9C2 - ldr r0, _0807A9E0 @ =gUnknown_20375F8 - ldr r1, _0807A9E4 @ =gUnknown_20371F8 + ldr r0, _0807A9E0 @ =gPlttBufferFaded + ldr r1, _0807A9E4 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -1824,8 +1824,8 @@ _0807A9C2: strb r1, [r0] b _0807AA56 .align 2, 0 -_0807A9E0: .4byte gUnknown_20375F8 -_0807A9E4: .4byte gUnknown_20371F8 +_0807A9E0: .4byte gPlttBufferFaded +_0807A9E4: .4byte gPlttBufferUnfaded _0807A9E8: .4byte gUnknown_2037F34 _0807A9EC: .4byte 0x000006c6 _0807A9F0: @@ -1959,7 +1959,7 @@ _0807AAF0: lsls r0, r4, 20 lsrs r4, r0, 16 movs r2, 0 - ldr r6, _0807AB18 @ =gUnknown_20375F8 + ldr r6, _0807AB18 @ =gPlttBufferFaded ldr r0, _0807AB1C @ =0x000006c4 adds r3, r5, r0 _0807AAFC: @@ -1976,15 +1976,15 @@ _0807AAFC: b _0807AB68 .align 2, 0 _0807AB14: .4byte 0x000006ca -_0807AB18: .4byte gUnknown_20375F8 +_0807AB18: .4byte gPlttBufferFaded _0807AB1C: .4byte 0x000006c4 _0807AB20: lsls r0, r4, 20 lsrs r4, r0, 16 lsls r1, r4, 1 - ldr r0, _0807AB4C @ =gUnknown_20375F8 + ldr r0, _0807AB4C @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _0807AB50 @ =gUnknown_20371F8 + ldr r2, _0807AB50 @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x8 bl CpuFastSet @@ -2000,8 +2000,8 @@ _0807AB20: bl BlendPalette b _0807AB68 .align 2, 0 -_0807AB4C: .4byte gUnknown_20375F8 -_0807AB50: .4byte gUnknown_20371F8 +_0807AB4C: .4byte gPlttBufferFaded +_0807AB50: .4byte gPlttBufferUnfaded _0807AB54: .4byte gPaletteFade _0807AB58: lsls r0, r4, 20 diff --git a/asm/fieldmap.s b/asm/fieldmap.s index f78a4df9b..8be48d4c5 100644 --- a/asm/fieldmap.s +++ b/asm/fieldmap.s @@ -2125,35 +2125,35 @@ sub_80598CC: @ 80598CC _080598EC: .4byte gUnknown_2036E28 _080598F0: lsls r4, 1 - ldr r0, _08059900 @ =gUnknown_20371F8 + ldr r0, _08059900 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_GrayScale b _0805992C .align 2, 0 -_08059900: .4byte gUnknown_20371F8 +_08059900: .4byte gPlttBufferUnfaded _08059904: lsls r4, 1 - ldr r0, _08059914 @ =gUnknown_20371F8 + ldr r0, _08059914 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_SepiaTone b _0805992C .align 2, 0 -_08059914: .4byte gUnknown_20371F8 +_08059914: .4byte gPlttBufferUnfaded _08059918: adds r0, r4, 0 adds r1, r5, 0 bl sub_8111F38 lsls r4, 1 - ldr r0, _08059940 @ =gUnknown_20371F8 + ldr r0, _08059940 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_GrayScale _0805992C: - ldr r0, _08059940 @ =gUnknown_20371F8 + ldr r0, _08059940 @ =gPlttBufferUnfaded adds r0, r4, r0 - ldr r1, _08059944 @ =gUnknown_20375F8 + ldr r1, _08059944 @ =gPlttBufferFaded adds r1, r4, r1 adds r2, r5, 0 bl CpuSet @@ -2162,8 +2162,8 @@ _0805993A: pop {r0} bx r0 .align 2, 0 -_08059940: .4byte gUnknown_20371F8 -_08059944: .4byte gUnknown_20375F8 +_08059940: .4byte gPlttBufferUnfaded +_08059944: .4byte gPlttBufferFaded thumb_func_end sub_80598CC thumb_func_start sub_8059948 @@ -2188,36 +2188,36 @@ sub_8059948: @ 8059948 _08059968: .4byte gUnknown_2036E28 _0805996C: lsls r4, 5 - ldr r0, _0805997C @ =gUnknown_20371F8 + ldr r0, _0805997C @ =gPlttBufferUnfaded adds r0, r4, r0 lsls r1, r6, 4 bl TintPalette_GrayScale b _080599AA .align 2, 0 -_0805997C: .4byte gUnknown_20371F8 +_0805997C: .4byte gPlttBufferUnfaded _08059980: lsls r4, 5 - ldr r0, _08059990 @ =gUnknown_20371F8 + ldr r0, _08059990 @ =gPlttBufferUnfaded adds r0, r4, r0 lsls r1, r6, 4 bl TintPalette_SepiaTone b _080599AA .align 2, 0 -_08059990: .4byte gUnknown_20371F8 +_08059990: .4byte gPlttBufferUnfaded _08059994: lsls r0, r4, 4 lsls r5, r6, 4 adds r1, r5, 0 bl sub_8111F38 lsls r4, 5 - ldr r0, _080599C0 @ =gUnknown_20371F8 + ldr r0, _080599C0 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_GrayScale _080599AA: - ldr r0, _080599C0 @ =gUnknown_20371F8 + ldr r0, _080599C0 @ =gPlttBufferUnfaded adds r0, r4, r0 - ldr r1, _080599C4 @ =gUnknown_20375F8 + ldr r1, _080599C4 @ =gPlttBufferFaded adds r1, r4, r1 lsls r2, r6, 3 bl CpuFastSet @@ -2226,8 +2226,8 @@ _080599B8: pop {r0} bx r0 .align 2, 0 -_080599C0: .4byte gUnknown_20371F8 -_080599C4: .4byte gUnknown_20375F8 +_080599C0: .4byte gPlttBufferUnfaded +_080599C4: .4byte gPlttBufferFaded thumb_func_end sub_8059948 thumb_func_start apply_map_tileset_palette diff --git a/asm/fldeff_sweetscent.s b/asm/fldeff_sweetscent.s index 6783e1bbb..34a8ee372 100644 --- a/asm/fldeff_sweetscent.s +++ b/asm/fldeff_sweetscent.s @@ -87,13 +87,13 @@ sub_80DE134: @ 80DE134 bl Alloc adds r1, r0, 0 str r1, [r4] - ldr r4, _080DE1BC @ =gUnknown_20371F8 + ldr r4, _080DE1BC @ =gPlttBufferUnfaded movs r5, 0x80 lsls r5, 1 adds r0, r4, 0 adds r2, r5, 0 bl CpuFastSet - ldr r0, _080DE1C0 @ =gUnknown_20375F8 + ldr r0, _080DE1C0 @ =gPlttBufferFaded adds r1, r4, 0 adds r2, r5, 0 bl CpuFastSet @@ -137,8 +137,8 @@ sub_80DE134: @ 80DE134 bx r0 .align 2, 0 _080DE1B8: .4byte gUnknown_203AAB0 -_080DE1BC: .4byte gUnknown_20371F8 -_080DE1C0: .4byte gUnknown_20375F8 +_080DE1BC: .4byte gPlttBufferUnfaded +_080DE1C0: .4byte gPlttBufferFaded _080DE1C4: .4byte gSprites _080DE1C8: .4byte sub_80DE1D0 _080DE1CC: .4byte gTasks @@ -237,7 +237,7 @@ sub_80DE274: @ 80DE274 bne _080DE2AA ldr r4, _080DE2B4 @ =gUnknown_203AAB0 ldr r0, [r4] - ldr r1, _080DE2B8 @ =gUnknown_20371F8 + ldr r1, _080DE2B8 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -255,7 +255,7 @@ _080DE2AA: .align 2, 0 _080DE2B0: .4byte gPaletteFade _080DE2B4: .4byte gUnknown_203AAB0 -_080DE2B8: .4byte gUnknown_20371F8 +_080DE2B8: .4byte gPlttBufferUnfaded _080DE2BC: .4byte gUnknown_81BE564 thumb_func_end sub_80DE274 diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index 1ad8d6f98..ae692a622 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -1330,8 +1330,8 @@ Task_Hof_HandlePaletteOnExit: @ 80F283C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080F287C @ =gUnknown_20375F8 - ldr r1, _080F2880 @ =gUnknown_20371F8 + ldr r0, _080F287C @ =gPlttBufferFaded + ldr r1, _080F2880 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 2 bl CpuSet @@ -1355,8 +1355,8 @@ Task_Hof_HandlePaletteOnExit: @ 80F283C pop {r0} bx r0 .align 2, 0 -_080F287C: .4byte gUnknown_20375F8 -_080F2880: .4byte gUnknown_20371F8 +_080F287C: .4byte gPlttBufferFaded +_080F2880: .4byte gPlttBufferUnfaded _080F2884: .4byte gTasks _080F2888: .4byte Task_Hof_HandleExit thumb_func_end Task_Hof_HandlePaletteOnExit @@ -2256,8 +2256,8 @@ sub_80F2FEC: @ 80F2FEC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080F3020 @ =gUnknown_20375F8 - ldr r1, _080F3024 @ =gUnknown_20371F8 + ldr r0, _080F3020 @ =gPlttBufferFaded + ldr r1, _080F3024 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 2 bl CpuSet @@ -2276,8 +2276,8 @@ sub_80F2FEC: @ 80F2FEC pop {r0} bx r0 .align 2, 0 -_080F3020: .4byte gUnknown_20375F8 -_080F3024: .4byte gUnknown_20371F8 +_080F3020: .4byte gPlttBufferFaded +_080F3024: .4byte gPlttBufferUnfaded _080F3028: .4byte gTasks _080F302C: .4byte sub_80F3030 thumb_func_end sub_80F2FEC diff --git a/asm/mail.s b/asm/mail.s index bf24fe177..1ecaf17cc 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -381,7 +381,7 @@ _080BEF28: movs r1, 0xF0 movs r2, 0x20 bl LoadPalette - ldr r6, _080BEFD0 @ =gUnknown_20371F8 + ldr r6, _080BEFD0 @ =gPlttBufferUnfaded ldr r4, _080BEFD4 @ =gUnknown_83EE9C8 ldr r0, _080BEFD8 @ =gUnknown_20399C4 ldr r3, [r0] @@ -396,7 +396,7 @@ _080BEF28: lsls r2, 1 adds r0, r6, r2 strh r1, [r0] - ldr r5, _080BEFDC @ =gUnknown_20375F8 + ldr r5, _080BEFDC @ =gPlttBufferFaded ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -458,10 +458,10 @@ _080BEF28: strh r0, [r5, 0x16] b _080BF0F4 .align 2, 0 -_080BEFD0: .4byte gUnknown_20371F8 +_080BEFD0: .4byte gPlttBufferUnfaded _080BEFD4: .4byte gUnknown_83EE9C8 _080BEFD8: .4byte gUnknown_20399C4 -_080BEFDC: .4byte gUnknown_20375F8 +_080BEFDC: .4byte gPlttBufferFaded _080BEFE0: .4byte gUnknown_83EE9C0 _080BEFE4: .4byte gSaveBlock2Ptr _080BEFE8: diff --git a/asm/main_menu.s b/asm/main_menu.s index 3285c29ea..e315c70cf 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -988,11 +988,11 @@ _0800CB2E: .align 2, 0 _0800CB44: .4byte gUnknown_2031DE0 _0800CB48: - ldr r0, _0800CB64 @ =gUnknown_20371F8 + ldr r0, _0800CB64 @ =gPlttBufferUnfaded movs r2, 0 movs r1, 0 strh r1, [r0] - ldr r0, _0800CB68 @ =gUnknown_20375F8 + ldr r0, _0800CB68 @ =gPlttBufferFaded strh r1, [r0] ldr r0, _0800CB6C @ =gUnknown_2031DE0 strb r2, [r0] @@ -1001,8 +1001,8 @@ _0800CB48: bl sub_8110F14 b _0800CB84 .align 2, 0 -_0800CB64: .4byte gUnknown_20371F8 -_0800CB68: .4byte gUnknown_20375F8 +_0800CB64: .4byte gPlttBufferUnfaded +_0800CB68: .4byte gPlttBufferFaded _0800CB6C: .4byte gUnknown_2031DE0 _0800CB70: ldr r0, _0800CB8C @ =sub_81422AC diff --git a/asm/naming_screen.s b/asm/naming_screen.s index e8a5cb2c2..bcf7b4772 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -1648,18 +1648,18 @@ sub_809E6B8: @ 809E6B8 lsrs r0, 24 bl sub_809E644 lsls r0, 16 - ldr r2, _0809E6D8 @ =gUnknown_20375F8 + ldr r2, _0809E6D8 @ =gPlttBufferFaded lsrs r0, 15 adds r2, r0, r2 - ldr r1, _0809E6DC @ =gUnknown_20371F8 + ldr r1, _0809E6DC @ =gPlttBufferUnfaded adds r0, r1 ldrh r0, [r0] strh r0, [r2] pop {r0} bx r0 .align 2, 0 -_0809E6D8: .4byte gUnknown_20375F8 -_0809E6DC: .4byte gUnknown_20371F8 +_0809E6D8: .4byte gPlttBufferFaded +_0809E6DC: .4byte gPlttBufferUnfaded thumb_func_end sub_809E6B8 thumb_func_start sub_809E6E0 diff --git a/asm/oak_speech.s b/asm/oak_speech.s index e20c96638..a44f2fc37 100644 --- a/asm/oak_speech.s +++ b/asm/oak_speech.s @@ -270,10 +270,10 @@ sub_812EB10: @ 812EB10 thumb_func_start sub_812EB2C sub_812EB2C: @ 812EB2C push {lr} - ldr r0, _0812EB48 @ =gUnknown_20371F8 + ldr r0, _0812EB48 @ =gPlttBufferUnfaded movs r1, 0 strh r1, [r0] - ldr r0, _0812EB4C @ =gUnknown_20375F8 + ldr r0, _0812EB4C @ =gPlttBufferFaded strh r1, [r0] ldr r0, _0812EB50 @ =sub_812EB58 bl CreateTask @@ -282,8 +282,8 @@ sub_812EB2C: @ 812EB2C pop {r0} bx r0 .align 2, 0 -_0812EB48: .4byte gUnknown_20371F8 -_0812EB4C: .4byte gUnknown_20375F8 +_0812EB48: .4byte gPlttBufferUnfaded +_0812EB4C: .4byte gPlttBufferFaded _0812EB50: .4byte sub_812EB58 _0812EB54: .4byte sub_812EB10 thumb_func_end sub_812EB2C @@ -4188,9 +4188,9 @@ _08130B4A: cmp r1, 0xE ble _08130B96 movs r2, 0 - ldr r6, _08130BA0 @ =gUnknown_20375F8 + ldr r6, _08130BA0 @ =gPlttBufferFaded adds r3, r7, 0 - ldr r4, _08130BA4 @ =gUnknown_20371F8 + ldr r4, _08130BA4 @ =gPlttBufferUnfaded _08130B78: adds r0, r2, 0 adds r0, 0x40 @@ -4212,8 +4212,8 @@ _08130B96: bx r0 .align 2, 0 _08130B9C: .4byte 0x00007fff -_08130BA0: .4byte gUnknown_20375F8 -_08130BA4: .4byte gUnknown_20371F8 +_08130BA0: .4byte gPlttBufferFaded +_08130BA4: .4byte gPlttBufferUnfaded thumb_func_end sub_8130B10 thumb_func_start sub_8130BA8 diff --git a/asm/palette.s b/asm/palette.s index d53329082..ed9327106 100644 --- a/asm/palette.s +++ b/asm/palette.s @@ -17,13 +17,13 @@ LoadCompressedPalette: @ 80703A8 adds r1, r6, 0 bl LZDecompressWram lsls r4, 1 - ldr r1, _080703E4 @ =gUnknown_20371F8 + ldr r1, _080703E4 @ =gPlttBufferUnfaded adds r1, r4, r1 lsrs r5, 17 adds r0, r6, 0 adds r2, r5, 0 bl CpuSet - ldr r0, _080703E8 @ =gUnknown_20375F8 + ldr r0, _080703E8 @ =gPlttBufferFaded adds r4, r0 adds r0, r6, 0 adds r1, r4, 0 @@ -34,8 +34,8 @@ LoadCompressedPalette: @ 80703A8 bx r0 .align 2, 0 _080703E0: .4byte gUnknown_2037ACC -_080703E4: .4byte gUnknown_20371F8 -_080703E8: .4byte gUnknown_20375F8 +_080703E4: .4byte gPlttBufferUnfaded +_080703E8: .4byte gPlttBufferFaded thumb_func_end LoadCompressedPalette thumb_func_start LoadPalette @@ -47,12 +47,12 @@ LoadPalette: @ 80703EC lsls r4, 16 lsls r5, 16 lsrs r4, 15 - ldr r1, _0807041C @ =gUnknown_20371F8 + ldr r1, _0807041C @ =gPlttBufferUnfaded adds r1, r4, r1 lsrs r5, 17 adds r2, r5, 0 bl CpuSet - ldr r0, _08070420 @ =gUnknown_20375F8 + ldr r0, _08070420 @ =gPlttBufferFaded adds r4, r0 adds r0, r6, 0 adds r1, r4, 0 @@ -62,8 +62,8 @@ LoadPalette: @ 80703EC pop {r0} bx r0 .align 2, 0 -_0807041C: .4byte gUnknown_20371F8 -_08070420: .4byte gUnknown_20375F8 +_0807041C: .4byte gPlttBufferUnfaded +_08070420: .4byte gPlttBufferFaded thumb_func_end LoadPalette thumb_func_start FillPalette @@ -80,7 +80,7 @@ FillPalette: @ 8070424 mov r0, sp strh r6, [r0] lsrs r4, 15 - ldr r1, _0807046C @ =gUnknown_20371F8 + ldr r1, _0807046C @ =gPlttBufferUnfaded adds r1, r4, r1 lsrs r5, 17 movs r0, 0x80 @@ -92,7 +92,7 @@ FillPalette: @ 8070424 mov r0, sp adds r0, 0x2 strh r6, [r0] - ldr r1, _08070470 @ =gUnknown_20375F8 + ldr r1, _08070470 @ =gPlttBufferFaded adds r4, r1 adds r1, r4, 0 adds r2, r5, 0 @@ -102,8 +102,8 @@ FillPalette: @ 8070424 pop {r0} bx r0 .align 2, 0 -_0807046C: .4byte gUnknown_20371F8 -_08070470: .4byte gUnknown_20375F8 +_0807046C: .4byte gPlttBufferUnfaded +_08070470: .4byte gPlttBufferFaded thumb_func_end FillPalette thumb_func_start TransferPlttBuffer @@ -118,7 +118,7 @@ TransferPlttBuffer: @ 8070474 lsrs r3, r0, 24 cmp r3, 0 bne _080704B6 - ldr r1, _080704C0 @ =gUnknown_20375F8 + ldr r1, _080704C0 @ =gPlttBufferFaded movs r2, 0xA0 lsls r2, 19 ldr r0, _080704C4 @ =0x040000d4 @@ -146,7 +146,7 @@ _080704B6: bx r0 .align 2, 0 _080704BC: .4byte gPaletteFade -_080704C0: .4byte gUnknown_20375F8 +_080704C0: .4byte gPlttBufferFaded _080704C4: .4byte 0x040000d4 _080704C8: .4byte 0x80000200 _080704CC: .4byte gUnknown_2037AC8 @@ -224,8 +224,8 @@ ReadPlttIntoBuffers: @ 8070548 lsls r0, 19 mov r12, r0 movs r4, 0 - ldr r7, _0807057C @ =gUnknown_20371F8 - ldr r6, _08070580 @ =gUnknown_20375F8 + ldr r7, _0807057C @ =gPlttBufferUnfaded + ldr r6, _08070580 @ =gPlttBufferFaded ldr r5, _08070584 @ =0x000001ff _08070558: lsls r1, r4, 1 @@ -246,8 +246,8 @@ _08070558: pop {r0} bx r0 .align 2, 0 -_0807057C: .4byte gUnknown_20371F8 -_08070580: .4byte gUnknown_20375F8 +_0807057C: .4byte gPlttBufferUnfaded +_08070580: .4byte gPlttBufferFaded _08070584: .4byte 0x000001ff thumb_func_end ReadPlttIntoBuffers @@ -373,7 +373,7 @@ _08070668: movs r0, 0x7F ands r0, r1 strb r0, [r4, 0x8] - ldr r0, _080706C4 @ =gUnknown_20375F8 + ldr r0, _080706C4 @ =gPlttBufferFaded movs r1, 0xA0 lsls r1, 19 ldr r2, _080706C8 @ =0x04000100 @@ -409,7 +409,7 @@ _080706B4: bx r1 .align 2, 0 _080706C0: .4byte gPaletteFade -_080706C4: .4byte gUnknown_20375F8 +_080706C4: .4byte gPlttBufferFaded _080706C8: .4byte 0x04000100 _080706CC: .4byte gUnknown_2037AC8 thumb_func_end BeginNormalPaletteFade @@ -542,9 +542,9 @@ unused_sub_80A1CDC: @ 8070790 lsrs r0, r2, 27 cmp r6, r0 bcs _08070878 - ldr r0, _0807081C @ =gUnknown_20371F8 + ldr r0, _0807081C @ =gPlttBufferUnfaded mov r12, r0 - ldr r7, _08070820 @ =gUnknown_20375F8 + ldr r7, _08070820 @ =gPlttBufferFaded _080707C4: ldr r0, [r4, 0x4] lsls r0, 11 @@ -591,15 +591,15 @@ _080707C4: bcc _080707C4 b _08070878 .align 2, 0 -_0807081C: .4byte gUnknown_20371F8 -_08070820: .4byte gUnknown_20375F8 +_0807081C: .4byte gPlttBufferUnfaded +_08070820: .4byte gPlttBufferFaded _08070824: .4byte 0x000003ff _08070828: .4byte 0xffe007ff _0807082C: lsrs r0, r2, 27 cmp r6, r0 bcs _08070878 - ldr r3, _080708E4 @ =gUnknown_20375F8 + ldr r3, _080708E4 @ =gPlttBufferFaded _08070834: ldr r1, [r4, 0x4] lsls r1, 11 @@ -693,7 +693,7 @@ _080708C8: pop {r0} bx r0 .align 2, 0 -_080708E4: .4byte gUnknown_20375F8 +_080708E4: .4byte gPlttBufferFaded _080708E8: .4byte 0x000003ff _080708EC: .4byte 0xffe007ff _080708F0: .4byte 0xfffff01f @@ -768,7 +768,7 @@ _08070950: adds r1, r2, 0 cmp r3, r1 bcs _080709A8 - ldr r6, _080709B0 @ =gUnknown_20375F8 + ldr r6, _080709B0 @ =gPlttBufferFaded _0807097C: ldrh r1, [r4, 0x4] lsls r1, 21 @@ -797,7 +797,7 @@ _080709A8: pop {r0} bx r0 .align 2, 0 -_080709B0: .4byte gUnknown_20375F8 +_080709B0: .4byte gPlttBufferFaded thumb_func_end unused_sub_80A1E40 thumb_func_start unused_sub_80A1F00 @@ -1237,7 +1237,7 @@ InvertPlttBuffer: @ 8070CCC movs r3, 0 cmp r1, 0 beq _08070D0A - ldr r7, _08070D10 @ =gUnknown_20375F8 + ldr r7, _08070D10 @ =gPlttBufferFaded _08070CD8: movs r0, 0x1 ands r0, r1 @@ -1271,7 +1271,7 @@ _08070D0A: pop {r0} bx r0 .align 2, 0 -_08070D10: .4byte gUnknown_20375F8 +_08070D10: .4byte gPlttBufferFaded thumb_func_end InvertPlttBuffer thumb_func_start TintPlttBuffer @@ -1308,7 +1308,7 @@ _08070D3E: cmp r0, 0 beq _08070DC2 movs r4, 0 - ldr r2, _08070DE0 @ =gUnknown_20375F8 + ldr r2, _08070DE0 @ =gPlttBufferFaded mov r8, r2 ldr r1, [sp] lsls r0, r1, 24 @@ -1383,7 +1383,7 @@ _08070DD0: pop {r0} bx r0 .align 2, 0 -_08070DE0: .4byte gUnknown_20375F8 +_08070DE0: .4byte gPlttBufferFaded _08070DE4: .4byte 0xfffffc1f thumb_func_end TintPlttBuffer @@ -1396,9 +1396,9 @@ UnfadePlttBuffer: @ 8070DE8 movs r3, 0 cmp r1, 0 beq _08070E32 - ldr r0, _08070E3C @ =gUnknown_20375F8 + ldr r0, _08070E3C @ =gPlttBufferFaded mov r8, r0 - ldr r0, _08070E40 @ =gUnknown_20371F8 + ldr r0, _08070E40 @ =gPlttBufferUnfaded mov r12, r0 _08070DFE: movs r0, 0x1 @@ -1436,8 +1436,8 @@ _08070E32: pop {r0} bx r0 .align 2, 0 -_08070E3C: .4byte gUnknown_20375F8 -_08070E40: .4byte gUnknown_20371F8 +_08070E3C: .4byte gPlttBufferFaded +_08070E40: .4byte gPlttBufferUnfaded thumb_func_end UnfadePlttBuffer thumb_func_start BeginFastPaletteFade @@ -1498,7 +1498,7 @@ BeginFastPaletteFadeInternal: @ 8070E68 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r1, _08070EE0 @ =gUnknown_20375F8 + ldr r1, _08070EE0 @ =gPlttBufferFaded ldr r2, _08070EE4 @ =0x01000200 mov r0, sp bl CpuSet @@ -1510,7 +1510,7 @@ _08070EBA: ldr r2, _08070EE8 @ =0x00007fff adds r1, r2, 0 strh r1, [r0] - ldr r1, _08070EE0 @ =gUnknown_20375F8 + ldr r1, _08070EE0 @ =gPlttBufferFaded ldr r2, _08070EE4 @ =0x01000200 bl CpuSet _08070ED0: @@ -1521,7 +1521,7 @@ _08070ED0: bx r0 .align 2, 0 _08070EDC: .4byte gPaletteFade -_08070EE0: .4byte gUnknown_20375F8 +_08070EE0: .4byte gPlttBufferFaded _08070EE4: .4byte 0x01000200 _08070EE8: .4byte 0x00007fff thumb_func_end BeginFastPaletteFadeInternal @@ -1599,7 +1599,7 @@ _08070F62: b _08071148 _08070F6A: lsls r2, r7, 1 - ldr r0, _08070FF0 @ =gUnknown_20371F8 + ldr r0, _08070FF0 @ =gPlttBufferUnfaded adds r0, r2, r0 ldr r1, [r0] lsls r3, r1, 27 @@ -1609,7 +1609,7 @@ _08070F6A: lsls r1, 17 lsrs r1, 27 mov r8, r1 - ldr r0, _08070FF4 @ =gUnknown_20375F8 + ldr r0, _08070FF4 @ =gPlttBufferFaded adds r2, r0 mov r9, r2 ldr r1, [r2] @@ -1669,8 +1669,8 @@ _08070FD0: bcc _08070F6A b _08071148 .align 2, 0 -_08070FF0: .4byte gUnknown_20371F8 -_08070FF4: .4byte gUnknown_20375F8 +_08070FF0: .4byte gPlttBufferUnfaded +_08070FF4: .4byte gPlttBufferFaded _08070FF8: adds r7, r2, 0 cmp r7, r10 @@ -1678,7 +1678,7 @@ _08070FF8: b _08071148 _08071000: lsls r1, r7, 1 - ldr r0, _08071058 @ =gUnknown_20375F8 + ldr r0, _08071058 @ =gPlttBufferFaded adds r2, r1, r0 ldr r1, [r2] lsls r0, r1, 27 @@ -1725,14 +1725,14 @@ _0807103A: bcc _08071000 b _08071148 .align 2, 0 -_08071058: .4byte gUnknown_20375F8 +_08071058: .4byte gPlttBufferFaded _0807105C: adds r7, r2, 0 cmp r7, r10 bcs _08071148 _08071062: lsls r2, r7, 1 - ldr r0, _080710DC @ =gUnknown_20371F8 + ldr r0, _080710DC @ =gPlttBufferUnfaded adds r0, r2, r0 ldr r1, [r0] lsls r3, r1, 27 @@ -1742,7 +1742,7 @@ _08071062: lsls r1, 17 lsrs r1, 27 mov r8, r1 - ldr r0, _080710E0 @ =gUnknown_20375F8 + ldr r0, _080710E0 @ =gPlttBufferFaded adds r2, r0 ldr r1, [r2] lsls r0, r1, 27 @@ -1795,13 +1795,13 @@ _080710BC: bcc _08071062 b _08071148 .align 2, 0 -_080710DC: .4byte gUnknown_20371F8 -_080710E0: .4byte gUnknown_20375F8 +_080710DC: .4byte gPlttBufferUnfaded +_080710E0: .4byte gPlttBufferFaded _080710E4: adds r7, r2, 0 cmp r7, r10 bcs _08071148 - ldr r4, _08071170 @ =gUnknown_20375F8 + ldr r4, _08071170 @ =gPlttBufferFaded mov r8, r4 _080710EE: lsls r0, r7, 1 @@ -1873,7 +1873,7 @@ _08071148: ldrb r0, [r1, 0x7] b _08071244 .align 2, 0 -_08071170: .4byte gUnknown_20375F8 +_08071170: .4byte gPlttBufferFaded _08071174: .4byte gPaletteFade _08071178: ldr r2, _08071194 @ =gPaletteFade @@ -1934,31 +1934,31 @@ _080711E0: beq _08071220 b _0807122C _080711EA: - ldr r0, _080711F8 @ =gUnknown_20371F8 - ldr r1, _080711FC @ =gUnknown_20375F8 + ldr r0, _080711F8 @ =gPlttBufferUnfaded + ldr r1, _080711FC @ =gPlttBufferFaded ldr r2, _08071200 @ =0x04000100 bl CpuSet b _0807122C .align 2, 0 -_080711F8: .4byte gUnknown_20371F8 -_080711FC: .4byte gUnknown_20375F8 +_080711F8: .4byte gPlttBufferUnfaded +_080711FC: .4byte gPlttBufferFaded _08071200: .4byte 0x04000100 _08071204: movs r0, 0x1 negs r0, r0 str r0, [sp] - ldr r1, _08071218 @ =gUnknown_20375F8 + ldr r1, _08071218 @ =gPlttBufferFaded ldr r2, _0807121C @ =0x05000100 mov r0, sp bl CpuSet b _0807122C .align 2, 0 -_08071218: .4byte gUnknown_20375F8 +_08071218: .4byte gPlttBufferFaded _0807121C: .4byte 0x05000100 _08071220: str r1, [sp, 0x4] add r0, sp, 0x4 - ldr r1, _08071258 @ =gUnknown_20375F8 + ldr r1, _08071258 @ =gPlttBufferFaded ldr r2, _0807125C @ =0x05000100 bl CpuSet _0807122C: @@ -1987,7 +1987,7 @@ _08071246: pop {r1} bx r1 .align 2, 0 -_08071258: .4byte gUnknown_20375F8 +_08071258: .4byte gPlttBufferFaded _0807125C: .4byte 0x05000100 _08071260: .4byte gPaletteFade thumb_func_end UpdateFastPaletteFade @@ -2371,8 +2371,8 @@ BlendPalettesUnfaded: @ 8071510 lsrs r4, 24 lsls r5, 16 lsrs r5, 16 - ldr r0, _0807153C @ =gUnknown_20371F8 - ldr r1, _08071540 @ =gUnknown_20375F8 + ldr r0, _0807153C @ =gPlttBufferUnfaded + ldr r1, _08071540 @ =gPlttBufferFaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -2384,8 +2384,8 @@ BlendPalettesUnfaded: @ 8071510 pop {r0} bx r0 .align 2, 0 -_0807153C: .4byte gUnknown_20371F8 -_08071540: .4byte gUnknown_20375F8 +_0807153C: .4byte gPlttBufferUnfaded +_08071540: .4byte gPlttBufferFaded thumb_func_end BlendPalettesUnfaded thumb_func_start TintPalette_GrayScale diff --git a/asm/party_menu.s b/asm/party_menu.s index c482366d4..9754bb605 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -681,7 +681,7 @@ _0811EFD4: lsls r2, 1 movs r1, 0 bl LoadCompressedPalette - ldr r0, _0811EFF8 @ =gUnknown_20371F8 + ldr r0, _0811EFF8 @ =gPlttBufferUnfaded ldr r4, _0811EFFC @ =gUnknown_203B09C ldr r1, [r4] adds r1, 0x18 @@ -691,7 +691,7 @@ _0811EFD4: b _0811F01A .align 2, 0 _0811EFF4: .4byte gUnknown_8E829C8 -_0811EFF8: .4byte gUnknown_20371F8 +_0811EFF8: .4byte gPlttBufferUnfaded _0811EFFC: .4byte gUnknown_203B09C _0811F000: movs r0, 0x4 @@ -747,7 +747,7 @@ sub_811F03C: @ 811F03C adds r0, r5, 0 movs r2, 0x10 bl CpuSet - ldr r0, _0811F06C @ =gUnknown_20375F8 + ldr r0, _0811F06C @ =gPlttBufferFaded adds r4, r0 adds r0, r5, 0 adds r1, r4, 0 @@ -758,7 +758,7 @@ sub_811F03C: @ 811F03C bx r0 .align 2, 0 _0811F068: .4byte gUnknown_2037258 -_0811F06C: .4byte gUnknown_20375F8 +_0811F06C: .4byte gPlttBufferFaded thumb_func_end sub_811F03C thumb_func_start sub_811F070 diff --git a/asm/pc_screen_effect.s b/asm/pc_screen_effect.s index b8e48f91c..61c47a719 100644 --- a/asm/pc_screen_effect.s +++ b/asm/pc_screen_effect.s @@ -226,7 +226,7 @@ _080A0BCC: movs r1, 0 movs r2, 0 bl BlendPalettes - ldr r0, _080A0C0C @ =gUnknown_20375F8 + ldr r0, _080A0C0C @ =gPlttBufferFaded strh r5, [r0] _080A0BF2: ldrh r1, [r4, 0xE] @@ -241,7 +241,7 @@ _080A0BF2: ldrsh r0, [r4, r1] b _080A0C54 .align 2, 0 -_080A0C0C: .4byte gUnknown_20375F8 +_080A0C0C: .4byte gPlttBufferFaded _080A0C10: ldrh r0, [r4, 0x12] ldrh r1, [r4, 0xC] @@ -326,11 +326,11 @@ _080A0CA0: beq _080A0D54 b _080A0DA8 _080A0CAA: - ldr r0, _080A0CB0 @ =gUnknown_20375F8 + ldr r0, _080A0CB0 @ =gPlttBufferFaded strh r1, [r0] b _080A0DCA .align 2, 0 -_080A0CB0: .4byte gUnknown_20375F8 +_080A0CB0: .4byte gPlttBufferFaded _080A0CB4: movs r1, 0 strh r1, [r4, 0xE] @@ -431,7 +431,7 @@ _080A0D72: movs r1, 0x10 movs r2, 0 bl BlendPalettes - ldr r1, _080A0DA4 @ =gUnknown_20375F8 + ldr r1, _080A0DA4 @ =gPlttBufferFaded movs r0, 0 strh r0, [r1] _080A0D88: @@ -449,7 +449,7 @@ _080A0D88: bne _080A0DD0 b _080A0DCA .align 2, 0 -_080A0DA4: .4byte gUnknown_20375F8 +_080A0DA4: .4byte gPlttBufferFaded _080A0DA8: movs r1, 0x80 lsls r1, 6 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 682d5e9b3..04dae118c 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -12786,7 +12786,7 @@ sub_8091EF0: @ 8091EF0 adds r1, r2, r3 ldrh r1, [r1] lsls r1, 1 - ldr r2, _08091F34 @ =gUnknown_20371F8 + ldr r2, _08091F34 @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x2 bl CpuSet @@ -12794,7 +12794,7 @@ sub_8091EF0: @ 8091EF0 .align 2, 0 _08091F2C: .4byte gUnknown_20397B0 _08091F30: .4byte gUnknown_83D29D0 -_08091F34: .4byte gUnknown_20371F8 +_08091F34: .4byte gPlttBufferUnfaded _08091F38: lsls r0, r1, 2 ldr r1, _08091F54 @ =gUnknown_83D29D0 @@ -12803,7 +12803,7 @@ _08091F38: adds r1, r2, r3 ldrh r1, [r1] lsls r1, 1 - ldr r2, _08091F5C @ =gUnknown_20371F8 + ldr r2, _08091F5C @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x2 bl CpuSet @@ -12813,7 +12813,7 @@ _08091F50: .align 2, 0 _08091F54: .4byte gUnknown_83D29D0 _08091F58: .4byte 0x0000071e -_08091F5C: .4byte gUnknown_20371F8 +_08091F5C: .4byte gPlttBufferUnfaded thumb_func_end sub_8091EF0 thumb_func_start sub_8091F60 diff --git a/asm/quest_log.s b/asm/quest_log.s index 9809b1b52..4972eaa07 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,99 +5,6 @@ .text - thumb_func_start sub_81121D8 -sub_81121D8: @ 81121D8 - push {r4-r7,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _0811227C @ =gTasks+0x8 - adds r7, r1, r0 - ldrh r1, [r7, 0x2] - movs r2, 0x2 - ldrsh r0, [r7, r2] - cmp r0, 0xF - bgt _08112290 - ldr r5, _08112280 @ =gUnknown_20371FA - ldr r6, _08112284 @ =gUnknown_20375FA - movs r4, 0xF - subs r3, r4, r1 - lsls r3, 24 - lsrs r3, 24 - adds r0, r5, 0 - adds r1, r6, 0 - movs r2, 0xDF - bl sub_80716F8 - movs r0, 0xFF - lsls r0, 1 - adds r5, r0 - adds r6, r0 - movs r2, 0x80 - lsls r2, 1 - ldrb r0, [r7, 0x2] - subs r4, r0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - adds r1, r6, 0 - adds r3, r4, 0 - bl sub_80716F8 - ldr r5, _08112288 @ =gUnknown_203ADFE - ldrb r0, [r5] - ldr r4, _0811228C @ =gUnknown_845661C - ldrb r3, [r4, 0x4] - lsls r3, 3 - subs r3, 0x1 - ldrh r1, [r7, 0x2] - subs r3, r1 - lsls r3, 16 - lsrs r3, 16 - ldrb r1, [r4, 0x3] - lsls r1, 3 - str r1, [sp] - movs r6, 0x1 - str r6, [sp, 0x4] - movs r1, 0 - movs r2, 0 - bl FillWindowPixelRect - ldrb r0, [r5, 0x1] - ldrh r3, [r7, 0x2] - ldrb r1, [r4, 0xB] - lsls r1, 3 - str r1, [sp] - str r6, [sp, 0x4] - movs r1, 0 - movs r2, 0 - bl FillWindowPixelRect - ldrb r0, [r5] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r5, 0x1] - movs r1, 0x2 - bl CopyWindowToVram - ldrh r0, [r7, 0x2] - adds r0, 0x1 - strh r0, [r7, 0x2] - movs r0, 0 - b _08112292 - .align 2, 0 -_0811227C: .4byte gTasks+0x8 -_08112280: .4byte gUnknown_20371FA -_08112284: .4byte gUnknown_20375FA -_08112288: .4byte gUnknown_203ADFE -_0811228C: .4byte gUnknown_845661C -_08112290: - movs r0, 0x1 -_08112292: - add sp, 0x8 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81121D8 - thumb_func_start sub_811229C sub_811229C: @ 811229C push {r4-r6,lr} @@ -138,7 +45,7 @@ sub_811229C: @ 811229C movs r2, 0x50 bl sub_807B0C4 ldr r0, [r4] - ldr r1, _08112318 @ =gUnknown_20371F8 + ldr r1, _08112318 @ =gPlttBufferUnfaded adds r2, r5, 0 bl CpuSet ldr r1, [r4] @@ -152,7 +59,7 @@ sub_811229C: @ 811229C bx r0 .align 2, 0 _08112314: .4byte gUnknown_203AE90 -_08112318: .4byte gUnknown_20371F8 +_08112318: .4byte gPlttBufferUnfaded thumb_func_end sub_811229C thumb_func_start sub_811231C diff --git a/asm/roulette_util.s b/asm/roulette_util.s index b94b22743..532bf4684 100644 --- a/asm/roulette_util.s +++ b/asm/roulette_util.s @@ -151,9 +151,9 @@ _080D8CD8: ldrh r0, [r5, 0x6] add r0, r12 lsls r0, 1 - ldr r1, _080D8CFC @ =gUnknown_20375F8 + ldr r1, _080D8CFC @ =gPlttBufferFaded adds r3, r0, r1 - ldr r1, _080D8D00 @ =gUnknown_20371F8 + ldr r1, _080D8D00 @ =gPlttBufferUnfaded adds r6, r0, r1 ldrb r0, [r5] lsls r0, 25 @@ -165,8 +165,8 @@ _080D8CD8: b _080D8E4E .align 2, 0 _080D8CF8: .4byte 0xfffffc1f -_080D8CFC: .4byte gUnknown_20375F8 -_080D8D00: .4byte gUnknown_20371F8 +_080D8CFC: .4byte gPlttBufferFaded +_080D8D00: .4byte gPlttBufferUnfaded _080D8D04: ldr r0, [r3] lsls r2, r0, 27 @@ -422,7 +422,7 @@ _080D8ECE: ldrb r0, [r3, 0x8] cmp r2, r0 bcs _080D8EEE - ldr r4, _080D8EF8 @ =gUnknown_20375F8 + ldr r4, _080D8EF8 @ =gPlttBufferFaded _080D8ED6: ldrh r0, [r3, 0x6] adds r0, r2 @@ -443,13 +443,13 @@ _080D8EEE: adds r1, 0x1 b _080D8F28 .align 2, 0 -_080D8EF8: .4byte gUnknown_20375F8 +_080D8EF8: .4byte gPlttBufferFaded _080D8EFC: ldrb r0, [r3, 0x8] cmp r2, r0 bcs _080D8F20 - ldr r5, _080D8F40 @ =gUnknown_20375F8 - ldr r4, _080D8F44 @ =gUnknown_20371F8 + ldr r5, _080D8F40 @ =gPlttBufferFaded + ldr r4, _080D8F44 @ =gPlttBufferUnfaded _080D8F06: ldrh r0, [r3, 0x6] adds r0, r2 @@ -483,8 +483,8 @@ _080D8F36: pop {r1} bx r1 .align 2, 0 -_080D8F40: .4byte gUnknown_20375F8 -_080D8F44: .4byte gUnknown_20371F8 +_080D8F40: .4byte gPlttBufferFaded +_080D8F44: .4byte gPlttBufferUnfaded thumb_func_end sub_80D8EB8 thumb_func_start task_tutorial_controls_fadein @@ -625,9 +625,9 @@ _080D9016: beq _080D907E ldrh r1, [r4, 0xA] lsls r1, 1 - ldr r0, _080D9074 @ =gUnknown_20375F8 + ldr r0, _080D9074 @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _080D9078 @ =gUnknown_20371F8 + ldr r2, _080D9078 @ =gPlttBufferUnfaded adds r1, r2 ldrb r2, [r4, 0xC] lsls r2, 1 @@ -651,8 +651,8 @@ _080D9016: strb r0, [r4, 0x7] b _080D907E .align 2, 0 -_080D9074: .4byte gUnknown_20375F8 -_080D9078: .4byte gUnknown_20371F8 +_080D9074: .4byte gPlttBufferFaded +_080D9078: .4byte gPlttBufferUnfaded _080D907C: strb r3, [r4, 0x7] _080D907E: @@ -787,8 +787,8 @@ sub_80D9140: @ 80D9140 adds r0, r2, r0 cmp r2, r0 bge _080D9182 - ldr r5, _080D91B4 @ =gUnknown_20375F8 - ldr r3, _080D91B8 @ =gUnknown_20371F8 + ldr r5, _080D91B4 @ =gPlttBufferFaded + ldr r3, _080D91B8 @ =gPlttBufferUnfaded _080D9168: lsls r0, r2, 1 adds r1, r0, r5 @@ -829,8 +829,8 @@ _080D9182: pop {r0} bx r0 .align 2, 0 -_080D91B4: .4byte gUnknown_20375F8 -_080D91B8: .4byte gUnknown_20371F8 +_080D91B4: .4byte gPlttBufferFaded +_080D91B8: .4byte gPlttBufferUnfaded thumb_func_end sub_80D9140 thumb_func_start sub_80D91BC @@ -992,8 +992,8 @@ sub_80D9294: @ 80D9294 adds r0, r2, r0 cmp r2, r0 bge _080D92FA - ldr r5, _080D9314 @ =gUnknown_20375F8 - ldr r4, _080D9318 @ =gUnknown_20371F8 + ldr r5, _080D9314 @ =gPlttBufferFaded + ldr r4, _080D9318 @ =gPlttBufferUnfaded _080D92E0: lsls r0, r2, 1 adds r1, r0, r5 @@ -1022,8 +1022,8 @@ _080D92FA: strh r0, [r2] b _080D93A6 .align 2, 0 -_080D9314: .4byte gUnknown_20375F8 -_080D9318: .4byte gUnknown_20371F8 +_080D9314: .4byte gPlttBufferFaded +_080D9318: .4byte gPlttBufferUnfaded _080D931C: movs r0, 0x1 mov r9, r0 @@ -1066,8 +1066,8 @@ _080D9350: adds r0, r2, r0 cmp r2, r0 bge _080D9386 - ldr r6, _080D93B4 @ =gUnknown_20375F8 - ldr r4, _080D93B8 @ =gUnknown_20371F8 + ldr r6, _080D93B4 @ =gPlttBufferFaded + ldr r4, _080D93B8 @ =gPlttBufferUnfaded _080D936C: lsls r0, r2, 1 adds r1, r0, r6 @@ -1109,8 +1109,8 @@ _080D93A6: pop {r0} bx r0 .align 2, 0 -_080D93B4: .4byte gUnknown_20375F8 -_080D93B8: .4byte gUnknown_20371F8 +_080D93B4: .4byte gPlttBufferFaded +_080D93B8: .4byte gPlttBufferUnfaded thumb_func_end sub_80D9294 thumb_func_start sub_80D93BC diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 2fc05a82a..f21a6f185 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -4503,9 +4503,9 @@ _08141A00: bl BlendPalettes _08141A2C: movs r4, 0 - ldr r5, _08141A4C @ =gUnknown_20375F8 + ldr r5, _08141A4C @ =gPlttBufferFaded ldr r3, _08141A50 @ =gUnknown_8466C34 - ldr r2, _08141A54 @ =gUnknown_20371F8 + ldr r2, _08141A54 @ =gPlttBufferUnfaded _08141A34: adds r0, r4, r3 ldrb r0, [r0] @@ -4520,9 +4520,9 @@ _08141A34: bls _08141A34 b _08141AA8 .align 2, 0 -_08141A4C: .4byte gUnknown_20375F8 +_08141A4C: .4byte gPlttBufferFaded _08141A50: .4byte gUnknown_8466C34 -_08141A54: .4byte gUnknown_20371F8 +_08141A54: .4byte gPlttBufferUnfaded _08141A58: movs r4, 0 _08141A5A: diff --git a/asm/title_screen.s b/asm/title_screen.s index c9ec19427..9e12dfbff 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -1381,9 +1381,9 @@ _08079478: lsls r0, 16 cmp r0, 0 beq _080794CC - ldr r2, _080794C0 @ =gUnknown_20371F8 + ldr r2, _080794C0 @ =gPlttBufferUnfaded ldr r4, _080794C4 @ =gUnknown_8EAE094 - ldr r1, _080794C8 @ =gUnknown_20375F8 + ldr r1, _080794C8 @ =gPlttBufferFaded movs r0, 0xF1 lsls r0, 1 adds r1, r0 @@ -1401,14 +1401,14 @@ _080794AC: bge _080794AC b _080794F2 .align 2, 0 -_080794C0: .4byte gUnknown_20371F8 +_080794C0: .4byte gPlttBufferUnfaded _080794C4: .4byte gUnknown_8EAE094 -_080794C8: .4byte gUnknown_20375F8 +_080794C8: .4byte gPlttBufferFaded _080794CC: movs r3, 0 - ldr r2, _08079518 @ =gUnknown_20371F8 + ldr r2, _08079518 @ =gPlttBufferUnfaded ldr r0, _0807951C @ =gUnknown_8EAE094 - ldr r1, _08079520 @ =gUnknown_20375F8 + ldr r1, _08079520 @ =gPlttBufferFaded adds r4, r0, 0x2 movs r0, 0xF1 lsls r0, 1 @@ -1445,9 +1445,9 @@ _08079510: pop {r0} bx r0 .align 2, 0 -_08079518: .4byte gUnknown_20371F8 +_08079518: .4byte gPlttBufferUnfaded _0807951C: .4byte gUnknown_8EAE094 -_08079520: .4byte gUnknown_20375F8 +_08079520: .4byte gPlttBufferFaded _08079524: .4byte gPaletteFade thumb_func_end sub_807941C diff --git a/asm/tm_case.s b/asm/tm_case.s index 3cd478ee6..a4767baa5 100644 --- a/asm/tm_case.s +++ b/asm/tm_case.s @@ -3075,8 +3075,8 @@ _08133170: ldrh r1, [r1] strh r1, [r2, 0xA] bl Free - ldr r0, _08133208 @ =gUnknown_20375F8 - ldr r1, _0813320C @ =gUnknown_20371F8 + ldr r0, _08133208 @ =gPlttBufferFaded + ldr r1, _0813320C @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -3100,8 +3100,8 @@ _081331F8: .4byte gSaveBlock1Ptr _081331FC: .4byte 0x00000464 _08133200: .4byte gUnknown_203B11C _08133204: .4byte gUnknown_203B10C -_08133208: .4byte gUnknown_20375F8 -_0813320C: .4byte gUnknown_20371F8 +_08133208: .4byte gPlttBufferFaded +_0813320C: .4byte gPlttBufferUnfaded _08133210: ldr r0, _0813323C @ =gPaletteFade ldrb r1, [r0, 0x7] diff --git a/include/palette.h b/include/palette.h index bdd1d1b93..90112947a 100644 --- a/include/palette.h +++ b/include/palette.h @@ -42,8 +42,8 @@ struct PaletteFadeControl extern struct PaletteFadeControl gPaletteFade; extern u32 gPlttBufferTransferPending; extern u8 gPaletteDecompressionBuffer[]; -extern u16 gPlttBufferUnfaded[]; -extern u16 gPlttBufferFaded[]; +extern u16 gPlttBufferUnfaded[PLTT_BUFFER_SIZE]; +extern u16 gPlttBufferFaded[PLTT_BUFFER_SIZE]; void LoadCompressedPalette(const void *, u16, u16); void LoadPalette(const void *, u16, u16); @@ -67,6 +67,7 @@ void BeginFastPaletteFade(u8); void BeginHardwarePaletteFade(u8, u8, u8, u8, u8); void BlendPalettes(u32, u8, u16); void BlendPalettesUnfaded(u32, u8, u16); +void sub_80716F8(const u16 *, u16 *, u16, u8); extern struct PaletteFadeControl gPaletteFade; diff --git a/src/quest_log.c b/src/quest_log.c index e7a5a2d5b..028bd574e 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -44,8 +44,6 @@ struct UnkStruct_203AE98 u8 unk_6; }; -extern u16 gUnknown_20371F8[]; - EWRAM_DATA u8 gUnknown_203ADF8 = 0; EWRAM_DATA u8 gUnknown_203ADF9 = 0; EWRAM_DATA u8 gUnknown_203ADFA = 0; @@ -1214,7 +1212,7 @@ void sub_8111F14(void) void sub_8111F38(u16 a0, u16 a1) { - CpuSet(gUnknown_20371F8 + a0, gUnknown_203AE90 + a0, a1); + CpuSet(gPlttBufferUnfaded + a0, gUnknown_203AE90 + a0, a1); } bool8 sub_8111F60(void) @@ -1311,7 +1309,7 @@ void sub_81120AC(u8 taskId) default: if (gUnknown_203AE94.unk_0_6 == 1) sub_8098110(1); - CpuCopy16(gUnknown_203AE90, gUnknown_20371F8, 0x400); + CpuCopy16(gUnknown_203AE90, gPlttBufferUnfaded, 0x400); Free(gUnknown_203AE90); gUnknown_203AE94 = (struct UnkStruct_203AE94){}; sub_80696C0(); @@ -1324,3 +1322,20 @@ void sub_81120AC(u8 taskId) break; } } + +bool8 sub_81121D8(u8 taskId) +{ + s16 * data = gTasks[taskId].data; + + if (data[1] > 15) + return TRUE; + + sub_80716F8(gPlttBufferUnfaded + 0x01, gPlttBufferFaded + 0x01, 0xDF, 0x0F - data[1]); + sub_80716F8(gPlttBufferUnfaded + 0x100, gPlttBufferFaded + 0x100, 0x100, 0x0F - data[1]); + FillWindowPixelRect(gUnknown_203ADFE[0], 0x00, 0, gUnknown_845661C[0].height * 8 - 1 - data[1], gUnknown_845661C[0].width * 8, 1); + FillWindowPixelRect(gUnknown_203ADFE[1], 0x00, 0, data[1], gUnknown_845661C[1].width * 8, 1); + CopyWindowToVram(gUnknown_203ADFE[0], 2); + CopyWindowToVram(gUnknown_203ADFE[1], 2); + data[1]++; + return FALSE; +} diff --git a/sym_ewram.txt b/sym_ewram.txt index cebe20e4f..dd96b15fd 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -761,7 +761,7 @@ gUnknown_2037104: @ 2037104 gUnknown_2037108: @ 2037108 .space 0xF0 -gUnknown_20371F8: @ 20371F8 +gPlttBufferUnfaded: @ 20371F8 .space 0x2 gUnknown_20371FA: @ 20371FA @@ -788,7 +788,7 @@ gUnknown_20373F8: @ 20373F8 gUnknown_2037408: @ 2037408 .space 0x1F0 -gUnknown_20375F8: @ 20375F8 +gPlttBufferFaded: @ 20375F8 .space 0x2 gUnknown_20375FA: @ 20375FA |