diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 12:18:17 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 12:18:17 -0400 |
commit | 9377dc23e2dcb8a293d8c0d1193c4d708045e08d (patch) | |
tree | 45eca3d96fe89f574a4f187bd82c9aedf1f614e4 | |
parent | 714d387cbd8e3a9a9e5b522eed42c8132d41e0b0 (diff) |
through sub_8111F8C
75 files changed, 806 insertions, 937 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s index 086603fe1..92cbd66b4 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -1620,7 +1620,7 @@ _08010AF0: .4byte gMain _08010AF4: .4byte gBattleTypeFlags _08010AF8: .4byte sub_80109C8 _08010AFC: - ldr r0, _08010B1C @ =gUnknown_2037AB8 + ldr r0, _08010B1C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1635,7 +1635,7 @@ _08010AFC: bl sub_800AB9C b _08010B82 .align 2, 0 -_08010B1C: .4byte gUnknown_2037AB8 +_08010B1C: .4byte gPaletteFade _08010B20: .4byte gUnknown_3003F3C _08010B24: bl sub_800AAC0 @@ -2439,7 +2439,7 @@ _080111B8: .4byte 0x00000439 CB2_QuitRecordedBattle: @ 80111BC push {lr} bl UpdatePaletteFade - ldr r0, _080111E4 @ =gUnknown_2037AB8 + ldr r0, _080111E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2454,7 +2454,7 @@ _080111DE: pop {r0} bx r0 .align 2, 0 -_080111E4: .4byte gUnknown_2037AB8 +_080111E4: .4byte gPaletteFade _080111E8: .4byte gMain thumb_func_end CB2_QuitRecordedBattle @@ -3726,7 +3726,7 @@ _08011C08: strb r0, [r4] b _08011C34 _08011C10: - ldr r0, _08011C3C @ =gUnknown_2037AB8 + ldr r0, _08011C3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3745,7 +3745,7 @@ _08011C34: pop {r0} bx r0 .align 2, 0 -_08011C3C: .4byte gUnknown_2037AB8 +_08011C3C: .4byte gPaletteFade _08011C40: .4byte gMain thumb_func_end sub_8011BB0 @@ -11485,7 +11485,7 @@ _08015A2C: .4byte gUnknown_2023D74 thumb_func_start sub_8015A30 sub_8015A30: @ 8015A30 push {lr} - ldr r0, _08015A58 @ =gUnknown_2037AB8 + ldr r0, _08015A58 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -11505,7 +11505,7 @@ _08015A52: ldr r0, _08015A68 @ =ReturnFromBattleToOverworld b _08015A70 .align 2, 0 -_08015A58: .4byte gUnknown_2037AB8 +_08015A58: .4byte gPaletteFade _08015A5C: .4byte gUnknown_3004FD4 _08015A60: .4byte gUnknown_2023E8A _08015A64: .4byte gUnknown_3004F84 diff --git a/asm/battle_anim.s b/asm/battle_anim.s index c258fa7b1..f15200700 100644 --- a/asm/battle_anim.s +++ b/asm/battle_anim.s @@ -2536,7 +2536,7 @@ sub_8073850: @ 8073850 .align 2, 0 _08073884: .4byte gTasks _08073888: - ldr r2, _080738A4 @ =gUnknown_2037AB8 + ldr r2, _080738A4 @ =gPaletteFade ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -2551,7 +2551,7 @@ _08073888: strb r0, [r1] b _080738F0 .align 2, 0 -_080738A4: .4byte gUnknown_2037AB8 +_080738A4: .4byte gPaletteFade _080738A8: .4byte gUnknown_2037F17 _080738AC: cmp r3, 0x2 diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index 90b0c8c86..e38fc6501 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -8218,7 +8218,7 @@ _080A6178: _080A618C: .4byte 0x00007fbb _080A6190: .4byte gUnknown_20375F8 _080A6194: - ldr r0, _080A61DC @ =gUnknown_2037AB8 + ldr r0, _080A61DC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -8257,7 +8257,7 @@ _080A61CA: strh r0, [r4, 0xA] b _080A6214 .align 2, 0 -_080A61DC: .4byte gUnknown_2037AB8 +_080A61DC: .4byte gPaletteFade _080A61E0: .4byte gSprites _080A61E4: .4byte gUnknown_83E3734 _080A61E8: .4byte gUnknown_83E3764 @@ -8288,7 +8288,7 @@ _080A6214: .align 2, 0 _080A621C: .4byte 0x00007fbb _080A6220: - ldr r0, _080A6240 @ =gUnknown_2037AB8 + ldr r0, _080A6240 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -8304,7 +8304,7 @@ _080A6232: pop {r0} bx r0 .align 2, 0 -_080A6240: .4byte gUnknown_2037AB8 +_080A6240: .4byte gPaletteFade thumb_func_end sub_80A60A8 thumb_func_start sub_80A6244 @@ -41851,7 +41851,7 @@ sub_80B65F0: @ 80B65F0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080B663C @ =gUnknown_2037AB8 + ldr r0, _080B663C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -41883,7 +41883,7 @@ _080B6636: pop {r0} bx r0 .align 2, 0 -_080B663C: .4byte gUnknown_2037AB8 +_080B663C: .4byte gPaletteFade _080B6640: .4byte gUnknown_2022984 _080B6644: .4byte gUnknown_2022986 _080B6648: .4byte 0x00003f3f @@ -48522,7 +48522,7 @@ sub_80B9A14: @ 80B9A14 sub_80B9A5C: @ 80B9A5C push {lr} adds r2, r0, 0 - ldr r0, _080B9A78 @ =gUnknown_2037AB8 + ldr r0, _080B9A78 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -48534,7 +48534,7 @@ _080B9A72: pop {r0} bx r0 .align 2, 0 -_080B9A78: .4byte gUnknown_2037AB8 +_080B9A78: .4byte gPaletteFade thumb_func_end sub_80B9A5C thumb_func_start sub_80B9A7C @@ -48592,7 +48592,7 @@ sub_80B9AD0: @ 80B9AD0 strh r0, [r4, 0x2E] b _080B9B54 _080B9AE4: - ldr r0, _080B9B00 @ =gUnknown_2037AB8 + ldr r0, _080B9B00 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -48606,7 +48606,7 @@ _080B9AE4: str r0, [r4, 0x1C] b _080B9B54 .align 2, 0 -_080B9B00: .4byte gUnknown_2037AB8 +_080B9B00: .4byte gPaletteFade _080B9B04: .4byte sub_80B9B5C _080B9B08: movs r2, 0x3C @@ -48656,7 +48656,7 @@ _080B9B54: sub_80B9B5C: @ 80B9B5C push {r4,lr} adds r4, r0, 0 - ldr r0, _080B9B88 @ =gUnknown_2037AB8 + ldr r0, _080B9B88 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -48675,7 +48675,7 @@ _080B9B82: pop {r0} bx r0 .align 2, 0 -_080B9B88: .4byte gUnknown_2037AB8 +_080B9B88: .4byte gPaletteFade thumb_func_end sub_80B9B5C thumb_func_start sub_80B9B8C @@ -48806,7 +48806,7 @@ sub_80B9C7C: @ 80B9C7C lsls r0, 24 lsrs r3, r0, 24 adds r4, r3, 0 - ldr r0, _080B9CB4 @ =gUnknown_2037AB8 + ldr r0, _080B9CB4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -48831,7 +48831,7 @@ sub_80B9C7C: @ 80B9C7C ldrb r2, [r3, 0x10] b _080B9CC0 .align 2, 0 -_080B9CB4: .4byte gUnknown_2037AB8 +_080B9CB4: .4byte gPaletteFade _080B9CB8: .4byte gTasks _080B9CBC: ldrb r1, [r3, 0x10] @@ -49001,7 +49001,7 @@ sub_80B9DF0: @ 80B9DF0 lsls r0, 24 lsrs r3, r0, 24 adds r4, r3, 0 - ldr r0, _080B9E28 @ =gUnknown_2037AB8 + ldr r0, _080B9E28 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -49026,7 +49026,7 @@ sub_80B9DF0: @ 80B9DF0 ldrb r2, [r3, 0x10] b _080B9E34 .align 2, 0 -_080B9E28: .4byte gUnknown_2037AB8 +_080B9E28: .4byte gPaletteFade _080B9E2C: .4byte gTasks _080B9E30: ldrb r1, [r3, 0x10] @@ -49146,7 +49146,7 @@ sub_80B9F04: @ 80B9F04 lsls r0, 24 lsrs r3, r0, 24 adds r4, r3, 0 - ldr r0, _080B9F3C @ =gUnknown_2037AB8 + ldr r0, _080B9F3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -49171,7 +49171,7 @@ sub_80B9F04: @ 80B9F04 ldrb r2, [r3, 0x10] b _080B9F48 .align 2, 0 -_080B9F3C: .4byte gUnknown_2037AB8 +_080B9F3C: .4byte gPaletteFade _080B9F40: .4byte gTasks _080B9F44: ldrb r1, [r3, 0x10] @@ -49274,7 +49274,7 @@ sub_80B9FD8: @ 80B9FD8 .align 2, 0 _080B9FFC: .4byte gTasks _080BA000: - ldr r0, _080BA01C @ =gUnknown_2037AB8 + ldr r0, _080BA01C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -49288,7 +49288,7 @@ _080BA000: str r0, [r4] b _080BA084 .align 2, 0 -_080BA01C: .4byte gUnknown_2037AB8 +_080BA01C: .4byte gPaletteFade _080BA020: .4byte sub_80BA090 _080BA024: ldrh r0, [r4, 0x16] @@ -49353,7 +49353,7 @@ sub_80BA090: @ 80BA090 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080BA0E0 @ =gUnknown_2037AB8 + ldr r0, _080BA0E0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -49387,7 +49387,7 @@ _080BA0D6: pop {r0} bx r0 .align 2, 0 -_080BA0E0: .4byte gUnknown_2037AB8 +_080BA0E0: .4byte gPaletteFade _080BA0E4: .4byte gTasks thumb_func_end sub_80BA090 @@ -50765,7 +50765,7 @@ sub_80BAB78: @ 80BAB78 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080BAB94 @ =gUnknown_2037AB8 + ldr r0, _080BAB94 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -50777,7 +50777,7 @@ _080BAB90: pop {r0} bx r0 .align 2, 0 -_080BAB94: .4byte gUnknown_2037AB8 +_080BAB94: .4byte gPaletteFade thumb_func_end sub_80BAB78 thumb_func_start sub_80BAB98 diff --git a/asm/battle_anim_80EEC0C.s b/asm/battle_anim_80EEC0C.s index 84c8c93e2..f79c453b6 100644 --- a/asm/battle_anim_80EEC0C.s +++ b/asm/battle_anim_80EEC0C.s @@ -2684,7 +2684,7 @@ _080F014E: strh r0, [r4, 0x2E] b _080F017C _080F0156: - ldr r0, _080F0184 @ =gUnknown_2037AB8 + ldr r0, _080F0184 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2707,7 +2707,7 @@ _080F017C: pop {r0} bx r0 .align 2, 0 -_080F0184: .4byte gUnknown_2037AB8 +_080F0184: .4byte gPaletteFade _080F0188: .4byte sub_80F018C thumb_func_end sub_80F00A4 @@ -4953,7 +4953,7 @@ sub_80F12E0: @ 80F12E0 _080F1330: .4byte gTasks _080F1334: .4byte gUnknown_840C1C4 _080F1338: - ldr r0, _080F1368 @ =gUnknown_2037AB8 + ldr r0, _080F1368 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4977,7 +4977,7 @@ _080F1360: pop {r0} bx r0 .align 2, 0 -_080F1368: .4byte gUnknown_2037AB8 +_080F1368: .4byte gPaletteFade _080F136C: .4byte 0x00007fff thumb_func_end sub_80F12E0 @@ -4987,7 +4987,7 @@ sub_80F1370: @ 80F1370 sub sp, 0x4 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080F13B0 @ =gUnknown_2037AB8 + ldr r0, _080F13B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5016,7 +5016,7 @@ _080F13A8: pop {r0} bx r0 .align 2, 0 -_080F13B0: .4byte gUnknown_2037AB8 +_080F13B0: .4byte gPaletteFade _080F13B4: .4byte gTasks _080F13B8: .4byte 0x00007fff _080F13BC: .4byte sub_80F13C0 diff --git a/asm/battle_controller_oak.s b/asm/battle_controller_oak.s index b5905ade8..c1488e453 100644 --- a/asm/battle_controller_oak.s +++ b/asm/battle_controller_oak.s @@ -464,7 +464,7 @@ _080E792A: thumb_func_start sub_80E7930 sub_80E7930: @ 80E7930 push {lr} - ldr r0, _080E7960 @ =gUnknown_2037AB8 + ldr r0, _080E7960 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -487,7 +487,7 @@ _080E795A: pop {r0} bx r0 .align 2, 0 -_080E7960: .4byte gUnknown_2037AB8 +_080E7960: .4byte gPaletteFade _080E7964: .4byte gMain _080E7968: .4byte 0x00000439 _080E796C: .4byte gUnknown_3004F80 @@ -536,7 +536,7 @@ _080E79B4: .4byte gActiveBattler thumb_func_start sub_80E79B8 sub_80E79B8: @ 80E79B8 push {r4,lr} - ldr r0, _080E79FC @ =gUnknown_2037AB8 + ldr r0, _080E79FC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -568,7 +568,7 @@ _080E79F6: pop {r0} bx r0 .align 2, 0 -_080E79FC: .4byte gUnknown_2037AB8 +_080E79FC: .4byte gPaletteFade _080E7A00: .4byte gUnknown_3004FE0 _080E7A04: .4byte gActiveBattler _080E7A08: .4byte sub_80E7A14 @@ -584,7 +584,7 @@ sub_80E7A14: @ 80E7A14 ldr r0, _080E7A48 @ =sub_8011100 cmp r1, r0 bne _080E7A6A - ldr r0, _080E7A4C @ =gUnknown_2037AB8 + ldr r0, _080E7A4C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -603,7 +603,7 @@ sub_80E7A14: @ 80E7A14 .align 2, 0 _080E7A44: .4byte gMain _080E7A48: .4byte sub_8011100 -_080E7A4C: .4byte gUnknown_2037AB8 +_080E7A4C: .4byte gPaletteFade _080E7A50: .4byte gUnknown_203B0C0 _080E7A54: .4byte gUnknown_203B0C1 _080E7A58: .4byte gUnknown_203B0DC @@ -622,7 +622,7 @@ _080E7A6A: thumb_func_start sub_80E7A70 sub_80E7A70: @ 80E7A70 push {lr} - ldr r0, _080E7AA8 @ =gUnknown_2037AB8 + ldr r0, _080E7AA8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -646,7 +646,7 @@ sub_80E7A70: @ 80E7A70 bl sub_8107ECC b _080E7AC0 .align 2, 0 -_080E7AA8: .4byte gUnknown_2037AB8 +_080E7AA8: .4byte gPaletteFade _080E7AAC: .4byte gUnknown_3004FE0 _080E7AB0: .4byte gActiveBattler _080E7AB4: .4byte sub_80E7AC4 @@ -666,7 +666,7 @@ sub_80E7AC4: @ 80E7AC4 ldr r0, _080E7B18 @ =sub_8011100 cmp r1, r0 bne _080E7B42 - ldr r0, _080E7B1C @ =gUnknown_2037AB8 + ldr r0, _080E7B1C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -700,7 +700,7 @@ sub_80E7AC4: @ 80E7AC4 .align 2, 0 _080E7B14: .4byte gMain _080E7B18: .4byte sub_8011100 -_080E7B1C: .4byte gUnknown_2037AB8 +_080E7B1C: .4byte gPaletteFade _080E7B20: .4byte gUnknown_203AD30 _080E7B24: .4byte gBattleTypeFlags _080E7B28: .4byte gUnknown_3004FE0 @@ -1731,7 +1731,7 @@ _080E8384: .4byte _080E8500 .4byte _080E8530 _080E83A8: - ldr r0, _080E83EC @ =gUnknown_2037AB8 + ldr r0, _080E83EC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1763,9 +1763,9 @@ _080E83BA: ldr r1, [r7] b _080E8522 .align 2, 0 -_080E83EC: .4byte gUnknown_2037AB8 +_080E83EC: .4byte gPaletteFade _080E83F0: - ldr r0, _080E8404 @ =gUnknown_2037AB8 + ldr r0, _080E8404 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1776,7 +1776,7 @@ _080E83FE: bl sub_80EB30C b _080E851E .align 2, 0 -_080E8404: .4byte gUnknown_2037AB8 +_080E8404: .4byte gPaletteFade _080E8408: ldr r0, _080E8418 @ =gUnknown_83FDAE2 bl BattleStringExpandPlaceholdersToDisplayedString @@ -1823,7 +1823,7 @@ _080E8430: _080E8460: .4byte gBitTable _080E8464: .4byte gBattleStruct _080E8468: - ldr r0, _080E8484 @ =gUnknown_2037AB8 + ldr r0, _080E8484 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1836,7 +1836,7 @@ _080E8468: bl sub_80D87BC b _080E851E .align 2, 0 -_080E8484: .4byte gUnknown_2037AB8 +_080E8484: .4byte gPaletteFade _080E8488: .4byte gUnknown_83FDB92 _080E848C: .4byte gUnknown_202298C _080E8490: @@ -1873,7 +1873,7 @@ _080E8490: _080E84D0: .4byte gBitTable _080E84D4: .4byte gBattleStruct _080E84D8: - ldr r0, _080E84F4 @ =gUnknown_2037AB8 + ldr r0, _080E84F4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1886,7 +1886,7 @@ _080E84D8: bl sub_80D87BC b _080E851E .align 2, 0 -_080E84F4: .4byte gUnknown_2037AB8 +_080E84F4: .4byte gPaletteFade _080E84F8: .4byte gUnknown_83FDBEF _080E84FC: .4byte gUnknown_202298C _080E8500: @@ -1915,7 +1915,7 @@ _080E8522: .align 2, 0 _080E852C: .4byte gBattleStruct _080E8530: - ldr r0, _080E8568 @ =gUnknown_2037AB8 + ldr r0, _080E8568 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1940,7 +1940,7 @@ _080E855E: pop {r0} bx r0 .align 2, 0 -_080E8568: .4byte gUnknown_2037AB8 +_080E8568: .4byte gPaletteFade _080E856C: .4byte gBattleStruct thumb_func_end sub_80E835C @@ -2070,7 +2070,7 @@ _080E8634: ldr r1, [r5] b _080E86A6 _080E865A: - ldr r0, _080E866C @ =gUnknown_2037AB8 + ldr r0, _080E866C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2079,7 +2079,7 @@ _080E865A: bl sub_80EB30C b _080E86A2 .align 2, 0 -_080E866C: .4byte gUnknown_2037AB8 +_080E866C: .4byte gPaletteFade _080E8670: adds r0, r2, 0 bl BattleStringExpandPlaceholdersToDisplayedString @@ -2115,7 +2115,7 @@ _080E86A6: .align 2, 0 _080E86B0: .4byte gBattleStruct _080E86B4: - ldr r0, _080E86D8 @ =gUnknown_2037AB8 + ldr r0, _080E86D8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2131,7 +2131,7 @@ _080E86B4: bl WallyBufferExecCompleted b _080E86E4 .align 2, 0 -_080E86D8: .4byte gUnknown_2037AB8 +_080E86D8: .4byte gPaletteFade _080E86DC: .4byte gActiveBattler _080E86E0: bl OpponentBufferExecCompleted @@ -2184,7 +2184,7 @@ _080E872C: .4byte _080E8848 .4byte _080E8880 _080E8748: - ldr r0, _080E8780 @ =gUnknown_2037AB8 + ldr r0, _080E8780 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2211,10 +2211,10 @@ _080E875A: ldr r1, [r5] b _080E886C .align 2, 0 -_080E8780: .4byte gUnknown_2037AB8 +_080E8780: .4byte gPaletteFade _080E8784: .4byte gActiveBattler _080E8788: - ldr r0, _080E87C8 @ =gUnknown_2037AB8 + ldr r0, _080E87C8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2247,10 +2247,10 @@ _080E879A: ldr r1, [r5] b _080E886C .align 2, 0 -_080E87C8: .4byte gUnknown_2037AB8 +_080E87C8: .4byte gPaletteFade _080E87CC: .4byte gBitTable _080E87D0: - ldr r0, _080E87E4 @ =gUnknown_2037AB8 + ldr r0, _080E87E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2259,7 +2259,7 @@ _080E87D0: bl sub_80EB30C b _080E8868 .align 2, 0 -_080E87E4: .4byte gUnknown_2037AB8 +_080E87E4: .4byte gPaletteFade _080E87E8: ldr r0, _080E87F8 @ =gUnknown_83FDCD2 bl BattleStringExpandPlaceholdersToDisplayedString @@ -2304,7 +2304,7 @@ _080E8800: _080E8840: .4byte gBitTable _080E8844: .4byte gBattleStruct _080E8848: - ldr r0, _080E8878 @ =gUnknown_2037AB8 + ldr r0, _080E8878 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2329,10 +2329,10 @@ _080E886C: strb r0, [r1] b _080E88AA .align 2, 0 -_080E8878: .4byte gUnknown_2037AB8 +_080E8878: .4byte gPaletteFade _080E887C: .4byte gBattleStruct _080E8880: - ldr r0, _080E88B4 @ =gUnknown_2037AB8 + ldr r0, _080E88B4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2356,7 +2356,7 @@ _080E88AA: pop {r0} bx r0 .align 2, 0 -_080E88B4: .4byte gUnknown_2037AB8 +_080E88B4: .4byte gPaletteFade _080E88B8: .4byte gUnknown_203AD30 _080E88BC: .4byte gBattleStruct thumb_func_end sub_80E8704 diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 6c6587e9c..38d4081d3 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -2396,7 +2396,7 @@ _0802F6A4: .4byte sub_8011A1C thumb_func_start sub_802F6A8 sub_802F6A8: @ 802F6A8 push {lr} - ldr r0, _0802F6D0 @ =gUnknown_2037AB8 + ldr r0, _0802F6D0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2415,7 +2415,7 @@ sub_802F6A8: @ 802F6A8 bl sub_800AAC0 b _0802F6E0 .align 2, 0 -_0802F6D0: .4byte gUnknown_2037AB8 +_0802F6D0: .4byte gPaletteFade _0802F6D4: .4byte gBattleTypeFlags _0802F6D8: .4byte gUnknown_3003F3C _0802F6DC: @@ -4293,7 +4293,7 @@ _08030622: thumb_func_start sub_8030628 sub_8030628: @ 8030628 push {r4,lr} - ldr r0, _0803066C @ =gUnknown_2037AB8 + ldr r0, _0803066C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4325,7 +4325,7 @@ _08030666: pop {r0} bx r0 .align 2, 0 -_0803066C: .4byte gUnknown_2037AB8 +_0803066C: .4byte gPaletteFade _08030670: .4byte gUnknown_3004FE0 _08030674: .4byte gActiveBattler _08030678: .4byte sub_8030684 @@ -4341,7 +4341,7 @@ sub_8030684: @ 8030684 ldr r0, _080306B8 @ =sub_8011100 cmp r1, r0 bne _080306F4 - ldr r0, _080306BC @ =gUnknown_2037AB8 + ldr r0, _080306BC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4360,7 +4360,7 @@ sub_8030684: @ 8030684 .align 2, 0 _080306B4: .4byte gMain _080306B8: .4byte sub_8011100 -_080306BC: .4byte gUnknown_2037AB8 +_080306BC: .4byte gPaletteFade _080306C0: .4byte gUnknown_203B0C0 _080306C4: .4byte gUnknown_203B0C1 _080306C8: .4byte gUnknown_203B0DC @@ -4395,7 +4395,7 @@ _080306FC: .4byte gActiveBattler thumb_func_start sub_8030700 sub_8030700: @ 8030700 push {lr} - ldr r0, _0803072C @ =gUnknown_2037AB8 + ldr r0, _0803072C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4415,7 +4415,7 @@ _08030728: pop {r0} bx r0 .align 2, 0 -_0803072C: .4byte gUnknown_2037AB8 +_0803072C: .4byte gPaletteFade _08030730: .4byte gUnknown_3004FE0 _08030734: .4byte gActiveBattler _08030738: .4byte CompleteWhenChoseItem @@ -4429,7 +4429,7 @@ CompleteWhenChoseItem: @ 803073C ldr r0, _0803076C @ =sub_8011100 cmp r1, r0 bne _08030762 - ldr r0, _08030770 @ =gUnknown_2037AB8 + ldr r0, _08030770 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4446,7 +4446,7 @@ _08030762: .align 2, 0 _08030768: .4byte gMain _0803076C: .4byte sub_8011100 -_08030770: .4byte gUnknown_2037AB8 +_08030770: .4byte gPaletteFade _08030774: .4byte gUnknown_203AD30 thumb_func_end CompleteWhenChoseItem diff --git a/asm/battle_controller_pokedude.s b/asm/battle_controller_pokedude.s index fcfa5d275..9e18ea91c 100644 --- a/asm/battle_controller_pokedude.s +++ b/asm/battle_controller_pokedude.s @@ -227,7 +227,7 @@ _0815624E: thumb_func_start sub_8156254 sub_8156254: @ 8156254 push {lr} - ldr r0, _08156284 @ =gUnknown_2037AB8 + ldr r0, _08156284 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -250,7 +250,7 @@ _0815627E: pop {r0} bx r0 .align 2, 0 -_08156284: .4byte gUnknown_2037AB8 +_08156284: .4byte gPaletteFade _08156288: .4byte gMain _0815628C: .4byte 0x00000439 _08156290: .4byte gUnknown_3004F80 @@ -550,7 +550,7 @@ sub_81564E4: @ 81564E4 thumb_func_start sub_81564F0 sub_81564F0: @ 81564F0 push {lr} - ldr r0, _08156524 @ =gUnknown_2037AB8 + ldr r0, _08156524 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -574,7 +574,7 @@ _08156520: pop {r0} bx r0 .align 2, 0 -_08156524: .4byte gUnknown_2037AB8 +_08156524: .4byte gPaletteFade _08156528: .4byte gUnknown_3004FE0 _0815652C: .4byte gActiveBattler _08156530: .4byte sub_8156538 @@ -589,7 +589,7 @@ sub_8156538: @ 8156538 ldr r0, _0815656C @ =sub_8011100 cmp r1, r0 bne _0815658E - ldr r0, _08156570 @ =gUnknown_2037AB8 + ldr r0, _08156570 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -608,7 +608,7 @@ sub_8156538: @ 8156538 .align 2, 0 _08156568: .4byte gMain _0815656C: .4byte sub_8011100 -_08156570: .4byte gUnknown_2037AB8 +_08156570: .4byte gPaletteFade _08156574: .4byte gUnknown_203B0C0 _08156578: .4byte gUnknown_203B0C1 _0815657C: .4byte gUnknown_203B0DC @@ -627,7 +627,7 @@ _0815658E: thumb_func_start sub_8156594 sub_8156594: @ 8156594 push {lr} - ldr r0, _081565C8 @ =gUnknown_2037AB8 + ldr r0, _081565C8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -652,7 +652,7 @@ _081565C4: movs r0, 0x7 b _081565DE .align 2, 0 -_081565C8: .4byte gUnknown_2037AB8 +_081565C8: .4byte gPaletteFade _081565CC: .4byte gUnknown_3004FE0 _081565D0: .4byte gActiveBattler _081565D4: .4byte sub_81565E8 @@ -674,7 +674,7 @@ sub_81565E8: @ 81565E8 ldr r0, _08156618 @ =sub_8011100 cmp r1, r0 bne _0815660E - ldr r0, _0815661C @ =gUnknown_2037AB8 + ldr r0, _0815661C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -691,7 +691,7 @@ _0815660E: .align 2, 0 _08156614: .4byte gMain _08156618: .4byte sub_8011100 -_0815661C: .4byte gUnknown_2037AB8 +_0815661C: .4byte gPaletteFade _08156620: .4byte gUnknown_203AD30 thumb_func_end sub_81565E8 @@ -7222,7 +7222,7 @@ _08159BDC: .4byte _08159C64 .4byte _08159CB4 _08159BF0: - ldr r0, _08159C10 @ =gUnknown_2037AB8 + ldr r0, _08159C10 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7238,9 +7238,9 @@ _08159BF0: movs r3, 0x8 b _08159C90 .align 2, 0 -_08159C10: .4byte gUnknown_2037AB8 +_08159C10: .4byte gPaletteFade _08159C14: - ldr r0, _08159C3C @ =gUnknown_2037AB8 + ldr r0, _08159C3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7259,7 +7259,7 @@ _08159C14: adds r0, r5 b _08159C9E .align 2, 0 -_08159C3C: .4byte gUnknown_2037AB8 +_08159C3C: .4byte gPaletteFade _08159C40: .4byte gUnknown_2022976 _08159C44: ldr r1, _08159C5C @ =gUnknown_2022976 @@ -7314,7 +7314,7 @@ _08159CA8: .4byte gMain _08159CAC: .4byte gUnknown_3005EE0 _08159CB0: .4byte gActiveBattler _08159CB4: - ldr r0, _08159CF8 @ =gUnknown_2037AB8 + ldr r0, _08159CF8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7346,7 +7346,7 @@ _08159CEE: pop {r0} bx r0 .align 2, 0 -_08159CF8: .4byte gUnknown_2037AB8 +_08159CF8: .4byte gPaletteFade _08159CFC: .4byte 0x00000137 _08159D00: .4byte gUnknown_2022976 thumb_func_end sub_8159BA8 @@ -7386,7 +7386,7 @@ _08159D34: .4byte _08159E64 .4byte _08159EA4 _08159D50: - ldr r0, _08159D90 @ =gUnknown_2037AB8 + ldr r0, _08159D90 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7417,10 +7417,10 @@ _08159D62: movs r3, 0x8 b _08159E80 .align 2, 0 -_08159D90: .4byte gUnknown_2037AB8 +_08159D90: .4byte gPaletteFade _08159D94: .4byte gBattleStruct _08159D98: - ldr r0, _08159DD0 @ =gUnknown_2037AB8 + ldr r0, _08159DD0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7449,11 +7449,11 @@ _08159DAA: str r3, [sp] b _08159E7A .align 2, 0 -_08159DD0: .4byte gUnknown_2037AB8 +_08159DD0: .4byte gPaletteFade _08159DD4: .4byte gBitTable _08159DD8: .4byte gBattleStruct _08159DDC: - ldr r0, _08159DF0 @ =gUnknown_2037AB8 + ldr r0, _08159DF0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7464,7 +7464,7 @@ _08159DEA: bl sub_80EB30C b _08159E84 .align 2, 0 -_08159DF0: .4byte gUnknown_2037AB8 +_08159DF0: .4byte gPaletteFade _08159DF4: bl sub_8159EF0 bl BattleStringExpandPlaceholdersToDisplayedString @@ -7515,7 +7515,7 @@ _08159E58: .4byte gMain _08159E5C: .4byte gBitTable _08159E60: .4byte gBattleStruct _08159E64: - ldr r0, _08159E98 @ =gUnknown_2037AB8 + ldr r0, _08159E98 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7544,11 +7544,11 @@ _08159E84: strb r0, [r1, 0x2] b _08159EDE .align 2, 0 -_08159E98: .4byte gUnknown_2037AB8 +_08159E98: .4byte gPaletteFade _08159E9C: .4byte gUnknown_3005EE0 _08159EA0: .4byte gActiveBattler _08159EA4: - ldr r0, _08159EE8 @ =gUnknown_2037AB8 + ldr r0, _08159EE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7578,7 +7578,7 @@ _08159EDE: pop {r0} bx r0 .align 2, 0 -_08159EE8: .4byte gUnknown_2037AB8 +_08159EE8: .4byte gPaletteFade _08159EEC: .4byte 0x00000137 thumb_func_end sub_8159D04 diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index a4e877dcb..9c91aa6c7 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -330,7 +330,7 @@ _080DD7AC: .4byte SpriteCallbackDummy thumb_func_start sub_80DD7B0 sub_80DD7B0: @ 80DD7B0 push {lr} - ldr r0, _080DD7E0 @ =gUnknown_2037AB8 + ldr r0, _080DD7E0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -353,7 +353,7 @@ _080DD7DA: pop {r0} bx r0 .align 2, 0 -_080DD7E0: .4byte gUnknown_2037AB8 +_080DD7E0: .4byte gPaletteFade _080DD7E4: .4byte gMain _080DD7E8: .4byte 0x00000439 _080DD7EC: .4byte gUnknown_3004F80 @@ -394,7 +394,7 @@ _080DD828: .4byte gActiveBattler thumb_func_start sub_80DD82C sub_80DD82C: @ 80DD82C push {lr} - ldr r0, _080DD84C @ =gUnknown_2037AB8 + ldr r0, _080DD84C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -411,7 +411,7 @@ _080DD848: pop {r0} bx r0 .align 2, 0 -_080DD84C: .4byte gUnknown_2037AB8 +_080DD84C: .4byte gPaletteFade _080DD850: .4byte gUnknown_3004FE0 _080DD854: .4byte gActiveBattler _080DD858: .4byte CompleteWhenChosePokeblock @@ -425,7 +425,7 @@ CompleteWhenChosePokeblock: @ 80DD85C ldr r0, _080DD88C @ =sub_8011100 cmp r1, r0 bne _080DD882 - ldr r0, _080DD890 @ =gUnknown_2037AB8 + ldr r0, _080DD890 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -442,7 +442,7 @@ _080DD882: .align 2, 0 _080DD888: .4byte gMain _080DD88C: .4byte sub_8011100 -_080DD890: .4byte gUnknown_2037AB8 +_080DD890: .4byte gPaletteFade _080DD894: .4byte gUnknown_203AD30 thumb_func_end CompleteWhenChosePokeblock diff --git a/asm/battle_records.s b/asm/battle_records.s index 797830e95..dc7ecb94f 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -189,7 +189,7 @@ sub_80CD3B8: @ 80CD3B8 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080CD3DC @ =gUnknown_2037AB8 + ldr r0, _080CD3DC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -206,7 +206,7 @@ _080CD3D8: pop {r0} bx r0 .align 2, 0 -_080CD3DC: .4byte gUnknown_2037AB8 +_080CD3DC: .4byte gPaletteFade _080CD3E0: .4byte gTasks _080CD3E4: .4byte sub_80CD3E8 thumb_func_end sub_80CD3B8 @@ -281,7 +281,7 @@ sub_80CD460: @ 80CD460 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080CD498 @ =gUnknown_2037AB8 + ldr r0, _080CD498 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -302,7 +302,7 @@ _080CD490: pop {r0} bx r0 .align 2, 0 -_080CD498: .4byte gUnknown_2037AB8 +_080CD498: .4byte gPaletteFade _080CD49C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _080CD4A0: .4byte gUnknown_2039A1C thumb_func_end sub_80CD460 diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s index 9d165dd4c..58e7a405b 100644 --- a/asm/battle_script_commands.s +++ b/asm/battle_script_commands.s @@ -15654,7 +15654,7 @@ _0802549C: .align 2, 0 _080254A4: .4byte gBattleScripting _080254A8: - ldr r0, _080254E4 @ =gUnknown_2037AB8 + ldr r0, _080254E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -15684,7 +15684,7 @@ _080254D8: strb r0, [r1, 0x1F] b _080256D0 .align 2, 0 -_080254E4: .4byte gUnknown_2037AB8 +_080254E4: .4byte gPaletteFade _080254E8: .4byte gPlayerParty _080254EC: .4byte gBattleStruct _080254F0: .4byte gUnknown_2024029 @@ -15692,7 +15692,7 @@ _080254F4: .4byte sub_8077764 _080254F8: .4byte gUnknown_2024022 _080254FC: .4byte gBattleScripting _08025500: - ldr r0, _0802552C @ =gUnknown_2037AB8 + ldr r0, _0802552C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -15716,7 +15716,7 @@ _0802551A: strb r5, [r0, 0x1F] b _080256D0 .align 2, 0 -_0802552C: .4byte gUnknown_2037AB8 +_0802552C: .4byte gPaletteFade _08025530: .4byte gMain _08025534: .4byte sub_8011100 _08025538: .4byte gBattleScripting @@ -32443,7 +32443,7 @@ _0802DA24: .align 2, 0 _0802DA38: .4byte 0x00007fff _0802DA3C: - ldr r0, _0802DA5C @ =gUnknown_2037AB8 + ldr r0, _0802DA5C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -32458,10 +32458,10 @@ _0802DA4A: strb r0, [r1, 0x1] b _0802DB36 .align 2, 0 -_0802DA5C: .4byte gUnknown_2037AB8 +_0802DA5C: .4byte gPaletteFade _0802DA60: .4byte gUnknown_2023E82 _0802DA64: - ldr r0, _0802DAAC @ =gUnknown_2037AB8 + ldr r0, _0802DAAC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -32497,7 +32497,7 @@ _0802DA72: strb r0, [r4] b _0802DB6C .align 2, 0 -_0802DAAC: .4byte gUnknown_2037AB8 +_0802DAAC: .4byte gPaletteFade _0802DAB0: .4byte gMain _0802DAB4: .4byte sub_8011100 _0802DAB8: .4byte gTasks @@ -32567,7 +32567,7 @@ _0802DB4C: .4byte 0x05000080 _0802DB50: .4byte 0x0001ffff _0802DB54: .4byte gUnknown_2023E82 _0802DB58: - ldr r0, _0802DB74 @ =gUnknown_2037AB8 + ldr r0, _0802DB74 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -32583,7 +32583,7 @@ _0802DB6C: pop {r0} bx r0 .align 2, 0 -_0802DB74: .4byte gUnknown_2037AB8 +_0802DB74: .4byte gPaletteFade _0802DB78: .4byte gUnknown_2023D74 thumb_func_end sub_802D9D8 @@ -32946,7 +32946,7 @@ _0802DE36: .align 2, 0 _0802DE3C: .4byte gUnknown_2023E82 _0802DE40: - ldr r0, _0802DEFC @ =gUnknown_2037AB8 + ldr r0, _0802DEFC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -33035,7 +33035,7 @@ _0802DE4E: strb r0, [r1] b _0802DFA6 .align 2, 0 -_0802DEFC: .4byte gUnknown_2037AB8 +_0802DEFC: .4byte gPaletteFade _0802DF00: .4byte gBattlerPartyIndexes _0802DF04: .4byte sBattler_AI _0802DF08: .4byte gEnemyParty @@ -33048,7 +33048,7 @@ _0802DF18: ldr r0, _0802DF58 @ =sub_8011100 cmp r1, r0 bne _0802DFA6 - ldr r0, _0802DF5C @ =gUnknown_2037AB8 + ldr r0, _0802DF5C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -33075,7 +33075,7 @@ _0802DF18: .align 2, 0 _0802DF54: .4byte gMain _0802DF58: .4byte sub_8011100 -_0802DF5C: .4byte gUnknown_2037AB8 +_0802DF5C: .4byte gPaletteFade _0802DF60: .4byte gBattlerPartyIndexes _0802DF64: .4byte sBattler_AI _0802DF68: .4byte gEnemyParty diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 70453eb32..d3128f656 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -407,7 +407,7 @@ _080D0B9E: thumb_func_start sub_80D0BA8 sub_80D0BA8: @ 80D0BA8 push {lr} - ldr r0, _080D0BCC @ =gUnknown_2037AB8 + ldr r0, _080D0BCC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -423,7 +423,7 @@ _080D0BC4: pop {r1} bx r1 .align 2, 0 -_080D0BCC: .4byte gUnknown_2037AB8 +_080D0BCC: .4byte gPaletteFade _080D0BD0: .4byte sub_80D0ADC thumb_func_end sub_80D0BA8 @@ -533,7 +533,7 @@ sub_80D0C78: @ 80D0C78 adds r0, r3, 0 movs r3, 0x2 bl sub_80D3E74 - ldr r0, _080D0CE8 @ =gUnknown_2037AB8 + ldr r0, _080D0CE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -558,7 +558,7 @@ _080D0CCA: .align 2, 0 _080D0CE0: .4byte gUnknown_2039A2C _080D0CE4: .4byte gUnknown_2038700 -_080D0CE8: .4byte gUnknown_2037AB8 +_080D0CE8: .4byte gPaletteFade _080D0CEC: .4byte sub_80D0BD4 thumb_func_end sub_80D0C78 @@ -733,7 +733,7 @@ _080D0E18: lsrs r4, r0, 16 cmp r5, 0x9F bls _080D0E18 - ldr r0, _080D0E78 @ =gUnknown_2037AB8 + ldr r0, _080D0E78 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -757,7 +757,7 @@ _080D0E5E: .align 2, 0 _080D0E70: .4byte gUnknown_2039A2C _080D0E74: .4byte gUnknown_2038700 -_080D0E78: .4byte gUnknown_2037AB8 +_080D0E78: .4byte gPaletteFade _080D0E7C: .4byte sub_80D0D54 thumb_func_end sub_80D0DF0 @@ -2559,7 +2559,7 @@ _080D1C78: ldrsh r0, [r6, r5] cmp r0, 0 beq _080D1C9A - ldr r0, _080D1CC0 @ =gUnknown_2037AB8 + ldr r0, _080D1CC0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2588,7 +2588,7 @@ _080D1C9A: _080D1CB4: .4byte gUnknown_2039A2C _080D1CB8: .4byte 0x1fff0000 _080D1CBC: .4byte gUnknown_2038700 -_080D1CC0: .4byte gUnknown_2037AB8 +_080D1CC0: .4byte gPaletteFade _080D1CC4: .4byte sub_80D1B58 thumb_func_end sub_80D1BE8 diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s index a9523846e..d4d16e15e 100644 --- a/asm/berry_pouch.s +++ b/asm/berry_pouch.s @@ -362,7 +362,7 @@ sub_813D048: @ 813D048 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0813D074 @ =gUnknown_2037AB8 + ldr r0, _0813D074 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -379,7 +379,7 @@ _0813D06C: pop {r0} bx r0 .align 2, 0 -_0813D074: .4byte gUnknown_2037AB8 +_0813D074: .4byte gPaletteFade _0813D078: .4byte gUnknown_203F370 thumb_func_end sub_813D048 @@ -1399,7 +1399,7 @@ sub_813D844: @ 813D844 lsls r0, 3 ldr r1, _0813D87C @ =gTasks+0x8 adds r2, r0, r1 - ldr r0, _0813D880 @ =gUnknown_2037AB8 + ldr r0, _0813D880 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1419,7 +1419,7 @@ sub_813D844: @ 813D844 b _0813D896 .align 2, 0 _0813D87C: .4byte gTasks+0x8 -_0813D880: .4byte gUnknown_2037AB8 +_0813D880: .4byte gPaletteFade _0813D884: .4byte gUnknown_203F37A _0813D888: .4byte gUnknown_203F36C _0813D88C: @@ -1669,7 +1669,7 @@ sub_813DA68: @ 813DA68 lsls r0, 3 ldr r1, _0813DAD8 @ =gTasks+0x8 adds r7, r0, r1 - ldr r0, _0813DADC @ =gUnknown_2037AB8 + ldr r0, _0813DADC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1714,7 +1714,7 @@ _0813DA9E: b _0813DB48 .align 2, 0 _0813DAD8: .4byte gTasks+0x8 -_0813DADC: .4byte gUnknown_2037AB8 +_0813DADC: .4byte gPaletteFade _0813DAE0: .4byte gUnknown_203F37A _0813DAE4: .4byte gMain _0813DAE8: .4byte gUnknown_203AD30 diff --git a/asm/cable_club.s b/asm/cable_club.s index eeb9471db..f481a12cd 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -1547,13 +1547,13 @@ _0808135C: _08081374: .4byte gUnknown_202271A _08081378: .4byte 0x00002211 _0808137C: - ldr r0, _08081388 @ =gUnknown_2037AB8 + ldr r0, _08081388 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 b _080813A6 .align 2, 0 -_08081388: .4byte gUnknown_2037AB8 +_08081388: .4byte gPaletteFade _0808138C: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -1706,7 +1706,7 @@ _080814A0: _080814BC: .4byte gUnknown_202271A _080814C0: .4byte 0x00002211 _080814C4: - ldr r0, _080814D8 @ =gUnknown_2037AB8 + ldr r0, _080814D8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1718,7 +1718,7 @@ _080814D2: strh r0, [r6] b _0808160A .align 2, 0 -_080814D8: .4byte gUnknown_2037AB8 +_080814D8: .4byte gPaletteFade _080814DC: ldr r1, _080814EC @ =gUnknown_2022720 movs r0, 0 @@ -2183,7 +2183,7 @@ _08081882: bl sub_800A068 b _080818B8 _08081894: - ldr r0, _080818A4 @ =gUnknown_2037AB8 + ldr r0, _080818A4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2191,7 +2191,7 @@ _08081894: bne _080818D8 b _080818B8 .align 2, 0 -_080818A4: .4byte gUnknown_2037AB8 +_080818A4: .4byte gPaletteFade _080818A8: ldr r1, _080818C0 @ =gUnknown_2031DA4 movs r0, 0 @@ -2259,7 +2259,7 @@ _0808191A: bl sub_80F985C b _08081950 _0808192C: - ldr r0, _0808193C @ =gUnknown_2037AB8 + ldr r0, _0808193C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2267,7 +2267,7 @@ _0808192C: bne _08081970 b _08081950 .align 2, 0 -_0808193C: .4byte gUnknown_2037AB8 +_0808193C: .4byte gPaletteFade _08081940: ldr r1, _08081958 @ =gUnknown_2031DA4 movs r0, 0 diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index c5381bbf2..84dd082f6 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -91,7 +91,7 @@ _080F5618: bl BeginNormalPaletteFade b _080F56E2 _080F562A: - ldr r0, _080F5640 @ =gUnknown_2037AB8 + ldr r0, _080F5640 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -101,7 +101,7 @@ _080F562A: bl SetVBlankCallback b _080F56E2 .align 2, 0 -_080F5640: .4byte gUnknown_2037AB8 +_080F5640: .4byte gPaletteFade _080F5644: bl sub_80F5820 b _080F56E2 @@ -296,7 +296,7 @@ _080F57B8: .align 2, 0 _080F57D0: .4byte 0x0000ffff _080F57D4: - ldr r0, _080F5808 @ =gUnknown_2037AB8 + ldr r0, _080F5808 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -318,7 +318,7 @@ _080F57FE: pop {r0} bx r0 .align 2, 0 -_080F5808: .4byte gUnknown_2037AB8 +_080F5808: .4byte gPaletteFade thumb_func_end sub_80F579C thumb_func_start sub_80F580C diff --git a/asm/credits.s b/asm/credits.s index 6d9921366..af08d608f 100644 --- a/asm/credits.s +++ b/asm/credits.s @@ -606,7 +606,7 @@ _080F3E94: _080F3EAC: .4byte gUnknown_203AB40 _080F3EB0: .4byte gUnknown_8410CF4 _080F3EB4: - ldr r0, _080F3F14 @ =gUnknown_2037AB8 + ldr r0, _080F3F14 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -654,7 +654,7 @@ _080F3EB4: movs r0, 0x8 b _080F3FB8 .align 2, 0 -_080F3F14: .4byte gUnknown_2037AB8 +_080F3F14: .4byte gPaletteFade _080F3F18: .4byte gUnknown_84145BC _080F3F1C: .4byte gUnknown_8410CF4 _080F3F20: .4byte gUnknown_8410E00 @@ -738,7 +738,7 @@ _080F3FBA: .align 2, 0 _080F3FC0: .4byte gUnknown_8410CF4 _080F3FC4: - ldr r0, _080F3FE8 @ =gUnknown_2037AB8 + ldr r0, _080F3FE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -756,7 +756,7 @@ _080F3FD6: movs r0, 0xB b _080F413C .align 2, 0 -_080F3FE8: .4byte gUnknown_2037AB8 +_080F3FE8: .4byte gPaletteFade _080F3FEC: .4byte gUnknown_203AB40 _080F3FF0: ldr r0, [r7] @@ -773,7 +773,7 @@ _080F3FFE: movs r0, 0x6 b _080F413C _080F400A: - ldr r0, _080F4050 @ =gUnknown_2037AB8 + ldr r0, _080F4050 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -810,7 +810,7 @@ _080F404A: movs r0, 0x1 b _080F4068 .align 2, 0 -_080F4050: .4byte gUnknown_2037AB8 +_080F4050: .4byte gPaletteFade _080F4054: .4byte gUnknown_203AB40 _080F4058: add r1, sp, 0x14 @@ -838,7 +838,7 @@ _080F4068: .align 2, 0 _080F4080: .4byte gUnknown_203AB40 _080F4084: - ldr r0, _080F40B0 @ =gUnknown_2037AB8 + ldr r0, _080F40B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -859,7 +859,7 @@ _080F4096: movs r0, 0xE b _080F413C .align 2, 0 -_080F40B0: .4byte gUnknown_2037AB8 +_080F40B0: .4byte gPaletteFade _080F40B4: .4byte gUnknown_203AB40 _080F40B8: bl sub_80F4328 @@ -874,7 +874,7 @@ _080F40C2: .align 2, 0 _080F40CC: .4byte gUnknown_203AB40 _080F40D0: - ldr r0, _080F40F8 @ =gUnknown_2037AB8 + ldr r0, _080F40F8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -894,7 +894,7 @@ _080F40E2: movs r0, 0x10 b _080F413C .align 2, 0 -_080F40F8: .4byte gUnknown_2037AB8 +_080F40F8: .4byte gPaletteFade _080F40FC: .4byte gUnknown_203AB40 _080F4100: bl sub_80F4674 @@ -953,7 +953,7 @@ _080F4156: .align 2, 0 _080F416C: .4byte 0x00007fff _080F4170: - ldr r0, _080F418C @ =gUnknown_2037AB8 + ldr r0, _080F418C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -968,7 +968,7 @@ _080F4182: pop {r1} bx r1 .align 2, 0 -_080F418C: .4byte gUnknown_2037AB8 +_080F418C: .4byte gPaletteFade thumb_func_end sub_80F3BD0 thumb_func_start sub_80F4190 @@ -1382,7 +1382,7 @@ _080F4530: bne _080F45DE b _080F4630 _080F453A: - ldr r0, _080F4554 @ =gUnknown_2037AB8 + ldr r0, _080F4554 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1397,7 +1397,7 @@ _080F4548: strh r0, [r1, 0xE] b _080F4630 .align 2, 0 -_080F4554: .4byte gUnknown_2037AB8 +_080F4554: .4byte gPaletteFade _080F4558: ldr r1, [r4] ldrh r0, [r1, 0xC] @@ -1511,7 +1511,7 @@ _080F4630: strb r0, [r1, 0x1] b _080F4668 _080F4638: - ldr r0, _080F4660 @ =gUnknown_2037AB8 + ldr r0, _080F4660 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1529,7 +1529,7 @@ _080F4638: movs r0, 0x1 b _080F466A .align 2, 0 -_080F4660: .4byte gUnknown_2037AB8 +_080F4660: .4byte gPaletteFade _080F4664: .4byte gUnknown_203AB40 _080F4668: movs r0, 0 @@ -1697,7 +1697,7 @@ _080F47C2: .align 2, 0 _080F47CC: .4byte gUnknown_203AB40 _080F47D0: - ldr r0, _080F47E8 @ =gUnknown_2037AB8 + ldr r0, _080F47E8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1709,7 +1709,7 @@ _080F47D0: movs r0, 0x1 b _080F47EE .align 2, 0 -_080F47E8: .4byte gUnknown_2037AB8 +_080F47E8: .4byte gPaletteFade _080F47EC: movs r0, 0 _080F47EE: diff --git a/asm/diploma.s b/asm/diploma.s index 4ff605295..d0b652619 100644 --- a/asm/diploma.s +++ b/asm/diploma.s @@ -147,7 +147,7 @@ _080F4D22: .align 2, 0 _080F4D2C: .4byte sub_80F4BFC _080F4D30: - ldr r0, _080F4D64 @ =gUnknown_2037AB8 + ldr r0, _080F4D64 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -174,7 +174,7 @@ _080F4D5A: pop {r0} bx r0 .align 2, 0 -_080F4D64: .4byte gUnknown_2037AB8 +_080F4D64: .4byte gPaletteFade _080F4D68: .4byte gTasks _080F4D6C: .4byte sub_80F4D74 _080F4D70: .4byte gUnknown_203AB48 @@ -245,7 +245,7 @@ sub_80F4DE0: @ 80F4DE0 push {r4,r5,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080F4E18 @ =gUnknown_2037AB8 + ldr r0, _080F4E18 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -267,7 +267,7 @@ _080F4E10: pop {r0} bx r0 .align 2, 0 -_080F4E18: .4byte gUnknown_2037AB8 +_080F4E18: .4byte gPaletteFade _080F4E1C: .4byte gUnknown_203AB48 _080F4E20: .4byte sub_80568FC thumb_func_end sub_80F4DE0 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 16732a4d3..b12a9d76c 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -499,7 +499,7 @@ sub_8047004: @ 8047004 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08047034 @ =gUnknown_2037AB8 + ldr r0, _08047034 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -518,7 +518,7 @@ _0804702C: pop {r0} bx r0 .align 2, 0 -_08047034: .4byte gUnknown_2037AB8 +_08047034: .4byte gPaletteFade _08047038: .4byte CB2_EggHatch_0 _0804703C: .4byte gUnknown_3005020 _08047040: .4byte sub_807DD24 @@ -912,7 +912,7 @@ _080473D8: .4byte gUnknown_8260134 _080473DC: .4byte gUnknown_3000E74 _080473E0: .4byte sub_80472E4 _080473E4: - ldr r0, _08047408 @ =gUnknown_2037AB8 + ldr r0, _08047408 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -931,7 +931,7 @@ _080473F6: ldr r1, [r5] b _08047648 .align 2, 0 -_08047408: .4byte gUnknown_2037AB8 +_08047408: .4byte gPaletteFade _0804740C: ldr r1, [r5] ldrb r0, [r1, 0x3] @@ -1205,7 +1205,7 @@ _08047648: .align 2, 0 _08047650: .4byte gUnknown_3000E74 _08047654: - ldr r0, _080476A8 @ =gUnknown_2037AB8 + ldr r0, _080476A8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1238,7 +1238,7 @@ _08047684: pop {r0} bx r0 .align 2, 0 -_080476A8: .4byte gUnknown_2037AB8 +_080476A8: .4byte gPaletteFade _080476AC: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_8047338 @@ -1489,7 +1489,7 @@ _0804788C: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - ldr r0, _080478C8 @ =gUnknown_2037AB8 + ldr r0, _080478C8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1515,7 +1515,7 @@ _080478BA: bx r0 .align 2, 0 _080478C4: .4byte 0x0000ffff -_080478C8: .4byte gUnknown_2037AB8 +_080478C8: .4byte gPaletteFade _080478CC: .4byte SpriteCB_Egg_5 thumb_func_end SpriteCB_Egg_4 diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s index 671d52e6c..dd268128f 100644 --- a/asm/evolution_graphics.s +++ b/asm/evolution_graphics.s @@ -1103,7 +1103,7 @@ sub_80F6170: @ 80F6170 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080F618C @ =gUnknown_2037AB8 + ldr r0, _080F618C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1115,7 +1115,7 @@ _080F6188: pop {r0} bx r0 .align 2, 0 -_080F618C: .4byte gUnknown_2037AB8 +_080F618C: .4byte gPaletteFade thumb_func_end sub_80F6170 thumb_func_start sub_80F6190 diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index 1966dcaca..6e5466ca2 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -48,7 +48,7 @@ _080CDD50: strh r0, [r6, 0x8] b _080CDD98 _080CDD68: - ldr r0, _080CDDA0 @ =gUnknown_2037AB8 + ldr r0, _080CDDA0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -76,7 +76,7 @@ _080CDD98: pop {r0} bx r0 .align 2, 0 -_080CDDA0: .4byte gUnknown_2037AB8 +_080CDDA0: .4byte gPaletteFade _080CDDA4: .4byte gPlayerParty thumb_func_end Task_BeginEvolutionScene @@ -1483,7 +1483,7 @@ _080CEA84: .4byte gSprites _080CEA88: .4byte gUnknown_2039A20 _080CEA8C: .4byte gTasks _080CEA90: - ldr r0, _080CEAC0 @ =gUnknown_2037AB8 + ldr r0, _080CEAC0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1505,7 +1505,7 @@ _080CEAA0: adds r1, r0 b _080CEFDE .align 2, 0 -_080CEAC0: .4byte gUnknown_2037AB8 +_080CEAC0: .4byte gPaletteFade _080CEAC4: .4byte gStringVar4 _080CEAC8: .4byte gUnknown_83FE672 _080CEACC: .4byte gTasks @@ -1572,7 +1572,7 @@ _080CEB28: .align 2, 0 _080CEB54: .4byte gTasks _080CEB58: - ldr r0, _080CEB84 @ =gUnknown_2037AB8 + ldr r0, _080CEB84 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1593,7 +1593,7 @@ _080CEB68: adds r1, r0 b _080CEFDE .align 2, 0 -_080CEB84: .4byte gUnknown_2037AB8 +_080CEB84: .4byte gPaletteFade _080CEB88: .4byte gUnknown_2023E82 _080CEB8C: .4byte gTasks _080CEB90: @@ -1773,7 +1773,7 @@ _080CED00: .4byte gUnknown_2037238 _080CED04: .4byte gUnknown_2039A20 _080CED08: .4byte gTasks _080CED0C: - ldr r0, _080CED28 @ =gUnknown_2037AB8 + ldr r0, _080CED28 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1788,7 +1788,7 @@ _080CED1C: ldrh r0, [r4, 0xC] b _080CEF28 .align 2, 0 -_080CED28: .4byte gUnknown_2037AB8 +_080CED28: .4byte gPaletteFade _080CED2C: bl IsCryFinished lsls r0, 24 @@ -1922,7 +1922,7 @@ _080CEE40: .align 2, 0 _080CEE5C: .4byte gTasks _080CEE60: - ldr r0, _080CEEC4 @ =gUnknown_2037AB8 + ldr r0, _080CEEC4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r2, 0x80 adds r0, r2, 0 @@ -1967,7 +1967,7 @@ _080CEEA0: bl SetMainCallback2 b _080CF528 .align 2, 0 -_080CEEC4: .4byte gUnknown_2037AB8 +_080CEEC4: .4byte gPaletteFade _080CEEC8: .4byte gUnknown_2039A20 _080CEECC: .4byte gUnknown_300537C _080CEED0: @@ -2000,7 +2000,7 @@ _080CEF04: .4byte gUnknown_2023E82 _080CEF08: .4byte 0x0006001c _080CEF0C: .4byte 0x00007fff _080CEF10: - ldr r0, _080CEF38 @ =gUnknown_2037AB8 + ldr r0, _080CEF38 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2023,7 +2023,7 @@ _080CEF2E: strh r0, [r4, 0x8] b _080CF528 .align 2, 0 -_080CEF38: .4byte gUnknown_2037AB8 +_080CEF38: .4byte gPaletteFade _080CEF3C: bl IsCryFinished lsls r0, 24 @@ -2424,7 +2424,7 @@ _080CF284: _080CF2AC: .4byte gTasks _080CF2B0: .4byte gMain _080CF2B4: - ldr r0, _080CF2F4 @ =gUnknown_2037AB8 + ldr r0, _080CF2F4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2455,14 +2455,14 @@ _080CF2C2: strh r0, [r5, 0x14] b _080CF528 .align 2, 0 -_080CF2F4: .4byte gUnknown_2037AB8 +_080CF2F4: .4byte gPaletteFade _080CF2F8: .4byte gPlayerParty _080CF2FC: .4byte gTasks _080CF300: .4byte gUnknown_2024029 _080CF304: .4byte CB2_EvolutionSceneLoadGraphics _080CF308: .4byte gUnknown_2024022 _080CF30C: - ldr r0, _080CF340 @ =gUnknown_2037AB8 + ldr r0, _080CF340 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2489,7 +2489,7 @@ _080CF324: movs r0, 0xA b _080CF526 .align 2, 0 -_080CF340: .4byte gUnknown_2037AB8 +_080CF340: .4byte gPaletteFade _080CF344: .4byte sub_80CE710 _080CF348: .4byte gTasks _080CF34C: @@ -2887,7 +2887,7 @@ _080CF6AC: .align 2, 0 _080CF6CC: .4byte gTasks _080CF6D0: - ldr r0, _080CF724 @ =gUnknown_2037AB8 + ldr r0, _080CF724 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2925,7 +2925,7 @@ _080CF6E0: bl SetGpuReg bl _080D003A .align 2, 0 -_080CF724: .4byte gUnknown_2037AB8 +_080CF724: .4byte gPaletteFade _080CF728: .4byte gSprites _080CF72C: .4byte gUnknown_2039A20 _080CF730: .4byte gUnknown_2023E82 @@ -3305,7 +3305,7 @@ _080CFA68: .4byte gUnknown_2039A20 _080CFA6C: .4byte 0x0004001c _080CFA70: .4byte 0x00007fff _080CFA74: - ldr r0, _080CFA98 @ =gUnknown_2037AB8 + ldr r0, _080CFA98 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3326,7 +3326,7 @@ _080CFA90: strh r0, [r4, 0x8] b _080D003A .align 2, 0 -_080CFA98: .4byte gUnknown_2037AB8 +_080CFA98: .4byte gPaletteFade _080CFA9C: bl IsCryFinished lsls r0, 24 @@ -3679,7 +3679,7 @@ _080CFDA0: .4byte gUnknown_83FDF3C _080CFDA4: .4byte gUnknown_202298C _080CFDA8: .4byte gTasks _080CFDAC: - ldr r0, _080CFE14 @ =gUnknown_2037AB8 + ldr r0, _080CFE14 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3724,7 +3724,7 @@ _080CFDC6: strh r0, [r5, 0x14] b _080D003A .align 2, 0 -_080CFE14: .4byte gUnknown_2037AB8 +_080CFE14: .4byte gPaletteFade _080CFE18: .4byte gUnknown_3003F3C _080CFE1C: .4byte gPlayerParty _080CFE20: .4byte gTasks @@ -3732,7 +3732,7 @@ _080CFE24: .4byte gUnknown_2024029 _080CFE28: .4byte CB2_TradeEvolutionSceneLoadGraphics _080CFE2C: .4byte gUnknown_2024022 _080CFE30: - ldr r0, _080CFE64 @ =gUnknown_2037AB8 + ldr r0, _080CFE64 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3759,7 +3759,7 @@ _080CFE4A: movs r0, 0x9 b _080D0038 .align 2, 0 -_080CFE64: .4byte gUnknown_2037AB8 +_080CFE64: .4byte gPaletteFade _080CFE68: .4byte gMain _080CFE6C: .4byte sub_80CE72C _080CFE70: .4byte gTasks diff --git a/asm/fame_checker.s b/asm/fame_checker.s index d86263801..b6fbea82f 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -322,7 +322,7 @@ sub_812C664: @ 812C664 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0812C688 @ =gUnknown_2037AB8 + ldr r0, _0812C688 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -339,7 +339,7 @@ _0812C684: pop {r0} bx r0 .align 2, 0 -_0812C688: .4byte gUnknown_2037AB8 +_0812C688: .4byte gPaletteFade _0812C68C: .4byte gTasks _0812C690: .4byte sub_812C694 thumb_func_end sub_812C664 @@ -1455,7 +1455,7 @@ sub_812CF7C: @ 812CF7C push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0812D074 @ =gUnknown_2037AB8 + ldr r0, _0812D074 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1556,7 +1556,7 @@ _0812D06C: pop {r0} bx r0 .align 2, 0 -_0812D074: .4byte gUnknown_2037AB8 +_0812D074: .4byte gPaletteFade _0812D078: .4byte gUnknown_203B0FC _0812D07C: .4byte gTasks _0812D080: .4byte gSprites diff --git a/asm/field_effect.s b/asm/field_effect.s index 1382a6dae..de1776e9d 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -2121,7 +2121,7 @@ c3_080843F8: @ 80843F8 ldrsh r0, [r4, r1] cmp r0, 0 bne _0808442A - ldr r0, _08084450 @ =gUnknown_2037AB8 + ldr r0, _08084450 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2148,7 +2148,7 @@ _08084444: bx r0 .align 2, 0 _0808444C: .4byte gTasks -_08084450: .4byte gUnknown_2037AB8 +_08084450: .4byte gPaletteFade thumb_func_end c3_080843F8 thumb_func_start sub_8084454 @@ -2848,7 +2848,7 @@ sub_8084990: @ 8084990 thumb_func_start sub_80849A0 sub_80849A0: @ 80849A0 push {lr} - ldr r0, _080849E0 @ =gUnknown_2037AB8 + ldr r0, _080849E0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2875,7 +2875,7 @@ _080849DC: pop {r0} bx r0 .align 2, 0 -_080849E0: .4byte gUnknown_2037AB8 +_080849E0: .4byte gPaletteFade _080849E4: .4byte gUnknown_3005020 _080849E8: .4byte sub_80849F4 _080849EC: .4byte sub_805671C @@ -3872,7 +3872,7 @@ sub_808514C: @ 808514C thumb_func_start sub_8085168 sub_8085168: @ 8085168 push {lr} - ldr r0, _080851A8 @ =gUnknown_2037AB8 + ldr r0, _080851A8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3899,7 +3899,7 @@ _080851A0: pop {r1} bx r1 .align 2, 0 -_080851A8: .4byte gUnknown_2037AB8 +_080851A8: .4byte gPaletteFade _080851AC: .4byte gUnknown_3005020 _080851B0: .4byte mapldr_080851BC _080851B4: .4byte sub_805671C @@ -4377,7 +4377,7 @@ _08085542: thumb_func_start sub_808554C sub_808554C: @ 808554C push {lr} - ldr r0, _0808558C @ =gUnknown_2037AB8 + ldr r0, _0808558C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4404,7 +4404,7 @@ _08085584: pop {r1} bx r1 .align 2, 0 -_0808558C: .4byte gUnknown_2037AB8 +_0808558C: .4byte gPaletteFade _08085590: .4byte gUnknown_3005020 _08085594: .4byte sub_8084454 _08085598: .4byte sub_805671C @@ -4595,7 +4595,7 @@ _08085702: ldrsh r0, [r4, r2] cmp r0, 0x1 bne _08085750 - ldr r0, _08085758 @ =gUnknown_2037AB8 + ldr r0, _08085758 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4628,7 +4628,7 @@ _08085750: pop {r0} bx r0 .align 2, 0 -_08085758: .4byte gUnknown_2037AB8 +_08085758: .4byte gPaletteFade _0808575C: .4byte gUnknown_3005020 _08085760: .4byte sub_80859D4 _08085764: .4byte sub_805671C @@ -5394,7 +5394,7 @@ _08085D30: .4byte gSprites thumb_func_start sub_8085D34 sub_8085D34: @ 8085D34 push {lr} - ldr r0, _08085D74 @ =gUnknown_2037AB8 + ldr r0, _08085D74 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5421,7 +5421,7 @@ _08085D70: pop {r0} bx r0 .align 2, 0 -_08085D74: .4byte gUnknown_2037AB8 +_08085D74: .4byte gPaletteFade _08085D78: .4byte sub_805671C _08085D7C: .4byte gUnknown_3005020 _08085D80: .4byte mapldr_08085D88 @@ -7943,7 +7943,7 @@ _08087132: thumb_func_start sub_8087138 sub_8087138: @ 8087138 push {lr} - ldr r0, _08087160 @ =gUnknown_2037AB8 + ldr r0, _08087160 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7960,7 +7960,7 @@ _0808715A: pop {r0} bx r0 .align 2, 0 -_08087160: .4byte gUnknown_2037AB8 +_08087160: .4byte gPaletteFade _08087164: .4byte sub_8086E40 thumb_func_end sub_8087138 @@ -9439,7 +9439,7 @@ sub_8087CB4: @ 8087CB4 adds r4, r0, 0 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _08087CF4 @ =gUnknown_2037AB8 + ldr r0, _08087CF4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9464,7 +9464,7 @@ _08087CEE: pop {r0} bx r0 .align 2, 0 -_08087CF4: .4byte gUnknown_2037AB8 +_08087CF4: .4byte gPaletteFade _08087CF8: .4byte sub_8087B14 thumb_func_end sub_8087CB4 @@ -9616,7 +9616,7 @@ sub_8087E00: @ 8087E00 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08087E24 @ =gUnknown_2037AB8 + ldr r0, _08087E24 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9631,7 +9631,7 @@ _08087E1E: pop {r0} bx r0 .align 2, 0 -_08087E24: .4byte gUnknown_2037AB8 +_08087E24: .4byte gPaletteFade thumb_func_end sub_8087E00 thumb_func_start sub_8087E28 diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index 1b3aaf9d3..b9a31bee4 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -1125,12 +1125,12 @@ _0807E408: .4byte task_mpl_807E3C8 thumb_func_start sub_807E40C sub_807E40C: @ 807E40C - ldr r0, _0807E414 @ =gUnknown_2037AB8 + ldr r0, _0807E414 @ =gPaletteFade ldrb r0, [r0, 0x7] lsrs r0, 7 bx lr .align 2, 0 -_0807E414: .4byte gUnknown_2037AB8 +_0807E414: .4byte gPaletteFade thumb_func_end sub_807E40C thumb_func_start sub_807E418 diff --git a/asm/field_specials.s b/asm/field_specials.s index 5132df30e..93971a0b7 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -4717,7 +4717,7 @@ sub_80CCA18: @ 80CCA18 lsls r1, 3 ldr r0, _080CCAA4 @ =gTasks+0x8 adds r4, r1, r0 - ldr r0, _080CCAA8 @ =gUnknown_2037AB8 + ldr r0, _080CCAA8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4779,7 +4779,7 @@ _080CCA78: b _080CCADE .align 2, 0 _080CCAA4: .4byte gTasks+0x8 -_080CCAA8: .4byte gUnknown_2037AB8 +_080CCAA8: .4byte gPaletteFade _080CCAAC: .4byte gUnknown_2036E28 _080CCAB0: .4byte gSaveBlock1Ptr _080CCAB4: .4byte 0x00004f01 @@ -4847,7 +4847,7 @@ _080CCB36: movs r0, 0x7 movs r1, 0x1 bl sub_8059948 - ldr r0, _080CCB64 @ =gUnknown_2037AB8 + ldr r0, _080CCB64 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4866,7 +4866,7 @@ _080CCB5A: bx r0 .align 2, 0 _080CCB60: .4byte gUnknown_83F60B0 -_080CCB64: .4byte gUnknown_2037AB8 +_080CCB64: .4byte gPaletteFade thumb_func_end sub_80CCAF4 thumb_func_start sub_80CCB68 diff --git a/asm/field_weather.s b/asm/field_weather.s index 8a3208f55..608f03109 100644 --- a/asm/field_weather.s +++ b/asm/field_weather.s @@ -690,7 +690,7 @@ _0807A144: _0807A164: .4byte gUnknown_2037F34 _0807A168: .4byte 0x000006c6 _0807A16C: - ldr r0, _0807A190 @ =gUnknown_2037AB8 + ldr r0, _0807A190 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -711,7 +711,7 @@ _0807A18C: pop {r0} bx r0 .align 2, 0 -_0807A190: .4byte gUnknown_2037AB8 +_0807A190: .4byte gPaletteFade _0807A194: .4byte 0x000006c1 _0807A198: .4byte 0x000006c6 thumb_func_end sub_807A084 @@ -1988,7 +1988,7 @@ _0807AB20: adds r1, r2 movs r2, 0x8 bl CpuFastSet - ldr r0, _0807AB54 @ =gUnknown_2037AB8 + ldr r0, _0807AB54 @ =gPaletteFade ldrh r2, [r0, 0x4] lsls r2, 21 lsrs r2, 27 @@ -2002,7 +2002,7 @@ _0807AB20: .align 2, 0 _0807AB4C: .4byte gUnknown_20375F8 _0807AB50: .4byte gUnknown_20371F8 -_0807AB54: .4byte gUnknown_2037AB8 +_0807AB54: .4byte gPaletteFade _0807AB58: lsls r0, r4, 20 lsrs r4, r0, 16 diff --git a/asm/fldeff_sweetscent.s b/asm/fldeff_sweetscent.s index dfa734b91..6783e1bbb 100644 --- a/asm/fldeff_sweetscent.s +++ b/asm/fldeff_sweetscent.s @@ -155,7 +155,7 @@ sub_80DE1D0: @ 80DE1D0 lsls r5, r0, 3 ldr r6, _080DE21C @ =gTasks+0x8 adds r2, r5, r6 - ldr r0, _080DE220 @ =gUnknown_2037AB8 + ldr r0, _080DE220 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -182,7 +182,7 @@ sub_80DE1D0: @ 80DE1D0 b _080DE26C .align 2, 0 _080DE21C: .4byte gTasks+0x8 -_080DE220: .4byte gUnknown_2037AB8 +_080DE220: .4byte gPaletteFade _080DE224: .4byte gUnknown_203AAB0 _080DE228: adds r0, r6, 0 @@ -229,7 +229,7 @@ sub_80DE274: @ 80DE274 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080DE2B0 @ =gUnknown_2037AB8 + ldr r0, _080DE2B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -253,7 +253,7 @@ _080DE2AA: pop {r0} bx r0 .align 2, 0 -_080DE2B0: .4byte gUnknown_2037AB8 +_080DE2B0: .4byte gPaletteFade _080DE2B4: .4byte gUnknown_203AAB0 _080DE2B8: .4byte gUnknown_20371F8 _080DE2BC: .4byte gUnknown_81BE564 diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index 0f66e62de..1ad8d6f98 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -130,7 +130,7 @@ _080F1EBC: .4byte sub_80F1DAC _080F1EC0: .4byte gMain _080F1EC4: bl UpdatePaletteFade - ldr r0, _080F1EE8 @ =gUnknown_2037AB8 + ldr r0, _080F1EE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -144,7 +144,7 @@ _080F1EC4: movs r0, 0 b _080F1EF2 .align 2, 0 -_080F1EE8: .4byte gUnknown_2037AB8 +_080F1EE8: .4byte gPaletteFade _080F1EEC: .4byte sub_80F1DC0 _080F1EF0: movs r0, 0x1 @@ -1366,7 +1366,7 @@ Task_Hof_HandleExit: @ 80F288C push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _080F2924 @ =gUnknown_2037AB8 + ldr r0, _080F2924 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1432,7 +1432,7 @@ _080F291E: pop {r0} bx r0 .align 2, 0 -_080F2924: .4byte gUnknown_2037AB8 +_080F2924: .4byte gPaletteFade _080F2928: .4byte gTasks _080F292C: .4byte gUnknown_203AB3C _080F2930: .4byte gUnknown_203AB38 diff --git a/asm/hof_pc.s b/asm/hof_pc.s index 48085bbd8..b5a437662 100644 --- a/asm/hof_pc.s +++ b/asm/hof_pc.s @@ -10,7 +10,7 @@ sub_80CA53C: @ 80CA53C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080CA56C @ =gUnknown_2037AB8 + ldr r0, _080CA56C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -28,7 +28,7 @@ _080CA564: pop {r0} bx r0 .align 2, 0 -_080CA56C: .4byte gUnknown_2037AB8 +_080CA56C: .4byte gPaletteFade _080CA570: .4byte sub_80F2978 thumb_func_end sub_80CA53C @@ -100,7 +100,7 @@ sub_80CA5F8: @ 80CA5F8 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080CA614 @ =gUnknown_2037AB8 + ldr r0, _080CA614 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -112,7 +112,7 @@ _080CA610: pop {r0} bx r0 .align 2, 0 -_080CA614: .4byte gUnknown_2037AB8 +_080CA614: .4byte gPaletteFade thumb_func_end sub_80CA5F8 .align 2, 0 @ Don't pad with nop. diff --git a/asm/intro.s b/asm/intro.s index 2d8a626b4..45f4c6e1d 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -1222,7 +1222,7 @@ _080ECFA4: _080ECFD0: .4byte sub_80ED0AC _080ECFD4: .4byte 0x00007fff _080ECFD8: - ldr r0, _080ECFF8 @ =gUnknown_2037AB8 + ldr r0, _080ECFF8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1239,7 +1239,7 @@ _080ECFF0: strb r0, [r5, 0x4] b _080ED094 .align 2, 0 -_080ECFF8: .4byte gUnknown_2037AB8 +_080ECFF8: .4byte gPaletteFade _080ECFFC: .4byte 0x00000115 _080ED000: ldrh r0, [r5, 0x12] @@ -1282,7 +1282,7 @@ _080ED058: .4byte 0x00007fff _080ED05C: .4byte sub_80ED0AC _080ED060: .4byte sub_80ED188 _080ED064: - ldr r0, _080ED09C @ =gUnknown_2037AB8 + ldr r0, _080ED09C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1307,7 +1307,7 @@ _080ED094: pop {r0} bx r0 .align 2, 0 -_080ED09C: .4byte gUnknown_2037AB8 +_080ED09C: .4byte gPaletteFade _080ED0A0: .4byte sub_80ED0AC _080ED0A4: .4byte sub_80ED140 _080ED0A8: .4byte sub_80ED188 @@ -1618,13 +1618,13 @@ _080ED32C: .align 2, 0 _080ED34C: .4byte 0x00007fff _080ED350: - ldr r0, _080ED35C @ =gUnknown_2037AB8 + ldr r0, _080ED35C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 b _080ED3C0 .align 2, 0 -_080ED35C: .4byte gUnknown_2037AB8 +_080ED35C: .4byte gPaletteFade _080ED360: ldrh r0, [r7, 0x12] adds r0, 0x1 @@ -2495,7 +2495,7 @@ _080EDA50: .4byte 0x00007fff _080EDA54: .4byte gUnknown_2037218 _080EDA58: .4byte 0x01000020 _080EDA5C: - ldr r0, _080EDA78 @ =gUnknown_2037AB8 + ldr r0, _080EDA78 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2512,7 +2512,7 @@ _080EDA6E: strb r0, [r4, 0x4] b _080EDAC4 .align 2, 0 -_080EDA78: .4byte gUnknown_2037AB8 +_080EDA78: .4byte gPaletteFade _080EDA7C: ldrh r0, [r4, 0x12] adds r0, 0x1 diff --git a/asm/item_menu.s b/asm/item_menu.s index 07fefddfe..d9aa3dd95 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -264,13 +264,13 @@ _08107FC0: b _08108104 _08107FC6: bl ResetPaletteFade - ldr r2, _08107FD4 @ =gUnknown_2037AB8 + ldr r2, _08107FD4 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 b _08108102 .align 2, 0 -_08107FD4: .4byte gUnknown_2037AB8 +_08107FD4: .4byte gPaletteFade _08107FD8: bl ResetSpriteData b _08108104 @@ -408,7 +408,7 @@ _081080F4: movs r0, 0x9 bl sub_812B1F0 _081080FA: - ldr r2, _08108114 @ =gUnknown_2037AB8 + ldr r2, _08108114 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -424,7 +424,7 @@ _08108104: strb r0, [r1] b _08108134 .align 2, 0 -_08108114: .4byte gUnknown_2037AB8 +_08108114: .4byte gPaletteFade _08108118: .4byte gMain _0810811C: ldr r0, _0810812C @ =sub_8107EFC @@ -477,7 +477,7 @@ sub_8108178: @ 8108178 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081081A4 @ =gUnknown_2037AB8 + ldr r0, _081081A4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -494,7 +494,7 @@ _0810819C: pop {r0} bx r0 .align 2, 0 -_081081A4: .4byte gUnknown_2037AB8 +_081081A4: .4byte gPaletteFade _081081A8: .4byte gUnknown_203ACFC thumb_func_end sub_8108178 @@ -1780,7 +1780,7 @@ sub_8108B8C: @ 8108B8C lsls r0, 3 ldr r1, _08108BE0 @ =gTasks+0x8 adds r4, r0, r1 - ldr r0, _08108BE4 @ =gUnknown_2037AB8 + ldr r0, _08108BE4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1812,7 +1812,7 @@ sub_8108B8C: @ 8108B8C b _08108BFA .align 2, 0 _08108BE0: .4byte gTasks+0x8 -_08108BE4: .4byte gUnknown_2037AB8 +_08108BE4: .4byte gPaletteFade _08108BE8: .4byte sub_8108CFC _08108BEC: .4byte gUnknown_203ACFC _08108BF0: .4byte gUnknown_203AD10 @@ -2245,7 +2245,7 @@ sub_8108F0C: @ 8108F0C lsls r0, 3 ldr r1, _08108F78 @ =gTasks+0x8 adds r7, r0, r1 - ldr r0, _08108F7C @ =gUnknown_2037AB8 + ldr r0, _08108F7C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2291,7 +2291,7 @@ _08108F4A: b _08108FA0 .align 2, 0 _08108F78: .4byte gTasks+0x8 -_08108F7C: .4byte gUnknown_2037AB8 +_08108F7C: .4byte gPaletteFade _08108F80: .4byte sub_8108CFC _08108F84: .4byte gUnknown_203ACFC _08108F88: .4byte gMain @@ -6144,7 +6144,7 @@ sub_810AF9C: @ 810AF9C lsls r6, r0, 3 ldr r7, _0810AFCC @ =gTasks+0x8 adds r5, r6, r7 - ldr r0, _0810AFD0 @ =gUnknown_2037AB8 + ldr r0, _0810AFD0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -6161,7 +6161,7 @@ sub_810AF9C: @ 810AF9C b _0810B064 .align 2, 0 _0810AFCC: .4byte gTasks+0x8 -_0810AFD0: .4byte gUnknown_2037AB8 +_0810AFD0: .4byte gPaletteFade _0810AFD4: movs r0, 0x99 lsls r0, 1 @@ -6269,7 +6269,7 @@ sub_810B0AC: @ 810B0AC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0810B0DC @ =gUnknown_2037AB8 + ldr r0, _0810B0DC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -6289,7 +6289,7 @@ sub_810B0AC: @ 810B0AC bl SetMainCallback2 b _0810B0F0 .align 2, 0 -_0810B0DC: .4byte gUnknown_2037AB8 +_0810B0DC: .4byte gPaletteFade _0810B0E0: .4byte sub_8108CFC _0810B0E4: .4byte gUnknown_203AD10 _0810B0E8: @@ -6417,7 +6417,7 @@ sub_810B1D4: @ 810B1D4 lsls r5, r0, 3 ldr r6, _0810B220 @ =gTasks+0x8 adds r7, r5, r6 - ldr r0, _0810B224 @ =gUnknown_2037AB8 + ldr r0, _0810B224 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -6450,7 +6450,7 @@ _0810B202: b _0810B36C .align 2, 0 _0810B220: .4byte gTasks+0x8 -_0810B224: .4byte gUnknown_2037AB8 +_0810B224: .4byte gPaletteFade _0810B228: movs r0, 0x99 lsls r0, 1 @@ -6614,7 +6614,7 @@ sub_810B378: @ 810B378 lsls r6, r0, 3 ldr r7, _0810B3B0 @ =gTasks+0x8 adds r4, r6, r7 - ldr r0, _0810B3B4 @ =gUnknown_2037AB8 + ldr r0, _0810B3B4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -6633,7 +6633,7 @@ _0810B396: b _0810B4B6 .align 2, 0 _0810B3B0: .4byte gTasks+0x8 -_0810B3B4: .4byte gUnknown_2037AB8 +_0810B3B4: .4byte gPaletteFade _0810B3B8: movs r0, 0x10 ldrsh r1, [r4, r0] @@ -6775,7 +6775,7 @@ sub_810B4BC: @ 810B4BC mov r9, r0 mov r5, r8 add r5, r9 - ldr r0, _0810B508 @ =gUnknown_2037AB8 + ldr r0, _0810B508 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r7, 0x80 adds r0, r7, 0 @@ -6795,7 +6795,7 @@ sub_810B4BC: @ 810B4BC b _0810B5C6 .align 2, 0 _0810B504: .4byte gTasks+0x8 -_0810B508: .4byte gUnknown_2037AB8 +_0810B508: .4byte gPaletteFade _0810B50C: movs r0, 0x10 ldrsh r1, [r5, r0] @@ -6901,7 +6901,7 @@ sub_810B5D4: @ 810B5D4 mov r9, r0 mov r6, r8 add r6, r9 - ldr r0, _0810B628 @ =gUnknown_2037AB8 + ldr r0, _0810B628 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r7, 0x80 adds r0, r7, 0 @@ -6927,7 +6927,7 @@ sub_810B5D4: @ 810B5D4 b _0810B6E0 .align 2, 0 _0810B624: .4byte gTasks+0x8 -_0810B628: .4byte gUnknown_2037AB8 +_0810B628: .4byte gPaletteFade _0810B62C: movs r0, 0x99 lsls r0, 1 diff --git a/asm/item_pc.s b/asm/item_pc.s index d209e7c0d..1a7a3b498 100644 --- a/asm/item_pc.s +++ b/asm/item_pc.s @@ -365,7 +365,7 @@ sub_810D6E8: @ 810D6E8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0810D714 @ =gUnknown_2037AB8 + ldr r0, _0810D714 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -382,7 +382,7 @@ _0810D70C: pop {r0} bx r0 .align 2, 0 -_0810D714: .4byte gUnknown_2037AB8 +_0810D714: .4byte gPaletteFade _0810D718: .4byte gUnknown_203ADCC thumb_func_end sub_810D6E8 @@ -1140,7 +1140,7 @@ sub_810DCE4: @ 810DCE4 lsls r0, 3 ldr r1, _0810DD28 @ =gTasks+0x8 adds r4, r0, r1 - ldr r0, _0810DD2C @ =gUnknown_2037AB8 + ldr r0, _0810DD2C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1164,7 +1164,7 @@ sub_810DCE4: @ 810DCE4 b _0810DD40 .align 2, 0 _0810DD28: .4byte gTasks+0x8 -_0810DD2C: .4byte gUnknown_2037AB8 +_0810DD2C: .4byte gPaletteFade _0810DD30: .4byte gUnknown_203ADD0 _0810DD34: .4byte gUnknown_203ADBC _0810DD38: @@ -1382,7 +1382,7 @@ sub_810DEA0: @ 810DEA0 lsls r0, 3 ldr r1, _0810DF10 @ =gTasks+0x8 adds r6, r0, r1 - ldr r0, _0810DF14 @ =gUnknown_2037AB8 + ldr r0, _0810DF14 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1426,7 +1426,7 @@ sub_810DEA0: @ 810DEA0 b _0810DF9E .align 2, 0 _0810DF10: .4byte gTasks+0x8 -_0810DF14: .4byte gUnknown_2037AB8 +_0810DF14: .4byte gPaletteFade _0810DF18: .4byte gMain _0810DF1C: .4byte gUnknown_203ADBC _0810DF20: diff --git a/asm/item_use.s b/asm/item_use.s index e2cad1322..e15bd8660 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -1060,7 +1060,7 @@ sub_80A17E8: @ 80A17E8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1818 @ =gUnknown_2037AB8 + ldr r0, _080A1818 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1079,7 +1079,7 @@ _080A1812: pop {r0} bx r0 .align 2, 0 -_080A1818: .4byte gUnknown_2037AB8 +_080A1818: .4byte gPaletteFade _080A181C: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80A17E8 @@ -1138,7 +1138,7 @@ sub_80A1880: @ 80A1880 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A18B0 @ =gUnknown_2037AB8 + ldr r0, _080A18B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1157,7 +1157,7 @@ _080A18AA: pop {r0} bx r0 .align 2, 0 -_080A18B0: .4byte gUnknown_2037AB8 +_080A18B0: .4byte gPaletteFade _080A18B4: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80A1880 @@ -1253,7 +1253,7 @@ sub_80A1960: @ 80A1960 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1990 @ =gUnknown_2037AB8 + ldr r0, _080A1990 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1271,7 +1271,7 @@ _080A1988: pop {r0} bx r0 .align 2, 0 -_080A1990: .4byte gUnknown_2037AB8 +_080A1990: .4byte gPaletteFade _080A1994: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80A1960 @@ -1660,7 +1660,7 @@ sub_80A1CC0: @ 80A1CC0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1CF0 @ =gUnknown_2037AB8 + ldr r0, _080A1CF0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1678,7 +1678,7 @@ _080A1CE8: pop {r0} bx r0 .align 2, 0 -_080A1CF0: .4byte gUnknown_2037AB8 +_080A1CF0: .4byte gPaletteFade _080A1CF4: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80A1CC0 @@ -1743,7 +1743,7 @@ sub_80A1D68: @ 80A1D68 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1D94 @ =gUnknown_2037AB8 + ldr r0, _080A1D94 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1760,7 +1760,7 @@ _080A1D8E: pop {r0} bx r0 .align 2, 0 -_080A1D94: .4byte gUnknown_2037AB8 +_080A1D94: .4byte gPaletteFade _080A1D98: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80A1D68 diff --git a/asm/learn_move.s b/asm/learn_move.s index eba23b712..43eb29d5b 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -42,7 +42,7 @@ sub_80E4660: @ 80E4660 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080E468C @ =gUnknown_2037AB8 + ldr r0, _080E468C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -60,7 +60,7 @@ _080E4684: pop {r0} bx r0 .align 2, 0 -_080E468C: .4byte gUnknown_2037AB8 +_080E468C: .4byte gPaletteFade _080E4690: .4byte sub_80E478C _080E4694: .4byte gUnknown_3005020 _080E4698: .4byte sub_807DD24 @@ -406,7 +406,7 @@ _080E49A8: _080E49EC: .4byte gUnknown_203AAB4 _080E49F0: .4byte 0x0000025f _080E49F4: - ldr r0, _080E4A08 @ =gUnknown_2037AB8 + ldr r0, _080E4A08 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -418,7 +418,7 @@ _080E4A02: movs r0, 0x4 b _080E4ED8 .align 2, 0 -_080E4A08: .4byte gUnknown_2037AB8 +_080E4A08: .4byte gPaletteFade _080E4A0C: ldr r1, [r7] ldrb r0, [r1] @@ -720,7 +720,7 @@ _080E4C5A: bl BeginNormalPaletteFade b _080E4EDA _080E4C70: - ldr r0, _080E4CC8 @ =gUnknown_2037AB8 + ldr r0, _080E4CC8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -763,7 +763,7 @@ _080E4C7E: movs r0, 0x1C b _080E4ED8 .align 2, 0 -_080E4CC8: .4byte gUnknown_2037AB8 +_080E4CC8: .4byte gPaletteFade _080E4CCC: .4byte 0x00000263 _080E4CD0: .4byte 0x00000a68 _080E4CD4: .4byte 0x00000a6a @@ -798,7 +798,7 @@ _080E4CFA: .align 2, 0 _080E4D14: .4byte gUnknown_203AAB4 _080E4D18: - ldr r0, _080E4D3C @ =gUnknown_2037AB8 + ldr r0, _080E4D3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -814,7 +814,7 @@ _080E4D26: bl SetMainCallback2 b _080E4EDA .align 2, 0 -_080E4D3C: .4byte gUnknown_2037AB8 +_080E4D3C: .4byte gPaletteFade _080E4D40: .4byte gUnknown_203AAB4 _080E4D44: .4byte c2_exit_to_overworld_2_switch _080E4D48: @@ -844,7 +844,7 @@ _080E4D48: .align 2, 0 _080E4D88: .4byte gUnknown_203AAB4 _080E4D8C: - ldr r0, _080E4DAC @ =gUnknown_2037AB8 + ldr r0, _080E4DAC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -861,7 +861,7 @@ _080E4D9A: movs r0, 0x18 b _080E4ED8 .align 2, 0 -_080E4DAC: .4byte gUnknown_2037AB8 +_080E4DAC: .4byte gPaletteFade _080E4DB0: .4byte 0x00000261 _080E4DB4: movs r4, 0x98 diff --git a/asm/link_rfu.s b/asm/link_rfu.s index 3f8d3735c..4b20fa9a0 100644 --- a/asm/link_rfu.s +++ b/asm/link_rfu.s @@ -3372,7 +3372,7 @@ _080FED28: strh r0, [r6] b _080FED6E _080FED38: - ldr r0, _080FED78 @ =gUnknown_2037AB8 + ldr r0, _080FED78 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3402,7 +3402,7 @@ _080FED6E: pop {r0} bx r0 .align 2, 0 -_080FED78: .4byte gUnknown_2037AB8 +_080FED78: .4byte gPaletteFade _080FED7C: .4byte 0x0000082d thumb_func_end sub_80FEC90 diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index f4e12b60f..6f282750b 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -3849,7 +3849,7 @@ _08117944: bl fade_screen b _08117968 _08117958: - ldr r0, _08117970 @ =gUnknown_2037AB8 + ldr r0, _08117970 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3862,7 +3862,7 @@ _08117968: strh r0, [r4] b _08117988 .align 2, 0 -_08117970: .4byte gUnknown_2037AB8 +_08117970: .4byte gPaletteFade _08117974: bl sub_800A4BC lsls r0, 24 @@ -6990,7 +6990,7 @@ _081194F0: movs r0, 0x36 b _081198DA _08119504: - ldr r0, _08119528 @ =gUnknown_2037AB8 + ldr r0, _08119528 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7009,7 +7009,7 @@ _08119512: bl sub_81277F4 b _081198DC .align 2, 0 -_08119528: .4byte gUnknown_2037AB8 +_08119528: .4byte gPaletteFade _0811952C: .4byte gUnknown_203B06C _08119530: .4byte gUnknown_3005020 _08119534: .4byte sub_807DCE4 diff --git a/asm/mail.s b/asm/mail.s index ecd5e71fd..bf24fe177 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -497,7 +497,7 @@ _080BF01C: _080BF026: ldr r0, _080BF038 @ =sub_80BF354 bl SetVBlankCallback - ldr r2, _080BF03C @ =gUnknown_2037AB8 + ldr r2, _080BF03C @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -505,7 +505,7 @@ _080BF026: b _080BF0F4 .align 2, 0 _080BF038: .4byte sub_80BF354 -_080BF03C: .4byte gUnknown_2037AB8 +_080BF03C: .4byte gPaletteFade _080BF040: ldr r5, _080BF064 @ =gUnknown_20399C4 ldr r0, [r5] @@ -573,7 +573,7 @@ _080BF0A4: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r2, _080BF0E8 @ =gUnknown_2037AB8 + ldr r2, _080BF0E8 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -586,7 +586,7 @@ _080BF0A4: movs r0, 0x1 b _080BF104 .align 2, 0 -_080BF0E8: .4byte gUnknown_2037AB8 +_080BF0E8: .4byte gPaletteFade _080BF0EC: .4byte gUnknown_20399C4 _080BF0F0: .4byte sub_80BF394 _080BF0F4: diff --git a/asm/main_menu.s b/asm/main_menu.s index 9c1302cdc..3285c29ea 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -223,7 +223,7 @@ sub_800C4D0: @ 800C4D0 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0800C538 @ =gUnknown_2037AB8 + ldr r0, _0800C538 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -266,7 +266,7 @@ _0800C4E8: beq _0800C54A b _0800C5E8 .align 2, 0 -_0800C538: .4byte gUnknown_2037AB8 +_0800C538: .4byte gPaletteFade _0800C53C: .4byte gUnknown_30053A0 _0800C540: cmp r4, 0x4 @@ -430,7 +430,7 @@ sub_800C688: @ 800C688 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0800C6E0 @ =gUnknown_2037AB8 + ldr r0, _0800C6E0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -466,7 +466,7 @@ sub_800C688: @ 800C688 ldr r0, _0800C6F0 @ =sub_800C704 b _0800C6F6 .align 2, 0 -_0800C6E0: .4byte gUnknown_2037AB8 +_0800C6E0: .4byte gPaletteFade _0800C6E4: .4byte gMain _0800C6E8: .4byte gUnknown_8234638 _0800C6EC: .4byte gTasks @@ -488,7 +488,7 @@ sub_800C704: @ 800C704 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0800C764 @ =gUnknown_2037AB8 + ldr r0, _0800C764 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -527,7 +527,7 @@ sub_800C704: @ 800C704 ldr r0, _0800C76C @ =sub_800CA94 b _0800C772 .align 2, 0 -_0800C764: .4byte gUnknown_2037AB8 +_0800C764: .4byte gPaletteFade _0800C768: .4byte gTasks _0800C76C: .4byte sub_800CA94 _0800C770: @@ -547,7 +547,7 @@ sub_800C780: @ 800C780 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0800C79C @ =gUnknown_2037AB8 + ldr r0, _0800C79C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -559,7 +559,7 @@ _0800C798: pop {r0} bx r0 .align 2, 0 -_0800C79C: .4byte gUnknown_2037AB8 +_0800C79C: .4byte gPaletteFade thumb_func_end sub_800C780 thumb_func_start sub_800C7A0 @@ -867,7 +867,7 @@ sub_800CA54: @ 800CA54 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0800CA88 @ =gUnknown_2037AB8 + ldr r0, _0800CA88 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -890,7 +890,7 @@ _0800CA80: pop {r0} bx r0 .align 2, 0 -_0800CA88: .4byte gUnknown_2037AB8 +_0800CA88: .4byte gPaletteFade _0800CA8C: .4byte gTasks _0800CA90: .4byte sub_800CA28 thumb_func_end sub_800CA54 @@ -901,7 +901,7 @@ sub_800CA94: @ 800CA94 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0800CAC4 @ =gUnknown_2037AB8 + ldr r0, _0800CAC4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -922,7 +922,7 @@ sub_800CA94: @ 800CA94 beq _0800CADA b _0800CAEE .align 2, 0 -_0800CAC4: .4byte gUnknown_2037AB8 +_0800CAC4: .4byte gPaletteFade _0800CAC8: .4byte gTasks _0800CACC: movs r1, 0xA @@ -1084,13 +1084,13 @@ _0800CBF2: _0800CC04: .4byte gUnknown_8415ACB _0800CC08: .4byte gTasks _0800CC0C: - ldr r0, _0800CC18 @ =gUnknown_2037AB8 + ldr r0, _0800CC18 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 b _0800CC28 .align 2, 0 -_0800CC18: .4byte gUnknown_2037AB8 +_0800CC18: .4byte gPaletteFade _0800CC1C: bl RunTextPrinters movs r0, 0x4 @@ -1135,7 +1135,7 @@ sub_800CC68: @ 800CC68 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0800CC8C @ =gUnknown_2037AB8 + ldr r0, _0800CC8C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1150,7 +1150,7 @@ _0800CC86: pop {r0} bx r0 .align 2, 0 -_0800CC8C: .4byte gUnknown_2037AB8 +_0800CC8C: .4byte gPaletteFade _0800CC90: .4byte sub_8078914 thumb_func_end sub_800CC68 diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 0c344853a..ccb86ba64 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -246,7 +246,7 @@ _08145834: lsrs r6, r0, 24 cmp r6, 0 bne _0814592E - ldr r2, _081458A0 @ =gUnknown_2037AB8 + ldr r2, _081458A0 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -291,7 +291,7 @@ _08145834: bl CopyBgTilemapBufferToVram b _0814591E .align 2, 0 -_081458A0: .4byte gUnknown_2037AB8 +_081458A0: .4byte gPaletteFade _081458A4: .4byte gUnknown_203F3C8 _081458A8: .4byte 0x0000045c _081458AC: @@ -315,7 +315,7 @@ _081458D2: bl ShowBg movs r0, 0x2 bl ShowBg - ldr r2, _08145904 @ =gUnknown_2037AB8 + ldr r2, _08145904 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -331,7 +331,7 @@ _081458D2: bl UpdatePaletteFade b _0814591E .align 2, 0 -_08145904: .4byte gUnknown_2037AB8 +_08145904: .4byte gPaletteFade _08145908: bl UpdatePaletteFade lsls r0, 24 @@ -1780,7 +1780,7 @@ _08146494: beq _081464A2 b _081465EC _081464A2: - ldr r2, _0814653C @ =gUnknown_2037AB8 + ldr r2, _0814653C @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -1851,7 +1851,7 @@ _081464A2: bl CopyBgTilemapBufferToVram b _081465D2 .align 2, 0 -_0814653C: .4byte gUnknown_2037AB8 +_0814653C: .4byte gPaletteFade _08146540: .4byte gUnknown_203F3CC _08146544: bl sub_8146980 @@ -1870,7 +1870,7 @@ _0814655C: bl ShowBg movs r0, 0x3 bl ShowBg - ldr r2, _081465AC @ =gUnknown_2037AB8 + ldr r2, _081465AC @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -1898,7 +1898,7 @@ _0814655C: bl UpdatePaletteFade b _081465D2 .align 2, 0 -_081465AC: .4byte gUnknown_2037AB8 +_081465AC: .4byte gPaletteFade _081465B0: .4byte gUnknown_203F3CC _081465B4: .4byte 0x000001c1 _081465B8: diff --git a/asm/naming_screen.s b/asm/naming_screen.s index e42ed45d8..e8a5cb2c2 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -692,7 +692,7 @@ _0809DF24: .4byte 0x00001e10 thumb_func_start sub_809DF28 sub_809DF28: @ 809DF28 push {lr} - ldr r0, _0809DF58 @ =gUnknown_2037AB8 + ldr r0, _0809DF58 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -714,7 +714,7 @@ _0809DF50: pop {r1} bx r1 .align 2, 0 -_0809DF58: .4byte gUnknown_2037AB8 +_0809DF58: .4byte gPaletteFade _0809DF5C: .4byte gUnknown_203998C _0809DF60: .4byte 0x00001e10 thumb_func_end sub_809DF28 @@ -837,7 +837,7 @@ _0809E044: .4byte 0x00001e10 thumb_func_start sub_809E048 sub_809E048: @ 809E048 push {r4,r5,lr} - ldr r0, _0809E0A0 @ =gUnknown_2037AB8 + ldr r0, _0809E0A0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -875,7 +875,7 @@ _0809E096: pop {r1} bx r1 .align 2, 0 -_0809E0A0: .4byte gUnknown_2037AB8 +_0809E0A0: .4byte gPaletteFade _0809E0A4: .4byte gUnknown_203998C _0809E0A8: .4byte 0x00001e2c _0809E0AC: .4byte 0x00001e3c diff --git a/asm/oak_speech.s b/asm/oak_speech.s index c5591fc0e..e20c96638 100644 --- a/asm/oak_speech.s +++ b/asm/oak_speech.s @@ -462,7 +462,7 @@ _0812ECF4: .4byte gUnknown_203B108 _0812ECF8: .4byte gSpriteCoordOffsetX _0812ECFC: .4byte gSpriteCoordOffsetY _0812ED00: - ldr r2, _0812ED34 @ =gUnknown_2037AB8 + ldr r2, _0812ED34 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -483,7 +483,7 @@ _0812ED00: bl LoadPalette b _0812EE94 .align 2, 0 -_0812ED34: .4byte gUnknown_2037AB8 +_0812ED34: .4byte gPaletteFade _0812ED38: .4byte gUnknown_8460568 _0812ED3C: bl sub_80F78A8 @@ -561,7 +561,7 @@ _0812ED9A: movs r3, 0x13 bl FillBgTilemapBufferRect_Palette0 bl sub_812EEB0 - ldr r2, _0812EE28 @ =gUnknown_2037AB8 + ldr r2, _0812EE28 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -590,7 +590,7 @@ _0812ED9A: _0812EE1C: .4byte 0x0000d00f _0812EE20: .4byte 0x0000d002 _0812EE24: .4byte 0x0000d00e -_0812EE28: .4byte gUnknown_2037AB8 +_0812EE28: .4byte gPaletteFade _0812EE2C: .4byte gTasks _0812EE30: movs r0, 0x1 @@ -890,7 +890,7 @@ sub_812F0B0: @ 812F0B0 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0812F10C @ =gUnknown_2037AB8 + ldr r0, _0812F10C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -931,7 +931,7 @@ sub_812F0B0: @ 812F0B0 bl BeginNormalPaletteFade b _0812F150 .align 2, 0 -_0812F10C: .4byte gUnknown_2037AB8 +_0812F10C: .4byte gPaletteFade _0812F110: .4byte gMain _0812F114: .4byte gTasks _0812F118: .4byte gUnknown_203B108 @@ -992,7 +992,7 @@ sub_812F180: @ 812F180 lsrs r7, r0, 24 movs r0, 0 mov r8, r0 - ldr r0, _0812F1B0 @ =gUnknown_2037AB8 + ldr r0, _0812F1B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1008,7 +1008,7 @@ sub_812F180: @ 812F180 mov r8, r1 b _0812F1C4 .align 2, 0 -_0812F1B0: .4byte gUnknown_2037AB8 +_0812F1B0: .4byte gPaletteFade _0812F1B4: .4byte gUnknown_203B108 _0812F1B8: cmp r0, 0 @@ -1115,7 +1115,7 @@ sub_812F274: @ 812F274 lsrs r0, 24 mov r8, r0 movs r6, 0 - ldr r0, _0812F32C @ =gUnknown_2037AB8 + ldr r0, _0812F32C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1194,7 +1194,7 @@ _0812F320: pop {r0} bx r0 .align 2, 0 -_0812F32C: .4byte gUnknown_2037AB8 +_0812F32C: .4byte gPaletteFade _0812F330: .4byte gUnknown_203B108 _0812F334: .4byte gTasks _0812F338: .4byte sub_812F33C @@ -1402,7 +1402,7 @@ _0812F4E4: .4byte _0812F644 .4byte _0812F688 _0812F4F8: - ldr r0, _0812F534 @ =gUnknown_2037AB8 + ldr r0, _0812F534 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1429,7 +1429,7 @@ _0812F506: bl SetGpuRegBits b _0812F676 .align 2, 0 -_0812F534: .4byte gUnknown_2037AB8 +_0812F534: .4byte gPaletteFade _0812F538: ldrh r1, [r4, 0x2E] movs r0, 0x3 @@ -1681,7 +1681,7 @@ sub_812F72C: @ 812F72C ldr r0, _0812F7B4 @ =gTasks+0x8 mov r8, r0 adds r4, r7, r0 - ldr r0, _0812F7B8 @ =gUnknown_2037AB8 + ldr r0, _0812F7B8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1731,7 +1731,7 @@ _0812F7A6: bx r0 .align 2, 0 _0812F7B4: .4byte gTasks+0x8 -_0812F7B8: .4byte gUnknown_2037AB8 +_0812F7B8: .4byte gPaletteFade _0812F7BC: .4byte sub_812F7C0 thumb_func_end sub_812F72C @@ -1834,7 +1834,7 @@ sub_812F880: @ 812F880 lsls r0, 3 ldr r1, _0812F8B0 @ =gTasks+0x8 adds r2, r0, r1 - ldr r0, _0812F8B4 @ =gUnknown_2037AB8 + ldr r0, _0812F8B4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1850,7 +1850,7 @@ sub_812F880: @ 812F880 b _0812F92E .align 2, 0 _0812F8B0: .4byte gTasks+0x8 -_0812F8B4: .4byte gUnknown_2037AB8 +_0812F8B4: .4byte gPaletteFade _0812F8B8: movs r0, 0 movs r1, 0 @@ -3215,7 +3215,7 @@ sub_81303B4: @ 81303B4 sub sp, 0x8 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _081303F8 @ =gUnknown_2037AB8 + ldr r0, _081303F8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3243,7 +3243,7 @@ sub_81303B4: @ 81303B4 bl DoNamingScreen b _08130440 .align 2, 0 -_081303F8: .4byte gUnknown_2037AB8 +_081303F8: .4byte gPaletteFade _081303FC: .4byte gUnknown_203B108 _08130400: .4byte gSaveBlock2Ptr _08130404: .4byte sub_8130C64 @@ -3301,7 +3301,7 @@ sub_8130464: @ 8130464 lsls r6, r1, 3 ldr r7, _081304A0 @ =gTasks+0x8 adds r5, r6, r7 - ldr r0, _081304A4 @ =gUnknown_2037AB8 + ldr r0, _081304A4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3322,7 +3322,7 @@ sub_8130464: @ 8130464 b _081304BC .align 2, 0 _081304A0: .4byte gTasks+0x8 -_081304A4: .4byte gUnknown_2037AB8 +_081304A4: .4byte gPaletteFade _081304A8: .4byte gUnknown_203B108 _081304AC: .4byte gStringVar4 _081304B0: .4byte gUnknown_81C5E13 @@ -4072,7 +4072,7 @@ sub_8130A80: @ 8130A80 lsls r0, 3 ldr r1, _08130AB8 @ =gTasks+0x8 adds r2, r0, r1 - ldr r0, _08130ABC @ =gUnknown_2037AB8 + ldr r0, _08130ABC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4091,7 +4091,7 @@ sub_8130A80: @ 8130A80 b _08130AD4 .align 2, 0 _08130AB8: .4byte gTasks+0x8 -_08130ABC: .4byte gUnknown_2037AB8 +_08130ABC: .4byte gPaletteFade _08130AC0: adds r0, 0x1 strh r0, [r2, 0x2] @@ -4260,7 +4260,7 @@ sub_8130BF0: @ 8130BF0 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08130C14 @ =gUnknown_2037AB8 + ldr r0, _08130C14 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4277,7 +4277,7 @@ _08130C10: pop {r0} bx r0 .align 2, 0 -_08130C14: .4byte gUnknown_2037AB8 +_08130C14: .4byte gPaletteFade _08130C18: .4byte gTasks _08130C1C: .4byte sub_8130C20 thumb_func_end sub_8130BF0 @@ -5350,7 +5350,7 @@ sub_81314DC: @ 81314DC mov r12, r1 cmp r0, 0x10 bne _08131530 - ldr r0, _0813152C @ =gUnknown_2037AB8 + ldr r0, _0813152C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5369,7 +5369,7 @@ sub_81314DC: @ 81314DC b _081315BA .align 2, 0 _08131528: .4byte gTasks -_0813152C: .4byte gUnknown_2037AB8 +_0813152C: .4byte gPaletteFade _08131530: ldrh r1, [r2, 0x10] movs r7, 0x10 diff --git a/asm/option_menu.s b/asm/option_menu.s index 780b5046e..e3c44d1ac 100644 --- a/asm/option_menu.s +++ b/asm/option_menu.s @@ -640,7 +640,7 @@ _08088878: .align 2, 0 _08088890: .4byte gUnknown_2039620 _08088894: - ldr r0, _080888AC @ =gUnknown_2037AB8 + ldr r0, _080888AC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -653,7 +653,7 @@ _080888A2: strb r0, [r1, 0x10] b _080888B6 .align 2, 0 -_080888AC: .4byte gUnknown_2037AB8 +_080888AC: .4byte gPaletteFade _080888B0: adds r0, r2, 0 bl sub_8088B00 diff --git a/asm/overworld.s b/asm/overworld.s index 5e6315b9f..ddc5bf6d7 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -3409,7 +3409,7 @@ sub_80565A8: @ 80565A8 thumb_func_start sub_80565B4 sub_80565B4: @ 80565B4 push {r4,lr} - ldr r0, _080565DC @ =gUnknown_2037AB8 + ldr r0, _080565DC @ =gPaletteFade ldrb r0, [r0, 0x7] lsrs r0, 7 adds r4, r0, 0 @@ -3427,7 +3427,7 @@ _080565D4: pop {r0} bx r0 .align 2, 0 -_080565DC: .4byte gUnknown_2037AB8 +_080565DC: .4byte gPaletteFade thumb_func_end sub_80565B4 thumb_func_start sub_80565E0 @@ -5161,7 +5161,7 @@ _080574A0: .4byte sub_8056534 thumb_func_start sub_80574A4 sub_80574A4: @ 80574A4 push {r4,lr} - ldr r0, _080574E8 @ =gUnknown_2037AB8 + ldr r0, _080574E8 @ =gPaletteFade ldrb r0, [r0, 0x7] lsrs r0, 7 adds r4, r0, 0 @@ -5186,13 +5186,13 @@ _080574E0: pop {r0} bx r0 .align 2, 0 -_080574E8: .4byte gUnknown_2037AB8 +_080574E8: .4byte gPaletteFade thumb_func_end sub_80574A4 thumb_func_start sub_80574EC sub_80574EC: @ 80574EC push {lr} - ldr r0, _08057500 @ =gUnknown_2037AB8 + ldr r0, _08057500 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5201,7 +5201,7 @@ sub_80574EC: @ 80574EC movs r0, 0 b _08057506 .align 2, 0 -_08057500: .4byte gUnknown_2037AB8 +_08057500: .4byte gPaletteFade _08057504: movs r0, 0x1 _08057506: @@ -5305,7 +5305,7 @@ _08057560: ldrh r0, [r0, 0x4] strh r0, [r1] bl warp_in - ldr r2, _08057610 @ =gUnknown_2037AB8 + ldr r2, _08057610 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -5333,7 +5333,7 @@ _08057600: .4byte 0xffff0000 _08057604: .4byte 0x0000ffff _08057608: .4byte gUnknown_2031DBC _0805760C: .4byte gUnknown_2031DE8 -_08057610: .4byte gUnknown_2037AB8 +_08057610: .4byte gPaletteFade _08057614: .4byte gUnknown_3005024 _08057618: .4byte sub_80574EC _0805761C: .4byte gMain @@ -5443,7 +5443,7 @@ _0805770C: b _0805772A _08057712: bl cur_mapheader_run_tileset_funcs_after_some_cpuset - ldr r2, _08057734 @ =gUnknown_2037AB8 + ldr r2, _08057734 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -5458,7 +5458,7 @@ _0805772A: strb r0, [r4] b _08057740 .align 2, 0 -_08057734: .4byte gUnknown_2037AB8 +_08057734: .4byte gPaletteFade _08057738: .4byte 0x3fffffff _0805773C: movs r0, 0x1 @@ -5613,7 +5613,7 @@ sub_8057854: @ 8057854 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0805787C @ =gUnknown_2037AB8 + ldr r0, _0805787C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5629,7 +5629,7 @@ _08057876: pop {r0} bx r0 .align 2, 0 -_0805787C: .4byte gUnknown_2037AB8 +_0805787C: .4byte gPaletteFade _08057880: .4byte sub_805671C thumb_func_end sub_8057854 @@ -7029,7 +7029,7 @@ sub_8058274: @ 8058274 strb r1, [r0] cmp r2, 0x1 beq _080582C0 - ldr r2, _080582D4 @ =gUnknown_2037AB8 + ldr r2, _080582D4 @ =gPaletteFade ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -7048,7 +7048,7 @@ _080582C4: .4byte gUnknown_3000E84 _080582C8: .4byte sub_8057DC8 _080582CC: .4byte sub_8057DA4 _080582D0: .4byte gUnknown_3000E88 -_080582D4: .4byte gUnknown_2037AB8 +_080582D4: .4byte gPaletteFade _080582D8: movs r0, 0 _080582DA: diff --git a/asm/palette.s b/asm/palette.s index a99aeda10..d53329082 100644 --- a/asm/palette.s +++ b/asm/palette.s @@ -109,7 +109,7 @@ _08070470: .4byte gUnknown_20375F8 thumb_func_start TransferPlttBuffer TransferPlttBuffer: @ 8070474 push {r4,r5,lr} - ldr r4, _080704BC @ =gUnknown_2037AB8 + ldr r4, _080704BC @ =gPaletteFade ldrb r1, [r4, 0x8] movs r5, 0x80 adds r0, r5, 0 @@ -145,7 +145,7 @@ _080704B6: pop {r0} bx r0 .align 2, 0 -_080704BC: .4byte gUnknown_2037AB8 +_080704BC: .4byte gPaletteFade _080704C0: .4byte gUnknown_20375F8 _080704C4: .4byte 0x040000d4 _080704C8: .4byte 0x80000200 @@ -164,7 +164,7 @@ UpdatePaletteFade: @ 80704D0 .align 2, 0 _080704E0: .4byte gUnknown_2037AC8 _080704E4: - ldr r0, _080704F8 @ =gUnknown_2037AB8 + ldr r0, _080704F8 @ =gPaletteFade ldrb r0, [r0, 0x9] movs r1, 0x3 ands r1, r0 @@ -173,7 +173,7 @@ _080704E4: bl UpdateNormalPaletteFade b _0807050A .align 2, 0 -_080704F8: .4byte gUnknown_2037AB8 +_080704F8: .4byte gPaletteFade _080704FC: cmp r1, 0x1 bne _08070506 @@ -185,7 +185,7 @@ _0807050A: lsls r0, 24 lsrs r3, r0, 24 ldr r2, _08070520 @ =gUnknown_2037AC8 - ldr r0, _08070524 @ =gUnknown_2037AB8 + ldr r0, _08070524 @ =gPaletteFade ldr r0, [r0] movs r1, 0 orrs r0, r1 @@ -196,7 +196,7 @@ _0807051C: bx r1 .align 2, 0 _08070520: .4byte gUnknown_2037AC8 -_08070524: .4byte gUnknown_2037AB8 +_08070524: .4byte gPaletteFade thumb_func_end UpdatePaletteFade thumb_func_start ResetPaletteFade @@ -268,7 +268,7 @@ BeginNormalPaletteFade: @ 8070588 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r5, _080705B8 @ =gUnknown_2037AB8 + ldr r5, _080705B8 @ =gPaletteFade ldrb r1, [r5, 0x7] movs r0, 0x80 ands r0, r1 @@ -277,7 +277,7 @@ BeginNormalPaletteFade: @ 8070588 movs r0, 0 b _080706B4 .align 2, 0 -_080705B8: .4byte gUnknown_2037AB8 +_080705B8: .4byte gPaletteFade _080705BC: ldrb r0, [r5, 0xA] movs r3, 0x79 @@ -367,7 +367,7 @@ _08070664: _08070668: strb r3, [r5, 0x8] bl UpdatePaletteFade - ldr r4, _080706C0 @ =gUnknown_2037AB8 + ldr r4, _080706C0 @ =gPaletteFade ldrb r1, [r4, 0x8] lsrs r5, r1, 7 movs r0, 0x7F @@ -393,7 +393,7 @@ _08070668: beq _080706A4 bl UpdateBlendRegisters _080706A4: - ldr r2, _080706C0 @ =gUnknown_2037AB8 + ldr r2, _080706C0 @ =gPaletteFade lsls r3, r5, 7 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -408,7 +408,7 @@ _080706B4: pop {r1} bx r1 .align 2, 0 -_080706C0: .4byte gUnknown_2037AB8 +_080706C0: .4byte gPaletteFade _080706C4: .4byte gUnknown_20375F8 _080706C8: .4byte 0x04000100 _080706CC: .4byte gUnknown_2037AC8 @@ -703,7 +703,7 @@ _080708F0: .4byte 0xfffff01f unused_sub_80A1E40: @ 80708F4 push {r4-r6,lr} adds r4, r0, 0 - ldr r3, _0807094C @ =gUnknown_2037AB8 + ldr r3, _0807094C @ =gPaletteFade ldrb r1, [r3, 0x7] movs r0, 0x80 ands r0, r1 @@ -745,7 +745,7 @@ unused_sub_80A1E40: @ 80708F4 bl BlendPalette b _080709A8 .align 2, 0 -_0807094C: .4byte gUnknown_2037AB8 +_0807094C: .4byte gPaletteFade _08070950: ldrb r1, [r3, 0x4] movs r0, 0x3F @@ -912,7 +912,7 @@ _08070A80: .4byte 0xfffff01f thumb_func_start ResetPaletteFadeControl ResetPaletteFadeControl: @ 8070A84 - ldr r2, _08070AEC @ =gUnknown_2037AB8 + ldr r2, _08070AEC @ =gPaletteFade movs r0, 0 str r0, [r2] subs r0, 0x40 @@ -965,7 +965,7 @@ ResetPaletteFadeControl: @ 8070A84 strb r3, [r2, 0xA] bx lr .align 2, 0 -_08070AEC: .4byte gUnknown_2037AB8 +_08070AEC: .4byte gPaletteFade _08070AF0: .4byte 0xfffff83f _08070AF4: .4byte 0xffff8000 _08070AF8: .4byte 0xfffe0fff @@ -1059,7 +1059,7 @@ _08070B88: thumb_func_start UpdateNormalPaletteFade UpdateNormalPaletteFade: @ 8070B8C push {r4-r7,lr} - ldr r4, _08070BA0 @ =gUnknown_2037AB8 + ldr r4, _08070BA0 @ =gPaletteFade ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -1068,7 +1068,7 @@ UpdateNormalPaletteFade: @ 8070B8C movs r0, 0 b _08070CC0 .align 2, 0 -_08070BA0: .4byte gUnknown_2037AB8 +_08070BA0: .4byte gPaletteFade _08070BA4: bl IsSoftwarePaletteFadeFinishing lsls r0, 24 @@ -1106,7 +1106,7 @@ _08070BDE: strb r0, [r4, 0x4] _08070BE6: movs r5, 0 - ldr r2, _08070BFC @ =gUnknown_2037AB8 + ldr r2, _08070BFC @ =gPaletteFade ldrb r1, [r2, 0xA] movs r0, 0x4 ands r0, r1 @@ -1116,7 +1116,7 @@ _08070BE6: ldrh r4, [r7] b _08070C06 .align 2, 0 -_08070BFC: .4byte gUnknown_2037AB8 +_08070BFC: .4byte gPaletteFade _08070C00: ldrh r4, [r7, 0x2] movs r5, 0x80 @@ -1124,7 +1124,7 @@ _08070C00: _08070C06: cmp r4, 0 beq _08070C38 - ldr r7, _08070C74 @ =gUnknown_2037AB8 + ldr r7, _08070C74 @ =gPaletteFade adds r6, r7, 0 _08070C0E: movs r0, 0x1 @@ -1180,7 +1180,7 @@ _08070C38: strb r4, [r7, 0xA] b _08070CBC .align 2, 0 -_08070C74: .4byte gUnknown_2037AB8 +_08070C74: .4byte gPaletteFade _08070C78: ldrb r1, [r7, 0x8] movs r0, 0x40 @@ -1445,7 +1445,7 @@ BeginFastPaletteFade: @ 8070E44 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _08070E64 @ =gUnknown_2037AB8 + ldr r3, _08070E64 @ =gPaletteFade ldrb r2, [r3, 0xA] movs r1, 0x79 negs r1, r1 @@ -1457,7 +1457,7 @@ BeginFastPaletteFade: @ 8070E44 pop {r0} bx r0 .align 2, 0 -_08070E64: .4byte gUnknown_2037AB8 +_08070E64: .4byte gPaletteFade thumb_func_end BeginFastPaletteFade thumb_func_start BeginFastPaletteFadeInternal @@ -1467,7 +1467,7 @@ BeginFastPaletteFadeInternal: @ 8070E68 lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r2, _08070EDC @ =gUnknown_2037AB8 + ldr r2, _08070EDC @ =gPaletteFade ldrh r0, [r2, 0x4] movs r3, 0xF8 lsls r3, 3 @@ -1520,7 +1520,7 @@ _08070ED0: pop {r0} bx r0 .align 2, 0 -_08070EDC: .4byte gUnknown_2037AB8 +_08070EDC: .4byte gPaletteFade _08070EE0: .4byte gUnknown_20375F8 _08070EE4: .4byte 0x01000200 _08070EE8: .4byte 0x00007fff @@ -1534,7 +1534,7 @@ UpdateFastPaletteFade: @ 8070EEC mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r4, _08070F08 @ =gUnknown_2037AB8 + ldr r4, _08070F08 @ =gPaletteFade ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -1543,7 +1543,7 @@ UpdateFastPaletteFade: @ 8070EEC movs r0, 0 b _08071246 .align 2, 0 -_08070F08: .4byte gUnknown_2037AB8 +_08070F08: .4byte gPaletteFade _08070F0C: bl IsSoftwarePaletteFadeFinishing lsls r0, 24 @@ -1569,7 +1569,7 @@ _08070F30: lsls r1, 1 mov r10, r1 _08070F38: - ldr r1, _08070F50 @ =gUnknown_2037AB8 + ldr r1, _08070F50 @ =gPaletteFade ldrb r0, [r1, 0x8] lsls r0, 26 lsrs r0, 26 @@ -1581,7 +1581,7 @@ _08070F38: beq _08070F62 b _08071148 .align 2, 0 -_08070F50: .4byte gUnknown_2037AB8 +_08070F50: .4byte gPaletteFade _08070F54: cmp r0, 0x2 bne _08070F5A @@ -1853,7 +1853,7 @@ _0807112C: cmp r7, r10 bcc _080710EE _08071148: - ldr r0, _08071174 @ =gUnknown_2037AB8 + ldr r0, _08071174 @ =gPaletteFade ldrb r2, [r0, 0xA] lsls r0, r2, 29 lsrs r0, 31 @@ -1864,7 +1864,7 @@ _08071148: negs r3, r3 ands r3, r2 orrs r3, r1 - ldr r1, _08071174 @ =gUnknown_2037AB8 + ldr r1, _08071174 @ =gPaletteFade strb r3, [r1, 0xA] movs r0, 0x4 ands r0, r3 @@ -1874,9 +1874,9 @@ _08071148: b _08071244 .align 2, 0 _08071170: .4byte gUnknown_20375F8 -_08071174: .4byte gUnknown_2037AB8 +_08071174: .4byte gPaletteFade _08071178: - ldr r2, _08071194 @ =gUnknown_2037AB8 + ldr r2, _08071194 @ =gPaletteFade ldrh r4, [r2, 0x4] lsls r5, r4, 21 lsrs r0, r5, 27 @@ -1887,11 +1887,11 @@ _08071178: bge _0807119C ldr r0, _08071198 @ =0xfffff83f ands r0, r4 - ldr r3, _08071194 @ =gUnknown_2037AB8 + ldr r3, _08071194 @ =gPaletteFade strh r0, [r3, 0x4] b _080711B2 .align 2, 0 -_08071194: .4byte gUnknown_2037AB8 +_08071194: .4byte gPaletteFade _08071198: .4byte 0xfffff83f _0807119C: lsrs r1, r5, 27 @@ -1903,17 +1903,17 @@ _0807119C: ldr r0, _080711D8 @ =0xfffff83f ands r0, r4 orrs r0, r1 - ldr r4, _080711DC @ =gUnknown_2037AB8 + ldr r4, _080711DC @ =gPaletteFade strh r0, [r4, 0x4] _080711B2: - ldr r1, _080711DC @ =gUnknown_2037AB8 + ldr r1, _080711DC @ =gPaletteFade ldrh r0, [r1, 0x4] movs r1, 0xF8 lsls r1, 3 ands r1, r0 cmp r1, 0 bne _08071240 - ldr r2, _080711DC @ =gUnknown_2037AB8 + ldr r2, _080711DC @ =gPaletteFade ldrb r0, [r2, 0x8] lsls r0, 26 lsrs r0, 26 @@ -1926,7 +1926,7 @@ _080711B2: b _0807122C .align 2, 0 _080711D8: .4byte 0xfffff83f -_080711DC: .4byte gUnknown_2037AB8 +_080711DC: .4byte gPaletteFade _080711E0: cmp r0, 0x2 beq _080711EA @@ -1962,7 +1962,7 @@ _08071220: ldr r2, _0807125C @ =0x05000100 bl CpuSet _0807122C: - ldr r2, _08071260 @ =gUnknown_2037AB8 + ldr r2, _08071260 @ =gPaletteFade ldrb r1, [r2, 0x9] movs r0, 0x4 negs r0, r0 @@ -1973,7 +1973,7 @@ _0807122C: orrs r0, r1 strb r0, [r2, 0xA] _08071240: - ldr r3, _08071260 @ =gUnknown_2037AB8 + ldr r3, _08071260 @ =gPaletteFade ldrb r0, [r3, 0x7] _08071244: lsrs r0, 7 @@ -1989,7 +1989,7 @@ _08071246: .align 2, 0 _08071258: .4byte gUnknown_20375F8 _0807125C: .4byte 0x05000100 -_08071260: .4byte gUnknown_2037AB8 +_08071260: .4byte gPaletteFade thumb_func_end UpdateFastPaletteFade thumb_func_start BeginHardwarePaletteFade @@ -2006,7 +2006,7 @@ BeginHardwarePaletteFade: @ 8071264 lsrs r3, 24 lsls r5, 24 lsrs r5, 24 - ldr r7, _080712EC @ =gUnknown_2037AB8 + ldr r7, _080712EC @ =gPaletteFade str r0, [r7] movs r0, 0x3F ands r1, r0 @@ -2062,7 +2062,7 @@ BeginHardwarePaletteFade: @ 8071264 ands r6, r0 b _080712F8 .align 2, 0 -_080712EC: .4byte gUnknown_2037AB8 +_080712EC: .4byte gPaletteFade _080712F0: .4byte 0xfffff83f _080712F4: movs r0, 0x40 @@ -2077,7 +2077,7 @@ _080712F8: thumb_func_start UpdateHardwarePaletteFade UpdateHardwarePaletteFade: @ 8071300 push {r4-r7,lr} - ldr r2, _08071314 @ =gUnknown_2037AB8 + ldr r2, _08071314 @ =gPaletteFade ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -2087,7 +2087,7 @@ UpdateHardwarePaletteFade: @ 8071300 movs r0, 0 b _08071410 .align 2, 0 -_08071314: .4byte gUnknown_2037AB8 +_08071314: .4byte gPaletteFade _08071318: ldrb r2, [r4, 0x4] lsls r1, r2, 26 @@ -2229,7 +2229,7 @@ _08071418: .4byte 0xfffff83f thumb_func_start UpdateBlendRegisters UpdateBlendRegisters: @ 807141C push {r4,lr} - ldr r4, _08071468 @ =gUnknown_2037AB8 + ldr r4, _08071468 @ =gPaletteFade ldrh r1, [r4] movs r0, 0x50 bl SetGpuReg @@ -2265,14 +2265,14 @@ _08071460: pop {r0} bx r0 .align 2, 0 -_08071468: .4byte gUnknown_2037AB8 +_08071468: .4byte gPaletteFade _0807146C: .4byte 0xfffff83f thumb_func_end UpdateBlendRegisters thumb_func_start IsSoftwarePaletteFadeFinishing IsSoftwarePaletteFadeFinishing: @ 8071470 push {r4,lr} - ldr r3, _080714A8 @ =gUnknown_2037AB8 + ldr r3, _080714A8 @ =gPaletteFade ldrb r4, [r3, 0xA] movs r0, 0x2 ands r0, r4 @@ -2300,7 +2300,7 @@ IsSoftwarePaletteFadeFinishing: @ 8071470 str r0, [r3, 0x8] b _080714C4 .align 2, 0 -_080714A8: .4byte gUnknown_2037AB8 +_080714A8: .4byte gPaletteFade _080714AC: .4byte 0xfffe0fff _080714B0: lsls r0, r2, 15 diff --git a/asm/party_menu.s b/asm/party_menu.s index c23e401ef..c482366d4 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -285,13 +285,13 @@ _0811EC8E: b _0811EDFC _0811EC94: bl ResetPaletteFade - ldr r2, _0811ECA4 @ =gUnknown_2037AB8 + ldr r2, _0811ECA4 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 b _0811EDFA .align 2, 0 -_0811ECA4: .4byte gUnknown_2037AB8 +_0811ECA4: .4byte gPaletteFade _0811ECA8: bl ResetSpriteData b _0811EDFC @@ -452,7 +452,7 @@ _0811EDDE: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r2, _0811EE0C @ =gUnknown_2037AB8 + ldr r2, _0811EE0C @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -468,7 +468,7 @@ _0811EDFC: strb r0, [r1] b _0811EE2C .align 2, 0 -_0811EE0C: .4byte gUnknown_2037AB8 +_0811EE0C: .4byte gPaletteFade _0811EE10: .4byte gMain _0811EE14: ldr r0, _0811EE24 @ =sub_811EBBC @@ -522,7 +522,7 @@ sub_811EE74: @ 811EE74 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0811EEA0 @ =gUnknown_2037AB8 + ldr r0, _0811EEA0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -539,7 +539,7 @@ _0811EE98: pop {r0} bx r0 .align 2, 0 -_0811EEA0: .4byte gUnknown_2037AB8 +_0811EEA0: .4byte gPaletteFade _0811EEA4: .4byte gUnknown_203B0A0 thumb_func_end sub_811EE74 @@ -2092,7 +2092,7 @@ sub_811FAB4: @ 811FAB4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0811FAE8 @ =gUnknown_2037AB8 + ldr r0, _0811FAE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2114,7 +2114,7 @@ _0811FAD6: bl SetMainCallback2 b _0811FAFA .align 2, 0 -_0811FAE8: .4byte gUnknown_2037AB8 +_0811FAE8: .4byte gPaletteFade _0811FAEC: .4byte gUnknown_203B0A0 _0811FAF0: .4byte gUnknown_203B09C _0811FAF4: @@ -2156,7 +2156,7 @@ sub_811FB28: @ 811FB28 lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 - ldr r0, _0811FB64 @ =gUnknown_2037AB8 + ldr r0, _0811FB64 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2180,7 +2180,7 @@ sub_811FB28: @ 811FB28 beq _0811FB6E b _0811FB98 .align 2, 0 -_0811FB64: .4byte gUnknown_2037AB8 +_0811FB64: .4byte gPaletteFade _0811FB68: cmp r0, 0x8 beq _0811FB82 @@ -4413,7 +4413,7 @@ sub_8120C3C: @ 8120C3C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08120C60 @ =gUnknown_2037AB8 + ldr r0, _08120C60 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4430,7 +4430,7 @@ _08120C5C: pop {r0} bx r0 .align 2, 0 -_08120C60: .4byte gUnknown_2037AB8 +_08120C60: .4byte gPaletteFade _08120C64: .4byte gTasks _08120C68: .4byte sub_8120C6C thumb_func_end sub_8120C3C @@ -4471,7 +4471,7 @@ sub_8120CA8: @ 8120CA8 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08120CCC @ =gUnknown_2037AB8 + ldr r0, _08120CCC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4488,7 +4488,7 @@ _08120CC8: pop {r0} bx r0 .align 2, 0 -_08120CCC: .4byte gUnknown_2037AB8 +_08120CCC: .4byte gPaletteFade _08120CD0: .4byte gTasks _08120CD4: .4byte sub_8120CD8 thumb_func_end sub_8120CA8 @@ -4584,7 +4584,7 @@ sub_8120D7C: @ 8120D7C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08120DA0 @ =gUnknown_2037AB8 + ldr r0, _08120DA0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4601,7 +4601,7 @@ _08120D9C: pop {r0} bx r0 .align 2, 0 -_08120DA0: .4byte gUnknown_2037AB8 +_08120DA0: .4byte gPaletteFade _08120DA4: .4byte gTasks _08120DA8: .4byte sub_8120DAC thumb_func_end sub_8120D7C @@ -4700,7 +4700,7 @@ sub_8120E58: @ 8120E58 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08120E90 @ =gUnknown_2037AB8 + ldr r0, _08120E90 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4722,7 +4722,7 @@ sub_8120E58: @ 8120E58 bl sub_8121D0C b _08120E9E .align 2, 0 -_08120E90: .4byte gUnknown_2037AB8 +_08120E90: .4byte gPaletteFade _08120E94: .4byte gUnknown_203B0A0 _08120E98: movs r0, 0 @@ -4775,7 +4775,7 @@ sub_8120EE0: @ 8120EE0 lsls r0, 3 ldr r1, _08120F1C @ =gTasks+0x8 adds r6, r0, r1 - ldr r0, _08120F20 @ =gUnknown_2037AB8 + ldr r0, _08120F20 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4798,7 +4798,7 @@ sub_8120EE0: @ 8120EE0 b _08120F62 .align 2, 0 _08120F1C: .4byte gTasks+0x8 -_08120F20: .4byte gUnknown_2037AB8 +_08120F20: .4byte gPaletteFade _08120F24: cmp r0, 0xF0 beq _08120F44 @@ -4919,7 +4919,7 @@ sub_8120FF0: @ 8120FF0 lsls r0, 3 ldr r1, _0812102C @ =gTasks+0x8 adds r4, r0, r1 - ldr r0, _08121030 @ =gUnknown_2037AB8 + ldr r0, _08121030 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4941,7 +4941,7 @@ sub_8120FF0: @ 8120FF0 b _08121048 .align 2, 0 _0812102C: .4byte gTasks+0x8 -_08121030: .4byte gUnknown_2037AB8 +_08121030: .4byte gPaletteFade _08121034: ldr r0, _08121050 @ =gUnknown_203B09C ldr r1, [r0] @@ -8529,7 +8529,7 @@ sub_8122C5C: @ 8122C5C push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08122C94 @ =gUnknown_2037AB8 + ldr r0, _08122C94 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -8553,7 +8553,7 @@ sub_8122C5C: @ 8122C5C bl ProcessMenuInputNoWrapAround_other b _08122CA4 .align 2, 0 -_08122C94: .4byte gUnknown_2037AB8 +_08122C94: .4byte gPaletteFade _08122C98: .4byte gTasks+0x8 _08122C9C: .4byte gUnknown_203B09C _08122CA0: @@ -8697,7 +8697,7 @@ _08122DB8: .4byte sub_8122DBC sub_8122DBC: @ 8122DBC push {lr} sub sp, 0xC - ldr r2, _08122DF4 @ =gUnknown_2037AB8 + ldr r2, _08122DF4 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -8722,7 +8722,7 @@ sub_8122DBC: @ 8122DBC pop {r0} bx r0 .align 2, 0 -_08122DF4: .4byte gUnknown_2037AB8 +_08122DF4: .4byte gPaletteFade _08122DF8: .4byte gUnknown_203B0A0 _08122DFC: .4byte sub_8122C30 thumb_func_end sub_8122DBC @@ -9986,7 +9986,7 @@ sub_8123824: @ 8123824 push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0812388C @ =gUnknown_2037AB8 + ldr r0, _0812388C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10031,7 +10031,7 @@ _08123880: pop {r0} bx r0 .align 2, 0 -_0812388C: .4byte gUnknown_2037AB8 +_0812388C: .4byte gPaletteFade _08123890: .4byte gUnknown_203AD30 _08123894: .4byte gUnknown_203B0A0 _08123898: .4byte gPlayerParty @@ -10044,7 +10044,7 @@ sub_81238A4: @ 81238A4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081238E4 @ =gUnknown_2037AB8 + ldr r0, _081238E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10073,7 +10073,7 @@ _081238DC: pop {r0} bx r0 .align 2, 0 -_081238E4: .4byte gUnknown_2037AB8 +_081238E4: .4byte gPaletteFade _081238E8: .4byte gUnknown_203B0A0 _081238EC: .4byte gPlayerParty _081238F0: .4byte gUnknown_203B0D8 @@ -10383,7 +10383,7 @@ sub_8123B78: @ 8123B78 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08123BB0 @ =gUnknown_2037AB8 + ldr r0, _08123BB0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10407,7 +10407,7 @@ sub_8123B78: @ 8123B78 bl sub_8120420 b _08123BD0 .align 2, 0 -_08123BB0: .4byte gUnknown_2037AB8 +_08123BB0: .4byte gPaletteFade _08123BB4: .4byte gUnknown_203B0D8 _08123BB8: .4byte gUnknown_203B0A0 _08123BBC: .4byte gPlayerParty @@ -10657,7 +10657,7 @@ _08123DC8: .4byte sub_8123DCC sub_8123DCC: @ 8123DCC push {lr} sub sp, 0xC - ldr r2, _08123E00 @ =gUnknown_2037AB8 + ldr r2, _08123E00 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -10680,7 +10680,7 @@ sub_8123DCC: @ 8123DCC pop {r0} bx r0 .align 2, 0 -_08123E00: .4byte gUnknown_2037AB8 +_08123E00: .4byte gPaletteFade _08123E04: .4byte gUnknown_203B0A0 _08123E08: .4byte sub_8122C30 thumb_func_end sub_8123DCC @@ -12870,7 +12870,7 @@ sub_8124FC8: @ 8124FC8 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _08125000 @ =gUnknown_2037AB8 + ldr r0, _08125000 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12896,7 +12896,7 @@ _08124FFA: pop {r0} bx r0 .align 2, 0 -_08125000: .4byte gUnknown_2037AB8 +_08125000: .4byte gPaletteFade _08125004: .4byte gUnknown_203B0A0 _08125008: .4byte gUnknown_203B09C _0812500C: .4byte sub_8128184 @@ -14729,7 +14729,7 @@ sub_8125F14: @ 8125F14 lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - ldr r0, _08125F3C @ =gUnknown_2037AB8 + ldr r0, _08125F3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -14744,7 +14744,7 @@ sub_8125F14: @ 8125F14 bl sub_8125FFC b _08125F46 .align 2, 0 -_08125F3C: .4byte gUnknown_2037AB8 +_08125F3C: .4byte gPaletteFade _08125F40: adds r0, r5, 0 bl sub_81260D8 @@ -16528,7 +16528,7 @@ sub_8126DC8: @ 8126DC8 push {r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08126E4C @ =gUnknown_2037AB8 + ldr r0, _08126E4C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -16583,7 +16583,7 @@ sub_8126DC8: @ 8126DC8 bl sub_8125C48 b _08126E98 .align 2, 0 -_08126E4C: .4byte gUnknown_2037AB8 +_08126E4C: .4byte gPaletteFade _08126E50: .4byte gUnknown_203B0A0 _08126E54: .4byte gPlayerParty _08126E58: .4byte gStringVar1 @@ -16813,7 +16813,7 @@ sub_812701C: @ 812701C push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08127084 @ =gUnknown_2037AB8 + ldr r0, _08127084 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -16858,7 +16858,7 @@ _08127078: pop {r0} bx r0 .align 2, 0 -_08127084: .4byte gUnknown_2037AB8 +_08127084: .4byte gPaletteFade _08127088: .4byte gUnknown_203B0A0 _0812708C: .4byte gPlayerParty _08127090: .4byte gTasks @@ -17010,7 +17010,7 @@ sub_81271C4: @ 81271C4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081271EC @ =gUnknown_2037AB8 + ldr r0, _081271EC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -17027,7 +17027,7 @@ sub_81271C4: @ 81271C4 bl sub_8120558 b _08127210 .align 2, 0 -_081271EC: .4byte gUnknown_2037AB8 +_081271EC: .4byte gPaletteFade _081271F0: .4byte gUnknown_203B0D8 _081271F4: .4byte gUnknown_203B0A0 _081271F8: @@ -19117,7 +19117,7 @@ sub_81281FC: @ 81281FC lsls r0, 3 ldr r1, _08128270 @ =gTasks+0x8 adds r4, r0, r1 - ldr r0, _08128274 @ =gUnknown_2037AB8 + ldr r0, _08128274 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -19168,7 +19168,7 @@ _08128268: bx r0 .align 2, 0 _08128270: .4byte gTasks+0x8 -_08128274: .4byte gUnknown_2037AB8 +_08128274: .4byte gPaletteFade _08128278: .4byte gUnknown_2022B58 _0812827C: .4byte gUnknown_203B0B4 _08128280: .4byte gTasks diff --git a/asm/player_pc.s b/asm/player_pc.s index a113049c4..ed594cb59 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -621,7 +621,7 @@ sub_80EBB70: @ 80EBB70 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080EBBA4 @ =gUnknown_2037AB8 + ldr r0, _080EBBA4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -642,7 +642,7 @@ _080EBB9C: pop {r0} bx r0 .align 2, 0 -_080EBBA4: .4byte gUnknown_2037AB8 +_080EBBA4: .4byte gPaletteFade _080EBBA8: .4byte c2_exit_to_overworld_2_switch _080EBBAC: .4byte gUnknown_3005020 _080EBBB0: .4byte sub_80EBC0C @@ -802,7 +802,7 @@ sub_80EBCD8: @ 80EBCD8 lsls r0, 3 ldr r1, _080EBD0C @ =gTasks+0x8 adds r5, r0, r1 - ldr r0, _080EBD10 @ =gUnknown_2037AB8 + ldr r0, _080EBD10 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -820,7 +820,7 @@ _080EBD06: bx r0 .align 2, 0 _080EBD0C: .4byte gTasks+0x8 -_080EBD10: .4byte gUnknown_2037AB8 +_080EBD10: .4byte gPaletteFade _080EBD14: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80EBCD8 @@ -1127,7 +1127,7 @@ sub_80EBF40: @ 80EBF40 mov r10, r0 mov r4, r9 add r4, r10 - ldr r0, _080EBF98 @ =gUnknown_2037AB8 + ldr r0, _080EBF98 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1153,7 +1153,7 @@ sub_80EBF40: @ 80EBF40 b _080EBFEA .align 2, 0 _080EBF94: .4byte gTasks+0x8 -_080EBF98: .4byte gUnknown_2037AB8 +_080EBF98: .4byte gPaletteFade _080EBF9C: .4byte gUnknown_203AAC6 _080EBFA0: movs r0, 0x5 @@ -1431,7 +1431,7 @@ sub_80EC1D4: @ 80EC1D4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080EC21C @ =gUnknown_2037AB8 + ldr r0, _080EC21C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1462,7 +1462,7 @@ _080EC216: pop {r0} bx r0 .align 2, 0 -_080EC21C: .4byte gUnknown_2037AB8 +_080EC21C: .4byte gPaletteFade _080EC220: .4byte gSaveBlock1Ptr _080EC224: .4byte gUnknown_203AAC4 _080EC228: .4byte 0x00002cd0 @@ -1746,7 +1746,7 @@ sub_80EC444: @ 80EC444 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080EC470 @ =gUnknown_2037AB8 + ldr r0, _080EC470 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1762,7 +1762,7 @@ _080EC468: pop {r0} bx r0 .align 2, 0 -_080EC470: .4byte gUnknown_2037AB8 +_080EC470: .4byte gPaletteFade thumb_func_end sub_80EC444 thumb_func_start sub_80EC474 diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s index 9cd8b78f0..d6c618dcf 100644 --- a/asm/pokedex_screen.s +++ b/asm/pokedex_screen.s @@ -18,7 +18,7 @@ sub_81024C0: @ 81024C0 thumb_func_start sub_81024D4 sub_81024D4: @ 81024D4 push {lr} - ldr r0, _08102500 @ =gUnknown_2037AB8 + ldr r0, _08102500 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -35,7 +35,7 @@ _081024EC: bl BuildOamBuffer b _08102508 .align 2, 0 -_08102500: .4byte gUnknown_2037AB8 +_08102500: .4byte gPaletteFade _08102504: bl UpdatePaletteFade _08102508: @@ -194,7 +194,7 @@ _081025AE: movs r1, 0 movs r2, 0 bl ChangeBgY - ldr r2, _081026BC @ =gUnknown_2037AB8 + ldr r2, _081026BC @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -214,7 +214,7 @@ _081026AC: .4byte sub_81024C0 _081026B0: .4byte sub_810287C _081026B4: .4byte gUnknown_203ACF0 _081026B8: .4byte gUnknown_8451EE4 -_081026BC: .4byte gUnknown_2037AB8 +_081026BC: .4byte gPaletteFade _081026C0: .4byte gUnknown_84406E0 _081026C4: ldr r0, _08102758 @ =gUnknown_84404C8 @@ -354,7 +354,7 @@ _081027D4: movs r0, 0 b _0810284C _081027D8: - ldr r0, _081027E8 @ =gUnknown_2037AB8 + ldr r0, _081027E8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -363,7 +363,7 @@ _081027D8: movs r0, 0x2 b _081027D2 .align 2, 0 -_081027E8: .4byte gUnknown_2037AB8 +_081027E8: .4byte gPaletteFade _081027EC: bl UpdatePaletteFade b _081027D4 @@ -549,7 +549,7 @@ _08102964: bl ShowBg movs r0, 0 bl ShowBg - ldr r2, _081029A4 @ =gUnknown_2037AB8 + ldr r2, _081029A4 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x80 ands r0, r1 @@ -568,7 +568,7 @@ _08102964: bl BeginNormalPaletteFade b _081029BC .align 2, 0 -_081029A4: .4byte gUnknown_2037AB8 +_081029A4: .4byte gPaletteFade _081029A8: .4byte 0x0000ffff _081029AC: ldr r0, _081029C4 @ =0xffff7fff @@ -5856,7 +5856,7 @@ _08105506: .align 2, 0 _08105524: .4byte 0x00007fff _08105528: - ldr r2, _08105554 @ =gUnknown_2037AB8 + ldr r2, _08105554 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -5875,10 +5875,10 @@ _08105528: adds r0, 0x1 b _0810557A .align 2, 0 -_08105554: .4byte gUnknown_2037AB8 +_08105554: .4byte gPaletteFade _08105558: .4byte gUnknown_203ACF0 _0810555C: - ldr r2, _08105588 @ =gUnknown_2037AB8 + ldr r2, _08105588 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -5903,7 +5903,7 @@ _0810557E: pop {r1} bx r1 .align 2, 0 -_08105588: .4byte gUnknown_2037AB8 +_08105588: .4byte gPaletteFade _0810558C: .4byte 0x00007fff _08105590: .4byte gUnknown_203ACF0 thumb_func_end sub_81052D0 @@ -8765,7 +8765,7 @@ _08106C98: .align 2, 0 _08106CD0: .4byte gUnknown_203ACF0 _08106CD4: - ldr r2, _08106D10 @ =gUnknown_2037AB8 + ldr r2, _08106D10 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -8791,7 +8791,7 @@ _08106CD4: movs r0, 0x5 b _08106E68 .align 2, 0 -_08106D10: .4byte gUnknown_2037AB8 +_08106D10: .4byte gPaletteFade _08106D14: .4byte 0x0000ffff _08106D18: .4byte gUnknown_203ACF0 _08106D1C: diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s index 9ebfd51bb..fa73d892f 100644 --- a/asm/pokemon_special_anim.s +++ b/asm/pokemon_special_anim.s @@ -580,7 +580,7 @@ _0811C9E0: strh r0, [r5] b _0811CA16 _0811C9E8: - ldr r0, _0811C9FC @ =gUnknown_2037AB8 + ldr r0, _0811C9FC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -593,7 +593,7 @@ _0811C9F4: strh r0, [r5] b _0811CA16 .align 2, 0 -_0811C9FC: .4byte gUnknown_2037AB8 +_0811C9FC: .4byte gPaletteFade _0811CA00: ldr r0, [r4, 0x4] bl SetMainCallback2 @@ -686,7 +686,7 @@ _0811CAAE: .align 2, 0 _0811CAD0: .4byte sub_811C6E8 _0811CAD4: - ldr r0, _0811CAF0 @ =gUnknown_2037AB8 + ldr r0, _0811CAF0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -700,7 +700,7 @@ _0811CAD4: subs r1, 0xC b _0811CBC6 .align 2, 0 -_0811CAF0: .4byte gUnknown_2037AB8 +_0811CAF0: .4byte gPaletteFade _0811CAF4: adds r1, r5, 0 adds r1, 0x9E @@ -908,7 +908,7 @@ _0811CC7C: .align 2, 0 _0811CCA8: .4byte sub_811C6E8 _0811CCAC: - ldr r0, _0811CCBC @ =gUnknown_2037AB8 + ldr r0, _0811CCBC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -916,7 +916,7 @@ _0811CCAC: bne _0811CD5A b _0811CD2A .align 2, 0 -_0811CCBC: .4byte gUnknown_2037AB8 +_0811CCBC: .4byte gPaletteFade _0811CCC0: adds r0, r5, 0 adds r0, 0x9C @@ -977,7 +977,7 @@ _0811CD2A: .align 2, 0 _0811CD34: .4byte gMain _0811CD38: - ldr r0, _0811CD64 @ =gUnknown_2037AB8 + ldr r0, _0811CD64 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -996,7 +996,7 @@ _0811CD5A: pop {r0} bx r0 .align 2, 0 -_0811CD64: .4byte gUnknown_2037AB8 +_0811CD64: .4byte gPaletteFade thumb_func_end sub_811CBE4 thumb_func_start sub_811CD68 @@ -1073,7 +1073,7 @@ _0811CDD2: .align 2, 0 _0811CDFC: .4byte sub_811C6E8 _0811CE00: - ldr r0, _0811CE20 @ =gUnknown_2037AB8 + ldr r0, _0811CE20 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1090,7 +1090,7 @@ _0811CE16: strh r0, [r4] b _0811CE3E .align 2, 0 -_0811CE20: .4byte gUnknown_2037AB8 +_0811CE20: .4byte gPaletteFade _0811CE24: adds r1, r5, 0 adds r1, 0x9E @@ -1290,7 +1290,7 @@ _0811CFA8: .align 2, 0 _0811CFC4: .4byte sub_811C6E8 _0811CFC8: - ldr r0, _0811D010 @ =gUnknown_2037AB8 + ldr r0, _0811D010 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1323,7 +1323,7 @@ _0811D008: pop {r0} bx r0 .align 2, 0 -_0811D010: .4byte gUnknown_2037AB8 +_0811D010: .4byte gPaletteFade _0811D014: .4byte gUnknown_203B090 thumb_func_end sub_811CF88 @@ -2020,7 +2020,7 @@ _0811D546: strh r0, [r4] b _0811D594 _0811D57E: - ldr r0, _0811D590 @ =gUnknown_2037AB8 + ldr r0, _0811D590 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2029,7 +2029,7 @@ _0811D57E: movs r0, 0 b _0811D596 .align 2, 0 -_0811D590: .4byte gUnknown_2037AB8 +_0811D590: .4byte gPaletteFade _0811D594: movs r0, 0x1 _0811D596: diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 67dea9b9e..682d5e9b3 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1731,7 +1731,7 @@ _0808C66E: .align 2, 0 _0808C67C: .4byte gUnknown_83CDA20 _0808C680: - ldr r0, _0808C6A4 @ =gUnknown_2037AB8 + ldr r0, _0808C6A4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1748,7 +1748,7 @@ _0808C69C: pop {r0} bx r0 .align 2, 0 -_0808C6A4: .4byte gUnknown_2037AB8 +_0808C6A4: .4byte gPaletteFade thumb_func_end c3_0808C39C thumb_func_start sub_808C6A8 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index ead0c8a01..b44f2f9f9 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -463,7 +463,7 @@ _08134890: .align 2, 0 _081348A8: .4byte gUnknown_203B140 _081348AC: - ldr r0, _081348C8 @ =gUnknown_2037AB8 + ldr r0, _081348C8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -476,7 +476,7 @@ _081348AC: adds r0, r2 b _08134AF6 .align 2, 0 -_081348C8: .4byte gUnknown_2037AB8 +_081348C8: .4byte gPaletteFade _081348CC: .4byte gUnknown_203B140 _081348D0: .4byte 0x00003270 _081348D4: @@ -803,7 +803,7 @@ _08134B60: _08134B80: .4byte gUnknown_203B140 _08134B84: .4byte 0x00003270 _08134B88: - ldr r0, _08134BA8 @ =gUnknown_2037AB8 + ldr r0, _08134BA8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -819,7 +819,7 @@ _08134B9A: pop {r0} bx r0 .align 2, 0 -_08134BA8: .4byte gUnknown_2037AB8 +_08134BA8: .4byte gPaletteFade thumb_func_end sub_8134840 thumb_func_start sub_8134BAC @@ -9566,7 +9566,7 @@ _08139420: _0813943C: .4byte gUnknown_203B140 _08139440: .4byte 0x00003288 _08139444: - ldr r0, _08139460 @ =gUnknown_2037AB8 + ldr r0, _08139460 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9581,7 +9581,7 @@ _08139452: adds r1, r0 b _08139728 .align 2, 0 -_08139460: .4byte gUnknown_2037AB8 +_08139460: .4byte gPaletteFade _08139464: .4byte gUnknown_203B140 _08139468: .4byte 0x00003288 _0813946C: @@ -9926,7 +9926,7 @@ _08139738: .align 2, 0 _08139744: .4byte gUnknown_203B16D _08139748: - ldr r0, _08139764 @ =gUnknown_2037AB8 + ldr r0, _08139764 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9940,7 +9940,7 @@ _0813975A: pop {r0} bx r0 .align 2, 0 -_08139764: .4byte gUnknown_2037AB8 +_08139764: .4byte gPaletteFade thumb_func_end sub_81393D4 thumb_func_start sub_8139768 diff --git a/asm/quest_log.s b/asm/quest_log.s index fd78239ff..2a6410b3f 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,221 +5,6 @@ .text - thumb_func_start sub_8111E20 -sub_8111E20: @ 8111E20 - push {r4,lr} - sub sp, 0x8 - ldr r4, _08111E60 @ =gUnknown_203ADFE - ldrb r0, [r4, 0x2] - bl ClearWindowTilemap - ldrb r0, [r4, 0x2] - movs r1, 0xF0 - str r1, [sp] - movs r1, 0x30 - str r1, [sp, 0x4] - movs r1, 0xF - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - ldrb r0, [r4, 0x2] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r4, 0x1] - bl PutWindowTilemap - ldrb r0, [r4, 0x1] - movs r1, 0x1 - bl CopyWindowToVram - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111E60: .4byte gUnknown_203ADFE - thumb_func_end sub_8111E20 - - thumb_func_start sub_8111E64 -sub_8111E64: @ 8111E64 - push {lr} - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0x1 - bl fade_screen - ldr r1, _08111E7C @ =gUnknown_203AE8C - ldr r0, _08111E80 @ =sub_8111E84 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_08111E7C: .4byte gUnknown_203AE8C -_08111E80: .4byte sub_8111E84 - thumb_func_end sub_8111E64 - - thumb_func_start sub_8111E84 -sub_8111E84: @ 8111E84 - push {r4,lr} - ldr r0, _08111F00 @ =gUnknown_2037AB8 - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08111EF8 - bl ScriptContext2_Enable - ldr r3, _08111F04 @ =gUnknown_203ADF8 - ldrb r0, [r3] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bhi _08111EEE - ldr r0, _08111F08 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldrb r2, [r3] - movs r1, 0xCD - lsls r1, 3 - muls r1, r2 - adds r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _08111EEE - adds r4, r3, 0 -_08111EBE: - ldrb r0, [r4] - ldr r1, _08111F0C @ =gUnknown_203AE98 - bl sub_811175C - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bhi _08111EEE - ldr r0, _08111F08 @ =gSaveBlock1Ptr - ldr r1, [r0] - ldrb r2, [r4] - movs r0, 0xCD - lsls r0, 3 - muls r0, r2 - adds r1, r0 - movs r0, 0x98 - lsls r0, 5 - adds r1, r0 - ldrb r0, [r1] - cmp r0, 0 - bne _08111EBE -_08111EEE: - ldr r1, _08111F10 @ =gUnknown_3005E88 - movs r0, 0 - strb r0, [r1] - bl sub_8111984 -_08111EF8: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111F00: .4byte gUnknown_2037AB8 -_08111F04: .4byte gUnknown_203ADF8 -_08111F08: .4byte gSaveBlock1Ptr -_08111F0C: .4byte gUnknown_203AE98 -_08111F10: .4byte gUnknown_3005E88 - thumb_func_end sub_8111E84 - - thumb_func_start sub_8111F14 -sub_8111F14: @ 8111F14 - push {r4,lr} - ldr r0, _08111F30 @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x3 - bne _08111F2A - ldr r4, _08111F34 @ =gUnknown_203AE90 - movs r0, 0x80 - lsls r0, 3 - bl AllocZeroed - str r0, [r4] -_08111F2A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111F30: .4byte gUnknown_203ADFA -_08111F34: .4byte gUnknown_203AE90 - thumb_func_end sub_8111F14 - - thumb_func_start sub_8111F38 -sub_8111F38: @ 8111F38 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - lsls r3, 16 - lsls r2, 16 - lsrs r2, 16 - lsrs r3, 15 - ldr r0, _08111F58 @ =gUnknown_20371F8 - adds r0, r3, r0 - ldr r1, _08111F5C @ =gUnknown_203AE90 - ldr r1, [r1] - adds r1, r3 - bl CpuSet - pop {r0} - bx r0 - .align 2, 0 -_08111F58: .4byte gUnknown_20371F8 -_08111F5C: .4byte gUnknown_203AE90 - thumb_func_end sub_8111F38 - - thumb_func_start sub_8111F60 -sub_8111F60: @ 8111F60 - push {lr} - movs r0, 0x4 - bl stdpal_get - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r0, 0 - bl sub_8111070 - bl sub_807DF7C - ldr r0, _08111F88 @ =sub_8111F8C - movs r1, 0xFF - bl CreateTask - movs r0, 0x1 - pop {r1} - bx r1 - .align 2, 0 -_08111F88: .4byte sub_8111F8C - thumb_func_end sub_8111F60 - - thumb_func_start sub_8111F8C -sub_8111F8C: @ 8111F8C - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _08111FC4 @ =gTasks - adds r4, r1, r0 - bl ScriptContext2_IsEnabled - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08111FBC - bl player_bitmagic - bl sub_805C270 - bl sub_805C780 - bl ScriptContext2_Enable - ldr r0, _08111FC8 @ =sub_8111FCC - str r0, [r4] -_08111FBC: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111FC4: .4byte gTasks -_08111FC8: .4byte sub_8111FCC - thumb_func_end sub_8111F8C - thumb_func_start sub_8111FCC sub_8111FCC: @ 8111FCC push {r4,r5,lr} @@ -230,7 +15,7 @@ sub_8111FCC: @ 8111FCC lsls r1, 3 ldr r0, _08112024 @ =gTasks adds r5, r1, r0 - ldr r0, _08112028 @ =gUnknown_2037AB8 + ldr r0, _08112028 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -265,7 +50,7 @@ _0811201E: bx r0 .align 2, 0 _08112024: .4byte gTasks -_08112028: .4byte gUnknown_2037AB8 +_08112028: .4byte gPaletteFade _0811202C: .4byte gUnknown_203AE94 _08112030: .4byte gStringVar1 _08112034: .4byte gMapHeader diff --git a/asm/region_map.s b/asm/region_map.s index aa684531d..f860c6065 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -932,7 +932,7 @@ _080C0584: _080C05D8: .4byte gUnknown_8418EB5 _080C05DC: .4byte gUnknown_8418E8B _080C05E0: - ldr r0, _080C0618 @ =gUnknown_2037AB8 + ldr r0, _080C0618 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -958,7 +958,7 @@ _080C05FA: adds r1, r2 b _080C07A0 .align 2, 0 -_080C0618: .4byte gUnknown_2037AB8 +_080C0618: .4byte gPaletteFade _080C061C: .4byte gUnknown_20399D4 _080C0620: .4byte 0x000047a0 _080C0624: @@ -1140,7 +1140,7 @@ _080C07A0: _080C07A8: .4byte gUnknown_20399D4 _080C07AC: .4byte 0x000047a0 _080C07B0: - ldr r0, _080C07CC @ =gUnknown_2037AB8 + ldr r0, _080C07CC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1154,7 +1154,7 @@ _080C07C2: pop {r0} bx r0 .align 2, 0 -_080C07CC: .4byte gUnknown_2037AB8 +_080C07CC: .4byte gPaletteFade thumb_func_end sub_80C04E4 thumb_func_start sub_80C07D0 @@ -5019,7 +5019,7 @@ _080C2768: bl sub_80C2B48 b _080C2976 _080C2788: - ldr r0, _080C27AC @ =gUnknown_2037AB8 + ldr r0, _080C27AC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5037,7 +5037,7 @@ _080C2796: bl PlaySE b _080C299A .align 2, 0 -_080C27AC: .4byte gUnknown_2037AB8 +_080C27AC: .4byte gPaletteFade _080C27B0: .4byte 0x00000ccc _080C27B4: bl sub_80C29A4 @@ -10006,7 +10006,7 @@ _080C4FEC: .align 2, 0 _080C4FFC: .4byte gUnknown_8418EB0 _080C5000: - ldr r0, _080C5024 @ =gUnknown_2037AB8 + ldr r0, _080C5024 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10022,7 +10022,7 @@ _080C500E: bl PutWindowTilemap b _080C51A6 .align 2, 0 -_080C5024: .4byte gUnknown_2037AB8 +_080C5024: .4byte gPaletteFade _080C5028: bl sub_80C3400 lsls r0, 24 @@ -10207,7 +10207,7 @@ _080C51AA: .align 2, 0 _080C51B4: .4byte gUnknown_20399FC _080C51B8: - ldr r0, _080C51E4 @ =gUnknown_2037AB8 + ldr r0, _080C51E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10229,7 +10229,7 @@ _080C51DC: pop {r0} bx r0 .align 2, 0 -_080C51E4: .4byte gUnknown_2037AB8 +_080C51E4: .4byte gPaletteFade thumb_func_end sub_80C4F08 thumb_func_start sub_80C51E8 diff --git a/asm/reshow_battle_screen.s b/asm/reshow_battle_screen.s index 5538afcff..20373bfa8 100644 --- a/asm/reshow_battle_screen.s +++ b/asm/reshow_battle_screen.s @@ -13,7 +13,7 @@ nullsub_44: @ 8077760 thumb_func_start sub_8077764 sub_8077764: @ 8077764 push {lr} - ldr r2, _080777B0 @ =gUnknown_2037AB8 + ldr r2, _080777B0 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -48,7 +48,7 @@ sub_8077764: @ 8077764 bl sub_812B1F0 b _080777DA .align 2, 0 -_080777B0: .4byte gUnknown_2037AB8 +_080777B0: .4byte gPaletteFade _080777B4: .4byte gBattleScripting _080777B8: .4byte gBattleTypeFlags _080777BC: @@ -355,7 +355,7 @@ _08077A5C: movs r2, 0x10 movs r3, 0 bl BeginHardwarePaletteFade - ldr r2, _08077AA0 @ =gUnknown_2037AB8 + ldr r2, _08077AA0 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -375,7 +375,7 @@ _08077A8A: bx r0 .align 2, 0 _08077A9C: .4byte sub_80116F4 -_08077AA0: .4byte gUnknown_2037AB8 +_08077AA0: .4byte gPaletteFade _08077AA4: .4byte sub_8011100 _08077AA8: .4byte gBattleScripting thumb_func_end sub_80777E8 diff --git a/asm/roulette_util.s b/asm/roulette_util.s index 8e60a9fe2..b94b22743 100644 --- a/asm/roulette_util.s +++ b/asm/roulette_util.s @@ -1151,7 +1151,7 @@ _080D93E4: beq _080D93FE b _080D9552 _080D93FE: - ldr r0, _080D944C @ =gUnknown_2037AB8 + ldr r0, _080D944C @ =gPaletteFade ldrb r1, [r0, 0x7] adds r0, r3, 0 ands r0, r1 @@ -1191,7 +1191,7 @@ _080D9424: beq _080D9456 b _080D953C .align 2, 0 -_080D944C: .4byte gUnknown_2037AB8 +_080D944C: .4byte gPaletteFade _080D9450: cmp r0, 0x2 beq _080D94FE diff --git a/asm/scrcmd.s b/asm/scrcmd.s index ec78da1d5..f242a22e5 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -1423,7 +1423,7 @@ ScrCmd_setflashradius: @ 806A8FC thumb_func_start sub_806A918 sub_806A918: @ 806A918 push {lr} - ldr r0, _0806A92C @ =gUnknown_2037AB8 + ldr r0, _0806A92C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1432,7 +1432,7 @@ sub_806A918: @ 806A918 movs r0, 0 b _0806A932 .align 2, 0 -_0806A92C: .4byte gUnknown_2037AB8 +_0806A92C: .4byte gPaletteFade _0806A930: movs r0, 0x1 _0806A932: diff --git a/asm/script_menu.s b/asm/script_menu.s index 08f1c32b4..321f739a0 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -453,7 +453,7 @@ sub_809CC98: @ 809CC98 lsls r0, 3 ldr r1, _0809CCC4 @ =gTasks+0x8 adds r5, r0, r1 - ldr r0, _0809CCC8 @ =gUnknown_2037AB8 + ldr r0, _0809CCC8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -468,7 +468,7 @@ sub_809CC98: @ 809CC98 b _0809CD3C .align 2, 0 _0809CCC4: .4byte gTasks+0x8 -_0809CCC8: .4byte gUnknown_2037AB8 +_0809CCC8: .4byte gPaletteFade _0809CCCC: .4byte gUnknown_2039988 _0809CCD0: movs r1, 0xA diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index 81b861413..d5c339f0b 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -72,7 +72,7 @@ sub_80BF97C: @ 80BF97C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _080BF9B4 @ =gUnknown_2037AB8 + ldr r2, _080BF9B4 @ =gPaletteFade ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -96,7 +96,7 @@ _080BF9AC: pop {r0} bx r0 .align 2, 0 -_080BF9B4: .4byte gUnknown_2037AB8 +_080BF9B4: .4byte gPaletteFade _080BF9B8: .4byte gTasks thumb_func_end sub_80BF97C diff --git a/asm/seagallop.s b/asm/seagallop.s index 45ff92759..7d40b69e0 100644 --- a/asm/seagallop.s +++ b/asm/seagallop.s @@ -316,7 +316,7 @@ sub_8147108: @ 8147108 lsls r0, 24 cmp r0, 0 beq _08147136 - ldr r0, _0814713C @ =gUnknown_2037AB8 + ldr r0, _0814713C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -331,7 +331,7 @@ _08147136: pop {r0} bx r0 .align 2, 0 -_0814713C: .4byte gUnknown_2037AB8 +_0814713C: .4byte gPaletteFade thumb_func_end sub_8147108 thumb_func_start sub_8147140 diff --git a/asm/shop.s b/asm/shop.s index 8c39c795f..2160a54ca 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -347,7 +347,7 @@ sub_809AD40: @ 809AD40 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0809AD70 @ =gUnknown_2037AB8 + ldr r0, _0809AD70 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -365,7 +365,7 @@ _0809AD68: pop {r0} bx r0 .align 2, 0 -_0809AD70: .4byte gUnknown_2037AB8 +_0809AD70: .4byte gPaletteFade thumb_func_end sub_809AD40 thumb_func_start sub_809AD74 @@ -2157,7 +2157,7 @@ sub_809BBC0: @ 809BBC0 lsls r0, 3 ldr r1, _0809BC00 @ =gTasks+0x8 adds r5, r0, r1 - ldr r0, _0809BC04 @ =gUnknown_2037AB8 + ldr r0, _0809BC04 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2181,7 +2181,7 @@ sub_809BBC0: @ 809BBC0 b _0809BC8E .align 2, 0 _0809BC00: .4byte gTasks+0x8 -_0809BC04: .4byte gUnknown_2037AB8 +_0809BC04: .4byte gPaletteFade _0809BC08: .4byte gUnknown_2039942 _0809BC0C: movs r0, 0x5 @@ -2682,7 +2682,7 @@ sub_809C04C: @ 809C04C lsls r0, 3 ldr r1, _0809C088 @ =gTasks+0x8 adds r2, r0, r1 - ldr r0, _0809C08C @ =gUnknown_2037AB8 + ldr r0, _0809C08C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2703,7 +2703,7 @@ _0809C082: bx r0 .align 2, 0 _0809C088: .4byte gTasks+0x8 -_0809C08C: .4byte gUnknown_2037AB8 +_0809C08C: .4byte gPaletteFade _0809C090: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_809C04C diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 1f4cd16c8..2fc05a82a 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -3683,7 +3683,7 @@ _0814142E: b _08141450 _08141436: bl UpdatePaletteFade - ldr r0, _0814144C @ =gUnknown_2037AB8 + ldr r0, _0814144C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3692,7 +3692,7 @@ _08141436: movs r0, 0 b _08141452 .align 2, 0 -_0814144C: .4byte gUnknown_2037AB8 +_0814144C: .4byte gPaletteFade _08141450: movs r0, 0x1 _08141452: @@ -3728,7 +3728,7 @@ _08141472: strb r0, [r4] b _081414A0 _0814148A: - ldr r0, _0814149C @ =gUnknown_2037AB8 + ldr r0, _0814149C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3737,7 +3737,7 @@ _0814148A: movs r0, 0 b _081414A2 .align 2, 0 -_0814149C: .4byte gUnknown_2037AB8 +_0814149C: .4byte gPaletteFade _081414A0: movs r0, 0x1 _081414A2: diff --git a/asm/start_menu.s b/asm/start_menu.s index 263e27504..0991b8bc3 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -841,7 +841,7 @@ _0806F40A: thumb_func_start sub_806F410 sub_806F410: @ 806F410 push {lr} - ldr r0, _0806F424 @ =gUnknown_2037AB8 + ldr r0, _0806F424 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -850,7 +850,7 @@ sub_806F410: @ 806F410 movs r0, 0 b _0806F442 .align 2, 0 -_0806F424: .4byte gUnknown_2037AB8 +_0806F424: .4byte gPaletteFade _0806F428: movs r0, 0x29 bl IncrementGameStat @@ -870,7 +870,7 @@ _0806F448: .4byte sub_810275C thumb_func_start sub_806F44C sub_806F44C: @ 806F44C push {lr} - ldr r0, _0806F460 @ =gUnknown_2037AB8 + ldr r0, _0806F460 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -879,7 +879,7 @@ sub_806F44C: @ 806F44C movs r0, 0 b _0806F478 .align 2, 0 -_0806F460: .4byte gUnknown_2037AB8 +_0806F460: .4byte gPaletteFade _0806F464: bl play_some_sound bl sub_806EF18 @@ -897,7 +897,7 @@ _0806F47C: .4byte CB2_PartyMenuFromStartMenu thumb_func_start sub_806F480 sub_806F480: @ 806F480 push {lr} - ldr r0, _0806F494 @ =gUnknown_2037AB8 + ldr r0, _0806F494 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -906,7 +906,7 @@ sub_806F480: @ 806F480 movs r0, 0 b _0806F4AC .align 2, 0 -_0806F494: .4byte gUnknown_2037AB8 +_0806F494: .4byte gPaletteFade _0806F498: bl play_some_sound bl sub_806EF18 @@ -924,7 +924,7 @@ _0806F4B0: .4byte sub_8107EB8 thumb_func_start sub_806F4B4 sub_806F4B4: @ 806F4B4 push {lr} - ldr r0, _0806F4C8 @ =gUnknown_2037AB8 + ldr r0, _0806F4C8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -933,7 +933,7 @@ sub_806F4B4: @ 806F4B4 movs r0, 0 b _0806F4E0 .align 2, 0 -_0806F4C8: .4byte gUnknown_2037AB8 +_0806F4C8: .4byte gPaletteFade _0806F4CC: bl play_some_sound bl sub_806EF18 @@ -963,7 +963,7 @@ _0806F4F8: .4byte sub_806F5A4 thumb_func_start sub_806F4FC sub_806F4FC: @ 806F4FC push {lr} - ldr r0, _0806F510 @ =gUnknown_2037AB8 + ldr r0, _0806F510 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -972,7 +972,7 @@ sub_806F4FC: @ 806F4FC movs r0, 0 b _0806F52E .align 2, 0 -_0806F510: .4byte gUnknown_2037AB8 +_0806F510: .4byte gPaletteFade _0806F514: bl play_some_sound bl sub_806EF18 @@ -1018,7 +1018,7 @@ sub_806F554: @ 806F554 thumb_func_start sub_806F56C sub_806F56C: @ 806F56C push {lr} - ldr r0, _0806F580 @ =gUnknown_2037AB8 + ldr r0, _0806F580 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1027,7 +1027,7 @@ sub_806F56C: @ 806F56C movs r0, 0 b _0806F598 .align 2, 0 -_0806F580: .4byte gUnknown_2037AB8 +_0806F580: .4byte gPaletteFade _0806F584: bl play_some_sound bl sub_80563F0 @@ -1860,7 +1860,7 @@ sub_806FBB8: @ 806FBB8 lsls r0, 3 ldr r1, _0806FBEC @ =gTasks+0x8 adds r5, r0, r1 - ldr r0, _0806FBF0 @ =gUnknown_2037AB8 + ldr r0, _0806FBF0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1881,7 +1881,7 @@ _0806FBE2: mov pc, r0 .align 2, 0 _0806FBEC: .4byte gTasks+0x8 -_0806FBF0: .4byte gUnknown_2037AB8 +_0806FBF0: .4byte gPaletteFade _0806FBF4: .4byte _0806FBF8 .align 2, 0 _0806FBF8: diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s index 70b02bbd5..812aac1a5 100644 --- a/asm/teachy_tv.s +++ b/asm/teachy_tv.s @@ -849,7 +849,7 @@ sub_815B274: @ 815B274 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0815B298 @ =gUnknown_2037AB8 + ldr r0, _0815B298 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -863,7 +863,7 @@ sub_815B274: @ 815B274 bl SetMainCallback2 b _0815B2AC .align 2, 0 -_0815B298: .4byte gUnknown_2037AB8 +_0815B298: .4byte gPaletteFade _0815B29C: .4byte gUnknown_203F450 _0815B2A0: bl sub_8055DC4 @@ -893,7 +893,7 @@ sub_815B2C0: @ 815B2C0 ldr r1, _0815B31C @ =gTasks+0x8 adds r6, r0, r1 bl sub_815B0CC - ldr r0, _0815B320 @ =gUnknown_2037AB8 + ldr r0, _0815B320 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -929,7 +929,7 @@ _0815B30A: b _0815B37A .align 2, 0 _0815B31C: .4byte gTasks+0x8 -_0815B320: .4byte gUnknown_2037AB8 +_0815B320: .4byte gPaletteFade _0815B324: .4byte gUnknown_203F44A _0815B328: .4byte gMain _0815B32C: .4byte sub_8107EB8 @@ -1864,7 +1864,7 @@ sub_815BA54: @ 815BA54 lsls r2, r1, 3 ldr r4, _0815BA8C @ =gTasks+0x8 adds r3, r2, r4 - ldr r0, _0815BA90 @ =gUnknown_2037AB8 + ldr r0, _0815BA90 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1887,7 +1887,7 @@ _0815BA86: bx r0 .align 2, 0 _0815BA8C: .4byte gTasks+0x8 -_0815BA90: .4byte gUnknown_2037AB8 +_0815BA90: .4byte gPaletteFade _0815BA94: .4byte gUnknown_8479390 _0815BA98: .4byte gUnknown_203F444 _0815BA9C: .4byte sub_815B4EC diff --git a/asm/title_screen.s b/asm/title_screen.s index 33c7d7386..c9ec19427 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -592,7 +592,7 @@ _08078E02: .align 2, 0 _08078E20: .4byte gUnknown_2037398 _08078E24: - ldr r0, _08078E3C @ =gUnknown_2037AB8 + ldr r0, _08078E3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -605,7 +605,7 @@ _08078E36: strh r0, [r6, 0x4] b _08078F80 .align 2, 0 -_08078E3C: .4byte gUnknown_2037AB8 +_08078E3C: .4byte gPaletteFade _08078E40: ldrh r0, [r6, 0x4] adds r0, 0x1 @@ -778,7 +778,7 @@ _08078F98: bl sub_807185C cmp r0, 0 bne _08078FB6 - ldr r0, _08078FC0 @ =gUnknown_2037AB8 + ldr r0, _08078FC0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -793,7 +793,7 @@ _08078FB6: pop {r0} bx r0 .align 2, 0 -_08078FC0: .4byte gUnknown_2037AB8 +_08078FC0: .4byte gPaletteFade thumb_func_end sub_8078DA4 thumb_func_start sub_8078FC4 @@ -943,7 +943,7 @@ _080790FC: bl sub_8079A88 b _0807918C _08079104: - ldr r0, _08079138 @ =gUnknown_2037AB8 + ldr r0, _08079138 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -966,13 +966,13 @@ _08079104: bl sub_8079528 b _0807918C .align 2, 0 -_08079138: .4byte gUnknown_2037AB8 +_08079138: .4byte gPaletteFade _0807913C: bl IsNotWaitingForBGMStop lsls r0, 24 cmp r0, 0 beq _080791B0 - ldr r0, _08079168 @ =gUnknown_2037AB8 + ldr r0, _08079168 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -988,7 +988,7 @@ _0807913C: strh r5, [r4, 0x4] b _0807918C .align 2, 0 -_08079168: .4byte gUnknown_2037AB8 +_08079168: .4byte gPaletteFade _0807916C: .4byte sub_807941C _08079170: ldrh r0, [r4, 0x4] @@ -1048,7 +1048,7 @@ _080791D8: beq _08079248 b _080792A6 _080791DE: - ldr r0, _08079200 @ =gUnknown_2037AB8 + ldr r0, _08079200 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1064,7 +1064,7 @@ _080791DE: strh r5, [r4, 0x4] b _08079238 .align 2, 0 -_08079200: .4byte gUnknown_2037AB8 +_08079200: .4byte gPaletteFade _08079204: ldrh r1, [r4, 0x4] movs r2, 0x4 @@ -1098,7 +1098,7 @@ _08079238: _08079240: .4byte 0x0fffffff _08079244: .4byte 0x00007fff _08079248: - ldr r0, _080792B0 @ =gUnknown_2037AB8 + ldr r0, _080792B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1142,7 +1142,7 @@ _080792A6: pop {r0} bx r0 .align 2, 0 -_080792B0: .4byte gUnknown_2037AB8 +_080792B0: .4byte gPaletteFade _080792B4: .4byte gUnknown_30053A0 _080792B8: .4byte gSaveBlock2Ptr _080792BC: .4byte gHeap @@ -1327,7 +1327,7 @@ sub_807941C: @ 807941C ldrsh r0, [r5, r1] cmp r0, 0 beq _08079444 - ldr r0, _08079464 @ =gUnknown_2037AB8 + ldr r0, _08079464 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1340,7 +1340,7 @@ _08079444: ldrsh r0, [r5, r3] cmp r0, 0 beq _08079468 - ldr r0, _08079464 @ =gUnknown_2037AB8 + ldr r0, _08079464 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1351,7 +1351,7 @@ _08079444: b _08079510 .align 2, 0 _08079460: .4byte gTasks+0x8 -_08079464: .4byte gUnknown_2037AB8 +_08079464: .4byte gPaletteFade _08079468: movs r1, 0x2 ldrsh r0, [r5, r1] @@ -1432,7 +1432,7 @@ _080794F2: beq _08079510 movs r0, 0x80 lsls r0, 8 - ldr r2, _08079524 @ =gUnknown_2037AB8 + ldr r2, _08079524 @ =gPaletteFade ldrh r1, [r2, 0x4] lsls r1, 21 lsrs r1, 27 @@ -1448,7 +1448,7 @@ _08079510: _08079518: .4byte gUnknown_20371F8 _0807951C: .4byte gUnknown_8EAE094 _08079520: .4byte gUnknown_20375F8 -_08079524: .4byte gUnknown_2037AB8 +_08079524: .4byte gPaletteFade thumb_func_end sub_807941C thumb_func_start sub_8079528 diff --git a/asm/tm_case.s b/asm/tm_case.s index 303586153..3cd478ee6 100644 --- a/asm/tm_case.s +++ b/asm/tm_case.s @@ -1314,7 +1314,7 @@ sub_813226C: @ 813226C lsls r0, 3 ldr r1, _081322A4 @ =gTasks+0x8 adds r2, r0, r1 - ldr r0, _081322A8 @ =gUnknown_2037AB8 + ldr r0, _081322A8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1334,7 +1334,7 @@ sub_813226C: @ 813226C b _081322BE .align 2, 0 _081322A4: .4byte gTasks+0x8 -_081322A8: .4byte gUnknown_2037AB8 +_081322A8: .4byte gPaletteFade _081322AC: .4byte gUnknown_203B116 _081322B0: .4byte gUnknown_203B118 _081322B4: @@ -1365,7 +1365,7 @@ sub_81322D4: @ 81322D4 lsls r0, 3 ldr r1, _08132340 @ =gTasks+0x8 adds r6, r0, r1 - ldr r0, _08132344 @ =gUnknown_2037AB8 + ldr r0, _08132344 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1406,7 +1406,7 @@ sub_81322D4: @ 81322D4 b _08132370 .align 2, 0 _08132340: .4byte gTasks+0x8 -_08132344: .4byte gUnknown_2037AB8 +_08132344: .4byte gPaletteFade _08132348: .4byte gUnknown_203B116 _0813234C: .4byte gMain _08132350: .4byte gUnknown_203AD30 @@ -2770,7 +2770,7 @@ sub_8132F20: @ 8132F20 lsls r3, r1, 3 ldr r4, _08132F54 @ =gTasks+0x8 adds r2, r3, r4 - ldr r0, _08132F58 @ =gUnknown_2037AB8 + ldr r0, _08132F58 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2791,7 +2791,7 @@ _08132F4E: bx r0 .align 2, 0 _08132F54: .4byte gTasks+0x8 -_08132F58: .4byte gUnknown_2037AB8 +_08132F58: .4byte gPaletteFade _08132F5C: .4byte sub_8132F60 thumb_func_end sub_8132F20 @@ -2873,7 +2873,7 @@ _08133008: .align 2, 0 _08133020: .4byte 0xffff8405 _08133024: - ldr r0, _0813304C @ =gUnknown_2037AB8 + ldr r0, _0813304C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2895,7 +2895,7 @@ _08133046: strh r1, [r6, 0x12] b _081331EA .align 2, 0 -_0813304C: .4byte gUnknown_2037AB8 +_0813304C: .4byte gPaletteFade _08133050: movs r0, 0x12 ldrsh r1, [r6, r0] @@ -3035,7 +3035,7 @@ _0813315C: .align 2, 0 _0813316C: .4byte gMain _08133170: - ldr r0, _081331F4 @ =gUnknown_2037AB8 + ldr r0, _081331F4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3095,7 +3095,7 @@ _081331EA: strh r0, [r6, 0x10] b _08133232 .align 2, 0 -_081331F4: .4byte gUnknown_2037AB8 +_081331F4: .4byte gPaletteFade _081331F8: .4byte gSaveBlock1Ptr _081331FC: .4byte 0x00000464 _08133200: .4byte gUnknown_203B11C @@ -3103,7 +3103,7 @@ _08133204: .4byte gUnknown_203B10C _08133208: .4byte gUnknown_20375F8 _0813320C: .4byte gUnknown_20371F8 _08133210: - ldr r0, _0813323C @ =gUnknown_2037AB8 + ldr r0, _0813323C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3122,7 +3122,7 @@ _08133232: pop {r0} bx r0 .align 2, 0 -_0813323C: .4byte gUnknown_2037AB8 +_0813323C: .4byte gPaletteFade _08133240: .4byte gUnknown_203B10C thumb_func_end sub_8132F60 diff --git a/asm/trade.s b/asm/trade.s index 8351a9a73..0af3865cc 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -13,7 +13,7 @@ sub_804C600: @ 804C600 bl FreeAllSpritePalettes bl ResetTasks bl ResetPaletteFade - ldr r2, _0804C6F8 @ =gUnknown_2037AB8 + ldr r2, _0804C6F8 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -116,7 +116,7 @@ _0804C6F0: pop {r0} bx r0 .align 2, 0 -_0804C6F8: .4byte gUnknown_2037AB8 +_0804C6F8: .4byte gPaletteFade _0804C6FC: .4byte sub_804D4F8 _0804C700: .4byte gUnknown_841F408 _0804C704: .4byte gUnknown_8261F1C @@ -219,7 +219,7 @@ _0804C7F0: .4byte gUnknown_2031C90 _0804C7F4: .4byte gUnknown_2031C94 _0804C7F8: .4byte gMain _0804C7FC: - ldr r2, _0804C864 @ =gUnknown_2037AB8 + ldr r2, _0804C864 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -267,7 +267,7 @@ _0804C80A: bl sub_80FBB20 b _0804C892 .align 2, 0 -_0804C864: .4byte gUnknown_2037AB8 +_0804C864: .4byte gPaletteFade _0804C868: .4byte gEnemyParty _0804C86C: .4byte gUnknown_3003F64 _0804C870: .4byte gUnknown_202271A @@ -1019,7 +1019,7 @@ _0804CEC2: .align 2, 0 _0804CECC: .4byte gMain _0804CED0: - ldr r0, _0804CF08 @ =gUnknown_2037AB8 + ldr r0, _0804CF08 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1042,7 +1042,7 @@ _0804CEE6: pop {r0} bx r0 .align 2, 0 -_0804CF08: .4byte gUnknown_2037AB8 +_0804CF08: .4byte gPaletteFade _0804CF0C: .4byte sub_804DFF0 _0804CF10: .4byte sub_804D638 thumb_func_end sub_804C728 @@ -1647,7 +1647,7 @@ _0804D41C: _0804D43C: .4byte gUnknown_2031DA8 _0804D440: .4byte gMain _0804D444: - ldr r2, _0804D478 @ =gUnknown_2037AB8 + ldr r2, _0804D478 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -1671,7 +1671,7 @@ _0804D444: adds r1, r3 b _0804D4B4 .align 2, 0 -_0804D478: .4byte gUnknown_2037AB8 +_0804D478: .4byte gPaletteFade _0804D47C: .4byte gMain _0804D480: movs r1, 0x82 @@ -1707,7 +1707,7 @@ _0804D4B4: .align 2, 0 _0804D4BC: .4byte gMain _0804D4C0: - ldr r0, _0804D4F0 @ =gUnknown_2037AB8 + ldr r0, _0804D4F0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1727,7 +1727,7 @@ _0804D4D2: pop {r0} bx r0 .align 2, 0 -_0804D4F0: .4byte gUnknown_2037AB8 +_0804D4F0: .4byte gPaletteFade _0804D4F4: .4byte sub_804D638 thumb_func_end sub_804CF14 @@ -1778,7 +1778,7 @@ _0804D544: .4byte gUnknown_2031DA8 thumb_func_start sub_804D548 sub_804D548: @ 804D548 push {r4,lr} - ldr r0, _0804D580 @ =gUnknown_2037AB8 + ldr r0, _0804D580 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1805,7 +1805,7 @@ sub_804D548: @ 804D548 strb r0, [r1] b _0804D59E .align 2, 0 -_0804D580: .4byte gUnknown_2037AB8 +_0804D580: .4byte gPaletteFade _0804D584: .4byte gUnknown_2031DA4 _0804D588: .4byte gUnknown_2031DA8 _0804D58C: .4byte gUnknown_3003F3C @@ -3669,7 +3669,7 @@ _0804E490: .4byte gMain sub_804E494: @ 804E494 push {r4,lr} sub sp, 0x4 - ldr r0, _0804E4CC @ =gUnknown_2037AB8 + ldr r0, _0804E4CC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3695,7 +3695,7 @@ sub_804E494: @ 804E494 bl sub_81344F8 b _0804E4F8 .align 2, 0 -_0804E4CC: .4byte gUnknown_2037AB8 +_0804E4CC: .4byte gPaletteFade _0804E4D0: .4byte gUnknown_2031DA8 _0804E4D4: .4byte gPlayerParty _0804E4D8: .4byte sub_804CF14 @@ -4247,7 +4247,7 @@ _0804E904: .4byte gSprites thumb_func_start sub_804E908 sub_804E908: @ 804E908 push {lr} - ldr r0, _0804E924 @ =gUnknown_2037AB8 + ldr r0, _0804E924 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4260,7 +4260,7 @@ sub_804E908: @ 804E908 bl sub_800AB9C b _0804E932 .align 2, 0 -_0804E924: .4byte gUnknown_2037AB8 +_0804E924: .4byte gPaletteFade _0804E928: .4byte gUnknown_3003F3C _0804E92C: movs r0, 0xC @@ -7739,7 +7739,7 @@ _08050440: .align 2, 0 _08050448: .4byte gMain _0805044C: - ldr r0, _08050490 @ =gUnknown_2037AB8 + ldr r0, _08050490 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7767,7 +7767,7 @@ _08050472: pop {r0} bx r0 .align 2, 0 -_08050490: .4byte gUnknown_2037AB8 +_08050490: .4byte gPaletteFade _08050494: .4byte gUnknown_3003F3C _08050498: .4byte sub_8053D84 thumb_func_end sub_8050138 @@ -9519,7 +9519,7 @@ _08051598: .align 2, 0 _080515B8: .4byte gUnknown_2031DAC _080515BC: - ldr r0, _080515E8 @ =gUnknown_2037AB8 + ldr r0, _080515E8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9537,7 +9537,7 @@ _080515CC: bl CopyWindowToVram bl _080522A8 .align 2, 0 -_080515E8: .4byte gUnknown_2037AB8 +_080515E8: .4byte gPaletteFade _080515EC: movs r1, 0x1 negs r1, r1 @@ -9548,7 +9548,7 @@ _080515EC: movs r3, 0 bl _080522A4 _080515FE: - ldr r0, _0805161C @ =gUnknown_2037AB8 + ldr r0, _0805161C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9562,7 +9562,7 @@ _0805160E: strh r1, [r0] bl _08052318 .align 2, 0 -_0805161C: .4byte gUnknown_2037AB8 +_0805161C: .4byte gPaletteFade _08051620: ldr r4, _0805163C @ =gUnknown_2031DAC ldr r0, [r4] @@ -9808,7 +9808,7 @@ _08051808: .align 2, 0 _08051828: .4byte gUnknown_2031DAC _0805182C: - ldr r0, _08051870 @ =gUnknown_2037AB8 + ldr r0, _08051870 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9838,7 +9838,7 @@ _0805183C: ldr r1, [r7] bl _080522AC .align 2, 0 -_08051870: .4byte gUnknown_2037AB8 +_08051870: .4byte gPaletteFade _08051874: .4byte gSprites _08051878: movs r1, 0x1 @@ -9874,7 +9874,7 @@ _08051878: _080518BC: .4byte gUnknown_826CE84 _080518C0: .4byte gUnknown_2031DAC _080518C4: - ldr r0, _08051914 @ =gUnknown_2037AB8 + ldr r0, _08051914 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9913,7 +9913,7 @@ _080518E2: strh r1, [r0, 0x26] bl _08052318 .align 2, 0 -_08051914: .4byte gUnknown_2037AB8 +_08051914: .4byte gPaletteFade _08051918: .4byte gUnknown_2031DAC _0805191C: .4byte gSprites _08051920: @@ -10298,7 +10298,7 @@ _08051BF6: .align 2, 0 _08051C38: .4byte gSprites _08051C3C: - ldr r0, _08051CA4 @ =gUnknown_2037AB8 + ldr r0, _08051CA4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10347,7 +10347,7 @@ _08051C4A: bl StartSpriteAnim b _08052318 .align 2, 0 -_08051CA4: .4byte gUnknown_2037AB8 +_08051CA4: .4byte gPaletteFade _08051CA8: .4byte gUnknown_826CE44 _08051CAC: .4byte gUnknown_826CE84 _08051CB0: .4byte gSprites @@ -10365,7 +10365,7 @@ _08051CC4: lsls r1, 5 movs r0, 0 bl SetGpuReg - ldr r0, _08051CE0 @ =gUnknown_2037AB8 + ldr r0, _08051CE0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10375,7 +10375,7 @@ _08051CC4: _08051CDC: b _080522A8 .align 2, 0 -_08051CE0: .4byte gUnknown_2037AB8 +_08051CE0: .4byte gPaletteFade _08051CE4: ldr r2, _08051D30 @ =gSprites ldr r4, [r7] @@ -10635,7 +10635,7 @@ _08051EC4: .align 2, 0 _08051EE0: .4byte gUnknown_2031DAC _08051EE4: - ldr r4, _08051F08 @ =gUnknown_2037AB8 + ldr r4, _08051F08 @ =gPaletteFade ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -10653,9 +10653,9 @@ _08051EF2: strb r0, [r4, 0x8] b _080522A8 .align 2, 0 -_08051F08: .4byte gUnknown_2037AB8 +_08051F08: .4byte gPaletteFade _08051F0C: - ldr r2, _08051F24 @ =gUnknown_2037AB8 + ldr r2, _08051F24 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -10668,13 +10668,13 @@ _08051F0C: movs r3, 0 b _080522A4 .align 2, 0 -_08051F24: .4byte gUnknown_2037AB8 +_08051F24: .4byte gPaletteFade _08051F28: movs r1, 0xA2 lsls r1, 5 movs r0, 0 bl SetGpuReg - ldr r0, _08051F44 @ =gUnknown_2037AB8 + ldr r0, _08051F44 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10684,7 +10684,7 @@ _08051F28: _08051F40: b _080522A8 .align 2, 0 -_08051F44: .4byte gUnknown_2037AB8 +_08051F44: .4byte gPaletteFade _08051F48: ldr r0, _08051FDC @ =gUnknown_826CDE4 movs r2, 0x8 @@ -11107,7 +11107,7 @@ _080522AC: .align 2, 0 _080522B8: .4byte gUnknown_2031DAC _080522BC: - ldr r0, _08052324 @ =gUnknown_2037AB8 + ldr r0, _08052324 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -11149,7 +11149,7 @@ _0805231A: pop {r1} bx r1 .align 2, 0 -_08052324: .4byte gUnknown_2037AB8 +_08052324: .4byte gPaletteFade _08052328: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_8050F3C @@ -11695,7 +11695,7 @@ _08052988: .align 2, 0 _080529A8: .4byte gUnknown_2031DAC _080529AC: - ldr r0, _080529D8 @ =gUnknown_2037AB8 + ldr r0, _080529D8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -11713,7 +11713,7 @@ _080529BC: bl CopyWindowToVram bl _08053704 .align 2, 0 -_080529D8: .4byte gUnknown_2037AB8 +_080529D8: .4byte gPaletteFade _080529DC: movs r1, 0x1 negs r1, r1 @@ -11724,7 +11724,7 @@ _080529DC: movs r3, 0 bl _08053700 _080529EE: - ldr r0, _08052A0C @ =gUnknown_2037AB8 + ldr r0, _08052A0C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -11738,7 +11738,7 @@ _080529FE: strh r1, [r0] bl _08053774 .align 2, 0 -_08052A0C: .4byte gUnknown_2037AB8 +_08052A0C: .4byte gPaletteFade _08052A10: ldr r4, _08052A2C @ =gUnknown_2031DAC ldr r0, [r4] @@ -11994,7 +11994,7 @@ _08052C18: .align 2, 0 _08052C38: .4byte gUnknown_2031DAC _08052C3C: - ldr r0, _08052C80 @ =gUnknown_2037AB8 + ldr r0, _08052C80 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12024,7 +12024,7 @@ _08052C4C: ldr r1, [r7] bl _08053708 .align 2, 0 -_08052C80: .4byte gUnknown_2037AB8 +_08052C80: .4byte gPaletteFade _08052C84: .4byte gSprites _08052C88: movs r1, 0x1 @@ -12060,7 +12060,7 @@ _08052C88: _08052CCC: .4byte gUnknown_826CE84 _08052CD0: .4byte gUnknown_2031DAC _08052CD4: - ldr r0, _08052D24 @ =gUnknown_2037AB8 + ldr r0, _08052D24 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12099,7 +12099,7 @@ _08052CF2: strh r1, [r0, 0x26] bl _08053774 .align 2, 0 -_08052D24: .4byte gUnknown_2037AB8 +_08052D24: .4byte gPaletteFade _08052D28: .4byte gUnknown_2031DAC _08052D2C: .4byte gSprites _08052D30: @@ -12490,7 +12490,7 @@ _08053012: .align 2, 0 _08053054: .4byte gSprites _08053058: - ldr r0, _080530E4 @ =gUnknown_2037AB8 + ldr r0, _080530E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12557,7 +12557,7 @@ _08053066: bl StartSpriteAnim b _08053774 .align 2, 0 -_080530E4: .4byte gUnknown_2037AB8 +_080530E4: .4byte gPaletteFade _080530E8: .4byte gUnknown_826CE44 _080530EC: .4byte gSprites _080530F0: .4byte sub_804FD48 @@ -12576,7 +12576,7 @@ _08053108: lsls r1, 5 movs r0, 0 bl SetGpuReg - ldr r0, _08053124 @ =gUnknown_2037AB8 + ldr r0, _08053124 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12586,7 +12586,7 @@ _08053108: _08053120: b _08053704 .align 2, 0 -_08053124: .4byte gUnknown_2037AB8 +_08053124: .4byte gPaletteFade _08053128: ldr r2, _0805317C @ =gSprites ldr r4, [r7] @@ -12860,7 +12860,7 @@ _08053320: .align 2, 0 _0805333C: .4byte gUnknown_2031DAC _08053340: - ldr r4, _08053364 @ =gUnknown_2037AB8 + ldr r4, _08053364 @ =gPaletteFade ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -12878,9 +12878,9 @@ _0805334E: strb r0, [r4, 0x8] b _08053704 .align 2, 0 -_08053364: .4byte gUnknown_2037AB8 +_08053364: .4byte gPaletteFade _08053368: - ldr r2, _08053380 @ =gUnknown_2037AB8 + ldr r2, _08053380 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -12893,13 +12893,13 @@ _08053368: movs r3, 0 b _08053700 .align 2, 0 -_08053380: .4byte gUnknown_2037AB8 +_08053380: .4byte gPaletteFade _08053384: movs r1, 0xA2 lsls r1, 5 movs r0, 0 bl SetGpuReg - ldr r0, _080533A0 @ =gUnknown_2037AB8 + ldr r0, _080533A0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12909,7 +12909,7 @@ _08053384: _0805339C: b _08053704 .align 2, 0 -_080533A0: .4byte gUnknown_2037AB8 +_080533A0: .4byte gPaletteFade _080533A4: ldr r0, _08053438 @ =gUnknown_826CDE4 movs r2, 0x8 @@ -13332,7 +13332,7 @@ _08053708: .align 2, 0 _08053714: .4byte gUnknown_2031DAC _08053718: - ldr r0, _08053780 @ =gUnknown_2037AB8 + ldr r0, _08053780 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -13374,7 +13374,7 @@ _08053776: pop {r1} bx r1 .align 2, 0 -_08053780: .4byte gUnknown_2037AB8 +_08053780: .4byte gPaletteFade _08053784: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_805232C @@ -14685,7 +14685,7 @@ _080542C4: bl BeginNormalPaletteFade b _08054338 _080542E0: - ldr r0, _080542FC @ =gUnknown_2037AB8 + ldr r0, _080542FC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -14699,7 +14699,7 @@ _080542E0: adds r1, r0 b _08054340 .align 2, 0 -_080542FC: .4byte gUnknown_2037AB8 +_080542FC: .4byte gPaletteFade _08054300: .4byte gMain _08054304: bl IsBGMStopped @@ -14792,7 +14792,7 @@ _080543C0: .4byte sub_80543C4 thumb_func_start sub_80543C4 sub_80543C4: @ 80543C4 push {r4,r5,lr} - ldr r0, _08054430 @ =gUnknown_2037AB8 + ldr r0, _08054430 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -14833,7 +14833,7 @@ _0805441A: pop {r0} bx r0 .align 2, 0 -_08054430: .4byte gUnknown_2037AB8 +_08054430: .4byte gPaletteFade _08054434: .4byte gUnknown_2031DAC _08054438: .4byte gUnknown_3003F3C _0805443C: .4byte gMain @@ -14867,7 +14867,7 @@ sub_8054470: @ 8054470 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0805449C @ =gUnknown_2037AB8 + ldr r0, _0805449C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -14885,7 +14885,7 @@ _08054494: pop {r0} bx r0 .align 2, 0 -_0805449C: .4byte gUnknown_2037AB8 +_0805449C: .4byte gPaletteFade _080544A0: .4byte sub_80505CC _080544A4: .4byte gUnknown_3005020 _080544A8: .4byte sub_807DD24 diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s index 48a4e478f..caec21cff 100644 --- a/asm/union_room_chat.s +++ b/asm/union_room_chat.s @@ -155,7 +155,7 @@ _08128548: _08128550: .4byte sub_81285B4 _08128554: bl UpdatePaletteFade - ldr r0, _081285A0 @ =gUnknown_2037AB8 + ldr r0, _081285A0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -187,7 +187,7 @@ _08128598: pop {r0} bx r0 .align 2, 0 -_081285A0: .4byte gUnknown_2037AB8 +_081285A0: .4byte gPaletteFade _081285A4: .4byte sub_81285CC _081285A8: .4byte sub_81285E8 _081285AC: .4byte gUnknown_203B0E0 @@ -1711,7 +1711,7 @@ _081291C8: .align 2, 0 _081291E4: .4byte gUnknown_203B0E0 _081291E8: - ldr r0, _08129210 @ =gUnknown_2037AB8 + ldr r0, _08129210 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1728,7 +1728,7 @@ _08129206: pop {r0} bx r0 .align 2, 0 -_08129210: .4byte gUnknown_2037AB8 +_08129210: .4byte gPaletteFade _08129214: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_8128FB8 diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s index fc9620900..9ae5acd08 100644 --- a/asm/unk_8147AA8.s +++ b/asm/unk_8147AA8.s @@ -497,7 +497,7 @@ _08147E98: .4byte sub_8147D58 _08147E9C: .4byte gUnknown_203F3D4 _08147EA0: bl UpdatePaletteFade - ldr r0, _08147EC4 @ =gUnknown_2037AB8 + ldr r0, _08147EC4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -515,7 +515,7 @@ _08147EBC: strh r0, [r1, 0x8] b _08147F04 .align 2, 0 -_08147EC4: .4byte gUnknown_2037AB8 +_08147EC4: .4byte gPaletteFade _08147EC8: .4byte gUnknown_203F3D4 _08147ECC: ldr r0, [r2] @@ -2529,7 +2529,7 @@ _08148DC4: ldr r1, [r4] b _08148DFE _08148DEA: - ldr r0, _08148E08 @ =gUnknown_2037AB8 + ldr r0, _08148E08 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2545,7 +2545,7 @@ _08148DFE: strh r0, [r1, 0xA] b _08148E20 .align 2, 0 -_08148E08: .4byte gUnknown_2037AB8 +_08148E08: .4byte gPaletteFade _08148E0C: .4byte gUnknown_203F3D4 _08148E10: ldr r0, _08148E1C @ =gUnknown_3003F64 diff --git a/asm/unk_814BB4C.s b/asm/unk_814BB4C.s index bb11cca7f..1895133dc 100644 --- a/asm/unk_814BB4C.s +++ b/asm/unk_814BB4C.s @@ -89,7 +89,7 @@ sub_814BBB8: @ 814BBB8 lsls r4, 8 ldrb r2, [r1, 0x7] orrs r4, r2 - ldr r5, _0814BC0C @ =gUnknown_2037AB8 + ldr r5, _0814BC0C @ =gPaletteFade ldrb r3, [r5, 0x8] movs r2, 0x7F ands r2, r3 @@ -110,7 +110,7 @@ sub_814BBB8: @ 814BBB8 pop {r1} bx r1 .align 2, 0 -_0814BC0C: .4byte gUnknown_2037AB8 +_0814BC0C: .4byte gPaletteFade thumb_func_end sub_814BBB8 thumb_func_start sub_814BC10 diff --git a/asm/unk_814D5C8.s b/asm/unk_814D5C8.s index 313bf9f78..01a4a08cb 100644 --- a/asm/unk_814D5C8.s +++ b/asm/unk_814D5C8.s @@ -192,14 +192,14 @@ _0814D774: bl sub_814EB38 adds r0, r5, 0 bl sub_814EBB0 - ldr r0, _0814D794 @ =gUnknown_2037AB8 + ldr r0, _0814D794 @ =gPaletteFade ldrb r1, [r0, 0x8] movs r2, 0x80 orrs r1, r2 strb r1, [r0, 0x8] b _0814D878 .align 2, 0 -_0814D794: .4byte gUnknown_2037AB8 +_0814D794: .4byte gPaletteFade _0814D798: ldr r0, _0814D7E4 @ =gUnknown_8EAFEA0 movs r2, 0xC0 @@ -261,7 +261,7 @@ _0814D7F4: .align 2, 0 _0814D82C: .4byte gSpriteCoordOffsetY _0814D830: - ldr r2, _0814D874 @ =gUnknown_2037AB8 + ldr r2, _0814D874 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -289,7 +289,7 @@ _0814D830: movs r0, 0x1 b _0814D880 .align 2, 0 -_0814D874: .4byte gUnknown_2037AB8 +_0814D874: .4byte gPaletteFade _0814D878: ldrb r0, [r5, 0xC] adds r0, 0x1 diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s index cb042d971..a93a5ae2e 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -468,7 +468,7 @@ _08150BA2: _08150BC8: .4byte sub_8152034 _08150BCC: bl UpdatePaletteFade - ldr r0, _08150BE8 @ =gUnknown_2037AB8 + ldr r0, _08150BE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -483,7 +483,7 @@ _08150BE0: strb r0, [r1, 0xC] b _08150BFC .align 2, 0 -_08150BE8: .4byte gUnknown_2037AB8 +_08150BE8: .4byte gPaletteFade _08150BEC: .4byte gUnknown_203F3E0 _08150BF0: adds r0, r1, 0 @@ -1678,7 +1678,7 @@ _08151512: b _0815155E _08151524: bl UpdatePaletteFade - ldr r0, _08151538 @ =gUnknown_2037AB8 + ldr r0, _08151538 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1686,7 +1686,7 @@ _08151524: bne _08151590 b _0815155E .align 2, 0 -_08151538: .4byte gUnknown_2037AB8 +_08151538: .4byte gPaletteFade _0815153C: bl sub_8154274 bl sub_8153ED8 @@ -1828,7 +1828,7 @@ _08151656: b _08151686 _08151676: bl UpdatePaletteFade - ldr r0, _08151694 @ =gUnknown_2037AB8 + ldr r0, _08151694 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1842,7 +1842,7 @@ _08151686: strb r0, [r1, 0x10] b _081516CC .align 2, 0 -_08151694: .4byte gUnknown_2037AB8 +_08151694: .4byte gPaletteFade _08151698: .4byte gUnknown_203F3E0 _0815169C: ldrb r0, [r1, 0x4] diff --git a/asm/wireless_communication_status_screen.s b/asm/wireless_communication_status_screen.s index 5b3186c32..b4aecb9a5 100644 --- a/asm/wireless_communication_status_screen.s +++ b/asm/wireless_communication_status_screen.s @@ -388,7 +388,7 @@ _0814F4D4: bl ShowBg b _0814F618 _0814F4F8: - ldr r0, _0814F510 @ =gUnknown_2037AB8 + ldr r0, _0814F510 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -402,7 +402,7 @@ _0814F506: adds r0, r2 b _0814F622 .align 2, 0 -_0814F510: .4byte gUnknown_2037AB8 +_0814F510: .4byte gPaletteFade _0814F514: ldr r0, _0814F570 @ =gUnknown_3002040 ldr r0, [r0] @@ -541,7 +541,7 @@ _0814F622: .align 2, 0 _0814F62C: .4byte gTasks _0814F630: - ldr r0, _0814F654 @ =gUnknown_2037AB8 + ldr r0, _0814F654 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -559,7 +559,7 @@ _0814F648: pop {r0} bx r0 .align 2, 0 -_0814F654: .4byte gUnknown_2037AB8 +_0814F654: .4byte gPaletteFade _0814F658: .4byte sub_814F32C thumb_func_end sub_814F46C diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 25b7f2d71..4bbc197aa 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -11,6 +11,8 @@ u8 player_get_direction_upper_nybble(void); u8 player_get_x22(void); void sub_808D074(u8); +void sub_805C270(); +void sub_805C780(); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); #endif //GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/map_obj_80688E4.h b/include/map_obj_80688E4.h new file mode 100644 index 000000000..b131a1a54 --- /dev/null +++ b/include/map_obj_80688E4.h @@ -0,0 +1,6 @@ +#ifndef GUARD_MAP_OBJ_80688E4_H +#define GUARD_MAP_OBJ_80688E4_H + +void player_bitmagic(void); + +#endif //GUARD_MAP_OBJ_80688E4_H diff --git a/include/palette.h b/include/palette.h index ffdc0496d..bdd1d1b93 100644 --- a/include/palette.h +++ b/include/palette.h @@ -68,6 +68,6 @@ void BeginHardwarePaletteFade(u8, u8, u8, u8, u8); void BlendPalettes(u32, u8, u16); void BlendPalettesUnfaded(u32, u8, u16); -extern struct PaletteFadeControl gUnknown_2037AB8; +extern struct PaletteFadeControl gPaletteFade; #endif // GUARD_PALETTE_H @@ -1067,7 +1067,6 @@ void CopyBgTilemapBufferToVram(u8 bg) void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u8 height) { - void* srcCopy; u16 destX16; u16 destY16; u16 mode; @@ -1077,26 +1076,30 @@ void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u switch (GetBgType(bg)) { case 0: - srcCopy = src; + { + u16 * srcCopy = src; for (destY16 = destY; destY16 < (destY + height); destY16++) { for (destX16 = destX; destX16 < (destX + width); destX16++) { - ((u16*)sGpuBgConfigs2[bg].tilemap)[((destY16 * 0x20) + destX16)] = *((u16*)srcCopy)++; + ((u16*)sGpuBgConfigs2[bg].tilemap)[((destY16 * 0x20) + destX16)] = *(srcCopy)++; } } break; + } case 1: - srcCopy = src; + { + u8 * srcCopy = src; mode = GetBgMetricAffineMode(bg, 0x1); for (destY16 = destY; destY16 < (destY + height); destY16++) { for (destX16 = destX; destX16 < (destX + width); destX16++) { - ((u8*)sGpuBgConfigs2[bg].tilemap)[((destY16 * mode) + destX16)] = *((u8*)srcCopy)++; + ((u8*)sGpuBgConfigs2[bg].tilemap)[((destY16 * mode) + destX16)] = *(srcCopy)++; } } break; + } } } } diff --git a/src/quest_log.c b/src/quest_log.c index 4cf7e6c95..2c98ca377 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -13,6 +13,8 @@ #include "overworld.h" #include "field_fadetransition.h" #include "field_weather.h" +#include "map_obj_80688E4.h" +#include "field_player_avatar.h" #include "item.h" #include "wild_encounter.h" #include "help_system.h" @@ -39,6 +41,8 @@ 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; @@ -48,6 +52,7 @@ EWRAM_DATA void * gUnknown_203AE04 = NULL; EWRAM_DATA u16 * gUnknown_203AE08 = NULL; EWRAM_DATA void * gUnknown_203AE0C[32] = {NULL}; EWRAM_DATA void (* gUnknown_203AE8C)(void) = 0; +EWRAM_DATA u16 *gUnknown_203AE90 = NULL; EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0}; EWRAM_DATA u16 gUnknown_203AF98 = 0; @@ -82,7 +87,10 @@ void sub_8111D10(void); void sub_8111D90(u8); void sub_8111E20(void); void sub_8111E64(s8); +void sub_8111E84(void); bool8 sub_8111F60(void); +void sub_8111F8C(u8); +void sub_8111FCC(u8); void sub_8112364(void); void sub_8112888(u8); void sub_8112940(u8, struct UnkStruct_203AE98 *, u16); @@ -916,7 +924,7 @@ void sub_81118F4(s8 a0) void sub_8111914(void) { - if (!gUnknown_2037AB8.active) + if (!gPaletteFade.active) { ScriptContext2_Enable(); if (++gUnknown_203ADF8 < 4 && gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000) @@ -985,7 +993,7 @@ void sub_8111A34(u8 taskId) } break; case 1: - if (!gUnknown_2037AB8.active) + if (!gPaletteFade.active) { gUnknown_3005E88 = 0; routine = (void (*)(void)) GetWordTaskArg(taskId, 14); @@ -1158,3 +1166,68 @@ void sub_8111D90(u8 a0) Free(buffer); } } + +void sub_8111E20(void) +{ + ClearWindowTilemap(gUnknown_203ADFE[2]); + FillWindowPixelRect(gUnknown_203ADFE[2], 15, 0, 0, 0xf0, 0x30); + CopyWindowToVram(gUnknown_203ADFE[2], 2); + PutWindowTilemap(gUnknown_203ADFE[1]); + CopyWindowToVram(gUnknown_203ADFE[1], 1); +} + +void sub_8111E64(s8 a0) +{ + fade_screen(1, a0); + gUnknown_203AE8C = sub_8111E84; +} + +void sub_8111E84(void) +{ + if (!gPaletteFade.active) + { + ScriptContext2_Enable(); + for (gUnknown_203ADF8 = gUnknown_203ADF8; gUnknown_203ADF8 < 4; gUnknown_203ADF8++) + { + if (gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000 == 0) + break; + sub_811175C(gUnknown_203ADF8, gUnknown_203AE98); + } + gUnknown_3005E88 = 0; + sub_8111984(); + } +} + +void sub_8111F14(void) +{ + if (gUnknown_203ADFA == 3) + gUnknown_203AE90 = AllocZeroed(0x200 * sizeof(u16)); +} + +void sub_8111F38(u16 a0, u16 a1) +{ + CpuSet(gUnknown_20371F8 + a0, gUnknown_203AE90 + a0, a1); +} + +bool8 sub_8111F60(void) +{ + LoadPalette(stdpal_get(4), 0xF0, 0x20); + sub_8111070(0); + sub_807DF7C(); + CreateTask(sub_8111F8C, 0xFF); + return TRUE; +} + +void sub_8111F8C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + if (ScriptContext2_IsEnabled() != TRUE) + { + player_bitmagic(); + sub_805C270(); + sub_805C780(); + ScriptContext2_Enable(); + task->func = sub_8111FCC; + } +} diff --git a/sym_ewram.txt b/sym_ewram.txt index 3864a27a7..cebe20e4f 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -806,7 +806,7 @@ gUnknown_20377F8: @ 20377F8 gUnknown_20379F8: @ 20379F8 .space 0xC0 -gUnknown_2037AB8: @ 2037AB8 +gPaletteFade: @ 2037AB8 .space 0x10 gUnknown_2037AC8: @ 2037AC8 |