diff options
Diffstat (limited to 'asm/party_menu.s')
-rw-r--r-- | asm/party_menu.s | 162 |
1 files changed, 81 insertions, 81 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s index 411fbb92a..d9504245a 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 @@ -681,7 +681,7 @@ _0811EFD4: lsls r2, 1 movs r1, 0 bl LoadCompressedPalette - ldr r0, _0811EFF8 @ =gUnknown_20371F8 + ldr r0, _0811EFF8 @ =gPlttBufferUnfaded ldr r4, _0811EFFC @ =gUnknown_203B09C ldr r1, [r4] adds r1, 0x18 @@ -691,7 +691,7 @@ _0811EFD4: b _0811F01A .align 2, 0 _0811EFF4: .4byte gUnknown_8E829C8 -_0811EFF8: .4byte gUnknown_20371F8 +_0811EFF8: .4byte gPlttBufferUnfaded _0811EFFC: .4byte gUnknown_203B09C _0811F000: movs r0, 0x4 @@ -739,7 +739,7 @@ sub_811F03C: @ 811F03C push {r4,r5,lr} adds r4, r0, 0 lsls r4, 28 - ldr r5, _0811F068 @ =gUnknown_2037258 + ldr r5, _0811F068 @ =gPlttBufferUnfaded + 0x60 lsrs r4, 23 adds r1, r5, 0 subs r1, 0x60 @@ -747,7 +747,7 @@ sub_811F03C: @ 811F03C adds r0, r5, 0 movs r2, 0x10 bl CpuSet - ldr r0, _0811F06C @ =gUnknown_20375F8 + ldr r0, _0811F06C @ =gPlttBufferFaded adds r4, r0 adds r0, r5, 0 adds r1, r4, 0 @@ -757,8 +757,8 @@ sub_811F03C: @ 811F03C pop {r0} bx r0 .align 2, 0 -_0811F068: .4byte gUnknown_2037258 -_0811F06C: .4byte gUnknown_20375F8 +_0811F068: .4byte gPlttBufferUnfaded + 0x60 +_0811F06C: .4byte gPlttBufferFaded thumb_func_end sub_811F03C thumb_func_start sub_811F070 @@ -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 @@ -12100,7 +12100,7 @@ sub_8124998: @ 8124998 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsSemiDeepWater @@ -12163,7 +12163,7 @@ _08124A24: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsSemiDeepWater @@ -12276,7 +12276,7 @@ hm_prepare_waterfall: @ 8124AF8 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsWaterfall @@ -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 @@ -13647,7 +13647,7 @@ _08125620: movs r0, 0xD adds r2, r5, 0 muls r2, r0 - ldr r0, _081256BC @ =gUnknown_8247094 + ldr r0, _081256BC @ =gMoveNames adds r2, r0 lsls r0, r6, 4 adds r0, 0x2 @@ -13697,7 +13697,7 @@ _08125680: bx r0 .align 2, 0 _081256B8: .4byte gPlayerParty -_081256BC: .4byte gUnknown_8247094 +_081256BC: .4byte gMoveNames thumb_func_end sub_81255F0 thumb_func_start sub_81256C0 @@ -13974,7 +13974,7 @@ sub_8125898: @ 8125898 ldr r2, _08125944 @ =gStringVar1 movs r1, 0xD muls r1, r0 - ldr r0, _08125948 @ =gUnknown_8247094 + ldr r0, _08125948 @ =gMoveNames adds r1, r0 adds r0, r2, 0 bl StringCopy @@ -14005,7 +14005,7 @@ _08125938: .4byte gUnknown_203AD30 _0812593C: .4byte gUnknown_203B0C0 _08125940: .4byte 0x0000ffff _08125944: .4byte gStringVar1 -_08125948: .4byte gUnknown_8247094 +_08125948: .4byte gMoveNames _0812594C: .4byte gStringVar4 _08125950: .4byte gTasks _08125954: .4byte sub_81255BC @@ -14076,7 +14076,7 @@ _081259A0: ldr r0, _08125A28 @ =gStringVar1 movs r1, 0xD muls r1, r4 - ldr r2, _08125A2C @ =gUnknown_8247094 + ldr r2, _08125A2C @ =gMoveNames adds r1, r2 bl StringCopy adds r0, r5, 0 @@ -14104,7 +14104,7 @@ _08125A1C: .4byte gUnknown_203B0C0 _08125A20: .4byte gPlayerParty _08125A24: .4byte 0x0000ffff _08125A28: .4byte gStringVar1 -_08125A2C: .4byte gUnknown_8247094 +_08125A2C: .4byte gMoveNames _08125A30: .4byte gStringVar4 _08125A34: .4byte gTasks _08125A38: .4byte sub_81255BC @@ -14288,7 +14288,7 @@ sub_8125B40: @ 8125B40 ldrsh r2, [r7, r1] movs r1, 0xD muls r1, r2 - ldr r2, _08125BE4 @ =gUnknown_8247094 + ldr r2, _08125BE4 @ =gMoveNames adds r1, r2 bl StringCopy movs r0, 0 @@ -14328,7 +14328,7 @@ _08125BD4: .4byte gPlayerParty _08125BD8: .4byte gUnknown_203AD30 _08125BDC: .4byte gStringVar1 _08125BE0: .4byte gStringVar2 -_08125BE4: .4byte gUnknown_8247094 +_08125BE4: .4byte gMoveNames _08125BE8: .4byte 0x0000ffff _08125BEC: .4byte gUnknown_3005E98 _08125BF0: .4byte sub_8125C38 @@ -14416,7 +14416,7 @@ _08125C84: ldrsh r2, [r6, r1] movs r1, 0xD muls r1, r2 - ldr r2, _08125CE0 @ =gUnknown_8247094 + ldr r2, _08125CE0 @ =gMoveNames adds r1, r2 bl StringCopy ldr r4, _08125CE4 @ =gStringVar4 @@ -14444,7 +14444,7 @@ _08125CD0: .4byte gPlayerParty _08125CD4: .4byte gUnknown_203AD30 _08125CD8: .4byte gStringVar1 _08125CDC: .4byte gStringVar2 -_08125CE0: .4byte gUnknown_8247094 +_08125CE0: .4byte gMoveNames _08125CE4: .4byte gStringVar4 _08125CE8: .4byte gUnknown_8416DB3 _08125CEC: .4byte gTasks @@ -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 @@ -14806,7 +14806,7 @@ sub_8125F5C: @ 8125F5C ldr r0, _08125FF4 @ =gStringVar2 movs r1, 0xD muls r1, r4 - ldr r2, _08125FF8 @ =gUnknown_8247094 + ldr r2, _08125FF8 @ =gMoveNames adds r1, r2 bl StringCopy adds r0, r6, 0 @@ -14831,7 +14831,7 @@ _08125FE8: .4byte gPlayerParty _08125FEC: .4byte gUnknown_203AD30 _08125FF0: .4byte gStringVar1 _08125FF4: .4byte gStringVar2 -_08125FF8: .4byte gUnknown_8247094 +_08125FF8: .4byte gMoveNames thumb_func_end sub_8125F5C thumb_func_start sub_8125FFC @@ -14864,7 +14864,7 @@ sub_8125FFC: @ 8125FFC ldr r0, _08126068 @ =gStringVar2 movs r1, 0xD muls r1, r4 - ldr r2, _0812606C @ =gUnknown_8247094 + ldr r2, _0812606C @ =gMoveNames adds r1, r2 bl StringCopy ldr r0, _08126070 @ =gUnknown_8416EC6 @@ -14884,7 +14884,7 @@ _0812605C: .4byte gUnknown_203B0A0 _08126060: .4byte gPlayerParty _08126064: .4byte gStringVar1 _08126068: .4byte gStringVar2 -_0812606C: .4byte gUnknown_8247094 +_0812606C: .4byte gMoveNames _08126070: .4byte gUnknown_8416EC6 _08126074: .4byte gTasks _08126078: .4byte sub_812607C @@ -14945,7 +14945,7 @@ sub_81260D8: @ 81260D8 ldrsh r2, [r1, r3] movs r1, 0xD muls r1, r2 - ldr r2, _08126128 @ =gUnknown_8247094 + ldr r2, _08126128 @ =gMoveNames adds r1, r2 bl StringCopy ldr r4, _0812612C @ =gStringVar4 @@ -14970,7 +14970,7 @@ sub_81260D8: @ 81260D8 .align 2, 0 _08126120: .4byte gStringVar2 _08126124: .4byte gUnknown_203B0A0 -_08126128: .4byte gUnknown_8247094 +_08126128: .4byte gMoveNames _0812612C: .4byte gStringVar4 _08126130: .4byte gUnknown_8416E6B _08126134: .4byte gTasks @@ -15044,7 +15044,7 @@ _081261AE: ldrsh r2, [r7, r1] movs r1, 0xD muls r1, r2 - ldr r2, _081261FC @ =gUnknown_8247094 + ldr r2, _081261FC @ =gMoveNames adds r1, r2 bl StringCopy ldr r4, _08126200 @ =gStringVar4 @@ -15069,7 +15069,7 @@ _081261AE: .align 2, 0 _081261F4: .4byte gStringVar1 _081261F8: .4byte gStringVar2 -_081261FC: .4byte gUnknown_8247094 +_081261FC: .4byte gMoveNames _08126200: .4byte gStringVar4 _08126204: .4byte gUnknown_8416E84 _08126208: .4byte gTasks @@ -15105,7 +15105,7 @@ _0812623A: ldrsh r2, [r1, r3] movs r1, 0xD muls r1, r2 - ldr r2, _0812627C @ =gUnknown_8247094 + ldr r2, _0812627C @ =gMoveNames adds r1, r2 bl StringCopy ldr r0, _08126280 @ =gUnknown_8416DF7 @@ -15125,7 +15125,7 @@ _0812626A: _08126270: .4byte gStringVar1 _08126274: .4byte gStringVar2 _08126278: .4byte gUnknown_203B0A0 -_0812627C: .4byte gUnknown_8247094 +_0812627C: .4byte gMoveNames _08126280: .4byte gUnknown_8416DF7 _08126284: .4byte gTasks _08126288: .4byte sub_8125D88 @@ -15754,7 +15754,7 @@ sub_8126770: @ 8126770 ldrh r2, [r6] movs r1, 0xD muls r1, r2 - ldr r2, _081267F0 @ =gUnknown_8247094 + ldr r2, _081267F0 @ =gMoveNames adds r1, r2 bl StringCopy ldr r4, _081267F4 @ =gStringVar4 @@ -15787,7 +15787,7 @@ _081267E0: .4byte gPlayerParty _081267E4: .4byte gStringVar1 _081267E8: .4byte gStringVar2 _081267EC: .4byte gMoveToLearn -_081267F0: .4byte gUnknown_8247094 +_081267F0: .4byte gMoveNames _081267F4: .4byte gStringVar4 _081267F8: .4byte gUnknown_8416DF7 _081267FC: .4byte gTasks @@ -15818,7 +15818,7 @@ sub_8126804: @ 8126804 ldr r0, _0812687C @ =gStringVar2 movs r1, 0xD muls r1, r5 - ldr r2, _08126880 @ =gUnknown_8247094 + ldr r2, _08126880 @ =gMoveNames adds r1, r2 bl StringCopy ldr r4, _08126884 @ =gStringVar4 @@ -15849,7 +15849,7 @@ _08126870: .4byte gUnknown_203B0A0 _08126874: .4byte gPlayerParty _08126878: .4byte gStringVar1 _0812687C: .4byte gStringVar2 -_08126880: .4byte gUnknown_8247094 +_08126880: .4byte gMoveNames _08126884: .4byte gStringVar4 _08126888: .4byte gUnknown_8416DB3 _0812688C: .4byte gTasks @@ -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 @@ -16556,7 +16556,7 @@ sub_8126DC8: @ 8126DC8 ldrsh r2, [r7, r1] movs r1, 0xD muls r1, r2 - ldr r2, _08126E64 @ =gUnknown_8247094 + ldr r2, _08126E64 @ =gMoveNames adds r1, r2 bl StringCopy movs r0, 0x2 @@ -16583,13 +16583,13 @@ 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 _08126E5C: .4byte gSpecialVar_0x8005 _08126E60: .4byte gStringVar2 -_08126E64: .4byte gUnknown_8247094 +_08126E64: .4byte gMoveNames _08126E68: .4byte 0xffff0000 _08126E6C: ldr r1, _08126E70 @ =gUnknown_8416DC2 @@ -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 |