diff options
Diffstat (limited to 'asm')
139 files changed, 3596 insertions, 26820 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index e93a714eb..72f5fe901 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -228,7 +228,7 @@ sub_800F380: @ 800F380 movs r1, 0x22 movs r2, 0x10 bl sub_815001C - ldr r4, _0800F3F0 @ =gUnknown_20371F8 + ldr r4, _0800F3F0 @ =gPlttBufferUnfaded adds r0, r4, 0 adds r0, 0xB8 ldr r1, _0800F3F4 @ =0x00002529 @@ -242,7 +242,7 @@ sub_800F380: @ 800F380 adds r2, 0x2 ldr r1, _0800F3FC @ =0x0000675a strh r1, [r2] - ldr r5, _0800F400 @ =gUnknown_20376B0 + ldr r5, _0800F400 @ =gPlttBufferFaded + 0xB8 adds r1, r5, 0 movs r2, 0x4 bl CpuSet @@ -271,11 +271,11 @@ _0800F3EA: pop {r0} bx r0 .align 2, 0 -_0800F3F0: .4byte gUnknown_20371F8 +_0800F3F0: .4byte gPlttBufferUnfaded _0800F3F4: .4byte 0x00002529 _0800F3F8: .4byte 0x00007fff _0800F3FC: .4byte 0x0000675a -_0800F400: .4byte gUnknown_20376B0 +_0800F400: .4byte gPlttBufferFaded + 0xB8 _0800F404: .4byte gBattleTypeFlags _0800F408: .4byte 0x00010010 thumb_func_end sub_800F380 @@ -298,7 +298,7 @@ LoadBattleTextboxAndBackground: @ 800F420 movs r1, 0xC0 lsls r1, 19 bl LZDecompressVram - ldr r1, _0800F458 @ =gUnknown_8D0051C + ldr r1, _0800F458 @ =gFile_graphics_interface_menu_map_tilemap movs r0, 0 movs r2, 0 movs r3, 0 @@ -315,7 +315,7 @@ LoadBattleTextboxAndBackground: @ 800F420 bx r0 .align 2, 0 _0800F454: .4byte gUnknown_8D00000 -_0800F458: .4byte gUnknown_8D0051C +_0800F458: .4byte gFile_graphics_interface_menu_map_tilemap _0800F45C: .4byte gUnknown_8D004D8 thumb_func_end LoadBattleTextboxAndBackground @@ -703,7 +703,7 @@ _0800F734: movs r5, 0 movs r6, 0x3 _0800F744: - ldr r0, _0800F760 @ =gUnknown_2022744 + ldr r0, _0800F760 @ =gLinkPlayers + 8 adds r1, r5, r0 subs r0, 0x8 adds r4, r5, r0 @@ -717,7 +717,7 @@ _0800F744: b _0800F7C2 .align 2, 0 _0800F75C: .4byte gBattleTypeFlags -_0800F760: .4byte gUnknown_2022744 +_0800F760: .4byte gLinkPlayers + 8 _0800F764: cmp r0, 0x2 beq _0800F790 @@ -838,12 +838,12 @@ _0800F850: ldr r0, _0800F8CC @ =0x00002710 bl AllocSpritePalette lsls r0, 24 - ldr r2, _0800F8D0 @ =gUnknown_20371F8 + ldr r2, _0800F8D0 @ =gPlttBufferUnfaded lsrs r0, 19 ldr r3, _0800F8D4 @ =0x0000021e adds r0, r3 adds r2, r0, r2 - ldr r1, _0800F8D8 @ =gUnknown_20375F8 + ldr r1, _0800F8D8 @ =gPlttBufferFaded adds r0, r1 ldr r1, _0800F8DC @ =0x00007fff strh r1, [r0] @@ -895,9 +895,9 @@ _0800F850: b _0800FAC4 .align 2, 0 _0800F8CC: .4byte 0x00002710 -_0800F8D0: .4byte gUnknown_20371F8 +_0800F8D0: .4byte gPlttBufferUnfaded _0800F8D4: .4byte 0x0000021e -_0800F8D8: .4byte gUnknown_20375F8 +_0800F8D8: .4byte gPlttBufferFaded _0800F8DC: .4byte 0x00007fff _0800F8E0: .4byte gUnknown_82482E8 _0800F8E4: .4byte gBattleStruct @@ -1152,13 +1152,13 @@ sub_800FAE0: @ 800FAE0 ands r0, r1 cmp r0, 0 beq _0800FB94 - ldr r0, _0800FB68 @ =gUnknown_8E7737C + ldr r0, _0800FB68 @ =gFile_graphics_battle_transitions_vs_frame_sheet ldr r1, _0800FB6C @ =0x06004000 bl LZDecompressVram - ldr r0, _0800FB70 @ =gUnknown_8E77598 + ldr r0, _0800FB70 @ =gFile_graphics_battle_transitions_vs_sheet ldr r1, _0800FB74 @ =0x06010000 bl LZDecompressVram - ldr r0, _0800FB78 @ =gUnknown_8E77570 + ldr r0, _0800FB78 @ =gFile_graphics_battle_transitions_vs_frame_palette movs r1, 0x60 movs r2, 0x20 bl LoadCompressedPalette @@ -1169,7 +1169,7 @@ sub_800FAE0: @ 800FAE0 ldr r1, _0800FB7C @ =0x00005c04 movs r0, 0xA bl SetGpuReg - ldr r4, _0800FB80 @ =gUnknown_8E77464 + ldr r4, _0800FB80 @ =gFile_graphics_battle_transitions_vs_frame_tilemap movs r0, 0x1 adds r1, r4, 0 movs r2, 0 @@ -1201,13 +1201,13 @@ sub_800FAE0: @ 800FAE0 b _0800FC26 .align 2, 0 _0800FB64: .4byte gBattleTypeFlags -_0800FB68: .4byte gUnknown_8E7737C +_0800FB68: .4byte gFile_graphics_battle_transitions_vs_frame_sheet _0800FB6C: .4byte 0x06004000 -_0800FB70: .4byte gUnknown_8E77598 +_0800FB70: .4byte gFile_graphics_battle_transitions_vs_sheet _0800FB74: .4byte 0x06010000 -_0800FB78: .4byte gUnknown_8E77570 +_0800FB78: .4byte gFile_graphics_battle_transitions_vs_frame_palette _0800FB7C: .4byte 0x00005c04 -_0800FB80: .4byte gUnknown_8E77464 +_0800FB80: .4byte gFile_graphics_battle_transitions_vs_frame_tilemap _0800FB84: .4byte gUnknown_202297A _0800FB88: .4byte 0x0000ff5c _0800FB8C: .4byte gUnknown_202297E @@ -1393,7 +1393,7 @@ _0800FCEC: .align 2, 0 _0800FCF8: .4byte gUnknown_8D00000 _0800FCFC: - ldr r1, _0800FD10 @ =gUnknown_8D0051C + ldr r1, _0800FD10 @ =gFile_graphics_interface_menu_map_tilemap movs r0, 0 movs r2, 0 movs r3, 0 @@ -1402,7 +1402,7 @@ _0800FCFC: bl CopyBgTilemapBufferToVram b _0800FD94 .align 2, 0 -_0800FD10: .4byte gUnknown_8D0051C +_0800FD10: .4byte gFile_graphics_interface_menu_map_tilemap _0800FD14: ldr r0, _0800FD20 @ =gUnknown_8D004D8 movs r1, 0 diff --git a/asm/battle_2.s b/asm/battle_2.s index 8abec7a86..1ecfe6ad3 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -638,7 +638,7 @@ _080102C0: mov r8, r4 _080102D8: lsls r0, r5, 8 - ldr r1, _08010348 @ =gUnknown_202211C + ldr r1, _08010348 @ =gBlockRecvBuffer + 4 adds r7, r0, r1 lsls r0, r5, 3 subs r0, r5 @@ -694,14 +694,14 @@ _0801031C: .align 2, 0 _08010340: .4byte gEnigmaBerries _08010344: .4byte gLinkPlayers -_08010348: .4byte gUnknown_202211C +_08010348: .4byte gBlockRecvBuffer + 4 _0801034C: movs r5, 0 ldr r4, _0801040C @ =gEnigmaBerries mov r9, r4 _08010352: lsls r0, r5, 8 - ldr r1, _08010410 @ =gUnknown_202211C + ldr r1, _08010410 @ =gBlockRecvBuffer + 4 adds r7, r0, r1 movs r4, 0 adds r2, r5, 0x1 @@ -797,7 +797,7 @@ _080103FC: bx r0 .align 2, 0 _0801040C: .4byte gEnigmaBerries -_08010410: .4byte gUnknown_202211C +_08010410: .4byte gBlockRecvBuffer + 4 thumb_func_end sub_801017C thumb_func_start sub_8010414 @@ -810,7 +810,7 @@ sub_8010414: @ 8010414 lsls r1, 24 lsrs r3, r1, 24 movs r6, 0 - ldr r0, _08010440 @ =gUnknown_2022118 + ldr r0, _08010440 @ =gBlockRecvBuffer ldrh r2, [r0] movs r1, 0x80 lsls r1, 1 @@ -824,7 +824,7 @@ sub_8010414: @ 8010414 movs r2, 0xC b _0801044E .align 2, 0 -_08010440: .4byte gUnknown_2022118 +_08010440: .4byte gBlockRecvBuffer _08010444: .4byte gBattleTypeFlags _08010448: ldr r0, _0801048C @ =gBattleTypeFlags @@ -842,7 +842,7 @@ _08010458: movs r2, 0 cmp r2, r4 bge _0801047C - ldr r1, _08010490 @ =gUnknown_2022118 + ldr r1, _08010490 @ =gBlockRecvBuffer mov r8, r1 movs r5, 0x80 lsls r5, 1 @@ -867,7 +867,7 @@ _0801047C: b _0801049A .align 2, 0 _0801048C: .4byte gBattleTypeFlags -_08010490: .4byte gUnknown_2022118 +_08010490: .4byte gBlockRecvBuffer _08010494: ldr r0, _080104EC @ =gBattleTypeFlags ldr r1, [r0] @@ -1004,7 +1004,7 @@ _08010590: movs r0, 0x1 strb r0, [r1] _080105BC: - ldr r0, _080105D0 @ =gUnknown_3003F3C + ldr r0, _080105D0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _080105C6 @@ -1014,7 +1014,7 @@ _080105C6: b _080108B8 .align 2, 0 _080105CC: .4byte gUnknown_2023E82 -_080105D0: .4byte gUnknown_3003F3C +_080105D0: .4byte gWirelessCommType _080105D4: ldr r2, _08010640 @ =gBattleTypeFlags ldr r1, [r2] @@ -1023,7 +1023,7 @@ _080105D4: ands r0, r6 cmp r0, 0 beq _08010658 - ldr r0, _08010644 @ =gUnknown_3003F64 + ldr r0, _08010644 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _080105EC @@ -1056,7 +1056,7 @@ _080105EC: ldr r0, _08010650 @ =gUnknown_2023E82 strb r6, [r0] _0801062A: - ldr r0, _08010654 @ =gUnknown_3003F3C + ldr r0, _08010654 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _08010634 @@ -1068,11 +1068,11 @@ _08010634: b _080108B8 .align 2, 0 _08010640: .4byte gBattleTypeFlags -_08010644: .4byte gUnknown_3003F64 +_08010644: .4byte gReceivedRemoteLinkPlayers _08010648: .4byte gBattleStruct _0801064C: .4byte 0x00000185 _08010650: .4byte gUnknown_2023E82 -_08010654: .4byte gUnknown_3003F3C +_08010654: .4byte gWirelessCommType _08010658: movs r0, 0x4 orrs r1, r0 @@ -1126,7 +1126,7 @@ _0801067E: lsls r0, 8 orrs r1, r0 strh r1, [r2, 0xE] - ldr r0, _080106EC @ =gUnknown_2022118 + ldr r0, _080106EC @ =gBlockRecvBuffer lsls r1, r5, 8 adds r0, 0x2 adds r1, r0 @@ -1139,7 +1139,7 @@ _0801067E: _080106E0: .4byte sub_800F6FC _080106E4: .4byte gTasks _080106E8: .4byte gBattleStruct -_080106EC: .4byte gUnknown_2022118 +_080106EC: .4byte gBlockRecvBuffer _080106F0: .4byte gUnknown_2023E82 _080106F4: bl sub_800A4BC @@ -1170,7 +1170,7 @@ _0801072A: bl ResetBlockReceivedFlags ldr r0, _08010740 @ =gEnemyParty lsls r1, r5, 8 - ldr r2, _08010744 @ =gUnknown_2022118 + ldr r2, _08010744 @ =gBlockRecvBuffer adds r1, r2 movs r2, 0xC8 bl memcpy @@ -1178,7 +1178,7 @@ _0801072A: b _080108B2 .align 2, 0 _08010740: .4byte gEnemyParty -_08010744: .4byte gUnknown_2022118 +_08010744: .4byte gBlockRecvBuffer _08010748: .4byte gUnknown_2023E82 _0801074C: bl sub_800A4BC @@ -1209,7 +1209,7 @@ _08010782: bl ResetBlockReceivedFlags ldr r0, _08010798 @ =gUnknown_20240F4 lsls r1, r5, 8 - ldr r2, _0801079C @ =gUnknown_2022118 + ldr r2, _0801079C @ =gBlockRecvBuffer adds r1, r2 movs r2, 0xC8 bl memcpy @@ -1217,7 +1217,7 @@ _08010782: b _080108B2 .align 2, 0 _08010798: .4byte gUnknown_20240F4 -_0801079C: .4byte gUnknown_2022118 +_0801079C: .4byte gBlockRecvBuffer _080107A0: .4byte gUnknown_2023E82 _080107A4: bl sub_800A4BC @@ -1246,7 +1246,7 @@ _080107CC: bl ResetBlockReceivedFlags ldr r4, _08010820 @ =gUnknown_20241BC lsls r1, r5, 8 - ldr r0, _08010824 @ =gUnknown_2022118 + ldr r0, _08010824 @ =gBlockRecvBuffer adds r1, r0 adds r0, r4, 0 movs r2, 0xC8 @@ -1272,7 +1272,7 @@ _080107CC: b _080108B2 .align 2, 0 _08010820: .4byte gUnknown_20241BC -_08010824: .4byte gUnknown_2022118 +_08010824: .4byte gBlockRecvBuffer _08010828: .4byte 0xfffffe70 _0801082C: .4byte 0xfffffed4 _08010830: .4byte gUnknown_2023E82 @@ -1515,7 +1515,7 @@ _08010A14: _08010A1E: b _08010B82 _08010A20: - ldr r0, _08010A58 @ =gUnknown_3003F64 + ldr r0, _08010A58 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08010A2A @@ -1542,7 +1542,7 @@ _08010A36: strb r0, [r5] b _08010B82 .align 2, 0 -_08010A58: .4byte gUnknown_3003F64 +_08010A58: .4byte gReceivedRemoteLinkPlayers _08010A5C: bl GetBlockReceivedStatus movs r1, 0xF @@ -1586,7 +1586,7 @@ _08010AA0: beq _08010ABA _08010AAC: lsls r1, r4, 8 - ldr r0, _08010AE4 @ =gUnknown_2022118 + ldr r0, _08010AE4 @ =gBlockRecvBuffer adds r1, r0 ldr r0, _08010AE8 @ =gUnknown_2022B58 movs r2, 0x60 @@ -1613,14 +1613,14 @@ _08010ABA: bl sub_8128198 b _08010B82 .align 2, 0 -_08010AE4: .4byte gUnknown_2022118 +_08010AE4: .4byte gBlockRecvBuffer _08010AE8: .4byte gUnknown_2022B58 _08010AEC: .4byte gUnknown_2023E82 _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 @@ -1628,20 +1628,20 @@ _08010AFC: bne _08010B82 movs r0, 0x3 strb r0, [r5] - ldr r0, _08010B20 @ =gUnknown_3003F3C + ldr r0, _08010B20 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08010B24 bl sub_800AB9C b _08010B82 .align 2, 0 -_08010B1C: .4byte gUnknown_2037AB8 -_08010B20: .4byte gUnknown_3003F3C +_08010B1C: .4byte gPaletteFade +_08010B20: .4byte gWirelessCommType _08010B24: bl sub_800AAC0 b _08010B82 _08010B2A: - ldr r0, _08010B54 @ =gUnknown_3003F3C + ldr r0, _08010B54 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08010B64 @@ -1661,12 +1661,12 @@ _08010B2A: bl SetMainCallback2 b _08010B82 .align 2, 0 -_08010B54: .4byte gUnknown_3003F3C +_08010B54: .4byte gWirelessCommType _08010B58: .4byte gBattleTypeFlags _08010B5C: .4byte gMain _08010B60: .4byte sub_800FE24 _08010B64: - ldr r0, _08010B90 @ =gUnknown_3003F64 + ldr r0, _08010B90 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08010B82 @@ -1688,7 +1688,7 @@ _08010B82: pop {r0} bx r0 .align 2, 0 -_08010B90: .4byte gUnknown_3003F64 +_08010B90: .4byte gReceivedRemoteLinkPlayers _08010B94: .4byte gBattleTypeFlags _08010B98: .4byte gMain _08010B9C: .4byte sub_800FE24 @@ -1757,7 +1757,7 @@ _08010C18: movs r0, 0x1 strb r0, [r1] _08010C44: - ldr r0, _08010C58 @ =gUnknown_3003F3C + ldr r0, _08010C58 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _08010C4E @@ -1767,9 +1767,9 @@ _08010C4E: b _080110F0 .align 2, 0 _08010C54: .4byte gUnknown_2023E82 -_08010C58: .4byte gUnknown_3003F3C +_08010C58: .4byte gWirelessCommType _08010C5C: - ldr r0, _08010CC0 @ =gUnknown_3003F64 + ldr r0, _08010CC0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08010C66 @@ -1805,7 +1805,7 @@ _08010C66: adds r0, 0x1 strb r0, [r1] _08010CAA: - ldr r0, _08010CD0 @ =gUnknown_3003F3C + ldr r0, _08010CD0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _08010CB4 @@ -1816,11 +1816,11 @@ _08010CB4: bl sub_80FCD74 b _080110F0 .align 2, 0 -_08010CC0: .4byte gUnknown_3003F64 +_08010CC0: .4byte gReceivedRemoteLinkPlayers _08010CC4: .4byte gBattleStruct _08010CC8: .4byte 0x00000185 _08010CCC: .4byte gUnknown_2023E82 -_08010CD0: .4byte gUnknown_3003F3C +_08010CD0: .4byte gWirelessCommType _08010CD4: bl GetBlockReceivedStatus movs r1, 0xF @@ -1860,7 +1860,7 @@ _08010CE2: strh r2, [r1, 0xE] strh r2, [r1, 0x10] adds r2, r1, 0 - ldr r0, _08010D5C @ =gUnknown_2022118 + ldr r0, _08010D5C @ =gBlockRecvBuffer adds r3, r0, 0x2 ldr r5, _08010D60 @ =gLinkPlayers movs r4, 0x3F @@ -1881,7 +1881,7 @@ _08010D4C: .4byte gDecompressionBuffer _08010D50: .4byte gPlayerParty _08010D54: .4byte sub_800F6FC _08010D58: .4byte gTasks -_08010D5C: .4byte gUnknown_2022118 +_08010D5C: .4byte gBlockRecvBuffer _08010D60: .4byte gLinkPlayers _08010D64: cmp r0, 0x2 @@ -1962,7 +1962,7 @@ _08010DEE: subs r0, r7 lsls r0, 2 mov r8, r0 - ldr r4, _08010E18 @ =gUnknown_2022118 + ldr r4, _08010E18 @ =gBlockRecvBuffer movs r5, 0 _08010E00: cmp r6, r7 @@ -1978,7 +1978,7 @@ _08010E00: beq _08010E24 b _08010EBE .align 2, 0 -_08010E18: .4byte gUnknown_2022118 +_08010E18: .4byte gBlockRecvBuffer _08010E1C: .4byte gLinkPlayers _08010E20: cmp r0, 0x3 @@ -2115,7 +2115,7 @@ _08010F0E: subs r0, r7 lsls r0, 2 mov r8, r0 - ldr r4, _08010F38 @ =gUnknown_2022118 + ldr r4, _08010F38 @ =gBlockRecvBuffer movs r5, 0 _08010F20: cmp r6, r7 @@ -2131,7 +2131,7 @@ _08010F20: beq _08010F44 b _08010FDE .align 2, 0 -_08010F38: .4byte gUnknown_2022118 +_08010F38: .4byte gBlockRecvBuffer _08010F3C: .4byte gLinkPlayers _08010F40: cmp r0, 0x3 @@ -2375,7 +2375,7 @@ sub_8011100: @ 8011100 ands r0, r1 cmp r0, 0 beq _08011158 - ldr r2, _08011168 @ =gUnknown_20370D0 + ldr r2, _08011168 @ =gSpecialVar_Result ldr r1, _0801116C @ =gUnknown_2023E8A movs r0, 0x3 strb r0, [r1] @@ -2398,7 +2398,7 @@ _08011158: .align 2, 0 _08011160: .4byte gMain _08011164: .4byte gBattleTypeFlags -_08011168: .4byte gUnknown_20370D0 +_08011168: .4byte gSpecialVar_Result _0801116C: .4byte gUnknown_2023E8A _08011170: .4byte CB2_QuitRecordedBattle thumb_func_end sub_8011100 @@ -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 @@ -11647,12 +11647,12 @@ _08015B74: ands r0, r5 cmp r0, 0 beq _08015B86 - ldr r0, _08015BE4 @ =gUnknown_3003F64 + ldr r0, _08015BE4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08015BD4 _08015B86: - ldr r1, _08015BE8 @ =gUnknown_20370D0 + ldr r1, _08015BE8 @ =gSpecialVar_Result ldr r5, _08015BEC @ =gUnknown_2023E8A ldrb r0, [r5] strh r0, [r1] @@ -11696,8 +11696,8 @@ _08015BD4: .align 2, 0 _08015BDC: .4byte gBattleTypeFlags _08015BE0: .4byte gPlayerParty -_08015BE4: .4byte gUnknown_3003F64 -_08015BE8: .4byte gUnknown_20370D0 +_08015BE4: .4byte gReceivedRemoteLinkPlayers +_08015BE8: .4byte gSpecialVar_Result _08015BEC: .4byte gUnknown_2023E8A _08015BF0: .4byte gMain _08015BF4: .4byte 0x00000439 diff --git a/asm/battle_anim.s b/asm/battle_anim.s index 7f9d4d26e..085b11f09 100644 --- a/asm/battle_anim.s +++ b/asm/battle_anim.s @@ -1307,7 +1307,7 @@ _08072E5E: movs r0, 0x16 bl SetGpuReg lsls r4, r7, 5 - ldr r0, _08072F7C @ =gUnknown_20373F8 + ldr r0, _08072F7C @ =gPlttBufferUnfaded + 0x200 adds r4, r0 add r0, sp, 0x10 ldrb r1, [r0, 0x8] @@ -1353,7 +1353,7 @@ _08072F6C: .4byte gUnknown_2023D44 _08072F70: .4byte gUnknown_2022978 _08072F74: .4byte gSprites _08072F78: .4byte gUnknown_202297A -_08072F7C: .4byte gUnknown_20373F8 +_08072F7C: .4byte gPlttBufferUnfaded + 0x200 _08072F80: .4byte 0x04000008 _08072F84: ldr r1, _08073094 @ =0x06006000 @@ -1440,7 +1440,7 @@ _08072F84: movs r0, 0x1A bl SetGpuReg lsls r4, r7, 5 - ldr r0, _080730B4 @ =gUnknown_20373F8 + ldr r0, _080730B4 @ =gPlttBufferUnfaded + 0x200 adds r4, r0 adds r0, r4, 0 movs r1, 0x90 @@ -1487,7 +1487,7 @@ _080730A4: .4byte gUnknown_2023D44 _080730A8: .4byte gUnknown_202297C _080730AC: .4byte gSprites _080730B0: .4byte gUnknown_202297E -_080730B4: .4byte gUnknown_20373F8 +_080730B4: .4byte gPlttBufferUnfaded + 0x200 _080730B8: .4byte 0x05000120 _080730BC: .4byte 0x04000008 thumb_func_end sub_8072E48 @@ -1640,7 +1640,7 @@ task_pA_ma0A_obj_to_bg_pal: @ 8073174 adds r0, r5 strh r0, [r1] lsls r0, r6, 5 - ldr r2, _08073200 @ =gUnknown_20377F8 + ldr r2, _08073200 @ =gPlttBufferFaded + 0x200 adds r0, r2 mov r1, sp ldrb r1, [r1, 0x8] @@ -1656,7 +1656,7 @@ _080731F0: .4byte gTasks _080731F4: .4byte gSprites _080731F8: .4byte gUnknown_2022978 _080731FC: .4byte gUnknown_202297A -_08073200: .4byte gUnknown_20377F8 +_08073200: .4byte gPlttBufferFaded + 0x200 _08073204: .4byte 0xfffffe00 _08073208: .4byte 0x04000008 _0807320C: @@ -1673,7 +1673,7 @@ _0807320C: adds r0, r5 strh r0, [r1] lsls r0, r6, 5 - ldr r1, _08073244 @ =gUnknown_20377F8 + ldr r1, _08073244 @ =gPlttBufferFaded + 0x200 adds r0, r1 subs r1, 0xE0 ldr r2, _08073248 @ =0x04000008 @@ -1686,7 +1686,7 @@ _08073232: .align 2, 0 _0807323C: .4byte gUnknown_202297C _08073240: .4byte gUnknown_202297E -_08073244: .4byte gUnknown_20377F8 +_08073244: .4byte gPlttBufferFaded + 0x200 _08073248: .4byte 0x04000008 thumb_func_end task_pA_ma0A_obj_to_bg_pal @@ -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_8074480.s b/asm/battle_anim_8074480.s index 1881e7a8f..b900ba15a 100644 --- a/asm/battle_anim_8074480.s +++ b/asm/battle_anim_8074480.s @@ -3149,8 +3149,8 @@ sub_8075B48: @ 8075B48 lsrs r0, 16 cmp r1, 0 bne _08075BC4 - ldr r2, _08075BB8 @ =gUnknown_20371F8 - ldr r1, _08075BBC @ =gUnknown_20375F8 + ldr r2, _08075BB8 @ =gPlttBufferUnfaded + ldr r1, _08075BBC @ =gPlttBufferFaded lsls r0, 1 adds r4, r0, r1 adds r5, r0, r2 @@ -3200,14 +3200,14 @@ _08075B60: bge _08075B60 b _08075BD4 .align 2, 0 -_08075BB8: .4byte gUnknown_20371F8 -_08075BBC: .4byte gUnknown_20375F8 +_08075BB8: .4byte gPlttBufferUnfaded +_08075BBC: .4byte gPlttBufferFaded _08075BC0: .4byte 0xfffffc1f _08075BC4: lsls r1, r0, 1 - ldr r0, _08075BDC @ =gUnknown_20371F8 + ldr r0, _08075BDC @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _08075BE0 @ =gUnknown_20375F8 + ldr r2, _08075BE0 @ =gPlttBufferFaded adds r1, r2 ldr r2, _08075BE4 @ =0x04000008 bl CpuSet @@ -3216,8 +3216,8 @@ _08075BD4: pop {r0} bx r0 .align 2, 0 -_08075BDC: .4byte gUnknown_20371F8 -_08075BE0: .4byte gUnknown_20375F8 +_08075BDC: .4byte gPlttBufferUnfaded +_08075BE0: .4byte gPlttBufferFaded _08075BE4: .4byte 0x04000008 thumb_func_end sub_8075B48 @@ -5967,10 +5967,10 @@ _080770D4: _080770D6: strh r0, [r5, 0x14] lsls r0, r4, 1 - ldr r1, _08077104 @ =gUnknown_20371F8 + ldr r1, _08077104 @ =gPlttBufferUnfaded adds r0, r1 lsls r1, r6, 1 - ldr r2, _08077108 @ =gUnknown_20375F8 + ldr r2, _08077108 @ =gPlttBufferFaded adds r1, r2 ldr r2, _0807710C @ =0x04000008 bl CpuSet @@ -5986,8 +5986,8 @@ _080770D6: pop {r0} bx r0 .align 2, 0 -_08077104: .4byte gUnknown_20371F8 -_08077108: .4byte gUnknown_20375F8 +_08077104: .4byte gPlttBufferUnfaded +_08077108: .4byte gPlttBufferFaded _0807710C: .4byte 0x04000008 _08077110: .4byte gUnknown_2037F02 _08077114: .4byte sub_8077118 diff --git a/asm/battle_anim_8078178.s b/asm/battle_anim_8078178.s index e4f15971d..1080351b3 100644 --- a/asm/battle_anim_8078178.s +++ b/asm/battle_anim_8078178.s @@ -505,7 +505,7 @@ sub_8078528: @ 8078528 asrs r0, 16 cmp r0, 0x3 bne _080785B8 - ldr r3, _080785C8 @ =gUnknown_20375F8 + ldr r3, _080785C8 @ =gPlttBufferFaded lsls r2, 4 mov r12, r2 ldr r1, _080785CC @ =0x0000010d @@ -555,7 +555,7 @@ _080785B8: .align 2, 0 _080785C0: .4byte 0x0000271a _080785C4: .4byte gTasks -_080785C8: .4byte gUnknown_20375F8 +_080785C8: .4byte gPlttBufferFaded _080785CC: .4byte 0x0000010d _080785D0: .4byte 0x0000010f _080785D4: .4byte sub_80785D8 diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index 2c5feb2f1..e64654d57 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -5084,7 +5084,7 @@ sub_80A49D4: @ 80A49D4 ble _080A4A32 movs r0, 0 strh r0, [r4, 0x30] - ldr r1, _080A4A7C @ =gUnknown_20375F8 + ldr r1, _080A4A7C @ =gPlttBufferFaded movs r2, 0x32 ldrsh r0, [r4, r2] adds r0, 0x1 @@ -5153,7 +5153,7 @@ _080A4A6C: strh r0, [r4, 0x2E] b _080A4AC2 .align 2, 0 -_080A4A7C: .4byte gUnknown_20375F8 +_080A4A7C: .4byte gPlttBufferFaded _080A4A80: ldrh r0, [r4, 0x3A] adds r0, 0x1 @@ -6117,7 +6117,7 @@ _080A51A4: ldrb r1, [r4, 0x5] lsrs r1, 4 lsls r0, r1, 5 - ldr r2, _080A5204 @ =gUnknown_2037408 + ldr r2, _080A5204 @ =gPlttBufferUnfaded + 0x210 adds r0, r2 lsls r1, 4 ldr r3, _080A5208 @ =0x00000101 @@ -6135,7 +6135,7 @@ _080A51A4: b _080A5214 .align 2, 0 _080A5200: .4byte 0x00007fff -_080A5204: .4byte gUnknown_2037408 +_080A5204: .4byte gPlttBufferUnfaded + 0x210 _080A5208: .4byte 0x00000101 _080A520C: cmp r0, 0 @@ -8192,7 +8192,7 @@ _080A614C: cmp r0, 0 beq _080A6178 movs r1, 0x1 - ldr r2, _080A6190 @ =gUnknown_20375F8 + ldr r2, _080A6190 @ =gPlttBufferFaded _080A6164: adds r0, r3, r1 lsls r0, 1 @@ -8216,9 +8216,9 @@ _080A6178: b _080A6232 .align 2, 0 _080A618C: .4byte 0x00007fbb -_080A6190: .4byte gUnknown_20375F8 +_080A6190: .4byte gPlttBufferFaded _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 @@ -8534,7 +8534,7 @@ sub_80A63B4: @ 80A63B4 adds r0, 0x10 lsls r4, r0, 4 movs r5, 0x1 - ldr r2, _080A6450 @ =gUnknown_20371F8 + ldr r2, _080A6450 @ =gPlttBufferUnfaded _080A640C: adds r1, r3, r5 lsls r1, 1 @@ -8566,7 +8566,7 @@ _080A640C: _080A6444: .4byte gTasks _080A6448: .4byte 0x00002771 _080A644C: .4byte gSprites -_080A6450: .4byte gUnknown_20371F8 +_080A6450: .4byte gPlttBufferUnfaded _080A6454: lsls r2, r0, 4 adds r2, r0 @@ -8796,7 +8796,7 @@ sub_80A65E8: @ 80A65E8 adds r0, r1 lsrs r3, r0, 16 movs r2, 0x1 - ldr r5, _080A669C @ =gUnknown_20375F8 + ldr r5, _080A669C @ =gPlttBufferFaded _080A6614: adds r1, r3, r2 lsls r1, 1 @@ -8834,7 +8834,7 @@ _080A6632: adds r0, r1 lsrs r3, r0, 16 movs r2, 0x1 - ldr r7, _080A669C @ =gUnknown_20375F8 + ldr r7, _080A669C @ =gPlttBufferFaded ldr r6, _080A6698 @ =gUnknown_83E3898 adds r4, r5, 0 _080A6660: @@ -8867,7 +8867,7 @@ _080A667A: bx r0 .align 2, 0 _080A6698: .4byte gUnknown_83E3898 -_080A669C: .4byte gUnknown_20375F8 +_080A669C: .4byte gPlttBufferFaded thumb_func_end sub_80A65E8 thumb_func_start sub_80A66A0 @@ -11414,7 +11414,7 @@ sub_80A7A18: @ 80A7A18 movs r0, 0 strh r0, [r4, 0x30] ldrh r5, [r4, 0x2E] - ldr r1, _080A7A84 @ =gUnknown_20375F8 + ldr r1, _080A7A84 @ =gPlttBufferFaded adds r0, r5, 0 adds r0, 0x8 lsls r0, 1 @@ -11457,7 +11457,7 @@ _080A7A7C: pop {r0} bx r0 .align 2, 0 -_080A7A84: .4byte gUnknown_20375F8 +_080A7A84: .4byte gPlttBufferFaded thumb_func_end sub_80A7A18 thumb_func_start sub_80A7A88 @@ -15161,7 +15161,7 @@ _080A96CC: lsls r2, 1 adds r0, r2 str r1, [r0] - ldr r0, _080A975C @ =gUnknown_8D227E4 + ldr r0, _080A975C @ =gFile_graphics_battle_anims_sprites_206_palette bl LZDecompressWram movs r4, 0 _080A9700: @@ -15206,7 +15206,7 @@ _080A9700: _080A9750: .4byte 0x000027de _080A9754: .4byte 0x00002710 _080A9758: .4byte gMonSpritesGfxPtr -_080A975C: .4byte gUnknown_8D227E4 +_080A975C: .4byte gFile_graphics_battle_anims_sprites_206_palette thumb_func_end sub_80A96B4 thumb_func_start sub_80A9760 @@ -15955,15 +15955,15 @@ _080A9D2A: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080A9DAC @ =gUnknown_8D23F4C + ldr r1, _080A9DAC @ =gFile_graphics_battle_anims_backgrounds_attract_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080A9DB0 @ =gUnknown_8D234B4 + ldr r1, _080A9DB0 @ =gFile_graphics_battle_anims_backgrounds_attract_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080A9DB4 @ =gUnknown_8D23F24 + ldr r0, _080A9DB4 @ =gFile_graphics_battle_anims_backgrounds_attract_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -15995,9 +15995,9 @@ _080A9D88: _080A9DA0: .4byte 0x00003f42 _080A9DA4: .4byte gUnknown_2022978 _080A9DA8: .4byte gUnknown_202297A -_080A9DAC: .4byte gUnknown_8D23F4C -_080A9DB0: .4byte gUnknown_8D234B4 -_080A9DB4: .4byte gUnknown_8D23F24 +_080A9DAC: .4byte gFile_graphics_battle_anims_backgrounds_attract_tilemap +_080A9DB0: .4byte gFile_graphics_battle_anims_backgrounds_attract_sheet +_080A9DB4: .4byte gFile_graphics_battle_anims_backgrounds_attract_palette _080A9DB8: .4byte gTasks _080A9DBC: .4byte sub_80A9DC0 thumb_func_end sub_80A9CE8 @@ -16214,7 +16214,7 @@ _080A9F52: lsls r0, 24 cmp r0, 0 beq _080A9F98 - ldr r0, _080A9F94 @ =gUnknown_8E7F874 + ldr r0, _080A9F94 @ =gFile_graphics_battle_anims_backgrounds_scary_face_contest_tilemap ldr r1, [sp, 0x4] bl LZDecompressVram b _080A9FC6 @@ -16222,7 +16222,7 @@ _080A9F52: _080A9F88: .4byte 0x00003f42 _080A9F8C: .4byte gUnknown_2022978 _080A9F90: .4byte gUnknown_202297A -_080A9F94: .4byte gUnknown_8E7F874 +_080A9F94: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_contest_tilemap _080A9F98: ldr r0, _080A9FB4 @ =gUnknown_2037F1B ldrb r0, [r0] @@ -16233,25 +16233,25 @@ _080A9F98: bne _080A9FBC mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080A9FB8 @ =gUnknown_8E7F4AC + ldr r1, _080A9FB8 @ =gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap bl sub_807543C b _080A9FC6 .align 2, 0 _080A9FB4: .4byte gUnknown_2037F1B -_080A9FB8: .4byte gUnknown_8E7F4AC +_080A9FB8: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap _080A9FBC: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AA010 @ =gUnknown_8E7F690 + ldr r1, _080AA010 @ =gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap bl sub_807543C _080A9FC6: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AA014 @ =gUnknown_8D24BCC + ldr r1, _080AA014 @ =gFile_graphics_battle_anims_backgrounds_scary_face_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080AA018 @ =gUnknown_8D24BA4 + ldr r0, _080AA018 @ =gFile_graphics_battle_anims_backgrounds_scary_face_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -16280,9 +16280,9 @@ _080A9FFA: pop {r0} bx r0 .align 2, 0 -_080AA010: .4byte gUnknown_8E7F690 -_080AA014: .4byte gUnknown_8D24BCC -_080AA018: .4byte gUnknown_8D24BA4 +_080AA010: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap +_080AA014: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_sheet +_080AA018: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_palette _080AA01C: .4byte gTasks _080AA020: .4byte sub_80AA024 thumb_func_end sub_80A9F10 @@ -18331,7 +18331,7 @@ sub_80AAFA4: @ 80AAFA4 adds r0, 0x1 lsls r0, 16 lsrs r5, r0, 16 - ldr r1, _080AB020 @ =gUnknown_20375F8 + ldr r1, _080AB020 @ =gPlttBufferFaded lsls r0, r5, 1 adds r0, r1 ldrh r6, [r0] @@ -18373,7 +18373,7 @@ _080AB016: bx r0 .align 2, 0 _080AB01C: .4byte gTasks -_080AB020: .4byte gUnknown_20375F8 +_080AB020: .4byte gPlttBufferFaded thumb_func_end sub_80AAFA4 thumb_func_start sub_80AB024 @@ -18865,23 +18865,23 @@ sub_80AB38C: @ 80AB38C bne _080AB408 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AB404 @ =gUnknown_8E81D14 + ldr r1, _080AB404 @ =gFile_graphics_unknown_unknown_E81D14_tilemap bl sub_807543C b _080AB42E .align 2, 0 _080AB3FC: .4byte 0x00003f42 _080AB400: .4byte gUnknown_2037F1A -_080AB404: .4byte gUnknown_8E81D14 +_080AB404: .4byte gFile_graphics_unknown_unknown_E81D14_tilemap _080AB408: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AB414 @ =gUnknown_8E81FE4 + ldr r1, _080AB414 @ =gFile_graphics_unknown_unknown_E81FE4_tilemap bl sub_807543C b _080AB42E .align 2, 0 -_080AB414: .4byte gUnknown_8E81FE4 +_080AB414: .4byte gFile_graphics_unknown_unknown_E81FE4_tilemap _080AB418: - ldr r0, _080AB458 @ =gUnknown_8E822B8 + ldr r0, _080AB458 @ =gFile_graphics_unknown_unknown_E822B8_tilemap ldr r1, [sp, 0x4] bl LZDecompressVram mov r0, sp @@ -18893,7 +18893,7 @@ _080AB418: _080AB42E: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AB45C @ =gUnknown_8E809CC + ldr r1, _080AB45C @ =gFile_graphics_battle_anims_backgrounds_water_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 @@ -18902,7 +18902,7 @@ _080AB42E: ldrsh r0, [r0, r1] cmp r0, 0 bne _080AB468 - ldr r0, _080AB464 @ =gUnknown_8E81CEC + ldr r0, _080AB464 @ =gFile_graphics_battle_anims_backgrounds_water_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -18910,12 +18910,12 @@ _080AB42E: bl LoadCompressedPalette b _080AB476 .align 2, 0 -_080AB458: .4byte gUnknown_8E822B8 -_080AB45C: .4byte gUnknown_8E809CC +_080AB458: .4byte gFile_graphics_unknown_unknown_E822B8_tilemap +_080AB45C: .4byte gFile_graphics_battle_anims_backgrounds_water_sheet _080AB460: .4byte gUnknown_2037F02 -_080AB464: .4byte gUnknown_8E81CEC +_080AB464: .4byte gFile_graphics_battle_anims_backgrounds_water_palette _080AB468: - ldr r0, _080AB4E0 @ =gUnknown_8E7BAB0 + ldr r0, _080AB4E0 @ =gFile_graphics_battle_anims_backgrounds_water_muddy_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -18973,7 +18973,7 @@ _080AB476: strh r0, [r7, 0xE] b _080AB552 .align 2, 0 -_080AB4E0: .4byte gUnknown_8E7BAB0 +_080AB4E0: .4byte gFile_graphics_battle_anims_backgrounds_water_muddy_palette _080AB4E4: .4byte sub_80AB79C _080AB4E8: .4byte gTasks _080AB4EC: .4byte 0x0000ffb0 @@ -19110,7 +19110,7 @@ sub_80AB5C8: @ 80AB5C8 asrs r0, 16 cmp r0, 0x4 bne _080AB65C - ldr r1, _080AB700 @ =gUnknown_20375F8 + ldr r1, _080AB700 @ =gPlttBufferFaded mov r0, sp ldrb r0, [r0, 0x8] lsls r0, 4 @@ -19236,7 +19236,7 @@ _080AB6EC: _080AB6F4: .4byte gUnknown_2022978 _080AB6F8: .4byte gUnknown_202297A _080AB6FC: .4byte gTasks -_080AB700: .4byte gUnknown_20375F8 +_080AB700: .4byte gPlttBufferFaded _080AB704: .4byte sub_80AB708 thumb_func_end sub_80AB5C8 @@ -28163,7 +28163,7 @@ _080AFB26: bl LoadBgTiles mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AFBB0 @ =gUnknown_8E7F1F4 + ldr r1, _080AFBB0 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap bl sub_807543C ldr r0, _080AFBB4 @ =gUnknown_83C2CE0 mov r1, sp @@ -28198,7 +28198,7 @@ _080AFBA0: .4byte 0x00003f42 _080AFBA4: .4byte gUnknown_2022978 _080AFBA8: .4byte gUnknown_202297A _080AFBAC: .4byte gUnknown_83C3540 -_080AFBB0: .4byte gUnknown_8E7F1F4 +_080AFBB0: .4byte gFile_graphics_battle_anims_backgrounds_fog_tilemap _080AFBB4: .4byte gUnknown_83C2CE0 _080AFBB8: .4byte gTasks _080AFBBC: .4byte sub_80AFBC0 @@ -28474,7 +28474,7 @@ _080AFDC2: bl LoadBgTiles mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AFE50 @ =gUnknown_8E7F1F4 + ldr r1, _080AFE50 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap bl sub_807543C ldr r0, _080AFE54 @ =gUnknown_83C2CE0 mov r1, sp @@ -28511,7 +28511,7 @@ _080AFE40: .4byte 0x00003f42 _080AFE44: .4byte gUnknown_2022978 _080AFE48: .4byte gUnknown_202297A _080AFE4C: .4byte gUnknown_83C3540 -_080AFE50: .4byte gUnknown_8E7F1F4 +_080AFE50: .4byte gFile_graphics_battle_anims_backgrounds_fog_tilemap _080AFE54: .4byte gUnknown_83C2CE0 _080AFE58: .4byte gTasks _080AFE5C: .4byte 0x0000ffff @@ -32037,7 +32037,7 @@ sub_80B198C: @ 80B198C movs r0, 0 strh r0, [r3, 0x1C] ldrb r0, [r3, 0xC] - ldr r2, _080B1A10 @ =gUnknown_20375F8 + ldr r2, _080B1A10 @ =gPlttBufferFaded lsls r0, 4 movs r3, 0x84 lsls r3, 1 @@ -32083,7 +32083,7 @@ _080B1A04: bx r0 .align 2, 0 _080B1A0C: .4byte gTasks -_080B1A10: .4byte gUnknown_20375F8 +_080B1A10: .4byte gPlttBufferFaded _080B1A14: .4byte 0x00000107 _080B1A18: .4byte 0x00000101 thumb_func_end sub_80B198C @@ -35026,7 +35026,7 @@ sub_80B3044: @ 80B3044 movs r0, 0 strh r0, [r3, 0x30] ldrh r4, [r3, 0x2E] - ldr r1, _080B30A8 @ =gUnknown_20375F8 + ldr r1, _080B30A8 @ =gPlttBufferFaded adds r0, r4, 0 adds r0, 0x8 lsls r0, 1 @@ -35067,7 +35067,7 @@ _080B30A2: pop {r0} bx r0 .align 2, 0 -_080B30A8: .4byte gUnknown_20375F8 +_080B30A8: .4byte gPlttBufferFaded _080B30AC: .4byte sub_80B30B0 thumb_func_end sub_80B3044 @@ -38100,15 +38100,15 @@ _080B4854: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080B48F0 @ =gUnknown_8E79354 + ldr r1, _080B48F0 @ =gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080B48F4 @ =gUnknown_8E794D0 + ldr r1, _080B48F4 @ =gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080B48F8 @ =gUnknown_8E799FC + ldr r0, _080B48F8 @ =gFile_graphics_battle_anims_sprites_261_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -38154,9 +38154,9 @@ _080B48CA: _080B48E4: .4byte 0x00003f42 _080B48E8: .4byte gUnknown_2022978 _080B48EC: .4byte gUnknown_202297A -_080B48F0: .4byte gUnknown_8E79354 -_080B48F4: .4byte gUnknown_8E794D0 -_080B48F8: .4byte gUnknown_8E799FC +_080B48F0: .4byte gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap +_080B48F4: .4byte gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet +_080B48F8: .4byte gFile_graphics_battle_anims_sprites_261_palette _080B48FC: .4byte gUnknown_2037F02 _080B4900: .4byte gUnknown_2037F1A _080B4904: .4byte gTasks @@ -40643,12 +40643,12 @@ _080B5C2C: movs r2, 0x10 ldrsh r0, [r5, r2] lsls r0, 1 - ldr r1, _080B5C60 @ =gUnknown_20371F8 + ldr r1, _080B5C60 @ =gPlttBufferUnfaded adds r0, r1 movs r2, 0x24 ldrsh r1, [r5, r2] lsls r1, 1 - ldr r2, _080B5C64 @ =gUnknown_20375F8 + ldr r2, _080B5C64 @ =gPlttBufferFaded adds r1, r2 ldr r2, _080B5C68 @ =0x04000008 bl CpuSet @@ -40659,8 +40659,8 @@ _080B5C2C: bl BlendPalette b _080B5D22 .align 2, 0 -_080B5C60: .4byte gUnknown_20371F8 -_080B5C64: .4byte gUnknown_20375F8 +_080B5C60: .4byte gPlttBufferUnfaded +_080B5C64: .4byte gPlttBufferFaded _080B5C68: .4byte 0x04000008 _080B5C6C: .4byte 0x00003c0d _080B5C70: @@ -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 @@ -42800,11 +42800,11 @@ _080B6D28: bl sub_80752C8 add r0, sp, 0xC ldrb r0, [r0, 0x9] - ldr r1, _080B6D84 @ =gUnknown_8D24BCC + ldr r1, _080B6D84 @ =gFile_graphics_battle_anims_backgrounds_scary_face_sheet add r2, sp, 0xC ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080B6D88 @ =gUnknown_8D24BA4 + ldr r0, _080B6D88 @ =gFile_graphics_battle_anims_backgrounds_scary_face_palette add r1, sp, 0xC ldrb r1, [r1, 0x8] lsls r1, 4 @@ -42814,8 +42814,8 @@ _080B6D28: .align 2, 0 _080B6D7C: .4byte gUnknown_202297C _080B6D80: .4byte gUnknown_202297E -_080B6D84: .4byte gUnknown_8D24BCC -_080B6D88: .4byte gUnknown_8D24BA4 +_080B6D84: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_sheet +_080B6D88: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_palette _080B6D8C: add r0, sp, 0xC movs r1, 0x2 @@ -42830,7 +42830,7 @@ _080B6D8C: lsls r4, 1 adds r0, r4 str r1, [r0] - ldr r0, _080B6E00 @ =gUnknown_8E7F4AC + ldr r0, _080B6E00 @ =gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap bl LZDecompressWram add r0, sp, 0xC ldrb r0, [r0, 0x8] @@ -42867,7 +42867,7 @@ _080B6D8C: b _080B6F1E .align 2, 0 _080B6DFC: .4byte gMonSpritesGfxPtr -_080B6E00: .4byte gUnknown_8E7F4AC +_080B6E00: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap _080B6E04: ldrh r0, [r6, 0xA] adds r0, 0x1 @@ -46190,15 +46190,15 @@ _080B8828: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080B88C4 @ =gUnknown_8D1D388 + ldr r1, _080B88C4 @ =gFile_graphics_battle_anims_masks_metal_shine_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080B88C8 @ =gUnknown_8D1D224 + ldr r1, _080B88C8 @ =gFile_graphics_battle_anims_masks_metal_shine_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080B88CC @ =gUnknown_8D1D360 + ldr r0, _080B88CC @ =gFile_graphics_battle_anims_masks_metal_shine_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -46236,9 +46236,9 @@ _080B8828: _080B88B8: .4byte gBattlerPartyIndexes _080B88BC: .4byte gPlayerParty _080B88C0: .4byte gUnknown_2037F1A -_080B88C4: .4byte gUnknown_8D1D388 -_080B88C8: .4byte gUnknown_8D1D224 -_080B88CC: .4byte gUnknown_8D1D360 +_080B88C4: .4byte gFile_graphics_battle_anims_masks_metal_shine_tilemap +_080B88C8: .4byte gFile_graphics_battle_anims_masks_metal_shine_sheet +_080B88CC: .4byte gFile_graphics_battle_anims_masks_metal_shine_palette _080B88D0: .4byte gUnknown_2022978 _080B88D4: .4byte gSprites _080B88D8: .4byte gUnknown_202297A @@ -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 @@ -51145,7 +51145,7 @@ _080BAE5C: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080BAF18 @ =gUnknown_8D20858 + ldr r1, _080BAF18 @ =gFile_graphics_battle_anims_masks_curse_tilemap bl sub_807543C bl sub_8073788 lsls r0, 24 @@ -51160,7 +51160,7 @@ _080BAE5C: _080BAEAC: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080BAF1C @ =gUnknown_8D2083C + ldr r1, _080BAF1C @ =gFile_graphics_battle_anims_masks_curse_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 @@ -51207,8 +51207,8 @@ _080BAEAC: _080BAF0C: .4byte gBattlerPartyIndexes _080BAF10: .4byte gPlayerParty _080BAF14: .4byte gUnknown_2037F1A -_080BAF18: .4byte gUnknown_8D20858 -_080BAF1C: .4byte gUnknown_8D2083C +_080BAF18: .4byte gFile_graphics_battle_anims_masks_curse_tilemap +_080BAF1C: .4byte gFile_graphics_battle_anims_masks_curse_sheet _080BAF20: .4byte gUnknown_83E7CC8 _080BAF24: .4byte gUnknown_2022978 _080BAF28: .4byte gSprites @@ -51659,17 +51659,17 @@ _080BB2E2: bne _080BB30C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080BB308 @ =gUnknown_8D2DB04 + ldr r1, _080BB308 @ =gFile_graphics_battle_anims_masks_stat_tilemap_1_tilemap bl sub_807543C b _080BB316 .align 2, 0 _080BB300: .4byte gUnknown_2023D44 _080BB304: .4byte gUnknown_20399B4 -_080BB308: .4byte gUnknown_8D2DB04 +_080BB308: .4byte gFile_graphics_battle_anims_masks_stat_tilemap_1_tilemap _080BB30C: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080BB354 @ =gUnknown_8D2DC20 + ldr r1, _080BB354 @ =gFile_graphics_battle_anims_masks_stat_tilemap_2_tilemap bl sub_807543C _080BB316: bl sub_8073788 @@ -51685,7 +51685,7 @@ _080BB316: _080BB32E: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080BB358 @ =gUnknown_8D2D8F4 + ldr r1, _080BB358 @ =gFile_graphics_battle_anims_masks_stat_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 @@ -51701,8 +51701,8 @@ _080BB32E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080BB354: .4byte gUnknown_8D2DC20 -_080BB358: .4byte gUnknown_8D2D8F4 +_080BB354: .4byte gFile_graphics_battle_anims_masks_stat_tilemap_2_tilemap +_080BB358: .4byte gFile_graphics_battle_anims_masks_stat_sheet _080BB35C: .4byte gUnknown_20399B4 _080BB360: .4byte _080BB364 .align 2, 0 @@ -51715,37 +51715,37 @@ _080BB364: .4byte _080BB3A8 .4byte _080BB3B0 _080BB380: - ldr r0, _080BB384 @ =gUnknown_8D2DD5C + ldr r0, _080BB384 @ =gFile_graphics_battle_anims_masks_stat2_palette b _080BB3B2 .align 2, 0 -_080BB384: .4byte gUnknown_8D2DD5C +_080BB384: .4byte gFile_graphics_battle_anims_masks_stat2_palette _080BB388: - ldr r0, _080BB38C @ =gUnknown_8D2DD3C + ldr r0, _080BB38C @ =gFile_graphics_battle_anims_masks_stat1_palette b _080BB3B2 .align 2, 0 -_080BB38C: .4byte gUnknown_8D2DD3C +_080BB38C: .4byte gFile_graphics_battle_anims_masks_stat1_palette _080BB390: - ldr r0, _080BB394 @ =gUnknown_8D2DD7C + ldr r0, _080BB394 @ =gFile_graphics_battle_anims_masks_stat3_palette b _080BB3B2 .align 2, 0 -_080BB394: .4byte gUnknown_8D2DD7C +_080BB394: .4byte gFile_graphics_battle_anims_masks_stat3_palette _080BB398: - ldr r0, _080BB39C @ =gUnknown_8D2DD9C + ldr r0, _080BB39C @ =gFile_graphics_battle_anims_masks_stat4_palette b _080BB3B2 .align 2, 0 -_080BB39C: .4byte gUnknown_8D2DD9C +_080BB39C: .4byte gFile_graphics_battle_anims_masks_stat4_palette _080BB3A0: - ldr r0, _080BB3A4 @ =gUnknown_8D2DDDC + ldr r0, _080BB3A4 @ =gFile_graphics_battle_anims_masks_stat6_palette b _080BB3B2 .align 2, 0 -_080BB3A4: .4byte gUnknown_8D2DDDC +_080BB3A4: .4byte gFile_graphics_battle_anims_masks_stat6_palette _080BB3A8: - ldr r0, _080BB3AC @ =gUnknown_8D2DDFC + ldr r0, _080BB3AC @ =gFile_graphics_battle_anims_masks_stat7_palette b _080BB3B2 .align 2, 0 -_080BB3AC: .4byte gUnknown_8D2DDFC +_080BB3AC: .4byte gFile_graphics_battle_anims_masks_stat7_palette _080BB3B0: - ldr r0, _080BB3C0 @ =gUnknown_8D2DE1C + ldr r0, _080BB3C0 @ =gFile_graphics_battle_anims_masks_stat8_palette _080BB3B2: mov r1, sp ldrb r1, [r1, 0x8] @@ -51754,9 +51754,9 @@ _080BB3B2: bl LoadCompressedPalette b _080BB3D2 .align 2, 0 -_080BB3C0: .4byte gUnknown_8D2DE1C +_080BB3C0: .4byte gFile_graphics_battle_anims_masks_stat8_palette _080BB3C4: - ldr r0, _080BB3FC @ =gUnknown_8D2DDBC + ldr r0, _080BB3FC @ =gFile_graphics_battle_anims_masks_stat5_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -51785,7 +51785,7 @@ _080BB3D2: ldr r1, _080BB410 @ =0x0000fffd b _080BB420 .align 2, 0 -_080BB3FC: .4byte gUnknown_8D2DDBC +_080BB3FC: .4byte gFile_graphics_battle_anims_masks_stat5_palette _080BB400: .4byte gUnknown_2022978 _080BB404: .4byte gUnknown_202297A _080BB408: .4byte gUnknown_20399B4 @@ -52261,7 +52261,7 @@ _080BB79A: adds r0, 0x10 cmp r2, r0 bge _080BB7C6 - ldr r1, _080BB7D8 @ =gUnknown_20375F8 + ldr r1, _080BB7D8 @ =gPlttBufferFaded adds r3, r0, 0 _080BB7B6: lsls r0, r2, 1 @@ -52282,7 +52282,7 @@ _080BB7C6: pop {r0} bx r0 .align 2, 0 -_080BB7D8: .4byte gUnknown_20375F8 +_080BB7D8: .4byte gPlttBufferFaded thumb_func_end sub_80BB790 thumb_func_start sub_80BB7DC @@ -53173,7 +53173,7 @@ _080BBEC8: lsls r0, 5 adds r0, r1 lsls r1, r4, 5 - ldr r2, _080BBF04 @ =gUnknown_20371F8 + ldr r2, _080BBF04 @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x20 bl memcpy @@ -53187,7 +53187,7 @@ _080BBEC8: _080BBEF8: .4byte gUnknown_2037F1B _080BBEFC: .4byte gMonSpritesGfxPtr _080BBF00: .4byte gUnknown_2037F02 -_080BBF04: .4byte gUnknown_20371F8 +_080BBF04: .4byte gPlttBufferUnfaded thumb_func_end sub_80BBE6C thumb_func_start sub_80BBF08 @@ -53243,7 +53243,7 @@ _080BBF5E: adds r4, 0x10 _080BBF64: lsls r0, r4, 5 - ldr r1, _080BBF98 @ =gUnknown_20371F8 + ldr r1, _080BBF98 @ =gPlttBufferUnfaded adds r0, r1 ldr r1, _080BBF9C @ =gMonSpritesGfxPtr ldr r2, [r1] @@ -53266,7 +53266,7 @@ _080BBF64: bx r0 .align 2, 0 _080BBF94: .4byte gUnknown_2037F1B -_080BBF98: .4byte gUnknown_20371F8 +_080BBF98: .4byte gPlttBufferUnfaded _080BBF9C: .4byte gMonSpritesGfxPtr _080BBFA0: .4byte gUnknown_2037F02 thumb_func_end sub_80BBF08 @@ -53324,9 +53324,9 @@ _080BBFFA: adds r4, 0x10 _080BC000: lsls r1, r4, 5 - ldr r0, _080BC024 @ =gUnknown_20371F8 + ldr r0, _080BC024 @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _080BC028 @ =gUnknown_20375F8 + ldr r2, _080BC028 @ =gPlttBufferFaded adds r1, r2 movs r2, 0x20 bl memcpy @@ -53338,8 +53338,8 @@ _080BC000: bx r0 .align 2, 0 _080BC020: .4byte gUnknown_2037F1B -_080BC024: .4byte gUnknown_20371F8 -_080BC028: .4byte gUnknown_20375F8 +_080BC024: .4byte gPlttBufferUnfaded +_080BC028: .4byte gPlttBufferFaded thumb_func_end sub_80BBFA4 thumb_func_start sub_80BC02C diff --git a/asm/battle_anim_80DE2C0.s b/asm/battle_anim_80DE2C0.s index 9b56509a2..f3ddeb0b1 100644 --- a/asm/battle_anim_80DE2C0.s +++ b/asm/battle_anim_80DE2C0.s @@ -606,7 +606,7 @@ sub_80DE718: @ 80DE718 asrs r0, 16 cmp r0, 0x4 bne _080DE788 - ldr r0, _080DE7A8 @ =gUnknown_20375F8 + ldr r0, _080DE7A8 @ =gPlttBufferFaded lsls r2, r6, 4 adds r1, r2, 0 adds r1, 0xB @@ -658,7 +658,7 @@ _080DE798: bx r0 .align 2, 0 _080DE7A4: .4byte gTasks -_080DE7A8: .4byte gUnknown_20375F8 +_080DE7A8: .4byte gPlttBufferFaded _080DE7AC: .4byte gUnknown_2037F02 _080DE7B0: .4byte 0x0000ffff thumb_func_end sub_80DE718 @@ -711,7 +711,7 @@ sub_80DE7DC: @ 80DE7DC asrs r0, 16 cmp r0, 0x4 bne _080DE87E - ldr r0, _080DE8A0 @ =gUnknown_20375F8 + ldr r0, _080DE8A0 @ =gPlttBufferFaded lsls r2, r7, 4 adds r1, r2, 0 adds r1, 0xB @@ -722,7 +722,7 @@ sub_80DE7DC: @ 80DE7DC mov r10, r3 mov r9, r0 adds r5, r2, 0 - ldr r2, _080DE8A4 @ =gUnknown_20371F8 + ldr r2, _080DE8A4 @ =gPlttBufferUnfaded mov r12, r2 lsls r0, r7, 5 add r0, r9 @@ -787,8 +787,8 @@ _080DE88E: bx r0 .align 2, 0 _080DE89C: .4byte gTasks -_080DE8A0: .4byte gUnknown_20375F8 -_080DE8A4: .4byte gUnknown_20371F8 +_080DE8A0: .4byte gPlttBufferFaded +_080DE8A4: .4byte gPlttBufferUnfaded _080DE8A8: .4byte gUnknown_2037F02 _080DE8AC: .4byte 0x0000ffff thumb_func_end sub_80DE7DC @@ -3410,15 +3410,15 @@ _080DFCCE: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080DFD1C @ =gUnknown_8D2A8C0 + ldr r1, _080DFD1C @ =gFile_graphics_battle_anims_masks_morning_sun_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080DFD20 @ =gUnknown_8D2A808 + ldr r1, _080DFD20 @ =gFile_graphics_battle_anims_masks_morning_sun_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080DFD24 @ =gUnknown_8D2A8A8 + ldr r0, _080DFD24 @ =gFile_graphics_battle_anims_masks_morning_sun_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -3439,9 +3439,9 @@ _080DFCCE: b _080DFD58 .align 2, 0 _080DFD18: .4byte 0x00003f42 -_080DFD1C: .4byte gUnknown_8D2A8C0 -_080DFD20: .4byte gUnknown_8D2A808 -_080DFD24: .4byte gUnknown_8D2A8A8 +_080DFD1C: .4byte gFile_graphics_battle_anims_masks_morning_sun_tilemap +_080DFD20: .4byte gFile_graphics_battle_anims_masks_morning_sun_sheet +_080DFD24: .4byte gFile_graphics_battle_anims_masks_morning_sun_palette _080DFD28: .4byte gUnknown_2022978 _080DFD2C: .4byte 0x0000ffc8 _080DFD30: @@ -4052,15 +4052,15 @@ _080E01FC: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080E0250 @ =gUnknown_8D2A8C0 + ldr r1, _080E0250 @ =gFile_graphics_battle_anims_masks_morning_sun_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080E0254 @ =gUnknown_8D2A808 + ldr r1, _080E0254 @ =gFile_graphics_battle_anims_masks_morning_sun_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080E0258 @ =gUnknown_8D2A8A8 + ldr r0, _080E0258 @ =gFile_graphics_battle_anims_masks_morning_sun_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -4083,9 +4083,9 @@ _080E01FC: .align 2, 0 _080E0248: .4byte 0x00003f42 _080E024C: .4byte 0x00000d03 -_080E0250: .4byte gUnknown_8D2A8C0 -_080E0254: .4byte gUnknown_8D2A808 -_080E0258: .4byte gUnknown_8D2A8A8 +_080E0250: .4byte gFile_graphics_battle_anims_masks_morning_sun_tilemap +_080E0254: .4byte gFile_graphics_battle_anims_masks_morning_sun_sheet +_080E0258: .4byte gFile_graphics_battle_anims_masks_morning_sun_palette _080E025C: .4byte gUnknown_2022978 _080E0260: .4byte 0x0000ffc8 _080E0264: @@ -7994,11 +7994,11 @@ sub_80E2084: @ 80E2084 str r1, [sp, 0x8] movs r1, 0x1E str r1, [sp, 0xC] - ldr r1, _080E20C8 @ =gUnknown_8D2DE3C + ldr r1, _080E20C8 @ =gFile_graphics_battle_anims_masks_cure_bubbles_sheet str r1, [sp, 0x10] - ldr r1, _080E20CC @ =gUnknown_8D2DF98 + ldr r1, _080E20CC @ =gFile_graphics_battle_anims_masks_cure_bubbles_tilemap str r1, [sp, 0x14] - ldr r1, _080E20D0 @ =gUnknown_8D2DF78 + ldr r1, _080E20D0 @ =gFile_graphics_battle_anims_masks_cure_bubbles_palette str r1, [sp, 0x18] movs r1, 0 bl sub_80BBA20 @@ -8008,9 +8008,9 @@ sub_80E2084: @ 80E2084 .align 2, 0 _080E20C0: .4byte gUnknown_2037F1A _080E20C4: .4byte gUnknown_2037F02 -_080E20C8: .4byte gUnknown_8D2DE3C -_080E20CC: .4byte gUnknown_8D2DF98 -_080E20D0: .4byte gUnknown_8D2DF78 +_080E20C8: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_sheet +_080E20CC: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_tilemap +_080E20D0: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_palette thumb_func_end sub_80E2084 thumb_func_start sub_80E20D4 diff --git a/asm/battle_anim_80EEC0C.s b/asm/battle_anim_80EEC0C.s index bb6d8d8d8..82179f2e0 100644 --- a/asm/battle_anim_80EEC0C.s +++ b/asm/battle_anim_80EEC0C.s @@ -154,15 +154,15 @@ sub_80EEC0C: @ 80EEC0C bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080EEDD8 @ =gUnknown_8D2EC70 + ldr r1, _080EEDD8 @ =gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080EEDDC @ =gUnknown_8D2EC24 + ldr r1, _080EEDDC @ =gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080EEDE0 @ =gUnknown_8D2DF78 + ldr r0, _080EEDE0 @ =gFile_graphics_battle_anims_masks_cure_bubbles_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -212,9 +212,9 @@ _080EEDC8: .4byte 0x00003f42 _080EEDCC: .4byte gUnknown_3004FF0 _080EEDD0: .4byte gSprites _080EEDD4: .4byte SpriteCallbackDummy -_080EEDD8: .4byte gUnknown_8D2EC70 -_080EEDDC: .4byte gUnknown_8D2EC24 -_080EEDE0: .4byte gUnknown_8D2DF78 +_080EEDD8: .4byte gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap +_080EEDDC: .4byte gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet +_080EEDE0: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_palette _080EEDE4: .4byte gUnknown_2022978 _080EEDE8: .4byte gUnknown_202297A _080EEDEC: .4byte gTasks @@ -495,7 +495,7 @@ sub_80EEFC8: @ 80EEFC8 lsls r4, 4 orrs r4, r3 lsls r0, 1 - ldr r1, _080EF0B0 @ =gUnknown_20371F8 + ldr r1, _080EF0B0 @ =gPlttBufferUnfaded mov r8, r1 add r0, r8 mov r2, r9 @@ -557,7 +557,7 @@ _080EF0A0: .4byte gUnknown_3004FF0 _080EF0A4: .4byte gSprites _080EF0A8: .4byte 0x0000d709 _080EF0AC: .4byte 0x0000d70a -_080EF0B0: .4byte gUnknown_20371F8 +_080EF0B0: .4byte gPlttBufferUnfaded thumb_func_end sub_80EEFC8 thumb_func_start sub_80EF0B4 @@ -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 16fb18cdf..29ae446f6 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 @@ -677,7 +677,7 @@ sub_80E7AC4: @ 80E7AC4 lsls r0, 24 cmp r0, 0 bne _080E7B34 - ldr r0, _080E7B20 @ =gUnknown_203AD30 + ldr r0, _080E7B20 @ =gSpecialVar_ItemId ldrh r0, [r0] cmp r0, 0xD bne _080E7B34 @@ -700,14 +700,14 @@ sub_80E7AC4: @ 80E7AC4 .align 2, 0 _080E7B14: .4byte gMain _080E7B18: .4byte sub_8011100 -_080E7B1C: .4byte gUnknown_2037AB8 -_080E7B20: .4byte gUnknown_203AD30 +_080E7B1C: .4byte gPaletteFade +_080E7B20: .4byte gSpecialVar_ItemId _080E7B24: .4byte gBattleTypeFlags _080E7B28: .4byte gUnknown_3004FE0 _080E7B2C: .4byte gActiveBattler _080E7B30: .4byte sub_80E8704 _080E7B34: - ldr r0, _080E7B48 @ =gUnknown_203AD30 + ldr r0, _080E7B48 @ =gSpecialVar_ItemId ldrh r1, [r0] movs r0, 0x1 bl EmitOneReturnValue @@ -716,7 +716,7 @@ _080E7B42: pop {r0} bx r0 .align 2, 0 -_080E7B48: .4byte gUnknown_203AD30 +_080E7B48: .4byte gSpecialVar_ItemId thumb_func_end sub_80E7AC4 thumb_func_start sub_80E7B4C @@ -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 gDisplayedStringBattle _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 gDisplayedStringBattle _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 @@ -2341,7 +2341,7 @@ _080E8880: cmp r4, 0 bne _080E88AA bl sub_80EB524 - ldr r0, _080E88B8 @ =gUnknown_203AD30 + ldr r0, _080E88B8 @ =gSpecialVar_ItemId ldrh r1, [r0] movs r0, 0x1 bl EmitOneReturnValue @@ -2356,8 +2356,8 @@ _080E88AA: pop {r0} bx r0 .align 2, 0 -_080E88B4: .4byte gUnknown_2037AB8 -_080E88B8: .4byte gUnknown_203AD30 +_080E88B4: .4byte gPaletteFade +_080E88B8: .4byte gSpecialVar_ItemId _080E88BC: .4byte gBattleStruct thumb_func_end sub_80E8704 diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 1ae03fe5e..4db1f94c3 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -2330,11 +2330,11 @@ _0802F600: thumb_func_start sub_802F610 sub_802F610: @ 802F610 push {lr} - ldr r0, _0802F64C @ =gUnknown_3003F3C + ldr r0, _0802F64C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0802F664 - ldr r0, _0802F650 @ =gUnknown_3003F64 + ldr r0, _0802F650 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0802F694 @@ -2356,8 +2356,8 @@ sub_802F610: @ 802F610 bl FreeAllWindowBuffers b _0802F694 .align 2, 0 -_0802F64C: .4byte gUnknown_3003F3C -_0802F650: .4byte gUnknown_3003F64 +_0802F64C: .4byte gWirelessCommType +_0802F650: .4byte gReceivedRemoteLinkPlayers _0802F654: .4byte gMain _0802F658: .4byte 0x00000439 _0802F65C: .4byte gUnknown_3004F80 @@ -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 @@ -2408,16 +2408,16 @@ sub_802F6A8: @ 802F6A8 ands r0, r1 cmp r0, 0 beq _0802F6FC - ldr r0, _0802F6D8 @ =gUnknown_3003F3C + ldr r0, _0802F6D8 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0802F6DC bl sub_800AAC0 b _0802F6E0 .align 2, 0 -_0802F6D0: .4byte gUnknown_2037AB8 +_0802F6D0: .4byte gPaletteFade _0802F6D4: .4byte gBattleTypeFlags -_0802F6D8: .4byte gUnknown_3003F3C +_0802F6D8: .4byte gWirelessCommType _0802F6DC: bl sub_800AB9C _0802F6E0: @@ -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,13 +4429,13 @@ 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 cmp r0, 0 bne _08030762 - ldr r0, _08030774 @ =gUnknown_203AD30 + ldr r0, _08030774 @ =gSpecialVar_ItemId ldrh r1, [r0] movs r0, 0x1 bl EmitOneReturnValue @@ -4446,8 +4446,8 @@ _08030762: .align 2, 0 _08030768: .4byte gMain _0803076C: .4byte sub_8011100 -_08030770: .4byte gUnknown_2037AB8 -_08030774: .4byte gUnknown_203AD30 +_08030770: .4byte gPaletteFade +_08030774: .4byte gSpecialVar_ItemId thumb_func_end CompleteWhenChoseItem thumb_func_start CompleteOnSpecialAnimDone @@ -4570,7 +4570,7 @@ _08030848: ldrh r1, [r4] movs r0, 0xD muls r1, r0 - ldr r0, _080308A4 @ =gUnknown_8247094 + ldr r0, _080308A4 @ =gMoveNames adds r1, r0 adds r0, r6, 0 bl StringAppend @@ -4599,7 +4599,7 @@ _08030894: .4byte gUnknown_2022BC8 _08030898: .4byte gUnknown_3004FF8 _0803089C: .4byte gDisplayedStringBattle _080308A0: .4byte gUnknown_83FE770 -_080308A4: .4byte gUnknown_8247094 +_080308A4: .4byte gMoveNames thumb_func_end sub_8030830 thumb_func_start MoveSelectionDisplayPpString diff --git a/asm/battle_controller_pokedude.s b/asm/battle_controller_pokedude.s index 5c3c0ebf0..58fad294a 100644 --- a/asm/battle_controller_pokedude.s +++ b/asm/battle_controller_pokedude.s @@ -22,7 +22,7 @@ sub_81560A4: @ 81560A4 ldr r2, _081560D4 @ =gBattleStruct ldr r0, [r2] adds r0, 0x96 - ldr r1, _081560D8 @ =gUnknown_20370C0 + ldr r1, _081560D8 @ =gSpecialVar_0x8004 ldrh r1, [r1] strb r1, [r0] ldr r0, [r2] @@ -35,7 +35,7 @@ _081560C8: .4byte gUnknown_3004FE0 _081560CC: .4byte gActiveBattler _081560D0: .4byte sub_81560DC _081560D4: .4byte gBattleStruct -_081560D8: .4byte gUnknown_20370C0 +_081560D8: .4byte gSpecialVar_0x8004 thumb_func_end sub_81560A4 thumb_func_start sub_81560DC @@ -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 @@ -642,7 +642,7 @@ sub_8156594: @ 8156594 str r1, [r0] bl nullsub_44 bl FreeAllWindowBuffers - ldr r0, _081565D8 @ =gUnknown_20370C0 + ldr r0, _081565D8 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x1 beq _081565C4 @@ -652,11 +652,11 @@ _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 -_081565D8: .4byte gUnknown_20370C0 +_081565D8: .4byte gSpecialVar_0x8004 _081565DC: movs r0, 0x8 _081565DE: @@ -674,13 +674,13 @@ 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 cmp r0, 0 bne _0815660E - ldr r0, _08156620 @ =gUnknown_203AD30 + ldr r0, _08156620 @ =gSpecialVar_ItemId ldrh r1, [r0] movs r0, 0x1 bl EmitOneReturnValue @@ -691,8 +691,8 @@ _0815660E: .align 2, 0 _08156614: .4byte gMain _08156618: .4byte sub_8011100 -_0815661C: .4byte gUnknown_2037AB8 -_08156620: .4byte gUnknown_203AD30 +_0815661C: .4byte gPaletteFade +_08156620: .4byte gSpecialVar_ItemId thumb_func_end sub_81565E8 thumb_func_start sub_8156624 @@ -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 e221fe8e9..405d4c45b 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,13 +425,13 @@ 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 cmp r0, 0 bne _080DD882 - ldr r0, _080DD894 @ =gUnknown_203AD30 + ldr r0, _080DD894 @ =gSpecialVar_ItemId ldrh r1, [r0] movs r0, 0x1 bl EmitOneReturnValue @@ -442,8 +442,8 @@ _080DD882: .align 2, 0 _080DD888: .4byte gMain _080DD88C: .4byte sub_8011100 -_080DD890: .4byte gUnknown_2037AB8 -_080DD894: .4byte gUnknown_203AD30 +_080DD890: .4byte gPaletteFade +_080DD894: .4byte gSpecialVar_ItemId thumb_func_end CompleteWhenChosePokeblock thumb_func_start CompleteOnFinishedBattleAnimation_3 diff --git a/asm/battle_controllers.s b/asm/battle_controllers.s index 71c39120f..5d0921323 100644 --- a/asm/battle_controllers.s +++ b/asm/battle_controllers.s @@ -14,13 +14,13 @@ sub_800D230: @ 800D230 ands r0, r1 cmp r0, 0 beq _0800D262 - ldr r0, _0800D26C @ =gUnknown_3003F3C + ldr r0, _0800D26C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0800D24A bl sub_800B1F4 _0800D24A: - ldr r0, _0800D270 @ =gUnknown_3003F64 + ldr r0, _0800D270 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0800D256 @@ -35,8 +35,8 @@ _0800D262: bx r0 .align 2, 0 _0800D268: .4byte gBattleTypeFlags -_0800D26C: .4byte gUnknown_3003F3C -_0800D270: .4byte gUnknown_3003F64 +_0800D26C: .4byte gWirelessCommType +_0800D270: .4byte gReceivedRemoteLinkPlayers _0800D274: .4byte sub_8081A90 thumb_func_end sub_800D230 @@ -1229,7 +1229,7 @@ _0800DBDE: ldrh r0, [r1, 0x1E] adds r0, 0x1 strh r0, [r1, 0x1E] - ldr r0, _0800DBF0 @ =gUnknown_3003F64 + ldr r0, _0800DBF0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0800DBEE @@ -1237,7 +1237,7 @@ _0800DBDE: _0800DBEE: b _0800DD1C .align 2, 0 -_0800DBF0: .4byte gUnknown_3003F64 +_0800DBF0: .4byte gReceivedRemoteLinkPlayers _0800DBF4: bl GetLinkPlayerCount_2 lsls r0, 24 @@ -1403,7 +1403,7 @@ sub_800DD28: @ 800DD28 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _0800DD5C @ =gUnknown_3003F64 + ldr r0, _0800DD5C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _0800DE28 @@ -1420,15 +1420,15 @@ sub_800DD28: @ 800DD28 bne _0800DE28 bl sub_80FBB4C movs r4, 0 - ldr r0, _0800DD6C @ =gUnknown_2022118 + ldr r0, _0800DD6C @ =gBlockRecvBuffer mov r10, r0 b _0800DE1C .align 2, 0 -_0800DD5C: .4byte gUnknown_3003F64 +_0800DD5C: .4byte gReceivedRemoteLinkPlayers _0800DD60: .4byte gBattleTypeFlags _0800DD64: .4byte gLinkPlayers _0800DD68: .4byte 0x00002211 -_0800DD6C: .4byte gUnknown_2022118 +_0800DD6C: .4byte gBlockRecvBuffer _0800DD70: bl GetBlockReceivedStatus lsls r0, 24 @@ -1447,7 +1447,7 @@ _0800DD70: lsls r0, r4, 8 mov r4, r10 adds r3, r0, r4 - ldr r1, _0800DE3C @ =gUnknown_202211C + ldr r1, _0800DE3C @ =gBlockRecvBuffer + 4 adds r0, r1 ldrh r6, [r0] ldr r7, _0800DE40 @ =gTasks @@ -1534,7 +1534,7 @@ _0800DE28: bx r0 .align 2, 0 _0800DE38: .4byte gBitTable -_0800DE3C: .4byte gUnknown_202211C +_0800DE3C: .4byte gBlockRecvBuffer + 4 _0800DE40: .4byte gTasks _0800DE44: .4byte gUnknown_202286D _0800DE48: .4byte gUnknown_2023FF0 diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s index dd319645e..9ae7accdc 100644 --- a/asm/battle_gfx_sfx_util.s +++ b/asm/battle_gfx_sfx_util.s @@ -854,9 +854,9 @@ _0803443C: movs r2, 0x6 bl BlendPalette lsls r1, r7, 1 - ldr r0, _0803448C @ =gUnknown_20375F8 + ldr r0, _0803448C @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _08034490 @ =gUnknown_20371F8 + ldr r2, _08034490 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _08034494 @ =0x04000008 bl CpuSet @@ -875,8 +875,8 @@ _0803447C: .4byte gBattleStruct _08034480: .4byte gBattleMonForms _08034484: .4byte gUnknown_2024018 _08034488: .4byte 0x00007fff -_0803448C: .4byte gUnknown_20375F8 -_08034490: .4byte gUnknown_20371F8 +_0803448C: .4byte gPlttBufferFaded +_08034490: .4byte gPlttBufferUnfaded _08034494: .4byte 0x04000008 thumb_func_end BattleLoadOpponentMonSpriteGfx @@ -1059,9 +1059,9 @@ _080345FC: movs r2, 0x6 bl BlendPalette lsls r1, r7, 1 - ldr r0, _0803464C @ =gUnknown_20375F8 + ldr r0, _0803464C @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _08034650 @ =gUnknown_20371F8 + ldr r2, _08034650 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _08034654 @ =0x04000008 bl CpuSet @@ -1080,8 +1080,8 @@ _0803463C: .4byte gBattleStruct _08034640: .4byte gBattleMonForms _08034644: .4byte gUnknown_2024018 _08034648: .4byte 0x00007fff -_0803464C: .4byte gUnknown_20375F8 -_08034650: .4byte gUnknown_20371F8 +_0803464C: .4byte gPlttBufferFaded +_08034650: .4byte gPlttBufferUnfaded _08034654: .4byte 0x04000008 thumb_func_end sub_8034498 @@ -1466,7 +1466,7 @@ _0803495A: thumb_func_start LoadBattleBarGfx LoadBattleBarGfx: @ 8034964 push {lr} - ldr r0, _0803497C @ =gUnknown_8D093D8 + ldr r0, _0803497C @ =gFile_graphics_interface_hp_numbers ldr r1, _08034980 @ =gMonSpritesGfxPtr ldr r1, [r1] movs r2, 0xBA @@ -1477,7 +1477,7 @@ LoadBattleBarGfx: @ 8034964 pop {r0} bx r0 .align 2, 0 -_0803497C: .4byte gUnknown_8D093D8 +_0803497C: .4byte gFile_graphics_interface_hp_numbers _08034980: .4byte gMonSpritesGfxPtr thumb_func_end LoadBattleBarGfx @@ -2029,9 +2029,9 @@ _08034D88: bl BlendPalette mov r3, r10 lsls r1, r3, 1 - ldr r0, _08034E40 @ =gUnknown_20375F8 + ldr r0, _08034E40 @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _08034E44 @ =gUnknown_20371F8 + ldr r2, _08034E44 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _08034E48 @ =0x04000008 bl CpuSet @@ -2054,8 +2054,8 @@ _08034E30: .4byte gUnknown_2024018 _08034E34: .4byte gBattleStruct _08034E38: .4byte gBattleMonForms _08034E3C: .4byte 0x00007fff -_08034E40: .4byte gUnknown_20375F8 -_08034E44: .4byte gUnknown_20371F8 +_08034E40: .4byte gPlttBufferFaded +_08034E44: .4byte gPlttBufferUnfaded _08034E48: .4byte 0x04000008 _08034E4C: mov r0, r9 @@ -2263,9 +2263,9 @@ _08034FFC: bl BlendPalette mov r2, r10 lsls r1, r2, 1 - ldr r0, _080350AC @ =gUnknown_20375F8 + ldr r0, _080350AC @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _080350B0 @ =gUnknown_20371F8 + ldr r2, _080350B0 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _080350B4 @ =0x04000008 bl CpuSet @@ -2327,8 +2327,8 @@ _0803509C: .4byte 0x00000181 _080350A0: .4byte gBattleStruct _080350A4: .4byte gBattleMonForms _080350A8: .4byte 0x00007fff -_080350AC: .4byte gUnknown_20375F8 -_080350B0: .4byte gUnknown_20371F8 +_080350AC: .4byte gPlttBufferFaded +_080350B0: .4byte gPlttBufferUnfaded _080350B4: .4byte 0x04000008 _080350B8: .4byte gUnknown_2024018 thumb_func_end sub_8034BF4 @@ -2351,7 +2351,7 @@ sub_80350BC: @ 80350BC lsls r0, 24 cmp r0, 0 beq _080350FC - ldr r0, _080350F4 @ =gUnknown_8D2D0B4 + ldr r0, _080350F4 @ =gFile_graphics_battle_anims_sprites_substitute_sheet ldr r1, _080350F8 @ =gMonSpritesGfxPtr ldr r1, [r1] lsls r4, r5, 2 @@ -2361,10 +2361,10 @@ sub_80350BC: @ 80350BC bl LZDecompressVram b _0803510E .align 2, 0 -_080350F4: .4byte gUnknown_8D2D0B4 +_080350F4: .4byte gFile_graphics_battle_anims_sprites_substitute_sheet _080350F8: .4byte gMonSpritesGfxPtr _080350FC: - ldr r0, _08035144 @ =gUnknown_8D2D2F4 + ldr r0, _08035144 @ =gFile_graphics_battle_anims_sprites_substitute_tilemap ldr r1, _08035148 @ =gMonSpritesGfxPtr ldr r1, [r1] lsls r4, r5, 2 @@ -2375,7 +2375,7 @@ _080350FC: _0803510E: movs r3, 0x1 lsls r6, 4 - ldr r7, _0803514C @ =gUnknown_8D2D090 + ldr r7, _0803514C @ =gFile_graphics_battle_anims_sprites_substitute_palette ldr r0, _08035148 @ =gMonSpritesGfxPtr ldr r0, [r0] adds r0, 0x4 @@ -2401,9 +2401,9 @@ _08035120: bl LoadCompressedPalette b _0803519A .align 2, 0 -_08035144: .4byte gUnknown_8D2D2F4 +_08035144: .4byte gFile_graphics_battle_anims_sprites_substitute_tilemap _08035148: .4byte gMonSpritesGfxPtr -_0803514C: .4byte gUnknown_8D2D090 +_0803514C: .4byte gFile_graphics_battle_anims_sprites_substitute_palette _08035150: .4byte 0x040000d4 _08035154: .4byte 0x84000200 _08035158: diff --git a/asm/battle_interface.s b/asm/battle_interface.s index 85c9e4af9..8e109b6d6 100644 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -3770,7 +3770,7 @@ sub_804981C: @ 804981C lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _0804991C @@ -4066,7 +4066,7 @@ _08049AF4: movs r2, 0x2 bl FillPalette lsls r4, 1 - ldr r0, _08049BCC @ =gUnknown_20373F8 + ldr r0, _08049BCC @ =gPlttBufferUnfaded + 0x200 adds r0, r4, r0 ldr r1, _08049BD0 @ =0x05000200 adds r4, r1 @@ -4145,7 +4145,7 @@ _08049BB6: .align 2, 0 _08049BC4: .4byte gSprites _08049BC8: .4byte gUnknown_826055A -_08049BCC: .4byte gUnknown_20373F8 +_08049BCC: .4byte gPlttBufferUnfaded + 0x200 _08049BD0: .4byte 0x05000200 _08049BD4: .4byte 0x06010000 _08049BD8: .4byte 0x04000018 diff --git a/asm/battle_message.s b/asm/battle_message.s index 47dbf0870..029ff9ed0 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -473,7 +473,7 @@ _080D762C: ldrh r2, [r2] movs r1, 0xD muls r1, r2 - ldr r2, _080D764C @ =gUnknown_8247094 + ldr r2, _080D764C @ =gMoveNames adds r1, r2 bl StringCopy _080D763C: @@ -483,7 +483,7 @@ _080D763C: b _080D77DC .align 2, 0 _080D7648: .4byte gBattleTextBuff2 -_080D764C: .4byte gUnknown_8247094 +_080D764C: .4byte gMoveNames _080D7650: .4byte gUnknown_83FD57B _080D7654: ldr r4, _080D7694 @ =gBattleTextBuff1 @@ -1505,11 +1505,11 @@ _080D7ED4: _080D7ED6: movs r0, 0xD muls r1, r0 - ldr r0, _080D7EE0 @ =gUnknown_8247094 + ldr r0, _080D7EE0 @ =gMoveNames adds r4, r1, r0 b _080D8382 .align 2, 0 -_080D7EE0: .4byte gUnknown_8247094 +_080D7EE0: .4byte gMoveNames _080D7EE4: ldr r0, _080D7F1C @ =gBattleTypeFlags ldr r1, [r0] @@ -1834,11 +1834,11 @@ _080D8162: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 - ldr r1, _080D8170 @ =gUnknown_2022744 + ldr r1, _080D8170 @ =gLinkPlayers + 8 adds r4, r0, r1 b _080D8382 .align 2, 0 -_080D8170: .4byte gUnknown_2022744 +_080D8170: .4byte gLinkPlayers + 8 _080D8174: ldr r4, _080D8184 @ =gLinkPlayers lsls r0, r7, 3 @@ -1888,12 +1888,12 @@ _080D81C8: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _080D81D8 @ =gUnknown_2022744 + ldr r0, _080D81D8 @ =gLinkPlayers + 8 adds r4, r1, r0 b _080D8382 .align 2, 0 _080D81D4: .4byte gBattleScripting -_080D81D8: .4byte gUnknown_2022744 +_080D81D8: .4byte gLinkPlayers + 8 _080D81DC: ldr r0, _080D81E4 @ =gSaveBlock2Ptr ldr r4, [r0] @@ -2294,11 +2294,11 @@ _080D84EC: orrs r1, r0 movs r0, 0xD muls r1, r0 - ldr r0, _080D8500 @ =gUnknown_8247094 + ldr r0, _080D8500 @ =gMoveNames adds r1, r0 b _080D868E .align 2, 0 -_080D8500: .4byte gUnknown_8247094 +_080D8500: .4byte gMoveNames _080D8504: adds r0, r5, r7 ldrb r0, [r0, 0x1] @@ -2958,7 +2958,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC ldrb r1, [r1] bl GetCurrentPpToMaxPpState lsls r0, 24 - ldr r5, _080D8A48 @ =gUnknown_20371F8 + ldr r5, _080D8A48 @ =gPlttBufferUnfaded lsrs r0, 22 adds r0, r4 ldrh r1, [r0] @@ -2968,7 +2968,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC ldrh r0, [r0, 0x2] adds r5, 0xB6 strh r0, [r5] - ldr r4, _080D8A4C @ =gUnknown_20376B0 + ldr r4, _080D8A4C @ =gPlttBufferFaded + 0xB8 adds r0, r2, 0 adds r1, r4, 0 movs r2, 0x1 @@ -2986,8 +2986,8 @@ _080D8A38: .4byte gActiveBattler _080D8A3C: .4byte gUnknown_2022BC8 _080D8A40: .4byte gUnknown_8D2FBB4 _080D8A44: .4byte gUnknown_2023FFC -_080D8A48: .4byte gUnknown_20371F8 -_080D8A4C: .4byte gUnknown_20376B0 +_080D8A48: .4byte gPlttBufferUnfaded +_080D8A4C: .4byte gPlttBufferFaded + 0xB8 thumb_func_end SetPpNumbersPaletteInMoveSelection thumb_func_start GetCurrentPpToMaxPpState diff --git a/asm/battle_records.s b/asm/battle_records.s index 4a134cd0c..392161676 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -129,7 +129,7 @@ _080CD338: bl sub_80CD628 ldr r0, _080CD350 @ =sub_80CD38C bl SetVBlankCallback - ldr r0, _080CD354 @ =gUnknown_20370C0 + ldr r0, _080CD354 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 beq _080CD358 @@ -137,7 +137,7 @@ _080CD338: b _080CD35C .align 2, 0 _080CD350: .4byte sub_80CD38C -_080CD354: .4byte gUnknown_20370C0 +_080CD354: .4byte gSpecialVar_0x8004 _080CD358: bl sub_80CDBE4 _080CD35C: @@ -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 29dcfecca..ed0e6cb50 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 gPlayerPartyCount @@ -15692,7 +15692,7 @@ _080254F4: .4byte sub_8077764 _080254F8: .4byte gMoveToLearn _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 @@ -31945,7 +31945,7 @@ _0802D5D8: lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 movs r4, 0xA cmp r0, 0 @@ -32356,7 +32356,7 @@ sub_802D95C: @ 802D95C lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _0802D9B4 @@ -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 @@ -32539,7 +32539,7 @@ _0802DAE0: bl sub_810C1CC str r4, [sp, 0x14] add r0, sp, 0x14 - ldr r1, _0802DB48 @ =gUnknown_20375F8 + ldr r1, _0802DB48 @ =gPlttBufferFaded ldr r2, _0802DB4C @ =0x05000080 bl CpuSet ldr r0, _0802DB50 @ =0x0001ffff @@ -32562,12 +32562,12 @@ _0802DB36: .align 2, 0 _0802DB40: .4byte gBattleMons _0802DB44: .4byte 0x0000ffff -_0802DB48: .4byte gUnknown_20375F8 +_0802DB48: .4byte gPlttBufferFaded _0802DB4C: .4byte 0x05000080 _0802DB50: .4byte 0x0001ffff _0802DB54: .4byte gUnknown_2023E82 _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_setup.s b/asm/battle_setup.s index 81054e687..499d565f0 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -721,13 +721,13 @@ _0807FC30: ldrb r0, [r4] cmp r0, 0x1 bne _0807FC40 - ldr r0, _0807FC3C @ =gUnknown_20370D0 + ldr r0, _0807FC3C @ =gSpecialVar_Result strh r1, [r0] b _0807FC46 .align 2, 0 -_0807FC3C: .4byte gUnknown_20370D0 +_0807FC3C: .4byte gSpecialVar_Result _0807FC40: - ldr r1, _0807FC54 @ =gUnknown_20370D0 + ldr r1, _0807FC54 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] _0807FC46: @@ -739,7 +739,7 @@ _0807FC4C: pop {r0} bx r0 .align 2, 0 -_0807FC54: .4byte gUnknown_20370D0 +_0807FC54: .4byte gSpecialVar_Result _0807FC58: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_end sub_807FBF0 @@ -757,7 +757,7 @@ sub_807FC5C: @ 807FC5C ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r5, r0, 16 lsls r0, r5, 24 @@ -907,7 +907,7 @@ GetBattleTransitionTypeByMap: @ 807FD90 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 bl sav1_get_flash_used_on_map @@ -1503,7 +1503,7 @@ battle_80801F0: @ 80801F0 ldrh r1, [r0] cmp r1, 0 beq _08080212 - ldr r0, _0808021C @ =gUnknown_20370D2 + ldr r0, _0808021C @ =gSpecialVar_LastTalked strh r1, [r0] lsls r0, r1, 24 lsrs r0, 24 @@ -1519,7 +1519,7 @@ _08080212: bx r0 .align 2, 0 _08080218: .4byte gUnknown_20386B0 -_0808021C: .4byte gUnknown_20370D2 +_0808021C: .4byte gSpecialVar_LastTalked _08080220: .4byte gSaveBlock1Ptr _08080224: .4byte gUnknown_3005074 thumb_func_end battle_80801F0 @@ -1649,7 +1649,7 @@ TrainerWantsBattle: @ 8080334 lsrs r0, 24 ldr r2, _08080368 @ =gUnknown_3005074 strb r0, [r2] - ldr r4, _0808036C @ =gUnknown_20370D2 + ldr r4, _0808036C @ =gSpecialVar_LastTalked ldr r3, _08080370 @ =gMapObjects lsls r2, r0, 3 adds r2, r0 @@ -1668,7 +1668,7 @@ TrainerWantsBattle: @ 8080334 bx r0 .align 2, 0 _08080368: .4byte gUnknown_3005074 -_0808036C: .4byte gUnknown_20370D2 +_0808036C: .4byte gSpecialVar_LastTalked _08080370: .4byte gMapObjects _08080374: .4byte gUnknown_81A4EB4 thumb_func_end TrainerWantsBattle @@ -1859,7 +1859,7 @@ sub_80804AC: @ 80804AC adds r1, r0, 0 cmp r1, 0x1 bne _080804E8 - ldr r0, _080804E0 @ =gUnknown_20370D0 + ldr r0, _080804E0 @ =gSpecialVar_Result strh r1, [r0] ldr r0, _080804E4 @ =gUnknown_20386CC ldrh r0, [r0] @@ -1871,10 +1871,10 @@ sub_80804AC: @ 80804AC .align 2, 0 _080804D8: .4byte gUnknown_20386AC _080804DC: .4byte gUnknown_2023E8A -_080804E0: .4byte gUnknown_20370D0 +_080804E0: .4byte gSpecialVar_Result _080804E4: .4byte gUnknown_20386CC _080804E8: - ldr r0, _08080500 @ =gUnknown_20370D0 + ldr r0, _08080500 @ =gSpecialVar_Result movs r1, 0 strh r1, [r0] _080804EE: @@ -1884,7 +1884,7 @@ _080804EE: bl sub_81139BC b _0808054E .align 2, 0 -_08080500: .4byte gUnknown_20370D0 +_08080500: .4byte gSpecialVar_Result _08080504: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _08080508: ldr r0, _0808051C @ =gTrainerBattleOpponent_A diff --git a/asm/battle_tower.s b/asm/battle_tower.s index 10b07d2e0..82922b88f 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -143,8 +143,8 @@ sub_80E5A70: @ 80E5A70 add r4, sp, 0x28 movs r0, 0 strb r0, [r4] - bl sub_80E7490 - ldr r0, _080E5AA4 @ =gUnknown_20370D0 + bl ValidateEReaderTrainer + ldr r0, _080E5AA4 @ =gSpecialVar_Result ldrh r0, [r0] adds r7, r4, 0 cmp r0, 0 @@ -160,7 +160,7 @@ _080E5A9E: movs r0, 0 b _080E5B02 .align 2, 0 -_080E5AA4: .4byte gUnknown_20370D0 +_080E5AA4: .4byte gSpecialVar_Result _080E5AA8: .4byte gSaveBlock2Ptr _080E5AAC: .4byte 0x000004a2 _080E5AB0: @@ -1506,7 +1506,7 @@ sub_80E64C0: @ 80E64C0 lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _080E6554 @@ -1747,7 +1747,7 @@ _080E6662: adds r2, r0, 0 lsls r2, 16 lsrs r2, 16 - ldr r5, _080E6728 @ =gUnknown_20370D0 + ldr r5, _080E6728 @ =gSpecialVar_Result ldrb r3, [r5] str r4, [sp] add r0, sp, 0x10 @@ -1769,7 +1769,7 @@ _080E6662: ldr r1, _080E672C @ =gStringVar1 movs r0, 0xFF strb r0, [r1] - ldr r1, _080E6730 @ =gUnknown_20370C0 + ldr r1, _080E6730 @ =gSpecialVar_0x8004 movs r0, 0x1 strh r0, [r1] movs r0, 0 @@ -1810,9 +1810,9 @@ _080E6704: b _080E6742 .align 2, 0 _080E6724: .4byte gPlayerParty -_080E6728: .4byte gUnknown_20370D0 +_080E6728: .4byte gSpecialVar_Result _080E672C: .4byte gStringVar1 -_080E6730: .4byte gUnknown_20370C0 +_080E6730: .4byte gSpecialVar_0x8004 _080E6734: .4byte gUnknown_84020C4 _080E6738: .4byte 0x0000ffff _080E673C: .4byte gUnknown_83FE860 @@ -1825,7 +1825,7 @@ _080E6742: .align 2, 0 _080E674C: .4byte gUnknown_83FE864 _080E6750: - ldr r1, _080E6780 @ =gUnknown_20370C0 + ldr r1, _080E6780 @ =gSpecialVar_0x8004 movs r0, 0 strh r0, [r1] ldr r0, _080E6784 @ =gSaveBlock2Ptr @@ -1851,7 +1851,7 @@ _080E6770: pop {r0} bx r0 .align 2, 0 -_080E6780: .4byte gUnknown_20370C0 +_080E6780: .4byte gSpecialVar_0x8004 _080E6784: .4byte gSaveBlock2Ptr _080E6788: .4byte 0x0000055c thumb_func_end sub_80E6648 @@ -2053,7 +2053,7 @@ sub_80E6900: @ 80E6900 push {r4-r6,lr} sub sp, 0x4 ldr r0, _080E691C @ =gUnknown_203AAB8 - ldr r1, _080E6920 @ =gUnknown_20370C0 + ldr r1, _080E6920 @ =gSpecialVar_0x8004 ldrh r1, [r1] strh r1, [r0] ldrh r2, [r0] @@ -2066,7 +2066,7 @@ sub_80E6900: @ 80E6900 b _080E69E6 .align 2, 0 _080E691C: .4byte gUnknown_203AAB8 -_080E6920: .4byte gUnknown_20370C0 +_080E6920: .4byte gSpecialVar_0x8004 _080E6924: cmp r2, 0x2 beq _080E6998 @@ -2180,7 +2180,7 @@ sub_80E6A0C: @ 80E6A0C ldrb r0, [r0] lsls r0, 31 lsrs r5, r0, 31 - ldr r0, _080E6A3C @ =gUnknown_20370C0 + ldr r0, _080E6A3C @ =gSpecialVar_0x8004 ldrh r0, [r0] adds r6, r1, 0 cmp r0, 0xE @@ -2195,7 +2195,7 @@ _080E6A28: .align 2, 0 _080E6A34: .4byte gSaveBlock2Ptr _080E6A38: .4byte 0x0000055c -_080E6A3C: .4byte gUnknown_20370C0 +_080E6A3C: .4byte gSpecialVar_0x8004 _080E6A40: .4byte _080E6A44 .align 2, 0 _080E6A44: @@ -2339,7 +2339,7 @@ _080E6B66: adds r0, 0x1 strh r0, [r1] bl sub_80E6E48 - ldr r1, _080E6B9C @ =gUnknown_20370D0 + ldr r1, _080E6B9C @ =gSpecialVar_Result ldr r0, [r6] adds r0, r4 adds r0, r5 @@ -2354,7 +2354,7 @@ _080E6B66: .align 2, 0 _080E6B94: .4byte 0x0000056c _080E6B98: .4byte 0x0000270e -_080E6B9C: .4byte gUnknown_20370D0 +_080E6B9C: .4byte gSpecialVar_Result _080E6BA0: .4byte gStringVar1 _080E6BA4: ldr r0, [r6] @@ -2370,7 +2370,7 @@ _080E6BA4: strh r0, [r2] _080E6BBA: bl sub_80E6E48 - ldr r0, _080E6BD4 @ =gUnknown_20370D0 + ldr r0, _080E6BD4 @ =gSpecialVar_Result ldr r1, [r6] adds r1, r4 adds r1, r5 @@ -2381,7 +2381,7 @@ _080E6BC6: .align 2, 0 _080E6BCC: .4byte 0x00000564 _080E6BD0: .4byte 0x00000595 -_080E6BD4: .4byte gUnknown_20370D0 +_080E6BD4: .4byte gSpecialVar_Result _080E6BD8: ldr r3, [r6] ldr r0, _080E6BF8 @ =gSpecialVar_0x8005 @@ -2481,7 +2481,7 @@ sub_80E6C8C: @ 80E6C8C ldrb r0, [r0] lsls r0, 31 lsrs r4, r0, 31 - ldr r0, _080E6CBC @ =gUnknown_20370C0 + ldr r0, _080E6CBC @ =gSpecialVar_0x8004 ldrh r0, [r0] adds r3, r1, 0 cmp r0, 0xE @@ -2496,7 +2496,7 @@ _080E6CA8: .align 2, 0 _080E6CB4: .4byte gSaveBlock2Ptr _080E6CB8: .4byte 0x0000055c -_080E6CBC: .4byte gUnknown_20370C0 +_080E6CBC: .4byte gSpecialVar_0x8004 _080E6CC0: .4byte _080E6CC4 .align 2, 0 _080E6CC4: @@ -2516,17 +2516,17 @@ _080E6CC4: .4byte _080E6DD4 .4byte _080E6DF4 _080E6D00: - ldr r0, _080E6D0C @ =gUnknown_20370D0 + ldr r0, _080E6D0C @ =gSpecialVar_Result ldr r1, [r3] ldr r3, _080E6D10 @ =0x0000055e adds r1, r3 adds r1, r4 b _080E6D60 .align 2, 0 -_080E6D0C: .4byte gUnknown_20370D0 +_080E6D0C: .4byte gSpecialVar_Result _080E6D10: .4byte 0x0000055e _080E6D14: - ldr r0, _080E6D24 @ =gUnknown_20370D0 + ldr r0, _080E6D24 @ =gSpecialVar_Result ldr r1, [r3] ldr r2, _080E6D28 @ =0x0000055c adds r1, r2 @@ -2534,19 +2534,19 @@ _080E6D14: lsls r1, 31 b _080E6D7C .align 2, 0 -_080E6D24: .4byte gUnknown_20370D0 +_080E6D24: .4byte gSpecialVar_Result _080E6D28: .4byte 0x0000055c _080E6D2C: - ldr r2, _080E6D38 @ =gUnknown_20370D0 + ldr r2, _080E6D38 @ =gSpecialVar_Result ldr r0, [r3] lsls r1, r4, 1 movs r3, 0xAC lsls r3, 3 b _080E6D44 .align 2, 0 -_080E6D38: .4byte gUnknown_20370D0 +_080E6D38: .4byte gSpecialVar_Result _080E6D3C: - ldr r2, _080E6D50 @ =gUnknown_20370D0 + ldr r2, _080E6D50 @ =gSpecialVar_Result ldr r0, [r3] lsls r1, r4, 1 ldr r3, _080E6D54 @ =0x00000564 @@ -2557,10 +2557,10 @@ _080E6D44: strh r0, [r2] b _080E6E08 .align 2, 0 -_080E6D50: .4byte gUnknown_20370D0 +_080E6D50: .4byte gSpecialVar_Result _080E6D54: .4byte 0x00000564 _080E6D58: - ldr r0, _080E6D68 @ =gUnknown_20370D0 + ldr r0, _080E6D68 @ =gSpecialVar_Result ldr r1, [r3] ldr r2, _080E6D6C @ =0x0000056c adds r1, r2 @@ -2569,10 +2569,10 @@ _080E6D60: strh r1, [r0] b _080E6E08 .align 2, 0 -_080E6D68: .4byte gUnknown_20370D0 +_080E6D68: .4byte gSpecialVar_Result _080E6D6C: .4byte 0x0000056c _080E6D70: - ldr r0, _080E6D84 @ =gUnknown_20370D0 + ldr r0, _080E6D84 @ =gSpecialVar_Result ldr r1, [r3] ldr r3, _080E6D88 @ =0x0000055c adds r1, r3 @@ -2583,16 +2583,16 @@ _080E6D7C: strh r1, [r0] b _080E6E08 .align 2, 0 -_080E6D84: .4byte gUnknown_20370D0 +_080E6D84: .4byte gSpecialVar_Result _080E6D88: .4byte 0x0000055c _080E6D8C: adds r0, r4, 0 bl sub_80E7188 - ldr r1, _080E6D98 @ =gUnknown_20370D0 + ldr r1, _080E6D98 @ =gSpecialVar_Result strh r0, [r1] b _080E6E08 .align 2, 0 -_080E6D98: .4byte gUnknown_20370D0 +_080E6D98: .4byte gSpecialVar_Result _080E6D9C: ldr r0, [r3] ldr r1, _080E6DAC @ =0x0000057a @@ -2868,7 +2868,7 @@ sub_80E6FB8: @ 80E6FB8 ldrb r0, [r0] lsls r0, 31 lsrs r5, r0, 31 - ldr r0, _080E7044 @ =gUnknown_20370C0 + ldr r0, _080E7044 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x3 beq _080E6FD4 @@ -2899,7 +2899,7 @@ _080E6FF2: ldr r2, _080E7050 @ =0x0000055d adds r0, r2 strb r1, [r0] - ldr r0, _080E7044 @ =gUnknown_20370C0 + ldr r0, _080E7044 @ =gSpecialVar_0x8004 ldrh r1, [r0] cmp r1, 0x3 beq _080E7016 @@ -2928,7 +2928,7 @@ _080E7016: .align 2, 0 _080E703C: .4byte gSaveBlock2Ptr _080E7040: .4byte 0x0000055c -_080E7044: .4byte gUnknown_20370C0 +_080E7044: .4byte gSpecialVar_0x8004 _080E7048: .4byte 0x00000564 _080E704C: .4byte gUnknown_2023E8A _080E7050: .4byte 0x0000055d @@ -3230,16 +3230,16 @@ sub_80E724C: @ 80E724C ldrh r0, [r0] ldr r1, _080E7290 @ =gStringVar1 bl sub_8099E90 - ldr r0, _080E7294 @ =gUnknown_20370D0 + ldr r0, _080E7294 @ =gSpecialVar_Result strh r4, [r0] b _080E72AA .align 2, 0 _080E7288: .4byte gSaveBlock2Ptr _080E728C: .4byte 0x0000055c _080E7290: .4byte gStringVar1 -_080E7294: .4byte gUnknown_20370D0 +_080E7294: .4byte gSpecialVar_Result _080E7298: - ldr r1, _080E72B0 @ =gUnknown_20370D0 + ldr r1, _080E72B0 @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] ldr r0, [r5] @@ -3253,7 +3253,7 @@ _080E72AA: pop {r0} bx r0 .align 2, 0 -_080E72B0: .4byte gUnknown_20370D0 +_080E72B0: .4byte gSpecialVar_Result _080E72B4: .4byte 0x0000055e thumb_func_end sub_80E724C @@ -3273,7 +3273,7 @@ sub_80E72B8: @ 80E72B8 beq _080E72D2 movs r7, 0x45 _080E72D2: - ldr r4, _080E733C @ =gUnknown_20370D0 + ldr r4, _080E733C @ =gSpecialVar_Result movs r0, 0 strh r0, [r4] adds r0, r1, 0 @@ -3312,7 +3312,7 @@ _080E731A: cmp r5, 0x2 ble _080E72EA _080E7320: - ldr r0, _080E733C @ =gUnknown_20370D0 + ldr r0, _080E733C @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0 beq _080E732E @@ -3325,7 +3325,7 @@ _080E732E: .align 2, 0 _080E7334: .4byte gSaveBlock2Ptr _080E7338: .4byte 0x0000055c -_080E733C: .4byte gUnknown_20370D0 +_080E733C: .4byte gSpecialVar_Result _080E7340: .4byte 0x0000056d _080E7344: .4byte gPlayerParty thumb_func_end sub_80E72B8 @@ -3497,10 +3497,10 @@ _080E7488: .4byte gSaveBlock2Ptr _080E748C: .4byte 0x000004a4 thumb_func_end sub_80E7460 - thumb_func_start sub_80E7490 -sub_80E7490: @ 80E7490 + thumb_func_start ValidateEReaderTrainer +ValidateEReaderTrainer: @ 80E7490 push {r4-r6,lr} - ldr r2, _080E74C0 @ =gUnknown_20370D0 + ldr r2, _080E74C0 @ =gSpecialVar_Result movs r0, 0 strh r0, [r2] ldr r1, _080E74C4 @ =gSaveBlock2Ptr @@ -3524,7 +3524,7 @@ _080E74AA: strh r0, [r2] b _080E74F6 .align 2, 0 -_080E74C0: .4byte gUnknown_20370D0 +_080E74C0: .4byte gSpecialVar_Result _080E74C4: .4byte gSaveBlock2Ptr _080E74C8: movs r4, 0 @@ -3547,7 +3547,7 @@ _080E74CE: lsls r3, 3 adds r0, r1, r3 bl sub_80E7524 - ldr r1, _080E74FC @ =gUnknown_20370D0 + ldr r1, _080E74FC @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] _080E74F6: @@ -3555,8 +3555,8 @@ _080E74F6: pop {r0} bx r0 .align 2, 0 -_080E74FC: .4byte gUnknown_20370D0 - thumb_func_end sub_80E7490 +_080E74FC: .4byte gSpecialVar_Result + thumb_func_end ValidateEReaderTrainer thumb_func_start sub_80E7500 sub_80E7500: @ 80E7500 diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 921482d16..ae1c7fa08 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -138,8 +138,8 @@ Transition_Phase1: @ 80D09B0 push {r4,lr} adds r4, r0, 0 bl sub_807B05C - ldr r0, _080D09DC @ =gUnknown_20375F8 - ldr r1, _080D09E0 @ =gUnknown_20371F8 + ldr r0, _080D09DC @ =gPlttBufferFaded + ldr r1, _080D09E0 @ =gPlttBufferUnfaded ldr r2, _080D09E4 @ =0x04000100 bl CpuSet ldr r1, _080D09E8 @ =gUnknown_83FA320 @@ -155,8 +155,8 @@ Transition_Phase1: @ 80D09B0 movs r0, 0x1 b _080D09FA .align 2, 0 -_080D09DC: .4byte gUnknown_20375F8 -_080D09E0: .4byte gUnknown_20371F8 +_080D09DC: .4byte gPlttBufferFaded +_080D09E0: .4byte gPlttBufferUnfaded _080D09E4: .4byte 0x04000100 _080D09E8: .4byte gUnknown_83FA320 _080D09EC: @@ -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 @@ -1522,7 +1522,7 @@ Phase2_Transition_PokeballsTrail_Func2: @ 80D144C ands r5, r0 movs r1, 0 mov r8, r4 - ldr r6, _080D14D4 @ =gUnknown_20386E0 + ldr r6, _080D14D4 @ =gFieldEffectArguments _080D147A: lsls r5, 16 asrs r5, 16 @@ -1567,7 +1567,7 @@ _080D147A: .align 2, 0 _080D14CC: .4byte gUnknown_83FA400 _080D14D0: .4byte gUnknown_83FA404 -_080D14D4: .4byte gUnknown_20386E0 +_080D14D4: .4byte gFieldEffectArguments thumb_func_end Phase2_Transition_PokeballsTrail_Func2 thumb_func_start Phase2_Transition_PokeballsTrail_Func3 @@ -1596,7 +1596,7 @@ _080D1500: .4byte sub_80D13C8 FldEff_Pokeball: @ 80D1504 push {r4,r5,lr} ldr r0, _080D1560 @ =gUnknown_83FA5CC - ldr r5, _080D1564 @ =gUnknown_20386E0 + ldr r5, _080D1564 @ =gFieldEffectArguments movs r2, 0 ldrsh r1, [r5, r2] movs r3, 0x4 @@ -1639,7 +1639,7 @@ FldEff_Pokeball: @ 80D1504 bx r1 .align 2, 0 _080D1560: .4byte gUnknown_83FA5CC -_080D1564: .4byte gUnknown_20386E0 +_080D1564: .4byte gFieldEffectArguments _080D1568: .4byte gSprites _080D156C: .4byte 0x0000ffff thumb_func_end FldEff_Pokeball @@ -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.s b/asm/berry.s index 8b9593a2a..5537e3590 100644 --- a/asm/berry.s +++ b/asm/berry.s @@ -89,8 +89,8 @@ _0809C7BC: .4byte 0x000030ec _0809C7C0: .4byte 0x0100001a thumb_func_end sub_809C794 - thumb_func_start sub_809C7C4 -sub_809C7C4: @ 809C7C4 + thumb_func_start SetEnigmaBerry +SetEnigmaBerry: @ 809C7C4 push {r4-r7,lr} adds r4, r0, 0 bl sub_809C794 @@ -144,7 +144,7 @@ _0809C828: .4byte 0x000030ec _0809C82C: .4byte 0x00003108 _0809C830: .4byte 0x00000516 _0809C834: .4byte 0x00000529 - thumb_func_end sub_809C7C4 + thumb_func_end SetEnigmaBerry thumb_func_start GetEnigmaBerryChecksum GetEnigmaBerryChecksum: @ 809C838 diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s index 8d79dd1fe..b58832931 100644 --- a/asm/berry_pouch.s +++ b/asm/berry_pouch.s @@ -52,7 +52,7 @@ _0813CD98: strb r0, [r1, 0x6] movs r2, 0 ldr r6, _0813CDF0 @ =gTextFlags - ldr r0, _0813CDF4 @ =gUnknown_203AD30 + ldr r0, _0813CDF4 @ =gSpecialVar_ItemId mov r12, r0 ldr r1, _0813CDF8 @ =sub_813CE30 mov r8, r1 @@ -89,7 +89,7 @@ _0813CDE2: .align 2, 0 _0813CDEC: .4byte gUnknown_203F370 _0813CDF0: .4byte gTextFlags -_0813CDF4: .4byte gUnknown_203AD30 +_0813CDF4: .4byte gSpecialVar_ItemId _0813CDF8: .4byte sub_813CE30 _0813CDFC: .4byte 0x0000080c thumb_func_end sub_813CD50 @@ -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 @@ -948,7 +948,7 @@ sub_813D4D0: @ 813D4D0 bl CopyWindowToVram b _0813D52A _0813D514: - ldr r2, _0813D534 @ =gUnknown_841623B + ldr r2, _0813D534 @ =gFameCheckerText_ListMenuCursor str r5, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -964,7 +964,7 @@ _0813D52A: pop {r0} bx r0 .align 2, 0 -_0813D534: .4byte gUnknown_841623B +_0813D534: .4byte gFameCheckerText_ListMenuCursor thumb_func_end sub_813D4D0 thumb_func_start sub_813D538 @@ -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 @@ -1708,16 +1708,16 @@ _0813DA9E: bne _0813DAEC movs r0, 0x5 bl PlaySE - ldr r0, _0813DAE8 @ =gUnknown_203AD30 + ldr r0, _0813DAE8 @ =gSpecialVar_ItemId mov r1, r8 strh r1, [r0] 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 +_0813DAE8: .4byte gSpecialVar_ItemId _0813DAEC: movs r0, 0x2 negs r0, r0 @@ -1749,11 +1749,11 @@ _0813DB10: lsrs r1, 16 movs r0, 0x5 bl sub_809A798 - ldr r1, _0813DB34 @ =gUnknown_203AD30 + ldr r1, _0813DB34 @ =gSpecialVar_ItemId b _0813DB46 .align 2, 0 _0813DB30: .4byte gUnknown_203F370 -_0813DB34: .4byte gUnknown_203AD30 +_0813DB34: .4byte gSpecialVar_ItemId _0813DB38: ldr r0, _0813DB50 @ =gUnknown_203F36C ldr r0, [r0] @@ -1761,7 +1761,7 @@ _0813DB38: cmp r5, r0 bne _0813DB58 _0813DB42: - ldr r1, _0813DB54 @ =gUnknown_203AD30 + ldr r1, _0813DB54 @ =gSpecialVar_ItemId movs r0, 0 _0813DB46: strh r0, [r1] @@ -1771,7 +1771,7 @@ _0813DB48: b _0813DB9E .align 2, 0 _0813DB50: .4byte gUnknown_203F36C -_0813DB54: .4byte gUnknown_203AD30 +_0813DB54: .4byte gSpecialVar_ItemId _0813DB58: bl sub_813D684 movs r0, 0x1 @@ -1789,7 +1789,7 @@ _0813DB58: movs r0, 0x5 adds r1, r4, 0 bl sub_809A798 - ldr r1, _0813DBA8 @ =gUnknown_203AD30 + ldr r1, _0813DBA8 @ =gSpecialVar_ItemId strh r0, [r1] ldr r0, _0813DBAC @ =gTasks lsls r1, r6, 2 @@ -1810,7 +1810,7 @@ _0813DB9E: pop {r0} bx r0 .align 2, 0 -_0813DBA8: .4byte gUnknown_203AD30 +_0813DBA8: .4byte gSpecialVar_ItemId _0813DBAC: .4byte gTasks _0813DBB0: .4byte gUnknown_8464358 thumb_func_end sub_813DA68 @@ -1878,7 +1878,7 @@ _0813DC24: cmp r0, 0x1 bne _0813DC7C _0813DC38: - ldr r0, _0813DC54 @ =gUnknown_203AD30 + ldr r0, _0813DC54 @ =gSpecialVar_ItemId ldrh r0, [r0] bl sub_80BF6A8 lsls r0, 24 @@ -1891,7 +1891,7 @@ _0813DC38: movs r0, 0x1 b _0813DC86 .align 2, 0 -_0813DC54: .4byte gUnknown_203AD30 +_0813DC54: .4byte gSpecialVar_ItemId _0813DC58: .4byte gUnknown_203F384 _0813DC5C: .4byte gUnknown_84643AC _0813DC60: .4byte gUnknown_203F388 @@ -2118,7 +2118,7 @@ sub_813DE0C: @ 813DE0C ldrb r0, [r0, 0x4] cmp r0, 0x4 bne _0813DE78 - ldr r4, _0813DE64 @ =gUnknown_203AD30 + ldr r4, _0813DE64 @ =gSpecialVar_ItemId ldrh r0, [r4] bl ItemId_GetBattleFunc cmp r0, 0 @@ -2129,7 +2129,7 @@ sub_813DE0C: @ 813DE0C .align 2, 0 _0813DE5C: .4byte gUnknown_203F388 _0813DE60: .4byte gUnknown_203F370 -_0813DE64: .4byte gUnknown_203AD30 +_0813DE64: .4byte gSpecialVar_ItemId _0813DE68: ldrh r0, [r4] bl ItemId_GetBattleFunc @@ -2142,7 +2142,7 @@ _0813DE78: lsls r0, 24 cmp r0, 0 bne _0813DEA0 - ldr r0, _0813DE9C @ =gUnknown_203AD30 + ldr r0, _0813DE9C @ =gSpecialVar_ItemId ldrh r0, [r0] bl ItemId_GetType lsls r0, 24 @@ -2153,9 +2153,9 @@ _0813DE78: bl sub_813E274 b _0813DEB0 .align 2, 0 -_0813DE9C: .4byte gUnknown_203AD30 +_0813DE9C: .4byte gSpecialVar_ItemId _0813DEA0: - ldr r0, _0813DEB8 @ =gUnknown_203AD30 + ldr r0, _0813DEB8 @ =gSpecialVar_ItemId ldrh r0, [r0] bl ItemId_GetFieldFunc adds r1, r0, 0 @@ -2166,7 +2166,7 @@ _0813DEB0: pop {r0} bx r0 .align 2, 0 -_0813DEB8: .4byte gUnknown_203AD30 +_0813DEB8: .4byte gSpecialVar_ItemId thumb_func_end sub_813DE0C thumb_func_start sub_813DEBC @@ -2494,7 +2494,7 @@ sub_813E164: @ 813E164 _0813E18A: movs r0, 0x5 bl PlaySE - ldr r0, _0813E1F4 @ =gUnknown_203AD30 + ldr r0, _0813E1F4 @ =gSpecialVar_ItemId ldrh r0, [r0] ldrh r1, [r5, 0x10] bl sub_809A1D8 @@ -2532,7 +2532,7 @@ _0813E1E4: .align 2, 0 _0813E1EC: .4byte gTasks+0x8 _0813E1F0: .4byte gMain -_0813E1F4: .4byte gUnknown_203AD30 +_0813E1F4: .4byte gSpecialVar_ItemId _0813E1F8: .4byte gUnknown_203F37A _0813E1FC: .4byte gUnknown_3005E70 thumb_func_end sub_813E164 @@ -2807,7 +2807,7 @@ sub_813E428: @ 813E428 lsls r0, 3 ldr r1, _0813E470 @ =gTasks+0x8 adds r4, r0, r1 - ldr r6, _0813E474 @ =gUnknown_203AD30 + ldr r6, _0813E474 @ =gSpecialVar_ItemId ldrh r0, [r6] bl itemid_get_market_price lsls r0, 16 @@ -2831,7 +2831,7 @@ sub_813E428: @ 813E428 b _0813E4CE .align 2, 0 _0813E470: .4byte gTasks+0x8 -_0813E474: .4byte gUnknown_203AD30 +_0813E474: .4byte gSpecialVar_ItemId _0813E478: .4byte gStringVar1 _0813E47C: .4byte gStringVar4 _0813E480: .4byte gUnknown_84168F1 @@ -3185,7 +3185,7 @@ sub_813E768: @ 813E768 bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _0813E7D8 @ =gUnknown_203AD30 + ldr r0, _0813E7D8 @ =gSpecialVar_ItemId ldrh r0, [r0] ldr r1, _0813E7DC @ =gStringVar1 bl sub_8099E90 @@ -3219,7 +3219,7 @@ sub_813E768: @ 813E768 bx r0 .align 2, 0 _0813E7D4: .4byte gTasks+0x8 -_0813E7D8: .4byte gUnknown_203AD30 +_0813E7D8: .4byte gSpecialVar_ItemId _0813E7DC: .4byte gStringVar1 _0813E7E0: .4byte gStringVar3 _0813E7E4: .4byte gStringVar4 @@ -3246,7 +3246,7 @@ sub_813E7F0: @ 813E7F0 mov r8, r1 movs r0, 0xF8 bl PlaySE - ldr r5, _0813E8C0 @ =gUnknown_203AD30 + ldr r5, _0813E8C0 @ =gSpecialVar_ItemId ldrh r0, [r5] mov r2, r8 ldrh r1, [r2, 0x10] @@ -3319,7 +3319,7 @@ sub_813E7F0: @ 813E7F0 bx r0 .align 2, 0 _0813E8BC: .4byte gTasks+0x8 -_0813E8C0: .4byte gUnknown_203AD30 +_0813E8C0: .4byte gSpecialVar_ItemId _0813E8C4: .4byte gSaveBlock1Ptr _0813E8C8: .4byte gUnknown_203F37A _0813E8CC: .4byte gUnknown_3005E70 diff --git a/asm/bike.s b/asm/bike.s index 33c989d3b..915c4bf8f 100644 --- a/asm/bike.s +++ b/asm/bike.s @@ -42,7 +42,7 @@ sub_80BD0D4: @ 80BD0D4 lsls r2, 16 lsrs r2, 16 ldr r4, _080BD0F8 @ =gUnknown_83E7D10 - ldr r3, _080BD0FC @ =gUnknown_2037078 + ldr r3, _080BD0FC @ =gPlayerAvatar ldrb r3, [r3, 0x8] lsls r3, 2 adds r3, r4 @@ -55,7 +55,7 @@ sub_80BD0D4: @ 80BD0D4 bx r1 .align 2, 0 _080BD0F8: .4byte gUnknown_83E7D10 -_080BD0FC: .4byte gUnknown_2037078 +_080BD0FC: .4byte gPlayerAvatar thumb_func_end sub_80BD0D4 thumb_func_start sub_80BD100 @@ -72,7 +72,7 @@ sub_80BD100: @ 80BD100 lsls r2, 16 lsrs r2, 16 mov r9, r2 - ldr r5, _080BD15C @ =gUnknown_2037078 + ldr r5, _080BD15C @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -105,7 +105,7 @@ sub_80BD100: @ 80BD100 movs r0, 0x3 b _080BD1B6 .align 2, 0 -_080BD15C: .4byte gUnknown_2037078 +_080BD15C: .4byte gPlayerAvatar _080BD160: .4byte gMapObjects _080BD164: .4byte gMain _080BD168: @@ -124,11 +124,11 @@ _080BD176: bne _080BD18C _080BD17E: strb r7, [r6] - ldr r1, _080BD188 @ =gUnknown_2037078 + ldr r1, _080BD188 @ =gPlayerAvatar movs r0, 0 b _080BD1B4 .align 2, 0 -_080BD188: .4byte gUnknown_2037078 +_080BD188: .4byte gPlayerAvatar _080BD18C: cmp r0, r7 beq _080BD1B0 @@ -148,7 +148,7 @@ _080BD18C: lsrs r0, 24 b _080BD1B6 _080BD1B0: - ldr r1, _080BD1C4 @ =gUnknown_2037078 + ldr r1, _080BD1C4 @ =gPlayerAvatar movs r0, 0x2 _080BD1B4: strb r0, [r1, 0x2] @@ -161,13 +161,13 @@ _080BD1B6: pop {r1} bx r1 .align 2, 0 -_080BD1C4: .4byte gUnknown_2037078 +_080BD1C4: .4byte gPlayerAvatar thumb_func_end sub_80BD100 thumb_func_start sub_80BD1C8 sub_80BD1C8: @ 80BD1C8 push {lr} - ldr r2, _080BD1E4 @ =gUnknown_2037078 + ldr r2, _080BD1E4 @ =gPlayerAvatar ldrb r1, [r2, 0x9] strb r1, [r0] movs r1, 0 @@ -179,7 +179,7 @@ sub_80BD1C8: @ 80BD1C8 pop {r1} bx r1 .align 2, 0 -_080BD1E4: .4byte gUnknown_2037078 +_080BD1E4: .4byte gPlayerAvatar thumb_func_end sub_80BD1C8 thumb_func_start sub_80BD1E8 @@ -199,7 +199,7 @@ sub_80BD1E8: @ 80BD1E8 lsls r0, 24 lsrs r5, r0, 24 adds r7, r5, 0 - ldr r4, _080BD240 @ =gUnknown_2037078 + ldr r4, _080BD240 @ =gPlayerAvatar ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -226,7 +226,7 @@ sub_80BD1E8: @ 80BD1E8 lsrs r0, 24 b _080BD270 .align 2, 0 -_080BD240: .4byte gUnknown_2037078 +_080BD240: .4byte gPlayerAvatar _080BD244: .4byte gMapObjects _080BD248: movs r0, 0x2 @@ -276,7 +276,7 @@ sub_80BD28C: @ 80BD28C push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080BD2C0 @ =gUnknown_2037078 + ldr r0, _080BD2C0 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -298,7 +298,7 @@ _080BD2B2: pop {r0} bx r0 .align 2, 0 -_080BD2C0: .4byte gUnknown_2037078 +_080BD2C0: .4byte gPlayerAvatar _080BD2C4: .4byte gMapObjects thumb_func_end sub_80BD28C @@ -308,7 +308,7 @@ sub_80BD2C8: @ 80BD2C8 lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 - ldr r0, _080BD2F8 @ =gUnknown_2037078 + ldr r0, _080BD2F8 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -326,7 +326,7 @@ sub_80BD2C8: @ 80BD2C8 bl sub_80BD27C b _080BD350 .align 2, 0 -_080BD2F8: .4byte gUnknown_2037078 +_080BD2F8: .4byte gPlayerAvatar _080BD2FC: .4byte gMapObjects _080BD300: adds r0, r4, 0 @@ -420,7 +420,7 @@ sub_80BD3A0: @ 80BD3A0 adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, _080BD404 @ =gUnknown_2037078 + ldr r0, _080BD404 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -443,7 +443,7 @@ sub_80BD3A0: @ 80BD3A0 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 add r1, sp, 0x4 @@ -462,7 +462,7 @@ sub_80BD3A0: @ 80BD3A0 pop {r1} bx r1 .align 2, 0 -_080BD404: .4byte gUnknown_2037078 +_080BD404: .4byte gPlayerAvatar _080BD408: .4byte gMapObjects thumb_func_end sub_80BD3A0 @@ -645,7 +645,7 @@ _080BD538: sub_80BD540: @ 80BD540 push {r4,lr} sub sp, 0x4 - ldr r0, _080BD57C @ =gUnknown_2037078 + ldr r0, _080BD57C @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x18 ands r0, r1 @@ -661,7 +661,7 @@ sub_80BD540: @ 80BD540 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_80BD4B8 @@ -671,7 +671,7 @@ sub_80BD540: @ 80BD540 movs r0, 0 b _080BD582 .align 2, 0 -_080BD57C: .4byte gUnknown_2037078 +_080BD57C: .4byte gPlayerAvatar _080BD580: movs r0, 0x1 _080BD582: @@ -690,7 +690,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C cmp r0, 0 beq _080BD5C0 ldr r2, _080BD5B8 @ =gMapObjects - ldr r0, _080BD5BC @ =gUnknown_2037078 + ldr r0, _080BD5BC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -705,7 +705,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C b _080BD5C2 .align 2, 0 _080BD5B8: .4byte gMapObjects -_080BD5BC: .4byte gUnknown_2037078 +_080BD5BC: .4byte gPlayerAvatar _080BD5C0: movs r0, 0x1 _080BD5C2: @@ -721,7 +721,7 @@ sub_80BD5C8: @ 80BD5C8 ldr r1, _080BD5F0 @ =gUnknown_2036E2C movs r0, 0 strb r0, [r1] - ldr r0, _080BD5F4 @ =gUnknown_2037078 + ldr r0, _080BD5F4 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x6 ands r0, r1 @@ -734,7 +734,7 @@ sub_80BD5C8: @ 80BD5C8 b _080BD618 .align 2, 0 _080BD5F0: .4byte gUnknown_2036E2C -_080BD5F4: .4byte gUnknown_2037078 +_080BD5F4: .4byte gPlayerAvatar _080BD5F8: adds r0, r2, 0 bl SetPlayerAvatarTransitionFlags @@ -757,7 +757,7 @@ _080BD618: thumb_func_start sub_80BD620 sub_80BD620: @ 80BD620 push {lr} - ldr r2, _080BD64C @ =gUnknown_2037078 + ldr r2, _080BD64C @ =gPlayerAvatar movs r3, 0 strb r3, [r2, 0x8] strb r3, [r2, 0x9] @@ -779,32 +779,32 @@ _080BD638: pop {r0} bx r0 .align 2, 0 -_080BD64C: .4byte gUnknown_2037078 +_080BD64C: .4byte gPlayerAvatar thumb_func_end sub_80BD620 thumb_func_start Bike_UpdateBikeCounterSpeed Bike_UpdateBikeCounterSpeed: @ 80BD650 lsls r0, 24 lsrs r0, 24 - ldr r2, _080BD660 @ =gUnknown_2037078 + ldr r2, _080BD660 @ =gPlayerAvatar strb r0, [r2, 0xA] lsrs r1, r0, 1 adds r0, r1 strb r0, [r2, 0xB] bx lr .align 2, 0 -_080BD660: .4byte gUnknown_2037078 +_080BD660: .4byte gPlayerAvatar thumb_func_end Bike_UpdateBikeCounterSpeed thumb_func_start sub_80BD664 sub_80BD664: @ 80BD664 - ldr r1, _080BD670 @ =gUnknown_2037078 + ldr r1, _080BD670 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0xA] strb r0, [r1, 0xB] bx lr .align 2, 0 -_080BD670: .4byte gUnknown_2037078 +_080BD670: .4byte gPlayerAvatar thumb_func_end sub_80BD664 thumb_func_start GetPlayerSpeed @@ -815,7 +815,7 @@ GetPlayerSpeed: @ 80BD674 mov r0, sp movs r2, 0x6 bl memcpy - ldr r2, _080BD6A0 @ =gUnknown_2037078 + ldr r2, _080BD6A0 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x2 ands r0, r1 @@ -829,7 +829,7 @@ GetPlayerSpeed: @ 80BD674 b _080BD6BE .align 2, 0 _080BD69C: .4byte gUnknown_83E7D1C -_080BD6A0: .4byte gUnknown_2037078 +_080BD6A0: .4byte gPlayerAvatar _080BD6A4: movs r0, 0x4 ands r0, r1 @@ -856,7 +856,7 @@ _080BD6BE: Bike_HandleBumpySlopeJump: @ 80BD6C4 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _080BD714 @ =gUnknown_2037078 + ldr r5, _080BD714 @ =gPlayerAvatar ldrb r1, [r5] movs r0, 0x4 ands r0, r1 @@ -872,7 +872,7 @@ Bike_HandleBumpySlopeJump: @ 80BD6C4 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_ReturnFalse_14 @@ -891,7 +891,7 @@ _080BD70C: pop {r0} bx r0 .align 2, 0 -_080BD714: .4byte gUnknown_2037078 +_080BD714: .4byte gPlayerAvatar thumb_func_end Bike_HandleBumpySlopeJump .align 2, 0 @ Don't pad with nop. diff --git a/asm/blend_palette.s b/asm/blend_palette.s index 5ef3cf070..7c95f18e9 100644 --- a/asm/blend_palette.s +++ b/asm/blend_palette.s @@ -26,9 +26,9 @@ BlendPalette: @ 8045274 movs r6, 0 cmp r6, r12 bcs _080452FA - ldr r0, _0804530C @ =gUnknown_20371F8 + ldr r0, _0804530C @ =gPlttBufferUnfaded mov r10, r0 - ldr r1, _08045310 @ =gUnknown_20375F8 + ldr r1, _08045310 @ =gPlttBufferFaded mov r9, r1 _080452A2: mov r0, r8 @@ -85,8 +85,8 @@ _080452FA: pop {r0} bx r0 .align 2, 0 -_0804530C: .4byte gUnknown_20371F8 -_08045310: .4byte gUnknown_20375F8 +_0804530C: .4byte gPlttBufferUnfaded +_08045310: .4byte gPlttBufferFaded thumb_func_end BlendPalette thumb_func_start sub_8045314 diff --git a/asm/cable_club.s b/asm/cable_club.s index c4bbd479d..45967283c 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -243,7 +243,7 @@ sub_80808F0: @ 80808F0 lsrs r1, r0, 24 cmp r1, 0 bne _08080934 - ldr r0, _08080928 @ =gUnknown_202271A + ldr r0, _08080928 @ =gLinkType strh r1, [r0] ldr r1, _0808092C @ =gTasks lsls r0, r4, 2 @@ -256,7 +256,7 @@ sub_80808F0: @ 80808F0 b _08080936 .align 2, 0 _08080924: .4byte gMain -_08080928: .4byte gUnknown_202271A +_08080928: .4byte gLinkType _0808092C: .4byte gTasks _08080930: .4byte sub_8080FB4 _08080934: @@ -290,7 +290,7 @@ _08080952: .align 2, 0 _08080964: .4byte gMain _08080968: - ldr r1, _08080984 @ =gUnknown_202271A + ldr r1, _08080984 @ =gLinkType movs r0, 0 strh r0, [r1] ldr r1, _08080988 @ =gTasks @@ -306,7 +306,7 @@ _0808097E: pop {r1} bx r1 .align 2, 0 -_08080984: .4byte gUnknown_202271A +_08080984: .4byte gLinkType _08080988: .4byte gTasks _0808098C: .4byte sub_8080FB4 thumb_func_end sub_808093C @@ -696,7 +696,7 @@ sub_8080C6C: @ 8080C6C _08080CB0: .4byte gTasks _08080CB4: .4byte sub_8080FF0 _08080CB8: - ldr r4, _08080CD4 @ =gUnknown_20370D0 + ldr r4, _08080CD4 @ =gSpecialVar_Result adds r0, r7, 0 adds r1, r6, 0 bl sub_8080844 @@ -712,7 +712,7 @@ _08080CCE: pop {r0} bx r0 .align 2, 0 -_08080CD4: .4byte gUnknown_20370D0 +_08080CD4: .4byte gSpecialVar_Result _08080CD8: .4byte sub_8080DC0 thumb_func_end sub_8080C6C @@ -736,7 +736,7 @@ sub_8080CDC: @ 8080CDC bl sub_80808BC cmp r0, 0x1 beq _08080D74 - ldr r4, _08080D34 @ =gUnknown_20370D0 + ldr r4, _08080D34 @ =gSpecialVar_Result adds r0, r7, 0 adds r1, r6, 0 bl sub_8080844 @@ -757,7 +757,7 @@ sub_8080CDC: @ 8080CDC b _08080D72 .align 2, 0 _08080D30: .4byte gTasks -_08080D34: .4byte gUnknown_20370D0 +_08080D34: .4byte gSpecialVar_Result _08080D38: .4byte sub_8080F78 _08080D3C: cmp r2, 0x7 @@ -780,7 +780,7 @@ _08080D54: strb r0, [r1] ldrb r0, [r4] bl sub_800A900 - ldr r0, _08080D84 @ =gUnknown_2022618 + ldr r0, _08080D84 @ =gBlockSendBuffer bl sub_80898E8 ldr r0, _08080D88 @ =sub_8080E6C _08080D72: @@ -792,7 +792,7 @@ _08080D74: .align 2, 0 _08080D7C: .4byte gUnknown_3005030 _08080D80: .4byte gUnknown_300502C -_08080D84: .4byte gUnknown_2022618 +_08080D84: .4byte gBlockSendBuffer _08080D88: .4byte sub_8080E6C thumb_func_end sub_8080CDC @@ -838,7 +838,7 @@ sub_8080DC0: @ 8080DC0 bl sub_80808BC cmp r0, 0x1 beq _08080E50 - ldr r0, _08080DE8 @ =gUnknown_20370D0 + ldr r0, _08080DE8 @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0x4 bne _08080DEC @@ -848,7 +848,7 @@ sub_8080DC0: @ 8080DC0 bl sub_800AAC0 b _08080E02 .align 2, 0 -_08080DE8: .4byte gUnknown_20370D0 +_08080DE8: .4byte gSpecialVar_Result _08080DEC: cmp r0, 0x3 bne _08080DF6 @@ -883,7 +883,7 @@ _08080E20: strb r0, [r1] ldrb r0, [r4] bl sub_800A900 - ldr r0, _08080E60 @ =gUnknown_2022618 + ldr r0, _08080E60 @ =gBlockSendBuffer bl sub_80898E8 ldr r1, _08080E64 @ =gTasks lsls r0, r5, 2 @@ -901,7 +901,7 @@ _08080E50: .align 2, 0 _08080E58: .4byte gUnknown_3005030 _08080E5C: .4byte gUnknown_300502C -_08080E60: .4byte gUnknown_2022618 +_08080E60: .4byte gBlockSendBuffer _08080E64: .4byte gTasks _08080E68: .4byte sub_8080E6C thumb_func_end sub_8080DC0 @@ -941,7 +941,7 @@ _08080E9A: cmp r0, 0x1 bls _08080EDC lsls r1, r5, 8 - ldr r0, _08080ED4 @ =gUnknown_2022118 + ldr r0, _08080ED4 @ =gBlockRecvBuffer adds r1, r0 ldr r0, _08080ED8 @ =gUnknown_2039624 lsls r4, r5, 1 @@ -957,11 +957,11 @@ _08080E9A: b _08080EF2 .align 2, 0 _08080ED0: .4byte gLinkPlayers -_08080ED4: .4byte gUnknown_2022118 +_08080ED4: .4byte gBlockRecvBuffer _08080ED8: .4byte gUnknown_2039624 _08080EDC: lsls r1, r5, 8 - ldr r0, _08080F3C @ =gUnknown_2022118 + ldr r0, _08080F3C @ =gBlockRecvBuffer adds r1, r0 ldr r2, _08080F40 @ =gUnknown_2039624 lsls r0, r5, 1 @@ -984,11 +984,11 @@ _08080EF8: bl SetSuppressLinkErrorMessage bl ResetBlockReceivedFlags bl HideFieldMessageBox - ldr r0, _08080F44 @ =gUnknown_20370D0 + ldr r0, _08080F44 @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0x1 bne _08080F54 - ldr r0, _08080F48 @ =gUnknown_202271A + ldr r0, _08080F48 @ =gLinkType ldrh r1, [r0] ldr r0, _08080F4C @ =0x00004411 ldr r0, _08080F50 @ =gTasks @@ -1003,10 +1003,10 @@ _08080EF8: bl DestroyTask b _08080F66 .align 2, 0 -_08080F3C: .4byte gUnknown_2022118 +_08080F3C: .4byte gBlockRecvBuffer _08080F40: .4byte gUnknown_2039624 -_08080F44: .4byte gUnknown_20370D0 -_08080F48: .4byte gUnknown_202271A +_08080F44: .4byte gSpecialVar_Result +_08080F48: .4byte gLinkType _08080F4C: .4byte 0x00004411 _08080F50: .4byte gTasks _08080F54: @@ -1034,7 +1034,7 @@ sub_8080F78: @ 8080F78 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08080FAC @ =gUnknown_3003F64 + ldr r0, _08080FAC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08080FA6 @@ -1055,7 +1055,7 @@ _08080FA6: pop {r0} bx r0 .align 2, 0 -_08080FAC: .4byte gUnknown_3003F64 +_08080FAC: .4byte gReceivedRemoteLinkPlayers _08080FB0: .4byte gTasks thumb_func_end sub_8080F78 @@ -1065,7 +1065,7 @@ sub_8080FB4: @ 8080FB4 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08080FE8 @ =gUnknown_20370D0 + ldr r1, _08080FE8 @ =gSpecialVar_Result movs r0, 0x5 strh r0, [r1] ldr r1, _08080FEC @ =gTasks @@ -1083,7 +1083,7 @@ sub_8080FB4: @ 8080FB4 pop {r0} bx r0 .align 2, 0 -_08080FE8: .4byte gUnknown_20370D0 +_08080FE8: .4byte gSpecialVar_Result _08080FEC: .4byte gTasks thumb_func_end sub_8080FB4 @@ -1093,7 +1093,7 @@ sub_8080FF0: @ 8080FF0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08081024 @ =gUnknown_20370D0 + ldr r1, _08081024 @ =gSpecialVar_Result movs r0, 0x6 strh r0, [r1] ldr r1, _08081028 @ =gTasks @@ -1111,7 +1111,7 @@ sub_8080FF0: @ 8080FF0 pop {r0} bx r0 .align 2, 0 -_08081024: .4byte gUnknown_20370D0 +_08081024: .4byte gSpecialVar_Result _08081028: .4byte gTasks thumb_func_end sub_8080FF0 @@ -1153,7 +1153,7 @@ sub_8081064: @ 8081064 push {r4,lr} movs r3, 0x2 movs r2, 0x2 - ldr r0, _0808107C @ =gUnknown_20370C0 + ldr r0, _0808107C @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x2 beq _08081098 @@ -1163,31 +1163,31 @@ sub_8081064: @ 8081064 beq _08081086 b _080810B4 .align 2, 0 -_0808107C: .4byte gUnknown_20370C0 +_0808107C: .4byte gSpecialVar_0x8004 _08081080: cmp r0, 0x5 beq _080810A8 b _080810B4 _08081086: movs r3, 0x2 - ldr r1, _08081090 @ =gUnknown_202271A + ldr r1, _08081090 @ =gLinkType ldr r4, _08081094 @ =0x00002233 b _080810B0 .align 2, 0 -_08081090: .4byte gUnknown_202271A +_08081090: .4byte gLinkType _08081094: .4byte 0x00002233 _08081098: movs r3, 0x2 - ldr r1, _080810A0 @ =gUnknown_202271A + ldr r1, _080810A0 @ =gLinkType ldr r4, _080810A4 @ =0x00002244 b _080810B0 .align 2, 0 -_080810A0: .4byte gUnknown_202271A +_080810A0: .4byte gLinkType _080810A4: .4byte 0x00002244 _080810A8: movs r3, 0x4 movs r2, 0x4 - ldr r1, _080810C4 @ =gUnknown_202271A + ldr r1, _080810C4 @ =gLinkType ldr r4, _080810C8 @ =0x00002255 _080810B0: adds r0, r4, 0 @@ -1200,14 +1200,14 @@ _080810B4: pop {r0} bx r0 .align 2, 0 -_080810C4: .4byte gUnknown_202271A +_080810C4: .4byte gLinkType _080810C8: .4byte 0x00002255 thumb_func_end sub_8081064 thumb_func_start sub_80810CC sub_80810CC: @ 80810CC push {lr} - ldr r1, _080810E8 @ =gUnknown_202271A + ldr r1, _080810E8 @ =gLinkType ldr r2, _080810EC @ =0x00001133 adds r0, r2, 0 strh r0, [r1] @@ -1220,7 +1220,7 @@ sub_80810CC: @ 80810CC pop {r0} bx r0 .align 2, 0 -_080810E8: .4byte gUnknown_202271A +_080810E8: .4byte gLinkType _080810EC: .4byte 0x00001133 _080810F0: .4byte gBattleTypeFlags thumb_func_end sub_80810CC @@ -1228,10 +1228,10 @@ _080810F0: .4byte gBattleTypeFlags thumb_func_start sub_80810F4 sub_80810F4: @ 80810F4 push {lr} - ldr r1, _08081118 @ =gUnknown_20370D0 + ldr r1, _08081118 @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] - ldr r1, _0808111C @ =gUnknown_202271A + ldr r1, _0808111C @ =gLinkType ldr r2, _08081120 @ =0x00003311 adds r0, r2, 0 strh r0, [r1] @@ -1244,8 +1244,8 @@ sub_80810F4: @ 80810F4 pop {r0} bx r0 .align 2, 0 -_08081118: .4byte gUnknown_20370D0 -_0808111C: .4byte gUnknown_202271A +_08081118: .4byte gSpecialVar_Result +_0808111C: .4byte gLinkType _08081120: .4byte 0x00003311 _08081124: .4byte gBattleTypeFlags thumb_func_end sub_80810F4 @@ -1253,7 +1253,7 @@ _08081124: .4byte gBattleTypeFlags thumb_func_start sub_8081128 sub_8081128: @ 8081128 push {lr} - ldr r1, _08081144 @ =gUnknown_202271A + ldr r1, _08081144 @ =gLinkType ldr r2, _08081148 @ =0x00006601 adds r0, r2, 0 strh r0, [r1] @@ -1266,7 +1266,7 @@ sub_8081128: @ 8081128 pop {r0} bx r0 .align 2, 0 -_08081144: .4byte gUnknown_202271A +_08081144: .4byte gLinkType _08081148: .4byte 0x00006601 _0808114C: .4byte gBattleTypeFlags thumb_func_end sub_8081128 @@ -1284,7 +1284,7 @@ sub_8081150: @ 8081150 .align 2, 0 _08081164: .4byte sub_80811FC _08081168: - ldr r0, _0808117C @ =gUnknown_20370C0 + ldr r0, _0808117C @ =gSpecialVar_0x8004 ldrh r0, [r0] subs r0, 0x1 cmp r0, 0x4 @@ -1295,7 +1295,7 @@ _08081168: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0808117C: .4byte gUnknown_20370C0 +_0808117C: .4byte gSpecialVar_0x8004 _08081180: .4byte _08081184 .align 2, 0 _08081184: @@ -1305,35 +1305,35 @@ _08081184: .4byte _080811D8 .4byte _080811B8 _08081198: - ldr r1, _080811A0 @ =gUnknown_202271A + ldr r1, _080811A0 @ =gLinkType ldr r2, _080811A4 @ =0x00002233 b _080811DC .align 2, 0 -_080811A0: .4byte gUnknown_202271A +_080811A0: .4byte gLinkType _080811A4: .4byte 0x00002233 _080811A8: - ldr r1, _080811B0 @ =gUnknown_202271A + ldr r1, _080811B0 @ =gLinkType ldr r2, _080811B4 @ =0x00002244 b _080811DC .align 2, 0 -_080811B0: .4byte gUnknown_202271A +_080811B0: .4byte gLinkType _080811B4: .4byte 0x00002244 _080811B8: - ldr r1, _080811C0 @ =gUnknown_202271A + ldr r1, _080811C0 @ =gLinkType ldr r2, _080811C4 @ =0x00002255 b _080811DC .align 2, 0 -_080811C0: .4byte gUnknown_202271A +_080811C0: .4byte gLinkType _080811C4: .4byte 0x00002255 _080811C8: - ldr r1, _080811D0 @ =gUnknown_202271A + ldr r1, _080811D0 @ =gLinkType ldr r2, _080811D4 @ =0x00001111 b _080811DC .align 2, 0 -_080811D0: .4byte gUnknown_202271A +_080811D0: .4byte gLinkType _080811D4: .4byte 0x00001111 _080811D8: - ldr r1, _080811F0 @ =gUnknown_202271A + ldr r1, _080811F0 @ =gLinkType ldr r2, _080811F4 @ =0x00003322 _080811DC: adds r0, r2, 0 @@ -1348,7 +1348,7 @@ _080811EC: pop {r1} bx r1 .align 2, 0 -_080811F0: .4byte gUnknown_202271A +_080811F0: .4byte gLinkType _080811F4: .4byte 0x00003322 _080811F8: .4byte sub_80811FC thumb_func_end sub_8081150 @@ -1472,7 +1472,7 @@ sub_80812D8: @ 80812D8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08081308 @ =gUnknown_3003F64 + ldr r0, _08081308 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _08081300 @@ -1490,7 +1490,7 @@ _08081300: pop {r0} bx r0 .align 2, 0 -_08081308: .4byte gUnknown_3003F64 +_08081308: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_80812D8 thumb_func_start sub_808130C @@ -1537,23 +1537,23 @@ _0808135C: movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r1, _08081374 @ =gUnknown_202271A + ldr r1, _08081374 @ =gLinkType ldr r2, _08081378 @ =0x00002211 adds r0, r2, 0 strh r0, [r1] bl sub_800A068 b _080813AA .align 2, 0 -_08081374: .4byte gUnknown_202271A +_08081374: .4byte gLinkType _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 @@ -1567,7 +1567,7 @@ _0808139C: bl sub_800AAC0 b _080813AA _080813A2: - ldr r0, _080813B4 @ =gUnknown_3003F64 + ldr r0, _080813B4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] _080813A6: cmp r0, 0 @@ -1578,7 +1578,7 @@ _080813AA: strh r0, [r4, 0x8] b _0808143A .align 2, 0 -_080813B4: .4byte gUnknown_3003F64 +_080813B4: .4byte gReceivedRemoteLinkPlayers _080813B8: ldr r0, _080813CC @ =gLinkPlayers ldr r0, [r0, 0x4] @@ -1597,7 +1597,7 @@ _080813D4: lsls r0, 1 bl PlayMapChosenOrBattleBGM _080813DC: - ldr r0, _080813F0 @ =gUnknown_20370C0 + ldr r0, _080813F0 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x2 beq _08081404 @@ -1607,7 +1607,7 @@ _080813DC: beq _080813FA b _0808141A .align 2, 0 -_080813F0: .4byte gUnknown_20370C0 +_080813F0: .4byte gSpecialVar_0x8004 _080813F4: cmp r0, 0x5 beq _08081410 @@ -1694,7 +1694,7 @@ _080814A0: movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, _080814BC @ =gUnknown_202271A + ldr r0, _080814BC @ =gLinkType ldr r2, _080814C0 @ =0x00002211 adds r1, r2, 0 strh r1, [r0] @@ -1703,10 +1703,10 @@ _080814A0: strh r0, [r6] b _0808160A .align 2, 0 -_080814BC: .4byte gUnknown_202271A +_080814BC: .4byte gLinkType _080814C0: .4byte 0x00002211 _080814C4: - ldr r0, _080814D8 @ =gUnknown_2037AB8 + ldr r0, _080814D8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1718,9 +1718,9 @@ _080814D2: strh r0, [r6] b _0808160A .align 2, 0 -_080814D8: .4byte gUnknown_2037AB8 +_080814D8: .4byte gPaletteFade _080814DC: - ldr r1, _080814EC @ =gUnknown_2022720 + ldr r1, _080814EC @ =gLocalLinkPlayer movs r0, 0 movs r2, 0x1C bl SendBlock @@ -1728,7 +1728,7 @@ _080814DC: strh r0, [r6] b _0808160A .align 2, 0 -_080814EC: .4byte gUnknown_2022720 +_080814EC: .4byte gLocalLinkPlayer _080814F0: bl GetBlockReceivedStatus adds r4, r0, 0 @@ -1746,7 +1746,7 @@ _08081504: _0808150C: .4byte gLinkPlayers _08081510: lsls r1, r4, 8 - ldr r2, _08081548 @ =gUnknown_2022118 + ldr r2, _08081548 @ =gBlockRecvBuffer adds r0, r5, 0 adds r1, r2 ldm r1!, {r2,r3,r7} @@ -1772,7 +1772,7 @@ _08081536: strh r0, [r6] b _0808160A .align 2, 0 -_08081548: .4byte gUnknown_2022118 +_08081548: .4byte gBlockRecvBuffer _0808154C: ldrh r0, [r6, 0x2] adds r0, 0x1 @@ -1818,7 +1818,7 @@ _080815A0: ldr r0, _080815B8 @ =gLinkPlayers ldr r1, _080815BC @ =0x00002211 str r1, [r0, 0x14] - ldr r0, _080815C0 @ =gUnknown_20370C0 + ldr r0, _080815C0 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x2 beq _080815D4 @@ -1830,7 +1830,7 @@ _080815A0: .align 2, 0 _080815B8: .4byte gLinkPlayers _080815BC: .4byte 0x00002211 -_080815C0: .4byte gUnknown_20370C0 +_080815C0: .4byte gSpecialVar_0x8004 _080815C4: cmp r0, 0x5 beq _080815E0 @@ -1927,7 +1927,7 @@ sub_8081668: @ 8081668 bl LoadPlayerParty bl SavePlayerBag bl sub_81134B8 - ldr r0, _080816B8 @ =gUnknown_20370C0 + ldr r0, _080816B8 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x5 beq _0808170A @@ -1936,7 +1936,7 @@ sub_8081668: @ 8081668 movs r5, 0x1 eors r0, r5 bl sub_80CD98C - ldr r0, _080816C0 @ =gUnknown_3003F3C + ldr r0, _080816C0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0808170A @@ -1950,9 +1950,9 @@ sub_8081668: @ 8081668 .align 2, 0 _080816B0: .4byte gBattleTypeFlags _080816B4: .4byte 0x0000ffdf -_080816B8: .4byte gUnknown_20370C0 +_080816B8: .4byte gSpecialVar_0x8004 _080816BC: .4byte gUnknown_300502C -_080816C0: .4byte gUnknown_3003F3C +_080816C0: .4byte gWirelessCommType _080816C4: .4byte gUnknown_2023E8A _080816C8: ldr r4, _080816E8 @ =gLinkPlayers @@ -2015,7 +2015,7 @@ _08081740: .4byte sub_806FB7C thumb_func_start sub_8081744 sub_8081744: @ 8081744 push {lr} - ldr r0, _0808176C @ =gUnknown_20370C0 + ldr r0, _0808176C @ =gSpecialVar_0x8004 ldrh r1, [r0] subs r0, r1, 0x1 lsls r0, 16 @@ -2033,7 +2033,7 @@ _08081760: pop {r0} bx r0 .align 2, 0 -_0808176C: .4byte gUnknown_20370C0 +_0808176C: .4byte gSpecialVar_0x8004 thumb_func_end sub_8081744 thumb_func_start sub_8081770 @@ -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 @@ -2207,7 +2207,7 @@ _080818B8: .align 2, 0 _080818C0: .4byte gUnknown_2031DA4 _080818C4: - ldr r0, _080818E0 @ =gUnknown_3003F64 + ldr r0, _080818E0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _080818D8 @@ -2220,7 +2220,7 @@ _080818D8: pop {r0} bx r0 .align 2, 0 -_080818E0: .4byte gUnknown_3003F64 +_080818E0: .4byte gReceivedRemoteLinkPlayers _080818E4: .4byte sub_804C718 thumb_func_end sub_8081850 @@ -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 @@ -2299,7 +2299,7 @@ _08081970: thumb_func_start sub_8081978 sub_8081978: @ 8081978 push {lr} - ldr r0, _0808198C @ =gUnknown_3003F3C + ldr r0, _0808198C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08081994 @@ -2307,7 +2307,7 @@ sub_8081978: @ 8081978 bl sub_8081828 b _0808199A .align 2, 0 -_0808198C: .4byte gUnknown_3003F3C +_0808198C: .4byte gWirelessCommType _08081990: .4byte sub_80818E8 _08081994: ldr r0, _080819A0 @ =sub_8081850 @@ -2343,11 +2343,11 @@ sub_80819B8: @ 80819B8 thumb_func_start sub_80819C8 sub_80819C8: @ 80819C8 push {lr} - ldr r1, _080819E4 @ =gUnknown_202271A + ldr r1, _080819E4 @ =gLinkType ldr r2, _080819E8 @ =0x00002211 adds r0, r2, 0 strh r0, [r1] - ldr r0, _080819EC @ =gUnknown_3003F3C + ldr r0, _080819EC @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _080819F4 @@ -2355,9 +2355,9 @@ sub_80819C8: @ 80819C8 bl sub_8081828 b _080819FA .align 2, 0 -_080819E4: .4byte gUnknown_202271A +_080819E4: .4byte gLinkType _080819E8: .4byte 0x00002211 -_080819EC: .4byte gUnknown_3003F3C +_080819EC: .4byte gWirelessCommType _080819F0: .4byte sub_8081454 _080819F4: ldr r0, _08081A00 @ =sub_8081318 @@ -2385,14 +2385,14 @@ _08081A18: .4byte sub_808177C thumb_func_start sp02A_crash_sound sp02A_crash_sound: @ 8081A1C push {lr} - ldr r0, _08081A2C @ =gUnknown_20370C4 + ldr r0, _08081A2C @ =gSpecialVar_0x8006 ldrb r0, [r0] ldr r1, _08081A30 @ =c2_exit_to_overworld_1_continue_scripts_restart_music bl sub_808B700 pop {r0} bx r0 .align 2, 0 -_08081A2C: .4byte gUnknown_20370C4 +_08081A2C: .4byte gSpecialVar_0x8006 _08081A30: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_end sp02A_crash_sound @@ -2402,13 +2402,13 @@ sub_8081A34: @ 8081A34 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08081A74 @ =gUnknown_20370C4 + ldr r0, _08081A74 @ =gSpecialVar_0x8006 strh r4, [r0] ldr r0, _08081A78 @ =gStringVar1 lsls r1, r4, 3 subs r1, r4 lsls r1, 2 - ldr r2, _08081A7C @ =gUnknown_2022744 + ldr r2, _08081A7C @ =gLinkPlayers + 8 adds r1, r2 bl StringCopy adds r0, r4, 0 @@ -2427,9 +2427,9 @@ sub_8081A34: @ 8081A34 movs r0, 0x1 b _08081A8A .align 2, 0 -_08081A74: .4byte gUnknown_20370C4 +_08081A74: .4byte gSpecialVar_0x8006 _08081A78: .4byte gStringVar1 -_08081A7C: .4byte gUnknown_2022744 +_08081A7C: .4byte gLinkPlayers + 8 _08081A80: .4byte gStringVar2 _08081A84: .4byte gUnknown_83C6AB8 _08081A88: @@ -2465,7 +2465,7 @@ sub_8081A90: @ 8081A90 adds r0, r4, 0 bl DestroyTask _08081AC2: - ldr r0, _08081AE0 @ =gUnknown_3003F64 + ldr r0, _08081AE0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08081AD0 @@ -2478,7 +2478,7 @@ _08081AD0: .align 2, 0 _08081AD8: .4byte gTasks _08081ADC: .4byte c2_800ACD4 -_08081AE0: .4byte gUnknown_3003F64 +_08081AE0: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_8081A90 thumb_func_start sub_8081AE4 @@ -2486,7 +2486,7 @@ sub_8081AE4: @ 8081AE4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08081B04 @ =gUnknown_3003F64 + ldr r0, _08081B04 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08081AFC @@ -2498,7 +2498,7 @@ _08081AFC: pop {r0} bx r0 .align 2, 0 -_08081B04: .4byte gUnknown_3003F64 +_08081B04: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_8081AE4 thumb_func_start sub_8081B08 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..bf8c5eeac 100644 --- a/asm/credits.s +++ b/asm/credits.s @@ -242,13 +242,13 @@ _080F3B5E: bl sub_80F3AA4 movs r0, 0xF0 bl sub_80F77CC - ldr r0, _080F3BC8 @ =gUnknown_20371F8 + ldr r0, _080F3BC8 @ =gPlttBufferUnfaded movs r2, 0xFF lsls r2, 1 adds r0, r2 movs r1, 0 strh r1, [r0] - ldr r0, _080F3BCC @ =gUnknown_20375F8 + ldr r0, _080F3BCC @ =gPlttBufferFaded adds r0, r2 strh r1, [r0] movs r0, 0x1 @@ -261,8 +261,8 @@ _080F3BB8: .4byte gUnknown_2031DD8 _080F3BBC: .4byte gUnknown_203AB40 _080F3BC0: .4byte gUnknown_8414588 _080F3BC4: .4byte 0x0000247c -_080F3BC8: .4byte gUnknown_20371F8 -_080F3BCC: .4byte gUnknown_20375F8 +_080F3BC8: .4byte gPlttBufferUnfaded +_080F3BCC: .4byte gPlttBufferFaded thumb_func_end sub_80F3B2C thumb_func_start sub_80F3BD0 @@ -326,13 +326,13 @@ _080F3C64: bl sub_80F3AC4 movs r0, 0xF0 bl sub_80F77CC - ldr r0, _080F3C8C @ =gUnknown_20371F8 + ldr r0, _080F3C8C @ =gPlttBufferUnfaded movs r2, 0xFF lsls r2, 1 adds r0, r2 movs r1, 0 strh r1, [r0] - ldr r0, _080F3C90 @ =gUnknown_20375F8 + ldr r0, _080F3C90 @ =gPlttBufferFaded adds r0, r2 strh r1, [r0] ldr r0, _080F3C94 @ =gUnknown_203AB40 @@ -340,8 +340,8 @@ _080F3C64: movs r0, 0x2 b _080F413C .align 2, 0 -_080F3C8C: .4byte gUnknown_20371F8 -_080F3C90: .4byte gUnknown_20375F8 +_080F3C8C: .4byte gPlttBufferUnfaded +_080F3C90: .4byte gPlttBufferFaded _080F3C94: .4byte gUnknown_203AB40 _080F3C98: movs r0, 0x44 @@ -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/crt0.s b/asm/crt0.s index 37c7ef502..f2e28c9e1 100644 --- a/asm/crt0.s +++ b/asm/crt0.s @@ -60,11 +60,11 @@ GPIOPortReadEnable: @ 80000C8 .4byte 0x8245EE0 @ gSpeciesNames .4byte 0x8247094 @ gMoveNames .4byte 0x84556F8 @ gDecorations - .4byte 0xEE0 - .4byte 0x1000 - .4byte 0x18 - .4byte 0x5F8 - .4byte 0x3A18 + .4byte 0xEE0 @ offsetof(struct SaveBlock1, flags) + .4byte 0x1000 @ offsetof(struct SaveBlock1, vars) + .4byte 0x18 @ offsetof(struct SaveBlock2, pokedex) + .4byte 0x5F8 @ offsetof(struct SaveBlock1, seen1) + .4byte 0x3A18 @ offsetof(struct SaveBlock1, seen2) .4byte 0x3C .4byte 0x838 .4byte 0x839 @@ -74,35 +74,36 @@ GPIOPortReadEnable: @ 80000C8 .4byte 0xC121006 .4byte 0x8010B0F .4byte 0xC - .4byte 0xF24 - .4byte 0x3D68 - .4byte 0x34 - .4byte 0x38 - .4byte 9 - .4byte 0xA - .4byte 0 - .4byte 8 - .4byte 0xAD - .4byte 0xAD + .4byte 0xF24 @ sizeof(struct SaveBlock2) + .4byte 0x3D68 @ sizeof(struct SaveBlock1) + .4byte 0x34 @ offsetof(struct SaveBlock1, playerPartyCount) + .4byte 0x38 @ offsetof(struct SaveBlock1, playerParty) + .4byte 9 @ offsetof(struct SaveBlock2, specialSaveWarp) + .4byte 0xA @ offsetof(struct SaveBlock2, playerTrainerId) + .4byte 0 @ offsetof(struct SaveBlock2, playerName) + .4byte 8 @ offsetof(struct SaveBlock2, playerGender) + + .4byte 0xAD @ offsetof(struct SaveBlock2, ?????? (0xAD)) + .4byte 0xAD @ offsetof(struct SaveBlock2, ?????? (0xAD)) .4byte 0x30BB .4byte 0x30A7 .4byte 0 - .4byte 0x8254784 - .4byte 0x824FC40 - .4byte 0x824FB08 - .4byte 0x83DB028 - .4byte 0x8250C04 - .4byte 0x826056C - .4byte 0x82605CC + .4byte 0x8254784 @ gBaseStats + .4byte 0x824FC40 @ gAbilityNames + .4byte 0x824FB08 @ gAbilityDescriptionPointers + .4byte 0x83DB028 @ gItems + .4byte 0x8250C04 @ gBattleMoves + .4byte 0x826056C @ gBallSpriteSheets + .4byte 0x82605CC @ gBallSpritePalettes .4byte 0xA8 .4byte 0x82C .4byte 0x83B .4byte 0x3A0D1E2A .4byte 0x1E2B - .4byte 0x298 - .4byte 0x309C - .4byte 0x30EC - .4byte 0x34 + .4byte 0x298 @ offsetof(struct SaveBlock1, pcItems) // maybe all items were in a struct together? + .4byte 0x309C @ offsetof(struct SaveBlock1, giftRibbons) + .4byte 0x30EC @ offsetof(struct SaveBlock1, enigmaBerry) + .4byte 0x34 @ size of SaveBlock1 map header reconstruction data? .4byte 0 .4byte 0xFFFFFFFF diff --git a/asm/daycare.s b/asm/daycare.s index f6bc7b0e1..3b7d7ffe0 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -458,7 +458,7 @@ TakePokemonFromDaycare: @ 8045728 movs r1, 0xBE lsls r1, 6 adds r0, r1 - ldr r1, _08045748 @ =gUnknown_20370C0 + ldr r1, _08045748 @ =gSpecialVar_0x8004 ldrb r1, [r1] bl TakeSelectedPokemonMonFromDaycareShiftSlots lsls r0, 16 @@ -467,7 +467,7 @@ TakePokemonFromDaycare: @ 8045728 bx r1 .align 2, 0 _08045744: .4byte gSaveBlock1Ptr -_08045748: .4byte gUnknown_20370C0 +_08045748: .4byte gSpecialVar_0x8004 thumb_func_end TakePokemonFromDaycare thumb_func_start GetLevelAfterDaycareSteps @@ -598,7 +598,7 @@ GetDaycareCost: @ 8045838 movs r1, 0xBE lsls r1, 6 adds r0, r1 - ldr r1, _08045858 @ =gUnknown_20370C0 + ldr r1, _08045858 @ =gSpecialVar_0x8004 ldrb r1, [r1] bl GetDaycareCostForMon ldr r1, _0804585C @ =gSpecialVar_0x8005 @@ -607,7 +607,7 @@ GetDaycareCost: @ 8045838 bx r0 .align 2, 0 _08045854: .4byte gSaveBlock1Ptr -_08045858: .4byte gUnknown_20370C0 +_08045858: .4byte gSpecialVar_0x8004 _0804585C: .4byte gSpecialVar_0x8005 thumb_func_end GetDaycareCost @@ -644,7 +644,7 @@ _08045894: .4byte 0x00003d20 GetNumLevelsGainedFromDaycare: @ 8045898 push {r4-r6,lr} ldr r6, _080458C0 @ =gSaveBlock1Ptr - ldr r5, _080458C4 @ =gUnknown_20370C0 + ldr r5, _080458C4 @ =gSpecialVar_0x8004 ldrh r0, [r5] movs r4, 0x8C adds r1, r0, 0 @@ -662,7 +662,7 @@ GetNumLevelsGainedFromDaycare: @ 8045898 b _080458E0 .align 2, 0 _080458C0: .4byte gSaveBlock1Ptr -_080458C4: .4byte gUnknown_20370C0 +_080458C4: .4byte gSpecialVar_0x8004 _080458C8: ldrh r0, [r5] adds r1, r0, 0 @@ -2076,13 +2076,13 @@ _08046350: str r0, [sp] cmp r0, 0 bne _08046390 - ldr r0, _0804638C @ =gUnknown_20370C0 + ldr r0, _0804638C @ =gSpecialVar_0x8004 strh r5, [r0] movs r0, 0x1 b _080463AA .align 2, 0 _08046388: .4byte gPlayerParty -_0804638C: .4byte gUnknown_20370C0 +_0804638C: .4byte gSpecialVar_0x8004 _08046390: subs r0, 0x1 str r0, [sp] @@ -2990,13 +2990,13 @@ Task_HandleDaycareLevelMenuInput: @ 80469FC _08046A2C: .4byte gTasks _08046A30: .4byte gMain _08046A34: - ldr r0, _08046A3C @ =gUnknown_20370D0 + ldr r0, _08046A3C @ =gSpecialVar_Result strh r1, [r0] b _08046A46 .align 2, 0 -_08046A3C: .4byte gUnknown_20370D0 +_08046A3C: .4byte gSpecialVar_Result _08046A40: - ldr r1, _08046A74 @ =gUnknown_20370D0 + ldr r1, _08046A74 @ =gSpecialVar_Result movs r0, 0x2 strh r0, [r1] _08046A46: @@ -3019,7 +3019,7 @@ _08046A46: bl EnableBothScriptContexts b _08046AAC .align 2, 0 -_08046A74: .4byte gUnknown_20370D0 +_08046A74: .4byte gSpecialVar_Result _08046A78: .4byte gTasks _08046A7C: movs r1, 0x2 @@ -3027,7 +3027,7 @@ _08046A7C: ands r0, r2 cmp r0, 0 beq _08046AAC - ldr r0, _08046AB4 @ =gUnknown_20370D0 + ldr r0, _08046AB4 @ =gSpecialVar_Result strh r1, [r0] ldrb r0, [r4, 0x8] movs r1, 0 @@ -3046,7 +3046,7 @@ _08046AAC: pop {r0} bx r0 .align 2, 0 -_08046AB4: .4byte gUnknown_20370D0 +_08046AB4: .4byte gSpecialVar_Result thumb_func_end Task_HandleDaycareLevelMenuInput thumb_func_start ShowDaycareLevelMenu 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/easy_chat.s b/asm/easy_chat.s index 05a45baa1..0ec71e087 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -166,11 +166,11 @@ _080BD820: .4byte gSpeciesNames _080BD824: movs r0, 0xD muls r0, r2 - ldr r1, _080BD830 @ =gUnknown_8247094 + ldr r1, _080BD830 @ =gMoveNames adds r0, r1 b _080BD846 .align 2, 0 -_080BD830: .4byte gUnknown_8247094 +_080BD830: .4byte gMoveNames _080BD834: ldr r1, _080BD84C @ =gUnknown_83ECED4 lsls r0, 3 @@ -495,7 +495,7 @@ _080BDA74: thumb_func_start sub_80BDA7C sub_80BDA7C: @ 80BDA7C push {r4,r5,lr} - ldr r0, _080BDA90 @ =gUnknown_20370C0 + ldr r0, _080BDA90 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x1 beq _080BDAB4 @@ -505,7 +505,7 @@ sub_80BDA7C: @ 80BDA7C beq _080BDA9E b _080BDB08 .align 2, 0 -_080BDA90: .4byte gUnknown_20370C0 +_080BDA90: .4byte gSpecialVar_0x8004 _080BDA94: cmp r0, 0x2 beq _080BDADC @@ -622,8 +622,8 @@ _080BDB68: .4byte gSaveBlock1Ptr _080BDB6C: .4byte 0x00002f10 thumb_func_end sub_80BDB48 - thumb_func_start sub_80BDB70 -sub_80BDB70: @ 80BDB70 + thumb_func_start EnableRareWord +EnableRareWord: @ 80BDB70 push {lr} lsls r0, 24 lsrs r1, r0, 24 @@ -648,7 +648,7 @@ _080BDB94: .align 2, 0 _080BDB98: .4byte gSaveBlock1Ptr _080BDB9C: .4byte 0x00002f10 - thumb_func_end sub_80BDB70 + thumb_func_end EnableRareWord thumb_func_start sub_80BDBA0 sub_80BDBA0: @ 80BDBA0 @@ -687,7 +687,7 @@ sub_80BDBCC: @ 80BDBCC b _080BDC32 _080BDBDC: adds r0, r5, 0 - bl sub_80BDB70 + bl EnableRareWord ldr r0, _080BDBF4 @ =0x000001ff ands r4, r0 movs r1, 0xA0 @@ -841,7 +841,7 @@ _080BDCF6: lsls r0, 16 lsrs r0, 16 movs r1, 0 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _080BDD16 @@ -1769,7 +1769,7 @@ _080BE3BC: lsls r0, 16 lsrs r0, 16 movs r1, 0 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 lsrs r0, 24 b _080BE40C @@ -1783,7 +1783,7 @@ _080BE3D6: lsls r0, 16 lsrs r0, 16 movs r1, 0 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 lsrs r0, 24 b _080BE40C diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index e8f282578..eef234a71 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -214,10 +214,10 @@ AddHatchedMonToParty: @ 8046D60 lsrs r4, 16 adds r0, r4, 0 movs r1, 0x2 - bl sub_8088E74 + bl GetSetPokedexFlag adds r0, r4, 0 movs r1, 0x3 - bl sub_8088E74 + bl GetSetPokedexFlag ldr r1, _08046E1C @ =gStringVar1 adds r0, r5, 0 bl GetMonNick @@ -258,13 +258,13 @@ _08046E1C: .4byte gStringVar1 thumb_func_start ScriptHatchMon ScriptHatchMon: @ 8046E20 push {lr} - ldr r0, _08046E30 @ =gUnknown_20370C0 + ldr r0, _08046E30 @ =gSpecialVar_0x8004 ldrb r0, [r0] bl AddHatchedMonToParty pop {r0} bx r0 .align 2, 0 -_08046E30: .4byte gUnknown_20370C0 +_08046E30: .4byte gSpecialVar_0x8004 thumb_func_end ScriptHatchMon thumb_func_start sub_8046E34 @@ -332,7 +332,7 @@ sub_8046EAC: @ 8046EAC movs r1, 0xBE lsls r1, 6 adds r0, r1 - ldr r1, _08046ECC @ =gUnknown_20370C0 + ldr r1, _08046ECC @ =gSpecialVar_0x8004 ldrb r1, [r1] bl sub_8046E34 lsls r0, 24 @@ -341,7 +341,7 @@ sub_8046EAC: @ 8046EAC bx r1 .align 2, 0 _08046EC8: .4byte gSaveBlock1Ptr -_08046ECC: .4byte gUnknown_20370C0 +_08046ECC: .4byte gSpecialVar_0x8004 thumb_func_end sub_8046EAC thumb_func_start sub_8046ED0 @@ -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 @@ -566,7 +566,7 @@ _08047090: str r0, [r4] bl AllocateMonSpritesGfx ldr r2, [r4] - ldr r0, _0804714C @ =gUnknown_20370C0 + ldr r0, _0804714C @ =gSpecialVar_0x8004 ldrh r0, [r0] movs r1, 0 strb r0, [r2, 0x4] @@ -626,7 +626,7 @@ _08047090: b _0804724A .align 2, 0 _08047148: .4byte gUnknown_3000E74 -_0804714C: .4byte gUnknown_20370C0 +_0804714C: .4byte gSpecialVar_0x8004 _08047150: .4byte sub_8046FC0 _08047154: .4byte gSpecialVar_0x8005 _08047158: .4byte gUnknown_826019C @@ -648,7 +648,7 @@ _08047174: movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r1, _080471A0 @ =gUnknown_8D0051C + ldr r1, _080471A0 @ =gFile_graphics_interface_menu_map_tilemap movs r0, 0 movs r2, 0 movs r3, 0 @@ -660,7 +660,7 @@ _08047174: b _0804724A .align 2, 0 _0804719C: .4byte gUnknown_8D00000 -_080471A0: .4byte gUnknown_8D0051C +_080471A0: .4byte gFile_graphics_interface_menu_map_tilemap _080471A4: .4byte gUnknown_8D004D8 _080471A8: ldr r0, _080471BC @ =gUnknown_826011C @@ -770,7 +770,7 @@ _0804729C: .4byte gUnknown_3000E74 thumb_func_start EggHatchSetMonNickname EggHatchSetMonNickname: @ 80472A0 push {lr} - ldr r0, _080472D0 @ =gUnknown_20370C0 + ldr r0, _080472D0 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -789,7 +789,7 @@ EggHatchSetMonNickname: @ 80472A0 pop {r0} bx r0 .align 2, 0 -_080472D0: .4byte gUnknown_20370C0 +_080472D0: .4byte gSpecialVar_0x8004 _080472D4: .4byte gPlayerParty _080472D8: .4byte gStringVar3 _080472DC: .4byte gUnknown_3000E74 @@ -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/event_data.s b/asm/event_data.s index a3664d482..690134c27 100644 --- a/asm/event_data.s +++ b/asm/event_data.s @@ -78,7 +78,7 @@ _0806E164: .4byte 0x00000842 sub_806E168: @ 806E168 push {lr} ldr r0, _0806E184 @ =0x0000403c - bl sub_806E454 + bl GetVarPointer ldr r1, _0806E188 @ =gSaveBlock2Ptr ldr r2, [r1] movs r1, 0 @@ -98,7 +98,7 @@ _0806E18C: .4byte 0x00000838 sub_806E190: @ 806E190 push {lr} ldr r0, _0806E1B0 @ =0x0000403c - bl sub_806E454 + bl GetVarPointer ldr r1, _0806E1B4 @ =gSaveBlock2Ptr ldr r2, [r1] movs r1, 0xDA @@ -154,7 +154,7 @@ _0806E1FE: sub_806E204: @ 806E204 push {lr} ldr r0, _0806E224 @ =0x0000404e - bl sub_806E454 + bl GetVarPointer ldr r1, _0806E228 @ =gSaveBlock2Ptr ldr r2, [r1] movs r1, 0 @@ -170,11 +170,11 @@ _0806E224: .4byte 0x0000404e _0806E228: .4byte gSaveBlock2Ptr thumb_func_end sub_806E204 - thumb_func_start sub_806E22C -sub_806E22C: @ 806E22C + thumb_func_start EnableNationalPokedex +EnableNationalPokedex: @ 806E22C push {lr} ldr r0, _0806E250 @ =0x0000404e - bl sub_806E454 + bl GetVarPointer ldr r1, _0806E254 @ =gSaveBlock2Ptr ldr r2, [r1] movs r1, 0xB9 @@ -191,7 +191,7 @@ sub_806E22C: @ 806E22C _0806E250: .4byte 0x0000404e _0806E254: .4byte gSaveBlock2Ptr _0806E258: .4byte 0x00006258 - thumb_func_end sub_806E22C + thumb_func_end EnableNationalPokedex thumb_func_start sub_806E25C sub_806E25C: @ 806E25C @@ -419,8 +419,8 @@ _0806E44E: bx r1 thumb_func_end CanResetRTC - thumb_func_start sub_806E454 -sub_806E454: @ 806E454 + thumb_func_start GetVarPointer +GetVarPointer: @ 806E454 push {r4-r6,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -509,7 +509,7 @@ _0806E500: .4byte gUnknown_300507C _0806E504: .4byte gSaveBlock1Ptr _0806E508: .4byte 0xffff9000 _0806E50C: - ldr r0, _0806E520 @ =gUnknown_815FD0C + ldr r0, _0806E520 @ =gSpecialVars ldr r3, _0806E524 @ =0xffff8000 adds r1, r6, r3 lsls r1, 2 @@ -520,9 +520,9 @@ _0806E518: pop {r1} bx r1 .align 2, 0 -_0806E520: .4byte gUnknown_815FD0C +_0806E520: .4byte gSpecialVars _0806E524: .4byte 0xffff8000 - thumb_func_end sub_806E454 + thumb_func_end GetVarPointer thumb_func_start sub_806E528 sub_806E528: @ 806E528 @@ -569,7 +569,7 @@ VarGet: @ 806E568 lsls r0, 16 lsrs r4, r0, 16 adds r0, r4, 0 - bl sub_806E454 + bl GetVarPointer cmp r0, 0 beq _0806E57C ldrh r0, [r0] @@ -589,7 +589,7 @@ VarSet: @ 806E584 lsrs r0, 16 lsls r1, 16 lsrs r4, r1, 16 - bl sub_806E454 + bl GetVarPointer cmp r0, 0 beq _0806E59C strh r4, [r0] @@ -796,38 +796,38 @@ _0806E6F6: thumb_func_start sub_806E6FC sub_806E6FC: @ 806E6FC - ldr r1, _0806E754 @ =gUnknown_20370B8 + ldr r1, _0806E754 @ =gSpecialVar_0x8000 movs r0, 0 strh r0, [r1] - ldr r1, _0806E758 @ =gUnknown_20370BA + ldr r1, _0806E758 @ =gSpecialVar_0x8001 strh r0, [r1] - ldr r1, _0806E75C @ =gUnknown_20370BC + ldr r1, _0806E75C @ =gSpecialVar_0x8002 strh r0, [r1] - ldr r1, _0806E760 @ =gUnknown_20370BE + ldr r1, _0806E760 @ =gSpecialVar_0x8003 strh r0, [r1] - ldr r1, _0806E764 @ =gUnknown_20370C0 + ldr r1, _0806E764 @ =gSpecialVar_0x8004 strh r0, [r1] ldr r1, _0806E768 @ =gSpecialVar_0x8005 strh r0, [r1] - ldr r1, _0806E76C @ =gUnknown_20370C4 + ldr r1, _0806E76C @ =gSpecialVar_0x8006 strh r0, [r1] - ldr r1, _0806E770 @ =gUnknown_20370C6 + ldr r1, _0806E770 @ =gSpecialVar_0x8007 strh r0, [r1] - ldr r1, _0806E774 @ =gUnknown_20370C8 + ldr r1, _0806E774 @ =gSpecialVar_0x8008 strh r0, [r1] - ldr r1, _0806E778 @ =gUnknown_20370CA + ldr r1, _0806E778 @ =gSpecialVar_0x8009 strh r0, [r1] - ldr r1, _0806E77C @ =gUnknown_20370CC + ldr r1, _0806E77C @ =gSpecialVar_0x800A strh r0, [r1] - ldr r1, _0806E780 @ =gUnknown_20370CE + ldr r1, _0806E780 @ =gSpecialVar_0x800B strh r0, [r1] - ldr r1, _0806E784 @ =gUnknown_20370D4 + ldr r1, _0806E784 @ =gSpecialVar_Facing strh r0, [r1] - ldr r1, _0806E788 @ =gUnknown_20370D0 + ldr r1, _0806E788 @ =gSpecialVar_Result strh r0, [r1] - ldr r1, _0806E78C @ =gUnknown_203AD30 + ldr r1, _0806E78C @ =gSpecialVar_ItemId strh r0, [r1] - ldr r1, _0806E790 @ =gUnknown_20370D2 + ldr r1, _0806E790 @ =gSpecialVar_LastTalked strh r0, [r1] ldr r1, _0806E794 @ =gSpecialVar_MonBoxId strh r0, [r1] @@ -841,22 +841,22 @@ sub_806E6FC: @ 806E6FC strh r0, [r1] bx lr .align 2, 0 -_0806E754: .4byte gUnknown_20370B8 -_0806E758: .4byte gUnknown_20370BA -_0806E75C: .4byte gUnknown_20370BC -_0806E760: .4byte gUnknown_20370BE -_0806E764: .4byte gUnknown_20370C0 +_0806E754: .4byte gSpecialVar_0x8000 +_0806E758: .4byte gSpecialVar_0x8001 +_0806E75C: .4byte gSpecialVar_0x8002 +_0806E760: .4byte gSpecialVar_0x8003 +_0806E764: .4byte gSpecialVar_0x8004 _0806E768: .4byte gSpecialVar_0x8005 -_0806E76C: .4byte gUnknown_20370C4 -_0806E770: .4byte gUnknown_20370C6 -_0806E774: .4byte gUnknown_20370C8 -_0806E778: .4byte gUnknown_20370CA -_0806E77C: .4byte gUnknown_20370CC -_0806E780: .4byte gUnknown_20370CE -_0806E784: .4byte gUnknown_20370D4 -_0806E788: .4byte gUnknown_20370D0 -_0806E78C: .4byte gUnknown_203AD30 -_0806E790: .4byte gUnknown_20370D2 +_0806E76C: .4byte gSpecialVar_0x8006 +_0806E770: .4byte gSpecialVar_0x8007 +_0806E774: .4byte gSpecialVar_0x8008 +_0806E778: .4byte gSpecialVar_0x8009 +_0806E77C: .4byte gSpecialVar_0x800A +_0806E780: .4byte gSpecialVar_0x800B +_0806E784: .4byte gSpecialVar_Facing +_0806E788: .4byte gSpecialVar_Result +_0806E78C: .4byte gSpecialVar_ItemId +_0806E790: .4byte gSpecialVar_LastTalked _0806E794: .4byte gSpecialVar_MonBoxId _0806E798: .4byte gSpecialVar_MonBoxPos _0806E79C: .4byte gUnknown_20370DA diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s index 671d52e6c..1dafc92ea 100644 --- a/asm/evolution_graphics.s +++ b/asm/evolution_graphics.s @@ -997,8 +997,8 @@ sub_80F6080: @ 80F6080 movs r0, 0 strh r0, [r5, 0x26] bl sub_80D0474 - ldr r0, _080F60D0 @ =gUnknown_2037638 - ldr r1, _080F60D4 @ =gUnknown_2037238 + ldr r0, _080F60D0 @ =gPlttBufferFaded + 0x40 + ldr r1, _080F60D4 @ =gPlttBufferUnfaded + 0x40 movs r2, 0x30 bl CpuSet ldr r0, _080F60D8 @ =0xfff90f1c @@ -1018,8 +1018,8 @@ sub_80F6080: @ 80F6080 bx r0 .align 2, 0 _080F60CC: .4byte gTasks -_080F60D0: .4byte gUnknown_2037638 -_080F60D4: .4byte gUnknown_2037238 +_080F60D0: .4byte gPlttBufferFaded + 0x40 +_080F60D4: .4byte gPlttBufferUnfaded + 0x40 _080F60D8: .4byte 0xfff90f1c _080F60DC: .4byte 0x00007fff _080F60E0: .4byte sub_80F60E4 @@ -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 @@ -1159,8 +1159,8 @@ sub_80F61C0: @ 80F61C0 movs r0, 0 strh r0, [r5, 0x26] bl sub_80D0474 - ldr r0, _080F6210 @ =gUnknown_2037638 - ldr r1, _080F6214 @ =gUnknown_2037238 + ldr r0, _080F6210 @ =gPlttBufferFaded + 0x40 + ldr r1, _080F6214 @ =gPlttBufferUnfaded + 0x40 movs r2, 0x30 bl CpuSet ldr r0, _080F6218 @ =0xfff90f00 @@ -1180,8 +1180,8 @@ sub_80F61C0: @ 80F61C0 bx r0 .align 2, 0 _080F620C: .4byte gTasks -_080F6210: .4byte gUnknown_2037638 -_080F6214: .4byte gUnknown_2037238 +_080F6210: .4byte gPlttBufferFaded + 0x40 +_080F6214: .4byte gPlttBufferUnfaded + 0x40 _080F6218: .4byte 0xfff90f00 _080F621C: .4byte 0x00007fff _080F6220: .4byte sub_80F6224 @@ -1369,7 +1369,7 @@ _080F62CE: ldrb r1, [r2, 0x5] lsrs r1, 4 lsls r1, 5 - ldr r0, _080F63FC @ =gUnknown_20377F8 + ldr r0, _080F63FC @ =gPlttBufferFaded + 0x200 mov r10, r0 add r1, r10 add r0, sp, 0x4 @@ -1422,7 +1422,7 @@ _080F63EC: .4byte 0x00007fff _080F63F0: .4byte gTasks _080F63F4: .4byte gSprites _080F63F8: .4byte nullsub_86 -_080F63FC: .4byte gUnknown_20377F8 +_080F63FC: .4byte gPlttBufferFaded + 0x200 thumb_func_end sub_80F62B4 thumb_func_start sub_80F6400 diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index 4ee374bed..d343c68d4 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 @@ -375,7 +375,7 @@ EvolutionScene: @ 80CDDF4 strh r2, [r0, 0x1C] ldr r1, _080CE0A8 @ =gUnknown_2039A20 ldr r0, [r1] - ldr r1, _080CE0D8 @ =gUnknown_2037238 + ldr r1, _080CE0D8 @ =gPlttBufferUnfaded + 0x40 adds r0, 0x4 movs r2, 0x60 bl memcpy @@ -423,7 +423,7 @@ _080CE0C8: .4byte gSprites _080CE0CC: .4byte nullsub_10 _080CE0D0: .4byte sub_80CE8DC _080CE0D4: .4byte gTasks -_080CE0D8: .4byte gUnknown_2037238 +_080CE0D8: .4byte gPlttBufferUnfaded + 0x40 _080CE0DC: .4byte nullsub_76 _080CE0E0: .4byte sub_80D0050 _080CE0E4: .4byte sub_80CE710 @@ -839,7 +839,7 @@ _080CE4C0: .4byte gSprites _080CE4C4: .4byte nullsub_10 _080CE4C8: .4byte gMain _080CE4CC: - ldr r0, _080CE4FC @ =gUnknown_3003F3C + ldr r0, _080CE4FC @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _080CE4E0 @@ -864,7 +864,7 @@ _080CE4F4: strb r0, [r1] b _080CE534 .align 2, 0 -_080CE4FC: .4byte gUnknown_3003F3C +_080CE4FC: .4byte gWirelessCommType _080CE500: .4byte gMain _080CE504: movs r0, 0x1 @@ -1252,13 +1252,13 @@ _080CE80C: lsls r0, 16 lsrs r0, 16 movs r1, 0x2 - bl sub_8088E74 + bl GetSetPokedexFlag ldrh r0, [r4, 0xC] bl SpeciesToNationalPokedexNum lsls r0, 16 lsrs r0, 16 movs r1, 0x3 - bl sub_8088E74 + bl GetSetPokedexFlag mov r0, r9 movs r1, 0xB bl GetMonData @@ -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: @@ -1748,7 +1748,7 @@ _080CECC0: bl _080CF528 _080CECCE: bl m4aMPlayAllStop - ldr r0, _080CED00 @ =gUnknown_2037238 + ldr r0, _080CED00 @ =gPlttBufferUnfaded + 0x40 ldr r1, _080CED04 @ =gUnknown_2039A20 ldr r1, [r1] adds r1, 0x4 @@ -1769,11 +1769,11 @@ _080CECCE: adds r1, r0 b _080CEFDE .align 2, 0 -_080CED00: .4byte gUnknown_2037238 +_080CED00: .4byte gPlttBufferUnfaded + 0x40 _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 @@ -1829,13 +1829,13 @@ _080CED3A: lsls r0, 16 lsrs r0, 16 movs r1, 0x2 - bl sub_8088E74 + bl GetSetPokedexFlag ldrh r0, [r4, 0xC] bl SpeciesToNationalPokedexNum lsls r0, 16 lsrs r0, 16 movs r1, 0x3 - bl sub_8088E74 + bl GetSetPokedexFlag movs r0, 0xE bl IncrementGameStat b _080CF528 @@ -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 gPlayerPartyCount _080CF304: .4byte CB2_EvolutionSceneLoadGraphics _080CF308: .4byte gMoveToLearn _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 @@ -3085,7 +3085,7 @@ _080CF86E: ldrh r0, [r4, 0xC] movs r1, 0 bl PlayCry1 - ldr r0, _080CF894 @ =gUnknown_2037238 + ldr r0, _080CF894 @ =gPlttBufferUnfaded + 0x40 ldr r1, _080CF898 @ =gUnknown_2039A20 ldr r1, [r1] adds r1, 0x4 @@ -3094,7 +3094,7 @@ _080CF86E: b _080CFA90 .align 2, 0 _080CF890: .4byte gTasks -_080CF894: .4byte gUnknown_2037238 +_080CF894: .4byte gPlttBufferUnfaded + 0x40 _080CF898: .4byte gUnknown_2039A20 _080CF89C: bl IsCryFinished @@ -3136,13 +3136,13 @@ _080CF8A8: lsls r0, 16 lsrs r0, 16 movs r1, 0x2 - bl sub_8088E74 + bl GetSetPokedexFlag ldrh r0, [r4, 0xC] bl SpeciesToNationalPokedexNum lsls r0, 16 lsrs r0, 16 movs r1, 0x3 - bl sub_8088E74 + bl GetSetPokedexFlag movs r0, 0xE bl IncrementGameStat b _080D003A @@ -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 gDisplayedStringBattle _080CFDA8: .4byte gTasks _080CFDAC: - ldr r0, _080CFE14 @ =gUnknown_2037AB8 + ldr r0, _080CFE14 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3687,7 +3687,7 @@ _080CFDAC: beq _080CFDBA b _080D003A _080CFDBA: - ldr r0, _080CFE18 @ =gUnknown_3003F3C + ldr r0, _080CFE18 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _080CFDC6 @@ -3724,15 +3724,15 @@ _080CFDC6: strh r0, [r5, 0x14] b _080D003A .align 2, 0 -_080CFE14: .4byte gUnknown_2037AB8 -_080CFE18: .4byte gUnknown_3003F3C +_080CFE14: .4byte gPaletteFade +_080CFE18: .4byte gWirelessCommType _080CFE1C: .4byte gPlayerParty _080CFE20: .4byte gTasks _080CFE24: .4byte gPlayerPartyCount _080CFE28: .4byte CB2_TradeEvolutionSceneLoadGraphics _080CFE2C: .4byte gMoveToLearn _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 deleted file mode 100644 index 129d91c0f..000000000 --- a/asm/fame_checker.s +++ /dev/null @@ -1,4171 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_812C380 -sub_812C380: @ 812C380 - push {lr} - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - pop {r0} - bx r0 - thumb_func_end sub_812C380 - - thumb_func_start sub_812C394 -sub_812C394: @ 812C394 - push {lr} - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl UpdatePaletteFade - pop {r0} - bx r0 - thumb_func_end sub_812C394 - - thumb_func_start sub_812C3AC -sub_812C3AC: @ 812C3AC - push {r4,r5,lr} - adds r5, r0, 0 - movs r0, 0 - bl SetVBlankCallback - ldr r4, _0812C3F0 @ =gUnknown_203B0FC - movs r0, 0x24 - bl AllocZeroed - str r0, [r4] - str r5, [r0] - movs r1, 0 - strb r1, [r0, 0x9] - ldr r0, [r4] - strb r1, [r0, 0xA] - ldr r0, [r4] - strb r1, [r0, 0xB] - ldr r1, [r4] - adds r1, 0x23 - ldrb r2, [r1] - movs r0, 0x2 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - movs r0, 0xC7 - bl PlaySE - ldr r0, _0812C3F4 @ =sub_812C3F8 - bl SetMainCallback2 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812C3F0: .4byte gUnknown_203B0FC -_0812C3F4: .4byte sub_812C3F8 - thumb_func_end sub_812C3AC - - thumb_func_start sub_812C3F8 -sub_812C3F8: @ 812C3F8 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0xC - ldr r0, _0812C41C @ =gMain - movs r1, 0x87 - lsls r1, 3 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x7 - bls _0812C410 - b _0812C626 -_0812C410: - lsls r0, 2 - ldr r1, _0812C420 @ =_0812C424 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0812C41C: .4byte gMain -_0812C420: .4byte _0812C424 - .align 2, 0 -_0812C424: - .4byte _0812C444 - .4byte _0812C450 - .4byte _0812C456 - .4byte _0812C4C0 - .4byte _0812C540 - .4byte _0812C578 - .4byte _0812C5A0 - .4byte _0812C5D4 -_0812C444: - movs r0, 0 - bl SetVBlankCallback - bl sub_812D420 - b _0812C5BE -_0812C450: - bl sub_812D558 - b _0812C5BE -_0812C456: - ldr r6, _0812C4B0 @ =gUnknown_203B0F0 - movs r4, 0x80 - lsls r4, 4 - adds r0, r4, 0 - bl AllocZeroed - str r0, [r6] - ldr r1, _0812C4B4 @ =gUnknown_203B0F4 - mov r8, r1 - movs r0, 0x80 - lsls r0, 5 - bl AllocZeroed - mov r1, r8 - str r0, [r1] - ldr r5, _0812C4B8 @ =gUnknown_203B0F8 - adds r0, r4, 0 - bl AllocZeroed - str r0, [r5] - movs r0, 0 - bl ResetBgsAndClearDma3BusyFlags - ldr r1, _0812C4BC @ =gUnknown_845FBF4 - movs r0, 0 - movs r2, 0x4 - bl InitBgsFromTemplates - ldr r1, [r6] - movs r0, 0x3 - bl SetBgTilemapBuffer - ldr r1, [r5] - movs r0, 0x2 - bl SetBgTilemapBuffer - mov r0, r8 - ldr r1, [r0] - movs r0, 0x1 - bl SetBgTilemapBuffer - bl sub_812D594 - b _0812C5BE - .align 2, 0 -_0812C4B0: .4byte gUnknown_203B0F0 -_0812C4B4: .4byte gUnknown_203B0F4 -_0812C4B8: .4byte gUnknown_203B0F8 -_0812C4BC: .4byte gUnknown_845FBF4 -_0812C4C0: - ldr r1, _0812C52C @ =gUnknown_8E9F260 - movs r2, 0xA5 - lsls r2, 5 - movs r0, 0x3 - movs r3, 0 - bl LoadBgTiles - ldr r1, _0812C530 @ =gUnknown_8EA0700 - movs r5, 0x20 - str r5, [sp] - str r5, [sp, 0x4] - movs r0, 0x3 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBufferRect - ldr r4, _0812C534 @ =gUnknown_8E9F220 - adds r0, r4, 0 - movs r1, 0 - movs r2, 0x40 - bl LoadPalette - adds r4, 0x20 - adds r0, r4, 0 - movs r1, 0x10 - movs r2, 0x20 - bl LoadPalette - ldr r1, _0812C538 @ =gUnknown_8EA0F00 - str r5, [sp] - str r5, [sp, 0x4] - movs r0, 0x2 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBufferRect - ldr r1, _0812C53C @ =gUnknown_845C600 - str r5, [sp] - str r5, [sp, 0x4] - movs r0, 0x11 - str r0, [sp, 0x8] - movs r0, 0x1 - movs r2, 0x1E - movs r3, 0 - bl CopyToBgTilemapBufferRect_ChangePalette - movs r0, 0x2 - bl stdpal_get - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - b _0812C5BE - .align 2, 0 -_0812C52C: .4byte gUnknown_8E9F260 -_0812C530: .4byte gUnknown_8EA0700 -_0812C534: .4byte gUnknown_8E9F220 -_0812C538: .4byte gUnknown_8EA0F00 -_0812C53C: .4byte gUnknown_845C600 -_0812C540: - bl IsDma3ManagerBusyWithBgCopy - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0812C626 - movs r0, 0 - bl ShowBg - movs r0, 0x1 - bl ShowBg - movs r0, 0x2 - bl ShowBg - movs r0, 0x3 - bl ShowBg - movs r0, 0x3 - bl CopyBgTilemapBufferToVram - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - b _0812C5BE -_0812C578: - ldr r0, _0812C598 @ =gUnknown_845FC04 - bl InitWindows - bl DeactivateAllTextPrinters - bl sub_812CEC0 - ldr r4, _0812C59C @ =gUnknown_203B100 - movs r0, 0x88 - bl AllocZeroed - str r0, [r4] - bl sub_812DB28 - b _0812C5BE - .align 2, 0 -_0812C598: .4byte gUnknown_845FC04 -_0812C59C: .4byte gUnknown_203B100 -_0812C5A0: - bl sub_812C648 - movs r0, 0 - bl sub_812D1A8 - bl sub_812CE9C - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade -_0812C5BE: - ldr r1, _0812C5D0 @ =gMain - movs r0, 0x87 - lsls r0, 3 - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _0812C626 - .align 2, 0 -_0812C5D0: .4byte gMain -_0812C5D4: - bl sub_812D584 - movs r1, 0xFD - lsls r1, 6 - movs r0, 0x50 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0x7 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0x8 - bl SetGpuReg - ldr r0, _0812C634 @ =sub_812C380 - bl SetVBlankCallback - ldr r0, _0812C638 @ =gUnknown_203B0FC - ldr r1, [r0] - movs r4, 0 - movs r0, 0 - strh r0, [r1, 0x4] - bl sub_812E000 - movs r0, 0x1 - movs r1, 0x4 - bl sub_812E178 - ldr r0, _0812C63C @ =sub_812C664 - movs r1, 0x8 - bl CreateTask - ldr r0, _0812C640 @ =sub_812C394 - bl SetMainCallback2 - ldr r0, _0812C644 @ =gMain - movs r1, 0x87 - lsls r1, 3 - adds r0, r1 - strb r4, [r0] -_0812C626: - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0812C634: .4byte sub_812C380 -_0812C638: .4byte gUnknown_203B0FC -_0812C63C: .4byte sub_812C664 -_0812C640: .4byte sub_812C394 -_0812C644: .4byte gMain - thumb_func_end sub_812C3F8 - - thumb_func_start sub_812C648 -sub_812C648: @ 812C648 - push {lr} - ldr r0, _0812C65C @ =gUnknown_845FB9C - bl LoadSpriteSheets - ldr r0, _0812C660 @ =gUnknown_845FBDC - bl LoadSpritePalettes - pop {r0} - bx r0 - .align 2, 0 -_0812C65C: .4byte gUnknown_845FB9C -_0812C660: .4byte gUnknown_845FBDC - thumb_func_end sub_812C648 - - thumb_func_start sub_812C664 -sub_812C664: @ 812C664 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, _0812C688 @ =gUnknown_2037AB8 - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0812C684 - ldr r0, _0812C68C @ =gTasks - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r0 - ldr r0, _0812C690 @ =sub_812C694 - str r0, [r1] -_0812C684: - pop {r0} - bx r0 - .align 2, 0 -_0812C688: .4byte gUnknown_2037AB8 -_0812C68C: .4byte gTasks -_0812C690: .4byte sub_812C694 - thumb_func_end sub_812C664 - - thumb_func_start sub_812C694 -sub_812C694: @ 812C694 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - ldr r0, _0812C714 @ =gTasks - adds r7, r1, r0 - adds r0, 0x8 - adds r1, r0 - mov r8, r1 - ldr r0, _0812C718 @ =sub_812E110 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - beq _0812C6C0 - b _0812C8EA -_0812C6C0: - bl RunTextPrinters - ldr r0, _0812C71C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0812C6E8 - ldr r0, _0812C720 @ =gUnknown_203B0FC - ldr r2, [r0] - ldrb r1, [r2, 0x7] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _0812C6E8 - ldr r1, [r2] - ldr r0, _0812C724 @ =sub_8107EB8 - cmp r1, r0 - beq _0812C6E8 - b _0812C8DA -_0812C6E8: - ldr r0, _0812C71C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _0812C7DC - bl sub_812E064 - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r5, 0 - bl sub_812C8F8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0812C728 - movs r0, 0xCB - bl PlaySE - b _0812C8EA - .align 2, 0 -_0812C714: .4byte gTasks -_0812C718: .4byte sub_812E110 -_0812C71C: .4byte gMain -_0812C720: .4byte gUnknown_203B0FC -_0812C724: .4byte sub_8107EB8 -_0812C728: - ldr r5, _0812C7D0 @ =gUnknown_203B0FC - ldr r0, [r5] - ldrb r0, [r0, 0x7] - lsrs r0, 2 - subs r0, 0x1 - cmp r4, r0 - bne _0812C738 - b _0812C8EA -_0812C738: - movs r0, 0xCB - bl PlaySE - movs r0, 0x58 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - movs r0, 0x3 - bl sub_812CEE0 - movs r0, 0x2 - movs r1, 0x4 - bl sub_812E178 - movs r0, 0x1 - movs r1, 0x5 - bl sub_812E178 - movs r0, 0x1 - bl sub_812D0F4 - ldr r0, [r5] - adds r0, 0xC - adds r0, r4 - ldrb r0, [r0] - bl sub_812D888 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r7, 0xC] - ldr r4, _0812C7D4 @ =gSprites - movs r0, 0xC - ldrsh r1, [r7, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r6, 0xF0 - strh r6, [r0, 0x24] - movs r3, 0xC - ldrsh r1, [r7, r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r5, 0x1 - strh r5, [r0, 0x2E] - bl sub_812D7E4 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r7, 0xE] - movs r0, 0xE - ldrsh r1, [r7, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - strh r6, [r0, 0x24] - movs r3, 0xE - ldrsh r1, [r7, r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - strh r5, [r0, 0x2E] - ldr r0, _0812C7D8 @ =sub_812C9BC - str r0, [r7] - b _0812C8EA - .align 2, 0 -_0812C7D0: .4byte gUnknown_203B0FC -_0812C7D4: .4byte gSprites -_0812C7D8: .4byte sub_812C9BC -_0812C7DC: - movs r6, 0x1 - adds r0, r6, 0 - ands r0, r1 - cmp r0, 0 - beq _0812C8C4 - movs r0, 0 - bl ListMenuHandleInput - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, _0812C824 @ =gUnknown_203B0FC - ldr r0, [r0] - ldrb r1, [r0, 0x7] - lsrs r0, r1, 2 - subs r0, 0x1 - cmp r4, r0 - beq _0812C8DA - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812C828 - movs r0, 0x2 - bl IsTextPrinterActive - lsls r0, 16 - cmp r0, 0 - bne _0812C8EA - bl sub_812D6B4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0812C8EA - bl sub_812CD3C - b _0812C8EA - .align 2, 0 -_0812C824: .4byte gUnknown_203B0FC -_0812C828: - adds r0, r6, 0 - ands r0, r1 - cmp r0, 0 - beq _0812C8EA - movs r0, 0x5 - bl PlaySE - movs r1, 0xA - ldrsh r0, [r7, r1] - bl sub_812D724 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r7, 0x8] - movs r4, 0 -_0812C846: - movs r3, 0xA - ldrsh r0, [r7, r3] - cmp r4, r0 - beq _0812C85E - ldr r0, _0812C8B4 @ =gUnknown_203B0FC - ldr r0, [r0] - adds r0, 0x1D - adds r0, r4 - ldrb r0, [r0] - movs r1, 0x1 - bl sub_812CEFC -_0812C85E: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _0812C846 - ldr r1, _0812C8B8 @ =gUnknown_3005EC8 - movs r0, 0xFF - strb r0, [r1] - movs r0, 0 - bl sub_812E4A4 - movs r0, 0x2 - bl sub_812D0F4 - ldr r2, _0812C8BC @ =gSprites - ldr r0, _0812C8B4 @ =gUnknown_203B0FC - ldr r0, [r0] - movs r3, 0xA - ldrsh r1, [r7, r3] - adds r0, 0x1D - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r1, 0x30 - ldrsh r0, [r0, r1] - cmp r0, 0xFF - beq _0812C8A8 - adds r0, r5, 0 - bl sub_812CE04 - mov r3, r8 - ldrb r0, [r3, 0x2] - bl sub_812DA14 -_0812C8A8: - bl sub_812E048 - ldr r0, _0812C8C0 @ =sub_812CAD8 - str r0, [r7] - b _0812C8EA - .align 2, 0 -_0812C8B4: .4byte gUnknown_203B0FC -_0812C8B8: .4byte gUnknown_3005EC8 -_0812C8BC: .4byte gSprites -_0812C8C0: .4byte sub_812CAD8 -_0812C8C4: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812C8E4 - adds r0, r5, 0 - bl sub_812C8F8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0812C8EA -_0812C8DA: - ldr r0, _0812C8E0 @ =sub_812CF3C - str r0, [r7] - b _0812C8EA - .align 2, 0 -_0812C8E0: .4byte sub_812CF3C -_0812C8E4: - movs r0, 0 - bl ListMenuHandleInput -_0812C8EA: - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_812C694 - - thumb_func_start sub_812C8F8 -sub_812C8F8: @ 812C8F8 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _0812C91C @ =gTasks - adds r4, r1, r0 - ldr r5, _0812C920 @ =gUnknown_203B0FC - ldr r0, [r5] - ldrb r1, [r0, 0x7] - movs r3, 0x2 - adds r0, r3, 0 - ands r0, r1 - cmp r0, 0 - bne _0812C924 - movs r0, 0 - b _0812C982 - .align 2, 0 -_0812C91C: .4byte gTasks -_0812C920: .4byte gUnknown_203B0FC -_0812C924: - ldr r2, _0812C988 @ =gSprites - movs r0, 0xC - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strh r3, [r0, 0x2E] - movs r0, 0xC - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x24] - adds r1, 0xA - strh r1, [r0, 0x24] - movs r0, 0xE - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strh r3, [r0, 0x2E] - movs r0, 0xE - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x24] - adds r1, 0xA - strh r1, [r0, 0x24] - bl sub_812CE9C - ldr r0, _0812C98C @ =sub_812CA1C - str r0, [r4] - bl sub_812C990 - ldr r1, [r5] - adds r1, 0x23 - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - movs r0, 0x1 -_0812C982: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_0812C988: .4byte gSprites -_0812C98C: .4byte sub_812CA1C - thumb_func_end sub_812C8F8 - - thumb_func_start sub_812C990 -sub_812C990: @ 812C990 - push {lr} - sub sp, 0x10 - ldr r2, _0812C9B8 @ =gUnknown_84181E4 - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0x3 - str r0, [sp, 0xC] - movs r0, 0x2 - movs r1, 0x2 - movs r3, 0 - bl AddTextPrinterParametrized - add sp, 0x10 - pop {r0} - bx r0 - .align 2, 0 -_0812C9B8: .4byte gUnknown_84181E4 - thumb_func_end sub_812C990 - - thumb_func_start sub_812C9BC -sub_812C9BC: @ 812C9BC - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _0812C9F8 @ =gTasks - adds r4, r1, r0 - ldr r2, _0812C9FC @ =gSprites - movs r0, 0xC - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r1, 0x2E - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _0812CA08 - bl sub_812CD3C - ldr r0, _0812CA00 @ =gUnknown_203B0FC - ldr r2, [r0] - ldrb r0, [r2, 0x7] - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2, 0x7] - ldr r0, _0812CA04 @ =sub_812C694 - str r0, [r4] - b _0812CA14 - .align 2, 0 -_0812C9F8: .4byte gTasks -_0812C9FC: .4byte gSprites -_0812CA00: .4byte gUnknown_203B0FC -_0812CA04: .4byte sub_812C694 -_0812CA08: - movs r1, 0xA0 - lsls r1, 4 - movs r0, 0x1 - movs r2, 0x1 - bl ChangeBgX -_0812CA14: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_812C9BC - - thumb_func_start sub_812CA1C -sub_812CA1C: @ 812CA1C - push {r4-r7,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, _0812CA44 @ =gTasks - adds r5, r0, r1 - movs r0, 0x1 - bl GetBgX - cmp r0, 0 - beq _0812CA48 - movs r1, 0xA0 - lsls r1, 4 - movs r0, 0x1 - movs r2, 0x2 - bl ChangeBgX - b _0812CA52 - .align 2, 0 -_0812CA44: .4byte gTasks -_0812CA48: - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgX -_0812CA52: - ldr r7, _0812CAC8 @ =gSprites - movs r1, 0xC - ldrsh r0, [r5, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r7 - movs r2, 0x2E - ldrsh r0, [r1, r2] - cmp r0, 0 - bne _0812CAC0 - ldr r6, _0812CACC @ =gUnknown_203B0FC - ldr r0, [r6] - ldrb r1, [r0, 0x7] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0812CA7C - movs r0, 0 - bl sub_812D0F4 -_0812CA7C: - movs r0, 0x1 - movs r1, 0x4 - bl sub_812E178 - movs r0, 0x2 - movs r1, 0x2 - bl sub_812E178 - ldr r2, [r6] - ldrb r1, [r2, 0x7] - movs r0, 0x3 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x7] - bl sub_812E064 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - adds r0, r4, 0 - bl sub_812D9A8 - ldr r0, _0812CAD0 @ =sub_812C694 - str r0, [r5] - movs r0, 0xE - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r1, r7, 0 - adds r1, 0x1C - adds r0, r1 - ldr r1, _0812CAD4 @ =sub_812D800 - str r1, [r0] -_0812CAC0: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812CAC8: .4byte gSprites -_0812CACC: .4byte gUnknown_203B0FC -_0812CAD0: .4byte sub_812C694 -_0812CAD4: .4byte sub_812D800 - thumb_func_end sub_812CA1C - - thumb_func_start sub_812CAD8 -sub_812CAD8: @ 812CAD8 - push {r4-r6,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - ldr r0, _0812CB9C @ =gTasks - adds r5, r1, r0 - adds r0, 0x8 - adds r6, r1, r0 - bl RunTextPrinters - ldr r0, _0812CBA0 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0812CB2E - movs r0, 0x2 - bl IsTextPrinterActive - lsls r0, 16 - cmp r0, 0 - bne _0812CB2E - ldr r0, _0812CBA4 @ =gUnknown_203B0FC - ldr r0, [r0] - movs r2, 0x2 - ldrsh r1, [r6, r2] - adds r0, 0x1D - adds r0, r1 - ldrb r1, [r0] - ldr r2, _0812CBA8 @ =gSprites - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r1, 0x30 - ldrsh r0, [r0, r1] - cmp r0, 0xFF - beq _0812CB2E - adds r0, r4, 0 - bl sub_812CE04 -_0812CB2E: - ldr r0, _0812CBA0 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812CBB8 - movs r0, 0x5 - bl PlaySE - movs r4, 0 - ldr r6, _0812CBA4 @ =gUnknown_203B0FC -_0812CB44: - ldr r0, [r6] - adds r0, 0x1D - adds r0, r4 - ldrb r0, [r0] - movs r1, 0 - bl sub_812CEFC - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _0812CB44 - bl sub_812CE9C - ldr r2, _0812CBA8 @ =gSprites - movs r0, 0x8 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r2, 0x1C - adds r0, r2 - ldr r1, _0812CBAC @ =sub_812D764 - str r1, [r0] - ldr r0, _0812CBB0 @ =gUnknown_3005EC8 - ldrb r0, [r0] - cmp r0, 0xFF - beq _0812CB80 - bl sub_812DB10 -_0812CB80: - movs r0, 0x1 - bl sub_812E4A4 - movs r0, 0 - bl sub_812D0F4 - bl sub_812E000 - bl sub_812C990 - ldr r0, _0812CBB4 @ =sub_812C694 - str r0, [r5] - b _0812CC62 - .align 2, 0 -_0812CB9C: .4byte gTasks -_0812CBA0: .4byte gMain -_0812CBA4: .4byte gUnknown_203B0FC -_0812CBA8: .4byte gSprites -_0812CBAC: .4byte sub_812D764 -_0812CBB0: .4byte gUnknown_3005EC8 -_0812CBB4: .4byte sub_812C694 -_0812CBB8: - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - bne _0812CBC8 - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _0812CBF4 -_0812CBC8: - ldrh r1, [r5, 0xA] - movs r2, 0xA - ldrsh r0, [r5, r2] - cmp r0, 0x2 - ble _0812CBE4 - subs r0, r1, 0x3 - strh r0, [r5, 0xA] - movs r2, 0x1B - negs r2, r2 - adds r0, r4, 0 - movs r1, 0 - bl sub_812CC68 - b _0812CC62 -_0812CBE4: - adds r0, r1, 0x3 - strh r0, [r5, 0xA] - adds r0, r4, 0 - movs r1, 0 - movs r2, 0x1B - bl sub_812CC68 - b _0812CC62 -_0812CBF4: - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _0812CC26 - ldrh r6, [r5, 0xA] - movs r1, 0xA - ldrsh r0, [r5, r1] - cmp r0, 0 - beq _0812CC12 - movs r1, 0x3 - bl __modsi3 - lsls r0, 16 - cmp r0, 0 - bne _0812CC1C -_0812CC12: - adds r0, r6, 0x2 - strh r0, [r5, 0xA] - adds r0, r4, 0 - movs r1, 0x5E - b _0812CC4A -_0812CC1C: - subs r0, r6, 0x1 - strh r0, [r5, 0xA] - movs r1, 0x2F - negs r1, r1 - b _0812CC48 -_0812CC26: - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _0812CC62 - movs r1, 0xA - ldrsh r0, [r5, r1] - adds r0, 0x1 - movs r1, 0x3 - bl __modsi3 - cmp r0, 0 - bne _0812CC52 - ldrh r0, [r5, 0xA] - subs r0, 0x2 - strh r0, [r5, 0xA] - movs r1, 0x5E - negs r1, r1 -_0812CC48: - adds r0, r4, 0 -_0812CC4A: - movs r2, 0 - bl sub_812CC68 - b _0812CC62 -_0812CC52: - ldrh r0, [r5, 0xA] - adds r0, 0x1 - strh r0, [r5, 0xA] - adds r0, r4, 0 - movs r1, 0x2F - movs r2, 0 - bl sub_812CC68 -_0812CC62: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_812CAD8 - - thumb_func_start sub_812CC68 -sub_812CC68: @ 812CC68 - push {r4-r7,lr} - sub sp, 0x8 - adds r4, r1, 0 - adds r5, r2, 0 - lsls r0, 24 - lsrs r7, r0, 24 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - ldr r1, _0812CD18 @ =gTasks+0x8 - adds r6, r0, r1 - movs r0, 0xBB - bl PlaySE - ldr r2, _0812CD1C @ =gSprites - movs r0, 0 - ldrsh r1, [r6, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - lsls r4, 24 - asrs r4, 24 - ldrh r1, [r0, 0x20] - adds r4, r1 - strh r4, [r0, 0x20] - movs r0, 0 - ldrsh r1, [r6, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - lsls r5, 24 - asrs r5, 24 - ldrh r1, [r0, 0x22] - adds r5, r1 - strh r5, [r0, 0x22] - movs r4, 0 - ldr r5, _0812CD20 @ =gUnknown_203B0FC -_0812CCBE: - ldr r0, [r5] - adds r0, 0x1D - adds r0, r4 - ldrb r0, [r0] - movs r1, 0x1 - bl sub_812CEFC - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _0812CCBE - movs r0, 0xD0 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x2 - movs r1, 0x11 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - bl sub_812C990 - ldr r0, _0812CD20 @ =gUnknown_203B0FC - ldr r0, [r0] - movs r2, 0x2 - ldrsh r1, [r6, r2] - adds r0, 0x1D - adds r0, r1 - ldrb r0, [r0] - movs r1, 0 - bl sub_812CEFC - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0812CD24 - adds r0, r7, 0 - bl sub_812CE04 - ldrb r0, [r6, 0x2] - bl sub_812DA14 - b _0812CD30 - .align 2, 0 -_0812CD18: .4byte gTasks+0x8 -_0812CD1C: .4byte gSprites -_0812CD20: .4byte gUnknown_203B0FC -_0812CD24: - ldr r0, _0812CD38 @ =gUnknown_3005EC8 - ldrb r0, [r0] - cmp r0, 0xFF - beq _0812CD30 - bl sub_812DB10 -_0812CD30: - add sp, 0x8 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812CD38: .4byte gUnknown_3005EC8 - thumb_func_end sub_812CC68 - - thumb_func_start sub_812CD3C -sub_812CD3C: @ 812CD3C - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x10 - movs r0, 0 - mov r8, r0 - bl sub_812E064 - lsls r0, 16 - lsrs r0, 16 - adds r6, r0, 0 - ldr r0, _0812CD7C @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r7, _0812CD80 @ =gUnknown_203B0FC - ldr r0, [r7] - adds r0, 0xC - adds r0, r6 - ldrb r0, [r0] - lsls r0, 2 - adds r1, r0 - ldr r0, _0812CD84 @ =0x00003a54 - adds r1, r0 - ldrb r0, [r1] - lsls r0, 30 - lsrs r5, r0, 30 - cmp r5, 0x2 - beq _0812CD88 - bl sub_812CE9C - bl sub_812C990 - b _0812CDEE - .align 2, 0 -_0812CD7C: .4byte gSaveBlock1Ptr -_0812CD80: .4byte gUnknown_203B0FC -_0812CD84: .4byte 0x00003a54 -_0812CD88: - movs r0, 0xD0 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x2 - movs r1, 0x11 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - bl sub_812D6B4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0812CDAC - movs r0, 0x10 - mov r8, r0 -_0812CDAC: - ldr r4, _0812CDFC @ =gStringVar4 - ldr r1, _0812CE00 @ =gUnknown_845F63C - ldr r0, [r7] - adds r0, 0xC - adds r0, r6 - ldrb r0, [r0] - add r0, r8 - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - adds r0, r4, 0 - bl StringExpandPlaceholders - bl sub_80F78A8 - adds r3, r0, 0 - lsls r3, 24 - lsrs r3, 24 - movs r0, 0 - str r0, [sp] - str r5, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0x3 - str r0, [sp, 0xC] - movs r0, 0x2 - movs r1, 0x2 - adds r2, r4, 0 - bl AddTextPrinterParametrized - movs r0, 0x2 - bl sub_812CEE0 -_0812CDEE: - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812CDFC: .4byte gStringVar4 -_0812CE00: .4byte gUnknown_845F63C - thumb_func_end sub_812CD3C - - thumb_func_start sub_812CE04 -sub_812CE04: @ 812CE04 - push {r4-r6,lr} - sub sp, 0x10 - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r0, _0812CE8C @ =gTasks+0x8 - adds r4, r0 - bl sub_812E064 - adds r5, r0, 0 - lsls r5, 16 - lsrs r5, 16 - movs r0, 0xD0 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x2 - movs r1, 0x11 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - ldr r6, _0812CE90 @ =gStringVar4 - ldr r2, _0812CE94 @ =gUnknown_845F6BC - ldr r0, _0812CE98 @ =gUnknown_203B0FC - ldr r0, [r0] - adds r0, 0xC - adds r0, r5 - ldrb r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 1 - movs r3, 0x2 - ldrsh r1, [r4, r3] - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldr r1, [r0] - adds r0, r6, 0 - bl StringExpandPlaceholders - bl sub_80F78A8 - adds r3, r0, 0 - lsls r3, 24 - lsrs r3, 24 - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0x3 - str r0, [sp, 0xC] - movs r0, 0x2 - movs r1, 0x2 - adds r2, r6, 0 - bl AddTextPrinterParametrized - movs r0, 0x2 - bl sub_812CEE0 - add sp, 0x10 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0812CE8C: .4byte gTasks+0x8 -_0812CE90: .4byte gStringVar4 -_0812CE94: .4byte gUnknown_845F6BC -_0812CE98: .4byte gUnknown_203B0FC - thumb_func_end sub_812CE04 - - thumb_func_start sub_812CE9C -sub_812CE9C: @ 812CE9C - push {lr} - sub sp, 0x8 - movs r0, 0xD0 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x2 - movs r1, 0x11 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - movs r0, 0x2 - bl sub_812CEE0 - add sp, 0x8 - pop {r0} - bx r0 - thumb_func_end sub_812CE9C - - thumb_func_start sub_812CEC0 -sub_812CEC0: @ 812CEC0 - push {lr} - bl sub_80F6E9C - movs r0, 0x2 - movs r1, 0x1 - bl sub_80F6EE4 - movs r0, 0x2 - bl sub_812CEE0 - movs r0, 0 - bl sub_812CEE0 - pop {r0} - bx r0 - thumb_func_end sub_812CEC0 - - thumb_func_start sub_812CEE0 -sub_812CEE0: @ 812CEE0 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - bl PutWindowTilemap - adds r0, r4, 0 - movs r1, 0x3 - bl CopyWindowToVram - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_812CEE0 - - thumb_func_start sub_812CEFC -sub_812CEFC: @ 812CEFC - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r4, r1, 24 - ldr r2, _0812CF1C @ =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r3, r1, r2 - movs r1, 0x30 - ldrsh r0, [r3, r1] - cmp r0, 0xFF - bne _0812CF20 - movs r0, 0 - b _0812CF36 - .align 2, 0 -_0812CF1C: .4byte gSprites -_0812CF20: - movs r0, 0x3 - adds r1, r4, 0 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r3, 0x1] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0x1] - movs r0, 0x1 -_0812CF36: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_812CEFC - - thumb_func_start sub_812CF3C -sub_812CF3C: @ 812CF3C - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0xC7 - bl PlaySE - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldr r1, _0812CF74 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, _0812CF78 @ =sub_812CF7C - str r1, [r0] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812CF74: .4byte gTasks -_0812CF78: .4byte sub_812CF7C - thumb_func_end sub_812CF3C - - thumb_func_start sub_812CF7C -sub_812CF7C: @ 812CF7C - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r0, _0812D074 @ =gUnknown_2037AB8 - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0812D06C - ldr r0, _0812D078 @ =gUnknown_203B0FC - ldr r0, [r0] - ldrb r1, [r0, 0x7] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812CFD8 - bl sub_812E064 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - adds r0, r6, 0 - bl sub_812D9A8 - ldr r0, _0812D07C @ =gTasks - lsls r4, r6, 2 - adds r4, r6 - lsls r4, 3 - adds r4, r0 - movs r0, 0xE - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r5, _0812D080 @ =gSprites - adds r0, r5 - bl FreeSpriteOamMatrix - movs r0, 0xE - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - bl DestroySprite -_0812CFD8: - movs r4, 0 -_0812CFDA: - ldr r5, _0812D078 @ =gUnknown_203B0FC - ldr r0, [r5] - adds r0, 0x1D - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _0812D080 @ =gSprites - adds r0, r1 - bl DestroySprite - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _0812CFDA - bl sub_812D814 - bl sub_812D7C8 - bl sub_812D70C - bl sub_812D770 - bl sub_812E048 - ldr r0, [r5] - ldr r0, [r0] - bl SetMainCallback2 - ldr r0, [r5] - ldrb r0, [r0, 0x8] - movs r1, 0 - movs r2, 0 - bl sub_810713C - ldr r0, _0812D084 @ =gUnknown_203B0F0 - ldr r0, [r0] - bl Free - ldr r0, _0812D088 @ =gUnknown_203B0F4 - ldr r0, [r0] - bl Free - ldr r0, _0812D08C @ =gUnknown_203B0F8 - ldr r0, [r0] - bl Free - ldr r0, [r5] - bl Free - ldr r0, _0812D090 @ =gUnknown_203B100 - ldr r0, [r0] - bl Free - movs r0, 0 - bl sub_812D094 - movs r0, 0x1 - bl sub_812D094 - movs r0, 0x2 - bl sub_812D094 - movs r0, 0x3 - bl sub_812D094 - bl FreeAllWindowBuffers - adds r0, r6, 0 - bl DestroyTask -_0812D06C: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0812D074: .4byte gUnknown_2037AB8 -_0812D078: .4byte gUnknown_203B0FC -_0812D07C: .4byte gTasks -_0812D080: .4byte gSprites -_0812D084: .4byte gUnknown_203B0F0 -_0812D088: .4byte gUnknown_203B0F4 -_0812D08C: .4byte gUnknown_203B0F8 -_0812D090: .4byte gUnknown_203B100 - thumb_func_end sub_812CF7C - - thumb_func_start sub_812D094 -sub_812D094: @ 812D094 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - movs r1, 0 - bl FillWindowPixelBuffer - adds r0, r4, 0 - bl ClearWindowTilemap - adds r0, r4, 0 - movs r1, 0x2 - bl CopyWindowToVram - adds r0, r4, 0 - bl RemoveWindow - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_812D094 - - thumb_func_start sub_812D0C0 -sub_812D0C0: @ 812D0C0 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0xAF - lsls r0, 1 - bl HasTrainerAlreadyBeenFought - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0812D0EA - cmp r4, 0x9 - bne _0812D0DE - movs r0, 0xF - b _0812D0EC -_0812D0DE: - cmp r4, 0x9 - bls _0812D0EA - subs r0, r4, 0x1 - lsls r0, 24 - lsrs r0, 24 - b _0812D0EC -_0812D0EA: - adds r0, r4, 0 -_0812D0EC: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_812D0C0 - - thumb_func_start sub_812D0F4 -sub_812D0F4: @ 812D0F4 - push {r4,r5,lr} - sub sp, 0x14 - lsls r0, 24 - lsrs r0, 24 - ldr r5, _0812D164 @ =gUnknown_841E5A4 - cmp r0, 0 - beq _0812D10A - ldr r5, _0812D168 @ =gUnknown_841E5D2 - cmp r0, 0x1 - bne _0812D10A - ldr r5, _0812D16C @ =gUnknown_841E5B9 -_0812D10A: - movs r0, 0 - adds r1, r5, 0 - movs r2, 0 - bl GetStringWidth - adds r4, r0, 0 - movs r0, 0xC0 - str r0, [sp] - movs r0, 0x10 - str r0, [sp, 0x4] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - movs r0, 0x44 - negs r0, r0 - adds r2, r0, 0 - subs r2, r4 - lsls r2, 24 - lsrs r2, 24 - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - ldr r0, _0812D170 @ =gUnknown_845F5E0 - str r0, [sp, 0x8] - movs r0, 0x1 - negs r0, r0 - str r0, [sp, 0xC] - str r5, [sp, 0x10] - movs r0, 0x1 - movs r1, 0 - movs r3, 0 - bl AddTextPrinterParametrized2 - movs r0, 0x1 - bl sub_812CEE0 - add sp, 0x14 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812D164: .4byte gUnknown_841E5A4 -_0812D168: .4byte gUnknown_841E5D2 -_0812D16C: .4byte gUnknown_841E5B9 -_0812D170: .4byte gUnknown_845F5E0 - thumb_func_end sub_812D0F4 - - thumb_func_start sub_812D174 -sub_812D174: @ 812D174 - push {r4,lr} - movs r4, 0 -_0812D178: - ldr r0, _0812D1A0 @ =gUnknown_203B0FC - ldr r0, [r0] - adds r0, 0x1D - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _0812D1A4 @ =gSprites - adds r0, r1 - bl DestroySprite - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _0812D178 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812D1A0: .4byte gUnknown_203B0FC -_0812D1A4: .4byte gSprites - thumb_func_end sub_812D174 - - thumb_func_start sub_812D1A8 -sub_812D1A8: @ 812D1A8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - movs r5, 0 - movs r6, 0 - ldr r7, _0812D238 @ =gUnknown_203B0FC -_0812D1BA: - ldr r0, _0812D23C @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, [r7] - adds r0, 0xC - add r0, r8 - ldrb r2, [r0] - lsls r0, r2, 2 - adds r1, r0 - ldr r0, _0812D240 @ =0x00003a54 - adds r1, r0 - ldrh r0, [r1] - lsls r0, 18 - lsrs r0, 20 - asrs r0, r6 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0812D248 - ldr r1, _0812D244 @ =gUnknown_845F83C - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 1 - adds r0, r6 - adds r0, r1 - ldrb r5, [r0] - adds r0, r6, 0 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 1 - adds r4, r0 - lsls r4, 4 - subs r4, r0 - adds r4, 0x72 - lsls r4, 16 - asrs r4, 16 - adds r0, r6, 0 - movs r1, 0x3 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - lsls r3, r0, 3 - subs r3, r0 - lsls r3, 2 - subs r3, r0 - adds r3, 0x2F - lsls r3, 16 - asrs r3, 16 - adds r0, r5, 0 - adds r1, r6, 0 - adds r2, r4, 0 - bl sub_805EB44 - ldr r1, [r7] - adds r1, 0x1D - adds r1, r6 - strb r0, [r1] - movs r5, 0x1 - b _0812D2A0 - .align 2, 0 -_0812D238: .4byte gUnknown_203B0FC -_0812D23C: .4byte gSaveBlock1Ptr -_0812D240: .4byte 0x00003a54 -_0812D244: .4byte gUnknown_845F83C -_0812D248: - adds r0, r6, 0 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 1 - adds r4, r0 - lsls r4, 4 - subs r4, r0 - adds r4, 0x72 - lsls r4, 24 - lsrs r4, 24 - adds r0, r6, 0 - movs r1, 0x3 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - subs r1, r0 - adds r1, 0x1F - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl sub_812D780 - ldr r1, [r7] - adds r1, 0x1D - adds r1, r6 - strb r0, [r1] - ldr r2, _0812D2D0 @ =gSprites - ldr r0, [r7] - adds r0, 0x1D - adds r0, r6 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r1, 0xFF - strh r1, [r0, 0x30] -_0812D2A0: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x5 - bls _0812D1BA - cmp r5, 0x1 - bne _0812D2E0 - ldr r3, _0812D2D4 @ =gUnknown_203B0FC - ldr r2, [r3] - ldrb r0, [r2, 0x7] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2, 0x7] - ldr r0, [r3] - ldrb r1, [r0, 0x7] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812D2D8 - movs r0, 0x1 - bl sub_812D0F4 - b _0812D2F4 - .align 2, 0 -_0812D2D0: .4byte gSprites -_0812D2D4: .4byte gUnknown_203B0FC -_0812D2D8: - movs r0, 0 - bl sub_812D0F4 - b _0812D2F4 -_0812D2E0: - ldr r0, _0812D300 @ =gUnknown_203B0FC - ldr r2, [r0] - ldrb r1, [r2, 0x7] - movs r0, 0x2 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x7] - movs r0, 0x1 - bl sub_812D0F4 -_0812D2F4: - adds r0, r5, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_0812D300: .4byte gUnknown_203B0FC - thumb_func_end sub_812D1A8 - - thumb_func_start sub_812D304 -sub_812D304: @ 812D304 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - movs r4, 0 - ldr r0, _0812D378 @ =gSaveBlock1Ptr - mov r9, r0 - mov r6, r9 - ldr r5, _0812D37C @ =0x00003a54 - movs r0, 0x4 - negs r0, r0 - mov r8, r0 - ldr r0, _0812D380 @ =0xffffc003 - mov r12, r0 - ldr r7, _0812D384 @ =0x00003a55 -_0812D322: - ldr r1, [r6] - lsls r3, r4, 2 - adds r1, r3 - adds r1, r5 - ldrb r2, [r1] - mov r0, r8 - ands r0, r2 - strb r0, [r1] - ldr r1, [r6] - adds r1, r3 - adds r3, r1, r5 - ldrh r2, [r3] - mov r0, r12 - ands r0, r2 - strh r0, [r3] - adds r1, r7 - ldrb r2, [r1] - movs r0, 0x3F - ands r0, r2 - strb r0, [r1] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xF - bls _0812D322 - mov r0, r9 - ldr r2, [r0] - ldr r0, _0812D37C @ =0x00003a54 - adds r2, r0 - ldrb r1, [r2] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2] - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812D378: .4byte gSaveBlock1Ptr -_0812D37C: .4byte 0x00003a54 -_0812D380: .4byte 0xffffc003 -_0812D384: .4byte 0x00003a55 - thumb_func_end sub_812D304 - - thumb_func_start sub_812D388 -sub_812D388: @ 812D388 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - movs r5, 0 - ldr r0, _0812D410 @ =gSaveBlock1Ptr - mov r12, r0 - ldr r7, _0812D414 @ =0x00003a54 - movs r1, 0x4 - negs r1, r1 - mov r10, r1 - ldr r6, _0812D418 @ =0xffffc003 - mov r9, r6 - movs r0, 0x1 - mov r8, r0 -_0812D3AA: - mov r1, r12 - ldr r2, [r1] - lsls r3, r5, 2 - adds r2, r3 - adds r2, r7 - ldrb r1, [r2] - mov r0, r10 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2] - movs r4, 0 - adds r5, 0x1 - str r5, [sp] - adds r5, r3, 0 -_0812D3C8: - mov r6, r12 - ldr r2, [r6] - adds r2, r5 - adds r2, r7 - ldrh r3, [r2] - lsls r0, r3, 18 - lsrs r0, 20 - mov r1, r8 - lsls r1, r4 - orrs r1, r0 - ldr r6, _0812D41C @ =0x00000fff - adds r0, r6, 0 - ands r1, r0 - lsls r1, 2 - mov r0, r9 - ands r0, r3 - orrs r0, r1 - strh r0, [r2] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _0812D3C8 - ldr r1, [sp] - lsls r0, r1, 24 - lsrs r5, r0, 24 - cmp r5, 0xF - bls _0812D3AA - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812D410: .4byte gSaveBlock1Ptr -_0812D414: .4byte 0x00003a54 -_0812D418: .4byte 0xffffc003 -_0812D41C: .4byte 0x00000fff - thumb_func_end sub_812D388 - - thumb_func_start sub_812D420 -sub_812D420: @ 812D420 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r3, 0xC0 - lsls r3, 19 - movs r4, 0xC0 - lsls r4, 9 - add r0, sp, 0x4 - mov r8, r0 - mov r2, sp - movs r6, 0 - ldr r1, _0812D550 @ =0x040000d4 - movs r5, 0x80 - lsls r5, 5 - ldr r7, _0812D554 @ =0x81000800 - movs r0, 0x81 - lsls r0, 24 - mov r12, r0 -_0812D446: - strh r6, [r2] - mov r0, sp - str r0, [r1] - str r3, [r1, 0x4] - str r7, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r3, r5 - subs r4, r5 - cmp r4, r5 - bhi _0812D446 - strh r6, [r2] - mov r2, sp - str r2, [r1] - str r3, [r1, 0x4] - lsrs r0, r4, 1 - mov r2, r12 - orrs r0, r2 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - movs r0, 0xE0 - lsls r0, 19 - movs r3, 0x80 - lsls r3, 3 - movs r4, 0 - str r4, [sp, 0x4] - ldr r2, _0812D550 @ =0x040000d4 - mov r1, r8 - str r1, [r2] - str r0, [r2, 0x4] - lsrs r0, r3, 2 - movs r1, 0x85 - lsls r1, 24 - orrs r0, r1 - str r0, [r2, 0x8] - ldr r0, [r2, 0x8] - movs r1, 0xA0 - lsls r1, 19 - mov r0, sp - strh r4, [r0] - str r0, [r2] - str r1, [r2, 0x4] - lsrs r3, 1 - movs r0, 0x81 - lsls r0, 24 - orrs r3, r0 - str r3, [r2, 0x8] - ldr r0, [r2, 0x8] - movs r0, 0 - movs r1, 0 - bl SetGpuReg - movs r0, 0x8 - movs r1, 0 - bl SetGpuReg - movs r0, 0x10 - movs r1, 0 - bl SetGpuReg - movs r0, 0x12 - movs r1, 0 - bl SetGpuReg - movs r0, 0xA - movs r1, 0 - bl SetGpuReg - movs r0, 0x14 - movs r1, 0 - bl SetGpuReg - movs r0, 0x16 - movs r1, 0 - bl SetGpuReg - movs r0, 0xC - movs r1, 0 - bl SetGpuReg - movs r0, 0x18 - movs r1, 0 - bl SetGpuReg - movs r0, 0x1A - movs r1, 0 - bl SetGpuReg - movs r0, 0xE - movs r1, 0 - bl SetGpuReg - movs r0, 0x1C - movs r1, 0 - bl SetGpuReg - movs r0, 0x1E - movs r1, 0 - bl SetGpuReg - movs r0, 0x40 - movs r1, 0 - bl SetGpuReg - movs r0, 0x44 - movs r1, 0 - bl SetGpuReg - movs r0, 0x48 - movs r1, 0 - bl SetGpuReg - movs r0, 0x4A - movs r1, 0 - bl SetGpuReg - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812D550: .4byte 0x040000d4 -_0812D554: .4byte 0x81000800 - thumb_func_end sub_812D420 - - thumb_func_start sub_812D558 -sub_812D558: @ 812D558 - push {lr} - bl remove_some_task - bl ResetTasks - bl ResetSpriteData - bl dp13_810BB8C - bl ResetPaletteFade - movs r0, 0 - bl npc_paltag_set_load - ldr r1, _0812D580 @ =gReservedSpritePaletteCount - movs r0, 0x7 - strb r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_0812D580: .4byte gReservedSpritePaletteCount - thumb_func_end sub_812D558 - - thumb_func_start sub_812D584 -sub_812D584: @ 812D584 - push {lr} - movs r1, 0xFA - lsls r1, 5 - movs r0, 0 - bl SetGpuReg - pop {r0} - bx r0 - thumb_func_end sub_812D584 - - thumb_func_start sub_812D594 -sub_812D594: @ 812D594 - push {lr} - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - pop {r0} - bx r0 - thumb_func_end sub_812D594 - - thumb_func_start sub_812D5EC -sub_812D5EC: @ 812D5EC - push {r4-r6,lr} - ldr r1, _0812D638 @ =gUnknown_20370C0 - ldrh r0, [r1] - cmp r0, 0xF - bhi _0812D632 - ldr r5, _0812D63C @ =gSpecialVar_0x8005 - ldrh r0, [r5] - cmp r0, 0x5 - bhi _0812D632 - ldr r0, _0812D640 @ =gSaveBlock1Ptr - ldr r2, [r0] - ldrh r0, [r1] - lsls r0, 2 - adds r2, r0 - ldr r0, _0812D644 @ =0x00003a54 - adds r2, r0 - ldrh r3, [r2] - lsls r0, r3, 18 - lsrs r0, 20 - movs r4, 0x1 - adds r1, r4, 0 - ldrh r6, [r5] - lsls r1, r6 - orrs r1, r0 - ldr r6, _0812D648 @ =0x00000fff - adds r0, r6, 0 - ands r1, r0 - lsls r1, 2 - ldr r0, _0812D64C @ =0xffffc003 - ands r0, r3 - orrs r0, r1 - strh r0, [r2] - strh r4, [r5] - bl sub_812D650 -_0812D632: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0812D638: .4byte gUnknown_20370C0 -_0812D63C: .4byte gSpecialVar_0x8005 -_0812D640: .4byte gSaveBlock1Ptr -_0812D644: .4byte 0x00003a54 -_0812D648: .4byte 0x00000fff -_0812D64C: .4byte 0xffffc003 - thumb_func_end sub_812D5EC - - thumb_func_start sub_812D650 -sub_812D650: @ 812D650 - push {r4,lr} - ldr r1, _0812D6A4 @ =gUnknown_20370C0 - ldrh r0, [r1] - cmp r0, 0xF - bhi _0812D69E - ldr r0, _0812D6A8 @ =gSpecialVar_0x8005 - ldrh r4, [r0] - adds r0, r4, 0 - cmp r0, 0x2 - bhi _0812D69E - cmp r0, 0 - beq _0812D69E - ldr r2, _0812D6AC @ =gSaveBlock1Ptr - ldrh r3, [r1] - cmp r0, 0x1 - bne _0812D684 - ldr r0, [r2] - lsls r1, r3, 2 - adds r0, r1 - ldr r1, _0812D6B0 @ =0x00003a54 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 30 - lsrs r0, 30 - cmp r0, 0x2 - beq _0812D69E -_0812D684: - ldr r2, [r2] - lsls r0, r3, 2 - adds r2, r0 - ldr r0, _0812D6B0 @ =0x00003a54 - adds r2, r0 - movs r1, 0x3 - ands r1, r4 - ldrb r3, [r2] - movs r0, 0x4 - negs r0, r0 - ands r0, r3 - orrs r0, r1 - strb r0, [r2] -_0812D69E: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812D6A4: .4byte gUnknown_20370C0 -_0812D6A8: .4byte gSpecialVar_0x8005 -_0812D6AC: .4byte gSaveBlock1Ptr -_0812D6B0: .4byte 0x00003a54 - thumb_func_end sub_812D650 - - thumb_func_start sub_812D6B4 -sub_812D6B4: @ 812D6B4 - push {r4,lr} - ldr r0, _0812D6EC @ =gUnknown_203B0FC - ldr r4, [r0] - bl sub_812E064 - lsls r0, 16 - lsrs r0, 16 - adds r4, 0xC - adds r4, r0 - ldrb r1, [r4] - movs r2, 0 - ldr r0, _0812D6F0 @ =gSaveBlock1Ptr - ldr r0, [r0] - lsls r1, 2 - adds r0, r1 - ldr r1, _0812D6F4 @ =0x00003a54 - adds r0, r1 - ldrh r0, [r0] - lsls r1, r0, 18 - movs r3, 0x1 -_0812D6DC: - lsrs r0, r1, 20 - asrs r0, r2 - ands r0, r3 - cmp r0, 0 - bne _0812D6F8 - movs r0, 0 - b _0812D704 - .align 2, 0 -_0812D6EC: .4byte gUnknown_203B0FC -_0812D6F0: .4byte gSaveBlock1Ptr -_0812D6F4: .4byte 0x00003a54 -_0812D6F8: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x5 - bls _0812D6DC - movs r0, 0x1 -_0812D704: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_812D6B4 - - thumb_func_start sub_812D70C -sub_812D70C: @ 812D70C - push {r4,lr} - movs r4, 0xFA - lsls r4, 2 - adds r0, r4, 0 - bl FreeSpriteTilesByTag - adds r0, r4, 0 - bl FreeSpritePaletteByTag - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_812D70C - - thumb_func_start sub_812D724 -sub_812D724: @ 812D724 - push {r4,lr} - lsls r0, 16 - asrs r0, 16 - movs r4, 0x22 - cmp r0, 0x2 - ble _0812D732 - movs r4, 0x3D -_0812D732: - movs r1, 0x3 - bl __modsi3 - lsls r0, 16 - asrs r0, 16 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 4 - subs r1, r0 - adds r1, 0x72 - ldr r0, _0812D760 @ =gUnknown_845FC44 - lsls r1, 16 - asrs r1, 16 - adds r2, r4, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_0812D760: .4byte gUnknown_845FC44 - thumb_func_end sub_812D724 - - thumb_func_start sub_812D764 -sub_812D764: @ 812D764 - push {lr} - bl DestroySprite - pop {r0} - bx r0 - thumb_func_end sub_812D764 - - thumb_func_start sub_812D770 -sub_812D770: @ 812D770 - push {lr} - ldr r0, _0812D77C @ =0x000003e9 - bl FreeSpriteTilesByTag - pop {r0} - bx r0 - .align 2, 0 -_0812D77C: .4byte 0x000003e9 - thumb_func_end sub_812D770 - - thumb_func_start sub_812D780 -sub_812D780: @ 812D780 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - lsls r3, 24 - lsrs r3, 24 - lsls r2, 24 - lsrs r2, 24 - ldr r0, _0812D7C0 @ =gUnknown_845FC78 - adds r1, r3, 0 - movs r3, 0x8 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r1, _0812D7C4 @ =gSprites - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r1 - ldrb r3, [r2, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r3 - movs r3, 0x8 - orrs r1, r3 - movs r3, 0xF - ands r1, r3 - movs r3, 0x20 - orrs r1, r3 - strb r1, [r2, 0x5] - pop {r1} - bx r1 - .align 2, 0 -_0812D7C0: .4byte gUnknown_845FC78 -_0812D7C4: .4byte gSprites - thumb_func_end sub_812D780 - - thumb_func_start sub_812D7C8 -sub_812D7C8: @ 812D7C8 - push {r4,lr} - ldr r4, _0812D7E0 @ =0x000003ea - adds r0, r4, 0 - bl FreeSpriteTilesByTag - adds r0, r4, 0 - bl FreeSpritePaletteByTag - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812D7E0: .4byte 0x000003ea - thumb_func_end sub_812D7C8 - - thumb_func_start sub_812D7E4 -sub_812D7E4: @ 812D7E4 - push {lr} - ldr r0, _0812D7FC @ =gUnknown_845FCB8 - movs r1, 0xE2 - movs r2, 0x42 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .align 2, 0 -_0812D7FC: .4byte gUnknown_845FCB8 - thumb_func_end sub_812D7E4 - - thumb_func_start sub_812D800 -sub_812D800: @ 812D800 - push {r4,lr} - adds r4, r0, 0 - bl FreeSpriteOamMatrix - adds r0, r4, 0 - bl DestroySprite - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_812D800 - - thumb_func_start sub_812D814 -sub_812D814: @ 812D814 - push {lr} - ldr r0, _0812D834 @ =0x000003ee - bl FreeSpriteTilesByTag - ldr r0, _0812D838 @ =0x000003ef - bl FreeSpriteTilesByTag - movs r0, 0xFC - lsls r0, 2 - bl FreeSpriteTilesByTag - ldr r0, _0812D83C @ =0x000003f1 - bl FreeSpriteTilesByTag - pop {r0} - bx r0 - .align 2, 0 -_0812D834: .4byte 0x000003ee -_0812D838: .4byte 0x000003ef -_0812D83C: .4byte 0x000003f1 - thumb_func_end sub_812D814 - - thumb_func_start sub_812D840 -sub_812D840: @ 812D840 - push {lr} - adds r2, r0, 0 - movs r1, 0x2E - ldrsh r0, [r2, r1] - cmp r0, 0x1 - bne _0812D864 - movs r3, 0x24 - ldrsh r0, [r2, r3] - subs r0, 0xA - cmp r0, 0 - bge _0812D85E - movs r0, 0 - strh r0, [r2, 0x24] - strh r0, [r2, 0x2E] - b _0812D882 -_0812D85E: - ldrh r0, [r2, 0x24] - subs r0, 0xA - b _0812D880 -_0812D864: - cmp r0, 0x2 - bne _0812D882 - ldrh r1, [r2, 0x24] - movs r3, 0x24 - ldrsh r0, [r2, r3] - cmp r0, 0xF0 - ble _0812D87C - movs r1, 0 - movs r0, 0xF0 - strh r0, [r2, 0x24] - strh r1, [r2, 0x2E] - b _0812D882 -_0812D87C: - adds r0, r1, 0 - adds r0, 0xA -_0812D880: - strh r0, [r2, 0x24] -_0812D882: - pop {r0} - bx r0 - thumb_func_end sub_812D840 - - thumb_func_start sub_812D888 -sub_812D888: @ 812D888 - push {r4,r5,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x1 - bne _0812D8B0 - ldr r0, _0812D8A8 @ =gUnknown_845FCE4 - movs r1, 0x94 - movs r2, 0x42 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _0812D8AC @ =gUnknown_845ED60 - b _0812D906 - .align 2, 0 -_0812D8A8: .4byte gUnknown_845FCE4 -_0812D8AC: .4byte gUnknown_845ED60 -_0812D8B0: - cmp r5, 0xE - bne _0812D8D0 - ldr r0, _0812D8C8 @ =gUnknown_845FCFC - movs r1, 0x94 - movs r2, 0x42 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _0812D8CC @ =gUnknown_845DD20 - b _0812D906 - .align 2, 0 -_0812D8C8: .4byte gUnknown_845FCFC -_0812D8CC: .4byte gUnknown_845DD20 -_0812D8D0: - cmp r5, 0 - bne _0812D8F0 - ldr r0, _0812D8E8 @ =gUnknown_845FD14 - movs r1, 0x94 - movs r2, 0x42 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _0812D8EC @ =gUnknown_845F580 - b _0812D906 - .align 2, 0 -_0812D8E8: .4byte gUnknown_845FD14 -_0812D8EC: .4byte gUnknown_845F580 -_0812D8F0: - cmp r5, 0xD - bne _0812D934 - ldr r0, _0812D928 @ =gUnknown_845FD2C - movs r1, 0x94 - movs r2, 0x42 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _0812D92C @ =gUnknown_845E540 -_0812D906: - movs r1, 0xB0 - lsls r1, 1 - movs r2, 0x20 - bl LoadPalette - ldr r1, _0812D930 @ =gSprites - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - adds r0, r1 - ldrb r2, [r0, 0x5] - movs r1, 0xF - ands r1, r2 - movs r2, 0x60 - orrs r1, r2 - strb r1, [r0, 0x5] - b _0812D950 - .align 2, 0 -_0812D928: .4byte gUnknown_845FD2C -_0812D92C: .4byte gUnknown_845E540 -_0812D930: .4byte gSprites -_0812D934: - ldr r0, _0812D98C @ =gUnknown_845F61C - adds r0, r5, r0 - ldrb r0, [r0] - movs r1, 0x6 - str r1, [sp] - ldr r1, _0812D990 @ =0x0000ffff - str r1, [sp, 0x4] - movs r1, 0x1 - movs r2, 0x94 - movs r3, 0x42 - bl sub_810C2A4 - lsls r0, 24 - lsrs r4, r0, 24 -_0812D950: - ldr r1, _0812D994 @ =gSprites - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - adds r1, 0x1C - adds r0, r1 - ldr r1, _0812D998 @ =sub_812D840 - str r1, [r0] - ldr r0, _0812D99C @ =gSaveBlock1Ptr - ldr r0, [r0] - lsls r1, r5, 2 - adds r0, r1 - ldr r1, _0812D9A0 @ =0x00003a54 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 30 - lsrs r0, 30 - cmp r0, 0x1 - bne _0812D982 - ldr r0, _0812D9A4 @ =gUnknown_845F5C0 - movs r1, 0xB0 - lsls r1, 1 - movs r2, 0x20 - bl LoadPalette -_0812D982: - adds r0, r4, 0 - add sp, 0x8 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_0812D98C: .4byte gUnknown_845F61C -_0812D990: .4byte 0x0000ffff -_0812D994: .4byte gSprites -_0812D998: .4byte sub_812D840 -_0812D99C: .4byte gSaveBlock1Ptr -_0812D9A0: .4byte 0x00003a54 -_0812D9A4: .4byte gUnknown_845F5C0 - thumb_func_end sub_812D888 - - thumb_func_start sub_812D9A8 -sub_812D9A8: @ 812D9A8 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 16 - lsls r2, r0, 2 - adds r2, r0 - lsls r2, 3 - ldr r0, _0812D9FC @ =gTasks+0x8 - adds r4, r2, r0 - lsrs r1, 16 - ldr r0, _0812DA00 @ =gUnknown_203B0FC - ldr r2, [r0] - ldrb r0, [r2, 0x7] - lsrs r3, r0, 2 - subs r0, r3, 0x1 - cmp r1, r0 - bne _0812D9D0 - subs r0, r3, 0x2 - lsls r0, 16 - lsrs r1, r0, 16 -_0812D9D0: - adds r0, r2, 0 - adds r0, 0xC - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x1 - beq _0812D9E8 - cmp r0, 0xE - beq _0812D9E8 - cmp r0, 0 - beq _0812D9E8 - cmp r0, 0xD - bne _0812DA08 -_0812D9E8: - movs r0, 0x4 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _0812DA04 @ =gSprites - adds r0, r1 - bl DestroySprite - b _0812DA0E - .align 2, 0 -_0812D9FC: .4byte gTasks+0x8 -_0812DA00: .4byte gUnknown_203B0FC -_0812DA04: .4byte gSprites -_0812DA08: - ldrh r0, [r4, 0x4] - bl sub_810C2E8 -_0812DA0E: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_812D9A8 - - thumb_func_start sub_812DA14 -sub_812DA14: @ 812DA14 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl sub_812E064 - ldr r1, _0812DAF8 @ =gUnknown_203B0FC - ldr r1, [r1] - lsls r0, 16 - lsrs r0, 16 - adds r1, 0xC - adds r1, r0 - ldrb r0, [r1] - lsls r5, r0, 1 - adds r5, r0 - lsls r5, 1 - adds r5, r4 - movs r0, 0x1 - bl sub_812E094 - ldr r1, _0812DAFC @ =gUnknown_3005EC8 - movs r0, 0x1 - strb r0, [r1] - movs r0, 0x58 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - ldr r0, _0812DB00 @ =gUnknown_845F89C - lsls r5, 2 - adds r0, r5, r0 - ldr r6, [r0] - movs r0, 0 - adds r1, r6, 0 - movs r2, 0 - bl GetStringWidth - movs r4, 0x54 - subs r0, r4, r0 - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - lsls r2, r0, 24 - lsrs r2, 24 - movs r7, 0 - str r7, [sp] - movs r0, 0x2 - mov r10, r0 - str r0, [sp, 0x4] - ldr r0, _0812DB04 @ =gUnknown_845F5E3 - mov r9, r0 - str r0, [sp, 0x8] - movs r0, 0x1 - negs r0, r0 - mov r8, r0 - str r0, [sp, 0xC] - str r6, [sp, 0x10] - movs r0, 0x3 - movs r1, 0 - movs r3, 0 - bl AddTextPrinterParametrized2 - ldr r6, _0812DB08 @ =gStringVar1 - ldr r0, _0812DB0C @ =gUnknown_845FA1C - adds r5, r0 - ldr r1, [r5] - adds r0, r6, 0 - bl StringExpandPlaceholders - movs r0, 0 - adds r1, r6, 0 - movs r2, 0 - bl GetStringWidth - subs r4, r0 - lsrs r0, r4, 31 - adds r4, r0 - asrs r0, r4, 1 - lsls r2, r0, 24 - lsrs r2, 24 - str r7, [sp] - mov r0, r10 - str r0, [sp, 0x4] - mov r0, r9 - str r0, [sp, 0x8] - mov r0, r8 - str r0, [sp, 0xC] - str r6, [sp, 0x10] - movs r0, 0x3 - movs r1, 0 - movs r3, 0xA - bl AddTextPrinterParametrized2 - movs r0, 0x3 - bl sub_812CEE0 - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812DAF8: .4byte gUnknown_203B0FC -_0812DAFC: .4byte gUnknown_3005EC8 -_0812DB00: .4byte gUnknown_845F89C -_0812DB04: .4byte gUnknown_845F5E3 -_0812DB08: .4byte gStringVar1 -_0812DB0C: .4byte gUnknown_845FA1C - thumb_func_end sub_812DA14 - - thumb_func_start sub_812DB10 -sub_812DB10: @ 812DB10 - push {lr} - movs r0, 0 - bl sub_812E094 - ldr r1, _0812DB24 @ =gUnknown_3005EC8 - movs r0, 0xFF - strb r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_0812DB24: .4byte gUnknown_3005EC8 - thumb_func_end sub_812DB10 - - thumb_func_start sub_812DB28 -sub_812DB28: @ 812DB28 - push {r4,lr} - bl sub_812DB64 - bl sub_812DEF0 - ldr r4, _0812DB5C @ =gUnknown_203B0FC - ldr r3, [r4] - lsls r0, 2 - ldrb r2, [r3, 0x7] - movs r1, 0x3 - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0x7] - ldr r0, _0812DB60 @ =gUnknown_3005EB0 - movs r1, 0 - movs r2, 0 - bl ListMenuInit - ldr r1, [r4] - strb r0, [r1, 0x8] - movs r0, 0 - bl sub_812DFE4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812DB5C: .4byte gUnknown_203B0FC -_0812DB60: .4byte gUnknown_3005EB0 - thumb_func_end sub_812DB28 - - thumb_func_start sub_812DB64 -sub_812DB64: @ 812DB64 - ldr r2, _0812DBB4 @ =gUnknown_3005EB0 - ldr r0, _0812DBB8 @ =gUnknown_203B100 - ldr r0, [r0] - str r0, [r2] - ldr r0, _0812DBBC @ =sub_812DBC0 - str r0, [r2, 0x4] - movs r0, 0 - str r0, [r2, 0x8] - movs r1, 0 - movs r0, 0x1 - strh r0, [r2, 0xC] - strh r0, [r2, 0xE] - strb r1, [r2, 0x10] - strb r1, [r2, 0x11] - movs r0, 0x8 - strb r0, [r2, 0x12] - strb r1, [r2, 0x13] - ldrb r1, [r2, 0x14] - subs r0, 0x18 - ands r0, r1 - movs r1, 0x4 - orrs r0, r1 - movs r1, 0xF - ands r0, r1 - movs r1, 0x20 - orrs r0, r1 - strb r0, [r2, 0x14] - movs r0, 0x30 - strb r0, [r2, 0x15] - movs r3, 0x3F - movs r0, 0 - strb r0, [r2, 0x16] - ldrb r1, [r2, 0x17] - subs r0, 0x40 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - ands r0, r3 - strb r0, [r2, 0x17] - bx lr - .align 2, 0 -_0812DBB4: .4byte gUnknown_3005EB0 -_0812DBB8: .4byte gUnknown_203B100 -_0812DBBC: .4byte sub_812DBC0 - thumb_func_end sub_812DB64 - - thumb_func_start sub_812DBC0 -sub_812DBC0: @ 812DBC0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - adds r7, r0, 0 - lsls r1, 24 - lsrs r1, 24 - ldr r0, _0812DC68 @ =gUnknown_203B104 - mov r10, r0 - movs r2, 0 - mov r8, r2 - str r2, [r0] - ldr r6, _0812DC6C @ =gUnknown_203B0FC - ldr r0, [r6] - ldrb r2, [r0, 0xA] - ldrb r0, [r0, 0xB] - adds r2, r0 - mov r9, r2 - adds r0, r7, 0 - bl sub_812DDF0 - ldr r0, _0812DC70 @ =sub_812C694 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xFF - bne _0812DBFE - b _0812DD3A -_0812DBFE: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, _0812DC74 @ =gTasks - adds r5, r0, r1 - movs r0, 0x5 - bl PlaySE - mov r0, r8 - strh r0, [r5, 0xA] - ldr r0, [r6] - ldrb r0, [r0, 0x8] - add r1, sp, 0x8 - movs r2, 0 - bl get_coro_args_x18_x1A - ldr r1, [r6] - add r0, sp, 0x8 - ldrh r0, [r0] - strh r0, [r1, 0x4] - ldrb r0, [r1, 0x7] - lsrs r0, 2 - subs r0, 0x1 - cmp r7, r0 - beq _0812DCD8 - bl sub_812D174 - lsls r0, r7, 24 - lsrs r0, 24 - bl sub_812D1A8 - ldr r2, [r6] - ldrb r1, [r2, 0x7] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812DCBC - adds r0, r2, 0 - adds r0, 0x23 - ldrb r1, [r0] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - bne _0812DC7C - adds r0, r4, 0 - mov r1, r9 - bl sub_812D9A8 - mov r1, r10 - str r7, [r1] - ldr r0, _0812DC78 @ =sub_812DD50 - str r0, [r5] - b _0812DD3A - .align 2, 0 -_0812DC68: .4byte gUnknown_203B104 -_0812DC6C: .4byte gUnknown_203B0FC -_0812DC70: .4byte sub_812C694 -_0812DC74: .4byte gTasks -_0812DC78: .4byte sub_812DD50 -_0812DC7C: - ldr r4, _0812DCB8 @ =gSprites - movs r2, 0xC - ldrsh r0, [r5, r2] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - adds r1, 0x3E - ldrb r3, [r1] - movs r2, 0x5 - negs r2, r2 - adds r0, r2, 0 - ands r0, r3 - strb r0, [r1] - ldr r0, [r6] - adds r0, 0x23 - ldrb r1, [r0] - ands r2, r1 - strb r2, [r0] - movs r0, 0xC - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - mov r1, r8 - strh r1, [r0, 0x2E] - bl sub_812CD3C - b _0812DD3A - .align 2, 0 -_0812DCB8: .4byte gSprites -_0812DCBC: - movs r0, 0xD0 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x2 - movs r1, 0x11 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - movs r0, 0x2 - bl sub_812CEE0 - b _0812DD3A -_0812DCD8: - bl sub_812DDAC - ldr r0, [r6] - ldrb r1, [r0, 0x7] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812DD10 - ldr r2, _0812DD0C @ =gSprites - movs r0, 0xC - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - ldr r1, [r6] - adds r1, 0x23 - ldrb r0, [r1] - orrs r0, r2 - strb r0, [r1] - b _0812DD3A - .align 2, 0 -_0812DD0C: .4byte gSprites -_0812DD10: - movs r2, 0 - ldr r5, _0812DD4C @ =gSprites - adds r4, r6, 0 - movs r3, 0x4 -_0812DD18: - ldr r0, [r4] - adds r0, 0x1D - adds r0, r2 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - adds r0, 0x3E - ldrb r1, [r0] - orrs r1, r3 - strb r1, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x5 - bls _0812DD18 -_0812DD3A: - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812DD4C: .4byte gSprites - thumb_func_end sub_812DBC0 - - thumb_func_start sub_812DD50 -sub_812DD50: @ 812DD50 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r0, _0812DD98 @ =gTasks - adds r4, r0 - ldr r0, _0812DD9C @ =gUnknown_203B0FC - ldr r0, [r0] - ldr r1, _0812DDA0 @ =gUnknown_203B104 - adds r0, 0xC - ldr r1, [r1] - adds r0, r1 - ldrb r0, [r0] - bl sub_812D888 - lsls r0, 24 - lsrs r0, 24 - movs r3, 0 - strh r0, [r4, 0xC] - ldr r2, _0812DDA4 @ =gSprites - movs r0, 0xC - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strh r3, [r0, 0x2E] - bl sub_812CD3C - ldr r0, _0812DDA8 @ =sub_812C694 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812DD98: .4byte gTasks -_0812DD9C: .4byte gUnknown_203B0FC -_0812DDA0: .4byte gUnknown_203B104 -_0812DDA4: .4byte gSprites -_0812DDA8: .4byte sub_812C694 - thumb_func_end sub_812DD50 - - thumb_func_start sub_812DDAC -sub_812DDAC: @ 812DDAC - push {lr} - sub sp, 0x10 - movs r0, 0xD0 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0x2 - movs r1, 0x11 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - ldr r2, _0812DDEC @ =gUnknown_84181C3 - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0x3 - str r0, [sp, 0xC] - movs r0, 0x2 - movs r1, 0x2 - movs r3, 0 - bl AddTextPrinterParametrized - movs r0, 0x2 - bl sub_812CEE0 - add sp, 0x10 - pop {r0} - bx r0 - .align 2, 0 -_0812DDEC: .4byte gUnknown_84181C3 - thumb_func_end sub_812DDAC - - thumb_func_start sub_812DDF0 -sub_812DDF0: @ 812DDF0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x18 - mov r8, r0 - lsls r5, r1, 24 - lsrs r5, 24 - ldr r7, _0812DE68 @ =gUnknown_203B0FC - ldr r0, [r7] - ldrb r0, [r0, 0x8] - mov r4, sp - adds r4, 0x16 - add r1, sp, 0x14 - adds r2, r4, 0 - bl get_coro_args_x18_x1A - add r1, sp, 0x14 - ldrh r0, [r4] - ldrh r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r6, r0, 16 - ldrh r0, [r4] - lsls r3, r0, 3 - subs r3, r0 - lsls r3, 25 - movs r0, 0x80 - lsls r0, 19 - adds r3, r0 - lsrs r3, 24 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - ldr r0, _0812DE6C @ =gUnknown_845F5E6 - str r0, [sp, 0x8] - str r1, [sp, 0xC] - ldr r0, _0812DE70 @ =gUnknown_203B100 - ldr r1, [r0] - mov r2, r8 - lsls r0, r2, 3 - adds r0, r1 - ldr r0, [r0] - str r0, [sp, 0x10] - movs r0, 0 - movs r1, 0x2 - movs r2, 0x8 - bl AddTextPrinterParametrized2 - cmp r5, 0 - bne _0812DEC0 - add r0, sp, 0x14 - ldr r1, [r7] - ldrh r2, [r0] - ldrb r0, [r1, 0xA] - cmp r2, r0 - bcs _0812DE74 - ldrb r0, [r1, 0xB] - adds r0, 0x1 - b _0812DE86 - .align 2, 0 -_0812DE68: .4byte gUnknown_203B0FC -_0812DE6C: .4byte gUnknown_845F5E6 -_0812DE70: .4byte gUnknown_203B100 -_0812DE74: - cmp r2, r0 - bls _0812DE88 - ldrb r0, [r1, 0x7] - lsrs r0, 2 - subs r0, 0x1 - cmp r6, r0 - beq _0812DE88 - ldrb r0, [r1, 0xB] - subs r0, 0x1 -_0812DE86: - strb r0, [r1, 0xB] -_0812DE88: - ldr r0, _0812DEE4 @ =gUnknown_203B0FC - ldr r2, [r0] - ldrb r0, [r2, 0xB] - lsls r3, r0, 3 - subs r3, r0 - lsls r3, 25 - movs r0, 0x80 - lsls r0, 19 - adds r3, r0 - lsrs r3, 24 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - ldr r0, _0812DEE8 @ =gUnknown_845F5E3 - str r0, [sp, 0x8] - str r1, [sp, 0xC] - ldrb r0, [r2, 0x9] - ldr r1, _0812DEEC @ =gUnknown_203B100 - ldr r1, [r1] - lsls r0, 3 - adds r0, r1 - ldr r0, [r0] - str r0, [sp, 0x10] - movs r0, 0 - movs r1, 0x2 - movs r2, 0x8 - bl AddTextPrinterParametrized2 -_0812DEC0: - ldr r1, _0812DEE4 @ =gUnknown_203B0FC - ldr r0, [r1] - mov r2, r8 - strb r2, [r0, 0x9] - ldr r2, [r1] - ldrh r0, [r4] - strb r0, [r2, 0xB] - ldr r1, [r1] - add r0, sp, 0x14 - ldrh r0, [r0] - strb r0, [r1, 0xA] - add sp, 0x18 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812DEE4: .4byte gUnknown_203B0FC -_0812DEE8: .4byte gUnknown_845F5E3 -_0812DEEC: .4byte gUnknown_203B100 - thumb_func_end sub_812DDF0 - - thumb_func_start sub_812DEF0 -sub_812DEF0: @ 812DEF0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r4, 0 - movs r6, 0 - ldr r0, _0812DF44 @ =0x0000fdff - mov r8, r0 - ldr r7, _0812DF48 @ =gUnknown_845F60C -_0812DF00: - adds r0, r6, 0 - bl sub_812D0C0 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, _0812DF4C @ =gSaveBlock1Ptr - ldr r0, [r0] - lsls r1, r5, 2 - adds r0, r1 - ldr r1, _0812DF50 @ =0x00003a54 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 30 - cmp r0, 0 - beq _0812DF88 - ldr r0, _0812DF54 @ =gUnknown_845F5EA - lsls r1, r5, 1 - adds r3, r1, r0 - ldrh r0, [r3] - cmp r0, r8 - bhi _0812DF60 - ldr r0, _0812DF58 @ =gUnknown_203B100 - ldr r0, [r0] - lsls r2, r4, 3 - adds r2, r0 - ldrh r1, [r3] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - ldr r1, _0812DF5C @ =gTrainers+0x4 - adds r0, r1 - str r0, [r2] - str r4, [r2, 0x4] - b _0812DF78 - .align 2, 0 -_0812DF44: .4byte 0x0000fdff -_0812DF48: .4byte gUnknown_845F60C -_0812DF4C: .4byte gSaveBlock1Ptr -_0812DF50: .4byte 0x00003a54 -_0812DF54: .4byte gUnknown_845F5EA -_0812DF58: .4byte gUnknown_203B100 -_0812DF5C: .4byte gTrainers+0x4 -_0812DF60: - ldr r0, _0812DFC0 @ =gUnknown_203B100 - ldr r0, [r0] - lsls r1, r4, 3 - adds r1, r0 - ldrh r0, [r3] - ldr r2, _0812DFC4 @ =0xffff0200 - adds r0, r2 - lsls r0, 2 - adds r0, r7 - ldr r0, [r0] - str r0, [r1] - str r4, [r1, 0x4] -_0812DF78: - ldr r0, _0812DFC8 @ =gUnknown_203B0FC - ldr r0, [r0] - adds r0, 0xC - adds r0, r4 - strb r5, [r0] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 -_0812DF88: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0xF - bls _0812DF00 - ldr r0, _0812DFC0 @ =gUnknown_203B100 - ldr r1, [r0] - lsls r0, r4, 3 - adds r0, r1 - ldr r1, _0812DFCC @ =gUnknown_84161C1 - str r1, [r0] - str r4, [r0, 0x4] - ldr r0, _0812DFC8 @ =gUnknown_203B0FC - ldr r0, [r0] - adds r0, 0xC - adds r0, r4 - movs r1, 0xFF - strb r1, [r0] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _0812DFD0 @ =gUnknown_3005EB0 - strh r4, [r1, 0xC] - cmp r4, 0x4 - bhi _0812DFD4 - strh r4, [r1, 0xE] - b _0812DFD8 - .align 2, 0 -_0812DFC0: .4byte gUnknown_203B100 -_0812DFC4: .4byte 0xffff0200 -_0812DFC8: .4byte gUnknown_203B0FC -_0812DFCC: .4byte gUnknown_84161C1 -_0812DFD0: .4byte gUnknown_3005EB0 -_0812DFD4: - movs r0, 0x5 - strh r0, [r1, 0xE] -_0812DFD8: - adds r0, r4, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_812DEF0 - - thumb_func_start sub_812DFE4 -sub_812DFE4: @ 812DFE4 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - bl PutWindowTilemap - adds r0, r4, 0 - movs r1, 0x3 - bl CopyWindowToVram - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_812DFE4 - - thumb_func_start sub_812E000 -sub_812E000: @ 812E000 - push {r4,lr} - sub sp, 0x10 - mov r1, sp - ldr r0, _0812E040 @ =gUnknown_845FD44 - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldr r0, [r0] - str r0, [r1] - ldr r4, _0812E044 @ =gUnknown_203B0FC - ldr r2, [r4] - ldrb r0, [r2, 0x7] - lsrs r0, 2 - cmp r0, 0x5 - bls _0812E036 - mov r1, sp - movs r0, 0 - strh r0, [r1, 0x6] - ldrb r0, [r2, 0x7] - lsrs r0, 2 - subs r0, 0x5 - strh r0, [r1, 0x8] - adds r1, r2, 0x4 - mov r0, sp - bl AddScrollIndicatorArrowPair - ldr r1, [r4] - strb r0, [r1, 0x6] -_0812E036: - add sp, 0x10 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812E040: .4byte gUnknown_845FD44 -_0812E044: .4byte gUnknown_203B0FC - thumb_func_end sub_812E000 - - thumb_func_start sub_812E048 -sub_812E048: @ 812E048 - push {lr} - ldr r0, _0812E060 @ =gUnknown_203B0FC - ldr r1, [r0] - ldrb r0, [r1, 0x7] - lsrs r0, 2 - cmp r0, 0x5 - bls _0812E05C - ldrb r0, [r1, 0x6] - bl RemoveScrollIndicatorArrowPair -_0812E05C: - pop {r0} - bx r0 - .align 2, 0 -_0812E060: .4byte gUnknown_203B0FC - thumb_func_end sub_812E048 - - thumb_func_start sub_812E064 -sub_812E064: @ 812E064 - push {r4,lr} - sub sp, 0x4 - ldr r0, _0812E090 @ =gUnknown_203B0FC - ldr r0, [r0] - ldrb r0, [r0, 0x8] - mov r4, sp - adds r4, 0x2 - mov r1, sp - adds r2, r4, 0 - bl get_coro_args_x18_x1A - mov r1, sp - ldrh r0, [r4] - ldrh r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_0812E090: .4byte gUnknown_203B0FC - thumb_func_end sub_812E064 - - thumb_func_start sub_812E094 -sub_812E094: @ 812E094 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - ldr r6, _0812E0EC @ =gUnknown_203B0FC - ldr r0, [r6] - adds r0, 0x23 - ldrb r0, [r0] - lsls r0, 31 - lsrs r0, 31 - cmp r0, r4 - beq _0812E108 - ldr r5, _0812E0F0 @ =sub_812E110 - adds r0, r5, 0 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xFF - bne _0812E0C8 - adds r0, r5, 0 - movs r1, 0x8 - bl CreateTask - lsls r0, 24 - lsrs r2, r0, 24 -_0812E0C8: - ldr r0, _0812E0F4 @ =gTasks - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r0 - movs r0, 0 - strh r0, [r1, 0x8] - movs r0, 0x4 - strh r0, [r1, 0xA] - cmp r4, 0x1 - bne _0812E0F8 - strh r4, [r1, 0xC] - ldr r0, [r6] - adds r0, 0x23 - ldrb r1, [r0] - movs r2, 0x1 - orrs r1, r2 - b _0812E106 - .align 2, 0 -_0812E0EC: .4byte gUnknown_203B0FC -_0812E0F0: .4byte sub_812E110 -_0812E0F4: .4byte gTasks -_0812E0F8: - strh r0, [r1, 0xC] - ldr r0, [r6] - adds r0, 0x23 - ldrb r2, [r0] - movs r1, 0x2 - negs r1, r1 - ands r1, r2 -_0812E106: - strb r1, [r0] -_0812E108: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_812E094 - - thumb_func_start sub_812E110 -sub_812E110: @ 812E110 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _0812E130 @ =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _0812E134 - cmp r0, 0x1 - beq _0812E154 - b _0812E170 - .align 2, 0 -_0812E130: .4byte gTasks -_0812E134: - ldrh r0, [r4, 0xA] - subs r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - cmp r0, 0 - bne _0812E170 - movs r0, 0x1 - movs r1, 0 - bl sub_812E178 - movs r0, 0x4 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _0812E170 -_0812E154: - ldrh r0, [r4, 0xA] - subs r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - cmp r0, 0 - bne _0812E170 - movs r0, 0xC - ldrsh r1, [r4, r0] - movs r0, 0x1 - bl sub_812E178 - adds r0, r5, 0 - bl DestroyTask -_0812E170: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_812E110 - - thumb_func_start sub_812E178 -sub_812E178: @ 812E178 - push {r4-r6,lr} - sub sp, 0xC - lsls r0, 24 - lsrs r6, r0, 24 - lsls r1, 16 - asrs r5, r1, 16 - cmp r5, 0 - beq _0812E18C - cmp r5, 0x3 - bne _0812E252 -_0812E18C: - movs r4, 0x1 - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x8C - movs r2, 0xE - movs r3, 0xA - bl FillBgTilemapBufferRect - movs r5, 0xA - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0xA1 - movs r2, 0xF - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x8D - movs r2, 0x19 - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x8E - movs r2, 0x1A - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x8F - movs r2, 0xE - movs r3, 0xB - bl FillBgTilemapBufferRect - movs r0, 0xB - str r0, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0 - movs r2, 0xF - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x90 - movs r2, 0x1A - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x91 - movs r2, 0xE - movs r3, 0xC - bl FillBgTilemapBufferRect - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0xA3 - movs r2, 0xF - movs r3, 0xC - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x92 - movs r2, 0x19 - movs r3, 0xC - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x93 - b _0812E470 -_0812E252: - cmp r5, 0x1 - bne _0812E2F4 - str r5, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x9B - movs r2, 0xE - movs r3, 0xA - bl FillBgTilemapBufferRect - movs r4, 0xB - str r4, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x9C - movs r2, 0xF - movs r3, 0xA - bl FillBgTilemapBufferRect - str r5, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x96 - movs r2, 0x1A - movs r3, 0xA - bl FillBgTilemapBufferRect - str r5, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x9D - movs r2, 0xE - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0 - movs r2, 0xF - movs r3, 0xB - bl FillBgTilemapBufferRect - str r5, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x90 - movs r2, 0x1A - movs r3, 0xB - bl FillBgTilemapBufferRect - str r5, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x9E - movs r2, 0xE - movs r3, 0xC - bl FillBgTilemapBufferRect - str r4, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x9F - movs r2, 0xF - movs r3, 0xC - bl FillBgTilemapBufferRect - str r5, [sp] - str r5, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x99 - b _0812E470 -_0812E2F4: - cmp r5, 0x2 - bne _0812E398 - movs r4, 0x1 - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x94 - movs r2, 0xE - movs r3, 0xA - bl FillBgTilemapBufferRect - movs r5, 0xB - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x95 - movs r2, 0xF - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x96 - movs r2, 0x1A - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x8F - movs r2, 0xE - movs r3, 0xB - bl FillBgTilemapBufferRect - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x9A - movs r2, 0xF - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x90 - movs r2, 0x1A - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x97 - movs r2, 0xE - movs r3, 0xC - bl FillBgTilemapBufferRect - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x98 - movs r2, 0xF - movs r3, 0xC - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x99 - b _0812E470 -_0812E398: - cmp r5, 0x4 - bne _0812E47A - movs r4, 0x1 - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x83 - movs r2, 0xE - movs r3, 0xA - bl FillBgTilemapBufferRect - movs r5, 0xA - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0xA0 - movs r2, 0xF - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x84 - movs r2, 0x19 - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x85 - movs r2, 0x1A - movs r3, 0xA - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x86 - movs r2, 0xE - movs r3, 0xB - bl FillBgTilemapBufferRect - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0xA2 - movs r2, 0xF - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x87 - movs r2, 0x19 - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x88 - movs r2, 0x1A - movs r3, 0xB - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x83 - movs r2, 0xE - movs r3, 0xC - bl FillBgTilemapBufferRect - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0xA0 - movs r2, 0xF - movs r3, 0xC - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x84 - movs r2, 0x19 - movs r3, 0xC - bl FillBgTilemapBufferRect - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0x85 -_0812E470: - movs r2, 0x1A - movs r3, 0xC - bl FillBgTilemapBufferRect - b _0812E496 -_0812E47A: - cmp r5, 0x5 - bne _0812E496 - movs r0, 0xD - str r0, [sp] - movs r0, 0x3 - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - adds r0, r6, 0 - movs r1, 0 - movs r2, 0xE - movs r3, 0xA - bl FillBgTilemapBufferRect -_0812E496: - adds r0, r6, 0 - bl CopyBgTilemapBufferToVram - add sp, 0xC - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_812E178 - - thumb_func_start sub_812E4A4 -sub_812E4A4: @ 812E4A4 - push {r4,lr} - sub sp, 0x14 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _0812E4E0 @ =gUnknown_203B0FC - ldr r0, [r0] - ldrb r0, [r0, 0x8] - bl ListMenuGetYCoordForPrintingArrowCursor - lsls r0, 16 - lsrs r0, 16 - cmp r4, 0x1 - bne _0812E4EC - lsls r3, r0, 24 - lsrs r3, 24 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - ldr r0, _0812E4E4 @ =gUnknown_845F5E3 - str r0, [sp, 0x8] - str r1, [sp, 0xC] - ldr r0, _0812E4E8 @ =gUnknown_841623B - str r0, [sp, 0x10] - movs r0, 0 - movs r1, 0x2 - movs r2, 0 - bl AddTextPrinterParametrized2 - b _0812E50A - .align 2, 0 -_0812E4E0: .4byte gUnknown_203B0FC -_0812E4E4: .4byte gUnknown_845F5E3 -_0812E4E8: .4byte gUnknown_841623B -_0812E4EC: - lsls r3, r0, 24 - lsrs r3, 24 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - ldr r0, _0812E514 @ =gUnknown_845F5E0 - str r0, [sp, 0x8] - str r1, [sp, 0xC] - ldr r0, _0812E518 @ =gUnknown_841623B - str r0, [sp, 0x10] - movs r0, 0 - movs r1, 0x2 - movs r2, 0 - bl AddTextPrinterParametrized2 -_0812E50A: - add sp, 0x14 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812E514: .4byte gUnknown_845F5E0 -_0812E518: .4byte gUnknown_841623B - thumb_func_end sub_812E4A4 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/field_camera.s b/asm/field_camera.s index 6228b9435..3d4ca0025 100644 --- a/asm/field_camera.s +++ b/asm/field_camera.s @@ -1222,7 +1222,7 @@ CameraPanningCB_PanAhead: @ 805AE74 .align 2, 0 _0805AE84: .4byte gUnknown_2036E2C _0805AE88: - ldr r0, _0805AEA0 @ =gUnknown_2037078 + ldr r0, _0805AEA0 @ =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x1 bne _0805AEA8 @@ -1235,7 +1235,7 @@ _0805AE88: beq _0805AF10 b _0805AEAE .align 2, 0 -_0805AEA0: .4byte gUnknown_2037078 +_0805AEA0: .4byte gPlayerAvatar _0805AEA4: .4byte gUnknown_3000E9C _0805AEA8: ldr r1, _0805AED0 @ =gUnknown_3000E9C diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 72b50a95d..9748301f7 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -34,8 +34,8 @@ sub_806C888: @ 806C888 bx r0 thumb_func_end sub_806C888 - thumb_func_start sub_806C8BC -sub_806C8BC: @ 806C8BC + thumb_func_start FieldGetPlayerInput +FieldGetPlayerInput: @ 806C8BC push {r4-r7,lr} mov r7, r8 push {r7} @@ -46,7 +46,7 @@ sub_806C8BC: @ 806C8BC mov r4, sp adds r4, 0x2 strh r2, [r4] - ldr r0, _0806CA14 @ =gUnknown_2037078 + ldr r0, _0806CA14 @ =gPlayerAvatar ldrb r1, [r0, 0x2] mov r8, r1 ldrb r6, [r0, 0x3] @@ -89,7 +89,7 @@ _0806C914: ands r0, r1 cmp r0, 0 beq _0806C940 - ldr r0, _0806CA14 @ =gUnknown_2037078 + ldr r0, _0806CA14 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x40 ands r0, r1 @@ -107,7 +107,7 @@ _0806C940: lsrs r0, 24 cmp r0, 0x1 bls _0806C9D0 - ldr r0, _0806CA14 @ =gUnknown_2037078 + ldr r0, _0806CA14 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x40 ands r0, r1 @@ -213,7 +213,7 @@ _0806C9F6: movs r0, 0x2 b _0806CA3E .align 2, 0 -_0806CA14: .4byte gUnknown_2037078 +_0806CA14: .4byte gPlayerAvatar _0806CA18: .4byte gUnknown_203ADFA _0806CA1C: movs r0, 0x80 @@ -244,7 +244,7 @@ _0806CA40: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_806C8BC + thumb_func_end FieldGetPlayerInput thumb_func_start sub_806CA4C sub_806CA4C: @ 806CA4C @@ -339,7 +339,7 @@ sub_806CAC8: @ 806CAC8 ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 ldr r7, _0806CB70 @ =gUnknown_3005078 @@ -347,7 +347,7 @@ sub_806CAC8: @ 806CAC8 bl sub_806C888 ldrb r0, [r5, 0x2] strb r0, [r7, 0x2] - bl sub_8081B30 + bl CheckForTrainersWantingBattle lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -406,7 +406,7 @@ _0806CB88: ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r7, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 mov r0, sp @@ -431,7 +431,7 @@ _0806CBC0: ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r7, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 _0806CBD8: @@ -441,7 +441,7 @@ _0806CBD8: cmp r0, 0 beq _0806CBFC mov r0, r8 - bl sub_806D7F4 + bl is_it_battle_time_3 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -464,7 +464,7 @@ _0806CBFC: mov r0, sp adds r1, r4, 0 adds r2, r6, 0 - bl sub_806D964 + bl mapheader_run_first_tag2_script_list_match_conditionally lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -484,7 +484,7 @@ _0806CC2C: ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 ldrb r1, [r5] @@ -541,7 +541,7 @@ _0806CC9C: mov r0, sp adds r1, r4, 0 adds r2, r6, 0 - bl sub_806DCD0 + bl map_warp_consider_2_to_inside lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -567,7 +567,7 @@ _0806CCCC: bl FlagSet movs r0, 0x6 bl PlaySE - bl sub_806F258 + bl ShowStartMenu b _0806CB6C .align 2, 0 _0806CCF4: .4byte gUnknown_3005078 @@ -577,7 +577,7 @@ _0806CCFC: ands r0, r1 cmp r0, 0 beq _0806CD20 - bl sub_810AD10 + bl UseRegisteredKeyItemOnField lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -708,7 +708,7 @@ sub_806CDF8: @ 806CDF8 bne _0806CE18 movs r0, 0x6 bl PlaySE - bl sub_806F258 + bl ShowStartMenu adds r0, r4, 0 bl DestroyTask _0806CE18: @@ -775,7 +775,7 @@ cur_mapdata_block_role_at_player_pos: @ 806CE74 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r0, 16 add sp, 0x4 @@ -873,7 +873,7 @@ sub_806CF38: @ 806CF38 ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsCounter @@ -938,13 +938,13 @@ _0806CFBC: ble _0806CFB0 ldr r0, _0806CFE8 @ =gUnknown_3005074 strb r3, [r0] - ldr r1, _0806CFEC @ =gUnknown_20370D2 + ldr r1, _0806CFEC @ =gSpecialVar_LastTalked adds r0, r2, r3 lsls r0, 2 adds r0, r5 ldrb r0, [r0, 0x8] strh r0, [r1] - ldr r0, _0806CFF0 @ =gUnknown_20370D4 + ldr r0, _0806CFF0 @ =gSpecialVar_Facing strh r6, [r0] adds r0, r3, 0 bl GetFieldObjectScriptPointerByFieldObjectId @@ -955,8 +955,8 @@ _0806CFDE: .align 2, 0 _0806CFE4: .4byte gUnknown_2031DEC _0806CFE8: .4byte gUnknown_3005074 -_0806CFEC: .4byte gUnknown_20370D2 -_0806CFF0: .4byte gUnknown_20370D4 +_0806CFEC: .4byte gSpecialVar_LastTalked +_0806CFF0: .4byte gSpecialVar_Facing thumb_func_end sub_806CF38 thumb_func_start sub_806CFF4 @@ -1046,14 +1046,14 @@ _0806D09C: .4byte gUnknown_826D2D8 _0806D0A0: ldr r0, _0806D0D4 @ =gUnknown_3005074 strb r5, [r0] - ldr r4, _0806D0D8 @ =gUnknown_20370D2 + ldr r4, _0806D0D8 @ =gSpecialVar_LastTalked ldr r1, _0806D0DC @ =gMapObjects adds r0, r6, r5 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0x8] strh r0, [r4] - ldr r0, _0806D0E0 @ =gUnknown_20370D4 + ldr r0, _0806D0E0 @ =gSpecialVar_Facing mov r1, r8 strh r1, [r0] adds r0, r5, 0 @@ -1070,9 +1070,9 @@ _0806D0C8: bx r1 .align 2, 0 _0806D0D4: .4byte gUnknown_3005074 -_0806D0D8: .4byte gUnknown_20370D2 +_0806D0D8: .4byte gSpecialVar_LastTalked _0806D0DC: .4byte gMapObjects -_0806D0E0: .4byte gUnknown_20370D4 +_0806D0E0: .4byte gSpecialVar_Facing thumb_func_end sub_806CFF4 thumb_func_start sub_806D0E4 @@ -1165,12 +1165,12 @@ _0806D17A: ldr r0, [r5, 0x8] movs r1, 0x1 bl sub_80CC44C - ldr r4, _0806D1C8 @ =gUnknown_20370C0 + ldr r4, _0806D1C8 @ =gSpecialVar_0x8004 strh r0, [r4] ldr r0, [r5, 0x8] movs r1, 0x2 bl sub_80CC44C - ldr r1, _0806D1CC @ =gUnknown_20370C4 + ldr r1, _0806D1CC @ =gSpecialVar_0x8006 strh r0, [r1] ldrh r0, [r4] bl FlagGet @@ -1178,22 +1178,22 @@ _0806D17A: lsrs r0, 24 cmp r0, 0x1 beq _0806D164 - ldr r0, _0806D1D0 @ =gUnknown_20370D4 + ldr r0, _0806D1D0 @ =gSpecialVar_Facing strh r6, [r0] ldr r0, _0806D1D4 @ =gUnknown_81A6843 b _0806D1E6 .align 2, 0 _0806D1C4: .4byte gSpecialVar_0x8005 -_0806D1C8: .4byte gUnknown_20370C0 -_0806D1CC: .4byte gUnknown_20370C4 -_0806D1D0: .4byte gUnknown_20370D4 +_0806D1C8: .4byte gSpecialVar_0x8004 +_0806D1CC: .4byte gSpecialVar_0x8006 +_0806D1D0: .4byte gSpecialVar_Facing _0806D1D4: .4byte gUnknown_81A6843 _0806D1D8: cmp r2, 0xFF beq _0806D1E0 bl sub_8069A20 _0806D1E0: - ldr r0, _0806D1EC @ =gUnknown_20370D4 + ldr r0, _0806D1EC @ =gSpecialVar_Facing strh r6, [r0] ldr r0, [r5, 0x8] _0806D1E6: @@ -1201,7 +1201,7 @@ _0806D1E6: pop {r1} bx r1 .align 2, 0 -_0806D1EC: .4byte gUnknown_20370D4 +_0806D1EC: .4byte gSpecialVar_Facing thumb_func_end sub_806D0E4 thumb_func_start sub_806D1F0 @@ -1211,7 +1211,7 @@ sub_806D1F0: @ 806D1F0 lsrs r4, r1, 24 lsls r2, 24 lsrs r5, r2, 24 - ldr r0, _0806D210 @ =gUnknown_20370D4 + ldr r0, _0806D210 @ =gSpecialVar_Facing strh r5, [r0] adds r0, r4, 0 bl MetatileBehavior_IsPC @@ -1222,7 +1222,7 @@ sub_806D1F0: @ 806D1F0 ldr r0, _0806D214 @ =gUnknown_81A6955 b _0806D53E .align 2, 0 -_0806D210: .4byte gUnknown_20370D4 +_0806D210: .4byte gSpecialVar_Facing _0806D214: .4byte gUnknown_81A6955 _0806D218: adds r0, r4, 0 @@ -1713,7 +1713,7 @@ sub_806D5E8: @ 806D5E8 lsrs r0, 24 cmp r0, 0x1 beq _0806D650 - ldr r0, _0806D654 @ =gUnknown_2037078 + ldr r0, _0806D654 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x40 ands r0, r1 @@ -1734,7 +1734,7 @@ _0806D650: movs r0, 0x1 b _0806D65A .align 2, 0 -_0806D654: .4byte gUnknown_2037078 +_0806D654: .4byte gPlayerAvatar _0806D658: movs r0, 0 _0806D65A: @@ -1792,7 +1792,7 @@ sub_806D698: @ 806D698 cmp r0, 0x2 beq _0806D72C bl AdjustFriendship_step - ldr r0, _0806D6E4 @ =gUnknown_2037078 + ldr r0, _0806D6E4 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x40 ands r0, r1 @@ -1814,7 +1814,7 @@ sub_806D698: @ 806D698 b _0806D730 .align 2, 0 _0806D6E0: .4byte gUnknown_203ADFA -_0806D6E4: .4byte gUnknown_2037078 +_0806D6E4: .4byte gPlayerAvatar _0806D6E8: .4byte gUnknown_81A8CED _0806D6EC: bl overworld_poison_step @@ -1872,7 +1872,7 @@ _0806D748: .4byte 0x00004021 AdjustFriendship_step: @ 806D74C push {r4,r5,lr} ldr r0, _0806D780 @ =0x00004021 - bl sub_806E454 + bl GetVarPointer ldrh r1, [r0] adds r1, 0x1 strh r1, [r0] @@ -1921,7 +1921,7 @@ overworld_poison_step: @ 806D79C cmp r0, 0x9 beq _0806D7E0 ldr r0, _0806D7DC @ =0x00004022 - bl sub_806E454 + bl GetVarPointer adds r4, r0, 0 ldrh r0, [r4] adds r0, 0x1 @@ -1961,15 +1961,15 @@ sub_806D7E8: @ 806D7E8 bx r0 thumb_func_end sub_806D7E8 - thumb_func_start sub_806D7F4 -sub_806D7F4: @ 806D7F4 + thumb_func_start is_it_battle_time_3 +is_it_battle_time_3: @ 806D7F4 push {lr} bl sub_80833B0 lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_806D7F4 + thumb_func_end is_it_battle_time_3 thumb_func_start sub_806D804 sub_806D804: @ 806D804 @@ -2114,7 +2114,7 @@ sub_806D908: @ 806D908 push {lr} lsls r1, 24 lsrs r1, 24 - ldr r2, _0806D924 @ =gUnknown_20370D4 + ldr r2, _0806D924 @ =gSpecialVar_Facing strh r1, [r2] bl ScriptContext1_SetupScript bl sub_80699E0 @@ -2122,7 +2122,7 @@ sub_806D908: @ 806D908 pop {r0} bx r0 .align 2, 0 -_0806D924: .4byte gUnknown_20370D4 +_0806D924: .4byte gSpecialVar_Facing thumb_func_end sub_806D908 thumb_func_start sub_806D928 @@ -2159,8 +2159,8 @@ _0806D958: _0806D960: .4byte gUnknown_81C555B thumb_func_end sub_806D928 - thumb_func_start sub_806D964 -sub_806D964: @ 806D964 + thumb_func_start mapheader_run_first_tag2_script_list_match_conditionally +mapheader_run_first_tag2_script_list_match_conditionally: @ 806D964 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2209,7 +2209,7 @@ _0806D9BC: cmp r0, 0x1 bne _0806DA00 movs r4, 0 - ldr r0, _0806D9FC @ =gUnknown_2037078 + ldr r0, _0806D9FC @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x6 ands r0, r1 @@ -2230,7 +2230,7 @@ _0806D9E2: movs r0, 0x1 b _0806DA02 .align 2, 0 -_0806D9FC: .4byte gUnknown_2037078 +_0806D9FC: .4byte gPlayerAvatar _0806DA00: movs r0, 0 _0806DA02: @@ -2241,7 +2241,7 @@ _0806DA02: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_806D964 + thumb_func_end mapheader_run_first_tag2_script_list_match_conditionally thumb_func_start sub_806DA10 sub_806DA10: @ 806DA10 @@ -2600,8 +2600,8 @@ _0806DCC4: _0806DCCC: .4byte gSaveBlock1Ptr thumb_func_end sub_806DC54 - thumb_func_start sub_806DCD0 -sub_806DCD0: @ 806DCD0 + thumb_func_start map_warp_consider_2_to_inside +map_warp_consider_2_to_inside: @ 806DCD0 push {r4-r7,lr} adds r6, r0, 0 lsls r1, 16 @@ -2649,7 +2649,7 @@ _0806DD32: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_806DCD0 + thumb_func_end map_warp_consider_2_to_inside thumb_func_start map_warp_check map_warp_check: @ 806DD38 @@ -2799,7 +2799,7 @@ sub_806DE28: @ 806DE28 ldrsh r0, [r5, r1] movs r2, 0x12 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r0, 0x66 bne _0806DE64 movs r0, 0x25 @@ -2839,7 +2839,7 @@ sub_806DE70: @ 806DE70 asrs r0, 16 lsrs r6, r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r0, 0x20 bne _0806DEB8 cmp r5, 0 @@ -3017,7 +3017,7 @@ sub_806DFB8: @ 806DFB8 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r5, r0, 24 ldr r0, _0806E010 @ =gMapHeader @@ -3095,7 +3095,7 @@ GetFieldObjectScriptPointerForComparison: @ 806E050 ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3121,7 +3121,7 @@ SetCableClubWarp: @ 806E08C ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt ldr r4, _0806E0CC @ =gMapHeader adds r0, r4, 0 mov r1, sp diff --git a/asm/field_door.s b/asm/field_door.s index e3facae8b..9c7e5eb10 100644 --- a/asm/field_door.s +++ b/asm/field_door.s @@ -487,7 +487,7 @@ sub_805B268: @ 805B268 asrs r0, 16 lsls r1, r5, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsWarpDoor_2 @@ -515,7 +515,7 @@ sub_805B29C: @ 805B29C asrs r0, 16 lsls r1, r5, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsWarpDoor_2 @@ -543,7 +543,7 @@ sub_805B2D0: @ 805B2D0 asrs r0, 16 lsls r1, r5, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsWarpDoor_2 @@ -577,7 +577,7 @@ sub_805B310: @ 805B310 asrs r0, 16 lsls r1, r5, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsWarpDoor_2 diff --git a/asm/field_effect.s b/asm/field_effect.s index 4edbbca95..1cbdc8214 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -218,38 +218,38 @@ _080835B4: .4byte gUnknown_2036E28 _080835B8: adds r4, 0x10 lsls r0, r4, 5 - ldr r1, _080835C8 @ =gUnknown_20371F8 + ldr r1, _080835C8 @ =gPlttBufferUnfaded adds r0, r1 movs r1, 0x10 bl TintPalette_GrayScale b _080835F6 .align 2, 0 -_080835C8: .4byte gUnknown_20371F8 +_080835C8: .4byte gPlttBufferUnfaded _080835CC: adds r4, 0x10 lsls r0, r4, 5 - ldr r1, _080835DC @ =gUnknown_20371F8 + ldr r1, _080835DC @ =gPlttBufferUnfaded adds r0, r1 movs r1, 0x10 bl TintPalette_SepiaTone b _080835F6 .align 2, 0 -_080835DC: .4byte gUnknown_20371F8 +_080835DC: .4byte gPlttBufferUnfaded _080835E0: adds r4, 0x10 lsls r0, r4, 4 movs r1, 0x10 bl sub_8111F38 lsls r0, r4, 5 - ldr r1, _0808360C @ =gUnknown_20371F8 + ldr r1, _0808360C @ =gPlttBufferUnfaded adds r0, r1 movs r1, 0x10 bl TintPalette_GrayScale _080835F6: lsls r1, r4, 5 - ldr r0, _0808360C @ =gUnknown_20371F8 + ldr r0, _0808360C @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _08083610 @ =gUnknown_20375F8 + ldr r2, _08083610 @ =gPlttBufferFaded adds r1, r2 movs r2, 0x8 bl CpuFastSet @@ -258,8 +258,8 @@ _08083606: pop {r0} bx r0 .align 2, 0 -_0808360C: .4byte gUnknown_20371F8 -_08083610: .4byte gUnknown_20375F8 +_0808360C: .4byte gPlttBufferUnfaded +_08083610: .4byte gPlttBufferFaded thumb_func_end sub_8083598 thumb_func_start sub_8083614 @@ -873,7 +873,7 @@ MultiplyInvertedPaletteRGBComponents: @ 8083A88 lsrs r2, 24 lsls r3, 24 lsrs r3, 24 - ldr r4, _08083B0C @ =gUnknown_20371F8 + ldr r4, _08083B0C @ =gPlttBufferUnfaded lsrs r0, 15 adds r4, r0, r4 ldrh r4, [r4] @@ -918,7 +918,7 @@ MultiplyInvertedPaletteRGBComponents: @ 8083A88 lsls r4, 26 orrs r4, r6 lsrs r4, 16 - ldr r1, _08083B10 @ =gUnknown_20375F8 + ldr r1, _08083B10 @ =gPlttBufferFaded adds r0, r1 strh r4, [r0] pop {r3,r4} @@ -928,8 +928,8 @@ MultiplyInvertedPaletteRGBComponents: @ 8083A88 pop {r0} bx r0 .align 2, 0 -_08083B0C: .4byte gUnknown_20371F8 -_08083B10: .4byte gUnknown_20375F8 +_08083B0C: .4byte gPlttBufferUnfaded +_08083B10: .4byte gPlttBufferFaded thumb_func_end MultiplyInvertedPaletteRGBComponents thumb_func_start MultiplyPaletteRGBComponents @@ -944,7 +944,7 @@ MultiplyPaletteRGBComponents: @ 8083B14 lsrs r2, 24 lsls r3, 24 lsrs r3, 24 - ldr r4, _08083B84 @ =gUnknown_20371F8 + ldr r4, _08083B84 @ =gPlttBufferUnfaded lsrs r0, 15 adds r4, r0, r4 ldrh r4, [r4] @@ -981,7 +981,7 @@ MultiplyPaletteRGBComponents: @ 8083B14 lsls r4, 26 orrs r4, r5 lsrs r4, 16 - ldr r1, _08083B88 @ =gUnknown_20375F8 + ldr r1, _08083B88 @ =gPlttBufferFaded adds r0, r1 strh r4, [r0] pop {r3} @@ -990,8 +990,8 @@ MultiplyPaletteRGBComponents: @ 8083B14 pop {r0} bx r0 .align 2, 0 -_08083B84: .4byte gUnknown_20371F8 -_08083B88: .4byte gUnknown_20375F8 +_08083B84: .4byte gPlttBufferUnfaded +_08083B88: .4byte gPlttBufferFaded thumb_func_end MultiplyPaletteRGBComponents thumb_func_start sub_8083B8C @@ -2019,7 +2019,7 @@ task00_8084310: @ 8084310 cmp r0, 0 beq _08084376 bl GetCursorSelectionMonId - ldr r1, _08084380 @ =gUnknown_20386E0 + ldr r1, _08084380 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -2053,7 +2053,7 @@ _08084376: bx r0 .align 2, 0 _0808437C: .4byte gTasks -_08084380: .4byte gUnknown_20386E0 +_08084380: .4byte gFieldEffectArguments _08084384: .4byte sub_805671C _08084388: .4byte gUnknown_3005020 _0808438C: .4byte mapldr_08084390 @@ -2068,7 +2068,7 @@ mapldr_08084390: @ 8084390 movs r1, 0 bl CreateTask ldr r4, _080843EC @ =gMapObjects - ldr r3, _080843F0 @ =gUnknown_2037078 + ldr r3, _080843F0 @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2102,7 +2102,7 @@ _080843D2: .align 2, 0 _080843E8: .4byte c3_080843F8 _080843EC: .4byte gMapObjects -_080843F0: .4byte gUnknown_2037078 +_080843F0: .4byte gPlayerAvatar _080843F4: .4byte gUnknown_3005020 thumb_func_end mapldr_08084390 @@ -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 @@ -2209,7 +2209,7 @@ sub_80844BC: @ 80844BC mov r5, r8 push {r5,r6} mov r9, r0 - ldr r6, _08084558 @ =gUnknown_2037078 + ldr r6, _08084558 @ =gPlayerAvatar ldrb r0, [r6, 0x5] lsls r5, r0, 3 adds r5, r0 @@ -2278,7 +2278,7 @@ sub_80844BC: @ 80844BC pop {r1} bx r1 .align 2, 0 -_08084558: .4byte gUnknown_2037078 +_08084558: .4byte gPlayerAvatar _0808455C: .4byte gMapObjects _08084560: .4byte gSprites thumb_func_end sub_80844BC @@ -2305,7 +2305,7 @@ _08084578: sub_8084580: @ 8084580 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _080845E4 @ =gUnknown_2037078 + ldr r6, _080845E4 @ =gPlayerAvatar ldrb r0, [r6, 0x4] lsls r2, r0, 4 adds r2, r0 @@ -2352,7 +2352,7 @@ sub_8084580: @ 8084580 pop {r1} bx r1 .align 2, 0 -_080845E4: .4byte gUnknown_2037078 +_080845E4: .4byte gPlayerAvatar _080845E8: .4byte gSprites _080845EC: .4byte gSpriteCoordOffsetY _080845F0: .4byte gMapObjects @@ -2362,7 +2362,7 @@ _080845F0: .4byte gMapObjects sub_80845F4: @ 80845F4 push {r4-r6,lr} adds r4, r0, 0 - ldr r2, _080846A0 @ =gUnknown_2037078 + ldr r2, _080846A0 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2449,7 +2449,7 @@ _08084698: pop {r1} bx r1 .align 2, 0 -_080846A0: .4byte gUnknown_2037078 +_080846A0: .4byte gPlayerAvatar _080846A4: .4byte gMapObjects _080846A8: .4byte gSprites thumb_func_end sub_80845F4 @@ -2511,7 +2511,7 @@ _080846FE: sub_8084708: @ 8084708 push {r4,lr} sub sp, 0x4 - ldr r1, _08084778 @ =gUnknown_2037078 + ldr r1, _08084778 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] bl ScriptContext2_Disable @@ -2528,7 +2528,7 @@ sub_8084708: @ 8084708 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r0, 16 bl sub_8055B38 @@ -2555,7 +2555,7 @@ _08084760: pop {r1} bx r1 .align 2, 0 -_08084778: .4byte gUnknown_2037078 +_08084778: .4byte gPlayerAvatar _0808477C: .4byte 0x00004001 _08084780: .4byte sub_8084484 thumb_func_end sub_8084708 @@ -2645,7 +2645,7 @@ sub_80847F8: @ 80847F8 sub_8084820: @ 8084820 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08084888 @ =gUnknown_2037078 + ldr r0, _08084888 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2692,7 +2692,7 @@ _0808487E: pop {r1} bx r1 .align 2, 0 -_08084888: .4byte gUnknown_2037078 +_08084888: .4byte gPlayerAvatar _0808488C: .4byte gMapObjects thumb_func_end sub_8084820 @@ -2760,7 +2760,7 @@ sub_80848E8: @ 80848E8 sub_80848F8: @ 80848F8 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _0808493C @ =gUnknown_2037078 + ldr r0, _0808493C @ =gPlayerAvatar ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -2792,7 +2792,7 @@ _08084936: pop {r0} bx r0 .align 2, 0 -_0808493C: .4byte gUnknown_2037078 +_0808493C: .4byte gPlayerAvatar _08084940: .4byte gSprites thumb_func_end sub_80848F8 @@ -2800,7 +2800,7 @@ _08084940: .4byte gSprites sub_8084944: @ 8084944 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08084988 @ =gUnknown_2037078 + ldr r0, _08084988 @ =gPlayerAvatar ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -2832,7 +2832,7 @@ _08084982: pop {r0} bx r0 .align 2, 0 -_08084988: .4byte gUnknown_2037078 +_08084988: .4byte gPlayerAvatar _0808498C: .4byte gSprites thumb_func_end sub_8084944 @@ -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 @@ -2939,7 +2939,7 @@ sub_8084A5C: @ 8084A5C sub sp, 0x4 adds r5, r0, 0 bl CameraObjectReset2 - ldr r0, _08084ABC @ =gUnknown_2037078 + ldr r0, _08084ABC @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -2963,7 +2963,7 @@ sub_8084A5C: @ 8084A5C ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r1, r0, 24 ldrh r0, [r5, 0x8] @@ -2978,7 +2978,7 @@ sub_8084A5C: @ 8084A5C strh r0, [r5, 0x8] b _08084AC6 .align 2, 0 -_08084ABC: .4byte gUnknown_2037078 +_08084ABC: .4byte gPlayerAvatar _08084AC0: .4byte gMapObjects _08084AC4: movs r1, 0 @@ -2996,7 +2996,7 @@ _08084AC6: sub_8084AD8: @ 8084AD8 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08084B10 @ =gUnknown_2037078 + ldr r0, _08084B10 @ =gPlayerAvatar ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -3021,7 +3021,7 @@ sub_8084AD8: @ 8084AD8 pop {r1} bx r1 .align 2, 0 -_08084B10: .4byte gUnknown_2037078 +_08084B10: .4byte gPlayerAvatar _08084B14: .4byte gSprites thumb_func_end sub_8084AD8 @@ -3029,7 +3029,7 @@ _08084B14: .4byte gSprites sub_8084B18: @ 8084B18 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _08084B70 @ =gUnknown_2037078 + ldr r0, _08084B70 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -3071,7 +3071,7 @@ _08084B66: pop {r1} bx r1 .align 2, 0 -_08084B70: .4byte gUnknown_2037078 +_08084B70: .4byte gPlayerAvatar _08084B74: .4byte gSprites thumb_func_end sub_8084B18 @@ -3079,7 +3079,7 @@ _08084B74: .4byte gSprites sub_8084B78: @ 8084B78 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08084BB0 @ =gUnknown_2037078 + ldr r0, _08084BB0 @ =gPlayerAvatar ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -3104,7 +3104,7 @@ sub_8084B78: @ 8084B78 pop {r1} bx r1 .align 2, 0 -_08084BB0: .4byte gUnknown_2037078 +_08084BB0: .4byte gPlayerAvatar _08084BB4: .4byte gSprites thumb_func_end sub_8084B78 @@ -3112,7 +3112,7 @@ _08084BB4: .4byte gSprites sub_8084BB8: @ 8084BB8 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _08084C10 @ =gUnknown_2037078 + ldr r0, _08084C10 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -3155,7 +3155,7 @@ _08084C08: pop {r1} bx r1 .align 2, 0 -_08084C10: .4byte gUnknown_2037078 +_08084C10: .4byte gPlayerAvatar _08084C14: .4byte gSprites thumb_func_end sub_8084BB8 @@ -3184,7 +3184,7 @@ _08084C36: thumb_func_start sub_8084C3C sub_8084C3C: @ 8084C3C push {r4,lr} - ldr r0, _08084C94 @ =gUnknown_2037078 + ldr r0, _08084C94 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -3219,7 +3219,7 @@ _08084C8A: pop {r1} bx r1 .align 2, 0 -_08084C94: .4byte gUnknown_2037078 +_08084C94: .4byte gPlayerAvatar _08084C98: .4byte gMapObjects _08084C9C: .4byte sub_8084A24 thumb_func_end sub_8084C3C @@ -3238,7 +3238,7 @@ oei_waterfall: @ 8084CA0 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _08084CD4 @ =gUnknown_20386E0 + ldr r2, _08084CD4 @ =gFieldEffectArguments ldr r2, [r2] strh r2, [r1, 0xA] bl _call_via_r4 @@ -3249,7 +3249,7 @@ oei_waterfall: @ 8084CA0 .align 2, 0 _08084CCC: .4byte sub_8084CD8 _08084CD0: .4byte gTasks -_08084CD4: .4byte gUnknown_20386E0 +_08084CD4: .4byte gFieldEffectArguments thumb_func_end oei_waterfall thumb_func_start sub_8084CD8 @@ -3268,7 +3268,7 @@ _08084CEA: ldrsh r2, [r4, r0] lsls r2, 2 adds r2, r5 - ldr r0, _08084D1C @ =gUnknown_2037078 + ldr r0, _08084D1C @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3287,7 +3287,7 @@ _08084CEA: .align 2, 0 _08084D14: .4byte gUnknown_83CC084 _08084D18: .4byte gTasks -_08084D1C: .4byte gUnknown_2037078 +_08084D1C: .4byte gPlayerAvatar _08084D20: .4byte gMapObjects thumb_func_end sub_8084CD8 @@ -3296,7 +3296,7 @@ sub_8084D24: @ 8084D24 push {r4,lr} adds r4, r0, 0 bl ScriptContext2_Enable - ldr r1, _08084D40 @ =gUnknown_2037078 + ldr r1, _08084D40 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -3307,7 +3307,7 @@ sub_8084D24: @ 8084D24 pop {r1} bx r1 .align 2, 0 -_08084D40: .4byte gUnknown_2037078 +_08084D40: .4byte gPlayerAvatar thumb_func_end sub_8084D24 thumb_func_start waterfall_1_do_anim_probably @@ -3323,7 +3323,7 @@ waterfall_1_do_anim_probably: @ 8084D44 bne _08084D74 adds r0, r5, 0 bl FieldObjectClearAnimIfSpecialAnimFinished - ldr r1, _08084D7C @ =gUnknown_20386E0 + ldr r1, _08084D7C @ =gFieldEffectArguments movs r2, 0xA ldrsh r0, [r4, r2] str r0, [r1] @@ -3338,7 +3338,7 @@ _08084D74: pop {r1} bx r1 .align 2, 0 -_08084D7C: .4byte gUnknown_20386E0 +_08084D7C: .4byte gFieldEffectArguments thumb_func_end waterfall_1_do_anim_probably thumb_func_start waterfall_2_wait_anim_finish_probably @@ -3404,7 +3404,7 @@ _08084DE2: cmp r4, 0 bne _08084E18 bl ScriptContext2_Disable - ldr r0, _08084E10 @ =gUnknown_2037078 + ldr r0, _08084E10 @ =gPlayerAvatar strb r4, [r0, 0x6] ldr r0, _08084E14 @ =sub_8084CD8 bl FindTaskIdByFunc @@ -3416,7 +3416,7 @@ _08084DE2: movs r0, 0 b _08084E1E .align 2, 0 -_08084E10: .4byte gUnknown_2037078 +_08084E10: .4byte gPlayerAvatar _08084E14: .4byte sub_8084CD8 _08084E18: movs r0, 0x3 @@ -3442,7 +3442,7 @@ FldEff_UseDive: @ 8084E24 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r3, _08084E5C @ =gUnknown_20386E0 + ldr r3, _08084E5C @ =gFieldEffectArguments ldr r2, [r3] strh r2, [r1, 0x26] ldr r2, [r3, 0x4] @@ -3455,7 +3455,7 @@ FldEff_UseDive: @ 8084E24 .align 2, 0 _08084E54: .4byte sub_8084E60 _08084E58: .4byte gTasks -_08084E5C: .4byte gUnknown_20386E0 +_08084E5C: .4byte gFieldEffectArguments thumb_func_end FldEff_UseDive thumb_func_start sub_8084E60 @@ -3490,7 +3490,7 @@ _08084E94: .4byte gTasks thumb_func_start dive_1_lock dive_1_lock: @ 8084E98 - ldr r2, _08084EA8 @ =gUnknown_2037078 + ldr r2, _08084EA8 @ =gPlayerAvatar movs r1, 0x1 strb r1, [r2, 0x6] ldrh r1, [r0, 0x8] @@ -3499,7 +3499,7 @@ dive_1_lock: @ 8084E98 movs r0, 0 bx lr .align 2, 0 -_08084EA8: .4byte gUnknown_2037078 +_08084EA8: .4byte gPlayerAvatar thumb_func_end dive_1_lock thumb_func_start dive_2_unknown @@ -3507,7 +3507,7 @@ dive_2_unknown: @ 8084EAC push {r4,lr} adds r4, r0, 0 bl ScriptContext2_Enable - ldr r1, _08084ED0 @ =gUnknown_20386E0 + ldr r1, _08084ED0 @ =gFieldEffectArguments movs r2, 0x26 ldrsh r0, [r4, r2] str r0, [r1] @@ -3521,7 +3521,7 @@ dive_2_unknown: @ 8084EAC pop {r1} bx r1 .align 2, 0 -_08084ED0: .4byte gUnknown_20386E0 +_08084ED0: .4byte gFieldEffectArguments thumb_func_end dive_2_unknown thumb_func_start dive_3_unknown @@ -3538,7 +3538,7 @@ dive_3_unknown: @ 8084ED4 cmp r0, 0 bne _08084F18 ldr r2, _08084F20 @ =gMapObjects - ldr r0, _08084F24 @ =gUnknown_2037078 + ldr r0, _08084F24 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -3561,7 +3561,7 @@ _08084F18: bx r1 .align 2, 0 _08084F20: .4byte gMapObjects -_08084F24: .4byte gUnknown_2037078 +_08084F24: .4byte gPlayerAvatar _08084F28: .4byte sub_8084E60 thumb_func_end dive_3_unknown @@ -3586,7 +3586,7 @@ sub_8084F44: @ 8084F44 lsrs r0, 24 ldr r6, _08084F8C @ =gUnknown_83CC0A4 ldr r2, _08084F90 @ =gTasks - ldr r5, _08084F94 @ =gUnknown_2037078 + ldr r5, _08084F94 @ =gPlayerAvatar lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3620,7 +3620,7 @@ _08084F58: .align 2, 0 _08084F8C: .4byte gUnknown_83CC0A4 _08084F90: .4byte gTasks -_08084F94: .4byte gUnknown_2037078 +_08084F94: .4byte gPlayerAvatar _08084F98: .4byte gMapObjects _08084F9C: .4byte gSprites thumb_func_end sub_8084F44 @@ -3634,7 +3634,7 @@ sub_8084FA0: @ 8084FA0 bl CameraObjectReset2 movs r0, 0 bl SetCameraPanningCallback - ldr r0, _08084FD4 @ =gUnknown_2037078 + ldr r0, _08084FD4 @ =gPlayerAvatar movs r2, 0x1 strb r2, [r0, 0x6] ldrb r0, [r5, 0x3] @@ -3650,7 +3650,7 @@ sub_8084FA0: @ 8084FA0 pop {r1} bx r1 .align 2, 0 -_08084FD4: .4byte gUnknown_2037078 +_08084FD4: .4byte gPlayerAvatar thumb_func_end sub_8084FA0 thumb_func_start sub_8084FD8 @@ -3691,7 +3691,7 @@ sub_808500C: @ 808500C strh r0, [r2, 0x26] movs r0, 0x1 strh r0, [r4, 0xE] - ldr r3, _08085054 @ =gUnknown_20386E0 + ldr r3, _08085054 @ =gFieldEffectArguments movs r5, 0x10 ldrsh r0, [r1, r5] str r0, [r3] @@ -3719,7 +3719,7 @@ sub_808500C: @ 808500C pop {r1} bx r1 .align 2, 0 -_08085054: .4byte gUnknown_20386E0 +_08085054: .4byte gFieldEffectArguments thumb_func_end sub_808500C thumb_func_start sub_8085058 @@ -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 @@ -3932,7 +3932,7 @@ sub_80851E8: @ 80851E8 lsrs r0, 24 ldr r6, _08085230 @ =gUnknown_83CC0BC ldr r2, _08085234 @ =gTasks - ldr r5, _08085238 @ =gUnknown_2037078 + ldr r5, _08085238 @ =gPlayerAvatar lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3966,7 +3966,7 @@ _080851FC: .align 2, 0 _08085230: .4byte gUnknown_83CC0BC _08085234: .4byte gTasks -_08085238: .4byte gUnknown_2037078 +_08085238: .4byte gPlayerAvatar _0808523C: .4byte gMapObjects _08085240: .4byte gSprites thumb_func_end sub_80851E8 @@ -3978,7 +3978,7 @@ sub_8085244: @ 8085244 adds r4, r1, 0 bl CameraObjectReset2 bl player_bitmagic - ldr r1, _08085270 @ =gUnknown_2037078 + ldr r1, _08085270 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrb r0, [r4, 0x1] @@ -3993,7 +3993,7 @@ sub_8085244: @ 8085244 pop {r1} bx r1 .align 2, 0 -_08085270: .4byte gUnknown_2037078 +_08085270: .4byte gPlayerAvatar thumb_func_end sub_8085244 thumb_func_start sub_8085274 @@ -4006,7 +4006,7 @@ sub_8085274: @ 8085274 lsls r0, 24 cmp r0, 0 beq _080852B4 - ldr r1, _080852BC @ =gUnknown_20386E0 + ldr r1, _080852BC @ =gFieldEffectArguments movs r2, 0x10 ldrsh r0, [r5, r2] str r0, [r1] @@ -4034,7 +4034,7 @@ _080852B4: pop {r1} bx r1 .align 2, 0 -_080852BC: .4byte gUnknown_20386E0 +_080852BC: .4byte gFieldEffectArguments thumb_func_end sub_8085274 thumb_func_start sub_80852C0 @@ -4088,7 +4088,7 @@ sub_8085314: @ 8085314 lsls r0, 24 cmp r0, 0 beq _0808533E - ldr r1, _08085344 @ =gUnknown_2037078 + ldr r1, _08085344 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] bl ScriptContext2_Disable @@ -4103,14 +4103,14 @@ _0808533E: pop {r1} bx r1 .align 2, 0 -_08085344: .4byte gUnknown_2037078 +_08085344: .4byte gPlayerAvatar _08085348: .4byte sub_80851E8 thumb_func_end sub_8085314 thumb_func_start FldEff_LavaridgeGymWarp FldEff_LavaridgeGymWarp: @ 808534C push {r4,lr} - ldr r4, _080853A4 @ =gUnknown_20386E0 + ldr r4, _080853A4 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -4151,7 +4151,7 @@ FldEff_LavaridgeGymWarp: @ 808534C pop {r1} bx r1 .align 2, 0 -_080853A4: .4byte gUnknown_20386E0 +_080853A4: .4byte gFieldEffectArguments _080853A8: .4byte gUnknown_83A0010 _080853AC: .4byte gSprites thumb_func_end FldEff_LavaridgeGymWarp @@ -4195,7 +4195,7 @@ sub_80853E4: @ 80853E4 lsrs r0, 24 ldr r6, _0808542C @ =gUnknown_83CC0CC ldr r2, _08085430 @ =gTasks - ldr r5, _08085434 @ =gUnknown_2037078 + ldr r5, _08085434 @ =gPlayerAvatar lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -4229,7 +4229,7 @@ _080853F8: .align 2, 0 _0808542C: .4byte gUnknown_83CC0CC _08085430: .4byte gTasks -_08085434: .4byte gUnknown_2037078 +_08085434: .4byte gPlayerAvatar _08085438: .4byte gMapObjects _0808543C: .4byte gSprites thumb_func_end sub_80853E4 @@ -4241,7 +4241,7 @@ sub_8085440: @ 8085440 adds r4, r1, 0 bl player_bitmagic bl CameraObjectReset2 - ldr r1, _0808546C @ =gUnknown_2037078 + ldr r1, _0808546C @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrb r0, [r4, 0x3] @@ -4256,7 +4256,7 @@ sub_8085440: @ 8085440 pop {r1} bx r1 .align 2, 0 -_0808546C: .4byte gUnknown_2037078 +_0808546C: .4byte gPlayerAvatar thumb_func_end sub_8085440 thumb_func_start sub_8085470 @@ -4275,7 +4275,7 @@ sub_8085470: @ 8085470 ldrsh r0, [r5, r2] cmp r0, 0x3 ble _080854C4 - ldr r1, _080854C0 @ =gUnknown_20386E0 + ldr r1, _080854C0 @ =gFieldEffectArguments movs r2, 0x10 ldrsh r0, [r4, r2] str r0, [r1] @@ -4299,7 +4299,7 @@ sub_8085470: @ 8085470 strh r0, [r5, 0x8] b _080854E4 .align 2, 0 -_080854C0: .4byte gUnknown_20386E0 +_080854C0: .4byte gFieldEffectArguments _080854C4: adds r0, r1, 0x1 strh r0, [r5, 0xA] @@ -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 @@ -4414,7 +4414,7 @@ _0808559C: .4byte sub_80853E4 thumb_func_start FldEff_PopOutOfAsh FldEff_PopOutOfAsh: @ 80855A0 push {r4,lr} - ldr r4, _080855F8 @ =gUnknown_20386E0 + ldr r4, _080855F8 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -4455,7 +4455,7 @@ FldEff_PopOutOfAsh: @ 80855A0 pop {r1} bx r1 .align 2, 0 -_080855F8: .4byte gUnknown_20386E0 +_080855F8: .4byte gFieldEffectArguments _080855FC: .4byte gUnknown_83A0010 _08085600: .4byte gSprites thumb_func_end FldEff_PopOutOfAsh @@ -4541,7 +4541,7 @@ sub_808566C: @ 808566C sub_8085690: @ 8085690 push {r4-r6,lr} adds r5, r0, 0 - ldr r0, _080856D4 @ =gUnknown_2037078 + ldr r0, _080856D4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4571,7 +4571,7 @@ sub_8085690: @ 8085690 bl PlaySE b _08085702 .align 2, 0 -_080856D4: .4byte gUnknown_2037078 +_080856D4: .4byte gPlayerAvatar _080856D8: .4byte gMapObjects _080856DC: movs r1, 0x8 @@ -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 @@ -4974,7 +4974,7 @@ sub_80859D4: @ 80859D4 movs r0, 0 str r0, [r1] ldr r2, _08085A18 @ =gMapObjects - ldr r0, _08085A1C @ =gUnknown_2037078 + ldr r0, _08085A1C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4992,7 +4992,7 @@ sub_80859D4: @ 80859D4 .align 2, 0 _08085A14: .4byte gUnknown_3005020 _08085A18: .4byte gMapObjects -_08085A1C: .4byte gUnknown_2037078 +_08085A1C: .4byte gPlayerAvatar _08085A20: .4byte sub_8085A24 thumb_func_end sub_80859D4 @@ -5051,7 +5051,7 @@ sub_8085A80: @ 8085A80 adds r4, r0, 0 adds r5, r4, 0 adds r5, 0x8 - ldr r0, _08085AD4 @ =gUnknown_2037078 + ldr r0, _08085AD4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5087,7 +5087,7 @@ sub_8085A80: @ 8085A80 strh r0, [r5, 0xC] b _08085B10 .align 2, 0 -_08085AD4: .4byte gUnknown_2037078 +_08085AD4: .4byte gPlayerAvatar _08085AD8: .4byte gMapObjects _08085ADC: movs r2, 0xE @@ -5221,7 +5221,7 @@ sub_8085BD0: @ 8085BD0 mov r0, sp movs r2, 0x5 bl memcpy - ldr r0, _08085C58 @ =gUnknown_2037078 + ldr r0, _08085C58 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5281,7 +5281,7 @@ _08085C4A: bx r0 .align 2, 0 _08085C54: .4byte gUnknown_83CC108 -_08085C58: .4byte gUnknown_2037078 +_08085C58: .4byte gPlayerAvatar _08085C5C: .4byte gMapObjects thumb_func_end sub_8085BD0 @@ -5294,7 +5294,7 @@ sub_8085C60: @ 8085C60 mov r0, sp movs r2, 0x5 bl memcpy - ldr r2, _08085D28 @ =gUnknown_2037078 + ldr r2, _08085D28 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5386,7 +5386,7 @@ _08085D1A: bx r0 .align 2, 0 _08085D24: .4byte gUnknown_83CC108 -_08085D28: .4byte gUnknown_2037078 +_08085D28: .4byte gPlayerAvatar _08085D2C: .4byte gMapObjects _08085D30: .4byte gSprites thumb_func_end sub_8085C60 @@ -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 @@ -5440,7 +5440,7 @@ mapldr_08085D88: @ 8085D88 movs r0, 0 str r0, [r1] ldr r2, _08085DD0 @ =gMapObjects - ldr r0, _08085DD4 @ =gUnknown_2037078 + ldr r0, _08085DD4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5459,7 +5459,7 @@ mapldr_08085D88: @ 8085D88 .align 2, 0 _08085DCC: .4byte gUnknown_3005020 _08085DD0: .4byte gMapObjects -_08085DD4: .4byte gUnknown_2037078 +_08085DD4: .4byte gPlayerAvatar _08085DD8: .4byte sub_8085DDC thumb_func_end mapldr_08085D88 @@ -5496,7 +5496,7 @@ sub_8085E0C: @ 8085E0C lsls r0, 24 cmp r0, 0 beq _08085E82 - ldr r5, _08085E88 @ =gUnknown_2037078 + ldr r5, _08085E88 @ =gPlayerAvatar ldrb r0, [r5, 0x4] lsls r2, r0, 4 adds r2, r0 @@ -5551,7 +5551,7 @@ _08085E82: pop {r0} bx r0 .align 2, 0 -_08085E88: .4byte gUnknown_2037078 +_08085E88: .4byte gPlayerAvatar _08085E8C: .4byte gSprites _08085E90: .4byte gSpriteCoordOffsetY _08085E94: .4byte gMapObjects @@ -5566,7 +5566,7 @@ sub_8085E98: @ 8085E98 mov r0, sp movs r2, 0x5 bl memcpy - ldr r2, _08085F04 @ =gUnknown_2037078 + ldr r2, _08085F04 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5612,7 +5612,7 @@ sub_8085E98: @ 8085E98 b _08085F36 .align 2, 0 _08085F00: .4byte gUnknown_83CC108 -_08085F04: .4byte gUnknown_2037078 +_08085F04: .4byte gPlayerAvatar _08085F08: .4byte gMapObjects _08085F0C: .4byte gSprites _08085F10: @@ -5699,7 +5699,7 @@ sub_8085F9C: @ 8085F9C mov r0, sp movs r2, 0x5 bl memcpy - ldr r0, _0808601C @ =gUnknown_2037078 + ldr r0, _0808601C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5750,7 +5750,7 @@ _08086010: bx r0 .align 2, 0 _08086018: .4byte gUnknown_83CC108 -_0808601C: .4byte gUnknown_2037078 +_0808601C: .4byte gPlayerAvatar _08086020: .4byte gMapObjects _08086024: .4byte sub_8085DDC thumb_func_end sub_8085F9C @@ -5777,7 +5777,7 @@ _0808604A: bl CreateTask lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _0808607C @ =gUnknown_20386E0 + ldr r2, _0808607C @ =gFieldEffectArguments ldr r0, [r2] ldr r1, [r2, 0x4] ldr r2, [r2, 0x8] @@ -5796,14 +5796,14 @@ _0808604A: bx r1 .align 2, 0 _08086078: .4byte sub_8086468 -_0808607C: .4byte gUnknown_20386E0 +_0808607C: .4byte gFieldEffectArguments _08086080: .4byte gTasks thumb_func_end FldEff_FieldMoveShowMon thumb_func_start FldEff_FieldMoveShowMonInit FldEff_FieldMoveShowMonInit: @ 8086084 push {r4-r6,lr} - ldr r5, _080860D8 @ =gUnknown_20386E0 + ldr r5, _080860D8 @ =gFieldEffectArguments ldr r0, [r5] movs r6, 0x80 lsls r6, 24 @@ -5839,7 +5839,7 @@ FldEff_FieldMoveShowMonInit: @ 8086084 pop {r1} bx r1 .align 2, 0 -_080860D8: .4byte gUnknown_20386E0 +_080860D8: .4byte gFieldEffectArguments _080860DC: .4byte gPlayerParty thumb_func_end FldEff_FieldMoveShowMonInit @@ -6945,7 +6945,7 @@ sub_8086944: @ 8086944 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _08086988 @ =gUnknown_20386E0 + ldr r0, _08086988 @ =gFieldEffectArguments ldr r0, [r0] strh r0, [r1, 0x26] bl sav1_reset_battle_music_maybe @@ -6964,7 +6964,7 @@ _08086978: .align 2, 0 _08086980: .4byte sub_8086990 _08086984: .4byte gTasks -_08086988: .4byte gUnknown_20386E0 +_08086988: .4byte gFieldEffectArguments _0808698C: .4byte 0x00000131 thumb_func_end sub_8086944 @@ -7001,7 +7001,7 @@ sub_80869C0: @ 80869C0 adds r4, r0, 0 bl ScriptContext2_Enable bl player_bitmagic - ldr r5, _08086A18 @ =gUnknown_2037078 + ldr r5, _08086A18 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r5, 0x6] movs r0, 0x8 @@ -7034,7 +7034,7 @@ sub_80869C0: @ 80869C0 pop {r0} bx r0 .align 2, 0 -_08086A18: .4byte gUnknown_2037078 +_08086A18: .4byte gPlayerAvatar _08086A1C: .4byte gMapObjects thumb_func_end sub_80869C0 @@ -7042,7 +7042,7 @@ _08086A1C: .4byte gMapObjects sub_8086A20: @ 8086A20 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08086A64 @ =gUnknown_2037078 + ldr r0, _08086A64 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7072,7 +7072,7 @@ _08086A5C: pop {r0} bx r0 .align 2, 0 -_08086A64: .4byte gUnknown_2037078 +_08086A64: .4byte gPlayerAvatar _08086A68: .4byte gMapObjects thumb_func_end sub_8086A20 @@ -7080,7 +7080,7 @@ _08086A68: .4byte gMapObjects sub_8086A6C: @ 8086A6C push {r4,lr} adds r4, r0, 0 - ldr r0, _08086AA8 @ =gUnknown_2037078 + ldr r0, _08086AA8 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7091,7 +7091,7 @@ sub_8086A6C: @ 8086A6C lsls r0, 24 cmp r0, 0 beq _08086AA2 - ldr r2, _08086AB0 @ =gUnknown_20386E0 + ldr r2, _08086AB0 @ =gFieldEffectArguments movs r1, 0x26 ldrsh r0, [r4, r1] movs r1, 0x80 @@ -7108,9 +7108,9 @@ _08086AA2: pop {r0} bx r0 .align 2, 0 -_08086AA8: .4byte gUnknown_2037078 +_08086AA8: .4byte gPlayerAvatar _08086AAC: .4byte gMapObjects -_08086AB0: .4byte gUnknown_20386E0 +_08086AB0: .4byte gFieldEffectArguments thumb_func_end sub_8086A6C thumb_func_start sub_8086AB4 @@ -7122,7 +7122,7 @@ sub_8086AB4: @ 8086AB4 lsls r0, 24 cmp r0, 0 bne _08086B1E - ldr r5, _08086B24 @ =gUnknown_2037078 + ldr r5, _08086B24 @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -7146,7 +7146,7 @@ sub_8086AB4: @ 8086AB4 lsrs r1, 24 adds r0, r4, 0 bl sub_8063CA4 - ldr r1, _08086B2C @ =gUnknown_20386E0 + ldr r1, _08086B2C @ =gFieldEffectArguments movs r2, 0xA ldrsh r0, [r6, r2] str r0, [r1] @@ -7166,15 +7166,15 @@ _08086B1E: pop {r0} bx r0 .align 2, 0 -_08086B24: .4byte gUnknown_2037078 +_08086B24: .4byte gPlayerAvatar _08086B28: .4byte gMapObjects -_08086B2C: .4byte gUnknown_20386E0 +_08086B2C: .4byte gFieldEffectArguments thumb_func_end sub_8086AB4 thumb_func_start sub_8086B30 sub_8086B30: @ 8086B30 push {r4,r5,lr} - ldr r5, _08086B9C @ =gUnknown_2037078 + ldr r5, _08086B9C @ =gPlayerAvatar ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7219,7 +7219,7 @@ _08086B96: pop {r0} bx r0 .align 2, 0 -_08086B9C: .4byte gUnknown_2037078 +_08086B9C: .4byte gPlayerAvatar _08086BA0: .4byte gMapObjects _08086BA4: .4byte sub_8086990 thumb_func_end sub_8086B30 @@ -7277,7 +7277,7 @@ sub_8086C00: @ 8086C00 adds r4, r0, 0 bl ScriptContext2_Enable bl player_bitmagic - ldr r1, _08086C20 @ =gUnknown_2037078 + ldr r1, _08086C20 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -7287,14 +7287,14 @@ sub_8086C00: @ 8086C00 pop {r0} bx r0 .align 2, 0 -_08086C20: .4byte gUnknown_2037078 +_08086C20: .4byte gPlayerAvatar thumb_func_end sub_8086C00 thumb_func_start sub_8086C24 sub_8086C24: @ 8086C24 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08086C68 @ =gUnknown_2037078 + ldr r0, _08086C68 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7324,7 +7324,7 @@ _08086C60: pop {r0} bx r0 .align 2, 0 -_08086C68: .4byte gUnknown_2037078 +_08086C68: .4byte gPlayerAvatar _08086C6C: .4byte gMapObjects thumb_func_end sub_8086C24 @@ -7332,7 +7332,7 @@ _08086C6C: .4byte gMapObjects sub_8086C70: @ 8086C70 push {r4-r6,lr} adds r6, r0, 0 - ldr r5, _08086C9C @ =gUnknown_2037078 + ldr r5, _08086C9C @ =gPlayerAvatar ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7352,7 +7352,7 @@ sub_8086C70: @ 8086C70 movs r0, 0x1 b _08086CAE .align 2, 0 -_08086C9C: .4byte gUnknown_2037078 +_08086C9C: .4byte gPlayerAvatar _08086CA0: .4byte gMapObjects _08086CA4: movs r0, 0x8 @@ -7398,7 +7398,7 @@ _08086CEE: thumb_func_start sub_8086CF4 sub_8086CF4: @ 8086CF4 push {r4,lr} - ldr r4, _08086D2C @ =gUnknown_2037078 + ldr r4, _08086D2C @ =gPlayerAvatar ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7423,7 +7423,7 @@ _08086D26: pop {r0} bx r0 .align 2, 0 -_08086D2C: .4byte gUnknown_2037078 +_08086D2C: .4byte gPlayerAvatar _08086D30: .4byte gMapObjects _08086D34: .4byte sub_8086BD0 thumb_func_end sub_8086CF4 @@ -7456,7 +7456,7 @@ sub_8086D38: @ 8086D38 strb r0, [r2, 0x5] ldr r0, _08086D8C @ =sub_8086D94 str r0, [r2, 0x1C] - ldr r0, _08086D90 @ =gUnknown_20386E0 + ldr r0, _08086D90 @ =gFieldEffectArguments ldr r0, [r0] strh r0, [r2, 0x30] movs r0, 0x97 @@ -7469,7 +7469,7 @@ sub_8086D38: @ 8086D38 _08086D84: .4byte gUnknown_83A0010 _08086D88: .4byte gSprites _08086D8C: .4byte sub_8086D94 -_08086D90: .4byte gUnknown_20386E0 +_08086D90: .4byte gFieldEffectArguments thumb_func_end sub_8086D38 thumb_func_start sub_8086D94 @@ -7550,7 +7550,7 @@ FldEff_UseFly: @ 8086E10 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _08086E3C @ =gUnknown_20386E0 + ldr r0, _08086E3C @ =gFieldEffectArguments ldr r0, [r0] strh r0, [r1, 0xA] movs r0, 0 @@ -7559,7 +7559,7 @@ FldEff_UseFly: @ 8086E10 .align 2, 0 _08086E34: .4byte sub_8086E40 _08086E38: .4byte gTasks -_08086E3C: .4byte gUnknown_20386E0 +_08086E3C: .4byte gFieldEffectArguments thumb_func_end FldEff_UseFly thumb_func_start sub_8086E40 @@ -7591,7 +7591,7 @@ _08086E6C: .4byte gTasks sub_8086E70: @ 8086E70 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _08086EC0 @ =gUnknown_2037078 + ldr r6, _08086EC0 @ =gPlayerAvatar ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7626,7 +7626,7 @@ _08086EB8: pop {r0} bx r0 .align 2, 0 -_08086EC0: .4byte gUnknown_2037078 +_08086EC0: .4byte gPlayerAvatar _08086EC4: .4byte gMapObjects thumb_func_end sub_8086E70 @@ -7634,7 +7634,7 @@ _08086EC4: .4byte gMapObjects sub_8086EC8: @ 8086EC8 push {r4,lr} adds r4, r0, 0 - ldr r0, _08086F00 @ =gUnknown_2037078 + ldr r0, _08086F00 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7648,7 +7648,7 @@ sub_8086EC8: @ 8086EC8 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r1, _08086F08 @ =gUnknown_20386E0 + ldr r1, _08086F08 @ =gFieldEffectArguments movs r2, 0xA ldrsh r0, [r4, r2] str r0, [r1] @@ -7659,9 +7659,9 @@ _08086EF8: pop {r0} bx r0 .align 2, 0 -_08086F00: .4byte gUnknown_2037078 +_08086F00: .4byte gPlayerAvatar _08086F04: .4byte gMapObjects -_08086F08: .4byte gUnknown_20386E0 +_08086F08: .4byte gFieldEffectArguments thumb_func_end sub_8086EC8 thumb_func_start sub_8086F0C @@ -7673,7 +7673,7 @@ sub_8086F0C: @ 8086F0C lsls r0, 24 cmp r0, 0 bne _08086F54 - ldr r0, _08086F5C @ =gUnknown_2037078 + ldr r0, _08086F5C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7704,7 +7704,7 @@ _08086F54: pop {r0} bx r0 .align 2, 0 -_08086F5C: .4byte gUnknown_2037078 +_08086F5C: .4byte gPlayerAvatar _08086F60: .4byte gMapObjects thumb_func_end sub_8086F0C @@ -7724,7 +7724,7 @@ sub_8086F64: @ 8086F64 strh r0, [r4, 0xC] movs r0, 0x1 bl SetPlayerAvatarTransitionFlags - ldr r0, _08086FA0 @ =gUnknown_2037078 + ldr r0, _08086FA0 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7738,7 +7738,7 @@ _08086F98: pop {r0} bx r0 .align 2, 0 -_08086FA0: .4byte gUnknown_2037078 +_08086FA0: .4byte gPlayerAvatar _08086FA4: .4byte gMapObjects thumb_func_end sub_8086F64 @@ -7746,7 +7746,7 @@ _08086FA4: .4byte gMapObjects sub_8086FA8: @ 8086FA8 push {r4,lr} adds r4, r0, 0 - ldr r0, _08086FF4 @ =gUnknown_2037078 + ldr r0, _08086FF4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7781,7 +7781,7 @@ _08086FEC: pop {r0} bx r0 .align 2, 0 -_08086FF4: .4byte gUnknown_2037078 +_08086FF4: .4byte gPlayerAvatar _08086FF8: .4byte gMapObjects thumb_func_end sub_8086FA8 @@ -7796,7 +7796,7 @@ sub_8086FFC: @ 8086FFC asrs r0, 16 cmp r0, 0x7 ble _0808705A - ldr r0, _08087060 @ =gUnknown_2037078 + ldr r0, _08087060 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -7835,7 +7835,7 @@ _0808705A: pop {r0} bx r0 .align 2, 0 -_08087060: .4byte gUnknown_2037078 +_08087060: .4byte gPlayerAvatar _08087064: .4byte gMapObjects _08087068: .4byte gSprites thumb_func_end sub_8086FFC @@ -7851,7 +7851,7 @@ sub_808706C: @ 808706C asrs r0, 16 cmp r0, 0x9 ble _080870FC - ldr r0, _08087104 @ =gUnknown_2037078 + ldr r0, _08087104 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -7914,7 +7914,7 @@ _080870FC: pop {r0} bx r0 .align 2, 0 -_08087104: .4byte gUnknown_2037078 +_08087104: .4byte gPlayerAvatar _08087108: .4byte gMapObjects _0808710C: .4byte gSprites _08087110: .4byte gSaveBlock2Ptr @@ -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 @@ -8425,7 +8425,7 @@ _080874C4: .4byte gTasks sub_80874C8: @ 80874C8 push {r4-r6,lr} adds r6, r0, 0 - ldr r4, _080875B4 @ =gUnknown_2037078 + ldr r4, _080875B4 @ =gPlayerAvatar ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -8531,7 +8531,7 @@ _080875AE: pop {r0} bx r0 .align 2, 0 -_080875B4: .4byte gUnknown_2037078 +_080875B4: .4byte gPlayerAvatar _080875B8: .4byte gMapObjects _080875BC: .4byte gSprites _080875C0: .4byte gSaveBlock2Ptr @@ -8561,7 +8561,7 @@ sub_80875C8: @ 80875C8 cmp r0, 0 bne _08087630 _080875F2: - ldr r0, _0808763C @ =gUnknown_2037078 + ldr r0, _0808763C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -8597,7 +8597,7 @@ _08087630: bx r0 .align 2, 0 _08087638: .4byte gSprites -_0808763C: .4byte gUnknown_2037078 +_0808763C: .4byte gPlayerAvatar _08087640: .4byte gMapObjects thumb_func_end sub_80875C8 @@ -8610,7 +8610,7 @@ sub_8087644: @ 8087644 mov r0, sp movs r2, 0x24 bl memcpy - ldr r0, _08087690 @ =gUnknown_2037078 + ldr r0, _08087690 @ =gPlayerAvatar ldrb r0, [r0, 0x4] lsls r1, r0, 4 adds r1, r0 @@ -8640,7 +8640,7 @@ _08087682: bx r0 .align 2, 0 _0808768C: .4byte gUnknown_83CC1F0 -_08087690: .4byte gUnknown_2037078 +_08087690: .4byte gPlayerAvatar _08087694: .4byte gSprites thumb_func_end sub_8087644 @@ -8653,7 +8653,7 @@ sub_8087698: @ 8087698 lsls r0, 24 cmp r0, 0 beq _080876FC - ldr r0, _08087704 @ =gUnknown_2037078 + ldr r0, _08087704 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r5, r0, 3 adds r5, r0 @@ -8697,7 +8697,7 @@ _080876FC: pop {r0} bx r0 .align 2, 0 -_08087704: .4byte gUnknown_2037078 +_08087704: .4byte gPlayerAvatar _08087708: .4byte gMapObjects _0808770C: .4byte gSprites thumb_func_end sub_8087698 @@ -8706,7 +8706,7 @@ _0808770C: .4byte gSprites sub_8087710: @ 8087710 push {r4,lr} adds r4, r0, 0 - ldr r0, _08087740 @ =gUnknown_2037078 + ldr r0, _08087740 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -8727,7 +8727,7 @@ _08087738: pop {r0} bx r0 .align 2, 0 -_08087740: .4byte gUnknown_2037078 +_08087740: .4byte gPlayerAvatar _08087744: .4byte gMapObjects thumb_func_end sub_8087710 @@ -8771,7 +8771,7 @@ fishE: @ 8087780 lsls r0, 16 cmp r0, 0 bne _080877EA - ldr r6, _080877F0 @ =gUnknown_2037078 + ldr r6, _080877F0 @ =gPlayerAvatar ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -8815,7 +8815,7 @@ _080877EA: pop {r0} bx r0 .align 2, 0 -_080877F0: .4byte gUnknown_2037078 +_080877F0: .4byte gPlayerAvatar _080877F4: .4byte gMapObjects _080877F8: .4byte sub_8087498 thumb_func_end fishE @@ -8977,7 +8977,7 @@ _08087920: .4byte sub_80872F0 sub_8087924: @ 8087924 push {r4-r7,lr} sub sp, 0x4 - ldr r7, _080879C4 @ =gUnknown_20386E0 + ldr r7, _080879C4 @ =gFieldEffectArguments ldrb r0, [r7] ldrb r1, [r7, 0x4] ldrb r2, [r7, 0x8] @@ -9054,7 +9054,7 @@ _080879BA: pop {r1} bx r1 .align 2, 0 -_080879C4: .4byte gUnknown_20386E0 +_080879C4: .4byte gFieldEffectArguments _080879C8: .4byte gMapObjects _080879CC: .4byte sub_80879D8 _080879D0: .4byte gTasks @@ -9176,7 +9176,7 @@ _08087AB0: .4byte gMapObjects sub_8087AB4: @ 8087AB4 push {r4,lr} sub sp, 0x4 - ldr r4, _08087AF8 @ =gUnknown_20386E0 + ldr r4, _08087AF8 @ =gFieldEffectArguments ldrb r0, [r4] ldrb r1, [r4, 0x4] ldrb r2, [r4, 0x8] @@ -9206,7 +9206,7 @@ sub_8087AB4: @ 8087AB4 strh r0, [r1, 0x18] b _08087B0A .align 2, 0 -_08087AF8: .4byte gUnknown_20386E0 +_08087AF8: .4byte gFieldEffectArguments _08087AFC: .4byte sub_8087BC0 _08087B00: .4byte gTasks _08087B04: @@ -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_effect_helpers.s b/asm/field_effect_helpers.s index afddfa3fc..ed746de25 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -580,7 +580,7 @@ _080DB1D8: .4byte gSprites thumb_func_start oei_shadow oei_shadow: @ 80DB1DC push {r4,r5,lr} - ldr r5, _080DB268 @ =gUnknown_20386E0 + ldr r5, _080DB268 @ =gFieldEffectArguments ldrb r0, [r5] ldrb r1, [r5, 0x4] ldrb r2, [r5, 0x8] @@ -648,7 +648,7 @@ _080DB260: pop {r1} bx r1 .align 2, 0 -_080DB268: .4byte gUnknown_20386E0 +_080DB268: .4byte gFieldEffectArguments _080DB26C: .4byte gMapObjects _080DB270: .4byte gUnknown_83A0010 _080DB274: .4byte gUnknown_83FECD2 @@ -757,7 +757,7 @@ _080DB344: .4byte 0x00400001 oei_grass_normal: @ 80DB348 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _080DB3E0 @ =gUnknown_20386E0 + ldr r5, _080DB3E0 @ =gFieldEffectArguments ldrh r1, [r5] mov r0, sp strh r1, [r0] @@ -829,7 +829,7 @@ _080DB3D4: pop {r1} bx r1 .align 2, 0 -_080DB3E0: .4byte gUnknown_20386E0 +_080DB3E0: .4byte gFieldEffectArguments _080DB3E4: .4byte gUnknown_83A0010 _080DB3E8: .4byte gSprites thumb_func_end oei_grass_normal @@ -888,7 +888,7 @@ _080DB438: ldrsh r0, [r5, r2] movs r2, 0x32 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r6, r0, 24 mov r0, r8 @@ -972,7 +972,7 @@ _080DB4F0: .4byte gMapObjects thumb_func_start FldEff_JumpTallGrass FldEff_JumpTallGrass: @ 80DB4F4 push {r4,lr} - ldr r4, _080DB558 @ =gUnknown_20386E0 + ldr r4, _080DB558 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -1021,7 +1021,7 @@ _080DB550: pop {r1} bx r1 .align 2, 0 -_080DB558: .4byte gUnknown_20386E0 +_080DB558: .4byte gFieldEffectArguments _080DB55C: .4byte gUnknown_83A0010 _080DB560: .4byte gSprites thumb_func_end FldEff_JumpTallGrass @@ -1107,7 +1107,7 @@ _080DB5E8: FldEff_LongGrass: @ 80DB5F4 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _080DB690 @ =gUnknown_20386E0 + ldr r5, _080DB690 @ =gFieldEffectArguments ldrh r1, [r5] mov r0, sp strh r1, [r0] @@ -1180,7 +1180,7 @@ _080DB684: pop {r1} bx r1 .align 2, 0 -_080DB690: .4byte gUnknown_20386E0 +_080DB690: .4byte gFieldEffectArguments _080DB694: .4byte gUnknown_83A0010 _080DB698: .4byte gSprites thumb_func_end FldEff_LongGrass @@ -1239,7 +1239,7 @@ _080DB6E8: ldrsh r0, [r5, r2] movs r2, 0x32 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r4, r0, 24 mov r0, r8 @@ -1315,7 +1315,7 @@ _080DB794: .4byte gMapObjects thumb_func_start FldEff_JumpLongGrass FldEff_JumpLongGrass: @ 80DB798 push {r4,lr} - ldr r4, _080DB7FC @ =gUnknown_20386E0 + ldr r4, _080DB7FC @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -1364,7 +1364,7 @@ _080DB7F4: pop {r1} bx r1 .align 2, 0 -_080DB7FC: .4byte gUnknown_20386E0 +_080DB7FC: .4byte gFieldEffectArguments _080DB800: .4byte gUnknown_83A0010 _080DB804: .4byte gSprites thumb_func_end FldEff_JumpLongGrass @@ -1372,7 +1372,7 @@ _080DB804: .4byte gSprites thumb_func_start sub_80DB808 sub_80DB808: @ 80DB808 push {r4-r6,lr} - ldr r6, _080DB89C @ =gUnknown_20386E0 + ldr r6, _080DB89C @ =gFieldEffectArguments ldrb r0, [r6] ldrb r1, [r6, 0x4] ldrb r2, [r6, 0x8] @@ -1445,7 +1445,7 @@ _080DB894: pop {r1} bx r1 .align 2, 0 -_080DB89C: .4byte gUnknown_20386E0 +_080DB89C: .4byte gFieldEffectArguments _080DB8A0: .4byte gMapObjects _080DB8A4: .4byte gUnknown_83A0010 _080DB8A8: .4byte gSprites @@ -1579,7 +1579,7 @@ _080DB99C: .4byte gSprites thumb_func_start FldEff_SandFootprints FldEff_SandFootprints: @ 80DB9A0 push {r4,lr} - ldr r4, _080DBA08 @ =gUnknown_20386E0 + ldr r4, _080DBA08 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -1628,7 +1628,7 @@ _080DB9FE: pop {r1} bx r1 .align 2, 0 -_080DBA08: .4byte gUnknown_20386E0 +_080DBA08: .4byte gFieldEffectArguments _080DBA0C: .4byte gUnknown_83A0010 _080DBA10: .4byte gSprites thumb_func_end FldEff_SandFootprints @@ -1636,7 +1636,7 @@ _080DBA10: .4byte gSprites thumb_func_start FldEff_DeepSandFootprints FldEff_DeepSandFootprints: @ 80DBA14 push {r4,r5,lr} - ldr r4, _080DBA7C @ =gUnknown_20386E0 + ldr r4, _080DBA7C @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -1686,7 +1686,7 @@ _080DBA74: pop {r1} bx r1 .align 2, 0 -_080DBA7C: .4byte gUnknown_20386E0 +_080DBA7C: .4byte gFieldEffectArguments _080DBA80: .4byte gUnknown_83A0010 _080DBA84: .4byte gSprites thumb_func_end FldEff_DeepSandFootprints @@ -1694,7 +1694,7 @@ _080DBA84: .4byte gSprites thumb_func_start FldEff_BikeTireTracks FldEff_BikeTireTracks: @ 80DBA88 push {r4,r5,lr} - ldr r4, _080DBAF0 @ =gUnknown_20386E0 + ldr r4, _080DBAF0 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -1744,7 +1744,7 @@ _080DBAE8: pop {r1} bx r1 .align 2, 0 -_080DBAF0: .4byte gUnknown_20386E0 +_080DBAF0: .4byte gFieldEffectArguments _080DBAF4: .4byte gUnknown_83A0010 _080DBAF8: .4byte gSprites thumb_func_end FldEff_BikeTireTracks @@ -1829,7 +1829,7 @@ _080DBB80: thumb_func_start FldEff_Splash FldEff_Splash: @ 80DBB88 push {r4-r6,lr} - ldr r6, _080DBC1C @ =gUnknown_20386E0 + ldr r6, _080DBC1C @ =gFieldEffectArguments ldrb r0, [r6] ldrb r1, [r6, 0x4] ldrb r2, [r6, 0x8] @@ -1899,7 +1899,7 @@ _080DBC12: pop {r1} bx r1 .align 2, 0 -_080DBC1C: .4byte gUnknown_20386E0 +_080DBC1C: .4byte gFieldEffectArguments _080DBC20: .4byte gMapObjects _080DBC24: .4byte gUnknown_83A0010 _080DBC28: .4byte gSprites @@ -1980,7 +1980,7 @@ _080DBCB4: .4byte gMapObjects thumb_func_start FldEff_JumpSmallSplash FldEff_JumpSmallSplash: @ 80DBCB8 push {r4,lr} - ldr r4, _080DBD1C @ =gUnknown_20386E0 + ldr r4, _080DBD1C @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -2029,7 +2029,7 @@ _080DBD14: pop {r1} bx r1 .align 2, 0 -_080DBD1C: .4byte gUnknown_20386E0 +_080DBD1C: .4byte gFieldEffectArguments _080DBD20: .4byte gUnknown_83A0010 _080DBD24: .4byte gSprites thumb_func_end FldEff_JumpSmallSplash @@ -2037,7 +2037,7 @@ _080DBD24: .4byte gSprites thumb_func_start oei_water_drop_tall oei_water_drop_tall: @ 80DBD28 push {r4,lr} - ldr r4, _080DBD8C @ =gUnknown_20386E0 + ldr r4, _080DBD8C @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -2086,7 +2086,7 @@ _080DBD84: pop {r1} bx r1 .align 2, 0 -_080DBD8C: .4byte gUnknown_20386E0 +_080DBD8C: .4byte gFieldEffectArguments _080DBD90: .4byte gUnknown_83A0010 _080DBD94: .4byte gSprites thumb_func_end oei_water_drop_tall @@ -2094,7 +2094,7 @@ _080DBD94: .4byte gSprites thumb_func_start FldEff_FeetInFlowingWater FldEff_FeetInFlowingWater: @ 80DBD98 push {r4-r7,lr} - ldr r7, _080DBE38 @ =gUnknown_20386E0 + ldr r7, _080DBE38 @ =gFieldEffectArguments ldrb r0, [r7] ldrb r1, [r7, 0x4] ldrb r2, [r7, 0x8] @@ -2170,7 +2170,7 @@ _080DBE2E: pop {r1} bx r1 .align 2, 0 -_080DBE38: .4byte gUnknown_20386E0 +_080DBE38: .4byte gFieldEffectArguments _080DBE3C: .4byte gMapObjects _080DBE40: .4byte gUnknown_83A0010 _080DBE44: .4byte gSprites @@ -2265,7 +2265,7 @@ oei_ripples: @ 80DBEF0 push {r4,lr} ldr r0, _080DBF44 @ =gUnknown_83A0010 ldr r0, [r0, 0x14] - ldr r4, _080DBF48 @ =gUnknown_20386E0 + ldr r4, _080DBF48 @ =gFieldEffectArguments movs r2, 0 ldrsh r1, [r4, r2] movs r3, 0x4 @@ -2306,14 +2306,14 @@ _080DBF3C: bx r1 .align 2, 0 _080DBF44: .4byte gUnknown_83A0010 -_080DBF48: .4byte gUnknown_20386E0 +_080DBF48: .4byte gFieldEffectArguments _080DBF4C: .4byte gSprites thumb_func_end oei_ripples thumb_func_start sub_80DBF50 sub_80DBF50: @ 80DBF50 push {r4-r6,lr} - ldr r6, _080DBFE4 @ =gUnknown_20386E0 + ldr r6, _080DBFE4 @ =gFieldEffectArguments ldrb r0, [r6] ldrb r1, [r6, 0x4] ldrb r2, [r6, 0x8] @@ -2386,7 +2386,7 @@ _080DBFDC: pop {r1} bx r1 .align 2, 0 -_080DBFE4: .4byte gUnknown_20386E0 +_080DBFE4: .4byte gFieldEffectArguments _080DBFE8: .4byte gMapObjects _080DBFEC: .4byte gUnknown_83A0010 _080DBFF0: .4byte gSprites @@ -2474,7 +2474,7 @@ _080DC088: .4byte gSprites thumb_func_start FldEff_Unknown19 FldEff_Unknown19: @ 80DC08C push {r4,lr} - ldr r4, _080DC0EC @ =gUnknown_20386E0 + ldr r4, _080DC0EC @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -2521,7 +2521,7 @@ _080DC0E4: pop {r1} bx r1 .align 2, 0 -_080DC0EC: .4byte gUnknown_20386E0 +_080DC0EC: .4byte gFieldEffectArguments _080DC0F0: .4byte gUnknown_83A0010 _080DC0F4: .4byte gSprites thumb_func_end FldEff_Unknown19 @@ -2529,7 +2529,7 @@ _080DC0F4: .4byte gSprites thumb_func_start FldEff_Unknown20 FldEff_Unknown20: @ 80DC0F8 push {r4,lr} - ldr r4, _080DC158 @ =gUnknown_20386E0 + ldr r4, _080DC158 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -2576,7 +2576,7 @@ _080DC150: pop {r1} bx r1 .align 2, 0 -_080DC158: .4byte gUnknown_20386E0 +_080DC158: .4byte gFieldEffectArguments _080DC15C: .4byte gUnknown_83A0010 _080DC160: .4byte gSprites thumb_func_end FldEff_Unknown20 @@ -2584,7 +2584,7 @@ _080DC160: .4byte gSprites thumb_func_start FldEff_Unknown21 FldEff_Unknown21: @ 80DC164 push {r4,lr} - ldr r4, _080DC1C4 @ =gUnknown_20386E0 + ldr r4, _080DC1C4 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -2631,7 +2631,7 @@ _080DC1BC: pop {r1} bx r1 .align 2, 0 -_080DC1C4: .4byte gUnknown_20386E0 +_080DC1C4: .4byte gFieldEffectArguments _080DC1C8: .4byte gUnknown_83A0010 _080DC1CC: .4byte gSprites thumb_func_end FldEff_Unknown21 @@ -2639,7 +2639,7 @@ _080DC1CC: .4byte gSprites thumb_func_start FldEff_Unknown22 FldEff_Unknown22: @ 80DC1D0 push {r4,lr} - ldr r4, _080DC230 @ =gUnknown_20386E0 + ldr r4, _080DC230 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -2686,7 +2686,7 @@ _080DC228: pop {r1} bx r1 .align 2, 0 -_080DC230: .4byte gUnknown_20386E0 +_080DC230: .4byte gFieldEffectArguments _080DC234: .4byte gUnknown_83A0010 _080DC238: .4byte gSprites thumb_func_end FldEff_Unknown22 @@ -2696,7 +2696,7 @@ ash: @ 80DC23C push {r4,lr} lsls r2, 16 lsrs r2, 16 - ldr r4, _080DC26C @ =gUnknown_20386E0 + ldr r4, _080DC26C @ =gFieldEffectArguments lsls r0, 16 asrs r0, 16 str r0, [r4] @@ -2717,14 +2717,14 @@ ash: @ 80DC23C pop {r0} bx r0 .align 2, 0 -_080DC26C: .4byte gUnknown_20386E0 +_080DC26C: .4byte gFieldEffectArguments thumb_func_end ash thumb_func_start oei_ash oei_ash: @ 80DC270 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _080DC2F0 @ =gUnknown_20386E0 + ldr r5, _080DC2F0 @ =gFieldEffectArguments ldrh r1, [r5] mov r0, sp strh r1, [r0] @@ -2786,7 +2786,7 @@ _080DC2E6: pop {r1} bx r1 .align 2, 0 -_080DC2F0: .4byte gUnknown_20386E0 +_080DC2F0: .4byte gFieldEffectArguments _080DC2F4: .4byte gUnknown_83A0010 _080DC2F8: .4byte gSprites thumb_func_end oei_ash @@ -2864,7 +2864,7 @@ sub_80DC348: @ 80DC348 ldrsh r1, [r4, r2] bl CurrentMapDrawMetatileAt ldr r2, _080DC3A0 @ =gMapObjects - ldr r0, _080DC3A4 @ =gUnknown_2037078 + ldr r0, _080DC3A4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2881,7 +2881,7 @@ sub_80DC348: @ 80DC348 bx r0 .align 2, 0 _080DC3A0: .4byte gMapObjects -_080DC3A4: .4byte gUnknown_2037078 +_080DC3A4: .4byte gPlayerAvatar thumb_func_end sub_80DC348 thumb_func_start sub_80DC3A8 @@ -2909,7 +2909,7 @@ _080DC3C8: thumb_func_start sub_80DC3D0 sub_80DC3D0: @ 80DC3D0 push {r4,r5,lr} - ldr r4, _080DC43C @ =gUnknown_20386E0 + ldr r4, _080DC43C @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -2960,7 +2960,7 @@ _080DC42C: pop {r1} bx r1 .align 2, 0 -_080DC43C: .4byte gUnknown_20386E0 +_080DC43C: .4byte gFieldEffectArguments _080DC440: .4byte gUnknown_83A0010 _080DC444: .4byte gSprites _080DC448: .4byte 0x0000ffff @@ -3387,7 +3387,7 @@ _080DC73C: .4byte gSprites thumb_func_start FldEff_Dust FldEff_Dust: @ 80DC740 push {r4,lr} - ldr r4, _080DC7A4 @ =gUnknown_20386E0 + ldr r4, _080DC7A4 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -3436,7 +3436,7 @@ _080DC79C: pop {r1} bx r1 .align 2, 0 -_080DC7A4: .4byte gUnknown_20386E0 +_080DC7A4: .4byte gFieldEffectArguments _080DC7A8: .4byte gUnknown_83A0010 _080DC7AC: .4byte gSprites thumb_func_end FldEff_Dust @@ -3444,7 +3444,7 @@ _080DC7AC: .4byte gSprites thumb_func_start FldEff_SandPile FldEff_SandPile: @ 80DC7B0 push {r4-r7,lr} - ldr r7, _080DC85C @ =gUnknown_20386E0 + ldr r7, _080DC85C @ =gFieldEffectArguments ldrb r0, [r7] ldrb r1, [r7, 0x4] ldrb r2, [r7, 0x8] @@ -3527,7 +3527,7 @@ _080DC854: pop {r1} bx r1 .align 2, 0 -_080DC85C: .4byte gUnknown_20386E0 +_080DC85C: .4byte gFieldEffectArguments _080DC860: .4byte gMapObjects _080DC864: .4byte gUnknown_83A0010 _080DC868: .4byte gSprites @@ -3641,7 +3641,7 @@ _080DC934: .4byte gMapObjects thumb_func_start FldEff_Bubbles FldEff_Bubbles: @ 80DC938 push {r4,lr} - ldr r4, _080DC990 @ =gUnknown_20386E0 + ldr r4, _080DC990 @ =gFieldEffectArguments adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 @@ -3684,7 +3684,7 @@ _080DC988: pop {r1} bx r1 .align 2, 0 -_080DC990: .4byte gUnknown_20386E0 +_080DC990: .4byte gFieldEffectArguments _080DC994: .4byte gUnknown_83A0010 _080DC998: .4byte gSprites thumb_func_end FldEff_Bubbles @@ -3775,7 +3775,7 @@ ShowDisguiseFieldEffect: @ 80DCA10 lsrs r6, r1, 24 lsls r2, 24 lsrs r7, r2, 24 - ldr r5, _080DCA44 @ =gUnknown_20386E0 + ldr r5, _080DCA44 @ =gFieldEffectArguments ldrb r0, [r5] ldrb r1, [r5, 0x4] ldrb r2, [r5, 0x8] @@ -3789,7 +3789,7 @@ ShowDisguiseFieldEffect: @ 80DCA10 movs r0, 0x40 b _080DCAB4 .align 2, 0 -_080DCA44: .4byte gUnknown_20386E0 +_080DCA44: .4byte gFieldEffectArguments _080DCA48: ldr r1, _080DCAC0 @ =gUnknown_83A0010 lsls r0, r6, 2 @@ -4043,7 +4043,7 @@ _080DCC18: thumb_func_start FldEff_Sparkle FldEff_Sparkle: @ 80DCC1C push {r4,lr} - ldr r4, _080DCC84 @ =gUnknown_20386E0 + ldr r4, _080DCC84 @ =gFieldEffectArguments ldr r0, [r4] adds r0, 0x7 str r0, [r4] @@ -4094,7 +4094,7 @@ _080DCC7C: pop {r1} bx r1 .align 2, 0 -_080DCC84: .4byte gUnknown_20386E0 +_080DCC84: .4byte gFieldEffectArguments _080DCC88: .4byte gUnknown_83A0010 _080DCC8C: .4byte gSprites thumb_func_end FldEff_Sparkle diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index f08858fd1..8ccc347e9 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -11,7 +11,7 @@ palette_bg_faded_fill_white: @ 807DB14 sub sp, 0x4 ldr r0, _0807DB2C @ =0x7fff7fff str r0, [sp] - ldr r1, _0807DB30 @ =gUnknown_20375F8 + ldr r1, _0807DB30 @ =gPlttBufferFaded ldr r2, _0807DB34 @ =0x01000100 mov r0, sp bl CpuFastSet @@ -20,7 +20,7 @@ palette_bg_faded_fill_white: @ 807DB14 bx r0 .align 2, 0 _0807DB2C: .4byte 0x7fff7fff -_0807DB30: .4byte gUnknown_20375F8 +_0807DB30: .4byte gPlttBufferFaded _0807DB34: .4byte 0x01000100 thumb_func_end palette_bg_faded_fill_white @@ -30,7 +30,7 @@ palette_bg_faded_fill_black: @ 807DB38 sub sp, 0x4 movs r0, 0 str r0, [sp] - ldr r1, _0807DB50 @ =gUnknown_20375F8 + ldr r1, _0807DB50 @ =gPlttBufferFaded ldr r2, _0807DB54 @ =0x01000100 mov r0, sp bl CpuFastSet @@ -38,7 +38,7 @@ palette_bg_faded_fill_black: @ 807DB38 pop {r0} bx r0 .align 2, 0 -_0807DB50: .4byte gUnknown_20375F8 +_0807DB50: .4byte gPlttBufferFaded _0807DB54: .4byte 0x01000100 thumb_func_end palette_bg_faded_fill_black @@ -461,7 +461,7 @@ sub_807DE78: @ 807DE78 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 @@ -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 @@ -1490,7 +1490,7 @@ _0807E6D4: strh r0, [r4] b _0807E6F4 _0807E6DC: - ldr r0, _0807E6FC @ =gUnknown_3003F64 + ldr r0, _0807E6FC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0807E6F4 @@ -1504,7 +1504,7 @@ _0807E6F4: pop {r0} bx r0 .align 2, 0 -_0807E6FC: .4byte gUnknown_3003F64 +_0807E6FC: .4byte gReceivedRemoteLinkPlayers _0807E700: .4byte sub_805671C thumb_func_end sub_807E678 @@ -1831,7 +1831,7 @@ sub_807E980: @ 807E980 lsls r0, 3 ldr r1, _0807E9C0 @ =gTasks+0x8 adds r5, r0, r1 - ldr r2, _0807E9C4 @ =gUnknown_2037078 + ldr r2, _0807E9C4 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1855,7 +1855,7 @@ sub_807E980: @ 807E980 b _0807EA9A .align 2, 0 _0807E9C0: .4byte gTasks+0x8 -_0807E9C4: .4byte gUnknown_2037078 +_0807E9C4: .4byte gPlayerAvatar _0807E9C8: .4byte gMapObjects _0807E9CC: .4byte gSprites _0807E9D0: @@ -1984,7 +1984,7 @@ sub_807EAC4: @ 807EAC4 lsls r0, 16 lsrs r0, 16 mov r12, r0 - ldr r3, _0807EB58 @ =gUnknown_2037078 + ldr r3, _0807EB58 @ =gPlayerAvatar ldrb r2, [r3, 0x4] lsls r0, r2, 4 adds r0, r2 @@ -2049,7 +2049,7 @@ _0807EB4C: pop {r0} bx r0 .align 2, 0 -_0807EB58: .4byte gUnknown_2037078 +_0807EB58: .4byte gPlayerAvatar _0807EB5C: .4byte gSprites _0807EB60: .4byte gMapObjects thumb_func_end sub_807EAC4 @@ -2064,7 +2064,7 @@ sub_807EB64: @ 807EB64 mov r8, r2 lsls r5, 16 lsrs r5, 16 - ldr r0, _0807EBB4 @ =gUnknown_2037078 + ldr r0, _0807EBB4 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -2092,7 +2092,7 @@ sub_807EB64: @ 807EB64 pop {r0} bx r0 .align 2, 0 -_0807EBB4: .4byte gUnknown_2037078 +_0807EBB4: .4byte gPlayerAvatar _0807EBB8: .4byte gMapObjects thumb_func_end sub_807EB64 @@ -2247,7 +2247,7 @@ sub_807ECBC: @ 807ECBC ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r6, r0, 24 adds r0, r6, 0 @@ -2266,7 +2266,7 @@ _0807ED06: _0807ED0A: movs r1, 0x4 _0807ED0C: - ldr r0, _0807ED94 @ =gUnknown_2037078 + ldr r0, _0807ED94 @ =gPlayerAvatar mov r8, r0 ldrb r0, [r0, 0x5] lsls r4, r0, 3 @@ -2332,7 +2332,7 @@ _0807ED0C: pop {r0} bx r0 .align 2, 0 -_0807ED94: .4byte gUnknown_2037078 +_0807ED94: .4byte gPlayerAvatar _0807ED98: .4byte gMapObjects _0807ED9C: .4byte gSprites thumb_func_end sub_807ECBC @@ -2343,7 +2343,7 @@ sub_807EDA0: @ 807EDA0 adds r5, r0, 0 adds r6, r1, 0 ldr r4, [sp, 0x14] - ldr r0, _0807EDC8 @ =gUnknown_2037078 + ldr r0, _0807EDC8 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -2359,7 +2359,7 @@ sub_807EDA0: @ 807EDA0 movs r0, 0 b _0807EDF8 .align 2, 0 -_0807EDC8: .4byte gUnknown_2037078 +_0807EDC8: .4byte gPlayerAvatar _0807EDCC: .4byte gSprites _0807EDD0: ldrh r0, [r5] diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s index b72d8f776..56af66346 100644 --- a/asm/field_ground_effect.s +++ b/asm/field_ground_effect.s @@ -118,13 +118,13 @@ FieldObjectUpdateMetatileBehaviors: @ 8067C24 ldrsh r0, [r4, r1] movs r2, 0x16 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt strb r0, [r4, 0x1F] movs r1, 0x10 ldrsh r0, [r4, r1] movs r2, 0x12 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt strb r0, [r4, 0x1E] pop {r4} pop {r0} @@ -616,7 +616,7 @@ _08067FA0: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -632,7 +632,7 @@ _08067FA0: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -661,7 +661,7 @@ _08067FFC: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -678,7 +678,7 @@ _08067FFC: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -695,7 +695,7 @@ _08067FFC: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -712,7 +712,7 @@ _08067FFC: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -801,7 +801,7 @@ _08068114: asrs r0, 16 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 ldr r2, _08068144 @ =gUnknown_83A705C @@ -1139,7 +1139,7 @@ _08068378: thumb_func_start GroundEffect_SpawnOnTallGrass GroundEffect_SpawnOnTallGrass: @ 806837C push {lr} - ldr r3, _080683C0 @ =gUnknown_20386E0 + ldr r3, _080683C0 @ =gFieldEffectArguments movs r2, 0x10 ldrsh r1, [r0, r2] str r1, [r3] @@ -1172,14 +1172,14 @@ GroundEffect_SpawnOnTallGrass: @ 806837C pop {r0} bx r0 .align 2, 0 -_080683C0: .4byte gUnknown_20386E0 +_080683C0: .4byte gFieldEffectArguments _080683C4: .4byte gSaveBlock1Ptr thumb_func_end GroundEffect_SpawnOnTallGrass thumb_func_start GroundEffect_StepOnTallGrass GroundEffect_StepOnTallGrass: @ 80683C8 push {lr} - ldr r3, _0806840C @ =gUnknown_20386E0 + ldr r3, _0806840C @ =gFieldEffectArguments movs r2, 0x10 ldrsh r1, [r0, r2] str r1, [r3] @@ -1212,14 +1212,14 @@ GroundEffect_StepOnTallGrass: @ 80683C8 pop {r0} bx r0 .align 2, 0 -_0806840C: .4byte gUnknown_20386E0 +_0806840C: .4byte gFieldEffectArguments _08068410: .4byte gSaveBlock1Ptr thumb_func_end GroundEffect_StepOnTallGrass thumb_func_start GroundEffect_SpawnOnLongGrass GroundEffect_SpawnOnLongGrass: @ 8068414 push {lr} - ldr r3, _08068458 @ =gUnknown_20386E0 + ldr r3, _08068458 @ =gFieldEffectArguments movs r2, 0x10 ldrsh r1, [r0, r2] str r1, [r3] @@ -1252,14 +1252,14 @@ GroundEffect_SpawnOnLongGrass: @ 8068414 pop {r0} bx r0 .align 2, 0 -_08068458: .4byte gUnknown_20386E0 +_08068458: .4byte gFieldEffectArguments _0806845C: .4byte gSaveBlock1Ptr thumb_func_end GroundEffect_SpawnOnLongGrass thumb_func_start GroundEffect_StepOnLongGrass GroundEffect_StepOnLongGrass: @ 8068460 push {lr} - ldr r3, _080684A4 @ =gUnknown_20386E0 + ldr r3, _080684A4 @ =gFieldEffectArguments movs r2, 0x10 ldrsh r1, [r0, r2] str r1, [r3] @@ -1292,7 +1292,7 @@ GroundEffect_StepOnLongGrass: @ 8068460 pop {r0} bx r0 .align 2, 0 -_080684A4: .4byte gUnknown_20386E0 +_080684A4: .4byte gFieldEffectArguments _080684A8: .4byte gSaveBlock1Ptr thumb_func_end GroundEffect_StepOnLongGrass @@ -1386,7 +1386,7 @@ DoTracksGroundEffect_Footprints: @ 8068530 mov r0, sp movs r2, 0x4 bl memcpy - ldr r1, _0806857C @ =gUnknown_20386E0 + ldr r1, _0806857C @ =gFieldEffectArguments movs r2, 0x14 ldrsh r0, [r5, r2] str r0, [r1] @@ -1412,7 +1412,7 @@ DoTracksGroundEffect_Footprints: @ 8068530 bx r0 .align 2, 0 _08068578: .4byte gUnknown_83A70A8 -_0806857C: .4byte gUnknown_20386E0 +_0806857C: .4byte gFieldEffectArguments thumb_func_end DoTracksGroundEffect_Footprints thumb_func_start DoTracksGroundEffect_BikeTireTracks @@ -1423,7 +1423,7 @@ DoTracksGroundEffect_BikeTireTracks: @ 8068580 ldr r0, [r4, 0x14] cmp r1, r0 beq _080685C2 - ldr r2, _080685C8 @ =gUnknown_20386E0 + ldr r2, _080685C8 @ =gFieldEffectArguments movs r1, 0x14 ldrsh r0, [r4, r1] str r0, [r2] @@ -1454,7 +1454,7 @@ _080685C2: pop {r0} bx r0 .align 2, 0 -_080685C8: .4byte gUnknown_20386E0 +_080685C8: .4byte gFieldEffectArguments _080685CC: .4byte gUnknown_83A70AC thumb_func_end DoTracksGroundEffect_BikeTireTracks @@ -1492,7 +1492,7 @@ GroundEffect_JumpOnTallGrass: @ 80685FC sub sp, 0x4 adds r5, r0, 0 adds r6, r1, 0 - ldr r1, _08068650 @ =gUnknown_20386E0 + ldr r1, _08068650 @ =gFieldEffectArguments movs r2, 0x10 ldrsh r0, [r5, r2] str r0, [r1] @@ -1528,13 +1528,13 @@ _08068646: pop {r0} bx r0 .align 2, 0 -_08068650: .4byte gUnknown_20386E0 +_08068650: .4byte gFieldEffectArguments thumb_func_end GroundEffect_JumpOnTallGrass thumb_func_start GroundEffect_JumpOnLongGrass GroundEffect_JumpOnLongGrass: @ 8068654 push {lr} - ldr r2, _08068678 @ =gUnknown_20386E0 + ldr r2, _08068678 @ =gFieldEffectArguments movs r3, 0x10 ldrsh r1, [r0, r3] str r1, [r2] @@ -1551,13 +1551,13 @@ GroundEffect_JumpOnLongGrass: @ 8068654 pop {r0} bx r0 .align 2, 0 -_08068678: .4byte gUnknown_20386E0 +_08068678: .4byte gFieldEffectArguments thumb_func_end GroundEffect_JumpOnLongGrass thumb_func_start GroundEffect_JumpOnShallowWater GroundEffect_JumpOnShallowWater: @ 806867C push {r4,lr} - ldr r3, _080686A8 @ =gUnknown_20386E0 + ldr r3, _080686A8 @ =gFieldEffectArguments movs r4, 0x10 ldrsh r2, [r0, r4] str r2, [r3] @@ -1577,13 +1577,13 @@ GroundEffect_JumpOnShallowWater: @ 806867C pop {r0} bx r0 .align 2, 0 -_080686A8: .4byte gUnknown_20386E0 +_080686A8: .4byte gFieldEffectArguments thumb_func_end GroundEffect_JumpOnShallowWater thumb_func_start GroundEffect_JumpOnWater GroundEffect_JumpOnWater: @ 80686AC push {r4,lr} - ldr r3, _080686D8 @ =gUnknown_20386E0 + ldr r3, _080686D8 @ =gFieldEffectArguments movs r4, 0x10 ldrsh r2, [r0, r4] str r2, [r3] @@ -1603,13 +1603,13 @@ GroundEffect_JumpOnWater: @ 80686AC pop {r0} bx r0 .align 2, 0 -_080686D8: .4byte gUnknown_20386E0 +_080686D8: .4byte gFieldEffectArguments thumb_func_end GroundEffect_JumpOnWater thumb_func_start GroundEffect_JumpLandingDust GroundEffect_JumpLandingDust: @ 80686DC push {r4,lr} - ldr r3, _08068708 @ =gUnknown_20386E0 + ldr r3, _08068708 @ =gFieldEffectArguments movs r4, 0x10 ldrsh r2, [r0, r4] str r2, [r3] @@ -1629,7 +1629,7 @@ GroundEffect_JumpLandingDust: @ 80686DC pop {r0} bx r0 .align 2, 0 -_08068708: .4byte gUnknown_20386E0 +_08068708: .4byte gFieldEffectArguments thumb_func_end GroundEffect_JumpLandingDust thumb_func_start GroundEffect_ShortGrass @@ -1655,7 +1655,7 @@ GroundEffect_HotSprings: @ 806871C thumb_func_start GroundEffect_Seaweed GroundEffect_Seaweed: @ 806872C push {lr} - ldr r2, _08068748 @ =gUnknown_20386E0 + ldr r2, _08068748 @ =gFieldEffectArguments movs r3, 0x10 ldrsh r1, [r0, r3] str r1, [r2] @@ -1667,7 +1667,7 @@ GroundEffect_Seaweed: @ 806872C pop {r0} bx r0 .align 2, 0 -_08068748: .4byte gUnknown_20386E0 +_08068748: .4byte gFieldEffectArguments thumb_func_end GroundEffect_Seaweed thumb_func_start DoFlaggedGroundEffects diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 5afe13b87..308421098 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -1012,7 +1012,7 @@ unref_sub_808D958: @ 805E55C push {r4,lr} movs r4, 0 _0805E560: - ldr r0, _0805E588 @ =gUnknown_2037078 + ldr r0, _0805E588 @ =gPlayerAvatar ldrb r0, [r0, 0x5] cmp r4, r0 beq _0805E576 @@ -1032,7 +1032,7 @@ _0805E576: pop {r0} bx r0 .align 2, 0 -_0805E588: .4byte gUnknown_2037078 +_0805E588: .4byte gPlayerAvatar _0805E58C: .4byte gMapObjects thumb_func_end unref_sub_808D958 @@ -2418,7 +2418,7 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0805F058 @ =gUnknown_2037078 + ldr r5, _0805F058 @ =gPlayerAvatar strb r0, [r5, 0x5] strb r1, [r5, 0x4] ldr r1, _0805F05C @ =gMapObjects @@ -2436,7 +2436,7 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C pop {r0} bx r0 .align 2, 0 -_0805F058: .4byte gUnknown_2037078 +_0805F058: .4byte gPlayerAvatar _0805F05C: .4byte gMapObjects thumb_func_end SetPlayerAvatarFieldObjectIdAndObjectId @@ -10369,7 +10369,7 @@ sub_80628E4: @ 80628E4 adds r6, r0, 0 adds r7, r1, 0 ldr r2, _08062908 @ =gMapObjects - ldr r3, _0806290C @ =gUnknown_2037078 + ldr r3, _0806290C @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -10386,7 +10386,7 @@ _08062904: b _08062938 .align 2, 0 _08062908: .4byte gMapObjects -_0806290C: .4byte gUnknown_2037078 +_0806290C: .4byte gPlayerAvatar _08062910: ldr r5, _08062940 @ =gUnknown_83A6390 bl player_get_x22 @@ -10533,7 +10533,7 @@ sub_80629B8: @ 80629B8 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -10622,7 +10622,7 @@ sub_8062A70: @ 8062A70 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -10711,7 +10711,7 @@ sub_8062B28: @ 8062B28 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -10800,7 +10800,7 @@ sub_8062BE0: @ 8062BE0 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -10925,7 +10925,7 @@ sub_8062CE0: @ 8062CE0 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -11021,7 +11021,7 @@ oac_hopping: @ 8062D98 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -11100,7 +11100,7 @@ mss_08062EA4: @ 8062EA4 adds r6, r0, 0 adds r7, r1, 0 ldr r2, _08062EC8 @ =gMapObjects - ldr r3, _08062ECC @ =gUnknown_2037078 + ldr r3, _08062ECC @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -11117,7 +11117,7 @@ _08062EC4: b _08062EF8 .align 2, 0 _08062EC8: .4byte gMapObjects -_08062ECC: .4byte gUnknown_2037078 +_08062ECC: .4byte gPlayerAvatar _08062ED0: ldr r5, _08062F00 @ =gUnknown_83A6390 bl player_get_x22 @@ -11168,7 +11168,7 @@ FieldObjectCB_TreeDisguise: @ 8062F08 cmp r0, 0 bne _08062F50 _08062F30: - ldr r1, _08062F70 @ =gUnknown_20386E0 + ldr r1, _08062F70 @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -11198,7 +11198,7 @@ _08062F50: bx r0 .align 2, 0 _08062F6C: .4byte gMapObjects -_08062F70: .4byte gUnknown_20386E0 +_08062F70: .4byte gFieldEffectArguments _08062F74: .4byte sub_8062F78 thumb_func_end FieldObjectCB_TreeDisguise @@ -11234,7 +11234,7 @@ FieldObjectCB_MountainDisguise: @ 8062F84 cmp r0, 0 bne _08062FCC _08062FAC: - ldr r1, _08062FEC @ =gUnknown_20386E0 + ldr r1, _08062FEC @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -11264,7 +11264,7 @@ _08062FCC: bx r0 .align 2, 0 _08062FE8: .4byte gMapObjects -_08062FEC: .4byte gUnknown_20386E0 +_08062FEC: .4byte gFieldEffectArguments _08062FF0: .4byte sub_8062F78 thumb_func_end FieldObjectCB_MountainDisguise @@ -12593,7 +12593,7 @@ IsMetatileDirectionallyImpassable: @ 80638AC asrs r0, 16 lsls r1, r7, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 ldr r1, [r4] @@ -19462,7 +19462,7 @@ sub_8066910: @ 8066910 do_exclamation_mark_bubble_1: @ 8066920 push {r4,lr} adds r4, r1, 0 - ldr r1, _08066940 @ =gUnknown_20386E0 + ldr r1, _08066940 @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -19475,14 +19475,14 @@ do_exclamation_mark_bubble_1: @ 8066920 pop {r1} bx r1 .align 2, 0 -_08066940: .4byte gUnknown_20386E0 +_08066940: .4byte gFieldEffectArguments thumb_func_end do_exclamation_mark_bubble_1 thumb_func_start do_exclamation_mark_bubble_2 do_exclamation_mark_bubble_2: @ 8066944 push {r4,lr} adds r4, r1, 0 - ldr r1, _08066964 @ =gUnknown_20386E0 + ldr r1, _08066964 @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -19495,14 +19495,14 @@ do_exclamation_mark_bubble_2: @ 8066944 pop {r1} bx r1 .align 2, 0 -_08066964: .4byte gUnknown_20386E0 +_08066964: .4byte gFieldEffectArguments thumb_func_end do_exclamation_mark_bubble_2 thumb_func_start do_heart_bubble do_heart_bubble: @ 8066968 push {r4,lr} adds r4, r1, 0 - ldr r1, _08066988 @ =gUnknown_20386E0 + ldr r1, _08066988 @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -19515,14 +19515,14 @@ do_heart_bubble: @ 8066968 pop {r1} bx r1 .align 2, 0 -_08066988: .4byte gUnknown_20386E0 +_08066988: .4byte gFieldEffectArguments thumb_func_end do_heart_bubble thumb_func_start sub_806698C sub_806698C: @ 806698C push {r4,lr} adds r4, r1, 0 - ldr r1, _080669AC @ =gUnknown_20386E0 + ldr r1, _080669AC @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -19535,14 +19535,14 @@ sub_806698C: @ 806698C pop {r1} bx r1 .align 2, 0 -_080669AC: .4byte gUnknown_20386E0 +_080669AC: .4byte gFieldEffectArguments thumb_func_end sub_806698C thumb_func_start sub_80669B0 sub_80669B0: @ 80669B0 push {r4,lr} adds r4, r1, 0 - ldr r1, _080669D0 @ =gUnknown_20386E0 + ldr r1, _080669D0 @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -19555,7 +19555,7 @@ sub_80669B0: @ 80669B0 pop {r1} bx r1 .align 2, 0 -_080669D0: .4byte gUnknown_20386E0 +_080669D0: .4byte gFieldEffectArguments thumb_func_end sub_80669B0 thumb_func_start sub_80669D4 diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 24494ab59..aa68c6ef2 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -43,7 +43,7 @@ sub_805B3E0: @ 805B3E0 mov r8, r1 lsls r2, 16 lsrs r7, r2, 16 - ldr r4, _0805B454 @ =gUnknown_2037078 + ldr r4, _0805B454 @ =gPlayerAvatar ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -84,7 +84,7 @@ _0805B448: pop {r0} bx r0 .align 2, 0 -_0805B454: .4byte gUnknown_2037078 +_0805B454: .4byte gPlayerAvatar _0805B458: .4byte gMapObjects thumb_func_end sub_805B3E0 @@ -144,14 +144,14 @@ npc_clear_strange_bits: @ 805B4B0 adds r2, 0x2 ands r1, r2 strb r1, [r0, 0x1] - ldr r2, _0805B4D0 @ =gUnknown_2037078 + ldr r2, _0805B4D0 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x7F ands r0, r1 strb r0, [r2] bx lr .align 2, 0 -_0805B4D0: .4byte gUnknown_2037078 +_0805B4D0: .4byte gPlayerAvatar thumb_func_end npc_clear_strange_bits thumb_func_start MovePlayerAvatarUsingKeypadInput @@ -163,7 +163,7 @@ MovePlayerAvatarUsingKeypadInput: @ 805B4D4 lsrs r4, r1, 16 lsls r2, 16 lsrs r2, 16 - ldr r0, _0805B4F8 @ =gUnknown_2037078 + ldr r0, _0805B4F8 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x6 ands r0, r1 @@ -174,7 +174,7 @@ MovePlayerAvatarUsingKeypadInput: @ 805B4D4 bl sub_80BD09C b _0805B504 .align 2, 0 -_0805B4F8: .4byte gUnknown_2037078 +_0805B4F8: .4byte gPlayerAvatar _0805B4FC: adds r0, r3, 0 adds r1, r2, 0 @@ -188,7 +188,7 @@ _0805B504: thumb_func_start PlayerAllowForcedMovementIfMovingSameDirection PlayerAllowForcedMovementIfMovingSameDirection: @ 805B50C push {lr} - ldr r2, _0805B524 @ =gUnknown_2037078 + ldr r2, _0805B524 @ =gPlayerAvatar ldrb r0, [r2, 0x2] cmp r0, 0x2 bne _0805B51E @@ -200,13 +200,13 @@ _0805B51E: pop {r0} bx r0 .align 2, 0 -_0805B524: .4byte gUnknown_2037078 +_0805B524: .4byte gPlayerAvatar thumb_func_end PlayerAllowForcedMovementIfMovingSameDirection thumb_func_start sub_805B528 sub_805B528: @ 805B528 push {r4,r5,lr} - ldr r5, _0805B58C @ =gUnknown_2037078 + ldr r5, _0805B58C @ =gPlayerAvatar ldrb r1, [r5] movs r0, 0x40 ands r0, r1 @@ -252,7 +252,7 @@ _0805B586: movs r0, 0x1 b _0805B59A .align 2, 0 -_0805B58C: .4byte gUnknown_2037078 +_0805B58C: .4byte gPlayerAvatar _0805B590: .4byte gUnknown_2036E30 _0805B594: .4byte gMapObjects _0805B598: @@ -267,7 +267,7 @@ _0805B59A: sub_805B5A0: @ 805B5A0 push {r4-r7,lr} sub sp, 0x4 - ldr r3, _0805B5F4 @ =gUnknown_2037078 + ldr r3, _0805B5F4 @ =gPlayerAvatar ldrb r1, [r3] movs r0, 0x20 ands r0, r1 @@ -307,17 +307,17 @@ _0805B5CC: bne _0805B5CC b _0805B628 .align 2, 0 -_0805B5F4: .4byte gUnknown_2037078 +_0805B5F4: .4byte gPlayerAvatar _0805B5F8: .4byte gMapObjects _0805B5FC: .4byte gUnknown_835B764 _0805B600: - ldr r0, _0805B60C @ =gUnknown_2037078 + ldr r0, _0805B60C @ =gPlayerAvatar strh r7, [r0, 0x1C] adds r0, r2, 0x4 adds r0, r5, r0 b _0805B62E .align 2, 0 -_0805B60C: .4byte gUnknown_2037078 +_0805B60C: .4byte gPlayerAvatar _0805B610: movs r6, 0 ldr r0, _0805B640 @ =gUnknown_835B764 @@ -352,7 +352,7 @@ _0805B640: .4byte gUnknown_835B764 thumb_func_start ForcedMovement_None ForcedMovement_None: @ 805B644 push {r4,lr} - ldr r4, _0805B688 @ =gUnknown_2037078 + ldr r4, _0805B688 @ =gPlayerAvatar ldrb r1, [r4] movs r0, 0x40 ands r0, r1 @@ -385,7 +385,7 @@ _0805B67E: pop {r1} bx r1 .align 2, 0 -_0805B688: .4byte gUnknown_2037078 +_0805B688: .4byte gPlayerAvatar _0805B68C: .4byte gMapObjects thumb_func_end ForcedMovement_None @@ -399,7 +399,7 @@ DoForcedMovement: @ 805B690 mov r9, r1 lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _0805B6D0 @ =gUnknown_2037078 + ldr r6, _0805B6D0 @ =gPlayerAvatar adds r0, r5, 0 bl sub_805BB1C lsls r0, 24 @@ -421,7 +421,7 @@ DoForcedMovement: @ 805B690 movs r0, 0 b _0805B6F8 .align 2, 0 -_0805B6D0: .4byte gUnknown_2037078 +_0805B6D0: .4byte gPlayerAvatar _0805B6D4: cmp r7, 0x6 bne _0805B6DE @@ -456,7 +456,7 @@ _0805B6F8: DoForcedMovementInCurrentDirection: @ 805B708 push {lr} adds r1, r0, 0 - ldr r0, _0805B734 @ =gUnknown_2037078 + ldr r0, _0805B734 @ =gPlayerAvatar ldrb r2, [r0, 0x5] lsls r0, r2, 3 adds r0, r2 @@ -475,7 +475,7 @@ DoForcedMovementInCurrentDirection: @ 805B708 pop {r1} bx r1 .align 2, 0 -_0805B734: .4byte gUnknown_2037078 +_0805B734: .4byte gPlayerAvatar _0805B738: .4byte gMapObjects thumb_func_end DoForcedMovementInCurrentDirection @@ -678,7 +678,7 @@ ForcedMovement_Slide: @ 805B88C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0805B8BC @ =gUnknown_2037078 + ldr r2, _0805B8BC @ =gPlayerAvatar ldrb r3, [r2, 0x5] lsls r2, r3, 3 adds r2, r3 @@ -698,7 +698,7 @@ ForcedMovement_Slide: @ 805B88C pop {r1} bx r1 .align 2, 0 -_0805B8BC: .4byte gUnknown_2037078 +_0805B8BC: .4byte gPlayerAvatar _0805B8C0: .4byte gMapObjects thumb_func_end ForcedMovement_Slide @@ -809,28 +809,28 @@ CheckMovementInputNotOnBike: @ 805B96C lsrs r4, r0, 24 cmp r4, 0 bne _0805B984 - ldr r0, _0805B980 @ =gUnknown_2037078 + ldr r0, _0805B980 @ =gPlayerAvatar strb r4, [r0, 0x2] movs r0, 0 b _0805B9A6 .align 2, 0 -_0805B980: .4byte gUnknown_2037078 +_0805B980: .4byte gPlayerAvatar _0805B984: bl player_get_direction_upper_nybble lsls r0, 24 lsrs r0, 24 cmp r4, r0 beq _0805B9A0 - ldr r1, _0805B99C @ =gUnknown_2037078 + ldr r1, _0805B99C @ =gPlayerAvatar ldrb r0, [r1, 0x2] cmp r0, 0x2 beq _0805B9A0 movs r0, 0x1 b _0805B9A4 .align 2, 0 -_0805B99C: .4byte gUnknown_2037078 +_0805B99C: .4byte gPlayerAvatar _0805B9A0: - ldr r1, _0805B9AC @ =gUnknown_2037078 + ldr r1, _0805B9AC @ =gPlayerAvatar movs r0, 0x2 _0805B9A4: strb r0, [r1, 0x2] @@ -839,7 +839,7 @@ _0805B9A6: pop {r1} bx r1 .align 2, 0 -_0805B9AC: .4byte gUnknown_2037078 +_0805B9AC: .4byte gPlayerAvatar thumb_func_end CheckMovementInputNotOnBike thumb_func_start PlayerNotOnBikeNotMoving @@ -898,7 +898,7 @@ _0805BA06: bl PlayerNotOnBikeCollide b _0805BAA4 _0805BA18: - ldr r6, _0805BA2C @ =gUnknown_2037078 + ldr r6, _0805BA2C @ =gPlayerAvatar ldrb r1, [r6] movs r0, 0x8 ands r0, r1 @@ -908,7 +908,7 @@ _0805BA18: bl sub_805C11C b _0805BAA4 .align 2, 0 -_0805BA2C: .4byte gUnknown_2037078 +_0805BA2C: .4byte gPlayerAvatar _0805BA30: movs r0, 0x2 ands r5, r0 @@ -943,14 +943,14 @@ _0805BA74: adds r0, r4, 0 bl sub_805C17C _0805BA7A: - ldr r2, _0805BA88 @ =gUnknown_2037078 + ldr r2, _0805BA88 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x80 orrs r0, r1 strb r0, [r2] b _0805BAA4 .align 2, 0 -_0805BA88: .4byte gUnknown_2037078 +_0805BA88: .4byte gPlayerAvatar _0805BA8C: adds r0, r4, 0 bl sub_805BAAC @@ -974,7 +974,7 @@ sub_805BAAC: @ 805BAAC sub sp, 0x4 lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _0805BAE4 @ =gUnknown_2037078 + ldr r0, _0805BAE4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -999,7 +999,7 @@ sub_805BAAC: @ 805BAAC asrs r1, 16 b _0805BB00 .align 2, 0 -_0805BAE4: .4byte gUnknown_2037078 +_0805BAE4: .4byte gPlayerAvatar _0805BAE8: .4byte gMapObjects _0805BAEC: movs r0, 0x1 @@ -1012,7 +1012,7 @@ _0805BAEC: movs r2, 0 ldrsh r1, [r4, r2] _0805BB00: - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsRockStairs @@ -1034,7 +1034,7 @@ sub_805BB1C: @ 805BB1C sub sp, 0x8 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0805BB94 @ =gUnknown_2037078 + ldr r0, _0805BB94 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1052,7 +1052,7 @@ sub_805BB1C: @ 805BB1C ldrsh r0, [r0, r2] lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r0, 16 adds r1, r6, 0 @@ -1069,7 +1069,7 @@ sub_805BB1C: @ 805BB1C ldrsh r0, [r0, r3] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 add r1, sp, 0x4 @@ -1085,7 +1085,7 @@ sub_805BB1C: @ 805BB1C lsrs r0, 24 b _0805BB9E .align 2, 0 -_0805BB94: .4byte gUnknown_2037078 +_0805BB94: .4byte gPlayerAvatar _0805BB98: .4byte gMapObjects _0805BB9C: movs r0, 0x8 @@ -1200,7 +1200,7 @@ sub_805BC60: @ 805BC60 lsrs r4, r1, 16 lsls r2, 24 lsrs r6, r2, 24 - ldr r0, _0805BCB8 @ =gUnknown_2037078 + ldr r0, _0805BCB8 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x8 ands r0, r1 @@ -1233,7 +1233,7 @@ sub_805BC60: @ 805BC60 movs r0, 0x1 b _0805BCC2 .align 2, 0 -_0805BCB8: .4byte gUnknown_2037078 +_0805BCB8: .4byte gPlayerAvatar _0805BCBC: .4byte gUnknown_835B820 _0805BCC0: movs r0, 0 @@ -1313,7 +1313,7 @@ sub_805BCEC: @ 805BCEC ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r0, 0x66 beq _0805BD8A mov r0, sp @@ -1332,7 +1332,7 @@ sub_805BCEC: @ 805BCEC ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsCaveDoor @@ -1399,7 +1399,7 @@ SetPlayerAvatarTransitionFlags: @ 805BDEC push {lr} lsls r0, 16 lsrs r0, 16 - ldr r2, _0805BE04 @ =gUnknown_2037078 + ldr r2, _0805BE04 @ =gPlayerAvatar ldrb r1, [r2, 0x1] orrs r0, r1 strb r0, [r2, 0x1] @@ -1407,13 +1407,13 @@ SetPlayerAvatarTransitionFlags: @ 805BDEC pop {r0} bx r0 .align 2, 0 -_0805BE04: .4byte gUnknown_2037078 +_0805BE04: .4byte gPlayerAvatar thumb_func_end SetPlayerAvatarTransitionFlags thumb_func_start DoPlayerAvatarTransition DoPlayerAvatarTransition: @ 805BE08 push {r4,r5,lr} - ldr r0, _0805BE50 @ =gUnknown_2037078 + ldr r0, _0805BE50 @ =gPlayerAvatar ldrb r4, [r0, 0x1] cmp r4, 0 beq _0805BE48 @@ -1426,7 +1426,7 @@ _0805BE14: ldr r0, _0805BE54 @ =gUnknown_835B844 lsls r2, r5, 2 adds r2, r0 - ldr r0, _0805BE50 @ =gUnknown_2037078 + ldr r0, _0805BE50 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1442,7 +1442,7 @@ _0805BE36: lsrs r4, 1 cmp r5, 0x7 bls _0805BE14 - ldr r1, _0805BE50 @ =gUnknown_2037078 + ldr r1, _0805BE50 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x1] _0805BE48: @@ -1450,7 +1450,7 @@ _0805BE48: pop {r0} bx r0 .align 2, 0 -_0805BE50: .4byte gUnknown_2037078 +_0805BE50: .4byte gPlayerAvatar _0805BE54: .4byte gUnknown_835B844 _0805BE58: .4byte gMapObjects thumb_func_end DoPlayerAvatarTransition @@ -1503,20 +1503,20 @@ nullsub_23: @ 805BEA4 thumb_func_start PlayerAvatarTransition_ReturnToField PlayerAvatarTransition_ReturnToField: @ 805BEA8 - ldr r2, _0805BEB4 @ =gUnknown_2037078 + ldr r2, _0805BEB4 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x20 orrs r0, r1 strb r0, [r2] bx lr .align 2, 0 -_0805BEB4: .4byte gUnknown_2037078 +_0805BEB4: .4byte gPlayerAvatar thumb_func_end PlayerAvatarTransition_ReturnToField thumb_func_start sub_805BEB8 sub_805BEB8: @ 805BEB8 push {r4,lr} - ldr r4, _0805BEE4 @ =gUnknown_2037078 + ldr r4, _0805BEE4 @ =gPlayerAvatar movs r0, 0 strb r0, [r4, 0x3] bl PlayerIsAnimActive @@ -1534,7 +1534,7 @@ sub_805BEB8: @ 805BEB8 movs r0, 0x1 b _0805BEF4 .align 2, 0 -_0805BEE4: .4byte gUnknown_2037078 +_0805BEE4: .4byte gPlayerAvatar _0805BEE8: bl sub_805BF58 lsls r0, 24 @@ -1553,7 +1553,7 @@ _0805BEF6: player_is_anim_in_certain_ranges: @ 805BEFC push {lr} ldr r2, _0805BF48 @ =gMapObjects - ldr r0, _0805BF4C @ =gUnknown_2037078 + ldr r0, _0805BF4C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1591,7 +1591,7 @@ _0805BF42: b _0805BF52 .align 2, 0 _0805BF48: .4byte gMapObjects -_0805BF4C: .4byte gUnknown_2037078 +_0805BF4C: .4byte gPlayerAvatar _0805BF50: movs r0, 0 _0805BF52: @@ -1606,14 +1606,14 @@ sub_805BF58: @ 805BF58 lsls r0, 24 cmp r0, 0 beq _0805BF74 - ldr r0, _0805BF70 @ =gUnknown_2037078 + ldr r0, _0805BF70 @ =gPlayerAvatar ldrb r0, [r0, 0x2] cmp r0, 0x1 beq _0805BF74 movs r0, 0x1 b _0805BF76 .align 2, 0 -_0805BF70: .4byte gUnknown_2037078 +_0805BF70: .4byte gPlayerAvatar _0805BF74: movs r0, 0 _0805BF76: @@ -1624,7 +1624,7 @@ _0805BF76: thumb_func_start PlayerIsAnimActive PlayerIsAnimActive: @ 805BF7C push {lr} - ldr r0, _0805BF98 @ =gUnknown_2037078 + ldr r0, _0805BF98 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1637,14 +1637,14 @@ PlayerIsAnimActive: @ 805BF7C pop {r1} bx r1 .align 2, 0 -_0805BF98: .4byte gUnknown_2037078 +_0805BF98: .4byte gPlayerAvatar _0805BF9C: .4byte gMapObjects thumb_func_end PlayerIsAnimActive thumb_func_start PlayerCheckIfAnimFinishedOrInactive PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0 push {lr} - ldr r0, _0805BFBC @ =gUnknown_2037078 + ldr r0, _0805BFBC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1657,14 +1657,14 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0 pop {r1} bx r1 .align 2, 0 -_0805BFBC: .4byte gUnknown_2037078 +_0805BFBC: .4byte gPlayerAvatar _0805BFC0: .4byte gMapObjects thumb_func_end PlayerCheckIfAnimFinishedOrInactive thumb_func_start player_set_x22 player_set_x22: @ 805BFC4 ldr r3, _0805BFD8 @ =gMapObjects - ldr r1, _0805BFDC @ =gUnknown_2037078 + ldr r1, _0805BFDC @ =gPlayerAvatar ldrb r2, [r1, 0x5] lsls r1, r2, 3 adds r1, r2 @@ -1675,13 +1675,13 @@ player_set_x22: @ 805BFC4 bx lr .align 2, 0 _0805BFD8: .4byte gMapObjects -_0805BFDC: .4byte gUnknown_2037078 +_0805BFDC: .4byte gPlayerAvatar thumb_func_end player_set_x22 thumb_func_start player_get_x22 player_get_x22: @ 805BFE0 ldr r2, _0805BFF4 @ =gMapObjects - ldr r0, _0805BFF8 @ =gUnknown_2037078 + ldr r0, _0805BFF8 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1692,7 +1692,7 @@ player_get_x22: @ 805BFE0 bx lr .align 2, 0 _0805BFF4: .4byte gMapObjects -_0805BFF8: .4byte gUnknown_2037078 +_0805BFF8: .4byte gPlayerAvatar thumb_func_end player_get_x22 thumb_func_start sub_805BFFC @@ -1701,7 +1701,7 @@ sub_805BFFC: @ 805BFFC adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _0805C01C @ =gUnknown_2037078 + ldr r0, _0805C01C @ =gPlayerAvatar ldrb r2, [r0, 0x5] lsls r0, r2, 3 adds r0, r2 @@ -1712,7 +1712,7 @@ sub_805BFFC: @ 805BFFC pop {r0} bx r0 .align 2, 0 -_0805C01C: .4byte gUnknown_2037078 +_0805C01C: .4byte gPlayerAvatar _0805C020: .4byte gMapObjects thumb_func_end sub_805BFFC @@ -1729,7 +1729,7 @@ sub_805C024: @ 805C024 bne _0805C05E adds r0, r4, 0 bl player_set_x22 - ldr r0, _0805C064 @ =gUnknown_2037078 + ldr r0, _0805C064 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1748,7 +1748,7 @@ _0805C05E: pop {r0} bx r0 .align 2, 0 -_0805C064: .4byte gUnknown_2037078 +_0805C064: .4byte gPlayerAvatar _0805C068: .4byte gMapObjects thumb_func_end sub_805C024 @@ -1757,7 +1757,7 @@ sub_805C06C: @ 805C06C push {r4,lr} lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _0805C09C @ =gUnknown_2037078 + ldr r0, _0805C09C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1777,7 +1777,7 @@ _0805C094: pop {r0} bx r0 .align 2, 0 -_0805C09C: .4byte gUnknown_2037078 +_0805C09C: .4byte gPlayerAvatar _0805C0A0: .4byte gMapObjects thumb_func_end sub_805C06C @@ -2045,7 +2045,7 @@ sub_805C260: @ 805C260 thumb_func_start sub_805C270 sub_805C270: @ 805C270 push {r4,lr} - ldr r4, _0805C2AC @ =gUnknown_2037078 + ldr r4, _0805C2AC @ =gPlayerAvatar ldrb r0, [r4, 0x3] cmp r0, 0x2 beq _0805C27E @@ -2074,7 +2074,7 @@ _0805C2A6: pop {r0} bx r0 .align 2, 0 -_0805C2AC: .4byte gUnknown_2037078 +_0805C2AC: .4byte gPlayerAvatar _0805C2B0: .4byte gMapObjects thumb_func_end sub_805C270 @@ -2302,7 +2302,7 @@ sub_805C438: @ 805C438 lsrs r5, r0, 24 adds r6, r5, 0 ldr r2, _0805C4E8 @ =gMapObjects - ldr r0, _0805C4EC @ =gUnknown_2037078 + ldr r0, _0805C4EC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2361,7 +2361,7 @@ _0805C4A0: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 @@ -2379,7 +2379,7 @@ _0805C4DE: bx r0 .align 2, 0 _0805C4E8: .4byte gMapObjects -_0805C4EC: .4byte gUnknown_2037078 +_0805C4EC: .4byte gPlayerAvatar _0805C4F0: .4byte gUnknown_835B864 thumb_func_end sub_805C438 @@ -2389,7 +2389,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4 adds r4, r0, 0 adds r5, r1, 0 ldr r3, _0805C530 @ =gMapObjects - ldr r2, _0805C534 @ =gUnknown_2037078 + ldr r2, _0805C534 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2415,14 +2415,14 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4 bx r0 .align 2, 0 _0805C530: .4byte gMapObjects -_0805C534: .4byte gUnknown_2037078 +_0805C534: .4byte gPlayerAvatar thumb_func_end GetXYCoordsOneStepInFrontOfPlayer thumb_func_start PlayerGetDestCoords PlayerGetDestCoords: @ 805C538 push {r4,r5,lr} ldr r5, _0805C560 @ =gMapObjects - ldr r4, _0805C564 @ =gUnknown_2037078 + ldr r4, _0805C564 @ =gPlayerAvatar ldrb r3, [r4, 0x5] lsls r2, r3, 3 adds r2, r3 @@ -2442,7 +2442,7 @@ PlayerGetDestCoords: @ 805C538 bx r0 .align 2, 0 _0805C560: .4byte gMapObjects -_0805C564: .4byte gUnknown_2037078 +_0805C564: .4byte gPlayerAvatar thumb_func_end PlayerGetDestCoords thumb_func_start plaer_get_pos_including_state_based_drift @@ -2450,7 +2450,7 @@ plaer_get_pos_including_state_based_drift: @ 805C568 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _0805C5BC @ =gUnknown_2037078 + ldr r0, _0805C5BC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2492,7 +2492,7 @@ _0805C5B0: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0805C5BC: .4byte gUnknown_2037078 +_0805C5BC: .4byte gPlayerAvatar _0805C5C0: .4byte gMapObjects _0805C5C4: .4byte gSprites _0805C5C8: .4byte _0805C5CC @@ -2585,7 +2585,7 @@ _0805C6BC: thumb_func_start player_get_direction_lower_nybble player_get_direction_lower_nybble: @ 805C6C4 ldr r2, _0805C6DC @ =gMapObjects - ldr r0, _0805C6E0 @ =gUnknown_2037078 + ldr r0, _0805C6E0 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2597,13 +2597,13 @@ player_get_direction_lower_nybble: @ 805C6C4 bx lr .align 2, 0 _0805C6DC: .4byte gMapObjects -_0805C6E0: .4byte gUnknown_2037078 +_0805C6E0: .4byte gPlayerAvatar thumb_func_end player_get_direction_lower_nybble thumb_func_start player_get_direction_upper_nybble player_get_direction_upper_nybble: @ 805C6E4 ldr r2, _0805C6F8 @ =gMapObjects - ldr r0, _0805C6FC @ =gUnknown_2037078 + ldr r0, _0805C6FC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2614,13 +2614,13 @@ player_get_direction_upper_nybble: @ 805C6E4 bx lr .align 2, 0 _0805C6F8: .4byte gMapObjects -_0805C6FC: .4byte gUnknown_2037078 +_0805C6FC: .4byte gPlayerAvatar thumb_func_end player_get_direction_upper_nybble thumb_func_start PlayerGetZCoord PlayerGetZCoord: @ 805C700 ldr r2, _0805C714 @ =gMapObjects - ldr r0, _0805C718 @ =gUnknown_2037078 + ldr r0, _0805C718 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2631,7 +2631,7 @@ PlayerGetZCoord: @ 805C700 bx lr .align 2, 0 _0805C714: .4byte gMapObjects -_0805C718: .4byte gUnknown_2037078 +_0805C718: .4byte gPlayerAvatar thumb_func_end PlayerGetZCoord thumb_func_start sub_805C71C @@ -2639,7 +2639,7 @@ sub_805C71C: @ 805C71C push {lr} adds r3, r0, 0 adds r2, r1, 0 - ldr r0, _0805C744 @ =gUnknown_2037078 + ldr r0, _0805C744 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2655,37 +2655,37 @@ sub_805C71C: @ 805C71C pop {r0} bx r0 .align 2, 0 -_0805C744: .4byte gUnknown_2037078 +_0805C744: .4byte gPlayerAvatar _0805C748: .4byte gMapObjects thumb_func_end sub_805C71C thumb_func_start TestPlayerAvatarFlags TestPlayerAvatarFlags: @ 805C74C - ldr r1, _0805C758 @ =gUnknown_2037078 + ldr r1, _0805C758 @ =gPlayerAvatar ldrb r1, [r1] ands r1, r0 adds r0, r1, 0 bx lr .align 2, 0 -_0805C758: .4byte gUnknown_2037078 +_0805C758: .4byte gPlayerAvatar thumb_func_end TestPlayerAvatarFlags thumb_func_start sub_805C75C sub_805C75C: @ 805C75C - ldr r0, _0805C764 @ =gUnknown_2037078 + ldr r0, _0805C764 @ =gPlayerAvatar ldrb r0, [r0] bx lr .align 2, 0 -_0805C764: .4byte gUnknown_2037078 +_0805C764: .4byte gPlayerAvatar thumb_func_end sub_805C75C thumb_func_start GetPlayerAvatarObjectId GetPlayerAvatarObjectId: @ 805C768 - ldr r0, _0805C770 @ =gUnknown_2037078 + ldr r0, _0805C770 @ =gPlayerAvatar ldrb r0, [r0, 0x4] bx lr .align 2, 0 -_0805C770: .4byte gUnknown_2037078 +_0805C770: .4byte gPlayerAvatar thumb_func_end GetPlayerAvatarObjectId thumb_func_start sub_805C774 @@ -2699,7 +2699,7 @@ sub_805C774: @ 805C774 thumb_func_start sub_805C780 sub_805C780: @ 805C780 push {r4,lr} - ldr r0, _0805C7C0 @ =gUnknown_2037078 + ldr r0, _0805C7C0 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -2726,7 +2726,7 @@ _0805C7B8: pop {r0} bx r0 .align 2, 0 -_0805C7C0: .4byte gUnknown_2037078 +_0805C7C0: .4byte gPlayerAvatar _0805C7C4: .4byte gMapObjects thumb_func_end sub_805C780 @@ -2776,7 +2776,7 @@ sub_805C808: @ 805C808 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0805C820 @ =gUnknown_2037078 + ldr r1, _0805C820 @ =gPlayerAvatar ldrb r1, [r1, 0x7] bl GetPlayerAvatarGraphicsIdByStateIdAndGender lsls r0, 24 @@ -2784,7 +2784,7 @@ sub_805C808: @ 805C808 pop {r1} bx r1 .align 2, 0 -_0805C820: .4byte gUnknown_2037078 +_0805C820: .4byte gPlayerAvatar thumb_func_end sub_805C808 thumb_func_start sub_805C824 @@ -2877,7 +2877,7 @@ _0805C8AC: IsPlayerFacingSurfableFishableWater: @ 805C8B0 push {r4,r5,lr} sub sp, 0x4 - ldr r0, _0805C924 @ =gUnknown_2037078 + ldr r0, _0805C924 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -2929,7 +2929,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0 movs r0, 0x1 b _0805C92E .align 2, 0 -_0805C924: .4byte gUnknown_2037078 +_0805C924: .4byte gPlayerAvatar _0805C928: .4byte gMapObjects _0805C92C: movs r0, 0 @@ -2962,21 +2962,21 @@ sub_805C938: @ 805C938 thumb_func_start ClearPlayerAvatarInfo ClearPlayerAvatarInfo: @ 805C95C push {lr} - ldr r0, _0805C96C @ =gUnknown_2037078 + ldr r0, _0805C96C @ =gPlayerAvatar movs r1, 0 movs r2, 0x20 bl memset pop {r0} bx r0 .align 2, 0 -_0805C96C: .4byte gUnknown_2037078 +_0805C96C: .4byte gPlayerAvatar thumb_func_end ClearPlayerAvatarInfo thumb_func_start SetPlayerAvatarStateMask SetPlayerAvatarStateMask: @ 805C970 lsls r0, 24 lsrs r0, 24 - ldr r3, _0805C984 @ =gUnknown_2037078 + ldr r3, _0805C984 @ =gPlayerAvatar ldrb r2, [r3] movs r1, 0xE0 ands r1, r2 @@ -2984,7 +2984,7 @@ SetPlayerAvatarStateMask: @ 805C970 strb r0, [r3] bx lr .align 2, 0 -_0805C984: .4byte gUnknown_2037078 +_0805C984: .4byte gPlayerAvatar thumb_func_end SetPlayerAvatarStateMask thumb_func_start GetPlayerAvatarStateTransitionByGraphicsId @@ -3028,7 +3028,7 @@ _0805C9C0: thumb_func_start GetPlayerAvatarGraphicsIdByCurrentState GetPlayerAvatarGraphicsIdByCurrentState: @ 805C9C8 push {r4-r6,lr} - ldr r0, _0805C9F0 @ =gUnknown_2037078 + ldr r0, _0805C9F0 @ =gPlayerAvatar ldrb r5, [r0] movs r2, 0 ldr r3, _0805C9F4 @ =gUnknown_835B882 @@ -3049,7 +3049,7 @@ _0805C9DC: ldrb r0, [r0] b _0805CA04 .align 2, 0 -_0805C9F0: .4byte gUnknown_2037078 +_0805C9F0: .4byte gPlayerAvatar _0805C9F4: .4byte gUnknown_835B882 _0805C9F8: adds r0, r2, 0x1 @@ -3072,7 +3072,7 @@ SetPlayerAvatarExtraStateTransition: @ 805CA0C lsrs r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r5, _0805CA38 @ =gUnknown_2037078 + ldr r5, _0805CA38 @ =gPlayerAvatar ldrb r1, [r5, 0x7] bl GetPlayerAvatarStateTransitionByGraphicsId lsls r0, 24 @@ -3086,7 +3086,7 @@ SetPlayerAvatarExtraStateTransition: @ 805CA0C pop {r0} bx r0 .align 2, 0 -_0805CA38: .4byte gUnknown_2037078 +_0805CA38: .4byte gPlayerAvatar thumb_func_end SetPlayerAvatarExtraStateTransition thumb_func_start InitPlayerAvatar @@ -3164,7 +3164,7 @@ InitPlayerAvatar: @ 805CA3C mov r1, r9 bl FieldObjectTurn bl ClearPlayerAvatarInfo - ldr r0, _0805CB00 @ =gUnknown_2037078 + ldr r0, _0805CB00 @ =gPlayerAvatar strb r6, [r0, 0x2] strb r6, [r0, 0x3] strb r5, [r0, 0x5] @@ -3183,7 +3183,7 @@ InitPlayerAvatar: @ 805CA3C bx r0 .align 2, 0 _0805CAFC: .4byte gMapObjects -_0805CB00: .4byte gUnknown_2037078 +_0805CB00: .4byte gPlayerAvatar thumb_func_end InitPlayerAvatar thumb_func_start sub_805CB04 @@ -3192,7 +3192,7 @@ sub_805CB04: @ 805CB04 lsls r0, 24 lsrs r4, r0, 24 ldr r6, _0805CB64 @ =gMapObjects - ldr r5, _0805CB68 @ =gUnknown_2037078 + ldr r5, _0805CB68 @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3237,14 +3237,14 @@ _0805CB5C: bx r0 .align 2, 0 _0805CB64: .4byte gMapObjects -_0805CB68: .4byte gUnknown_2037078 +_0805CB68: .4byte gPlayerAvatar _0805CB6C: .4byte gSprites thumb_func_end sub_805CB04 thumb_func_start sub_805CB70 sub_805CB70: @ 805CB70 push {r4,r5,lr} - ldr r5, _0805CBAC @ =gUnknown_2037078 + ldr r5, _0805CBAC @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -3270,7 +3270,7 @@ sub_805CB70: @ 805CB70 pop {r0} bx r0 .align 2, 0 -_0805CBAC: .4byte gUnknown_2037078 +_0805CBAC: .4byte gPlayerAvatar _0805CBB0: .4byte gMapObjects _0805CBB4: .4byte gSprites thumb_func_end sub_805CB70 @@ -3278,7 +3278,7 @@ _0805CBB4: .4byte gSprites thumb_func_start sub_805CBB8 sub_805CBB8: @ 805CBB8 push {lr} - ldr r2, _0805CBD4 @ =gUnknown_2037078 + ldr r2, _0805CBD4 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x6 ands r0, r1 @@ -3290,7 +3290,7 @@ sub_805CBB8: @ 805CBB8 lsrs r0, 24 b _0805CBE0 .align 2, 0 -_0805CBD4: .4byte gUnknown_2037078 +_0805CBD4: .4byte gPlayerAvatar _0805CBD8: ldr r0, _0805CBE4 @ =gUnknown_835B88E ldrb r1, [r2, 0x7] @@ -3306,7 +3306,7 @@ _0805CBE4: .4byte gUnknown_835B88E thumb_func_start sub_805CBE8 sub_805CBE8: @ 805CBE8 push {r4,r5,lr} - ldr r5, _0805CC20 @ =gUnknown_2037078 + ldr r5, _0805CC20 @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -3331,7 +3331,7 @@ sub_805CBE8: @ 805CBE8 pop {r0} bx r0 .align 2, 0 -_0805CC20: .4byte gUnknown_2037078 +_0805CC20: .4byte gPlayerAvatar _0805CC24: .4byte gMapObjects _0805CC28: .4byte gSprites thumb_func_end sub_805CBE8 @@ -3478,7 +3478,7 @@ _0805CD20: ldrsh r3, [r4, r0] lsls r3, 2 adds r3, r6 - ldr r0, _0805CD60 @ =gUnknown_2037078 + ldr r0, _0805CD60 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3503,7 +3503,7 @@ _0805CD20: _0805CD54: .4byte gUnknown_835B8A0 _0805CD58: .4byte gTasks _0805CD5C: .4byte gMapObjects -_0805CD60: .4byte gUnknown_2037078 +_0805CD60: .4byte gPlayerAvatar thumb_func_end taskFF_bump_boulder thumb_func_start sub_805CD64 @@ -3511,7 +3511,7 @@ sub_805CD64: @ 805CD64 push {r4,lr} adds r4, r0, 0 bl ScriptContext2_Enable - ldr r1, _0805CD80 @ =gUnknown_2037078 + ldr r1, _0805CD80 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -3522,7 +3522,7 @@ sub_805CD64: @ 805CD64 pop {r1} bx r1 .align 2, 0 -_0805CD80: .4byte gUnknown_2037078 +_0805CD80: .4byte gPlayerAvatar thumb_func_end sub_805CD64 thumb_func_start sub_805CD84 @@ -3559,7 +3559,7 @@ sub_805CD84: @ 805CD84 lsrs r1, 24 adds r0, r4, 0 bl sub_805C0A4 - ldr r2, _0805CE18 @ =gUnknown_20386E0 + ldr r2, _0805CE18 @ =gFieldEffectArguments movs r1, 0x10 ldrsh r0, [r4, r1] str r0, [r2] @@ -3592,7 +3592,7 @@ _0805CE0E: pop {r1} bx r1 .align 2, 0 -_0805CE18: .4byte gUnknown_20386E0 +_0805CE18: .4byte gFieldEffectArguments _0805CE1C: .4byte gSprites thumb_func_end sub_805CD84 @@ -3620,7 +3620,7 @@ sub_805CE20: @ 805CE20 ldrh r0, [r4, 0x10] ldrh r1, [r4, 0x12] bl sub_806DE70 - ldr r1, _0805CE78 @ =gUnknown_2037078 + ldr r1, _0805CE78 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] bl ScriptContext2_Disable @@ -3635,7 +3635,7 @@ _0805CE70: pop {r1} bx r1 .align 2, 0 -_0805CE78: .4byte gUnknown_2037078 +_0805CE78: .4byte gPlayerAvatar _0805CE7C: .4byte taskFF_bump_boulder thumb_func_end sub_805CE20 @@ -3672,7 +3672,7 @@ _0805CEB2: ldrsh r2, [r4, r0] lsls r2, 2 adds r2, r5 - ldr r0, _0805CEE4 @ =gUnknown_2037078 + ldr r0, _0805CEE4 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3691,7 +3691,7 @@ _0805CEB2: .align 2, 0 _0805CEDC: .4byte gUnknown_835B8AC _0805CEE0: .4byte gTasks -_0805CEE4: .4byte gUnknown_2037078 +_0805CEE4: .4byte gPlayerAvatar _0805CEE8: .4byte gMapObjects thumb_func_end sub_805CEA0 @@ -3700,7 +3700,7 @@ PlayerAvatar_DoSecretBaseMatJump: @ 805CEEC push {r4-r6,lr} adds r6, r0, 0 adds r4, r1, 0 - ldr r5, _0805CF50 @ =gUnknown_2037078 + ldr r5, _0805CF50 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r5, 0x6] adds r0, r4, 0 @@ -3743,7 +3743,7 @@ _0805CF48: pop {r1} bx r1 .align 2, 0 -_0805CF50: .4byte gUnknown_2037078 +_0805CF50: .4byte gPlayerAvatar _0805CF54: .4byte sub_805CEA0 thumb_func_end PlayerAvatar_DoSecretBaseMatJump @@ -3780,7 +3780,7 @@ _0805CF8A: ldrsh r2, [r4, r0] lsls r2, 2 adds r2, r5 - ldr r0, _0805CFBC @ =gUnknown_2037078 + ldr r0, _0805CFBC @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3799,7 +3799,7 @@ _0805CF8A: .align 2, 0 _0805CFB4: .4byte gUnknown_835B8B0 _0805CFB8: .4byte gTasks -_0805CFBC: .4byte gUnknown_2037078 +_0805CFBC: .4byte gPlayerAvatar _0805CFC0: .4byte gMapObjects thumb_func_end sub_805CF78 @@ -3812,7 +3812,7 @@ sub_805CFC4: @ 805CFC4 ldrb r1, [r1, 0x18] lsrs r1, 4 strh r1, [r0, 0xA] - ldr r1, _0805CFE8 @ =gUnknown_2037078 + ldr r1, _0805CFE8 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] bl ScriptContext2_Enable @@ -3822,7 +3822,7 @@ sub_805CFC4: @ 805CFC4 pop {r1} bx r1 .align 2, 0 -_0805CFE8: .4byte gUnknown_2037078 +_0805CFE8: .4byte gPlayerAvatar thumb_func_end sub_805CFC4 thumb_func_start sub_805CFEC @@ -3939,7 +3939,7 @@ sub_805D0A4: @ 805D0A4 adds r0, r5, 0 bl sub_805C06C bl ScriptContext2_Disable - ldr r1, _0805D0F0 @ =gUnknown_2037078 + ldr r1, _0805D0F0 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] ldr r0, _0805D0F4 @ =sub_805CF78 @@ -3953,7 +3953,7 @@ _0805D0E8: pop {r1} bx r1 .align 2, 0 -_0805D0F0: .4byte gUnknown_2037078 +_0805D0F0: .4byte gPlayerAvatar _0805D0F4: .4byte sub_805CF78 thumb_func_end sub_805D0A4 @@ -3967,7 +3967,7 @@ sub_805D0F8: @ 805D0F8 bl player_bitmagic bl sav1_reset_battle_music_maybe bl Overworld_ChangeMusicToDefault - ldr r2, _0805D148 @ =gUnknown_2037078 + ldr r2, _0805D148 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0xF7 ands r0, r1 @@ -3993,7 +3993,7 @@ sub_805D0F8: @ 805D0F8 pop {r0} bx r0 .align 2, 0 -_0805D148: .4byte gUnknown_2037078 +_0805D148: .4byte gPlayerAvatar _0805D14C: .4byte taskFF_0805D1D4 _0805D150: .4byte gTasks thumb_func_end sub_805D0F8 @@ -4006,7 +4006,7 @@ sub_805D154: @ 805D154 lsrs r4, 24 bl ScriptContext2_Enable bl player_bitmagic - ldr r2, _0805D19C @ =gUnknown_2037078 + ldr r2, _0805D19C @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0xF7 ands r0, r1 @@ -4032,7 +4032,7 @@ sub_805D154: @ 805D154 pop {r0} bx r0 .align 2, 0 -_0805D19C: .4byte gUnknown_2037078 +_0805D19C: .4byte gPlayerAvatar _0805D1A0: .4byte taskFF_0805D1D4 _0805D1A4: .4byte gTasks thumb_func_end sub_805D154 @@ -4065,7 +4065,7 @@ taskFF_0805D1D4: @ 805D1D4 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0805D230 @ =gUnknown_2037078 + ldr r0, _0805D230 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4105,7 +4105,7 @@ _0805D228: pop {r0} bx r0 .align 2, 0 -_0805D230: .4byte gUnknown_2037078 +_0805D230: .4byte gPlayerAvatar _0805D234: .4byte gMapObjects _0805D238: .4byte gTasks _0805D23C: .4byte sub_805D240 @@ -4116,7 +4116,7 @@ sub_805D240: @ 805D240 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _0805D2B4 @ =gUnknown_2037078 + ldr r6, _0805D2B4 @ =gPlayerAvatar ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4163,7 +4163,7 @@ _0805D2AE: pop {r0} bx r0 .align 2, 0 -_0805D2B4: .4byte gUnknown_2037078 +_0805D2B4: .4byte gPlayerAvatar _0805D2B8: .4byte gMapObjects _0805D2BC: .4byte gSprites thumb_func_end sub_805D240 @@ -4236,7 +4236,7 @@ sub_805D33C: @ 805D33C push {r4,lr} adds r4, r0, 0 bl ScriptContext2_Enable - ldr r1, _0805D358 @ =gUnknown_2037078 + ldr r1, _0805D358 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -4247,7 +4247,7 @@ sub_805D33C: @ 805D33C pop {r1} bx r1 .align 2, 0 -_0805D358: .4byte gUnknown_2037078 +_0805D358: .4byte gPlayerAvatar thumb_func_end sub_805D33C thumb_func_start fish1 @@ -4282,7 +4282,7 @@ fish1: @ 805D35C adds r1, r0 strh r1, [r5, 0x22] ldr r3, _0805D3EC @ =gMapObjects - ldr r2, _0805D3F0 @ =gUnknown_2037078 + ldr r2, _0805D3F0 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4317,14 +4317,14 @@ fish1: @ 805D35C _0805D3E4: .4byte gUnknown_835B90C _0805D3E8: .4byte gUnknown_835B912 _0805D3EC: .4byte gMapObjects -_0805D3F0: .4byte gUnknown_2037078 +_0805D3F0: .4byte gPlayerAvatar thumb_func_end fish1 thumb_func_start fish2 fish2: @ 805D3F4 push {r4,lr} adds r4, r0, 0 - ldr r0, _0805D428 @ =gUnknown_2037078 + ldr r0, _0805D428 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4348,7 +4348,7 @@ _0805D41E: pop {r1} bx r1 .align 2, 0 -_0805D428: .4byte gUnknown_2037078 +_0805D428: .4byte gPlayerAvatar _0805D42C: .4byte gSprites thumb_func_end fish2 @@ -4398,7 +4398,7 @@ sub_805D47C: @ 805D47C push {r4,r5,lr} sub sp, 0xC adds r4, r0, 0 - ldr r0, _0805D4CC @ =gUnknown_2037078 + ldr r0, _0805D4CC @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4436,7 +4436,7 @@ _0805D4C6: strh r0, [r4, 0x20] b _0805D4F8 .align 2, 0 -_0805D4CC: .4byte gUnknown_2037078 +_0805D4CC: .4byte gPlayerAvatar _0805D4D0: .4byte gSprites _0805D4D4: ldr r2, _0805D504 @ =gUnknown_835B918 @@ -4470,7 +4470,7 @@ _0805D504: .4byte gUnknown_835B918 sub_805D508: @ 805D508 push {r4-r6,lr} adds r4, r0, 0 - ldr r6, _0805D540 @ =gUnknown_2037078 + ldr r6, _0805D540 @ =gPlayerAvatar ldrb r1, [r6, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4495,7 +4495,7 @@ _0805D53A: strh r0, [r4, 0x8] b _0805D56A .align 2, 0 -_0805D540: .4byte gUnknown_2037078 +_0805D540: .4byte gPlayerAvatar _0805D544: .4byte gSprites _0805D548: ldrb r0, [r6, 0x4] @@ -4537,7 +4537,7 @@ sub_805D580: @ 805D580 mov r0, sp movs r2, 0x6 bl memcpy - ldr r0, _0805D5C4 @ =gUnknown_2037078 + ldr r0, _0805D5C4 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4562,7 +4562,7 @@ sub_805D580: @ 805D580 b _0805D5DC .align 2, 0 _0805D5C0: .4byte gUnknown_835B91A -_0805D5C4: .4byte gUnknown_2037078 +_0805D5C4: .4byte gPlayerAvatar _0805D5C8: .4byte gSprites _0805D5CC: ldr r0, _0805D5E8 @ =gMain @@ -4594,7 +4594,7 @@ sub_805D5EC: @ 805D5EC mov r0, sp movs r2, 0xC bl memcpy - ldr r0, _0805D664 @ =gUnknown_2037078 + ldr r0, _0805D664 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4644,7 +4644,7 @@ _0805D654: bx r1 .align 2, 0 _0805D660: .4byte gUnknown_835B920 -_0805D664: .4byte gUnknown_2037078 +_0805D664: .4byte gPlayerAvatar _0805D668: .4byte gSprites thumb_func_end sub_805D5EC @@ -4653,7 +4653,7 @@ sub_805D66C: @ 805D66C push {r4,r5,lr} sub sp, 0x10 adds r4, r0, 0 - ldr r0, _0805D6BC @ =gUnknown_2037078 + ldr r0, _0805D6BC @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4687,7 +4687,7 @@ sub_805D66C: @ 805D66C pop {r1} bx r1 .align 2, 0 -_0805D6BC: .4byte gUnknown_2037078 +_0805D6BC: .4byte gPlayerAvatar _0805D6C0: .4byte gSprites _0805D6C4: .4byte gUnknown_841D14E thumb_func_end sub_805D66C @@ -4702,7 +4702,7 @@ sub_805D6C8: @ 805D6C8 ldrsh r0, [r5, r1] cmp r0, 0 bne _0805D6EA - ldr r0, _0805D774 @ =gUnknown_2037078 + ldr r0, _0805D774 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4722,7 +4722,7 @@ _0805D6EA: lsrs r6, r0, 16 cmp r6, 0 bne _0805D780 - ldr r7, _0805D774 @ =gUnknown_2037078 + ldr r7, _0805D774 @ =gPlayerAvatar ldrb r0, [r7, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -4775,7 +4775,7 @@ _0805D748: strh r0, [r5, 0xA] b _0805D7AA .align 2, 0 -_0805D774: .4byte gUnknown_2037078 +_0805D774: .4byte gPlayerAvatar _0805D778: .4byte gSprites _0805D77C: .4byte gMapObjects _0805D780: @@ -4784,7 +4784,7 @@ _0805D780: cmp r0, 0 beq _0805D7AA _0805D788: - ldr r1, _0805D7B8 @ =gUnknown_2037078 + ldr r1, _0805D7B8 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] bl ScriptContext2_Disable @@ -4805,7 +4805,7 @@ _0805D7AA: pop {r1} bx r1 .align 2, 0 -_0805D7B8: .4byte gUnknown_2037078 +_0805D7B8: .4byte gPlayerAvatar _0805D7BC: .4byte sub_805D304 thumb_func_end sub_805D6C8 @@ -4814,7 +4814,7 @@ sub_805D7C0: @ 805D7C0 push {r4-r6,lr} sub sp, 0x10 adds r6, r0, 0 - ldr r4, _0805D82C @ =gUnknown_2037078 + ldr r4, _0805D82C @ =gPlayerAvatar ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4860,7 +4860,7 @@ sub_805D7C0: @ 805D7C0 pop {r1} bx r1 .align 2, 0 -_0805D82C: .4byte gUnknown_2037078 +_0805D82C: .4byte gPlayerAvatar _0805D830: .4byte gSprites _0805D834: .4byte gUnknown_841D169 thumb_func_end sub_805D7C0 @@ -4870,7 +4870,7 @@ sub_805D838: @ 805D838 push {r4-r6,lr} sub sp, 0x10 adds r6, r0, 0 - ldr r4, _0805D8A0 @ =gUnknown_2037078 + ldr r4, _0805D8A0 @ =gPlayerAvatar ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4914,7 +4914,7 @@ sub_805D838: @ 805D838 pop {r1} bx r1 .align 2, 0 -_0805D8A0: .4byte gUnknown_2037078 +_0805D8A0: .4byte gPlayerAvatar _0805D8A4: .4byte gSprites _0805D8A8: .4byte gUnknown_841D17E thumb_func_end sub_805D838 @@ -4923,7 +4923,7 @@ _0805D8A8: .4byte gUnknown_841D17E sub_805D8AC: @ 805D8AC push {r4,lr} adds r4, r0, 0 - ldr r0, _0805D8D0 @ =gUnknown_2037078 + ldr r0, _0805D8D0 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4939,7 +4939,7 @@ sub_805D8AC: @ 805D8AC pop {r1} bx r1 .align 2, 0 -_0805D8D0: .4byte gUnknown_2037078 +_0805D8D0: .4byte gPlayerAvatar _0805D8D4: .4byte gSprites thumb_func_end sub_805D8AC @@ -4949,7 +4949,7 @@ sub_805D8D8: @ 805D8D8 mov r7, r8 push {r7} adds r6, r0, 0 - ldr r5, _0805D974 @ =gUnknown_2037078 + ldr r5, _0805D974 @ =gPlayerAvatar ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -5022,7 +5022,7 @@ _0805D968: pop {r1} bx r1 .align 2, 0 -_0805D974: .4byte gUnknown_2037078 +_0805D974: .4byte gPlayerAvatar _0805D978: .4byte gSprites _0805D97C: .4byte gMapObjects thumb_func_end sub_805D8D8 @@ -5037,7 +5037,7 @@ sub_805D980: @ 805D980 lsrs r1, r0, 16 cmp r1, 0 bne _0805D9B6 - ldr r0, _0805D9BC @ =gUnknown_2037078 + ldr r0, _0805D9BC @ =gPlayerAvatar strb r1, [r0, 0x6] bl ScriptContext2_Disable bl UnfreezeMapObjects @@ -5054,7 +5054,7 @@ _0805D9B6: pop {r1} bx r1 .align 2, 0 -_0805D9BC: .4byte gUnknown_2037078 +_0805D9BC: .4byte gPlayerAvatar _0805D9C0: .4byte sub_805D304 thumb_func_end sub_805D980 @@ -5153,7 +5153,7 @@ _0805DA68: movs r0, 0x8 strh r0, [r4, 0x26] _0805DA78: - ldr r3, _0805DAA8 @ =gUnknown_2037078 + ldr r3, _0805DAA8 @ =gPlayerAvatar ldrb r1, [r3] movs r0, 0x8 ands r0, r1 @@ -5176,7 +5176,7 @@ _0805DA9C: bx r0 .align 2, 0 _0805DAA4: .4byte 0x0000fff8 -_0805DAA8: .4byte gUnknown_2037078 +_0805DAA8: .4byte gPlayerAvatar _0805DAAC: .4byte gMapObjects thumb_func_end sub_805D9C4 @@ -5242,7 +5242,7 @@ sub_805DB04: @ 805DB04 lsls r0, 24 lsrs r0, 24 adds r2, r0, 0 - ldr r0, _0805DB48 @ =gUnknown_2037078 + ldr r0, _0805DB48 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5270,7 +5270,7 @@ sub_805DB04: @ 805DB04 beq _0805DB5E b _0805DBFA .align 2, 0 -_0805DB48: .4byte gUnknown_2037078 +_0805DB48: .4byte gPlayerAvatar _0805DB4C: .4byte gMapObjects _0805DB50: .4byte gSprites _0805DB54: .4byte gTasks+0x8 @@ -5401,7 +5401,7 @@ sub_805DC38: @ 805DC38 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _0805DC80 @ =gUnknown_2037078 + ldr r0, _0805DC80 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5430,7 +5430,7 @@ sub_805DC38: @ 805DC38 beq _0805DC9A b _0805DDBA .align 2, 0 -_0805DC80: .4byte gUnknown_2037078 +_0805DC80: .4byte gPlayerAvatar _0805DC84: .4byte gMapObjects _0805DC88: .4byte gSprites _0805DC8C: .4byte gTasks+0x8 diff --git a/asm/field_poison.s b/asm/field_poison.s index 930f5b403..f76e7db4f 100644 --- a/asm/field_poison.s +++ b/asm/field_poison.s @@ -196,12 +196,12 @@ _080A05B8: adds r1, r0, 0 cmp r1, 0 beq _080A05E8 - ldr r1, _080A05CC @ =gUnknown_20370D0 + ldr r1, _080A05CC @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] b _080A05EC .align 2, 0 -_080A05CC: .4byte gUnknown_20370D0 +_080A05CC: .4byte gSpecialVar_Result _080A05D0: ldrb r0, [r4, 0x2] bl MonFaintFromPoisonOnField @@ -214,7 +214,7 @@ _080A05D0: .align 2, 0 _080A05E4: .4byte gUnknown_81A5476 _080A05E8: - ldr r0, _080A05FC @ =gUnknown_20370D0 + ldr r0, _080A05FC @ =gSpecialVar_Result strh r1, [r0] _080A05EC: bl EnableBothScriptContexts @@ -225,7 +225,7 @@ _080A05F6: pop {r0} bx r0 .align 2, 0 -_080A05FC: .4byte gUnknown_20370D0 +_080A05FC: .4byte gSpecialVar_Result thumb_func_end Task_WhiteOut thumb_func_start ExecuteWhiteOut diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s index a1a51b908..a8477a33f 100644 --- a/asm/field_screen_effect.s +++ b/asm/field_screen_effect.s @@ -937,7 +937,7 @@ _0807F542: lsls r0, 24 cmp r0, 0 beq _0807F5E4 - ldr r0, _0807F57C @ =gUnknown_2037078 + ldr r0, _0807F57C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -957,7 +957,7 @@ _0807F542: b _0807F5E4 .align 2, 0 _0807F578: .4byte gUnknown_841B5B6 -_0807F57C: .4byte gUnknown_2037078 +_0807F57C: .4byte gPlayerAvatar _0807F580: .4byte gMapObjects _0807F584: .4byte gTasks _0807F588: diff --git a/asm/field_specials.s b/asm/field_specials.s index 5cadf3dba..a4f3e6dc7 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -21,7 +21,7 @@ _080CA62C: .4byte sub_80F4C10 thumb_func_start sub_80CA630 sub_80CA630: @ 80CA630 push {r4,lr} - ldr r0, _080CA65C @ =gUnknown_2037078 + ldr r0, _080CA65C @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -40,7 +40,7 @@ _080CA644: pop {r0} bx r0 .align 2, 0 -_080CA65C: .4byte gUnknown_2037078 +_080CA65C: .4byte gPlayerAvatar thumb_func_end sub_80CA630 thumb_func_start nullsub_74 @@ -86,7 +86,7 @@ _080CA698: .4byte gStringVar4 thumb_func_start sub_80CA69C sub_80CA69C: @ 80CA69C - ldr r1, _080CA6B0 @ =gUnknown_20370C0 + ldr r1, _080CA6B0 @ =gSpecialVar_0x8004 ldr r0, _080CA6B4 @ =gSaveBlock1Ptr ldr r2, [r0] ldrh r0, [r2] @@ -96,7 +96,7 @@ sub_80CA69C: @ 80CA69C strh r0, [r1] bx lr .align 2, 0 -_080CA6B0: .4byte gUnknown_20370C0 +_080CA6B0: .4byte gSpecialVar_0x8004 _080CA6B4: .4byte gSaveBlock1Ptr _080CA6B8: .4byte gSpecialVar_0x8005 thumb_func_end sub_80CA69C @@ -188,13 +188,13 @@ _080CA754: .4byte gUnknown_2023E8A thumb_func_start sub_80CA758 sub_80CA758: @ 80CA758 push {lr} - ldr r0, _080CA768 @ =gUnknown_20370C0 + ldr r0, _080CA768 @ =gSpecialVar_0x8004 ldrh r0, [r0] bl FlagSet pop {r0} bx r0 .align 2, 0 -_080CA768: .4byte gUnknown_20370C0 +_080CA768: .4byte gSpecialVar_0x8004 thumb_func_end sub_80CA758 thumb_func_start sub_80CA76C @@ -441,14 +441,14 @@ _080CA92C: _080CA92E: cmp r6, 0 beq _080CA954 - ldr r0, _080CA940 @ =gUnknown_20370C0 + ldr r0, _080CA940 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _080CA944 movs r4, 0x62 b _080CA96E .align 2, 0 -_080CA940: .4byte gUnknown_20370C0 +_080CA940: .4byte gSpecialVar_0x8004 _080CA944: cmp r0, 0x1 beq _080CA94C @@ -460,14 +460,14 @@ _080CA94C: .align 2, 0 _080CA950: .4byte 0x0000028f _080CA954: - ldr r0, _080CA960 @ =gUnknown_20370C0 + ldr r0, _080CA960 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _080CA964 movs r4, 0x63 b _080CA96E .align 2, 0 -_080CA960: .4byte gUnknown_20370C0 +_080CA960: .4byte gSpecialVar_0x8004 _080CA964: cmp r0, 0x1 beq _080CA96C @@ -536,14 +536,14 @@ _080CA9D6: _080CA9D8: movs r5, 0xFF _080CA9DA: - ldr r0, _080CA9E8 @ =gUnknown_20370C0 + ldr r0, _080CA9E8 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _080CA9EC movs r4, 0x62 b _080CA9F6 .align 2, 0 -_080CA9E8: .4byte gUnknown_20370C0 +_080CA9E8: .4byte gSpecialVar_0x8004 _080CA9EC: cmp r0, 0x1 beq _080CA9F4 @@ -867,13 +867,13 @@ sub_80CAC28: @ 80CAC28 movs r2, 0 strh r0, [r1, 0x8] strh r2, [r1, 0xA] - ldr r0, _080CAC78 @ =gUnknown_20370C4 + ldr r0, _080CAC78 @ =gSpecialVar_0x8006 ldrh r0, [r0] strh r0, [r1, 0xC] - ldr r0, _080CAC7C @ =gUnknown_20370C6 + ldr r0, _080CAC7C @ =gSpecialVar_0x8007 ldrh r0, [r0] strh r0, [r1, 0xE] - ldr r0, _080CAC80 @ =gUnknown_20370C0 + ldr r0, _080CAC80 @ =gSpecialVar_0x8004 ldrh r0, [r0] strh r0, [r1, 0x10] movs r0, 0 @@ -886,9 +886,9 @@ sub_80CAC28: @ 80CAC28 _080CAC6C: .4byte sub_80CAC84 _080CAC70: .4byte gTasks _080CAC74: .4byte gSpecialVar_0x8005 -_080CAC78: .4byte gUnknown_20370C4 -_080CAC7C: .4byte gUnknown_20370C6 -_080CAC80: .4byte gUnknown_20370C0 +_080CAC78: .4byte gSpecialVar_0x8006 +_080CAC7C: .4byte gSpecialVar_0x8007 +_080CAC80: .4byte gSpecialVar_0x8004 thumb_func_end sub_80CAC28 thumb_func_start sub_80CAC84 @@ -1002,7 +1002,7 @@ _080CAD4C: thumb_func_start sub_80CAD54 sub_80CAD54: @ 80CAD54 push {lr} - ldr r0, _080CAD74 @ =gUnknown_20370C0 + ldr r0, _080CAD74 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -1016,14 +1016,14 @@ sub_80CAD54: @ 80CAD54 pop {r1} bx r1 .align 2, 0 -_080CAD74: .4byte gUnknown_20370C0 +_080CAD74: .4byte gSpecialVar_0x8004 _080CAD78: .4byte gPlayerParty thumb_func_end sub_80CAD54 thumb_func_start sub_80CAD7C sub_80CAD7C: @ 80CAD7C push {r4,lr} - ldr r0, _080CADA8 @ =gUnknown_20370C0 + ldr r0, _080CADA8 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -1042,7 +1042,7 @@ sub_80CAD7C: @ 80CAD7C movs r0, 0x1 b _080CADBA .align 2, 0 -_080CADA8: .4byte gUnknown_20370C0 +_080CADA8: .4byte gSpecialVar_0x8004 _080CADAC: .4byte gPlayerParty _080CADB0: .4byte gStringVar1 _080CADB4: .4byte gSaveBlock2Ptr @@ -1092,7 +1092,7 @@ sub_80CADEC: @ 80CADEC adds r0, 0x1 lsls r0, 16 lsrs r2, r0, 16 - ldr r1, _080CAE20 @ =gUnknown_20370C0 + ldr r1, _080CAE20 @ =gSpecialVar_0x8004 strh r2, [r1] ldr r0, _080CAE24 @ =gSpecialVar_0x8005 strh r2, [r0] @@ -1108,7 +1108,7 @@ _080CAE14: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CAE20: .4byte gUnknown_20370C0 +_080CAE20: .4byte gSpecialVar_0x8004 _080CAE24: .4byte gSpecialVar_0x8005 _080CAE28: .4byte _080CAE2C .align 2, 0 @@ -1353,7 +1353,7 @@ _080CB01C: ldrh r0, [r5] cmp r0, 0xF bls _080CB04C - ldr r0, _080CB044 @ =gUnknown_20370C0 + ldr r0, _080CB044 @ =gSpecialVar_0x8004 ldrh r4, [r0] adds r0, r4, 0 movs r1, 0x5 @@ -1368,7 +1368,7 @@ _080CB01C: b _080CB04A .align 2, 0 _080CB040: .4byte gSpecialVar_0x8005 -_080CB044: .4byte gUnknown_20370C0 +_080CB044: .4byte gSpecialVar_0x8004 _080CB048: adds r0, r4, 0x1 _080CB04A: @@ -1491,7 +1491,7 @@ _080CB128: lsls r0, 16 lsrs r0, 16 movs r1, 0 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 asrs r0, 24 cmp r0, 0x1 @@ -1521,7 +1521,7 @@ _080CB176: lsls r0, 16 lsrs r0, 16 movs r1, 0 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 asrs r0, 24 cmp r0, 0x1 @@ -1569,9 +1569,9 @@ _080CB1D2: thumb_func_start sub_80CB1D8 sub_80CB1D8: @ 80CB1D8 push {lr} - ldr r0, _080CB1F0 @ =gUnknown_20370D0 + ldr r0, _080CB1F0 @ =gSpecialVar_Result ldrh r1, [r0] - ldr r0, _080CB1F4 @ =gUnknown_20370C4 + ldr r0, _080CB1F4 @ =gSpecialVar_0x8006 ldrh r0, [r0] adds r1, r0 ldr r0, _080CB1F8 @ =0x0000270f @@ -1580,8 +1580,8 @@ sub_80CB1D8: @ 80CB1D8 movs r0, 0x1 b _080CB1FE .align 2, 0 -_080CB1F0: .4byte gUnknown_20370D0 -_080CB1F4: .4byte gUnknown_20370C4 +_080CB1F0: .4byte gSpecialVar_Result +_080CB1F4: .4byte gSpecialVar_0x8006 _080CB1F8: .4byte 0x0000270f _080CB1FC: movs r0, 0 @@ -1956,7 +1956,7 @@ sub_80CB498: @ 80CB498 movs r6, 0x1 strh r6, [r4, 0x8] ldr r0, _080CB4D8 @ =gSpecialVar_0x8005 - ldr r1, _080CB4DC @ =gUnknown_20370C4 + ldr r1, _080CB4DC @ =gSpecialVar_0x8006 ldrh r2, [r0] ldrh r0, [r1] cmp r2, r0 @@ -1970,7 +1970,7 @@ sub_80CB498: @ 80CB498 _080CB4D0: .4byte sub_80CB514 _080CB4D4: .4byte gTasks+0x8 _080CB4D8: .4byte gSpecialVar_0x8005 -_080CB4DC: .4byte gUnknown_20370C4 +_080CB4DC: .4byte gSpecialVar_0x8006 _080CB4E0: subs r0, r2 lsls r0, 16 @@ -2357,7 +2357,7 @@ _080CB7D6: lsls r0, 3 ldr r1, _080CB810 @ =gTasks adds r3, r0, r1 - ldr r0, _080CB814 @ =gUnknown_20370C0 + ldr r0, _080CB814 @ =gSpecialVar_0x8004 ldrh r4, [r0] cmp r4, 0x3 beq _080CB886 @@ -2374,7 +2374,7 @@ _080CB7D6: _080CB808: .4byte sub_809D6D4 _080CB80C: .4byte sub_80CB904 _080CB810: .4byte gTasks -_080CB814: .4byte gUnknown_20370C0 +_080CB814: .4byte gSpecialVar_0x8004 _080CB818: cmp r4, 0x5 beq _080CB8B4 @@ -2490,7 +2490,7 @@ _080CB8E6: strh r5, [r3, 0x26] b _080CB8F8 _080CB8EC: - ldr r1, _080CB900 @ =gUnknown_20370D0 + ldr r1, _080CB900 @ =gSpecialVar_Result movs r0, 0x7F strh r0, [r1] adds r0, r5, 0 @@ -2500,7 +2500,7 @@ _080CB8F8: pop {r0} bx r0 .align 2, 0 -_080CB900: .4byte gUnknown_20370D0 +_080CB900: .4byte gSpecialVar_Result thumb_func_end sub_80CB7C4 thumb_func_start sub_80CB904 @@ -2519,7 +2519,7 @@ sub_80CB904: @ 80CB904 ldr r1, _080CB934 @ =gTasks adds r5, r0, r1 bl ScriptContext2_Enable - ldr r0, _080CB938 @ =gUnknown_20370C0 + ldr r0, _080CB938 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x1 bne _080CB944 @@ -2530,7 +2530,7 @@ sub_80CB904: @ 80CB904 b _080CB94A .align 2, 0 _080CB934: .4byte gTasks -_080CB938: .4byte gUnknown_20370C0 +_080CB938: .4byte gSpecialVar_0x8004 _080CB93C: .4byte gUnknown_2039A18 _080CB940: .4byte gUnknown_2039A0E _080CB944: @@ -2563,7 +2563,7 @@ _080CB974: lsls r3, r4, 3 adds r3, r0 lsls r2, r4, 2 - ldr r0, _080CBA6C @ =gUnknown_20370C0 + ldr r0, _080CBA6C @ =gSpecialVar_0x8004 ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -2676,7 +2676,7 @@ _080CB9D2: _080CBA60: .4byte gUnknown_2039A18 _080CBA64: .4byte gUnknown_2039A14 _080CBA68: .4byte gUnknown_83F5BCC -_080CBA6C: .4byte gUnknown_20370C0 +_080CBA6C: .4byte gSpecialVar_0x8004 _080CBA70: .4byte gUnknown_3005360 _080CBA74: .4byte gTasks _080CBA78: .4byte sub_80CBB28 @@ -2794,16 +2794,16 @@ sub_80CBB28: @ 80CBB28 .align 2, 0 _080CBB54: .4byte gTasks _080CBB58: - ldr r1, _080CBB68 @ =gUnknown_20370D0 + ldr r1, _080CBB68 @ =gSpecialVar_Result movs r0, 0x7F strh r0, [r1] movs r0, 0x5 bl PlaySE b _080CBB88 .align 2, 0 -_080CBB68: .4byte gUnknown_20370D0 +_080CBB68: .4byte gSpecialVar_Result _080CBB6C: - ldr r0, _080CBB90 @ =gUnknown_20370D0 + ldr r0, _080CBB90 @ =gSpecialVar_Result strh r4, [r0] movs r0, 0x5 bl PlaySE @@ -2821,7 +2821,7 @@ _080CBB88: bl sub_80CBBAC b _080CBBA2 .align 2, 0 -_080CBB90: .4byte gUnknown_20370D0 +_080CBB90: .4byte gSpecialVar_Result _080CBB94: adds r0, r5, 0 bl sub_80CBD50 @@ -3123,17 +3123,17 @@ _080CBDC8: .4byte 0x00004031 thumb_func_start sub_80CBDCC sub_80CBDCC: @ 80CBDCC push {lr} - ldr r0, _080CBDE4 @ =gUnknown_20370C0 + ldr r0, _080CBDE4 @ =gSpecialVar_0x8004 ldrh r0, [r0] bl SpeciesToNationalPokedexNum lsls r0, 16 lsrs r0, 16 movs r1, 0x2 - bl sub_8088E74 + bl GetSetPokedexFlag pop {r0} bx r0 .align 2, 0 -_080CBDE4: .4byte gUnknown_20370C0 +_080CBDE4: .4byte gSpecialVar_0x8004 thumb_func_end sub_80CBDCC thumb_func_start sub_80CBDE8 @@ -3371,7 +3371,7 @@ _080CBF9A: thumb_func_start sub_80CBFA0 sub_80CBFA0: @ 80CBFA0 push {r4,lr} - ldr r0, _080CBFC8 @ =gUnknown_20370C0 + ldr r0, _080CBFC8 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -3389,7 +3389,7 @@ sub_80CBFA0: @ 80CBFA0 movs r0, 0x1 b _080CBFDA .align 2, 0 -_080CBFC8: .4byte gUnknown_20370C0 +_080CBFC8: .4byte gSpecialVar_0x8004 _080CBFCC: .4byte gPlayerParty _080CBFD0: .4byte gStringVar1 _080CBFD4: .4byte gStringVar3 @@ -3486,7 +3486,7 @@ ChangePokemonNickname: @ 80CC088 mov r4, r8 push {r4-r6} sub sp, 0x8 - ldr r0, _080CC130 @ =gUnknown_20370C0 + ldr r0, _080CC130 @ =gSpecialVar_0x8004 mov r9, r0 ldrh r0, [r0] movs r1, 0x64 @@ -3558,7 +3558,7 @@ ChangePokemonNickname: @ 80CC088 pop {r0} bx r0 .align 2, 0 -_080CC130: .4byte gUnknown_20370C0 +_080CC130: .4byte gSpecialVar_0x8004 _080CC134: .4byte gPlayerParty _080CC138: .4byte gStringVar3 _080CC13C: .4byte gStringVar2 @@ -3568,7 +3568,7 @@ _080CC140: .4byte ChangePokemonNickname_CB thumb_func_start ChangePokemonNickname_CB ChangePokemonNickname_CB: @ 80CC144 push {lr} - ldr r0, _080CC164 @ =gUnknown_20370C0 + ldr r0, _080CC164 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -3581,7 +3581,7 @@ ChangePokemonNickname_CB: @ 80CC144 pop {r0} bx r0 .align 2, 0 -_080CC164: .4byte gUnknown_20370C0 +_080CC164: .4byte gSpecialVar_0x8004 _080CC168: .4byte gPlayerParty _080CC16C: .4byte gStringVar2 thumb_func_end ChangePokemonNickname_CB @@ -3589,7 +3589,7 @@ _080CC16C: .4byte gStringVar2 thumb_func_start TV_CopyNicknameToStringVar1AndEnsureTerminated TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170 push {r4,lr} - ldr r0, _080CC194 @ =gUnknown_20370C0 + ldr r0, _080CC194 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -3605,7 +3605,7 @@ TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170 pop {r0} bx r0 .align 2, 0 -_080CC194: .4byte gUnknown_20370C0 +_080CC194: .4byte gSpecialVar_0x8004 _080CC198: .4byte gPlayerParty _080CC19C: .4byte gStringVar1 thumb_func_end TV_CopyNicknameToStringVar1AndEnsureTerminated @@ -3615,7 +3615,7 @@ TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0 push {r4,lr} bl sub_80CC1E4 adds r4, r0, 0 - ldr r0, _080CC1C8 @ =gUnknown_20370C0 + ldr r0, _080CC1C8 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -3626,15 +3626,15 @@ TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0 bl GetMonData cmp r4, r0 bne _080CC1D4 - ldr r1, _080CC1D0 @ =gUnknown_20370D0 + ldr r1, _080CC1D0 @ =gSpecialVar_Result movs r0, 0 b _080CC1D8 .align 2, 0 -_080CC1C8: .4byte gUnknown_20370C0 +_080CC1C8: .4byte gSpecialVar_0x8004 _080CC1CC: .4byte gPlayerParty -_080CC1D0: .4byte gUnknown_20370D0 +_080CC1D0: .4byte gSpecialVar_Result _080CC1D4: - ldr r1, _080CC1E0 @ =gUnknown_20370D0 + ldr r1, _080CC1E0 @ =gSpecialVar_Result movs r0, 0x1 _080CC1D8: strh r0, [r1] @@ -3642,7 +3642,7 @@ _080CC1D8: pop {r0} bx r0 .align 2, 0 -_080CC1E0: .4byte gUnknown_20370D0 +_080CC1E0: .4byte gSpecialVar_Result thumb_func_end TV_CheckMonOTIDEqualsPlayerID thumb_func_start sub_80CC1E4 @@ -3863,7 +3863,7 @@ _080CC318: adds r0, r4, 0 bl VarSet ldr r0, _080CC3C4 @ =0x00004042 - ldr r1, _080CC3C8 @ =gUnknown_20370C0 + ldr r1, _080CC3C8 @ =gSpecialVar_0x8004 ldrh r1, [r1] bl VarSet add sp, 0x24 @@ -3874,21 +3874,21 @@ _080CC318: _080CC3BC: .4byte gPlayerParty _080CC3C0: .4byte 0x00004043 _080CC3C4: .4byte 0x00004042 -_080CC3C8: .4byte gUnknown_20370C0 +_080CC3C8: .4byte gSpecialVar_0x8004 thumb_func_end sub_80CC2BC thumb_func_start sub_80CC3CC sub_80CC3CC: @ 80CC3CC push {r4-r6,lr} movs r5, 0 - ldr r4, _080CC3F8 @ =gUnknown_20370C0 + ldr r4, _080CC3F8 @ =gSpecialVar_0x8004 movs r0, 0xA bl GetGameStat strh r0, [r4] movs r0, 0xD bl GetGameStat adds r6, r0, 0 - ldr r4, _080CC3FC @ =gUnknown_20370C4 + ldr r4, _080CC3FC @ =gSpecialVar_0x8006 movs r0, 0x17 bl GetGameStat strh r0, [r4] @@ -3899,8 +3899,8 @@ sub_80CC3CC: @ 80CC3CC strh r1, [r0] b _080CC40C .align 2, 0 -_080CC3F8: .4byte gUnknown_20370C0 -_080CC3FC: .4byte gUnknown_20370C4 +_080CC3F8: .4byte gSpecialVar_0x8004 +_080CC3FC: .4byte gSpecialVar_0x8006 _080CC400: .4byte 0x0000ffff _080CC404: .4byte gSpecialVar_0x8005 _080CC408: @@ -3908,7 +3908,7 @@ _080CC408: strh r6, [r0] _080CC40C: adds r1, r0, 0 - ldr r0, _080CC444 @ =gUnknown_20370C0 + ldr r0, _080CC444 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 beq _080CC41A @@ -3923,7 +3923,7 @@ _080CC41A: lsls r0, r5, 16 lsrs r5, r0, 16 _080CC428: - ldr r0, _080CC448 @ =gUnknown_20370C4 + ldr r0, _080CC448 @ =gSpecialVar_0x8006 ldrh r0, [r0] cmp r0, 0 beq _080CC438 @@ -3938,8 +3938,8 @@ _080CC438: bx r1 .align 2, 0 _080CC440: .4byte gSpecialVar_0x8005 -_080CC444: .4byte gUnknown_20370C0 -_080CC448: .4byte gUnknown_20370C4 +_080CC444: .4byte gSpecialVar_0x8004 +_080CC448: .4byte gSpecialVar_0x8006 thumb_func_end sub_80CC3CC thumb_func_start sub_80CC44C @@ -3999,7 +3999,7 @@ _080CC49C: movs r1, 0x41 movs r2, 0 bl GetMonData - ldr r1, _080CC4BC @ =gUnknown_20370C0 + ldr r1, _080CC4BC @ =gSpecialVar_0x8004 ldrh r1, [r1] cmp r0, r1 bne _080CC4C0 @@ -4007,7 +4007,7 @@ _080CC49C: b _080CC4CC .align 2, 0 _080CC4B8: .4byte gPlayerParty -_080CC4BC: .4byte gUnknown_20370C0 +_080CC4BC: .4byte gSpecialVar_0x8004 _080CC4C0: adds r0, r4, 0x1 lsls r0, 24 @@ -4331,7 +4331,7 @@ _080CC72C: .4byte 0x0000404d thumb_func_start sub_80CC730 sub_80CC730: @ 80CC730 push {lr} - ldr r0, _080CC744 @ =gUnknown_20370D0 + ldr r0, _080CC744 @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0x4 bhi _080CC77C @@ -4341,7 +4341,7 @@ sub_80CC730: @ 80CC730 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CC744: .4byte gUnknown_20370D0 +_080CC744: .4byte gSpecialVar_Result _080CC748: .4byte _080CC74C .align 2, 0 _080CC74C: @@ -4548,7 +4548,7 @@ _080CC8C4: thumb_func_start sub_80CC8CC sub_80CC8CC: @ 80CC8CC push {r4,lr} - ldr r1, _080CC8E4 @ =gUnknown_20370C0 + ldr r1, _080CC8E4 @ =gSpecialVar_0x8004 ldr r2, _080CC8E8 @ =0xfffffedf adds r0, r2, 0 ldrh r2, [r1] @@ -4560,7 +4560,7 @@ sub_80CC8CC: @ 80CC8CC movs r0, 0 b _080CC908 .align 2, 0 -_080CC8E4: .4byte gUnknown_20370C0 +_080CC8E4: .4byte gSpecialVar_0x8004 _080CC8E8: .4byte 0xfffffedf _080CC8EC: ldr r4, _080CC910 @ =gStringVar1 @@ -4570,7 +4570,7 @@ _080CC8EC: lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _080CC914 @ =gUnknown_8247094 + ldr r0, _080CC914 @ =gMoveNames adds r1, r0 adds r0, r4, 0 bl StringCopy @@ -4581,7 +4581,7 @@ _080CC908: bx r1 .align 2, 0 _080CC910: .4byte gStringVar1 -_080CC914: .4byte gUnknown_8247094 +_080CC914: .4byte gMoveNames thumb_func_end sub_80CC8CC thumb_func_start sub_80CC918 @@ -4612,7 +4612,7 @@ _080CC944: .4byte 0x000001f3 thumb_func_start sub_80CC948 sub_80CC948: @ 80CC948 push {lr} - ldr r0, _080CC968 @ =gUnknown_20370C0 + ldr r0, _080CC968 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -4626,7 +4626,7 @@ sub_80CC948: @ 80CC948 pop {r0} bx r0 .align 2, 0 -_080CC968: .4byte gUnknown_20370C0 +_080CC968: .4byte gSpecialVar_0x8004 _080CC96C: .4byte gPlayerParty _080CC970: .4byte 0x00004025 thumb_func_end sub_80CC948 @@ -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 @@ -4904,7 +4904,7 @@ sub_80CCB94: @ 80CCB94 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _080CCBC0 @ =gUnknown_20370C6 + ldr r0, _080CCBC0 @ =gSpecialVar_0x8007 mov r1, r8 strh r1, [r0] movs r4, 0 @@ -4915,7 +4915,7 @@ sub_80CCB94: @ 80CCB94 mov r9, r0 b _080CCBCE .align 2, 0 -_080CCBC0: .4byte gUnknown_20370C6 +_080CCBC0: .4byte gSpecialVar_0x8007 _080CCBC4: .4byte gPlayerParty _080CCBC8: adds r0, r4, 0x1 @@ -5045,7 +5045,7 @@ _080CCCCC: lsls r0, 24 lsrs r6, r0, 24 _080CCCDE: - ldr r0, _080CCCF4 @ =gUnknown_20370C4 + ldr r0, _080CCCF4 @ =gSpecialVar_0x8006 strh r6, [r0] movs r0, 0x1 _080CCCE4: @@ -5057,7 +5057,7 @@ _080CCCE4: bx r1 .align 2, 0 _080CCCF0: .4byte gPlayerParty -_080CCCF4: .4byte gUnknown_20370C4 +_080CCCF4: .4byte gSpecialVar_0x8006 thumb_func_end sub_80CCB94 thumb_func_start sub_80CCCF8 @@ -5216,12 +5216,12 @@ task_deoxys_sound: @ 80CCE10 lsrs r0, 24 cmp r0, 0x1 bne _080CCE38 - ldr r1, _080CCE34 @ =gUnknown_20370D0 + ldr r1, _080CCE34 @ =gSpecialVar_Result movs r0, 0x3 b _080CCE9E .align 2, 0 _080CCE30: .4byte 0x00000848 -_080CCE34: .4byte gUnknown_20370D0 +_080CCE34: .4byte gSpecialVar_Result _080CCE38: ldr r0, _080CCE80 @ =0x0000403e mov r8, r0 @@ -5249,7 +5249,7 @@ _080CCE38: mov r0, r8 movs r1, 0 bl VarSet - ldr r1, _080CCE8C @ =gUnknown_20370D0 + ldr r1, _080CCE8C @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] b _080CCEA4 @@ -5257,13 +5257,13 @@ _080CCE38: _080CCE80: .4byte 0x0000403e _080CCE84: .4byte 0x00004026 _080CCE88: .4byte gUnknown_83F637C -_080CCE8C: .4byte gUnknown_20370D0 +_080CCE8C: .4byte gSpecialVar_Result _080CCE90: cmp r5, 0xA bne _080CCEB4 ldr r0, _080CCEAC @ =0x00000848 bl FlagSet - ldr r1, _080CCEB0 @ =gUnknown_20370D0 + ldr r1, _080CCEB0 @ =gSpecialVar_Result movs r0, 0x2 _080CCE9E: strh r0, [r1] @@ -5274,7 +5274,7 @@ _080CCEA4: b _080CCED6 .align 2, 0 _080CCEAC: .4byte 0x00000848 -_080CCEB0: .4byte gUnknown_20370D0 +_080CCEB0: .4byte gSpecialVar_Result _080CCEB4: adds r0, r5, 0x1 lsls r0, 16 @@ -5285,7 +5285,7 @@ _080CCEB4: ldr r0, _080CCEE0 @ =0x0000403e adds r1, r5, 0 bl VarSet - ldr r1, _080CCEE4 @ =gUnknown_20370D0 + ldr r1, _080CCEE4 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] adds r0, r7, 0 @@ -5298,7 +5298,7 @@ _080CCED6: bx r0 .align 2, 0 _080CCEE0: .4byte 0x0000403e -_080CCEE4: .4byte gUnknown_20370D0 +_080CCEE4: .4byte gSpecialVar_Result thumb_func_end task_deoxys_sound thumb_func_start sub_80CCEE8 @@ -5338,7 +5338,7 @@ _080CCF32: ldr r0, _080CCF64 @ =sub_80CCF98 movs r1, 0x8 bl CreateTask - ldr r3, _080CCF68 @ =gUnknown_20386E0 + ldr r3, _080CCF68 @ =gFieldEffectArguments movs r0, 0x1 str r0, [r3] movs r0, 0x38 @@ -5361,7 +5361,7 @@ _080CCF32: b _080CCF72 .align 2, 0 _080CCF64: .4byte sub_80CCF98 -_080CCF68: .4byte gUnknown_20386E0 +_080CCF68: .4byte gFieldEffectArguments _080CCF6C: .4byte gUnknown_83F6366 _080CCF70: movs r0, 0x5 @@ -5528,12 +5528,12 @@ sub_80CD098: @ 80CD098 ldrb r0, [r0] cmp r0, 0x2 beq _080CD0E8 - ldr r0, _080CD0D0 @ =gUnknown_20370C0 + ldr r0, _080CD0D0 @ =gSpecialVar_0x8004 ldrh r0, [r0] adds r0, 0x1B lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _080CD0D4 @ =gUnknown_20370C4 + ldr r0, _080CD0D4 @ =gSpecialVar_0x8006 ldrh r3, [r0] cmp r3, 0 bne _080CD0E0 @@ -5548,8 +5548,8 @@ sub_80CD098: @ 80CD098 b _080CD0E8 .align 2, 0 _080CD0CC: .4byte gUnknown_203ADFA -_080CD0D0: .4byte gUnknown_20370C0 -_080CD0D4: .4byte gUnknown_20370C4 +_080CD0D0: .4byte gSpecialVar_0x8004 +_080CD0D4: .4byte gSpecialVar_0x8006 _080CD0D8: .4byte gSpecialVar_0x8005 _080CD0DC: .4byte gUnknown_2039A1B _080CD0E0: @@ -5583,7 +5583,7 @@ _080CD104: movs r1, 0x41 movs r2, 0 bl GetMonData - ldr r1, _080CD13C @ =gUnknown_20370C0 + ldr r1, _080CD13C @ =gSpecialVar_0x8004 ldrh r1, [r1] cmp r0, r1 bne _080CD140 @@ -5599,7 +5599,7 @@ _080CD104: b _080CD14C .align 2, 0 _080CD138: .4byte gPlayerParty -_080CD13C: .4byte gUnknown_20370C0 +_080CD13C: .4byte gSpecialVar_0x8004 _080CD140: adds r0, r6, 0x1 lsls r0, 24 @@ -5708,7 +5708,7 @@ sub_80CD1CC: @ 80CD1CC _080CD200: movs r0, 0 ldrsh r1, [r4, r0] - ldr r0, _080CD224 @ =gUnknown_20370C0 + ldr r0, _080CD224 @ =gSpecialVar_0x8004 ldrh r0, [r0] subs r0, 0x1 cmp r1, r0 @@ -5722,7 +5722,7 @@ _080CD214: .align 2, 0 _080CD21C: .4byte gTasks+0x8 _080CD220: .4byte gSpecialVar_0x8005 -_080CD224: .4byte gUnknown_20370C0 +_080CD224: .4byte gSpecialVar_0x8004 thumb_func_end sub_80CD1CC .align 2, 0 @ Don't pad with nop. diff --git a/asm/field_tasks.s b/asm/field_tasks.s index 75fd499dd..306b52940 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -322,7 +322,7 @@ _0806EA52: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r6, r0, 24 adds r0, r6, 0 @@ -478,7 +478,7 @@ _0806EB8E: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_ReturnFalse_4 @@ -576,7 +576,7 @@ sub_806EC40: @ 806EC40 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r7, r0, 16 ldrh r1, [r5, 0x8] diff --git a/asm/field_weather.s b/asm/field_weather.s index 8a3208f55..77a138ad2 100644 --- a/asm/field_weather.s +++ b/asm/field_weather.s @@ -22,7 +22,7 @@ sub_8079C08: @ 8079C08 lsrs r5, 24 ldr r0, _08079CD0 @ =gUnknown_83C2CE0 lsls r1, r5, 5 - ldr r2, _08079CD4 @ =gUnknown_20373F8 + ldr r2, _08079CD4 @ =gPlttBufferUnfaded + 0x200 adds r1, r2 ldr r2, _08079CD8 @ =0x04000008 bl CpuSet @@ -101,7 +101,7 @@ _08079CC4: .align 2, 0 _08079CCC: .4byte Task_WeatherMain _08079CD0: .4byte gUnknown_83C2CE0 -_08079CD4: .4byte gUnknown_20373F8 +_08079CD4: .4byte gPlttBufferUnfaded + 0x200 _08079CD8: .4byte 0x04000008 _08079CDC: .4byte gUnknown_2037F34 _08079CE0: .4byte 0x000006d5 @@ -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 @@ -889,9 +889,9 @@ _0807A2CE: cmp r0, 0 bne _0807A30C lsls r1, r6, 1 - ldr r0, _0807A304 @ =gUnknown_20371F8 + ldr r0, _0807A304 @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _0807A308 @ =gUnknown_20375F8 + ldr r2, _0807A308 @ =gPlttBufferFaded adds r1, r2 movs r2, 0x8 bl CpuFastSet @@ -907,8 +907,8 @@ _0807A2CE: b _0807A38A .align 2, 0 _0807A300: .4byte gUnknown_20386A4 -_0807A304: .4byte gUnknown_20371F8 -_0807A308: .4byte gUnknown_20375F8 +_0807A304: .4byte gPlttBufferUnfaded +_0807A308: .4byte gPlttBufferFaded _0807A30C: cmp r0, 0x2 beq _0807A320 @@ -940,12 +940,12 @@ _0807A336: mov r8, r3 adds r4, 0x1 mov r12, r4 - ldr r0, _0807A398 @ =gUnknown_20375F8 + ldr r0, _0807A398 @ =gPlttBufferFaded mov r10, r0 _0807A34A: adds r2, r6, 0 lsls r0, r2, 1 - ldr r1, _0807A39C @ =gUnknown_20371F8 + ldr r1, _0807A39C @ =gPlttBufferUnfaded adds r0, r1 ldr r1, [r0] lsls r0, r1, 27 @@ -983,15 +983,15 @@ _0807A38A: bcc _0807A2CE b _0807A3B6 .align 2, 0 -_0807A398: .4byte gUnknown_20375F8 -_0807A39C: .4byte gUnknown_20371F8 +_0807A398: .4byte gPlttBufferFaded +_0807A39C: .4byte gPlttBufferUnfaded _0807A3A0: cmp r0, 0 blt _0807A3B6 lsls r1, r4, 5 - ldr r0, _0807A3C8 @ =gUnknown_20371F8 + ldr r0, _0807A3C8 @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _0807A3CC @ =gUnknown_20375F8 + ldr r2, _0807A3CC @ =gPlttBufferFaded adds r1, r2 mov r3, r9 lsls r2, r3, 3 @@ -1006,8 +1006,8 @@ _0807A3B6: pop {r0} bx r0 .align 2, 0 -_0807A3C8: .4byte gUnknown_20371F8 -_0807A3CC: .4byte gUnknown_20375F8 +_0807A3C8: .4byte gPlttBufferUnfaded +_0807A3CC: .4byte gPlttBufferFaded thumb_func_end sub_807A294 thumb_func_start sub_807A3D0 @@ -1104,7 +1104,7 @@ _0807A472: _0807A47E: adds r4, r6, 0 lsls r0, r4, 1 - ldr r1, _0807A510 @ =gUnknown_20371F8 + ldr r1, _0807A510 @ =gPlttBufferUnfaded adds r0, r1 ldr r1, [r0] lsls r0, r1, 27 @@ -1148,7 +1148,7 @@ _0807A47E: lsls r0, 16 lsrs r6, r0, 16 lsls r4, 1 - ldr r0, _0807A514 @ =gUnknown_20375F8 + ldr r0, _0807A514 @ =gPlttBufferFaded adds r4, r0 lsrs r1, 14 lsrs r2, 19 @@ -1177,8 +1177,8 @@ _0807A4FC: bx r0 .align 2, 0 _0807A50C: .4byte gUnknown_2038394 -_0807A510: .4byte gUnknown_20371F8 -_0807A514: .4byte gUnknown_20375F8 +_0807A510: .4byte gPlttBufferUnfaded +_0807A514: .4byte gPlttBufferFaded thumb_func_end sub_807A3D0 thumb_func_start sub_807A518 @@ -1231,12 +1231,12 @@ _0807A570: movs r7, 0 adds r4, 0x1 mov r12, r4 - ldr r0, _0807A5F0 @ =gUnknown_20375F8 + ldr r0, _0807A5F0 @ =gPlttBufferFaded mov r9, r0 _0807A57A: adds r4, r5, 0 lsls r0, r4, 1 - ldr r1, _0807A5F4 @ =gUnknown_20371F8 + ldr r1, _0807A5F4 @ =gPlttBufferUnfaded adds r0, r1 ldr r1, [r0] lsls r3, r1, 27 @@ -1294,8 +1294,8 @@ _0807A5D4: pop {r0} bx r0 .align 2, 0 -_0807A5F0: .4byte gUnknown_20375F8 -_0807A5F4: .4byte gUnknown_20371F8 +_0807A5F0: .4byte gPlttBufferFaded +_0807A5F4: .4byte gPlttBufferUnfaded thumb_func_end sub_807A518 thumb_func_start sub_807A5F8 @@ -1349,7 +1349,7 @@ _0807A634: mov r8, r0 _0807A658: lsls r5, r6, 1 - ldr r0, _0807A6DC @ =gUnknown_20371F8 + ldr r0, _0807A6DC @ =gPlttBufferUnfaded adds r0, r5, r0 ldr r2, [r0] lsls r4, r2, 27 @@ -1401,7 +1401,7 @@ _0807A658: asrs r0, 4 adds r2, r0 lsls r2, 24 - ldr r0, _0807A6E0 @ =gUnknown_20375F8 + ldr r0, _0807A6E0 @ =gPlttBufferFaded adds r5, r0 lsrs r2, 14 lsrs r3, 19 @@ -1415,8 +1415,8 @@ _0807A658: bcc _0807A658 b _0807A6F8 .align 2, 0 -_0807A6DC: .4byte gUnknown_20371F8 -_0807A6E0: .4byte gUnknown_20375F8 +_0807A6DC: .4byte gPlttBufferUnfaded +_0807A6E0: .4byte gPlttBufferFaded _0807A6E4: lsls r0, r4, 20 lsrs r0, 16 @@ -1650,8 +1650,8 @@ _0807A882: beq _0807A8C4 cmp r2, 0 beq _0807A896 - ldr r0, _0807A8B4 @ =gUnknown_20375F8 - ldr r1, _0807A8B8 @ =gUnknown_20371F8 + ldr r0, _0807A8B4 @ =gPlttBufferFaded + ldr r1, _0807A8B8 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -1671,8 +1671,8 @@ _0807A896: strb r1, [r0] b _0807A92C .align 2, 0 -_0807A8B4: .4byte gUnknown_20375F8 -_0807A8B8: .4byte gUnknown_20371F8 +_0807A8B4: .4byte gPlttBufferFaded +_0807A8B8: .4byte gPlttBufferUnfaded _0807A8BC: .4byte gUnknown_2037F34 _0807A8C0: .4byte 0x000006c6 _0807A8C4: @@ -1804,8 +1804,8 @@ _0807A9AE: beq _0807A9F0 cmp r2, 0 beq _0807A9C2 - ldr r0, _0807A9E0 @ =gUnknown_20375F8 - ldr r1, _0807A9E4 @ =gUnknown_20371F8 + ldr r0, _0807A9E0 @ =gPlttBufferFaded + ldr r1, _0807A9E4 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -1824,8 +1824,8 @@ _0807A9C2: strb r1, [r0] b _0807AA56 .align 2, 0 -_0807A9E0: .4byte gUnknown_20375F8 -_0807A9E4: .4byte gUnknown_20371F8 +_0807A9E0: .4byte gPlttBufferFaded +_0807A9E4: .4byte gPlttBufferUnfaded _0807A9E8: .4byte gUnknown_2037F34 _0807A9EC: .4byte 0x000006c6 _0807A9F0: @@ -1959,7 +1959,7 @@ _0807AAF0: lsls r0, r4, 20 lsrs r4, r0, 16 movs r2, 0 - ldr r6, _0807AB18 @ =gUnknown_20375F8 + ldr r6, _0807AB18 @ =gPlttBufferFaded ldr r0, _0807AB1C @ =0x000006c4 adds r3, r5, r0 _0807AAFC: @@ -1976,19 +1976,19 @@ _0807AAFC: b _0807AB68 .align 2, 0 _0807AB14: .4byte 0x000006ca -_0807AB18: .4byte gUnknown_20375F8 +_0807AB18: .4byte gPlttBufferFaded _0807AB1C: .4byte 0x000006c4 _0807AB20: lsls r0, r4, 20 lsrs r4, r0, 16 lsls r1, r4, 1 - ldr r0, _0807AB4C @ =gUnknown_20375F8 + ldr r0, _0807AB4C @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _0807AB50 @ =gUnknown_20371F8 + ldr r2, _0807AB50 @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x8 bl CpuFastSet - ldr r0, _0807AB54 @ =gUnknown_2037AB8 + ldr r0, _0807AB54 @ =gPaletteFade ldrh r2, [r0, 0x4] lsls r2, 21 lsrs r2, 27 @@ -2000,9 +2000,9 @@ _0807AB20: bl BlendPalette b _0807AB68 .align 2, 0 -_0807AB4C: .4byte gUnknown_20375F8 -_0807AB50: .4byte gUnknown_20371F8 -_0807AB54: .4byte gUnknown_2037AB8 +_0807AB4C: .4byte gPlttBufferFaded +_0807AB50: .4byte gPlttBufferUnfaded +_0807AB54: .4byte gPaletteFade _0807AB58: lsls r0, r4, 20 lsrs r4, r0, 16 diff --git a/asm/fieldmap.s b/asm/fieldmap.s index f78a4df9b..a8b2d36ee 100644 --- a/asm/fieldmap.s +++ b/asm/fieldmap.s @@ -789,8 +789,8 @@ sub_8058F48: @ 8058F48 _08058F74: .4byte gMapHeader thumb_func_end sub_8058F48 - thumb_func_start sub_8058F78 -sub_8058F78: @ 8058F78 + thumb_func_start MapGridGetMetatileBehaviorAt +MapGridGetMetatileBehaviorAt: @ 8058F78 push {lr} lsls r0, 16 asrs r0, 16 @@ -800,7 +800,7 @@ sub_8058F78: @ 8058F78 bl sub_8058F48 pop {r1} bx r1 - thumb_func_end sub_8058F78 + thumb_func_end MapGridGetMetatileBehaviorAt thumb_func_start sub_8058F8C sub_8058F8C: @ 8058F8C @@ -2125,35 +2125,35 @@ sub_80598CC: @ 80598CC _080598EC: .4byte gUnknown_2036E28 _080598F0: lsls r4, 1 - ldr r0, _08059900 @ =gUnknown_20371F8 + ldr r0, _08059900 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_GrayScale b _0805992C .align 2, 0 -_08059900: .4byte gUnknown_20371F8 +_08059900: .4byte gPlttBufferUnfaded _08059904: lsls r4, 1 - ldr r0, _08059914 @ =gUnknown_20371F8 + ldr r0, _08059914 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_SepiaTone b _0805992C .align 2, 0 -_08059914: .4byte gUnknown_20371F8 +_08059914: .4byte gPlttBufferUnfaded _08059918: adds r0, r4, 0 adds r1, r5, 0 bl sub_8111F38 lsls r4, 1 - ldr r0, _08059940 @ =gUnknown_20371F8 + ldr r0, _08059940 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_GrayScale _0805992C: - ldr r0, _08059940 @ =gUnknown_20371F8 + ldr r0, _08059940 @ =gPlttBufferUnfaded adds r0, r4, r0 - ldr r1, _08059944 @ =gUnknown_20375F8 + ldr r1, _08059944 @ =gPlttBufferFaded adds r1, r4, r1 adds r2, r5, 0 bl CpuSet @@ -2162,8 +2162,8 @@ _0805993A: pop {r0} bx r0 .align 2, 0 -_08059940: .4byte gUnknown_20371F8 -_08059944: .4byte gUnknown_20375F8 +_08059940: .4byte gPlttBufferUnfaded +_08059944: .4byte gPlttBufferFaded thumb_func_end sub_80598CC thumb_func_start sub_8059948 @@ -2188,36 +2188,36 @@ sub_8059948: @ 8059948 _08059968: .4byte gUnknown_2036E28 _0805996C: lsls r4, 5 - ldr r0, _0805997C @ =gUnknown_20371F8 + ldr r0, _0805997C @ =gPlttBufferUnfaded adds r0, r4, r0 lsls r1, r6, 4 bl TintPalette_GrayScale b _080599AA .align 2, 0 -_0805997C: .4byte gUnknown_20371F8 +_0805997C: .4byte gPlttBufferUnfaded _08059980: lsls r4, 5 - ldr r0, _08059990 @ =gUnknown_20371F8 + ldr r0, _08059990 @ =gPlttBufferUnfaded adds r0, r4, r0 lsls r1, r6, 4 bl TintPalette_SepiaTone b _080599AA .align 2, 0 -_08059990: .4byte gUnknown_20371F8 +_08059990: .4byte gPlttBufferUnfaded _08059994: lsls r0, r4, 4 lsls r5, r6, 4 adds r1, r5, 0 bl sub_8111F38 lsls r4, 5 - ldr r0, _080599C0 @ =gUnknown_20371F8 + ldr r0, _080599C0 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_GrayScale _080599AA: - ldr r0, _080599C0 @ =gUnknown_20371F8 + ldr r0, _080599C0 @ =gPlttBufferUnfaded adds r0, r4, r0 - ldr r1, _080599C4 @ =gUnknown_20375F8 + ldr r1, _080599C4 @ =gPlttBufferFaded adds r1, r4, r1 lsls r2, r6, 3 bl CpuFastSet @@ -2226,8 +2226,8 @@ _080599B8: pop {r0} bx r0 .align 2, 0 -_080599C0: .4byte gUnknown_20371F8 -_080599C4: .4byte gUnknown_20375F8 +_080599C0: .4byte gPlttBufferUnfaded +_080599C4: .4byte gPlttBufferFaded thumb_func_end sub_8059948 thumb_func_start apply_map_tileset_palette diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index 697b80bd5..2497c695d 100644 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -146,14 +146,14 @@ sub_8097984: @ 8097984 movs r0, 0x1 bl FieldEffectStart bl GetCursorSelectionMonId - ldr r1, _0809799C @ =gUnknown_20386E0 + ldr r1, _0809799C @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0809799C: .4byte gUnknown_20386E0 +_0809799C: .4byte gFieldEffectArguments thumb_func_end sub_8097984 thumb_func_start sub_80979A0 @@ -185,7 +185,7 @@ _080979CC: .4byte sub_8097A20 sub_80979D0: @ 80979D0 push {lr} bl GetCursorSelectionMonId - ldr r1, _080979E8 @ =gUnknown_20386E0 + ldr r1, _080979E8 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -194,7 +194,7 @@ sub_80979D0: @ 80979D0 pop {r0} bx r0 .align 2, 0 -_080979E8: .4byte gUnknown_20386E0 +_080979E8: .4byte gFieldEffectArguments _080979EC: .4byte gUnknown_81BDF6B thumb_func_end sub_80979D0 @@ -319,7 +319,7 @@ _08097ABC: movs r7, 0 ldr r5, _08097B44 @ =gSprites _08097AE2: - ldr r0, _08097B48 @ =gUnknown_2037078 + ldr r0, _08097B48 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -366,7 +366,7 @@ _08097B38: .4byte gUnknown_2039A04 _08097B3C: .4byte 0x0000ffff _08097B40: .4byte gUnknown_2039870 _08097B44: .4byte gSprites -_08097B48: .4byte gUnknown_2037078 +_08097B48: .4byte gPlayerAvatar _08097B4C: .4byte gUnknown_83D414C thumb_func_end sub_8097A48 diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s index 8fc9af0e3..6466c706e 100644 --- a/asm/fldeff_flash.s +++ b/asm/fldeff_flash.s @@ -47,7 +47,7 @@ sub_80C9B74: @ 80C9B74 lsls r4, 24 lsrs r4, 24 bl GetCursorSelectionMonId - ldr r1, _080C9BA4 @ =gUnknown_20386E0 + ldr r1, _080C9BA4 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -64,7 +64,7 @@ sub_80C9B74: @ 80C9B74 pop {r0} bx r0 .align 2, 0 -_080C9BA4: .4byte gUnknown_20386E0 +_080C9BA4: .4byte gFieldEffectArguments _080C9BA8: .4byte gTasks _080C9BAC: .4byte sub_80C9BB0 thumb_func_end sub_80C9B74 diff --git a/asm/fldeff_strength.s b/asm/fldeff_strength.s index e74be1bd3..778f2c916 100644 --- a/asm/fldeff_strength.s +++ b/asm/fldeff_strength.s @@ -23,7 +23,7 @@ _080D0808: movs r0, 0 b _080D0826 _080D080C: - ldr r4, _080D082C @ =gUnknown_20370D0 + ldr r4, _080D082C @ =gSpecialVar_Result bl GetCursorSelectionMonId lsls r0, 24 lsrs r0, 24 @@ -40,7 +40,7 @@ _080D0826: pop {r1} bx r1 .align 2, 0 -_080D082C: .4byte gUnknown_20370D0 +_080D082C: .4byte gSpecialVar_Result _080D0830: .4byte gUnknown_3005024 _080D0834: .4byte hm_add_c3_launch_phase_2 _080D0838: .4byte gUnknown_203B0C4 @@ -51,7 +51,7 @@ _080D083C: .4byte sub_80D0840 sub_80D0840: @ 80D0840 push {lr} bl GetCursorSelectionMonId - ldr r1, _080D0858 @ =gUnknown_20386E0 + ldr r1, _080D0858 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -60,7 +60,7 @@ sub_80D0840: @ 80D0840 pop {r0} bx r0 .align 2, 0 -_080D0858: .4byte gUnknown_20386E0 +_080D0858: .4byte gFieldEffectArguments _080D085C: .4byte gUnknown_81BE16E thumb_func_end sub_80D0840 @@ -79,7 +79,7 @@ sub_80D0860: @ 80D0860 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] - ldr r0, _080D089C @ =gUnknown_20386E0 + ldr r0, _080D089C @ =gFieldEffectArguments ldr r1, [r0] movs r0, 0x64 muls r0, r1 @@ -93,7 +93,7 @@ sub_80D0860: @ 80D0860 .align 2, 0 _080D0894: .4byte gTasks _080D0898: .4byte sub_80D08A8 -_080D089C: .4byte gUnknown_20386E0 +_080D089C: .4byte gFieldEffectArguments _080D08A0: .4byte gPlayerParty _080D08A4: .4byte gStringVar1 thumb_func_end sub_80D0860 diff --git a/asm/fldeff_sweetscent.s b/asm/fldeff_sweetscent.s index dfa734b91..47b9ef390 100644 --- a/asm/fldeff_sweetscent.s +++ b/asm/fldeff_sweetscent.s @@ -41,14 +41,14 @@ hm2_sweet_scent: @ 80DE0E8 movs r0, 0x33 bl FieldEffectStart bl GetCursorSelectionMonId - ldr r1, _080DE100 @ =gUnknown_20386E0 + ldr r1, _080DE100 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080DE100: .4byte gUnknown_20386E0 +_080DE100: .4byte gFieldEffectArguments thumb_func_end hm2_sweet_scent thumb_func_start FldEff_SweetScent @@ -87,13 +87,13 @@ sub_80DE134: @ 80DE134 bl Alloc adds r1, r0, 0 str r1, [r4] - ldr r4, _080DE1BC @ =gUnknown_20371F8 + ldr r4, _080DE1BC @ =gPlttBufferUnfaded movs r5, 0x80 lsls r5, 1 adds r0, r4, 0 adds r2, r5, 0 bl CpuFastSet - ldr r0, _080DE1C0 @ =gUnknown_20375F8 + ldr r0, _080DE1C0 @ =gPlttBufferFaded adds r1, r4, 0 adds r2, r5, 0 bl CpuFastSet @@ -137,8 +137,8 @@ sub_80DE134: @ 80DE134 bx r0 .align 2, 0 _080DE1B8: .4byte gUnknown_203AAB0 -_080DE1BC: .4byte gUnknown_20371F8 -_080DE1C0: .4byte gUnknown_20375F8 +_080DE1BC: .4byte gPlttBufferUnfaded +_080DE1C0: .4byte gPlttBufferFaded _080DE1C4: .4byte gSprites _080DE1C8: .4byte sub_80DE1D0 _080DE1CC: .4byte gTasks @@ -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 @@ -237,7 +237,7 @@ sub_80DE274: @ 80DE274 bne _080DE2AA ldr r4, _080DE2B4 @ =gUnknown_203AAB0 ldr r0, [r4] - ldr r1, _080DE2B8 @ =gUnknown_20371F8 + ldr r1, _080DE2B8 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -253,9 +253,9 @@ _080DE2AA: pop {r0} bx r0 .align 2, 0 -_080DE2B0: .4byte gUnknown_2037AB8 +_080DE2B0: .4byte gPaletteFade _080DE2B4: .4byte gUnknown_203AAB0 -_080DE2B8: .4byte gUnknown_20371F8 +_080DE2B8: .4byte gPlttBufferUnfaded _080DE2BC: .4byte gUnknown_81BE564 thumb_func_end sub_80DE274 diff --git a/asm/fldeff_teleport.s b/asm/fldeff_teleport.s index 0ac09c3f1..698ad4c23 100644 --- a/asm/fldeff_teleport.s +++ b/asm/fldeff_teleport.s @@ -44,14 +44,14 @@ hm_teleport_run_dp02scr: @ 80F6730 movs r0, 0x3F bl FieldEffectStart bl GetCursorSelectionMonId - ldr r1, _080F674C @ =gUnknown_20386E0 + ldr r1, _080F674C @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080F674C: .4byte gUnknown_20386E0 +_080F674C: .4byte gFieldEffectArguments thumb_func_end hm_teleport_run_dp02scr thumb_func_start FldEff_UseTeleport diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index e2cf4c477..147bc65c0 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 @@ -1330,8 +1330,8 @@ Task_Hof_HandlePaletteOnExit: @ 80F283C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080F287C @ =gUnknown_20375F8 - ldr r1, _080F2880 @ =gUnknown_20371F8 + ldr r0, _080F287C @ =gPlttBufferFaded + ldr r1, _080F2880 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 2 bl CpuSet @@ -1355,8 +1355,8 @@ Task_Hof_HandlePaletteOnExit: @ 80F283C pop {r0} bx r0 .align 2, 0 -_080F287C: .4byte gUnknown_20375F8 -_080F2880: .4byte gUnknown_20371F8 +_080F287C: .4byte gPlttBufferFaded +_080F2880: .4byte gPlttBufferUnfaded _080F2884: .4byte gTasks _080F2888: .4byte Task_Hof_HandleExit thumb_func_end Task_Hof_HandlePaletteOnExit @@ -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 @@ -2256,8 +2256,8 @@ sub_80F2FEC: @ 80F2FEC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080F3020 @ =gUnknown_20375F8 - ldr r1, _080F3024 @ =gUnknown_20371F8 + ldr r0, _080F3020 @ =gPlttBufferFaded + ldr r1, _080F3024 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 2 bl CpuSet @@ -2276,8 +2276,8 @@ sub_80F2FEC: @ 80F2FEC pop {r0} bx r0 .align 2, 0 -_080F3020: .4byte gUnknown_20375F8 -_080F3024: .4byte gUnknown_20371F8 +_080F3020: .4byte gPlttBufferFaded +_080F3024: .4byte gPlttBufferUnfaded _080F3028: .4byte gTasks _080F302C: .4byte sub_80F3030 thumb_func_end sub_80F2FEC diff --git a/asm/heal_location.s b/asm/heal_location.s index 33732a934..34eb1461b 100644 --- a/asm/heal_location.s +++ b/asm/heal_location.s @@ -112,7 +112,7 @@ sub_80BFCD0: @ 80BFCD0 movs r1, 0 bl VarSet _080BFD0A: - ldr r0, _080BFD34 @ =gUnknown_20370D2 + ldr r0, _080BFD34 @ =gSpecialVar_LastTalked strh r5, [r0] movs r0, 0x4 strh r0, [r4, 0x4] @@ -130,7 +130,7 @@ _080BFD24: .4byte 0x00004082 _080BFD28: .4byte gSaveBlock1Ptr _080BFD2C: .4byte 0x00003d34 _080BFD30: .4byte 0x00003d42 -_080BFD34: .4byte gUnknown_20370D2 +_080BFD34: .4byte gSpecialVar_LastTalked _080BFD38: ldr r0, _080BFD7C @ =gSaveBlock1Ptr ldr r1, [r0] @@ -239,7 +239,7 @@ _080BFDFA: thumb_func_start sub_80BFE00 sub_80BFE00: @ 80BFE00 - ldr r2, _080BFE10 @ =gUnknown_20370D2 + ldr r2, _080BFE10 @ =gSpecialVar_LastTalked ldr r1, _080BFE14 @ =gUnknown_83EECE8 subs r0, 0x1 adds r0, r1 @@ -247,7 +247,7 @@ sub_80BFE00: @ 80BFE00 strh r0, [r2] bx lr .align 2, 0 -_080BFE10: .4byte gUnknown_20370D2 +_080BFE10: .4byte gSpecialVar_LastTalked _080BFE14: .4byte gUnknown_83EECE8 thumb_func_end sub_80BFE00 diff --git a/asm/help_system.s b/asm/help_system.s index b0d5c5f34..7026c65d5 100644 --- a/asm/help_system.s +++ b/asm/help_system.s @@ -2040,14 +2040,14 @@ sub_813C828: @ 813C828 adds r2, r3 lsls r2, 24 lsrs r2, 24 - ldr r0, _0813C85C @ =gUnknown_841623B + ldr r0, _0813C85C @ =gFameCheckerText_ListMenuCursor bl sub_813C4CC pop {r4} pop {r0} bx r0 .align 2, 0 _0813C858: .4byte gUnknown_203F190 -_0813C85C: .4byte gUnknown_841623B +_0813C85C: .4byte gFameCheckerText_ListMenuCursor thumb_func_end sub_813C828 thumb_func_start sub_813C860 diff --git a/asm/help_system_812B1E0.s b/asm/help_system_812B1E0.s index b95ad8666..f9fb50cf7 100644 --- a/asm/help_system_812B1E0.s +++ b/asm/help_system_812B1E0.s @@ -49,13 +49,13 @@ _0812B21C: .4byte gUnknown_203B0EC thumb_func_start sub_812B220 sub_812B220: @ 812B220 ldr r0, _0812B22C @ =gUnknown_203B0EC - ldr r1, _0812B230 @ =gUnknown_20370C0 + ldr r1, _0812B230 @ =gSpecialVar_0x8004 ldrh r1, [r1] strh r1, [r0] bx lr .align 2, 0 _0812B22C: .4byte gUnknown_203B0EC -_0812B230: .4byte gUnknown_20370C0 +_0812B230: .4byte gSpecialVar_0x8004 thumb_func_end sub_812B220 thumb_func_start sub_812B234 @@ -357,14 +357,14 @@ _0812B458: .4byte gUnknown_203B0EE thumb_func_start sub_812B45C sub_812B45C: @ 812B45C push {lr} - ldr r0, _0812B46C @ =gUnknown_3003F64 + ldr r0, _0812B46C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 beq _0812B470 movs r0, 0x1 b _0812B472 .align 2, 0 -_0812B46C: .4byte gUnknown_3003F64 +_0812B46C: .4byte gReceivedRemoteLinkPlayers _0812B470: movs r0, 0 _0812B472: 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 62951aa55..af5104da3 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 @@ -2477,7 +2477,7 @@ _080EDA1C: ldr r2, _080EDA50 @ =0x00007fff adds r0, r2, 0 strh r0, [r1] - ldr r1, _080EDA54 @ =gUnknown_2037218 + ldr r1, _080EDA54 @ =gPlttBufferUnfaded + 0x20 ldr r2, _080EDA58 @ =0x01000020 add r0, sp, 0x4 bl CpuSet @@ -2492,10 +2492,10 @@ _080EDA1C: b _080EDA6E .align 2, 0 _080EDA50: .4byte 0x00007fff -_080EDA54: .4byte gUnknown_2037218 +_080EDA54: .4byte gPlttBufferUnfaded + 0x20 _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.s b/asm/item.s index 08df51656..aa64e54fa 100644 --- a/asm/item.s +++ b/asm/item.s @@ -326,13 +326,13 @@ sub_8099FAC: @ 8099FAC .align 2, 0 _08099FC0: .4byte 0x0000016d _08099FC4: - ldr r1, _08099FD0 @ =gUnknown_20370D0 + ldr r1, _08099FD0 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] movs r0, 0x1 b _08099FF6 .align 2, 0 -_08099FD0: .4byte gUnknown_20370D0 +_08099FD0: .4byte gSpecialVar_Result _08099FD4: movs r4, 0x85 _08099FD6: @@ -349,7 +349,7 @@ _08099FD6: cmp r4, 0xAF bls _08099FD6 _08099FF0: - ldr r0, _08099FFC @ =gUnknown_20370D0 + ldr r0, _08099FFC @ =gSpecialVar_Result strh r1, [r0] movs r0, 0 _08099FF6: @@ -357,7 +357,7 @@ _08099FF6: pop {r1} bx r1 .align 2, 0 -_08099FFC: .4byte gUnknown_20370D0 +_08099FFC: .4byte gSpecialVar_Result thumb_func_end sub_8099FAC thumb_func_start sub_809A000 diff --git a/asm/item_menu.s b/asm/item_menu.s index dbb01f15a..58b74acf3 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -94,7 +94,7 @@ _08107E5A: strb r0, [r2, 0x5] movs r1, 0 ldr r4, _08107EA4 @ =gTextFlags - ldr r5, _08107EA8 @ =gUnknown_203AD30 + ldr r5, _08107EA8 @ =gSpecialVar_ItemId ldr r6, _08107EAC @ =sub_8107F10 ldr r3, _08107EB0 @ =gUnknown_203AD10 movs r2, 0 @@ -132,14 +132,14 @@ _08107E9A: bx r0 .align 2, 0 _08107EA4: .4byte gTextFlags -_08107EA8: .4byte gUnknown_203AD30 +_08107EA8: .4byte gSpecialVar_ItemId _08107EAC: .4byte sub_8107F10 _08107EB0: .4byte gUnknown_203AD10 _08107EB4: .4byte gUnknown_203ACFC thumb_func_end sub_8107DB4 - thumb_func_start sub_8107EB8 -sub_8107EB8: @ 8107EB8 + thumb_func_start UseFameCheckerFromMenu +UseFameCheckerFromMenu: @ 8107EB8 push {lr} ldr r2, _08107EC8 @ =sub_80568A8 movs r0, 0 @@ -149,7 +149,7 @@ sub_8107EB8: @ 8107EB8 bx r0 .align 2, 0 _08107EC8: .4byte sub_80568A8 - thumb_func_end sub_8107EB8 + thumb_func_end UseFameCheckerFromMenu thumb_func_start sub_8107ECC sub_8107ECC: @ 8107ECC @@ -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 @@ -871,7 +871,7 @@ _0810848C: bl StringCopy ldr r0, [r5] adds r0, r4 - ldr r1, _08108550 @ =gUnknown_84161C1 + ldr r1, _08108550 @ =gFameCheckerText_Cancel bl StringAppend ldr r0, _08108548 @ =gUnknown_203AD18 ldr r2, [r0] @@ -951,7 +951,7 @@ _08108540: .4byte gUnknown_203AD10 _08108544: .4byte gUnknown_203AD1C _08108548: .4byte gUnknown_203AD18 _0810854C: .4byte gUnknown_8452F60 -_08108550: .4byte gUnknown_84161C1 +_08108550: .4byte gFameCheckerText_Cancel _08108554: .4byte gUnknown_3005E70 _08108558: .4byte sub_81085A4 _0810855C: .4byte sub_8108654 @@ -1257,7 +1257,7 @@ bag_menu_print_cursor: @ 810878C bl FillWindowPixelRect b _081087DE _081087C8: - ldr r2, _081087E8 @ =gUnknown_841623B + ldr r2, _081087E8 @ =gFameCheckerText_ListMenuCursor str r5, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -1273,7 +1273,7 @@ _081087DE: pop {r0} bx r0 .align 2, 0 -_081087E8: .4byte gUnknown_841623B +_081087E8: .4byte gFameCheckerText_ListMenuCursor thumb_func_end bag_menu_print_cursor thumb_func_start sub_81087EC @@ -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 @@ -2367,7 +2367,7 @@ _08109014: .4byte gUnknown_203ACFC _08109018: movs r0, 0x5 bl PlaySE - ldr r1, _08109038 @ =gUnknown_203AD30 + ldr r1, _08109038 @ =gSpecialVar_ItemId movs r0, 0 strh r0, [r1] bl sub_8108CB4 @@ -2379,7 +2379,7 @@ _08109018: ldr r1, _08109040 @ =sub_8108B50 b _081090C4 .align 2, 0 -_08109038: .4byte gUnknown_203AD30 +_08109038: .4byte gSpecialVar_ItemId _0810903C: .4byte gTasks _08109040: .4byte sub_8108B50 _08109044: @@ -2393,7 +2393,7 @@ _08109044: ldrb r0, [r0] cmp r4, r0 bne _08109084 - ldr r1, _08109078 @ =gUnknown_203AD30 + ldr r1, _08109078 @ =gSpecialVar_ItemId movs r0, 0 strh r0, [r1] bl sub_8108CB4 @@ -2406,7 +2406,7 @@ _08109044: b _081090C4 .align 2, 0 _08109074: .4byte gUnknown_203AD10 -_08109078: .4byte gUnknown_203AD30 +_08109078: .4byte gSpecialVar_ItemId _0810907C: .4byte gTasks _08109080: .4byte sub_8108B50 _08109084: @@ -2430,7 +2430,7 @@ _08109084: lsrs r0, 24 adds r1, r4, 0 bl sub_809A798 - ldr r1, _081090D0 @ =gUnknown_203AD30 + ldr r1, _081090D0 @ =gSpecialVar_ItemId strh r0, [r1] ldr r1, _081090D4 @ =gTasks lsls r0, r6, 2 @@ -2446,7 +2446,7 @@ _081090C6: pop {r0} bx r0 .align 2, 0 -_081090D0: .4byte gUnknown_203AD30 +_081090D0: .4byte gSpecialVar_ItemId _081090D4: .4byte gTasks _081090D8: .4byte sub_81090DC thumb_func_end sub_8108F0C @@ -3404,7 +3404,7 @@ _081098AC: beq _08109924 b _0810993C _081098B6: - ldr r2, _081098D4 @ =gUnknown_203AD30 + ldr r2, _081098D4 @ =gSpecialVar_ItemId ldrh r1, [r2] ldr r0, _081098D8 @ =0x0000016d cmp r1, r0 @@ -3420,7 +3420,7 @@ _081098B6: movs r0, 0x2 b _08109AD0 .align 2, 0 -_081098D4: .4byte gUnknown_203AD30 +_081098D4: .4byte gSpecialVar_ItemId _081098D8: .4byte 0x0000016d _081098DC: .4byte gUnknown_203AD20 _081098E0: .4byte gUnknown_203AD24 @@ -3473,7 +3473,7 @@ _0810993C: cmp r0, 0x1 bne _081099C4 _08109950: - ldr r1, _08109970 @ =gUnknown_203AD30 + ldr r1, _08109970 @ =gSpecialVar_ItemId ldr r2, _08109974 @ =0xfffffe94 adds r0, r2, 0 ldrh r1, [r1] @@ -3489,7 +3489,7 @@ _08109950: movs r0, 0x2 b _08109AD0 .align 2, 0 -_08109970: .4byte gUnknown_203AD30 +_08109970: .4byte gSpecialVar_ItemId _08109974: .4byte 0xfffffe94 _08109978: .4byte gUnknown_203AD24 _0810997C: .4byte gUnknown_8452F2E @@ -3549,7 +3549,7 @@ _081099EC: ldr r4, _08109A0C @ =gUnknown_203AD28 movs r0, 0x4 strb r0, [r4] - ldr r0, _08109A10 @ =gUnknown_203AD30 + ldr r0, _08109A10 @ =gSpecialVar_ItemId ldrh r0, [r0] bl itemid_is_mail lsls r0, 24 @@ -3563,7 +3563,7 @@ _081099EC: b _08109AD4 .align 2, 0 _08109A0C: .4byte gUnknown_203AD28 -_08109A10: .4byte gUnknown_203AD30 +_08109A10: .4byte gSpecialVar_ItemId _08109A14: .4byte gUnknown_203AD24 _08109A18: .4byte gUnknown_8452F24 _08109A1C: @@ -3591,7 +3591,7 @@ _08109A34: ldr r0, [r0] ldr r1, _08109A6C @ =0x00000296 adds r0, r1 - ldr r1, _08109A70 @ =gUnknown_203AD30 + ldr r1, _08109A70 @ =gSpecialVar_ItemId ldrh r0, [r0] adds r7, r3, 0 ldrh r3, [r1] @@ -3605,7 +3605,7 @@ _08109A60: .4byte gUnknown_203AD20 _08109A64: .4byte gUnknown_203AD28 _08109A68: .4byte gSaveBlock1Ptr _08109A6C: .4byte 0x00000296 -_08109A70: .4byte gUnknown_203AD30 +_08109A70: .4byte gSpecialVar_ItemId _08109A74: movs r0, 0x2 _08109A76: @@ -3722,7 +3722,7 @@ _08109AD4: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08109BA8 @ =gUnknown_203AD30 + ldr r0, _08109BA8 @ =gSpecialVar_ItemId ldrh r0, [r0] ldr r1, _08109BAC @ =gStringVar1 bl sub_8099E90 @@ -3751,7 +3751,7 @@ _08109B98: .4byte gUnknown_203AD24 _08109B9C: .4byte gUnknown_8452F18 _08109BA0: .4byte gUnknown_203AD28 _08109BA4: .4byte gUnknown_8452EB8 -_08109BA8: .4byte gUnknown_203AD30 +_08109BA8: .4byte gSpecialVar_ItemId _08109BAC: .4byte gStringVar1 _08109BB0: .4byte gStringVar4 _08109BB4: .4byte gUnknown_84162FF @@ -3838,7 +3838,7 @@ sub_8109C50: @ 8109C50 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _08109CA0 @ =gUnknown_203AD30 + ldr r5, _08109CA0 @ =gSpecialVar_ItemId ldrh r0, [r5] bl ItemId_GetFieldFunc cmp r0, 0 @@ -3867,9 +3867,9 @@ sub_8109C50: @ 8109C50 bl sub_810A170 b _08109CB4 .align 2, 0 -_08109CA0: .4byte gUnknown_203AD30 +_08109CA0: .4byte gSpecialVar_ItemId _08109CA4: - ldr r0, _08109CBC @ =gUnknown_203AD30 + ldr r0, _08109CBC @ =gSpecialVar_ItemId ldrh r0, [r0] bl ItemId_GetFieldFunc adds r1, r0, 0 @@ -3880,7 +3880,7 @@ _08109CB4: pop {r0} bx r0 .align 2, 0 -_08109CBC: .4byte gUnknown_203AD30 +_08109CBC: .4byte gSpecialVar_ItemId thumb_func_end sub_8109C50 thumb_func_start sub_8109CC0 @@ -4197,7 +4197,7 @@ sub_8109F44: @ 8109F44 _08109F6E: movs r0, 0x5 bl PlaySE - ldr r0, _08109FF4 @ =gUnknown_203AD30 + ldr r0, _08109FF4 @ =gSpecialVar_ItemId ldrh r0, [r0] ldrh r1, [r7, 0x10] bl sub_809A1D8 @@ -4249,7 +4249,7 @@ _08109FE0: .align 2, 0 _08109FEC: .4byte gTasks+0x8 _08109FF0: .4byte gMain -_08109FF4: .4byte gUnknown_203AD30 +_08109FF4: .4byte gSpecialVar_ItemId _08109FF8: .4byte gUnknown_203ACFC _08109FFC: .4byte gUnknown_3005E70 thumb_func_end sub_8109F44 @@ -4444,7 +4444,7 @@ sub_810A18C: @ 810A18C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0810A1BC @ =gUnknown_203AD30 + ldr r0, _0810A1BC @ =gSpecialVar_ItemId ldrh r0, [r0] ldr r1, _0810A1C0 @ =gStringVar1 bl sub_8099E90 @@ -4461,7 +4461,7 @@ sub_810A18C: @ 810A18C pop {r0} bx r0 .align 2, 0 -_0810A1BC: .4byte gUnknown_203AD30 +_0810A1BC: .4byte gSpecialVar_ItemId _0810A1C0: .4byte gStringVar1 _0810A1C4: .4byte gStringVar4 _0810A1C8: .4byte gUnknown_841635E @@ -4634,7 +4634,7 @@ sub_810A324: @ 810A324 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _0810A36C @ =gUnknown_203AD30 + ldr r5, _0810A36C @ =gSpecialVar_ItemId ldrh r0, [r5] bl ItemId_GetBattleFunc cmp r0, 0 @@ -4660,7 +4660,7 @@ _0810A364: pop {r0} bx r0 .align 2, 0 -_0810A36C: .4byte gUnknown_203AD30 +_0810A36C: .4byte gSpecialVar_ItemId thumb_func_end sub_810A324 thumb_func_start sub_810A370 @@ -4936,7 +4936,7 @@ sub_810A568: @ 810A568 lsls r0, 3 ldr r1, _0810A58C @ =gTasks+0x8 adds r4, r0, r1 - ldr r6, _0810A590 @ =gUnknown_203AD30 + ldr r6, _0810A590 @ =gSpecialVar_ItemId ldrh r1, [r6] movs r0, 0xB6 lsls r0, 1 @@ -4946,7 +4946,7 @@ sub_810A568: @ 810A568 b _0810A5A0 .align 2, 0 _0810A58C: .4byte gTasks+0x8 -_0810A590: .4byte gUnknown_203AD30 +_0810A590: .4byte gSpecialVar_ItemId _0810A594: .4byte sub_810A654 _0810A598: ldr r0, _0810A5AC @ =0x0000016d @@ -5394,7 +5394,7 @@ sub_810A940: @ 810A940 bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _0810A9B8 @ =gUnknown_203AD30 + ldr r0, _0810A9B8 @ =gSpecialVar_ItemId ldrh r0, [r0] ldr r1, _0810A9BC @ =gStringVar1 bl sub_8099E90 @@ -5432,7 +5432,7 @@ sub_810A940: @ 810A940 bx r0 .align 2, 0 _0810A9B4: .4byte gTasks+0x8 -_0810A9B8: .4byte gUnknown_203AD30 +_0810A9B8: .4byte gSpecialVar_ItemId _0810A9BC: .4byte gStringVar1 _0810A9C0: .4byte gStringVar3 _0810A9C4: .4byte gUnknown_203ACFC @@ -5460,7 +5460,7 @@ sub_810A9D4: @ 810A9D4 mov r8, r1 movs r0, 0xF8 bl PlaySE - ldr r5, _0810AADC @ =gUnknown_203AD30 + ldr r5, _0810AADC @ =gSpecialVar_ItemId ldrh r0, [r5] mov r2, r8 ldrh r1, [r2, 0x10] @@ -5559,7 +5559,7 @@ sub_810A9D4: @ 810A9D4 bx r0 .align 2, 0 _0810AAD8: .4byte gTasks+0x8 -_0810AADC: .4byte gUnknown_203AD30 +_0810AADC: .4byte gSpecialVar_ItemId _0810AAE0: .4byte gSaveBlock1Ptr _0810AAE4: .4byte gUnknown_203ACFC _0810AAE8: .4byte gUnknown_203AD10 @@ -5741,7 +5741,7 @@ sub_810AC40: @ 810AC40 mov r9, r0 mov r7, r8 add r7, r9 - ldr r5, _0810ACD0 @ =gUnknown_203AD30 + ldr r5, _0810ACD0 @ =gSpecialVar_ItemId ldrh r0, [r5] ldrh r1, [r7, 0x10] bl sub_809A3C8 @@ -5791,7 +5791,7 @@ sub_810AC40: @ 810AC40 b _0810ACF8 .align 2, 0 _0810ACCC: .4byte gTasks+0x8 -_0810ACD0: .4byte gUnknown_203AD30 +_0810ACD0: .4byte gSpecialVar_ItemId _0810ACD4: .4byte 0x0000ffff _0810ACD8: .4byte gStringVar1 _0810ACDC: .4byte gStringVar2 @@ -5817,8 +5817,8 @@ _0810AD08: .4byte gUnknown_84163BB _0810AD0C: .4byte sub_810A1D0 thumb_func_end sub_810AC40 - thumb_func_start sub_810AD10 -sub_810AD10: @ 810AD10 + thumb_func_start UseRegisteredKeyItemOnField +UseRegisteredKeyItemOnField: @ 810AD10 push {r4-r6,lr} bl InUnionRoom cmp r0, 0x1 @@ -5848,7 +5848,7 @@ _0810AD1E: bl player_bitmagic bl sub_805C270 bl sub_805C780 - ldr r2, _0810AD88 @ =gUnknown_203AD30 + ldr r2, _0810AD88 @ =gSpecialVar_ItemId ldr r0, [r4] adds r0, r5 ldrh r1, [r0] @@ -5869,7 +5869,7 @@ _0810AD1E: .align 2, 0 _0810AD80: .4byte gSaveBlock1Ptr _0810AD84: .4byte 0x00000296 -_0810AD88: .4byte gUnknown_203AD30 +_0810AD88: .4byte gSpecialVar_ItemId _0810AD8C: .4byte gTasks _0810AD90: ldr r0, [r4] @@ -5887,7 +5887,7 @@ _0810ADA0: bx r1 .align 2, 0 _0810ADA8: .4byte gUnknown_81A77A0 - thumb_func_end sub_810AD10 + thumb_func_end UseRegisteredKeyItemOnField thumb_func_start sub_810ADAC sub_810ADAC: @ 810ADAC @@ -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 @@ -6187,14 +6187,14 @@ _0810AFF6: bl bag_menu_print_cursor_ movs r0, 0x1 bl sub_8109140 - ldr r1, _0810B018 @ =gUnknown_203AD30 + ldr r1, _0810B018 @ =gSpecialVar_ItemId movs r0, 0x4 strh r0, [r1] adds r0, r4, 0 bl sub_8109890 b _0810B064 .align 2, 0 -_0810B018: .4byte gUnknown_203AD30 +_0810B018: .4byte gSpecialVar_ItemId _0810B01C: movs r0, 0x5 bl PlaySE @@ -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 @@ -6493,7 +6493,7 @@ _0810B266: bl bag_menu_print_cursor_ movs r0, 0x1 bl sub_8109140 - ldr r1, _0810B28C @ =gUnknown_203AD30 + ldr r1, _0810B28C @ =gSpecialVar_ItemId movs r2, 0xB7 lsls r2, 1 adds r0, r2, 0 @@ -6502,7 +6502,7 @@ _0810B266: bl sub_8109890 b _0810B36C .align 2, 0 -_0810B28C: .4byte gUnknown_203AD30 +_0810B28C: .4byte gSpecialVar_ItemId _0810B290: movs r0, 0x5 bl PlaySE @@ -6514,7 +6514,7 @@ _0810B29E: bl PlaySE ldr r0, _0810B318 @ =gSaveBlock1Ptr ldr r0, [r0] - ldr r1, _0810B31C @ =gUnknown_203AD30 + ldr r1, _0810B31C @ =gSpecialVar_ItemId ldrh r1, [r1] ldr r2, _0810B320 @ =0x00000296 adds r0, r2 @@ -6562,7 +6562,7 @@ _0810B29E: b _0810B36C .align 2, 0 _0810B318: .4byte gSaveBlock1Ptr -_0810B31C: .4byte gUnknown_203AD30 +_0810B31C: .4byte gSpecialVar_ItemId _0810B320: .4byte 0x00000296 _0810B324: .4byte gUnknown_203ACFC _0810B328: .4byte gUnknown_3005E70 @@ -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] @@ -6713,14 +6713,14 @@ _0810B440: bl bag_menu_print_cursor_ movs r0, 0x1 bl sub_8109140 - ldr r1, _0810B464 @ =gUnknown_203AD30 + ldr r1, _0810B464 @ =gSpecialVar_ItemId movs r0, 0x4 strh r0, [r1] adds r0, r5, 0 bl sub_8109890 b _0810B4B0 .align 2, 0 -_0810B464: .4byte gUnknown_203AD30 +_0810B464: .4byte gSpecialVar_ItemId _0810B468: movs r0, 0x5 bl PlaySE @@ -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] @@ -6829,14 +6829,14 @@ _0810B53C: bl bag_menu_print_cursor_ movs r0, 0x1 bl sub_8109140 - ldr r1, _0810B560 @ =gUnknown_203AD30 + ldr r1, _0810B560 @ =gSpecialVar_ItemId movs r0, 0xE strh r0, [r1] adds r0, r4, 0 bl sub_8109890 b _0810B5C0 .align 2, 0 -_0810B560: .4byte gUnknown_203AD30 +_0810B560: .4byte gSpecialVar_ItemId _0810B564: movs r0, 0x5 bl PlaySE @@ -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 @@ -6962,7 +6962,7 @@ _0810B660: bl bag_menu_print_cursor_ movs r0, 0x1 bl sub_8109140 - ldr r1, _0810B688 @ =gUnknown_203AD30 + ldr r1, _0810B688 @ =gSpecialVar_ItemId movs r2, 0xB6 lsls r2, 1 adds r0, r2, 0 @@ -6971,7 +6971,7 @@ _0810B660: bl sub_8109890 b _0810B6E0 .align 2, 0 -_0810B688: .4byte gUnknown_203AD30 +_0810B688: .4byte gSpecialVar_ItemId _0810B68C: movs r0, 0x5 bl PlaySE diff --git a/asm/item_pc.s b/asm/item_pc.s index 2f84e0c36..b222b9ca2 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 @@ -589,7 +589,7 @@ _0810D8A4: ldr r3, [r0] lsls r0, r4, 3 adds r0, r3 - ldr r1, _0810D944 @ =gUnknown_84161C1 + ldr r1, _0810D944 @ =gFameCheckerText_Cancel str r1, [r0] movs r1, 0x2 negs r1, r1 @@ -657,7 +657,7 @@ _0810D8A4: _0810D938: .4byte gSaveBlock1Ptr _0810D93C: .4byte gUnknown_203ADC4 _0810D940: .4byte gUnknown_203ADBC -_0810D944: .4byte gUnknown_84161C1 +_0810D944: .4byte gFameCheckerText_Cancel _0810D948: .4byte gUnknown_3005E70 _0810D94C: .4byte sub_810D954 _0810D950: .4byte sub_810DA20 @@ -709,12 +709,12 @@ _0810D968: lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _0810D9C0 @ =gUnknown_8247094 + ldr r0, _0810D9C0 @ =gMoveNames adds r5, r1, r0 b _0810D9DA .align 2, 0 _0810D9BC: .4byte gUnknown_203ADBC -_0810D9C0: .4byte gUnknown_8247094 +_0810D9C0: .4byte gMoveNames _0810D9C4: adds r0, r4, 0 bl ItemId_GetDescription @@ -879,7 +879,7 @@ sub_810DAD4: @ 810DAD4 bl FillWindowPixelRect b _0810DB26 _0810DB10: - ldr r2, _0810DB30 @ =gUnknown_841623B + ldr r2, _0810DB30 @ =gFameCheckerText_ListMenuCursor str r5, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -895,7 +895,7 @@ _0810DB26: pop {r0} bx r0 .align 2, 0 -_0810DB30: .4byte gUnknown_841623B +_0810DB30: .4byte gFameCheckerText_ListMenuCursor thumb_func_end sub_810DAD4 thumb_func_start sub_810DB34 @@ -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 9b239520a..558e175f2 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -10,7 +10,7 @@ sub_80A0FBC: @ 80A0FBC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080A0FD8 @ =gUnknown_203AD30 + ldr r1, _080A0FD8 @ =gSpecialVar_ItemId ldrh r0, [r1] cmp r0, 0xAF bne _080A0FE0 @@ -22,7 +22,7 @@ sub_80A0FBC: @ 80A0FBC ldrb r0, [r1, 0x10] b _080A0FE6 .align 2, 0 -_080A0FD8: .4byte gUnknown_203AD30 +_080A0FD8: .4byte gSpecialVar_ItemId _080A0FDC: .4byte gTasks _080A0FE0: ldrh r0, [r1] @@ -31,7 +31,7 @@ _080A0FE6: subs r0, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1010 @ =gUnknown_203AD30 + ldr r0, _080A1010 @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetPocketByItemId lsls r0, 24 @@ -47,7 +47,7 @@ _080A0FE6: bl sub_813D808 b _080A1032 .align 2, 0 -_080A1010: .4byte gUnknown_203AD30 +_080A1010: .4byte gSpecialVar_ItemId _080A1014: .4byte gUnknown_83E2954 _080A1018: ldr r0, _080A1038 @ =gUnknown_83E2954 @@ -317,10 +317,10 @@ sub_80A1208: @ 80A1208 push {lr} sub sp, 0x24 mov r1, sp - ldr r0, _080A1224 @ =gUnknown_203AD30 + ldr r0, _080A1224 @ =gSpecialVar_ItemId ldrh r0, [r0] strh r0, [r1, 0x20] - ldr r1, _080A1228 @ =sub_8107EB8 + ldr r1, _080A1228 @ =UseFameCheckerFromMenu mov r0, sp movs r2, 0 bl sub_80BEBEC @@ -328,8 +328,8 @@ sub_80A1208: @ 80A1208 pop {r0} bx r0 .align 2, 0 -_080A1224: .4byte gUnknown_203AD30 -_080A1228: .4byte sub_8107EB8 +_080A1224: .4byte gSpecialVar_ItemId +_080A1228: .4byte UseFameCheckerFromMenu thumb_func_end sub_80A1208 thumb_func_start sub_80A122C @@ -348,7 +348,7 @@ sub_80A122C: @ 80A122C ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x83 @@ -506,7 +506,7 @@ sub_80A137C: @ 80A137C ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r6, r0, 16 lsls r0, r6, 24 @@ -571,7 +571,7 @@ ItemUseOnFieldCB_Rod: @ 80A1410 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080A1434 @ =gUnknown_203AD30 + ldr r0, _080A1434 @ =gSpecialVar_ItemId ldrh r0, [r0] bl ItemId_GetSecondaryId lsls r0, 24 @@ -583,7 +583,7 @@ ItemUseOnFieldCB_Rod: @ 80A1410 pop {r0} bx r0 .align 2, 0 -_080A1434: .4byte gUnknown_203AD30 +_080A1434: .4byte gSpecialVar_ItemId thumb_func_end ItemUseOnFieldCB_Rod thumb_func_start ItemUseOutOfBattle_Itemfinder @@ -625,7 +625,7 @@ sub_80A1460: @ 80A1460 ldr r1, _080A14BC @ =gUnknown_8416537 adds r0, r4, 0 bl StringExpandPlaceholders - ldr r0, _080A14C0 @ =gUnknown_203AD30 + ldr r0, _080A14C0 @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r3, _080A14C4 @ =0x0000ffff movs r0, 0x4 @@ -650,7 +650,7 @@ sub_80A1460: @ 80A1460 _080A14B4: .4byte gStringVar1 _080A14B8: .4byte gStringVar4 _080A14BC: .4byte gUnknown_8416537 -_080A14C0: .4byte gUnknown_203AD30 +_080A14C0: .4byte gSpecialVar_ItemId _080A14C4: .4byte 0x0000ffff _080A14C8: .4byte gTasks _080A14CC: .4byte sub_810A1F8 @@ -684,7 +684,7 @@ sub_80A14E8: @ 80A14E8 ldr r1, _080A1540 @ =gUnknown_8416644 adds r0, r4, 0 bl StringExpandPlaceholders - ldr r0, _080A1544 @ =gUnknown_203AD30 + ldr r0, _080A1544 @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r3, _080A1548 @ =0x0000ffff movs r0, 0x4 @@ -709,7 +709,7 @@ sub_80A14E8: @ 80A14E8 _080A1538: .4byte gStringVar1 _080A153C: .4byte gStringVar4 _080A1540: .4byte gUnknown_8416644 -_080A1544: .4byte gUnknown_203AD30 +_080A1544: .4byte gSpecialVar_ItemId _080A1548: .4byte 0x0000ffff _080A154C: .4byte gTasks _080A1550: .4byte sub_810A1F8 @@ -760,7 +760,7 @@ _080A1598: bcc _080A1578 cmp r6, 0 beq _080A1600 - ldr r0, _080A15D4 @ =gUnknown_203AD30 + ldr r0, _080A15D4 @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r3, _080A15D8 @ =0x0000ffff movs r0, 0x4 @@ -780,7 +780,7 @@ _080A1598: b _080A1616 .align 2, 0 _080A15D0: .4byte gPlayerParty -_080A15D4: .4byte gUnknown_203AD30 +_080A15D4: .4byte gSpecialVar_ItemId _080A15D8: .4byte 0x0000ffff _080A15DC: .4byte gTasks _080A15E0: .4byte gUnknown_8416690 @@ -1045,14 +1045,14 @@ _080A17D0: .4byte sub_80A17E8 thumb_func_start sub_80A17D4 sub_80A17D4: @ 80A17D4 push {lr} - ldr r1, _080A17E4 @ =sub_8107EB8 + ldr r1, _080A17E4 @ =UseFameCheckerFromMenu movs r0, 0 movs r2, 0 bl sub_81317F8 pop {r0} bx r0 .align 2, 0 -_080A17E4: .4byte sub_8107EB8 +_080A17E4: .4byte UseFameCheckerFromMenu thumb_func_end sub_80A17D4 thumb_func_start sub_80A17E8 @@ -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 @@ -1123,14 +1123,14 @@ _080A1868: .4byte sub_80A1880 thumb_func_start sub_80A186C sub_80A186C: @ 80A186C push {lr} - ldr r1, _080A187C @ =sub_8107EB8 + ldr r1, _080A187C @ =UseFameCheckerFromMenu movs r0, 0 movs r2, 0 bl sub_813CD50 pop {r0} bx r0 .align 2, 0 -_080A187C: .4byte sub_8107EB8 +_080A187C: .4byte UseFameCheckerFromMenu thumb_func_end sub_80A186C thumb_func_start sub_80A1880 @@ -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 @@ -1196,7 +1196,7 @@ sub_80A18EC: @ 80A18EC push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1920 @ =gUnknown_203AD30 + ldr r0, _080A1920 @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r3, _080A1924 @ =0x0000ffff movs r0, 0x4 @@ -1217,7 +1217,7 @@ sub_80A18EC: @ 80A18EC bl sub_8108B50 b _080A1940 .align 2, 0 -_080A1920: .4byte gUnknown_203AD30 +_080A1920: .4byte gSpecialVar_ItemId _080A1924: .4byte 0x0000ffff _080A1928: .4byte gTasks _080A192C: .4byte sub_80A194C @@ -1239,13 +1239,13 @@ _080A1948: .4byte sub_80A1960 thumb_func_start sub_80A194C sub_80A194C: @ 80A194C push {lr} - ldr r1, _080A195C @ =sub_8107EB8 + ldr r1, _080A195C @ =UseFameCheckerFromMenu movs r0, 0 bl sub_815ABC4 pop {r0} bx r0 .align 2, 0 -_080A195C: .4byte sub_8107EB8 +_080A195C: .4byte UseFameCheckerFromMenu thumb_func_end sub_80A194C thumb_func_start sub_80A1960 @@ -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 @@ -1323,7 +1323,7 @@ sub_80A19E8: @ 80A19E8 lsls r0, 24 cmp r0, 0 bne _080A1A2A - ldr r4, _080A1A30 @ =gUnknown_203AD30 + ldr r4, _080A1A30 @ =gSpecialVar_ItemId ldrh r2, [r4] ldr r3, _080A1A34 @ =0x0000ffff movs r0, 0x4 @@ -1348,7 +1348,7 @@ _080A1A2A: pop {r0} bx r0 .align 2, 0 -_080A1A30: .4byte gUnknown_203AD30 +_080A1A30: .4byte gSpecialVar_ItemId _080A1A34: .4byte 0x0000ffff _080A1A38: .4byte 0x00004020 _080A1A3C: .4byte gStringVar4 @@ -1358,7 +1358,7 @@ _080A1A40: .4byte sub_810A1F8 thumb_func_start sub_80A1A44 sub_80A1A44: @ 80A1A44 push {r4,lr} - ldr r4, _080A1A84 @ =gUnknown_203AD30 + ldr r4, _080A1A84 @ =gSpecialVar_ItemId ldrh r0, [r4] movs r1, 0x1 bl sub_809A1D8 @@ -1382,7 +1382,7 @@ sub_80A1A44: @ 80A1A44 pop {r0} bx r0 .align 2, 0 -_080A1A84: .4byte gUnknown_203AD30 +_080A1A84: .4byte gSpecialVar_ItemId _080A1A88: .4byte gStringVar2 _080A1A8C: .4byte gStringVar4 _080A1A90: .4byte gUnknown_841658C @@ -1394,7 +1394,7 @@ sub_80A1A94: @ 80A1A94 lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 - ldr r5, _080A1AD4 @ =gUnknown_203AD30 + ldr r5, _080A1AD4 @ =gSpecialVar_ItemId ldrh r2, [r5] ldr r3, _080A1AD8 @ =0x0000ffff movs r0, 0x4 @@ -1418,7 +1418,7 @@ sub_80A1A94: @ 80A1A94 adds r0, r4 b _080A1B1A .align 2, 0 -_080A1AD4: .4byte gUnknown_203AD30 +_080A1AD4: .4byte gSpecialVar_ItemId _080A1AD8: .4byte 0x0000ffff _080A1ADC: .4byte 0x00000803 _080A1AE0: .4byte 0x00000804 @@ -1527,7 +1527,7 @@ ItemUseOutOfBattle_EscapeRope: @ 80A1BAC lsrs r0, 24 cmp r0, 0x1 bne _080A1BEC - ldr r0, _080A1BDC @ =gUnknown_203AD30 + ldr r0, _080A1BDC @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r0, _080A1BE0 @ =gMapHeader ldrb r3, [r0, 0x14] @@ -1541,7 +1541,7 @@ ItemUseOutOfBattle_EscapeRope: @ 80A1BAC bl sub_80A103C b _080A1BFE .align 2, 0 -_080A1BDC: .4byte gUnknown_203AD30 +_080A1BDC: .4byte gSpecialVar_ItemId _080A1BE0: .4byte gMapHeader _080A1BE4: .4byte gUnknown_2039998 _080A1BE8: .4byte sub_80A1C08 @@ -1646,13 +1646,13 @@ _080A1CA8: .4byte sub_80A1CC0 thumb_func_start sub_80A1CAC sub_80A1CAC: @ 80A1CAC push {lr} - ldr r1, _080A1CBC @ =sub_8107EB8 + ldr r1, _080A1CBC @ =UseFameCheckerFromMenu movs r0, 0 bl sub_80BFF50 pop {r0} bx r0 .align 2, 0 -_080A1CBC: .4byte sub_8107EB8 +_080A1CBC: .4byte UseFameCheckerFromMenu thumb_func_end sub_80A1CAC thumb_func_start sub_80A1CC0 @@ -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 @@ -1687,7 +1687,7 @@ sub_80A1CF8: @ 80A1CF8 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1D2C @ =gUnknown_203AD30 + ldr r0, _080A1D2C @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r3, _080A1D30 @ =0x0000ffff movs r0, 0x4 @@ -1708,7 +1708,7 @@ sub_80A1CF8: @ 80A1CF8 bl sub_8108B50 b _080A1D4C .align 2, 0 -_080A1D2C: .4byte gUnknown_203AD30 +_080A1D2C: .4byte gSpecialVar_ItemId _080A1D30: .4byte 0x0000ffff _080A1D34: .4byte gTasks _080A1D38: .4byte sub_80A1D58 @@ -1730,12 +1730,12 @@ _080A1D54: .4byte sub_80A1D68 thumb_func_start sub_80A1D58 sub_80A1D58: @ 80A1D58 push {lr} - ldr r0, _080A1D64 @ =sub_8107EB8 - bl sub_812C3AC + ldr r0, _080A1D64 @ =UseFameCheckerFromMenu + bl UseFameChecker pop {r0} bx r0 .align 2, 0 -_080A1D64: .4byte sub_8107EB8 +_080A1D64: .4byte UseFameCheckerFromMenu thumb_func_end sub_80A1D58 thumb_func_start sub_80A1D68 @@ -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 @@ -1752,7 +1752,7 @@ sub_80A1D68: @ 80A1D68 bl sub_80563F0 bl sub_80A1184 ldr r0, _080A1D98 @ =c2_exit_to_overworld_2_switch - bl sub_812C3AC + bl UseFameChecker adds r0, r4, 0 bl DestroyTask _080A1D8E: @@ -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 @@ -1841,7 +1841,7 @@ sub_80A1E1C: @ 80A1E1C lsls r0, 24 cmp r0, 0 bne _080A1E48 - ldr r0, _080A1E44 @ =gUnknown_203AD30 + ldr r0, _080A1E44 @ =gSpecialVar_ItemId ldrh r0, [r0] movs r1, 0x1 bl sub_809A1D8 @@ -1850,7 +1850,7 @@ sub_80A1E1C: @ 80A1E1C bl sub_8108B50 b _080A1E54 .align 2, 0 -_080A1E44: .4byte gUnknown_203AD30 +_080A1E44: .4byte gSpecialVar_ItemId _080A1E48: ldr r2, _080A1E5C @ =gUnknown_8416631 ldr r3, _080A1E60 @ =sub_810A1F8 @@ -1895,7 +1895,7 @@ sub_80A1E7C: @ 80A1E7C muls r0, r2 ldr r1, _080A1EC4 @ =gPlayerParty adds r0, r1 - ldr r1, _080A1EC8 @ =gUnknown_203AD30 + ldr r1, _080A1EC8 @ =gSpecialVar_ItemId ldrh r1, [r1] lsls r2, 24 lsrs r2, 24 @@ -1915,7 +1915,7 @@ sub_80A1E7C: @ 80A1E7C _080A1EBC: .4byte gBattlerPartyIndexes _080A1EC0: .4byte gBattlerInMenuId _080A1EC4: .4byte gPlayerParty -_080A1EC8: .4byte gUnknown_203AD30 +_080A1EC8: .4byte gSpecialVar_ItemId _080A1ECC: .4byte gUnknown_84169DC _080A1ED0: .4byte sub_810A1F8 _080A1ED4: @@ -1953,7 +1953,7 @@ sub_80A1EF4: @ 80A1EF4 asrs r0, 16 cmp r0, 0x7 ble _080A1F36 - ldr r0, _080A1F40 @ =gUnknown_203AD30 + ldr r0, _080A1F40 @ =gSpecialVar_ItemId ldrh r4, [r0] movs r0, 0x1 bl PlaySE @@ -1973,7 +1973,7 @@ _080A1F36: bx r0 .align 2, 0 _080A1F3C: .4byte gTasks+0x8 -_080A1F40: .4byte gUnknown_203AD30 +_080A1F40: .4byte gSpecialVar_ItemId _080A1F44: .4byte sub_80A1F48 thumb_func_end sub_80A1EF4 @@ -2009,7 +2009,7 @@ sub_80A1F78: @ 80A1F78 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1F9C @ =gUnknown_203AD30 + ldr r0, _080A1F9C @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetPocketByItemId lsls r0, 24 @@ -2022,7 +2022,7 @@ sub_80A1F78: @ 80A1F78 bl sub_813D808 b _080A1FB0 .align 2, 0 -_080A1F9C: .4byte gUnknown_203AD30 +_080A1F9C: .4byte gSpecialVar_ItemId _080A1FA0: .4byte sub_81279E0 _080A1FA4: ldr r0, _080A1FB8 @ =sub_81279E0 @@ -2097,7 +2097,7 @@ sub_80A2010: @ 80A2010 cmp r0, 0 bne _080A2058 bl sub_80A1A44 - ldr r0, _080A2048 @ =gUnknown_203AD30 + ldr r0, _080A2048 @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r3, _080A204C @ =0x0000ffff movs r0, 0x4 @@ -2111,7 +2111,7 @@ sub_80A2010: @ 80A2010 b _080A2060 .align 2, 0 _080A2044: .4byte gBattleTypeFlags -_080A2048: .4byte gUnknown_203AD30 +_080A2048: .4byte gSpecialVar_ItemId _080A204C: .4byte 0x0000ffff _080A2050: .4byte gStringVar4 _080A2054: .4byte sub_8108B50 @@ -2130,7 +2130,7 @@ ItemUseOutOfBattle_EnigmaBerry: @ 80A2068 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A208C @ =gUnknown_203AD30 + ldr r0, _080A208C @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetItemEffectType lsls r0, 24 @@ -2146,7 +2146,7 @@ _080A2082: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080A208C: .4byte gUnknown_203AD30 +_080A208C: .4byte gSpecialVar_ItemId _080A2090: .4byte _080A2094 .align 2, 0 _080A2094: @@ -2259,7 +2259,7 @@ ItemUseInBattle_EnigmaBerry: @ 80A2194 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A21B4 @ =gUnknown_203AD30 + ldr r0, _080A21B4 @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetItemEffectType lsls r0, 24 @@ -2272,7 +2272,7 @@ ItemUseInBattle_EnigmaBerry: @ 80A2194 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080A21B4: .4byte gUnknown_203AD30 +_080A21B4: .4byte gSpecialVar_ItemId _080A21B8: .4byte _080A21BC .align 2, 0 _080A21BC: @@ -2324,7 +2324,7 @@ sub_80A2238: @ 80A2238 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080A2268 @ =gUnknown_203AD30 + ldr r0, _080A2268 @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetPocketByItemId lsls r0, 24 @@ -2342,7 +2342,7 @@ sub_80A2238: @ 80A2238 bl sub_813EB20 b _080A228A .align 2, 0 -_080A2268: .4byte gUnknown_203AD30 +_080A2268: .4byte gSpecialVar_ItemId _080A226C: .4byte gStringVar4 _080A2270: .4byte gUnknown_8416425 _080A2274: .4byte sub_813E2B8 diff --git a/asm/itemfinder.s b/asm/itemfinder.s index d25a0c486..bf3e78ebc 100644 --- a/asm/itemfinder.s +++ b/asm/itemfinder.s @@ -369,14 +369,14 @@ sub_813EF40: @ 813EF40 adds r0, r5, 0 movs r1, 0x1 bl sub_80CC44C - ldr r1, _0813EF90 @ =gUnknown_20370C0 + ldr r1, _0813EF90 @ =gSpecialVar_0x8004 strh r0, [r1] adds r0, r5, 0 movs r1, 0 bl sub_80CC44C ldr r1, _0813EF94 @ =gSpecialVar_0x8005 strh r0, [r1] - ldr r0, _0813EF98 @ =gUnknown_20370C4 + ldr r0, _0813EF98 @ =gSpecialVar_0x8006 movs r5, 0x1 strh r5, [r0] ldrh r1, [r1] @@ -394,9 +394,9 @@ sub_813EF40: @ 813EF40 bx r0 .align 2, 0 _0813EF8C: .4byte gTasks+0x8 -_0813EF90: .4byte gUnknown_20370C0 +_0813EF90: .4byte gSpecialVar_0x8004 _0813EF94: .4byte gSpecialVar_0x8005 -_0813EF98: .4byte gUnknown_20370C4 +_0813EF98: .4byte gSpecialVar_0x8006 thumb_func_end sub_813EF40 thumb_func_start sub_813EF9C diff --git a/asm/learn_move.s b/asm/learn_move.s index a059a8f99..5068e6d16 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 @@ -182,7 +182,7 @@ sub_80E478C: @ 80E478C str r0, [r4] bl sub_80E4F54 ldr r0, [r4] - ldr r1, _080E47F4 @ =gUnknown_20370C0 + ldr r1, _080E47F4 @ =gSpecialVar_0x8004 ldrh r1, [r1] movs r2, 0x98 lsls r2, 2 @@ -205,7 +205,7 @@ sub_80E478C: @ 80E478C .align 2, 0 _080E47EC: .4byte gUnknown_203AAB4 _080E47F0: .4byte 0x00000a6c -_080E47F4: .4byte gUnknown_20370C0 +_080E47F4: .4byte gSpecialVar_0x8004 _080E47F8: .4byte sub_80E4620 _080E47FC: .4byte sub_80E4870 thumb_func_end sub_80E478C @@ -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] @@ -505,7 +505,7 @@ _080E4A88: beq _080E4AE0 ldr r0, _080E4AD8 @ =gUnknown_841E405 bl sub_80E48C0 - ldr r1, _080E4ADC @ =gUnknown_20370C0 + ldr r1, _080E4ADC @ =gSpecialVar_0x8004 movs r0, 0x1 strh r0, [r1] ldr r1, [r4] @@ -517,7 +517,7 @@ _080E4ACC: .4byte gPlayerParty _080E4AD0: .4byte 0x00000a67 _080E4AD4: .4byte 0xffff0000 _080E4AD8: .4byte gUnknown_841E405 -_080E4ADC: .4byte gUnknown_20370C0 +_080E4ADC: .4byte gSpecialVar_0x8004 _080E4AE0: ldr r1, [r4] movs r0, 0x10 @@ -567,11 +567,11 @@ _080E4B3A: beq _080E4B4C b _080E4EDA _080E4B40: - ldr r0, _080E4B48 @ =gUnknown_20370C0 + ldr r0, _080E4B48 @ =gSpecialVar_0x8004 strh r1, [r0] b _080E4ED2 .align 2, 0 -_080E4B48: .4byte gUnknown_20370C0 +_080E4B48: .4byte gSpecialVar_0x8004 _080E4B4C: ldr r0, _080E4B54 @ =gUnknown_203AAB4 ldr r1, [r0] @@ -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 @@ -882,7 +882,7 @@ _080E4DB4: mov r9, r1 mov r1, r9 muls r1, r0 - ldr r3, _080E4E58 @ =gUnknown_8247094 + ldr r3, _080E4E58 @ =gMoveNames mov r8, r3 add r1, r8 adds r0, r2, 0 @@ -931,19 +931,19 @@ _080E4DB4: ldr r1, [r7] movs r0, 0x1E strb r0, [r1] - ldr r1, _080E4E6C @ =gUnknown_20370C0 + ldr r1, _080E4E6C @ =gSpecialVar_0x8004 movs r0, 0x1 strh r0, [r1] b _080E4EDA .align 2, 0 _080E4E50: .4byte gPlayerParty _080E4E54: .4byte gStringVar3 -_080E4E58: .4byte gUnknown_8247094 +_080E4E58: .4byte gMoveNames _080E4E5C: .4byte 0x00000261 _080E4E60: .4byte 0x00000a67 _080E4E64: .4byte gStringVar2 _080E4E68: .4byte gUnknown_841E493 -_080E4E6C: .4byte gUnknown_20370C0 +_080E4E6C: .4byte gSpecialVar_0x8004 _080E4E70: ldr r0, _080E4E88 @ =gUnknown_841E4C0 bl sub_80E48C0 @@ -1297,7 +1297,7 @@ _080E511A: adds r1, r2 ldrh r1, [r1] muls r1, r7 - ldr r2, _080E51F0 @ =gUnknown_8247094 + ldr r2, _080E51F0 @ =gMoveNames adds r1, r2 bl StringCopy adds r4, 0xD @@ -1331,7 +1331,7 @@ _080E513C: lsls r7, 1 adds r1, r7 adds r0, r1 - ldr r1, _080E51F8 @ =gUnknown_84161C1 + ldr r1, _080E51F8 @ =gFameCheckerText_Cancel bl StringCopy ldr r1, [r4] ldrb r0, [r1, 0x1A] @@ -1367,7 +1367,7 @@ _080E51AA: adds r0, r2, 0 adds r0, 0x20 adds r0, r3 - ldr r1, _080E51F8 @ =gUnknown_84161C1 + ldr r1, _080E51F8 @ =gFameCheckerText_Cancel str r1, [r0] adds r2, 0x24 adds r2, r3 @@ -1394,9 +1394,9 @@ _080E51AA: .align 2, 0 _080E51E8: .4byte gUnknown_203AAB4 _080E51EC: .4byte gPlayerParty -_080E51F0: .4byte gUnknown_8247094 +_080E51F0: .4byte gMoveNames _080E51F4: .4byte gStringVar1 -_080E51F8: .4byte gUnknown_84161C1 +_080E51F8: .4byte gFameCheckerText_Cancel _080E51FC: .4byte gUnknown_3005E70 _080E5200: .4byte gUnknown_83FFA94 thumb_func_end sub_80E50CC diff --git a/asm/librfu.s b/asm/librfu.s index 6995a9ac1..bdf816bd8 100644 --- a/asm/librfu.s +++ b/asm/librfu.s @@ -2769,11 +2769,11 @@ _081E0956: thumb_func_start sub_81E095C sub_81E095C: @ 81E095C push {lr} - ldr r2, _081E0964 @ =gUnknown_86FC068 + ldr r2, _081E0964 @ =_Str_RFU_MBOOT ldr r3, _081E0968 @ =0x30000F0 b _081E0976 .align 2, 0 -_081E0964: .4byte gUnknown_86FC068 +_081E0964: .4byte _Str_RFU_MBOOT _081E0968: .4byte 0x30000F0 _081E096C: ldrb r0, [r3] @@ -5794,7 +5794,7 @@ _081E1FF0: movs r2, 0 movs r0, 0x1 ands r0, r3 - ldr r4, _081E2020 @ =gUnknown_86FC03C + ldr r4, _081E2020 @ =_Str_RfuHeader cmp r0, 0 bne _081E2012 movs r1, 0x1 @@ -5818,7 +5818,7 @@ _081E2012: adds r1, 0xF b _081E202E .align 2, 0 -_081E2020: .4byte gUnknown_86FC03C +_081E2020: .4byte _Str_RfuHeader _081E2024: cmp r0, 0 bne _081E2030 @@ -6832,7 +6832,7 @@ rfu_STC_NI_constructLLSF: @ 81E2790 ldr r0, [r2] ldrb r0, [r0] lsls r0, 4 - ldr r1, _081E2810 @ =gUnknown_86FC03C + ldr r1, _081E2810 @ =_Str_RfuHeader adds r0, r1 mov r8, r0 ldrh r1, [r4] @@ -6883,7 +6883,7 @@ _081E27FA: b _081E285C .align 2, 0 _081E280C: .4byte gUnknown_3007460 -_081E2810: .4byte gUnknown_86FC03C +_081E2810: .4byte _Str_RfuHeader _081E2814: .4byte 0x00008022 _081E2818: ldr r0, _081E2844 @ =0x00008022 @@ -7083,7 +7083,7 @@ _081E297C: ldr r2, [r0] ldrb r0, [r2] lsls r0, 4 - ldr r1, _081E29F8 @ =gUnknown_86FC03C + ldr r1, _081E29F8 @ =_Str_RfuHeader adds r5, r0, r1 ldrh r0, [r4] movs r1, 0xF @@ -7142,7 +7142,7 @@ _081E29CE: b _081E2A0C .align 2, 0 _081E29F4: .4byte gUnknown_3007460 -_081E29F8: .4byte gUnknown_86FC03C +_081E29F8: .4byte _Str_RfuHeader _081E29FC: .4byte gUnknown_3007468 _081E2A00: movs r0, 0x10 @@ -7469,7 +7469,7 @@ rfu_STC_analyzeLLSF: @ 81E2C40 movs r1, 0x1 ands r0, r1 lsls r0, 4 - ldr r1, _081E2C78 @ =gUnknown_86FC03C + ldr r1, _081E2C78 @ =_Str_RfuHeader adds r6, r0, r1 ldrb r0, [r6] cmp r3, r0 @@ -7478,7 +7478,7 @@ rfu_STC_analyzeLLSF: @ 81E2C40 b _081E2E6E .align 2, 0 _081E2C74: .4byte gUnknown_3007460 -_081E2C78: .4byte gUnknown_86FC03C +_081E2C78: .4byte _Str_RfuHeader _081E2C7C: movs r5, 0 movs r4, 0 @@ -8877,12 +8877,12 @@ _081E3726: cmp r0, 0x3 bhi _081E373C lsls r0, 1 - ldr r1, _081E3738 @ =gUnknown_86FC074 + ldr r1, _081E3738 @ =_Str_Sio32ID adds r0, r1 ldrh r0, [r0] b _081E373E .align 2, 0 -_081E3738: .4byte gUnknown_86FC074 +_081E3738: .4byte _Str_Sio32ID _081E373C: ldr r0, _081E3794 @ =0x00008001 _081E373E: diff --git a/asm/link.s b/asm/link.s index 586ee46a8..a0ba7f9cb 100644 --- a/asm/link.s +++ b/asm/link.s @@ -232,7 +232,7 @@ sub_8009640: @ 8009640 ldr r0, _080096D4 @ =sub_800978C bl SetVBlankCallback bl ResetBlockSend - ldr r1, _080096D8 @ =gUnknown_202271A + ldr r1, _080096D8 @ =gLinkType ldr r2, _080096DC @ =0x00001111 adds r0, r2, 0 strh r0, [r1] @@ -283,7 +283,7 @@ _08009670: bx r0 .align 2, 0 _080096D4: .4byte sub_800978C -_080096D8: .4byte gUnknown_202271A +_080096D8: .4byte gLinkType _080096DC: .4byte 0x00001111 _080096E0: .4byte gMain _080096E4: .4byte gSaveBlock2Ptr @@ -297,17 +297,17 @@ _080096F4: .4byte c2_08009A8C sub_80096F8: @ 80096F8 lsls r0, 24 lsrs r0, 24 - ldr r1, _08009704 @ =gUnknown_2022720 + ldr r1, _08009704 @ =gLocalLinkPlayer strh r0, [r1, 0x18] bx lr .align 2, 0 -_08009704: .4byte gUnknown_2022720 +_08009704: .4byte gLocalLinkPlayer thumb_func_end sub_80096F8 thumb_func_start sub_8009708 sub_8009708: @ 8009708 push {r4,r5,lr} - ldr r5, _08009774 @ =gUnknown_2022720 + ldr r5, _08009774 @ =gLocalLinkPlayer ldr r4, _08009778 @ =gSaveBlock2Ptr ldr r1, [r4] ldrb r2, [r1, 0xA] @@ -327,7 +327,7 @@ sub_8009708: @ 8009708 ldr r0, [r4] ldrb r0, [r0, 0x8] strb r0, [r5, 0x13] - ldr r0, _0800977C @ =gUnknown_202271A + ldr r0, _0800977C @ =gLinkType ldrh r0, [r0] str r0, [r5, 0x14] ldr r0, _08009780 @ =gGameLanguage @@ -359,9 +359,9 @@ _0800976E: pop {r0} bx r0 .align 2, 0 -_08009774: .4byte gUnknown_2022720 +_08009774: .4byte gLocalLinkPlayer _08009778: .4byte gSaveBlock2Ptr -_0800977C: .4byte gUnknown_202271A +_0800977C: .4byte gLinkType _08009780: .4byte gGameLanguage _08009784: .4byte gGameVersion _08009788: .4byte 0x00000844 @@ -380,7 +380,7 @@ sub_800978C: @ 800978C thumb_func_start sub_80097A0 sub_80097A0: @ 80097A0 push {lr} - ldr r3, _080097C0 @ =gUnknown_2022718 + ldr r3, _080097C0 @ =gLinkOpen ldr r1, _080097C4 @ =gUnknown_3003F50 ldr r2, _080097C8 @ =0x0000efff adds r0, r1, 0 @@ -396,7 +396,7 @@ _080097AC: pop {r0} bx r0 .align 2, 0 -_080097C0: .4byte gUnknown_2022718 +_080097C0: .4byte gLinkOpen _080097C4: .4byte gUnknown_3003F50 _080097C8: .4byte 0x0000efff thumb_func_end sub_80097A0 @@ -434,7 +434,7 @@ _08009800: .4byte gUnknown_3003F84 thumb_func_start sub_8009804 sub_8009804: @ 8009804 push {r4-r6,lr} - ldr r0, _0800984C @ =gUnknown_3003F3C + ldr r0, _0800984C @ =gWirelessCommType ldrb r4, [r0] cmp r4, 0 bne _08009878 @@ -464,7 +464,7 @@ sub_8009804: @ 8009804 bl CreateTask b _0800987C .align 2, 0 -_0800984C: .4byte gUnknown_3003F3C +_0800984C: .4byte gWirelessCommType _08009850: .4byte gUnknown_3003F80 _08009854: .4byte sub_800A720 _08009858: .4byte gLinkVSyncDisabled @@ -478,7 +478,7 @@ _08009874: .4byte task02_080097CC _08009878: bl sub_80F86F4 _0800987C: - ldr r1, _080098A8 @ =gUnknown_3003F64 + ldr r1, _080098A8 @ =gReceivedRemoteLinkPlayers movs r0, 0 strb r0, [r1] movs r1, 0 @@ -501,7 +501,7 @@ _0800988E: pop {r0} bx r0 .align 2, 0 -_080098A8: .4byte gUnknown_3003F64 +_080098A8: .4byte gReceivedRemoteLinkPlayers _080098AC: .4byte gUnknown_3003EB8 _080098B0: .4byte gUnknown_3003F30 _080098B4: .4byte gUnknown_3003F2C @@ -510,25 +510,25 @@ _080098B4: .4byte gUnknown_3003F2C thumb_func_start sub_80098B8 sub_80098B8: @ 80098B8 push {r4,lr} - ldr r0, _080098DC @ =gUnknown_3003F64 + ldr r0, _080098DC @ =gReceivedRemoteLinkPlayers movs r4, 0 strb r4, [r0] - ldr r0, _080098E0 @ =gUnknown_3003F3C + ldr r0, _080098E0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _080098CC bl sub_80F8DC0 _080098CC: - ldr r0, _080098E4 @ =gUnknown_2022718 + ldr r0, _080098E4 @ =gLinkOpen strb r4, [r0] bl sub_800B29C pop {r4} pop {r0} bx r0 .align 2, 0 -_080098DC: .4byte gUnknown_3003F64 -_080098E0: .4byte gUnknown_3003F3C -_080098E4: .4byte gUnknown_2022718 +_080098DC: .4byte gReceivedRemoteLinkPlayers +_080098E0: .4byte gWirelessCommType +_080098E4: .4byte gLinkOpen thumb_func_end sub_80098B8 thumb_func_start TestBlockTransfer @@ -597,7 +597,7 @@ _08009958: cmp r0, 0 beq _08009994 lsls r0, r5, 8 - ldr r1, _080099C0 @ =gUnknown_2022118 + ldr r1, _080099C0 @ =gBlockRecvBuffer adds r0, r1 lsls r4, r5, 1 adds r1, r4, r5 @@ -614,7 +614,7 @@ _08009958: ldrh r0, [r4] cmp r0, r8 beq _08009994 - ldr r0, _080099C8 @ =gUnknown_2022110 + ldr r0, _080099C8 @ =gLinkTestDebugValuesEnabled strb r6, [r0] ldr r0, _080099CC @ =gUnknown_2022111 strb r6, [r0] @@ -637,9 +637,9 @@ _080099B0: .4byte gUnknown_3000E08 _080099B4: .4byte gUnknown_3000E18 _080099B8: .4byte gUnknown_3000E60 _080099BC: .4byte 0x00000342 -_080099C0: .4byte gUnknown_2022118 +_080099C0: .4byte gBlockRecvBuffer _080099C4: .4byte gUnknown_3003F88 -_080099C8: .4byte gUnknown_2022110 +_080099C8: .4byte gLinkTestDebugValuesEnabled _080099CC: .4byte gUnknown_2022111 thumb_func_end TestBlockTransfer @@ -705,7 +705,7 @@ _08009A38: beq _08009A46 bl sub_800AAC0 _08009A46: - ldr r0, _08009A80 @ =gUnknown_2022110 + ldr r0, _08009A80 @ =gLinkTestDebugValuesEnabled ldrb r0, [r0] cmp r0, 0 beq _08009A66 @@ -731,7 +731,7 @@ _08009A70: .4byte gMain _08009A74: .4byte gUnknown_3003F84 _08009A78: .4byte gHeap + 0x4000 _08009A7C: .4byte 0x00002004 -_08009A80: .4byte gUnknown_2022110 +_08009A80: .4byte gLinkTestDebugValuesEnabled _08009A84: .4byte gLinkVSyncDisabled _08009A88: .4byte gUnknown_3003F80 thumb_func_end LinkTestProcessKeyInput @@ -756,14 +756,14 @@ c2_08009A8C: @ 8009A8C LinkMain2: @ 8009AB0 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _08009AC0 @ =gUnknown_2022718 + ldr r0, _08009AC0 @ =gLinkOpen ldrb r0, [r0] cmp r0, 0 bne _08009AC4 movs r0, 0 b _08009B0C .align 2, 0 -_08009AC0: .4byte gUnknown_2022718 +_08009AC0: .4byte gLinkOpen _08009AC4: movs r1, 0 ldr r5, _08009B14 @ =gUnknown_3003EC4 @@ -840,7 +840,7 @@ _08009B48: blt _08009B40 cmp r5, 0 bne _08009B64 - ldr r1, _08009B6C @ =gUnknown_3003F64 + ldr r1, _08009B6C @ =gReceivedRemoteLinkPlayers ldrb r0, [r1] cmp r0, 0 bne _08009B64 @@ -851,7 +851,7 @@ _08009B64: pop {r0} bx r0 .align 2, 0 -_08009B6C: .4byte gUnknown_3003F64 +_08009B6C: .4byte gReceivedRemoteLinkPlayers thumb_func_end HandleReceiveRemoteLinkPlayer thumb_func_start sub_8009B70 @@ -960,7 +960,7 @@ _08009C38: ldr r0, _08009C7C @ =gUnknown_3003E70 adds r2, r0, 0 adds r2, 0x10 - ldr r1, _08009C80 @ =gUnknown_2022720 + ldr r1, _08009C80 @ =gLocalLinkPlayer ldm r1!, {r3-r5} stm r2!, {r3-r5} ldm r1!, {r3,r6,r7} @@ -989,7 +989,7 @@ _08009C38: b _08009E3E .align 2, 0 _08009C7C: .4byte gUnknown_3003E70 -_08009C80: .4byte gUnknown_2022720 +_08009C80: .4byte gLocalLinkPlayer _08009C84: .4byte gUnknown_82345C0 _08009C88: ldr r1, _08009C90 @ =gUnknown_3003F28 @@ -1062,7 +1062,7 @@ _08009D08: .4byte gDecompressionBuffer _08009D0C: .4byte gUnknown_3003ED0 _08009D10: movs r2, 0 - ldr r1, _08009DC4 @ =gUnknown_2022118 + ldr r1, _08009DC4 @ =gBlockRecvBuffer mov r9, r1 adds r7, r3, 0 ldr r3, _08009DC8 @ =gUnknown_3003ED0 @@ -1106,7 +1106,7 @@ _08009D40: cmp r0, 0x1 bne _08009DE6 lsls r1, r6, 8 - ldr r0, _08009DC4 @ =gUnknown_2022118 + ldr r0, _08009DC4 @ =gBlockRecvBuffer adds r1, r0 mov r8, r1 lsls r0, r6, 3 @@ -1152,7 +1152,7 @@ _08009DBC: bl SetMainCallback2 b _08009E3E .align 2, 0 -_08009DC4: .4byte gUnknown_2022118 +_08009DC4: .4byte gBlockRecvBuffer _08009DC8: .4byte gUnknown_3003ED0 _08009DCC: .4byte gUnknown_3003EB8 _08009DD0: .4byte gLinkPlayers @@ -1318,12 +1318,12 @@ _08009F04: .4byte 0x0000cccc _08009F08: ldr r0, _08009F14 @ =gUnknown_3003F50 strh r2, [r0] - ldr r1, _08009F18 @ =gUnknown_202271A + ldr r1, _08009F18 @ =gLinkType ldrh r1, [r1] b _08009FD4 .align 2, 0 _08009F14: .4byte gUnknown_3003F50 -_08009F18: .4byte gUnknown_202271A +_08009F18: .4byte gLinkType _08009F1C: ldr r0, _08009F28 @ =gUnknown_3003F50 strh r2, [r0] @@ -1373,12 +1373,12 @@ _08009F74: .4byte gUnknown_3000E08 _08009F78: ldr r0, _08009F84 @ =gUnknown_3003F50 strh r2, [r0] - ldr r1, _08009F88 @ =gUnknown_203AD30 + ldr r1, _08009F88 @ =gSpecialVar_ItemId ldrh r1, [r1] b _08009FD4 .align 2, 0 _08009F84: .4byte gUnknown_3003F50 -_08009F88: .4byte gUnknown_203AD30 +_08009F88: .4byte gSpecialVar_ItemId _08009F8C: ldr r0, _08009F98 @ =gUnknown_3003F50 strh r2, [r0] @@ -1429,7 +1429,7 @@ _08009FE4: .4byte gUnknown_3003F50 thumb_func_start sub_8009FE8 sub_8009FE8: @ 8009FE8 push {lr} - ldr r0, _0800A000 @ =gUnknown_3003F3C + ldr r0, _0800A000 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08009FF6 @@ -1441,7 +1441,7 @@ _08009FF6: pop {r0} bx r0 .align 2, 0 -_0800A000: .4byte gUnknown_3003F3C +_0800A000: .4byte gWirelessCommType _0800A004: .4byte gUnknown_3003F80 _0800A008: .4byte sub_800A040 thumb_func_end sub_8009FE8 @@ -1449,14 +1449,14 @@ _0800A008: .4byte sub_800A040 thumb_func_start sub_800A00C sub_800A00C: @ 800A00C push {lr} - ldr r0, _0800A01C @ =gUnknown_3003F3C + ldr r0, _0800A01C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0800A020 bl sub_80F9808 b _0800A03A .align 2, 0 -_0800A01C: .4byte gUnknown_3003F3C +_0800A01C: .4byte gWirelessCommType _0800A020: ldr r0, _0800A030 @ =gUnknown_3003F80 ldr r1, [r0] @@ -1478,7 +1478,7 @@ _0800A03A: thumb_func_start sub_800A040 sub_800A040: @ 800A040 push {lr} - ldr r0, _0800A054 @ =gUnknown_3003F64 + ldr r0, _0800A054 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _0800A050 @@ -1488,7 +1488,7 @@ _0800A050: pop {r0} bx r0 .align 2, 0 -_0800A054: .4byte gUnknown_3003F64 +_0800A054: .4byte gReceivedRemoteLinkPlayers _0800A058: .4byte 0x0000cafe thumb_func_end sub_800A040 @@ -1505,14 +1505,14 @@ _0800A064: .4byte gUnknown_3003F80 thumb_func_start sub_800A068 sub_800A068: @ 800A068 push {lr} - ldr r0, _0800A078 @ =gUnknown_3003F3C + ldr r0, _0800A078 @ =gWirelessCommType ldrb r1, [r0] cmp r1, 0 beq _0800A07C bl sub_80F985C b _0800A080 .align 2, 0 -_0800A078: .4byte gUnknown_3003F3C +_0800A078: .4byte gWirelessCommType _0800A07C: ldr r0, _0800A084 @ =gUnknown_3003F80 str r1, [r0] @@ -1526,7 +1526,7 @@ _0800A084: .4byte gUnknown_3003F80 thumb_func_start GetLinkPlayerCount GetLinkPlayerCount: @ 800A088 push {lr} - ldr r0, _0800A0A0 @ =gUnknown_3003F3C + ldr r0, _0800A0A0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0800A0A8 @@ -1537,7 +1537,7 @@ GetLinkPlayerCount: @ 800A088 lsrs r0, 2 b _0800A0B0 .align 2, 0 -_0800A0A0: .4byte gUnknown_3003F3C +_0800A0A0: .4byte gWirelessCommType _0800A0A4: .4byte gUnknown_3003F20 _0800A0A8: bl sub_80FA4EC @@ -1554,14 +1554,14 @@ sub_800A0B4: @ 800A0B4 ldr r0, _0800A0C8 @ =gUnknown_3000E54 movs r1, 0 str r1, [r0] - ldr r0, _0800A0CC @ =gUnknown_202271C + ldr r0, _0800A0CC @ =gLinkTimeOutCounter strh r1, [r0] bl sub_8009804 pop {r0} bx r0 .align 2, 0 _0800A0C8: .4byte gUnknown_3000E54 -_0800A0CC: .4byte gUnknown_202271C +_0800A0CC: .4byte gLinkTimeOutCounter thumb_func_end sub_800A0B4 thumb_func_start sub_800A0D0 @@ -1570,7 +1570,7 @@ sub_800A0D0: @ 800A0D0 adds r5, r0, 0 adds r6, r1, 0 movs r7, 0 - ldr r0, _0800A0F8 @ =gUnknown_3003F64 + ldr r0, _0800A0F8 @ =gReceivedRemoteLinkPlayers ldrb r4, [r0] cmp r4, 0x1 bne _0800A1C8 @@ -1587,7 +1587,7 @@ _0800A0F0: str r0, [r1] b _0800A1E2 .align 2, 0 -_0800A0F8: .4byte gUnknown_3003F64 +_0800A0F8: .4byte gReceivedRemoteLinkPlayers _0800A0FC: .4byte gUnknown_3000E54 _0800A100: bl GetLinkPlayerCount @@ -1687,7 +1687,7 @@ _0800A1BC: .align 2, 0 _0800A1C4: .4byte gUnknown_3000E54 _0800A1C8: - ldr r0, _0800A1E8 @ =gUnknown_202271C + ldr r0, _0800A1E8 @ =gLinkTimeOutCounter ldrh r1, [r0] adds r1, 0x1 strh r1, [r0] @@ -1706,7 +1706,7 @@ _0800A1E2: pop {r1} bx r1 .align 2, 0 -_0800A1E8: .4byte gUnknown_202271C +_0800A1E8: .4byte gLinkTimeOutCounter _0800A1EC: .4byte gUnknown_3000E54 thumb_func_end sub_800A0D0 @@ -1844,7 +1844,7 @@ _0800A2C0: str r7, [r4, 0x4] b _0800A2EA _0800A2D8: - ldr r5, _0800A304 @ =gUnknown_2022618 + ldr r5, _0800A304 @ =gBlockSendBuffer cmp r7, r5 beq _0800A2E8 adds r0, r5, 0 @@ -1868,7 +1868,7 @@ _0800A2FE: pop {r1} bx r1 .align 2, 0 -_0800A304: .4byte gUnknown_2022618 +_0800A304: .4byte gBlockSendBuffer _0800A308: .4byte 0x0000bbbb _0800A30C: .4byte gUnknown_3003F80 _0800A310: .4byte LinkCB_BlockSendBegin @@ -2012,7 +2012,7 @@ _0800A400: .4byte 0x0000aaaa thumb_func_start GetMultiplayerId GetMultiplayerId: @ 800A404 push {lr} - ldr r0, _0800A418 @ =gUnknown_3003F3C + ldr r0, _0800A418 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 beq _0800A420 @@ -2022,7 +2022,7 @@ GetMultiplayerId: @ 800A404 lsrs r0, 30 b _0800A428 .align 2, 0 -_0800A418: .4byte gUnknown_3003F3C +_0800A418: .4byte gWirelessCommType _0800A41C: .4byte 0x04000128 _0800A420: bl rfu_get_multiplayer_id @@ -2056,7 +2056,7 @@ SendBlock: @ 800A448 adds r3, r1, 0 lsls r2, 16 lsrs r1, r2, 16 - ldr r0, _0800A460 @ =gUnknown_3003F3C + ldr r0, _0800A460 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 beq _0800A464 @@ -2064,7 +2064,7 @@ SendBlock: @ 800A448 bl InitBlockSend b _0800A46A .align 2, 0 -_0800A460: .4byte gUnknown_3003F3C +_0800A460: .4byte gWirelessCommType _0800A464: adds r0, r3, 0 bl sub_80F9E60 @@ -2081,7 +2081,7 @@ sub_800A474: @ 800A474 lsls r0, 24 lsrs r1, r0, 24 adds r2, r1, 0 - ldr r0, _0800A490 @ =gUnknown_3003F3C + ldr r0, _0800A490 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800A494 @@ -2091,7 +2091,7 @@ sub_800A474: @ 800A474 lsrs r0, 24 b _0800A4B0 .align 2, 0 -_0800A490: .4byte gUnknown_3003F3C +_0800A490: .4byte gWirelessCommType _0800A494: ldr r0, _0800A4A0 @ =gUnknown_3003F80 ldr r0, [r0] @@ -2118,7 +2118,7 @@ _0800A4B8: .4byte 0x0000cccc thumb_func_start sub_800A4BC sub_800A4BC: @ 800A4BC push {lr} - ldr r0, _0800A4D0 @ =gUnknown_3003F3C + ldr r0, _0800A4D0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800A4D4 @@ -2127,7 +2127,7 @@ sub_800A4BC: @ 800A4BC lsrs r0, 24 b _0800A4E2 .align 2, 0 -_0800A4D0: .4byte gUnknown_3003F3C +_0800A4D0: .4byte gWirelessCommType _0800A4D4: movs r1, 0 ldr r0, _0800A4E8 @ =gUnknown_3003F80 @@ -2147,7 +2147,7 @@ _0800A4E8: .4byte gUnknown_3003F80 thumb_func_start GetBlockReceivedStatus GetBlockReceivedStatus: @ 800A4EC push {lr} - ldr r0, _0800A510 @ =gUnknown_3003F3C + ldr r0, _0800A510 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 beq _0800A518 @@ -2164,7 +2164,7 @@ GetBlockReceivedStatus: @ 800A4EC orrs r0, r1 b _0800A51C .align 2, 0 -_0800A510: .4byte gUnknown_3003F3C +_0800A510: .4byte gWirelessCommType _0800A514: .4byte gUnknown_3003EBC _0800A518: bl sub_80F9CC8 @@ -2180,7 +2180,7 @@ sub_800A524: @ 800A524 push {lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _0800A53C @ =gUnknown_3003F3C + ldr r0, _0800A53C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800A540 @@ -2188,7 +2188,7 @@ sub_800A524: @ 800A524 bl sub_80F9720 b _0800A548 .align 2, 0 -_0800A53C: .4byte gUnknown_3003F3C +_0800A53C: .4byte gWirelessCommType _0800A540: ldr r0, _0800A54C @ =gUnknown_3003EBC adds r0, r1, r0 @@ -2204,7 +2204,7 @@ _0800A54C: .4byte gUnknown_3003EBC thumb_func_start ResetBlockReceivedFlags ResetBlockReceivedFlags: @ 800A550 push {r4,lr} - ldr r0, _0800A56C @ =gUnknown_3003F3C + ldr r0, _0800A56C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800A570 @@ -2218,7 +2218,7 @@ _0800A55C: ble _0800A55C b _0800A57E .align 2, 0 -_0800A56C: .4byte gUnknown_3003F3C +_0800A56C: .4byte gWirelessCommType _0800A570: ldr r1, _0800A584 @ =gUnknown_3003EBC movs r2, 0 @@ -2241,7 +2241,7 @@ ResetBlockReceivedFlag: @ 800A588 push {lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _0800A5A0 @ =gUnknown_3003F3C + ldr r0, _0800A5A0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800A5A4 @@ -2249,7 +2249,7 @@ ResetBlockReceivedFlag: @ 800A588 bl sub_80F974C b _0800A5B2 .align 2, 0 -_0800A5A0: .4byte gUnknown_3003F3C +_0800A5A0: .4byte gWirelessCommType _0800A5A4: ldr r0, _0800A5B8 @ =gUnknown_3003EBC adds r1, r0 @@ -2707,7 +2707,7 @@ sub_800A900: @ 800A900 ldr r1, _0800A938 @ =gUnknown_3003F60 strb r0, [r1] ldr r4, _0800A93C @ =gLinkPlayers - ldr r3, _0800A940 @ =gUnknown_20227C8 + ldr r3, _0800A940 @ =gSavedLinkPlayers movs r2, 0x4 _0800A914: adds r0, r3, 0 @@ -2730,7 +2730,7 @@ _0800A914: _0800A934: .4byte gUnknown_3003F40 _0800A938: .4byte gUnknown_3003F60 _0800A93C: .4byte gLinkPlayers -_0800A940: .4byte gUnknown_20227C8 +_0800A940: .4byte gSavedLinkPlayers thumb_func_end sub_800A900 thumb_func_start sub_800A944 @@ -2761,7 +2761,7 @@ sub_800A95C: @ 800A95C cmp r5, r2 bge _0800A986 ldr r1, _0800A994 @ =gLinkPlayers - ldr r0, _0800A998 @ =gUnknown_20227C8 + ldr r0, _0800A998 @ =gSavedLinkPlayers adds r4, r0, 0x4 adds r3, r1, 0x4 _0800A972: @@ -2785,7 +2785,7 @@ _0800A986: .align 2, 0 _0800A990: .4byte gUnknown_3003F40 _0800A994: .4byte gLinkPlayers -_0800A998: .4byte gUnknown_20227C8 +_0800A998: .4byte gSavedLinkPlayers _0800A99C: movs r0, 0x1 _0800A99E: @@ -2804,7 +2804,7 @@ sub_800A9A4: @ 800A9A4 ldrb r0, [r0] cmp r4, r0 bcs _0800AA04 - ldr r6, _0800AA14 @ =gUnknown_20227C8 + ldr r6, _0800AA14 @ =gSavedLinkPlayers ldr r5, _0800AA18 @ =gLinkPlayers movs r0, 0x8 adds r0, r6 @@ -2852,7 +2852,7 @@ _0800AA04: bx r0 .align 2, 0 _0800AA10: .4byte gUnknown_3003F40 -_0800AA14: .4byte gUnknown_20227C8 +_0800AA14: .4byte gSavedLinkPlayers _0800AA18: .4byte gLinkPlayers _0800AA1C: .4byte gUnknown_3003EAC _0800AA20: .4byte c2_800ACD4 @@ -2886,7 +2886,7 @@ _0800AA44: .4byte gUnknown_3003F20 thumb_func_start sub_800AA48 sub_800AA48: @ 800AA48 push {lr} - ldr r0, _0800AA60 @ =gUnknown_3003F3C + ldr r0, _0800AA60 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0800AA68 @@ -2897,7 +2897,7 @@ sub_800AA48: @ 800AA48 ands r0, r1 b _0800AA70 .align 2, 0 -_0800AA60: .4byte gUnknown_3003F3C +_0800AA60: .4byte gWirelessCommType _0800AA64: .4byte gUnknown_3003F20 _0800AA68: bl sub_80FBA2C @@ -2922,14 +2922,14 @@ sub_800AA80: @ 800AA80 push {lr} lsls r0, 16 lsrs r3, r0, 16 - ldr r0, _0800AA94 @ =gUnknown_3003F3C + ldr r0, _0800AA94 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800AA98 bl task_add_05_task_del_08FA224_when_no_RfuFunc b _0800AAAC .align 2, 0 -_0800AA94: .4byte gUnknown_3003F3C +_0800AA94: .4byte gWirelessCommType _0800AA98: ldr r2, _0800AAB0 @ =gUnknown_3003F80 ldr r1, [r2] @@ -2954,14 +2954,14 @@ _0800AABC: .4byte gUnknown_3003F34 thumb_func_start sub_800AAC0 sub_800AAC0: @ 800AAC0 push {lr} - ldr r0, _0800AAD0 @ =gUnknown_3003F3C + ldr r0, _0800AAD0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800AAD4 bl task_add_05_task_del_08FA224_when_no_RfuFunc b _0800AAFC .align 2, 0 -_0800AAD0: .4byte gUnknown_3003F3C +_0800AAD0: .4byte gWirelessCommType _0800AAD4: ldr r2, _0800AAE8 @ =gUnknown_3003F80 ldr r1, [r2] @@ -3067,14 +3067,14 @@ _0800AB98: .4byte gUnknown_3003F24 thumb_func_start sub_800AB9C sub_800AB9C: @ 800AB9C push {lr} - ldr r0, _0800ABAC @ =gUnknown_3003F3C + ldr r0, _0800ABAC @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _0800ABB0 bl sub_80FA42C b _0800ABC2 .align 2, 0 -_0800ABAC: .4byte gUnknown_3003F3C +_0800ABAC: .4byte gWirelessCommType _0800ABB0: ldr r1, _0800ABC8 @ =gUnknown_3003F80 ldr r0, [r1] @@ -3169,7 +3169,7 @@ _0800AC54: .4byte gUnknown_3003F80 thumb_func_start sub_800AC58 sub_800AC58: @ 800AC58 push {lr} - ldr r0, _0800AC9C @ =gUnknown_2022718 + ldr r0, _0800AC9C @ =gLinkOpen ldrb r0, [r0] cmp r0, 0 beq _0800AC98 @@ -3184,7 +3184,7 @@ sub_800AC58: @ 800AC58 ldrb r0, [r0] cmp r0, 0 bne _0800AC8E - ldr r1, _0800ACA8 @ =gUnknown_2022854 + ldr r1, _0800ACA8 @ =sLinkErrorBuffer str r2, [r1] ldr r0, _0800ACAC @ =gUnknown_3004F70 ldrb r0, [r0] @@ -3203,10 +3203,10 @@ _0800AC98: pop {r0} bx r0 .align 2, 0 -_0800AC9C: .4byte gUnknown_2022718 +_0800AC9C: .4byte gLinkOpen _0800ACA0: .4byte gUnknown_3003F20 _0800ACA4: .4byte gUnknown_3003F38 -_0800ACA8: .4byte gUnknown_2022854 +_0800ACA8: .4byte sLinkErrorBuffer _0800ACAC: .4byte gUnknown_3004F70 _0800ACB0: .4byte gUnknown_3003FA0 _0800ACB4: .4byte c2_800ACD4 @@ -3216,7 +3216,7 @@ _0800ACB8: .4byte gUnknown_3003EAC thumb_func_start sub_800ACBC sub_800ACBC: @ 800ACBC push {r4,lr} - ldr r4, _0800ACD0 @ =gUnknown_2022854 + ldr r4, _0800ACD0 @ =sLinkErrorBuffer str r0, [r4] strb r1, [r4, 0x5] strb r2, [r4, 0x4] @@ -3225,7 +3225,7 @@ sub_800ACBC: @ 800ACBC pop {r0} bx r0 .align 2, 0 -_0800ACD0: .4byte gUnknown_2022854 +_0800ACD0: .4byte sLinkErrorBuffer thumb_func_end sub_800ACBC thumb_func_start c2_800ACD4 @@ -3253,11 +3253,11 @@ c2_800ACD4: @ 800ACD4 bl FillPalette bl ResetTasks bl remove_some_task - ldr r1, _0800ADF0 @ =gUnknown_3003F3C + ldr r1, _0800ADF0 @ =gWirelessCommType ldrb r0, [r1] cmp r0, 0 beq _0800AD30 - ldr r0, _0800ADF4 @ =gUnknown_2022854 + ldr r0, _0800ADF4 @ =sLinkErrorBuffer ldrb r0, [r0, 0x6] cmp r0, 0 bne _0800AD2C @@ -3337,8 +3337,8 @@ _0800ADE0: .4byte gMPlayInfo_SE1 _0800ADE4: .4byte gMPlayInfo_SE2 _0800ADE8: .4byte gMPlayInfo_SE3 _0800ADEC: .4byte gHeap -_0800ADF0: .4byte gUnknown_3003F3C -_0800ADF4: .4byte gUnknown_2022854 +_0800ADF0: .4byte gWirelessCommType +_0800ADF4: .4byte sLinkErrorBuffer _0800ADF8: .4byte sub_800978C _0800ADFC: .4byte gUnknown_82345E8 _0800AE00: .4byte gUnknown_2022860 @@ -3354,14 +3354,14 @@ _0800AE18: .4byte sub_800AF2C sub_800AE1C: @ 800AE1C push {r4,r5,lr} sub sp, 0xC - ldr r1, _0800AEB8 @ =gUnknown_8231EE4 + ldr r1, _0800AEB8 @ =gWirelessLinkDisplay4bpp movs r5, 0 str r5, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r1, _0800AEBC @ =gUnknown_823238C + ldr r1, _0800AEBC @ =gWirelessLinkDisplayBin movs r0, 0x1 movs r2, 0 movs r3, 0 @@ -3416,8 +3416,8 @@ sub_800AE1C: @ 800AE1C pop {r0} bx r0 .align 2, 0 -_0800AEB8: .4byte gUnknown_8231EE4 -_0800AEBC: .4byte gUnknown_823238C +_0800AEB8: .4byte gWirelessLinkDisplay4bpp +_0800AEBC: .4byte gWirelessLinkDisplayBin _0800AEC0: .4byte gUnknown_8231EC4 _0800AEC4: .4byte gUnknown_8234610 _0800AEC8: .4byte gUnknown_841DEF0 @@ -3492,14 +3492,14 @@ _0800AF50: beq _0800AF7A b _0800AFC4 _0800AF5A: - ldr r0, _0800AF68 @ =gUnknown_2022854 + ldr r0, _0800AF68 @ =sLinkErrorBuffer ldrb r0, [r0, 0x6] cmp r0, 0 beq _0800AF6C bl sub_800AE1C b _0800AFC4 .align 2, 0 -_0800AF68: .4byte gUnknown_2022854 +_0800AF68: .4byte sLinkErrorBuffer _0800AF6C: bl sub_800AED0 b _0800AFC4 @@ -3508,7 +3508,7 @@ _0800AF72: bl PlaySE b _0800AFC4 _0800AF7A: - ldr r0, _0800AF9C @ =gUnknown_3003F3C + ldr r0, _0800AF9C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x2 bne _0800AFA8 @@ -3525,7 +3525,7 @@ _0800AF7A: bl box_print b _0800AFC4 .align 2, 0 -_0800AF9C: .4byte gUnknown_3003F3C +_0800AF9C: .4byte gWirelessCommType _0800AFA0: .4byte gUnknown_8234610 _0800AFA4: .4byte gUnknown_841DF6B _0800AFA8: @@ -3550,7 +3550,7 @@ _0800AFC4: ldrb r1, [r1] cmp r1, 0xA0 bne _0800B03C - ldr r4, _0800B008 @ =gUnknown_3003F3C + ldr r4, _0800B008 @ =gWirelessCommType ldrb r2, [r4] cmp r2, 0x1 bne _0800B010 @@ -3563,7 +3563,7 @@ _0800AFC4: bl PlaySE movs r0, 0 strb r0, [r4] - ldr r1, _0800B00C @ =gUnknown_2022854 + ldr r1, _0800B00C @ =sLinkErrorBuffer movs r0, 0 strb r0, [r1, 0x6] bl sub_8079B7C @@ -3572,8 +3572,8 @@ _0800AFC4: _0800AFFC: .4byte gUnknown_8234610 _0800B000: .4byte gUnknown_841DF4C _0800B004: .4byte gMain -_0800B008: .4byte gUnknown_3003F3C -_0800B00C: .4byte gUnknown_2022854 +_0800B008: .4byte gWirelessCommType +_0800B00C: .4byte sLinkErrorBuffer _0800B010: cmp r2, 0x2 bne _0800B02E @@ -3683,7 +3683,7 @@ sub_800B0B4: @ 800B0B4 ldr r1, _0800B100 @ =gUnknown_3003E70 adds r2, r1, 0 adds r2, 0x10 - ldr r0, _0800B104 @ =gUnknown_2022720 + ldr r0, _0800B104 @ =gLocalLinkPlayer ldm r0!, {r3-r5} stm r2!, {r3-r5} ldm r0!, {r3,r4,r6} @@ -3707,7 +3707,7 @@ sub_800B0B4: @ 800B0B4 strh r2, [r0] ldrb r2, [r3, 0x2] strb r2, [r0, 0x2] - ldr r0, _0800B10C @ =gUnknown_2022618 + ldr r0, _0800B10C @ =gBlockSendBuffer movs r2, 0x3C bl memcpy pop {r4-r6} @@ -3715,9 +3715,9 @@ sub_800B0B4: @ 800B0B4 bx r0 .align 2, 0 _0800B100: .4byte gUnknown_3003E70 -_0800B104: .4byte gUnknown_2022720 +_0800B104: .4byte gLocalLinkPlayer _0800B108: .4byte gUnknown_82345C0 -_0800B10C: .4byte gUnknown_2022618 +_0800B10C: .4byte gBlockSendBuffer thumb_func_end sub_800B0B4 thumb_func_start sub_800B110 @@ -3726,7 +3726,7 @@ sub_800B110: @ 800B110 lsls r0, 24 lsrs r0, 24 lsls r2, r0, 8 - ldr r1, _0800B168 @ =gUnknown_2022118 + ldr r1, _0800B168 @ =gBlockRecvBuffer adds r4, r2, r1 lsls r2, r0, 3 subs r2, r0 @@ -3764,7 +3764,7 @@ _0800B160: pop {r0} bx r0 .align 2, 0 -_0800B168: .4byte gUnknown_2022118 +_0800B168: .4byte gBlockRecvBuffer _0800B16C: .4byte gLinkPlayers _0800B170: .4byte gUnknown_82345C0 _0800B174: .4byte c2_800ACD4 @@ -3773,7 +3773,7 @@ _0800B174: .4byte c2_800ACD4 thumb_func_start HandleLinkConnection HandleLinkConnection: @ 800B178 push {r4,r5,lr} - ldr r0, _0800B1B0 @ =gUnknown_3003F3C + ldr r0, _0800B1B0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0800B1C8 @@ -3798,7 +3798,7 @@ _0800B1AA: movs r0, 0x1 b _0800B1EE .align 2, 0 -_0800B1B0: .4byte gUnknown_3003F3C +_0800B1B0: .4byte gWirelessCommType _0800B1B4: .4byte gUnknown_3003F84 _0800B1B8: .4byte gUnknown_3003F50 _0800B1BC: .4byte gUnknown_3003ED0 @@ -3830,59 +3830,59 @@ _0800B1EE: thumb_func_start sub_800B1F4 sub_800B1F4: @ 800B1F4 push {lr} - ldr r0, _0800B208 @ =gUnknown_3003F64 + ldr r0, _0800B208 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0800B204 - ldr r1, _0800B20C @ =gUnknown_3003F3C + ldr r1, _0800B20C @ =gWirelessCommType movs r0, 0x1 strb r0, [r1] _0800B204: pop {r0} bx r0 .align 2, 0 -_0800B208: .4byte gUnknown_3003F64 -_0800B20C: .4byte gUnknown_3003F3C +_0800B208: .4byte gReceivedRemoteLinkPlayers +_0800B20C: .4byte gWirelessCommType thumb_func_end sub_800B1F4 thumb_func_start sub_800B210 sub_800B210: @ 800B210 push {lr} - ldr r0, _0800B224 @ =gUnknown_3003F64 + ldr r0, _0800B224 @ =gReceivedRemoteLinkPlayers ldrb r1, [r0] cmp r1, 0 bne _0800B21E - ldr r0, _0800B228 @ =gUnknown_3003F3C + ldr r0, _0800B228 @ =gWirelessCommType strb r1, [r0] _0800B21E: pop {r0} bx r0 .align 2, 0 -_0800B224: .4byte gUnknown_3003F64 -_0800B228: .4byte gUnknown_3003F3C +_0800B224: .4byte gReceivedRemoteLinkPlayers +_0800B228: .4byte gWirelessCommType thumb_func_end sub_800B210 thumb_func_start sub_800B22C sub_800B22C: @ 800B22C push {lr} - ldr r0, _0800B240 @ =gUnknown_3003F64 + ldr r0, _0800B240 @ =gReceivedRemoteLinkPlayers ldrb r1, [r0] cmp r1, 0 bne _0800B23A - ldr r0, _0800B244 @ =gUnknown_3003F3C + ldr r0, _0800B244 @ =gWirelessCommType strb r1, [r0] _0800B23A: pop {r0} bx r0 .align 2, 0 -_0800B240: .4byte gUnknown_3003F64 -_0800B244: .4byte gUnknown_3003F3C +_0800B240: .4byte gReceivedRemoteLinkPlayers +_0800B244: .4byte gWirelessCommType thumb_func_end sub_800B22C thumb_func_start sub_800B248 sub_800B248: @ 800B248 push {lr} - ldr r0, _0800B25C @ =gUnknown_3003F3C + ldr r0, _0800B25C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0800B268 @@ -3892,7 +3892,7 @@ sub_800B248: @ 800B248 ldrb r0, [r0] b _0800B26C .align 2, 0 -_0800B25C: .4byte gUnknown_3003F3C +_0800B25C: .4byte gWirelessCommType _0800B260: .4byte gUnknown_3003FB0 _0800B264: .4byte 0x00000fbd _0800B268: diff --git a/asm/link_rfu.s b/asm/link_rfu.s index b6c34eeef..08f81f729 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 @@ -3504,7 +3504,7 @@ sub_80FEE24: @ 80FEE24 thumb_func_start sub_80FEE44 sub_80FEE44: @ 80FEE44 push {lr} - ldr r0, _080FEE58 @ =gUnknown_20370C0 + ldr r0, _080FEE58 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0xE bhi _080FEF12 @@ -3514,7 +3514,7 @@ sub_80FEE44: @ 80FEE44 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080FEE58: .4byte gUnknown_20370C0 +_080FEE58: .4byte gSpecialVar_0x8004 _080FEE5C: .4byte _080FEE60 .align 2, 0 _080FEE60: @@ -3585,7 +3585,7 @@ _080FEEF4: ldr r1, [r2] adds r1, r0 _080FEF08: - ldr r0, _080FEF24 @ =gUnknown_20370C0 + ldr r0, _080FEF24 @ =gSpecialVar_0x8004 ldrb r0, [r0] ldr r2, _080FEF28 @ =sub_80568C4 bl sub_80FEBAC @@ -3596,14 +3596,14 @@ _080FEF12: _080FEF18: .4byte gSaveBlock1Ptr _080FEF1C: .4byte gSpecialVar_0x8005 _080FEF20: .4byte 0x00002cd0 -_080FEF24: .4byte gUnknown_20370C0 +_080FEF24: .4byte gSpecialVar_0x8004 _080FEF28: .4byte sub_80568C4 thumb_func_end sub_80FEE44 thumb_func_start sub_80FEF2C sub_80FEF2C: @ 80FEF2C push {r4,lr} - ldr r4, _080FEF44 @ =gUnknown_20370C0 + ldr r4, _080FEF44 @ =gSpecialVar_0x8004 ldr r0, _080FEF48 @ =gUnknown_843F29C movs r1, 0x4 bl sub_80FFEDC @@ -3614,14 +3614,14 @@ sub_80FEF2C: @ 80FEF2C pop {r0} bx r0 .align 2, 0 -_080FEF44: .4byte gUnknown_20370C0 +_080FEF44: .4byte gSpecialVar_0x8004 _080FEF48: .4byte gUnknown_843F29C thumb_func_end sub_80FEF2C thumb_func_start sub_80FEF4C sub_80FEF4C: @ 80FEF4C push {r4,lr} - ldr r4, _080FEF64 @ =gUnknown_20370C0 + ldr r4, _080FEF64 @ =gSpecialVar_0x8004 ldr r0, _080FEF68 @ =gUnknown_843F2A4 movs r1, 0x4 bl sub_80FFEDC @@ -3632,7 +3632,7 @@ sub_80FEF4C: @ 80FEF4C pop {r0} bx r0 .align 2, 0 -_080FEF64: .4byte gUnknown_20370C0 +_080FEF64: .4byte gSpecialVar_0x8004 _080FEF68: .4byte gUnknown_843F2A4 thumb_func_end sub_80FEF4C @@ -4384,12 +4384,12 @@ _080FF4C8: .align 2, 0 _080FF4D8: .4byte gUnknown_203ACE8 _080FF4DC: - ldr r0, _080FF4E4 @ =gUnknown_20370D0 + ldr r0, _080FF4E4 @ =gSpecialVar_Result strh r1, [r0] movs r0, 0x17 b _080FF4EA .align 2, 0 -_080FF4E4: .4byte gUnknown_20370D0 +_080FF4E4: .4byte gSpecialVar_Result _080FF4E8: movs r0, 0 _080FF4EA: @@ -4425,7 +4425,7 @@ _080FF510: .align 2, 0 _080FF520: .4byte gUnknown_203ACE8 _080FF524: - ldr r4, _080FF538 @ =gUnknown_20370D0 + ldr r4, _080FF538 @ =gSpecialVar_Result bl sub_80FF78C lsls r0, 24 lsrs r0, 24 @@ -4434,7 +4434,7 @@ _080FF524: movs r0, 0x17 b _080FF53E .align 2, 0 -_080FF538: .4byte gUnknown_20370D0 +_080FF538: .4byte gSpecialVar_Result _080FF53C: movs r0, 0 _080FF53E: diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s index b606854a3..d36eeca20 100644 --- a/asm/link_rfu_2.s +++ b/asm/link_rfu_2.s @@ -142,7 +142,7 @@ sub_80F86F4: @ 80F86F4 lsrs r1, r0, 16 cmp r1, 0 bne _080F8722 - ldr r0, _080F8734 @ =gUnknown_202271A + ldr r0, _080F8734 @ =gLinkType strh r1, [r0] movs r0, 0 bl sub_80FB128 @@ -158,7 +158,7 @@ _080F8722: _080F8728: .4byte gUnknown_3001190 _080F872C: .4byte 0x00000e64 _080F8730: .4byte gIntrTable + 0x4 -_080F8734: .4byte gUnknown_202271A +_080F8734: .4byte gLinkType thumb_func_end sub_80F86F4 thumb_func_start sub_80F8738 @@ -1470,12 +1470,12 @@ _080F91B0: cmp r4, 0 bne _080F91CC bl sub_80F8DC0 - ldr r0, _080F91C8 @ =gUnknown_3003F64 + ldr r0, _080F91C8 @ =gReceivedRemoteLinkPlayers strb r4, [r0] b _080F91F6 .align 2, 0 _080F91C4: .4byte gUnknown_3005E10 -_080F91C8: .4byte gUnknown_3003F64 +_080F91C8: .4byte gReceivedRemoteLinkPlayers _080F91CC: bl sub_80F8FD4 ldr r0, _080F91E4 @ =gUnknown_3005450 @@ -1972,7 +1972,7 @@ _080F9538: bl sub_80FB9E4 _080F95B0: bl rfu_clearAllSlot - ldr r1, _080F9650 @ =gUnknown_3003F64 + ldr r1, _080F9650 @ =gReceivedRemoteLinkPlayers movs r0, 0 strb r0, [r1] ldr r0, _080F9644 @ =gUnknown_3005450 @@ -2043,7 +2043,7 @@ _080F9640: .4byte gUnknown_3005E10 _080F9644: .4byte gUnknown_3005450 _080F9648: .4byte 0x0000099c _080F964C: .4byte gUnknown_3007460 -_080F9650: .4byte gUnknown_3003F64 +_080F9650: .4byte gReceivedRemoteLinkPlayers _080F9654: .4byte 0x00000988 _080F9658: .4byte gUnknown_3003F50 thumb_func_end sub_80F9514 @@ -2240,7 +2240,7 @@ _080F97B4: .4byte 0x000008f6 thumb_func_start rfu_func_080F97B8 rfu_func_080F97B8: @ 80F97B8 push {lr} - ldr r0, _080F97F0 @ =gUnknown_3003F64 + ldr r0, _080F97F0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _080F97EA @@ -2267,7 +2267,7 @@ _080F97EA: pop {r0} bx r0 .align 2, 0 -_080F97F0: .4byte gUnknown_3003F64 +_080F97F0: .4byte gReceivedRemoteLinkPlayers _080F97F4: .4byte gUnknown_3005028 _080F97F8: .4byte gLinkTransferringData _080F97FC: .4byte gUnknown_3001188 @@ -2429,7 +2429,7 @@ _080F9902: ldrb r0, [r4, 0xC] cmp r0, 0 bne _080F9914 - ldr r0, _080F9940 @ =gUnknown_3003F64 + ldr r0, _080F9940 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _080F9914 @@ -2457,7 +2457,7 @@ _080F9924: b _080F9BF8 .align 2, 0 _080F993C: .4byte gUnknown_3005450 -_080F9940: .4byte gUnknown_3003F64 +_080F9940: .4byte gReceivedRemoteLinkPlayers _080F9944: .4byte gUnknown_3007460 _080F9948: .4byte gUnknown_3003ED2 _080F994C: .4byte gUnknown_3003ED4 @@ -2543,7 +2543,7 @@ _080F99DA: orrs r0, r3 str r0, [r1] movs r4, 0 - ldr r0, _080F9A8C @ =gUnknown_2022118 + ldr r0, _080F9A8C @ =gBlockRecvBuffer mov r9, r0 mov r12, r2 mov r1, r8 @@ -2606,7 +2606,7 @@ _080F9A4C: beq _080F9A6E b _080F9BF8 _080F9A6E: - ldr r0, _080F9A98 @ =gUnknown_3003F64 + ldr r0, _080F9A98 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _080F9A78 @@ -2617,15 +2617,15 @@ _080F9A78: beq _080F9A80 b _080F9BF8 _080F9A80: - ldr r0, _080F9A8C @ =gUnknown_2022118 + ldr r0, _080F9A8C @ =gBlockRecvBuffer bl sub_80FAA58 b _080F9BF8 .align 2, 0 _080F9A88: .4byte gUnknown_3005450 -_080F9A8C: .4byte gUnknown_2022118 +_080F9A8C: .4byte gBlockRecvBuffer _080F9A90: .4byte gUnknown_3003ED0 _080F9A94: .4byte gUnknown_843EBD4 -_080F9A98: .4byte gUnknown_3003F64 +_080F9A98: .4byte gReceivedRemoteLinkPlayers _080F9A9C: ldr r2, _080F9AB8 @ =gUnknown_843EC64 ldr r3, _080F9ABC @ =gUnknown_3003ED2 @@ -2679,7 +2679,7 @@ _080F9B00: ldrb r2, [r7, 0xC] cmp r2, 0 bne _080F9B68 - ldr r3, _080F9B50 @ =gUnknown_3003F64 + ldr r3, _080F9B50 @ =gReceivedRemoteLinkPlayers ldrb r0, [r3] mov r6, r8 adds r6, 0x1 @@ -2713,7 +2713,7 @@ _080F9B38: b _080F9BF8 .align 2, 0 _080F9B4C: .4byte gUnknown_3005450 -_080F9B50: .4byte gUnknown_3003F64 +_080F9B50: .4byte gReceivedRemoteLinkPlayers _080F9B54: .4byte gUnknown_3003ED2 _080F9B58: .4byte gUnknown_3007460 _080F9B5C: .4byte gUnknown_3003ED4 @@ -3204,7 +3204,7 @@ _080F9EC0: str r7, [r5, 0x70] b _080F9F14 _080F9F02: - ldr r4, _080F9F38 @ =gUnknown_2022618 + ldr r4, _080F9F38 @ =gBlockSendBuffer cmp r7, r4 beq _080F9F12 adds r0, r4, 0 @@ -3232,7 +3232,7 @@ _080F9F2A: pop {r1} bx r1 .align 2, 0 -_080F9F38: .4byte gUnknown_2022618 +_080F9F38: .4byte gBlockSendBuffer _080F9F3C: .4byte gUnknown_3005450 _080F9F40: .4byte rfufunc_80F9F44 thumb_func_end sub_80F9E60 @@ -3482,7 +3482,7 @@ sub_80FA114: @ 80FA114 push {lr} bl rfu_clearAllSlot bl sub_80FD52C - ldr r1, _080FA138 @ =gUnknown_3003F64 + ldr r1, _080FA138 @ =gReceivedRemoteLinkPlayers movs r0, 0 strb r0, [r1] ldr r2, _080FA13C @ =gUnknown_3005450 @@ -3495,7 +3495,7 @@ sub_80FA114: @ 80FA114 pop {r0} bx r0 .align 2, 0 -_080FA138: .4byte gUnknown_3003F64 +_080FA138: .4byte gReceivedRemoteLinkPlayers _080FA13C: .4byte gUnknown_3005450 thumb_func_end sub_80FA114 @@ -4515,7 +4515,7 @@ _080FA8B4: ldrb r0, [r5, 0xC] cmp r0, 0x1 bne _080FA8F4 - ldr r0, _080FA8CC @ =gUnknown_3003F64 + ldr r0, _080FA8CC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _080FA8D0 @@ -4524,7 +4524,7 @@ _080FA8B4: bl sub_80F9D04 b _080FA8D8 .align 2, 0 -_080FA8CC: .4byte gUnknown_3003F64 +_080FA8CC: .4byte gReceivedRemoteLinkPlayers _080FA8D0: movs r0, 0xEE lsls r0, 7 @@ -4609,7 +4609,7 @@ _080FA968: .4byte gTasks _080FA96C: adds r0, r6, 0 bl DestroyTask - ldr r1, _080FA9C4 @ =gUnknown_3003F64 + ldr r1, _080FA9C4 @ =gReceivedRemoteLinkPlayers movs r0, 0x1 strb r0, [r1] movs r0, 0x9A @@ -4652,7 +4652,7 @@ _080FA9BC: pop {r0} bx r0 .align 2, 0 -_080FA9C4: .4byte gUnknown_3003F64 +_080FA9C4: .4byte gReceivedRemoteLinkPlayers _080FA9C8: .4byte 0x0000099e _080FA9CC: .4byte 0x0000099d thumb_func_end sub_80FA834 @@ -4872,7 +4872,7 @@ _080FAB70: adds r0, r4, 0 bl ResetBlockReceivedFlag lsls r2, r4, 8 - ldr r0, _080FAB9C @ =gUnknown_2022118 + ldr r0, _080FAB9C @ =gBlockRecvBuffer adds r2, r0 ldr r1, _080FABA0 @ =gLinkPlayers lsls r0, r4, 3 @@ -4890,10 +4890,10 @@ _080FAB70: bl sub_800B284 b _080FAC2E .align 2, 0 -_080FAB9C: .4byte gUnknown_2022118 +_080FAB9C: .4byte gBlockRecvBuffer _080FABA0: .4byte gLinkPlayers _080FABA4: - ldr r5, _080FAC40 @ =gUnknown_2022618 + ldr r5, _080FAC40 @ =gBlockSendBuffer adds r1, r5, 0 ldr r0, _080FAC44 @ =gUnknown_843EDE4 "PokemonSioInfo" ldm r0!, {r2-r4} @@ -4931,7 +4931,7 @@ _080FABC6: adds r0, 0x1 strh r0, [r1, 0x8] _080FABEE: - ldr r5, _080FAC40 @ =gUnknown_2022618 + ldr r5, _080FAC40 @ =gBlockSendBuffer ldr r1, _080FAC48 @ =gUnknown_3005450 ldrb r0, [r1, 0xD] strb r0, [r5, 0xF] @@ -4955,7 +4955,7 @@ _080FAC04: mov r1, r12 movs r2, 0x8C bl memcpy - ldr r1, _080FAC40 @ =gUnknown_2022618 + ldr r1, _080FAC40 @ =gBlockSendBuffer movs r0, 0 movs r2, 0xA0 bl SendBlock @@ -4973,7 +4973,7 @@ _080FAC36: strh r0, [r1, 0x8] b _080FACD6 .align 2, 0 -_080FAC40: .4byte gUnknown_2022618 +_080FAC40: .4byte gBlockSendBuffer _080FAC44: .4byte gUnknown_843EDE4 _080FAC48: .4byte gUnknown_3005450 _080FAC4C: .4byte 0x00000996 @@ -5008,7 +5008,7 @@ _080FAC78: mov r0, sp movs r4, 0 strh r4, [r0] - ldr r1, _080FACE0 @ =gUnknown_2022118 + ldr r1, _080FACE0 @ =gBlockRecvBuffer ldr r2, _080FACE4 @ =0x0100007e bl CpuSet movs r0, 0 @@ -5046,7 +5046,7 @@ _080FACD6: pop {r0} bx r0 .align 2, 0 -_080FACE0: .4byte gUnknown_2022118 +_080FACE0: .4byte gBlockRecvBuffer _080FACE4: .4byte 0x0100007e _080FACE8: .4byte gUnknown_3005450 _080FACEC: .4byte 0x0000099e @@ -5095,13 +5095,13 @@ _080FAD3A: cmp r0, 0 beq _080FAD8A bl sub_800B0B4 - ldr r1, _080FAD50 @ =gUnknown_2022618 + ldr r1, _080FAD50 @ =gBlockSendBuffer movs r0, 0 movs r2, 0x3C bl SendBlock b _080FAD5E .align 2, 0 -_080FAD50: .4byte gUnknown_2022618 +_080FAD50: .4byte gBlockSendBuffer _080FAD54: bl sub_800A4BC lsls r0, 24 @@ -5119,11 +5119,11 @@ _080FAD66: ands r1, r0 cmp r1, 0 beq _080FAD8A - ldr r0, _080FAD90 @ =gUnknown_2022118 + ldr r0, _080FAD90 @ =gBlockRecvBuffer bl sub_80FA9FC movs r0, 0 bl ResetBlockReceivedFlag - ldr r0, _080FAD94 @ =gUnknown_3003F64 + ldr r0, _080FAD94 @ =gReceivedRemoteLinkPlayers strb r4, [r0] adds r0, r5, 0 bl DestroyTask @@ -5132,8 +5132,8 @@ _080FAD8A: pop {r0} bx r0 .align 2, 0 -_080FAD90: .4byte gUnknown_2022118 -_080FAD94: .4byte gUnknown_3003F64 +_080FAD90: .4byte gBlockRecvBuffer +_080FAD94: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_80FACF0 thumb_func_start sub_80FAD98 @@ -5155,7 +5155,7 @@ sub_80FAD98: @ 80FAD98 ldr r0, _080FAE1C @ =sub_814208C cmp r1, r0 bne _080FADC0 - ldr r1, _080FAE20 @ =gUnknown_3003F3C + ldr r1, _080FAE20 @ =gWirelessCommType movs r0, 0x2 strb r0, [r1] _080FADC0: @@ -5200,7 +5200,7 @@ _080FAE10: .4byte gUnknown_3005450 _080FAE14: .4byte gUnknown_3005E10 _080FAE18: .4byte gMain _080FAE1C: .4byte sub_814208C -_080FAE20: .4byte gUnknown_3003F3C +_080FAE20: .4byte gWirelessCommType _080FAE24: .4byte c2_800ACD4 _080FAE28: .4byte 0x0000069e _080FAE2C: .4byte 0x000008d2 @@ -5871,7 +5871,7 @@ _080FB2E4: bics r3, r2 adds r2, r3, 0 strb r2, [r1] - ldr r0, _080FB320 @ =gUnknown_3003F64 + ldr r0, _080FB320 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _080FB328 @@ -5884,7 +5884,7 @@ _080FB2E4: _080FB314: .4byte gUnknown_3005450 _080FB318: .4byte 0x0000099a _080FB31C: .4byte gUnknown_3005E10 -_080FB320: .4byte gUnknown_3003F64 +_080FB320: .4byte gReceivedRemoteLinkPlayers _080FB324: bl sub_80FB174 _080FB328: @@ -6101,7 +6101,7 @@ _080FB4BC: movs r1, 0x5 movs r2, 0x5 bl nullsub_87 - ldr r0, _080FB4E4 @ =gUnknown_3003F64 + ldr r0, _080FB4E4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _080FB556 @@ -6112,7 +6112,7 @@ _080FB4BC: _080FB4D8: .4byte gUnknown_3005450 _080FB4DC: .4byte 0x0000093e _080FB4E0: .4byte gUnknown_843EDF8 -_080FB4E4: .4byte gUnknown_3003F64 +_080FB4E4: .4byte gReceivedRemoteLinkPlayers _080FB4E8: ldr r0, _080FB4FC @ =gUnknown_3005450 adds r0, 0xF0 @@ -6635,7 +6635,7 @@ _080FB8D8: ldrb r0, [r2, 0xC] cmp r0, 0x1 bne _080FB916 - ldr r0, _080FB904 @ =gUnknown_3003F64 + ldr r0, _080FB904 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _080FB934 @@ -6653,7 +6653,7 @@ _080FB8D8: b _080FB934 .align 2, 0 _080FB900: .4byte gUnknown_3005450 -_080FB904: .4byte gUnknown_3003F64 +_080FB904: .4byte gReceivedRemoteLinkPlayers _080FB908: .4byte 0x0000099a _080FB90C: .4byte gUnknown_3005E10 _080FB910: @@ -6665,7 +6665,7 @@ _080FB916: ldrb r0, [r0] cmp r0, 0x2 beq _080FB934 - ldr r0, _080FB968 @ =gUnknown_3003F64 + ldr r0, _080FB968 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _080FB934 @@ -6699,7 +6699,7 @@ _080FB95A: b _080FB9C2 .align 2, 0 _080FB964: .4byte 0x0000099c -_080FB968: .4byte gUnknown_3003F64 +_080FB968: .4byte gReceivedRemoteLinkPlayers _080FB96C: .4byte gUnknown_3007460 _080FB970: .4byte gUnknown_3005E10 _080FB974: .4byte sub_80F8B34 @@ -6870,7 +6870,7 @@ sub_80FBA78: @ 80FBA78 lsls r0, 24 cmp r0, 0 beq _080FBAEC - ldr r1, _080FBAF8 @ =gUnknown_202271A + ldr r1, _080FBAF8 @ =gLinkType ldr r2, _080FBAFC @ =0x00001111 adds r0, r2, 0 strh r0, [r1] @@ -6907,7 +6907,7 @@ _080FBAEC: bx r0 .align 2, 0 _080FBAF4: .4byte sub_80FBA64 -_080FBAF8: .4byte gUnknown_202271A +_080FBAF8: .4byte gLinkType _080FBAFC: .4byte 0x00001111 _080FBB00: .4byte gMain _080FBB04: .4byte gSaveBlock2Ptr @@ -9926,7 +9926,7 @@ sub_80FD1A0: @ 80FD1A0 mov r5, r8 push {r5-r7} sub sp, 0x20 - ldr r0, _080FD1C4 @ =gUnknown_3003F3C + ldr r0, _080FD1C4 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _080FD1B6 @@ -9938,7 +9938,7 @@ _080FD1B6: movs r4, 0 b _080FD22C .align 2, 0 -_080FD1C4: .4byte gUnknown_3003F3C +_080FD1C4: .4byte gWirelessCommType _080FD1C8: lsls r2, r4, 2 mov r0, sp @@ -9954,7 +9954,7 @@ _080FD1C8: subs r0, r4 lsls r0, 2 str r0, [sp, 0x1C] - ldr r2, _080FD24C @ =gUnknown_2022744 + ldr r2, _080FD24C @ =gLinkPlayers + 8 mov r10, r2 ldr r6, _080FD250 @ =0x00003ba8 movs r4, 0 @@ -10007,7 +10007,7 @@ _080FD22C: ldr r6, [sp, 0x14] b _080FD2A4 .align 2, 0 -_080FD24C: .4byte gUnknown_2022744 +_080FD24C: .4byte gLinkPlayers + 8 _080FD250: .4byte 0x00003ba8 _080FD254: .4byte gSaveBlock1Ptr _080FD258: diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index c564cd83c..c5947ebc0 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -230,7 +230,7 @@ sub_8115A24: @ 8115A24 movs r0, 0 strb r0, [r1, 0xC] strb r0, [r1, 0xD] - ldr r1, _08115A64 @ =gUnknown_20370D0 + ldr r1, _08115A64 @ =gSpecialVar_Result strh r0, [r1] pop {r0} bx r0 @@ -239,7 +239,7 @@ _08115A54: .4byte sub_8115A68 _08115A58: .4byte gUnknown_203B05C _08115A5C: .4byte gTasks+0x8 _08115A60: .4byte gUnknown_3002024 -_08115A64: .4byte gUnknown_20370D0 +_08115A64: .4byte gSpecialVar_Result thumb_func_end sub_8115A24 thumb_func_start sub_8115A68 @@ -299,7 +299,7 @@ _08115A90: _08115B0C: ldr r3, _08115B4C @ =gUnknown_203B058 ldr r2, _08115B50 @ =gUnknown_8456CD8 - ldr r1, _08115B54 @ =gUnknown_20370C0 + ldr r1, _08115B54 @ =gSpecialVar_0x8004 ldrh r0, [r1] lsls r0, 2 adds r0, r2 @@ -328,7 +328,7 @@ _08115B0C: .align 2, 0 _08115B4C: .4byte gUnknown_203B058 _08115B50: .4byte gUnknown_8456CD8 -_08115B54: .4byte gUnknown_20370C0 +_08115B54: .4byte gSpecialVar_0x8004 _08115B58: .4byte gUnknown_203B059 _08115B5C: movs r0, 0x70 @@ -1083,22 +1083,22 @@ _0811617E: bl EnableBothScriptContexts adds r0, r4, 0 bl DestroyTask - ldr r1, _08116190 @ =gUnknown_20370D0 + ldr r1, _08116190 @ =gSpecialVar_Result movs r0, 0x5 strh r0, [r1] b _081161D8 .align 2, 0 -_08116190: .4byte gUnknown_20370D0 +_08116190: .4byte gSpecialVar_Result _08116194: bl EnableBothScriptContexts adds r0, r4, 0 bl DestroyTask - ldr r1, _081161A8 @ =gUnknown_20370D0 + ldr r1, _081161A8 @ =gSpecialVar_Result movs r0, 0x8 strh r0, [r1] b _081161D8 .align 2, 0 -_081161A8: .4byte gUnknown_20370D0 +_081161A8: .4byte gSpecialVar_Result _081161AC: bl sub_80FBA00 cmp r0, 0 @@ -1107,7 +1107,7 @@ _081161AC: strb r0, [r5, 0xC] b _081161D8 _081161BA: - ldr r0, _081161E0 @ =gUnknown_3003F64 + ldr r0, _081161E0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _081161D8 @@ -1124,7 +1124,7 @@ _081161D8: pop {r0} bx r0 .align 2, 0 -_081161E0: .4byte gUnknown_3003F64 +_081161E0: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_8115A68 thumb_func_start sub_81161E4 @@ -1767,7 +1767,7 @@ BerryBlenderLinkJoinGroup: @ 81166F4 movs r0, 0 strb r0, [r1, 0x8] strb r0, [r1, 0x9] - ldr r1, _08116734 @ =gUnknown_20370D0 + ldr r1, _08116734 @ =gSpecialVar_Result strh r0, [r1] pop {r0} bx r0 @@ -1776,7 +1776,7 @@ _08116724: .4byte sub_8116738 _08116728: .4byte gUnknown_203B05C _0811672C: .4byte gTasks+0x8 _08116730: .4byte gUnknown_3002028 -_08116734: .4byte gUnknown_20370D0 +_08116734: .4byte gSpecialVar_Result thumb_func_end BerryBlenderLinkJoinGroup thumb_func_start sub_8116738 @@ -1828,7 +1828,7 @@ _08116760: .4byte _08116CEC _081167C0: ldr r5, _08116800 @ =gUnknown_84570C8 - ldr r4, _08116804 @ =gUnknown_20370C0 + ldr r4, _08116804 @ =gSpecialVar_0x8004 ldrh r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -1855,13 +1855,13 @@ _081167C0: b _08116D06 .align 2, 0 _08116800: .4byte gUnknown_84570C8 -_08116804: .4byte gUnknown_20370C0 +_08116804: .4byte gSpecialVar_0x8004 _08116808: .4byte gUnknown_203B058 _0811680C: adds r0, r6, 0 adds r0, 0x9 ldr r2, _08116830 @ =gUnknown_84591B8 - ldr r1, _08116834 @ =gUnknown_20370C0 + ldr r1, _08116834 @ =gSpecialVar_0x8004 ldrh r1, [r1] lsls r1, 2 adds r1, r2 @@ -1877,7 +1877,7 @@ _08116828: b _08116D06 .align 2, 0 _08116830: .4byte gUnknown_84591B8 -_08116834: .4byte gUnknown_20370C0 +_08116834: .4byte gSpecialVar_0x8004 _08116838: ldr r0, [r6, 0x4] movs r1, 0x4 @@ -1886,7 +1886,7 @@ _08116838: movs r1, 0x10 bl sub_811A5E4 ldr r0, [r6, 0x4] - ldr r1, _081168E8 @ =gUnknown_20370C0 + ldr r1, _081168E8 @ =gSpecialVar_0x8004 ldrh r1, [r1] bl sub_811A054 movs r4, 0 @@ -1950,7 +1950,7 @@ _08116838: strb r0, [r6, 0x8] b _08116D06 .align 2, 0 -_081168E8: .4byte gUnknown_20370C0 +_081168E8: .4byte gSpecialVar_0x8004 _081168EC: .4byte gUnknown_8456CD0 _081168F0: .4byte gUnknown_8456D4C _081168F4: .4byte gUnknown_8456D54 @@ -2082,7 +2082,7 @@ _081169FC: .4byte gStringVar4 _08116A00: .4byte gUnknown_203B058 _08116A04: .4byte gStringVar1 _08116A08: - ldr r0, _08116A3C @ =gUnknown_3003F64 + ldr r0, _08116A3C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08116AA4 @@ -2108,7 +2108,7 @@ _08116A08: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08116A3C: .4byte gUnknown_3003F64 +_08116A3C: .4byte gReceivedRemoteLinkPlayers _08116A40: .4byte gUnknown_203B058 _08116A44: .4byte _08116A48 .align 2, 0 @@ -2361,19 +2361,19 @@ _08116C68: lsls r0, 24 cmp r0, 0 beq _08116D06 - ldr r0, _08116C94 @ =gUnknown_20370D0 + ldr r0, _08116C94 @ =gSpecialVar_Result movs r1, 0x6 b _08116CDC .align 2, 0 _08116C90: .4byte gUnknown_8457754 -_08116C94: .4byte gUnknown_20370D0 +_08116C94: .4byte gSpecialVar_Result _08116C98: bl sub_80FCE44 - ldr r0, _08116CA4 @ =gUnknown_20370D0 + ldr r0, _08116CA4 @ =gSpecialVar_Result movs r1, 0x5 b _08116CDC .align 2, 0 -_08116CA4: .4byte gUnknown_20370D0 +_08116CA4: .4byte gSpecialVar_Result _08116CA8: bl sub_80FCE44 adds r5, r6, 0 @@ -2397,7 +2397,7 @@ _08116CCE: lsls r0, 24 cmp r0, 0 beq _08116D06 - ldr r0, _08116CE8 @ =gUnknown_20370D0 + ldr r0, _08116CE8 @ =gSpecialVar_Result movs r1, 0x8 _08116CDC: strh r1, [r0] @@ -2406,7 +2406,7 @@ _08116CDC: b _08116D06 .align 2, 0 _08116CE4: .4byte gStringVar4 -_08116CE8: .4byte gUnknown_20370D0 +_08116CE8: .4byte gSpecialVar_Result _08116CEC: adds r0, r4, 0 bl DestroyTask @@ -2499,7 +2499,7 @@ sub_8116D60: @ 8116D60 adds r0, r5, 0 bl ConvertInternationalString ldr r1, _08116DD8 @ =gUnknown_84570C8 - ldr r0, _08116DDC @ =gUnknown_20370C0 + ldr r0, _08116DDC @ =gSpecialVar_0x8004 ldrh r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -2525,7 +2525,7 @@ sub_8116D60: @ 8116D60 .align 2, 0 _08116DD4: .4byte gStringVar1 _08116DD8: .4byte gUnknown_84570C8 -_08116DDC: .4byte gUnknown_20370C0 +_08116DDC: .4byte gSpecialVar_0x8004 thumb_func_end sub_8116D60 thumb_func_start sub_8116DE0 @@ -3028,7 +3028,7 @@ _0811719C: eors r1, r2 lsls r1, 24 lsrs r1, 16 - ldr r2, _081171D4 @ =gUnknown_2022118 + ldr r2, _081171D4 @ =gBlockRecvBuffer adds r1, r2 movs r2, 0x64 bl memcpy @@ -3038,9 +3038,9 @@ _0811719C: b _081171FA .align 2, 0 _081171D0: .4byte gEnemyParty -_081171D4: .4byte gUnknown_2022118 +_081171D4: .4byte gBlockRecvBuffer _081171D8: - ldr r4, _08117204 @ =gUnknown_2022618 + ldr r4, _08117204 @ =gBlockSendBuffer ldr r0, _08117208 @ =gSaveBlock1Ptr ldr r1, [r0] ldr r0, _0811720C @ =0x00002cd0 @@ -3061,7 +3061,7 @@ _081171FA: strh r0, [r5, 0x8] b _0811725C .align 2, 0 -_08117204: .4byte gUnknown_2022618 +_08117204: .4byte gBlockSendBuffer _08117208: .4byte gSaveBlock1Ptr _0811720C: .4byte 0x00002cd0 _08117210: @@ -3077,7 +3077,7 @@ _08117210: eors r1, r0 lsls r1, 24 lsrs r1, 16 - ldr r0, _0811726C @ =gUnknown_2022118 + ldr r0, _0811726C @ =gBlockRecvBuffer adds r1, r0 adds r0, r4, 0 movs r2, 0xD8 @@ -3104,7 +3104,7 @@ _0811725C: bx r0 .align 2, 0 _08117268: .4byte gUnknown_2031CCC -_0811726C: .4byte gUnknown_2022118 +_0811726C: .4byte gBlockRecvBuffer _08117270: .4byte gUnknown_2031DA4 _08117274: .4byte gMain _08117278: .4byte c2_exit_to_overworld_2_switch @@ -3165,7 +3165,7 @@ _081172E0: .4byte gUnknown_2039624 _081172E4: .4byte gLinkPlayers _081172E8: lsls r0, r4, 8 - ldr r1, _08117338 @ =gUnknown_2022118 + ldr r1, _08117338 @ =gBlockRecvBuffer adds r1, r0, r1 adds r0, r5, 0 movs r2, 0x60 @@ -3192,7 +3192,7 @@ _08117302: eors r0, r1 lsls r0, 24 lsrs r0, 16 - ldr r1, _08117338 @ =gUnknown_2022118 + ldr r1, _08117338 @ =gBlockRecvBuffer adds r1, r0, r1 adds r0, r1, 0 adds r0, 0x60 @@ -3200,7 +3200,7 @@ _08117302: bl sub_81446D0 b _08117340 .align 2, 0 -_08117338: .4byte gUnknown_2022118 +_08117338: .4byte gBlockRecvBuffer _0811733C: bl sub_81446C4 _08117340: @@ -3396,7 +3396,7 @@ sub_81174B4: @ 81174B4 lsrs r5, 24 lsls r1, 16 lsrs r1, 16 - ldr r0, _08117524 @ =gUnknown_20370C0 + ldr r0, _08117524 @ =gSpecialVar_0x8004 strh r1, [r0] ldr r0, _08117528 @ =0x0000406f bl VarSet @@ -3432,7 +3432,7 @@ sub_81174B4: @ 81174B4 pop {r0} bx r0 .align 2, 0 -_08117524: .4byte gUnknown_20370C0 +_08117524: .4byte gSpecialVar_0x8004 _08117528: .4byte 0x0000406f _0811752C: .4byte gUnknown_3005030 _08117530: .4byte gUnknown_300502C @@ -3657,7 +3657,7 @@ _08117798: .4byte gMain _0811779C: .4byte sub_811C1C8 _081177A0: bl sub_80563F0 - ldr r0, _081177C4 @ =gUnknown_2022618 + ldr r0, _081177C4 @ =gBlockSendBuffer movs r1, 0x1 bl sub_8117594 bl sp000_heal_pokemon @@ -3670,13 +3670,13 @@ _081177A0: movs r2, 0x6 b _0811782E .align 2, 0 -_081177C4: .4byte gUnknown_2022618 +_081177C4: .4byte gBlockSendBuffer _081177C8: bl sub_80563F0 bl sp000_heal_pokemon bl SavePlayerParty bl LoadPlayerBag - ldr r0, _081177EC @ =gUnknown_2022618 + ldr r0, _081177EC @ =gBlockSendBuffer movs r1, 0x1 bl sub_8117594 movs r0, 0x2 @@ -3686,13 +3686,13 @@ _081177C8: movs r2, 0x6 b _0811782E .align 2, 0 -_081177EC: .4byte gUnknown_2022618 +_081177EC: .4byte gBlockSendBuffer _081177F0: bl sub_80563F0 bl sp000_heal_pokemon bl SavePlayerParty bl LoadPlayerBag - ldr r0, _08117814 @ =gUnknown_2022618 + ldr r0, _08117814 @ =gBlockSendBuffer movs r1, 0x1 bl sub_8117594 movs r0, 0x5 @@ -3701,9 +3701,9 @@ _081177F0: movs r1, 0x3 b _0811782C .align 2, 0 -_08117814: .4byte gUnknown_2022618 +_08117814: .4byte gBlockSendBuffer _08117818: - ldr r0, _0811783C @ =gUnknown_2022618 + ldr r0, _0811783C @ =gBlockSendBuffer movs r1, 0x1 bl sub_8117594 bl sub_80563F0 @@ -3720,7 +3720,7 @@ _0811782E: bl SetMainCallback2 b _081178E0 .align 2, 0 -_0811783C: .4byte gUnknown_2022618 +_0811783C: .4byte gBlockSendBuffer _08117840: .4byte sub_8117534 _08117844: ldr r0, _08117850 @ =sub_8117130 @@ -3746,14 +3746,14 @@ _08117872: bl sub_8128420 b _081178E0 _08117878: - ldr r0, _08117888 @ =gUnknown_2022618 + ldr r0, _08117888 @ =gBlockSendBuffer movs r1, 0 bl sub_8117594 ldr r0, _0811788C @ =sub_8117354 bl SetMainCallback2 b _081178E0 .align 2, 0 -_08117888: .4byte gUnknown_2022618 +_08117888: .4byte gBlockSendBuffer _0811788C: .4byte sub_8117354 _08117890: movs r0, 0x8 @@ -3791,7 +3791,7 @@ _081178C8: _081178E0: adds r0, r4, 0 bl DestroyTask - ldr r1, _081178FC @ =gUnknown_20370D0 + ldr r1, _081178FC @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] bl ScriptContext2_Disable @@ -3801,7 +3801,7 @@ _081178E0: bx r0 .align 2, 0 _081178F8: .4byte sub_805671C -_081178FC: .4byte gUnknown_20370D0 +_081178FC: .4byte gSpecialVar_Result thumb_func_end sub_81175BC thumb_func_start sub_8117900 @@ -3832,13 +3832,13 @@ _08117928: beq _08117974 b _08117988 _08117932: - ldr r1, _08117940 @ =gUnknown_20370D0 + ldr r1, _08117940 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] bl EnableBothScriptContexts b _08117968 .align 2, 0 -_08117940: .4byte gUnknown_20370D0 +_08117940: .4byte gSpecialVar_Result _08117944: bl ScriptContext1_IsScriptSetUp lsls r0, 24 @@ -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 @@ -3931,7 +3931,7 @@ sub_81179CC: @ 81179CC strb r2, [r1, 0xC] strb r2, [r1, 0xD] strb r4, [r1, 0x18] - ldr r0, _08117A08 @ =gUnknown_20370D0 + ldr r0, _08117A08 @ =gSpecialVar_Result strh r2, [r0] pop {r4} pop {r0} @@ -3940,7 +3940,7 @@ sub_81179CC: @ 81179CC _081179FC: .4byte sub_8117A0C _08117A00: .4byte gUnknown_203B05C _08117A04: .4byte gTasks+0x8 -_08117A08: .4byte gUnknown_20370D0 +_08117A08: .4byte gSpecialVar_Result thumb_func_end sub_81179CC thumb_func_start sub_8117A0C @@ -4421,13 +4421,13 @@ _08117E26: beq _08117ECA adds r0, r4, 0 bl DestroyTask - ldr r1, _08117E48 @ =gUnknown_20370D0 + ldr r1, _08117E48 @ =gSpecialVar_Result movs r0, 0x5 strh r0, [r1] b _08117ECA .align 2, 0 _08117E44: .4byte gUnknown_84571B8 -_08117E48: .4byte gUnknown_20370D0 +_08117E48: .4byte gSpecialVar_Result _08117E4C: bl sub_80FB9F4 lsls r0, 24 @@ -4444,7 +4444,7 @@ _08117E64: strb r0, [r5, 0xC] b _08117ECA _08117E6A: - ldr r0, _08117E7C @ =gUnknown_3003F64 + ldr r0, _08117E7C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08117ECA @@ -4452,7 +4452,7 @@ _08117E6A: bl sub_80FAFE0 b _08117EB2 .align 2, 0 -_08117E7C: .4byte gUnknown_3003F64 +_08117E7C: .4byte gReceivedRemoteLinkPlayers _08117E80: ldrb r0, [r5, 0x12] movs r1, 0 @@ -4513,7 +4513,7 @@ sub_8117ED4: @ 8117ED4 strb r2, [r1, 0x9] subs r4, 0x15 strb r4, [r1, 0x12] - ldr r0, _08117F1C @ =gUnknown_20370D0 + ldr r0, _08117F1C @ =gSpecialVar_Result strh r2, [r0] pop {r4} pop {r0} @@ -4523,7 +4523,7 @@ _08117F0C: .4byte sub_8117F20 _08117F10: .4byte gUnknown_203B05C _08117F14: .4byte gTasks+0x8 _08117F18: .4byte gUnknown_3002028 -_08117F1C: .4byte gUnknown_20370D0 +_08117F1C: .4byte gSpecialVar_Result thumb_func_end sub_8117ED4 thumb_func_start sub_8117F20 @@ -4791,7 +4791,7 @@ _08118150: _08118184: .4byte gUnknown_8459238 _08118188: .4byte gStringVar1 _0811818C: - ldr r0, _081181C4 @ =gUnknown_3003F64 + ldr r0, _081181C4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _081181AA @@ -4820,7 +4820,7 @@ _081181AA: blt _08118288 b _081181D0 .align 2, 0 -_081181C4: .4byte gUnknown_3003F64 +_081181C4: .4byte gReceivedRemoteLinkPlayers _081181C8: .4byte gUnknown_203B058 _081181CC: cmp r0, 0x6 @@ -4883,13 +4883,13 @@ _08118252: adds r0, r6, 0 bl DestroyTask bl sub_80F8DC0 - ldr r1, _08118268 @ =gUnknown_20370D0 + ldr r1, _08118268 @ =gSpecialVar_Result movs r0, 0x5 strh r0, [r1] b _08118288 .align 2, 0 _08118264: .4byte gUnknown_84571B8 -_08118268: .4byte gUnknown_20370D0 +_08118268: .4byte gSpecialVar_Result _0811826C: ldrb r0, [r5, 0x8] adds r0, 0x1 @@ -4933,7 +4933,7 @@ sub_8118290: @ 8118290 strb r2, [r1, 0x9] subs r4, 0x15 strb r4, [r1, 0x12] - ldr r0, _081182D8 @ =gUnknown_20370D0 + ldr r0, _081182D8 @ =gSpecialVar_Result strh r2, [r0] pop {r4} pop {r0} @@ -4943,7 +4943,7 @@ _081182C8: .4byte sub_81182DC _081182CC: .4byte gUnknown_203B05C _081182D0: .4byte gTasks+0x8 _081182D4: .4byte gUnknown_3002028 -_081182D8: .4byte gUnknown_20370D0 +_081182D8: .4byte gSpecialVar_Result thumb_func_end sub_8118290 thumb_func_start sub_81182DC @@ -5188,7 +5188,7 @@ _081184C8: _081184FC: .4byte gUnknown_845928C _08118500: .4byte gStringVar1 _08118504: - ldr r0, _0811853C @ =gUnknown_3003F64 + ldr r0, _0811853C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08118522 @@ -5217,7 +5217,7 @@ _08118522: blt _08118604 b _08118548 .align 2, 0 -_0811853C: .4byte gUnknown_3003F64 +_0811853C: .4byte gReceivedRemoteLinkPlayers _08118540: .4byte gUnknown_203B058 _08118544: cmp r0, 0x6 @@ -5288,13 +5288,13 @@ _081185C2: adds r0, r4, 0 bl DestroyTask bl sub_80F8DC0 - ldr r1, _081185E4 @ =gUnknown_20370D0 + ldr r1, _081185E4 @ =gSpecialVar_Result movs r0, 0x5 strh r0, [r1] b _08118604 .align 2, 0 _081185E0: .4byte gUnknown_845933C -_081185E4: .4byte gUnknown_20370D0 +_081185E4: .4byte gSpecialVar_Result _081185E8: ldrb r0, [r5, 0x8] adds r0, 0x1 @@ -5334,7 +5334,7 @@ UnionRoomSpecial: @ 811860C strb r1, [r0, 0x16] strh r1, [r0, 0x10] strh r1, [r0, 0x12] - ldr r0, _08118654 @ =gUnknown_20370D0 + ldr r0, _08118654 @ =gSpecialVar_Result strh r1, [r0] movs r0, 0xD0 movs r1, 0x1 @@ -5346,7 +5346,7 @@ UnionRoomSpecial: @ 811860C _08118648: .4byte sub_81186E0 _0811864C: .4byte gUnknown_203B05C _08118650: .4byte gUnknown_300202C -_08118654: .4byte gUnknown_20370D0 +_08118654: .4byte gSpecialVar_Result thumb_func_end UnionRoomSpecial thumb_func_start sub_8118658 @@ -5593,14 +5593,14 @@ _0811887C: ldr r0, [r6, 0xC] movs r1, 0x4 bl sub_811A650 - ldr r1, _081188C8 @ =gUnknown_20370D0 + ldr r1, _081188C8 @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] movs r0, 0x3 bl _081198DA .align 2, 0 _081188C4: .4byte gUnknown_203B06C -_081188C8: .4byte gUnknown_20370D0 +_081188C8: .4byte gSpecialVar_Result _081188CC: bl sub_811FB18 lsls r0, 24 @@ -5703,7 +5703,7 @@ _081189A4: movs r0, 0x4 bl _081198DA _081189AA: - ldr r4, _081189D8 @ =gUnknown_20370D0 + ldr r4, _081189D8 @ =gSpecialVar_Result ldrh r0, [r4] cmp r0, 0 beq _08118A0E @@ -5723,7 +5723,7 @@ _081189AA: movs r0, 0x2A b _08118A06 .align 2, 0 -_081189D8: .4byte gUnknown_20370D0 +_081189D8: .4byte gSpecialVar_Result _081189DC: .4byte gStringVar1 _081189E0: .4byte gSaveBlock2Ptr _081189E4: @@ -5941,13 +5941,13 @@ _08118BBC: movs r0, 0x40 strb r0, [r1] _08118BC2: - ldr r0, _08118BEC @ =gUnknown_3003F64 + ldr r0, _08118BEC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08118BCE bl _081198DC _08118BCE: - ldr r0, _08118BF0 @ =gUnknown_2022618 + ldr r0, _08118BF0 @ =gBlockSendBuffer movs r1, 0x1 bl sub_8117594 ldr r0, _08118BF4 @ =sub_8117280 @@ -5958,8 +5958,8 @@ _08118BCE: .align 2, 0 _08118BE4: .4byte gUnknown_8457F90 _08118BE8: .4byte gUnknown_203B058 -_08118BEC: .4byte gUnknown_3003F64 -_08118BF0: .4byte gUnknown_2022618 +_08118BEC: .4byte gReceivedRemoteLinkPlayers +_08118BF0: .4byte gBlockSendBuffer _08118BF4: .4byte sub_8117280 _08118BF8: ldr r0, _08118C1C @ =sub_8117280 @@ -5985,7 +5985,7 @@ _08118C28: movs r0, 0x5 bl _081198DA _08118C2E: - ldr r0, _08118C54 @ =gUnknown_3003F64 + ldr r0, _08118C54 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08118C3A @@ -6002,7 +6002,7 @@ _08118C3A: movs r0, 0x2 bl _081198DA .align 2, 0 -_08118C54: .4byte gUnknown_3003F64 +_08118C54: .4byte gReceivedRemoteLinkPlayers _08118C58: adds r0, r6, 0 adds r0, 0x16 @@ -6021,7 +6021,7 @@ _08118C58: bne _08118C7C bl _081198DC _08118C7C: - ldr r0, _08118C94 @ =gUnknown_3003F64 + ldr r0, _08118C94 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08118C98 @@ -6030,7 +6030,7 @@ _08118C7C: .align 2, 0 _08118C8C: .4byte gUnknown_8456DF4 _08118C90: .4byte gUnknown_8456E1C -_08118C94: .4byte gUnknown_3003F64 +_08118C94: .4byte gReceivedRemoteLinkPlayers _08118C98: adds r1, r6, 0 adds r1, 0x84 @@ -6168,7 +6168,7 @@ _08118DAA: .align 2, 0 _08118DD0: .4byte gUnknown_203B06C _08118DD4: - ldr r0, _08118DEC @ =gUnknown_3003F64 + ldr r0, _08118DEC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08118DF8 @@ -6178,7 +6178,7 @@ _08118DD4: movs r0, 0x1C bl _081198DA .align 2, 0 -_08118DEC: .4byte gUnknown_3003F64 +_08118DEC: .4byte gReceivedRemoteLinkPlayers _08118DF0: .4byte gStringVar4 _08118DF4: .4byte gUnknown_8458434 _08118DF8: @@ -6293,7 +6293,7 @@ _08118ED6: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r4, _08118F24 @ =gUnknown_2022744 + ldr r4, _08118F24 @ =gLinkPlayers + 8 adds r1, r4 adds r0, r5, 0 bl StringCopy @@ -6312,7 +6312,7 @@ _08118ED6: bl _081198DA .align 2, 0 _08118F20: .4byte gStringVar1 -_08118F24: .4byte gUnknown_2022744 +_08118F24: .4byte gLinkPlayers + 8 _08118F28: .4byte gStringVar4 _08118F2C: .4byte gUnknown_8457C20 _08118F30: @@ -6481,7 +6481,7 @@ _08119088: movs r0, 0x1E bl sub_8118664 _08119096: - ldr r0, _081190AC @ =gUnknown_3003F64 + ldr r0, _081190AC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _081190A2 @@ -6491,7 +6491,7 @@ _081190A2: bl _081198DA .align 2, 0 _081190A8: .4byte gUnknown_84585E8 -_081190AC: .4byte gUnknown_3003F64 +_081190AC: .4byte gReceivedRemoteLinkPlayers _081190B0: movs r0, 0x42 bl PlaySE @@ -6512,13 +6512,13 @@ _081190CA: movs r0, 0x2 bl _081198DA _081190DE: - ldr r0, _08119100 @ =gUnknown_3003F64 + ldr r0, _08119100 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _081190EA bl _081198DC _081190EA: - ldr r0, _08119104 @ =gUnknown_2022618 + ldr r0, _08119104 @ =gBlockSendBuffer movs r1, 0x1 bl sub_8117594 ldr r0, _08119108 @ =sub_8117280 @@ -6527,8 +6527,8 @@ _081190EA: movs r0, 0x27 bl _081198DA .align 2, 0 -_08119100: .4byte gUnknown_3003F64 -_08119104: .4byte gUnknown_2022618 +_08119100: .4byte gReceivedRemoteLinkPlayers +_08119104: .4byte gBlockSendBuffer _08119108: .4byte sub_8117280 _0811910C: adds r0, r6, 0 @@ -6543,7 +6543,7 @@ _08119122: movs r0, 0x21 strb r0, [r6, 0x14] ldr r0, _08119154 @ =gStringVar1 - ldr r4, _08119158 @ =gUnknown_2022760 + ldr r4, _08119158 @ =gLinkPlayers + 0x24 adds r1, r4, 0 bl StringCopy adds r0, r4, 0 @@ -6562,7 +6562,7 @@ _08119122: .align 2, 0 _08119150: .4byte sub_8117280 _08119154: .4byte gStringVar1 -_08119158: .4byte gUnknown_2022760 +_08119158: .4byte gLinkPlayers + 0x24 _0811915C: .4byte gStringVar4 _08119160: .4byte gUnknown_8457BCC _08119164: @@ -6743,7 +6743,7 @@ _081192E0: movs r0, 0x24 b _081198DA _081192E8: - ldr r0, _08119318 @ =gUnknown_3003F64 + ldr r0, _08119318 @ =gReceivedRemoteLinkPlayers ldrb r4, [r0] cmp r4, 0 beq _081192F2 @@ -6767,7 +6767,7 @@ _081192F2: strh r4, [r0] b _081198DC .align 2, 0 -_08119318: .4byte gUnknown_3003F64 +_08119318: .4byte gReceivedRemoteLinkPlayers _0811931C: .4byte gUnknown_203B058 _08119320: .4byte gStringVar4 _08119324: @@ -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 @@ -7463,14 +7463,14 @@ var_800D_set_xB: @ 81198EC bl InUnionRoom cmp r0, 0x1 bne _081198FC - ldr r1, _08119900 @ =gUnknown_20370D0 + ldr r1, _08119900 @ =gSpecialVar_Result movs r0, 0xB strh r0, [r1] _081198FC: pop {r0} bx r0 .align 2, 0 -_08119900: .4byte gUnknown_20370D0 +_08119900: .4byte gSpecialVar_Result thumb_func_end var_800D_set_xB thumb_func_start sub_8119904 @@ -9685,7 +9685,7 @@ sub_811A9B8: @ 811A9B8 ldrsh r0, [r4, r1] cmp r0, 0x8 bne _0811A9F0 - ldr r0, _0811A9EC @ =gUnknown_2037078 + ldr r0, _0811A9EC @ =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x2 beq _0811A9E6 @@ -9695,7 +9695,7 @@ _0811A9E6: movs r0, 0x1 b _0811A9F2 .align 2, 0 -_0811A9EC: .4byte gUnknown_2037078 +_0811A9EC: .4byte gPlayerAvatar _0811A9F0: movs r0, 0 _0811A9F2: @@ -11147,7 +11147,7 @@ _0811B500: .4byte gUnknown_8459580 thumb_func_start is_walking_or_running is_walking_or_running: @ 811B504 push {lr} - ldr r0, _0811B518 @ =gUnknown_2037078 + ldr r0, _0811B518 @ =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x2 beq _0811B512 @@ -11157,7 +11157,7 @@ _0811B512: movs r0, 0x1 b _0811B51E .align 2, 0 -_0811B518: .4byte gUnknown_2037078 +_0811B518: .4byte gPlayerAvatar _0811B51C: movs r0, 0 _0811B51E: @@ -13024,7 +13024,7 @@ _0811C3B0: beq _0811C3BC b _0811C516 _0811C3BC: - ldr r4, _0811C3D8 @ =gUnknown_2022618 + ldr r4, _0811C3D8 @ =gBlockSendBuffer adds r0, r4, 0 movs r1, 0 movs r2, 0x20 @@ -13037,13 +13037,13 @@ _0811C3BC: movs r0, 0x52 b _0811C3E2 .align 2, 0 -_0811C3D8: .4byte gUnknown_2022618 +_0811C3D8: .4byte gBlockSendBuffer _0811C3DC: .4byte gUnknown_203B0D4 _0811C3E0: movs r0, 0x51 _0811C3E2: strb r0, [r4] - ldr r1, _0811C3F8 @ =gUnknown_2022618 + ldr r1, _0811C3F8 @ =gBlockSendBuffer movs r0, 0 movs r2, 0x20 bl SendBlock @@ -13053,7 +13053,7 @@ _0811C3E2: adds r1, r2 b _0811C4F2 .align 2, 0 -_0811C3F8: .4byte gUnknown_2022618 +_0811C3F8: .4byte gBlockSendBuffer _0811C3FC: .4byte gMain _0811C400: bl GetBlockReceivedStatus @@ -13063,7 +13063,7 @@ _0811C400: beq _0811C40E b _0811C516 _0811C40E: - ldr r1, _0811C440 @ =gUnknown_2022118 + ldr r1, _0811C440 @ =gBlockRecvBuffer ldrh r0, [r1] cmp r0, 0x51 bne _0811C448 @@ -13087,11 +13087,11 @@ _0811C40E: movs r1, 0x32 b _0811C47E .align 2, 0 -_0811C440: .4byte gUnknown_2022118 +_0811C440: .4byte gBlockRecvBuffer _0811C444: .4byte gMain _0811C448: bl sub_800AAC0 - ldr r4, _0811C46C @ =gUnknown_2022118 + ldr r4, _0811C46C @ =gBlockRecvBuffer bl GetMultiplayerId lsls r0, 24 lsrs r0, 16 @@ -13106,7 +13106,7 @@ _0811C448: movs r1, 0x6 b _0811C47E .align 2, 0 -_0811C46C: .4byte gUnknown_2022118 +_0811C46C: .4byte gBlockRecvBuffer _0811C470: .4byte gMain _0811C474: ldr r0, _0811C488 @ =gMain @@ -13159,7 +13159,7 @@ _0811C4D8: .4byte gUnknown_203B08C _0811C4DC: .4byte gUnknown_841E58D _0811C4E0: .4byte c2_exit_to_overworld_2_switch _0811C4E4: - ldr r0, _0811C4FC @ =gUnknown_3003F64 + ldr r0, _0811C4FC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0811C516 @@ -13172,7 +13172,7 @@ _0811C4F2: strb r0, [r1] b _0811C516 .align 2, 0 -_0811C4FC: .4byte gUnknown_3003F64 +_0811C4FC: .4byte gReceivedRemoteLinkPlayers _0811C500: ldr r0, _0811C534 @ =gUnknown_203B08C ldr r0, [r0] diff --git a/asm/link_rfu_4.s b/asm/link_rfu_4.s index 4749a278a..dd9c498a4 100644 --- a/asm/link_rfu_4.s +++ b/asm/link_rfu_4.s @@ -1649,7 +1649,7 @@ _081430B2: strb r0, [r5, 0x8] b _081435C6 _081430B8: - ldr r0, _081430D0 @ =gUnknown_3003F64 + ldr r0, _081430D0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _081430D4 @@ -1657,12 +1657,12 @@ _081430B8: bl sub_81424B8 movs r0, 0x7 strb r0, [r5, 0x8] - bl sub_8144AEC + bl mevent_srv_ish_do_init b _081435C6 .align 2, 0 -_081430D0: .4byte gUnknown_3003F64 +_081430D0: .4byte gReceivedRemoteLinkPlayers _081430D4: - ldr r0, _081430E8 @ =gUnknown_20370D0 + ldr r0, _081430E8 @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0x5 beq _081430DE @@ -1672,7 +1672,7 @@ _081430DE: bl sub_81424B8 b _08143464 .align 2, 0 -_081430E8: .4byte gUnknown_20370D0 +_081430E8: .4byte gSpecialVar_Result _081430EC: ldr r0, _081430F8 @ =gUnknown_841E794 bl sub_8142504 @@ -1683,7 +1683,7 @@ _081430EC: _081430F8: .4byte gUnknown_841E794 _081430FC: adds r0, r5, 0 - bl sub_8144B0C + bl mevent_srv_ish_do_exec subs r0, 0x2 cmp r0, 0x4 bls _0814310A @@ -1712,12 +1712,12 @@ _0814312C: b _081435C6 _0814313A: ldr r4, [r5, 0x10] - bl sub_8144B58 + bl mevent_srv_ish_get_buffer adds r1, r0, 0 adds r0, r4, 0 movs r2, 0x40 bl memcpy - bl sub_8144B48 + bl mevent_srv_ish_inc_flag b _081435C6 _08143150: movs r0, 0xA @@ -1731,16 +1731,16 @@ _0814315C: movs r0, 0xB strb r0, [r5, 0x8] ldr r0, _0814316C @ =gStringVar1 - ldr r1, _08143170 @ =gUnknown_2022744 + ldr r1, _08143170 @ =gLinkPlayers + 8 bl StringCopy b _081435C6 .align 2, 0 _0814316C: .4byte gStringVar1 -_08143170: .4byte gUnknown_2022744 +_08143170: .4byte gLinkPlayers + 8 _08143174: adds r4, r5, 0 adds r4, 0x9 - bl sub_8144B58 + bl mevent_srv_ish_get_buffer adds r3, r0, 0 adds r0, r4, 0 adds r1, r5, 0 @@ -1757,7 +1757,7 @@ _08143174: _08143198: adds r4, r5, 0 adds r4, 0x9 - bl sub_8144B58 + bl mevent_srv_ish_get_buffer adds r1, r0, 0 adds r0, r4, 0 bl mevent_0814257C @@ -1817,9 +1817,9 @@ _08143208: _0814320C: movs r0, 0x1 _0814320E: - bl sub_8144B64 + bl mevent_srv_ish_set_param _08143212: - bl sub_8144B48 + bl mevent_srv_ish_inc_flag movs r0, 0x7 strb r0, [r5, 0x8] b _081435C6 @@ -1847,7 +1847,7 @@ _08143242: cmp r0, 0x1 bne _08143250 ldr r0, _0814325C @ =gStringVar1 - ldr r1, _08143260 @ =gUnknown_2022744 + ldr r1, _08143260 @ =gLinkPlayers + 8 bl StringCopy _08143250: movs r0, 0xF @@ -1856,7 +1856,7 @@ _08143250: .align 2, 0 _08143258: .4byte gUnknown_841E7A3 _0814325C: .4byte gStringVar1 -_08143260: .4byte gUnknown_2022744 +_08143260: .4byte gLinkPlayers + 8 _08143264: ldrb r1, [r5, 0xC] ldrb r2, [r5, 0xD] @@ -2160,7 +2160,7 @@ _08143492: strb r0, [r5, 0x8] b _081435C6 _0814349C: - ldr r0, _081434B0 @ =gUnknown_3003F64 + ldr r0, _081434B0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _081434B4 @@ -2170,9 +2170,9 @@ _0814349C: strb r0, [r5, 0x8] b _081435C6 .align 2, 0 -_081434B0: .4byte gUnknown_3003F64 +_081434B0: .4byte gReceivedRemoteLinkPlayers _081434B4: - ldr r0, _081434CC @ =gUnknown_20370D0 + ldr r0, _081434CC @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0x5 beq _081434BE @@ -2185,7 +2185,7 @@ _081434C4: strb r0, [r5, 0x8] b _081435C6 .align 2, 0 -_081434CC: .4byte gUnknown_20370D0 +_081434CC: .4byte gSpecialVar_Result _081434D0: ldr r0, _081434F0 @ =gStringVar1 movs r1, 0xFF @@ -2199,7 +2199,7 @@ _081434D0: bne _08143500 ldr r0, _081434FC @ =gUnknown_841EAE7 bl sub_8142504 - bl sub_8144F40 + bl mevent_srv_common_do_init_2 b _0814350A .align 2, 0 _081434F0: .4byte gStringVar1 @@ -2209,7 +2209,7 @@ _081434FC: .4byte gUnknown_841EAE7 _08143500: ldr r0, _08143510 @ =gUnknown_841EB01 bl sub_8142504 - bl sub_8144F1C + bl mevent_srv_common_do_init_1 _0814350A: movs r0, 0x20 strb r0, [r5, 0x8] @@ -2218,7 +2218,7 @@ _0814350A: _08143510: .4byte gUnknown_841EB01 _08143514: adds r0, r5, 0 - bl sub_8144F64 + bl mevent_srv_init_do_exec cmp r0, 0x3 bne _081435C6 ldrh r0, [r5] @@ -2229,14 +2229,14 @@ _08143514: _08143528: bl task_add_05_task_del_08FA224_when_no_RfuFunc ldr r0, _0814353C @ =gStringVar1 - ldr r1, _08143540 @ =gUnknown_2022760 + ldr r1, _08143540 @ =gLinkPlayers + 0x24 bl StringCopy movs r0, 0x22 strb r0, [r5, 0x8] b _081435C6 .align 2, 0 _0814353C: .4byte gStringVar1 -_08143540: .4byte gUnknown_2022760 +_08143540: .4byte gLinkPlayers + 0x24 _08143544: bl sub_80FA4F8 lsls r0, 24 diff --git a/asm/list_menu.s b/asm/list_menu.s index 760c55311..3475b0914 100644 --- a/asm/list_menu.s +++ b/asm/list_menu.s @@ -969,14 +969,14 @@ _081075DA: beq _08107640 b _08107680 _081075E4: - ldr r1, _081075F4 @ =gUnknown_841623B + ldr r1, _081075F4 @ =gFameCheckerText_ListMenuCursor adds r0, r6, 0 mov r2, r8 adds r3, r7, 0 bl ListMenuPrint b _08107680 .align 2, 0 -_081075F4: .4byte gUnknown_841623B +_081075F4: .4byte gFameCheckerText_ListMenuCursor _081075F8: ldrb r0, [r6, 0x1E] cmp r0, 0xFF diff --git a/asm/mail.s b/asm/mail.s index ecd5e71fd..1ecaf17cc 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -381,7 +381,7 @@ _080BEF28: movs r1, 0xF0 movs r2, 0x20 bl LoadPalette - ldr r6, _080BEFD0 @ =gUnknown_20371F8 + ldr r6, _080BEFD0 @ =gPlttBufferUnfaded ldr r4, _080BEFD4 @ =gUnknown_83EE9C8 ldr r0, _080BEFD8 @ =gUnknown_20399C4 ldr r3, [r0] @@ -396,7 +396,7 @@ _080BEF28: lsls r2, 1 adds r0, r6, r2 strh r1, [r0] - ldr r5, _080BEFDC @ =gUnknown_20375F8 + ldr r5, _080BEFDC @ =gPlttBufferFaded ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -458,10 +458,10 @@ _080BEF28: strh r0, [r5, 0x16] b _080BF0F4 .align 2, 0 -_080BEFD0: .4byte gUnknown_20371F8 +_080BEFD0: .4byte gPlttBufferUnfaded _080BEFD4: .4byte gUnknown_83EE9C8 _080BEFD8: .4byte gUnknown_20399C4 -_080BEFDC: .4byte gUnknown_20375F8 +_080BEFDC: .4byte gPlttBufferFaded _080BEFE0: .4byte gUnknown_83EE9C0 _080BEFE4: .4byte gSaveBlock2Ptr _080BEFE8: @@ -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/mailbox_pc.s b/asm/mailbox_pc.s index d2933aa8b..d2cc06070 100644 --- a/asm/mailbox_pc.s +++ b/asm/mailbox_pc.s @@ -174,7 +174,7 @@ sub_810EC98: @ 810EC98 adds r6, r0, 0 movs r3, 0 ldr r7, _0810ED50 @ =gUnknown_203ADE0 - ldr r0, _0810ED54 @ =gUnknown_84161C1 + ldr r0, _0810ED54 @ =gFameCheckerText_Cancel mov r12, r0 ldr r5, _0810ED58 @ =gUnknown_3005E70 ldr r1, _0810ED5C @ =gUnknown_203ADDC @@ -262,7 +262,7 @@ _0810ECCE: bx r1 .align 2, 0 _0810ED50: .4byte gUnknown_203ADE0 -_0810ED54: .4byte gUnknown_84161C1 +_0810ED54: .4byte gFameCheckerText_Cancel _0810ED58: .4byte gUnknown_3005E70 _0810ED5C: .4byte gUnknown_203ADDC _0810ED60: .4byte gUnknown_8454003 diff --git a/asm/main_menu.s b/asm/main_menu.s index ff1ab95cc..ae0a4c69b 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 gSaveFileStatus _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 @@ -988,11 +988,11 @@ _0800CB2E: .align 2, 0 _0800CB44: .4byte gUnknown_2031DE0 _0800CB48: - ldr r0, _0800CB64 @ =gUnknown_20371F8 + ldr r0, _0800CB64 @ =gPlttBufferUnfaded movs r2, 0 movs r1, 0 strh r1, [r0] - ldr r0, _0800CB68 @ =gUnknown_20375F8 + ldr r0, _0800CB68 @ =gPlttBufferFaded strh r1, [r0] ldr r0, _0800CB6C @ =gUnknown_2031DE0 strb r2, [r0] @@ -1001,8 +1001,8 @@ _0800CB48: bl sub_8110F14 b _0800CB84 .align 2, 0 -_0800CB64: .4byte gUnknown_20371F8 -_0800CB68: .4byte gUnknown_20375F8 +_0800CB64: .4byte gPlttBufferUnfaded +_0800CB68: .4byte gPlttBufferFaded _0800CB6C: .4byte gUnknown_2031DE0 _0800CB70: ldr r0, _0800CB8C @ =sub_81422AC @@ -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/map_name_popup.s b/asm/map_name_popup.s index 7d9fffc08..b7e20c4bf 100644 --- a/asm/map_name_popup.s +++ b/asm/map_name_popup.s @@ -348,7 +348,7 @@ _080983B4: .4byte 0x00ffffff _080983B8: movs r0, 0x3 bl stdpal_get - ldr r1, _080983FC @ =gUnknown_2037398 + ldr r1, _080983FC @ =gPlttBufferUnfaded + 0x1A0 movs r2, 0x10 bl CpuSet _080983C6: @@ -374,7 +374,7 @@ _080983C6: pop {r1} bx r1 .align 2, 0 -_080983FC: .4byte gUnknown_2037398 +_080983FC: .4byte gPlttBufferUnfaded + 0x1A0 thumb_func_end sub_8098340 thumb_func_start sub_8098400 diff --git a/asm/map_obj_80688E4.s b/asm/map_obj_80688E4.s index 0f878255c..bc06896bc 100644 --- a/asm/map_obj_80688E4.s +++ b/asm/map_obj_80688E4.s @@ -96,7 +96,7 @@ _0806897A: lsls r0, 31 cmp r0, 0 beq _08068998 - ldr r0, _080689AC @ =gUnknown_2037078 + ldr r0, _080689AC @ =gPlayerAvatar ldrb r0, [r0, 0x5] cmp r4, r0 beq _08068998 @@ -113,7 +113,7 @@ _08068998: bx r0 .align 2, 0 _080689A8: .4byte gMapObjects -_080689AC: .4byte gUnknown_2037078 +_080689AC: .4byte gPlayerAvatar thumb_func_end player_bitmagic thumb_func_start FreezeMapObjectsExceptOne @@ -134,7 +134,7 @@ _080689BA: lsls r0, 31 cmp r0, 0 beq _080689DC - ldr r0, _080689F0 @ =gUnknown_2037078 + ldr r0, _080689F0 @ =gPlayerAvatar ldrb r0, [r0, 0x5] cmp r4, r0 beq _080689DC @@ -151,7 +151,7 @@ _080689DC: bx r0 .align 2, 0 _080689EC: .4byte gMapObjects -_080689F0: .4byte gUnknown_2037078 +_080689F0: .4byte gPlayerAvatar thumb_func_end FreezeMapObjectsExceptOne thumb_func_start npc_sync_anim_pause_bits @@ -1437,7 +1437,7 @@ oe_exec_and_other_stuff: @ 80692C8 adds r0, r1, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _080692EC @ =gUnknown_20386E0 + ldr r1, _080692EC @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -1448,7 +1448,7 @@ oe_exec_and_other_stuff: @ 80692C8 pop {r1} bx r1 .align 2, 0 -_080692EC: .4byte gUnknown_20386E0 +_080692EC: .4byte gFieldEffectArguments thumb_func_end oe_exec_and_other_stuff thumb_func_start DoShadowFieldEffect @@ -1475,7 +1475,7 @@ DoRippleFieldEffect: @ 806930C adds r4, r1, 0 ldrb r0, [r0, 0x5] bl GetFieldObjectGraphicsInfo - ldr r2, _08069344 @ =gUnknown_20386E0 + ldr r2, _08069344 @ =gFieldEffectArguments movs r3, 0x20 ldrsh r1, [r4, r3] str r1, [r2] @@ -1497,7 +1497,7 @@ DoRippleFieldEffect: @ 806930C pop {r0} bx r0 .align 2, 0 -_08069344: .4byte gUnknown_20386E0 +_08069344: .4byte gFieldEffectArguments thumb_func_end DoRippleFieldEffect .align 2, 0 @ Don't pad with nop. diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s index a5a61662d..1b406a74d 100644 --- a/asm/map_obj_lock.s +++ b/asm/map_obj_lock.s @@ -8,14 +8,14 @@ thumb_func_start walkrun_is_standing_still walkrun_is_standing_still: @ 8069554 push {lr} - ldr r0, _08069564 @ =gUnknown_2037078 + ldr r0, _08069564 @ =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x1 beq _08069568 movs r0, 0x1 b _0806956A .align 2, 0 -_08069564: .4byte gUnknown_2037078 +_08069564: .4byte gPlayerAvatar _08069568: movs r0, 0 _0806956A: @@ -270,7 +270,7 @@ sub_8069740: @ 8069740 lsls r0, 2 ldr r1, _08069760 @ =gMapObjects adds r0, r1 - ldr r1, _08069764 @ =gUnknown_20370D4 + ldr r1, _08069764 @ =gSpecialVar_Facing ldrb r1, [r1] bl FieldObjectFaceOppositeDirection pop {r0} @@ -278,7 +278,7 @@ sub_8069740: @ 8069740 .align 2, 0 _0806975C: .4byte gUnknown_3005074 _08069760: .4byte gMapObjects -_08069764: .4byte gUnknown_20370D4 +_08069764: .4byte gSpecialVar_Facing thumb_func_end sub_8069740 thumb_func_start sub_8069768 diff --git a/asm/menu.s b/asm/menu.s index 8bea8e86f..e593eef1c 100644 --- a/asm/menu.s +++ b/asm/menu.s @@ -1391,7 +1391,7 @@ RedrawMenuCursor: @ 810F874 bl FillWindowPixelRect ldrb r0, [r5, 0x5] ldrb r1, [r5, 0x6] - ldr r2, _0810F900 @ =gUnknown_841623B + ldr r2, _0810F900 @ =gFameCheckerText_ListMenuCursor ldrb r3, [r5] ldrb r4, [r5, 0x8] mov r6, r8 @@ -1415,7 +1415,7 @@ RedrawMenuCursor: @ 810F874 bx r0 .align 2, 0 _0810F8FC: .4byte gUnknown_203ADE4 -_0810F900: .4byte gUnknown_841623B +_0810F900: .4byte gFameCheckerText_ListMenuCursor thumb_func_end RedrawMenuCursor thumb_func_start MoveMenuCursor @@ -2893,7 +2893,7 @@ sub_811037C: @ 811037C lsrs r3, 24 ldrb r0, [r5, 0x5] ldrb r1, [r5, 0x6] - ldr r2, _0811044C @ =gUnknown_841623B + ldr r2, _0811044C @ =gFameCheckerText_ListMenuCursor str r3, [sp] movs r3, 0 str r3, [sp, 0x4] @@ -2910,7 +2910,7 @@ sub_811037C: @ 811037C bx r0 .align 2, 0 _08110448: .4byte gUnknown_203ADE4 -_0811044C: .4byte gUnknown_841623B +_0811044C: .4byte gFameCheckerText_ListMenuCursor thumb_func_end sub_811037C thumb_func_start sub_8110450 diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index c0e8f1333..3a0f709da 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -363,7 +363,7 @@ sub_80BF708: @ 80BF708 bl sub_805642C cmp r0, 0x1 beq _080BF71A - ldr r0, _080BF720 @ =gUnknown_3003F64 + ldr r0, _080BF720 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _080BF724 @@ -371,7 +371,7 @@ _080BF71A: movs r0, 0x1 b _080BF726 .align 2, 0 -_080BF720: .4byte gUnknown_3003F64 +_080BF720: .4byte gReceivedRemoteLinkPlayers _080BF724: movs r0, 0 _080BF726: diff --git a/asm/mevent.s b/asm/mevent.s deleted file mode 100644 index 697266a39..000000000 --- a/asm/mevent.s +++ /dev/null @@ -1,2438 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_81435DC -sub_81435DC: @ 81435DC - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x4 - adds r5, r0, 0 - adds r6, r1, 0 - mov r8, r2 - mov r1, sp - ldr r4, _08143630 @ =0x04000208 - ldrh r0, [r4] - strh r0, [r1] - movs r0, 0 - strh r0, [r4] - ldr r1, _08143634 @ =gIntrTable - ldr r0, _08143638 @ =sub_815C6D4 - str r0, [r1, 0x4] - ldr r0, _0814363C @ =sub_815C6C4 - str r0, [r1, 0x8] - bl sub_815C8C8 - bl sub_815C960 - ldr r2, _08143640 @ =0x04000200 - ldrh r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strh r0, [r2] - mov r0, sp - ldrh r0, [r0] - strh r0, [r4] - movs r0, 0 - strh r0, [r5] - str r6, [r5, 0x4] - mov r0, r8 - str r0, [r5, 0x8] - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08143630: .4byte 0x04000208 -_08143634: .4byte gIntrTable -_08143638: .4byte sub_815C6D4 -_0814363C: .4byte sub_815C6C4 -_08143640: .4byte 0x04000200 - thumb_func_end sub_81435DC - - thumb_func_start sub_8143644 -sub_8143644: @ 8143644 - push {r4,lr} - sub sp, 0x4 - mov r1, sp - ldr r4, _08143670 @ =0x04000208 - ldrh r0, [r4] - strh r0, [r1] - movs r0, 0 - strh r0, [r4] - bl sub_815C960 - bl sub_815C91C - bl RestoreSerialTimer3IntrHandlers - mov r0, sp - ldrh r0, [r0] - strh r0, [r4] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08143670: .4byte 0x04000208 - thumb_func_end sub_8143644 - - thumb_func_start sub_8143674 -sub_8143674: @ 8143674 - push {r4,r5,lr} - adds r4, r0, 0 - movs r5, 0 - ldr r1, [r4, 0x4] - ldr r2, [r4, 0x8] - movs r0, 0x1 - movs r3, 0 - bl sub_815C498 - adds r1, r0, 0 - strh r1, [r4] - movs r0, 0x13 - ands r0, r1 - cmp r0, 0x10 - bne _08143694 - movs r5, 0x1 -_08143694: - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _0814369E - movs r5, 0x2 -_0814369E: - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _081436A8 - movs r5, 0x3 -_081436A8: - ldr r1, _081436B8 @ =gUnknown_3003F84 - movs r0, 0 - strb r0, [r1] - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081436B8: .4byte gUnknown_3003F84 - thumb_func_end sub_8143674 - - thumb_func_start sub_81436BC -sub_81436BC: @ 81436BC - push {lr} - ldr r0, _081436E0 @ =gDecompressionBuffer - movs r2, 0x80 - lsls r2, 6 - movs r1, 0 - bl memset - ldr r1, _081436E4 @ =gUnknown_202271A - ldr r2, _081436E8 @ =0x00005502 - adds r0, r2, 0 - strh r0, [r1] - bl sub_8009804 - movs r0, 0x1 - bl SetSuppressLinkErrorMessage - pop {r0} - bx r0 - .align 2, 0 -_081436E0: .4byte gDecompressionBuffer -_081436E4: .4byte gUnknown_202271A -_081436E8: .4byte 0x00005502 - thumb_func_end sub_81436BC - - thumb_func_start sub_81436EC -sub_81436EC: @ 81436EC - push {lr} - sub sp, 0xC - mov r1, sp - ldr r2, _08143730 @ =0x04000208 - ldrh r0, [r2] - strh r0, [r1] - movs r0, 0 - strh r0, [r2] - ldr r0, _08143734 @ =gUnknown_3003FB4 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x4] - str r1, [sp, 0x8] - mov r0, sp - ldrh r0, [r0] - strh r0, [r2] - add r2, sp, 0x4 - ldrh r1, [r2] - ldr r0, _08143738 @ =0x0000b9a0 - cmp r1, r0 - bne _08143744 - ldrh r1, [r2, 0x2] - ldr r0, _0814373C @ =0x0000ccd0 - cmp r1, r0 - bne _08143744 - ldrh r1, [r2, 0x4] - ldr r0, _08143740 @ =0x0000ffff - cmp r1, r0 - bne _08143744 - ldrh r0, [r2, 0x6] - cmp r0, r1 - bne _08143744 - movs r0, 0x1 - b _08143746 - .align 2, 0 -_08143730: .4byte 0x04000208 -_08143734: .4byte gUnknown_3003FB4 -_08143738: .4byte 0x0000b9a0 -_0814373C: .4byte 0x0000ccd0 -_08143740: .4byte 0x0000ffff -_08143744: - movs r0, 0 -_08143746: - add sp, 0xC - pop {r1} - bx r1 - thumb_func_end sub_81436EC - - thumb_func_start sub_814374C -sub_814374C: @ 814374C - push {lr} - bl sub_800AA48 - lsls r0, 24 - cmp r0, 0 - beq _08143768 - bl GetLinkPlayerCount_2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bne _08143768 - movs r0, 0x1 - b _0814376A -_08143768: - movs r0, 0 -_0814376A: - pop {r1} - bx r1 - thumb_func_end sub_814374C - - thumb_func_start sub_8143770 -sub_8143770: @ 8143770 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldrb r0, [r4] - subs r0, 0x3 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bhi _08143794 - bl HasLinkErrorOccurred - lsls r0, 24 - cmp r0, 0 - beq _08143794 - movs r0, 0 - strb r0, [r4] - movs r0, 0x3 - b _0814389A -_08143794: - ldrb r0, [r4] - cmp r0, 0x5 - bls _0814379C - b _08143898 -_0814379C: - lsls r0, 2 - ldr r1, _081437A8 @ =_081437AC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081437A8: .4byte _081437AC - .align 2, 0 -_081437AC: - .4byte _081437C4 - .4byte _081437E0 - .4byte _081437F8 - .4byte _0814382C - .4byte _08143878 - .4byte _08143884 -_081437C4: - bl sub_800AA48 - lsls r0, 24 - cmp r0, 0 - beq _08143814 - bl GetLinkPlayerCount_2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _08143814 - movs r0, 0x1 - strb r0, [r4] - b _08143898 -_081437E0: - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r5] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x5 - bls _08143898 - movs r0, 0 - strh r0, [r5] - movs r0, 0x2 - strb r0, [r4] - b _08143898 -_081437F8: - bl GetLinkPlayerCount_2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bne _08143814 - movs r0, 0x42 - bl PlaySE - bl sub_800A5BC - movs r0, 0 - strh r0, [r5] - b _08143872 -_08143814: - ldr r0, _08143828 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08143898 - movs r0, 0 - strb r0, [r4] - movs r0, 0x1 - b _0814389A - .align 2, 0 -_08143828: .4byte gMain -_0814382C: - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r5] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1E - bls _08143842 - movs r0, 0 - strb r0, [r4] - movs r0, 0x5 - b _0814389A -_08143842: - bl IsLinkConnectionEstablished - lsls r0, 24 - cmp r0, 0 - beq _08143898 - ldr r0, _08143868 @ =gUnknown_3003F64 - ldrb r0, [r0] - cmp r0, 0 - beq _08143872 - bl IsLinkPlayerDataExchangeComplete - lsls r0, 24 - cmp r0, 0 - beq _0814386C - movs r0, 0 - strb r0, [r4] - movs r0, 0x2 - b _0814389A - .align 2, 0 -_08143868: .4byte gUnknown_3003F64 -_0814386C: - movs r0, 0x4 - strb r0, [r4] - b _08143898 -_08143872: - movs r0, 0x3 - strb r0, [r4] - b _08143898 -_08143878: - movs r0, 0 - bl sub_800AA80 - movs r0, 0x5 - strb r0, [r4] - b _08143898 -_08143884: - ldr r0, _08143894 @ =gUnknown_3003F64 - ldrb r0, [r0] - cmp r0, 0 - bne _08143898 - strb r0, [r4] - movs r0, 0x4 - b _0814389A - .align 2, 0 -_08143894: .4byte gUnknown_3003F64 -_08143898: - movs r0, 0 -_0814389A: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8143770 - - thumb_func_start sub_81438A0 -sub_81438A0: @ 81438A0 - push {r4,lr} - ldr r0, _081438E0 @ =sub_8143910 - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r0, _081438E4 @ =gTasks+0x8 - adds r4, r0 - movs r0, 0 - strb r0, [r4, 0x8] - strb r0, [r4, 0x9] - strb r0, [r4, 0xA] - strb r0, [r4, 0xB] - strb r0, [r4, 0xC] - strb r0, [r4, 0xD] - movs r1, 0 - strh r0, [r4] - strh r0, [r4, 0x2] - strh r0, [r4, 0x4] - strh r0, [r4, 0x6] - strb r1, [r4, 0xE] - movs r0, 0x40 - bl AllocZeroed - str r0, [r4, 0x10] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081438E0: .4byte sub_8143910 -_081438E4: .4byte gTasks+0x8 - thumb_func_end sub_81438A0 - - thumb_func_start sub_81438E8 -sub_81438E8: @ 81438E8 - movs r1, 0 - strh r1, [r0] - bx lr - thumb_func_end sub_81438E8 - - thumb_func_start sub_81438F0 -sub_81438F0: @ 81438F0 - push {lr} - adds r2, r0, 0 - lsls r1, 16 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - lsls r0, 16 - cmp r0, r1 - bhi _08143906 - movs r0, 0 - b _0814390C -_08143906: - movs r0, 0 - strh r0, [r2] - movs r0, 0x1 -_0814390C: - pop {r1} - bx r1 - thumb_func_end sub_81438F0 - - thumb_func_start sub_8143910 -sub_8143910: @ 8143910 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _08143934 @ =gTasks+0x8 - adds r4, r0, r1 - ldrb r0, [r4, 0x8] - cmp r0, 0x1A - bls _08143928 - b _08143D1A -_08143928: - lsls r0, 2 - ldr r1, _08143938 @ =_0814393C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08143934: .4byte gTasks+0x8 -_08143938: .4byte _0814393C - .align 2, 0 -_0814393C: - .4byte _081439A8 - .4byte _081439C4 - .4byte _081439D4 - .4byte _081439E8 - .4byte _081439F8 - .4byte _08143A24 - .4byte _08143A5C - .4byte _08143AD8 - .4byte _08143AF4 - .4byte _08143B1C - .4byte _08143B38 - .4byte _08143B68 - .4byte _08143B7E - .4byte _08143B94 - .4byte _08143BF6 - .4byte _08143C1C - .4byte _08143C34 - .4byte _08143C52 - .4byte _08143C7E - .4byte _08143CA4 - .4byte _08143CD4 - .4byte _08143CE0 - .4byte _08143CEC - .4byte _08143CBC - .4byte _08143D1A - .4byte _08143D1A - .4byte _08143D04 -_081439A8: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, _081439C0 @ =gUnknown_841DE52 - bl mevent_0814257C - cmp r0, 0 - bne _081439B8 - b _08143D1A -_081439B8: - movs r0, 0x1 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_081439C0: .4byte gUnknown_841DE52 -_081439C4: - bl sub_81436BC - adds r0, r4, 0 - bl sub_81438E8 - movs r0, 0x2 - strb r0, [r4, 0x8] - b _08143D1A -_081439D4: - adds r0, r4, 0 - movs r1, 0xA - bl sub_81438F0 - cmp r0, 0 - bne _081439E2 - b _08143D1A -_081439E2: - movs r0, 0x3 - strb r0, [r4, 0x8] - b _08143D1A -_081439E8: - bl sub_814374C - cmp r0, 0 - beq _081439F2 - b _08143B88 -_081439F2: - bl sub_80098B8 - b _08143AE8 -_081439F8: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, _08143A1C @ =gUnknown_841DE53 - bl mevent_0814257C - cmp r0, 0 - bne _08143A08 - b _08143D1A -_08143A08: - ldr r0, _08143A20 @ =gUnknown_841DE54 - bl sub_8142504 - adds r0, r4, 0 - bl sub_81438E8 - movs r0, 0x5 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143A1C: .4byte gUnknown_841DE53 -_08143A20: .4byte gUnknown_841DE54 -_08143A24: - adds r0, r4, 0 - movs r1, 0x5A - bl sub_81438F0 - cmp r0, 0 - beq _08143A3A - bl sub_81436BC - movs r0, 0x6 - strb r0, [r4, 0x8] - b _08143D1A -_08143A3A: - ldr r0, _08143A58 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _08143A48 - b _08143D1A -_08143A48: - adds r0, r4, 0 - bl sub_81438E8 - movs r0, 0x5 - bl PlaySE - b _08143BE6 - .align 2, 0 -_08143A58: .4byte gMain -_08143A5C: - ldr r0, _08143A7C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08143A80 - movs r0, 0x5 - bl PlaySE - bl sub_80098B8 - adds r0, r4, 0 - bl sub_81438E8 - b _08143BE6 - .align 2, 0 -_08143A7C: .4byte gMain -_08143A80: - bl GetLinkPlayerCount_2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _08143A9C - adds r0, r4, 0 - bl sub_81438E8 - bl sub_80098B8 - movs r0, 0x7 - strb r0, [r4, 0x8] - b _08143D1A -_08143A9C: - bl sub_81436EC - cmp r0, 0 - beq _08143ABA - movs r0, 0x5 - bl PlaySE - bl sub_80098B8 - adds r0, r4, 0 - bl sub_81438E8 - movs r0, 0x8 - strb r0, [r4, 0x8] - b _08143D1A -_08143ABA: - adds r0, r4, 0 - movs r1, 0xA - bl sub_81438F0 - cmp r0, 0 - bne _08143AC8 - b _08143D1A -_08143AC8: - bl sub_80098B8 - bl sub_81436BC - adds r0, r4, 0 - bl sub_81438E8 - b _08143D1A -_08143AD8: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, _08143AF0 @ =gUnknown_841DE7C - bl mevent_0814257C - cmp r0, 0 - bne _08143AE8 - b _08143D1A -_08143AE8: - movs r0, 0x4 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143AF0: .4byte gUnknown_841DE7C -_08143AF4: - ldr r0, _08143B0C @ =gUnknown_841DE95 - bl sub_8142504 - ldr r0, _08143B10 @ =gUnknown_3005ED0 - ldr r1, _08143B14 @ =gUnknownSerialData_End - ldr r2, _08143B18 @ =gUnknownSerialData_Start - subs r1, r2 - bl sub_81435DC - movs r0, 0x9 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143B0C: .4byte gUnknown_841DE95 -_08143B10: .4byte gUnknown_3005ED0 -_08143B14: .4byte gUnknownSerialData_End -_08143B18: .4byte gUnknownSerialData_Start -_08143B1C: - ldr r0, _08143B34 @ =gUnknown_3005ED0 - bl sub_8143674 - strb r0, [r4, 0xE] - lsls r0, 24 - cmp r0, 0 - bne _08143B2C - b _08143D1A -_08143B2C: - movs r0, 0xA - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143B34: .4byte gUnknown_3005ED0 -_08143B38: - ldr r0, _08143B60 @ =gUnknown_3005ED0 - bl sub_8143644 - ldrb r0, [r4, 0xE] - cmp r0, 0x3 - bne _08143B46 - b _08143C4C -_08143B46: - cmp r0, 0x1 - beq _08143B4C - b _08143CFA -_08143B4C: - adds r0, r4, 0 - bl sub_81438E8 - ldr r0, _08143B64 @ =gUnknown_841DE9B - bl sub_8142504 - movs r0, 0xB - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143B60: .4byte gUnknown_3005ED0 -_08143B64: .4byte gUnknown_841DE9B -_08143B68: - movs r1, 0xD2 - lsls r1, 2 - adds r0, r4, 0 - bl sub_81438F0 - cmp r0, 0 - bne _08143B78 - b _08143D1A -_08143B78: - movs r0, 0xC - strb r0, [r4, 0x8] - b _08143D1A -_08143B7E: - bl sub_81436BC - ldr r0, _08143B90 @ =gUnknown_841DE98 - bl sub_8142504 -_08143B88: - movs r0, 0xD - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143B90: .4byte gUnknown_841DE98 -_08143B94: - adds r0, r4, 0 - adds r0, 0x9 - adds r1, r4, 0 - bl sub_8143770 - cmp r0, 0x5 - bls _08143BA4 - b _08143D1A -_08143BA4: - lsls r0, 2 - ldr r1, _08143BB0 @ =_08143BB4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08143BB0: .4byte _08143BB4 - .align 2, 0 -_08143BB4: - .4byte _08143D1A - .4byte _08143BDC - .4byte _08143BCC - .4byte _08143C00 - .4byte _08143C00 - .4byte _08143BEC -_08143BCC: - ldr r0, _08143BD8 @ =gUnknown_841DE95 - bl sub_8142504 - movs r0, 0xE - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143BD8: .4byte gUnknown_841DE95 -_08143BDC: - movs r0, 0x5 - bl PlaySE - bl sub_80098B8 -_08143BE6: - movs r0, 0x17 - strb r0, [r4, 0x8] - b _08143D1A -_08143BEC: - bl sub_80098B8 - movs r0, 0x15 - strb r0, [r4, 0x8] - b _08143D1A -_08143BF6: - bl HasLinkErrorOccurred - lsls r0, 24 - cmp r0, 0 - beq _08143C06 -_08143C00: - bl sub_80098B8 - b _08143C4C -_08143C06: - bl GetBlockReceivedStatus - lsls r0, 24 - cmp r0, 0 - bne _08143C12 - b _08143D1A -_08143C12: - bl ResetBlockReceivedFlags - movs r0, 0xF - strb r0, [r4, 0x8] - b _08143D1A -_08143C1C: - ldr r0, _08143C30 @ =gDecompressionBuffer - bl sub_815D6B4 - strb r0, [r4, 0xE] - ldrb r0, [r4, 0xE] - bl sub_800AA80 - movs r0, 0x10 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143C30: .4byte gDecompressionBuffer -_08143C34: - ldr r0, _08143C48 @ =gUnknown_3003F64 - ldrb r0, [r0] - cmp r0, 0 - bne _08143D1A - ldrb r0, [r4, 0xE] - cmp r0, 0x1 - bne _08143C4C - movs r0, 0x11 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143C48: .4byte gUnknown_3003F64 -_08143C4C: - movs r0, 0x14 - strb r0, [r4, 0x8] - b _08143D1A -_08143C52: - ldr r0, _08143C70 @ =gDecompressionBuffer - bl sub_815D794 - cmp r0, 0 - beq _08143C78 - ldr r0, _08143C74 @ =gUnknown_841DE99 - bl sub_8142504 - adds r0, r4, 0 - bl sub_81438E8 - movs r0, 0x12 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143C70: .4byte gDecompressionBuffer -_08143C74: .4byte gUnknown_841DE99 -_08143C78: - movs r0, 0x16 - strb r0, [r4, 0x8] - b _08143D1A -_08143C7E: - adds r0, r4, 0 - movs r1, 0x78 - bl sub_81438F0 - cmp r0, 0 - beq _08143D1A - ldr r0, _08143CA0 @ =gUnknown_841DE9A - bl sub_8142504 - movs r0, 0x81 - lsls r0, 1 - bl PlayFanfare - movs r0, 0x13 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143CA0: .4byte gUnknown_841DE9A -_08143CA4: - bl IsFanfareTaskInactive - lsls r0, 24 - cmp r0, 0 - beq _08143D1A - ldr r0, _08143CB8 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - b _08143CC6 - .align 2, 0 -_08143CB8: .4byte gMain -_08143CBC: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, _08143CD0 @ =gUnknown_841DE7D - bl mevent_0814257C -_08143CC6: - cmp r0, 0 - beq _08143D1A - movs r0, 0x1A - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143CD0: .4byte gUnknown_841DE7D -_08143CD4: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, _08143CDC @ =gUnknown_841DE96 - b _08143CF2 - .align 2, 0 -_08143CDC: .4byte gUnknown_841DE96 -_08143CE0: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, _08143CE8 @ =gUnknown_841DE97 - b _08143CF2 - .align 2, 0 -_08143CE8: .4byte gUnknown_841DE97 -_08143CEC: - adds r0, r4, 0 - adds r0, 0x9 - ldr r1, _08143D00 @ =gUnknown_841DE9C -_08143CF2: - bl mevent_0814257C - cmp r0, 0 - beq _08143D1A -_08143CFA: - movs r0, 0 - strb r0, [r4, 0x8] - b _08143D1A - .align 2, 0 -_08143D00: .4byte gUnknown_841DE9C -_08143D04: - bl sub_812B484 - ldr r0, [r4, 0x10] - bl Free - adds r0, r5, 0 - bl DestroyTask - ldr r0, _08143D20 @ =sub_81422FC - bl SetMainCallback2 -_08143D1A: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08143D20: .4byte sub_81422FC - thumb_func_end sub_8143910 - - thumb_func_start sub_8143D24 -sub_8143D24: @ 8143D24 - push {lr} - sub sp, 0x4 - movs r0, 0 - str r0, [sp] - ldr r0, _08143D4C @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, _08143D50 @ =0x00003120 - adds r1, r0 - ldr r2, _08143D54 @ =0x050000db - mov r0, sp - bl CpuSet - bl sub_8143ED0 - bl sub_80BDE28 - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_08143D4C: .4byte gSaveBlock1Ptr -_08143D50: .4byte 0x00003120 -_08143D54: .4byte 0x050000db - thumb_func_end sub_8143D24 - - thumb_func_start sub_8143D58 -sub_8143D58: @ 8143D58 - ldr r0, _08143D64 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143D68 @ =0x00003124 - adds r0, r1 - bx lr - .align 2, 0 -_08143D64: .4byte gSaveBlock1Ptr -_08143D68: .4byte 0x00003124 - thumb_func_end sub_8143D58 - - thumb_func_start sav1_get_mevent_buffer_1 -sav1_get_mevent_buffer_1: @ 8143D6C - ldr r0, _08143D78 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143D7C @ =0x000032e4 - adds r0, r1 - bx lr - .align 2, 0 -_08143D78: .4byte gSaveBlock1Ptr -_08143D7C: .4byte 0x000032e4 - thumb_func_end sav1_get_mevent_buffer_1 - - thumb_func_start sav1_get_mevent_buffer_2 -sav1_get_mevent_buffer_2: @ 8143D80 - ldr r0, _08143D8C @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143D90 @ =0x00003434 - adds r0, r1 - bx lr - .align 2, 0 -_08143D8C: .4byte gSaveBlock1Ptr -_08143D90: .4byte 0x00003434 - thumb_func_end sav1_get_mevent_buffer_2 - - thumb_func_start sub_8143D94 -sub_8143D94: @ 8143D94 - ldr r0, _08143DA0 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143DA4 @ =0x00003460 - adds r0, r1 - bx lr - .align 2, 0 -_08143DA0: .4byte gSaveBlock1Ptr -_08143DA4: .4byte 0x00003460 - thumb_func_end sub_8143D94 - - thumb_func_start sub_8143DA8 -sub_8143DA8: @ 8143DA8 - ldr r0, _08143DB4 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143DB8 @ =0x00003458 - adds r0, r1 - bx lr - .align 2, 0 -_08143DB4: .4byte gSaveBlock1Ptr -_08143DB8: .4byte 0x00003458 - thumb_func_end sub_8143DA8 - - thumb_func_start sub_8143DBC -sub_8143DBC: @ 8143DBC - push {lr} - bl sub_8143E9C - pop {r0} - bx r0 - thumb_func_end sub_8143DBC - - thumb_func_start sub_8143DC8 -sub_8143DC8: @ 8143DC8 - push {r4-r7,lr} - adds r7, r0, 0 - bl sub_8143E64 - cmp r0, 0 - beq _08143E14 - bl sub_8143E9C - ldr r4, _08143E08 @ =gSaveBlock1Ptr - ldr r0, [r4] - ldr r5, _08143E0C @ =0x00003124 - adds r0, r5 - movs r6, 0xDE - lsls r6, 1 - adds r1, r7, 0 - adds r2, r6, 0 - bl memcpy - ldr r0, [r4] - adds r0, r5 - adds r1, r6, 0 - bl CalcCRC16WithTable - ldr r1, [r4] - ldr r2, _08143E10 @ =0x00003120 - adds r1, r2 - lsls r0, 16 - lsrs r0, 16 - str r0, [r1] - movs r0, 0x1 - b _08143E16 - .align 2, 0 -_08143E08: .4byte gSaveBlock1Ptr -_08143E0C: .4byte 0x00003124 -_08143E10: .4byte 0x00003120 -_08143E14: - movs r0, 0 -_08143E16: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8143DC8 - - thumb_func_start sub_8143E1C -sub_8143E1C: @ 8143E1C - push {r4,lr} - ldr r4, _08143E50 @ =gSaveBlock1Ptr - ldr r0, [r4] - ldr r1, _08143E54 @ =0x00003124 - adds r0, r1 - movs r1, 0xDE - lsls r1, 1 - bl CalcCRC16WithTable - lsls r0, 16 - lsrs r0, 16 - ldr r4, [r4] - ldr r2, _08143E58 @ =0x00003120 - adds r1, r4, r2 - ldr r1, [r1] - cmp r0, r1 - bne _08143E5C - ldr r1, _08143E54 @ =0x00003124 - adds r0, r4, r1 - bl sub_8143E64 - cmp r0, 0 - beq _08143E5C - movs r0, 0x1 - b _08143E5E - .align 2, 0 -_08143E50: .4byte gSaveBlock1Ptr -_08143E54: .4byte 0x00003124 -_08143E58: .4byte 0x00003120 -_08143E5C: - movs r0, 0 -_08143E5E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8143E1C - - thumb_func_start sub_8143E64 -sub_8143E64: @ 8143E64 - push {lr} - ldrh r0, [r0] - cmp r0, 0 - beq _08143E70 - movs r0, 0x1 - b _08143E72 -_08143E70: - movs r0, 0 -_08143E72: - pop {r1} - bx r1 - thumb_func_end sub_8143E64 - - thumb_func_start sub_8143E78 -sub_8143E78: @ 8143E78 - push {lr} - ldr r0, _08143E8C @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143E90 @ =0x00003124 - adds r0, r1 - ldrb r0, [r0, 0x2] - cmp r0, 0 - beq _08143E94 - movs r0, 0x1 - b _08143E96 - .align 2, 0 -_08143E8C: .4byte gSaveBlock1Ptr -_08143E90: .4byte 0x00003124 -_08143E94: - movs r0, 0 -_08143E96: - pop {r1} - bx r1 - thumb_func_end sub_8143E78 - - thumb_func_start sub_8143E9C -sub_8143E9C: @ 8143E9C - push {r4,lr} - sub sp, 0x4 - movs r4, 0 - str r4, [sp] - bl sub_8143D58 - adds r1, r0, 0 - ldr r2, _08143EC4 @ =0x0500006f - mov r0, sp - bl CpuSet - ldr r0, _08143EC8 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143ECC @ =0x00003120 - adds r0, r1 - str r4, [r0] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08143EC4: .4byte 0x0500006f -_08143EC8: .4byte gSaveBlock1Ptr -_08143ECC: .4byte 0x00003120 - thumb_func_end sub_8143E9C - - thumb_func_start sub_8143ED0 -sub_8143ED0: @ 8143ED0 - push {lr} - sub sp, 0x4 - movs r0, 0 - str r0, [sp] - bl sub_8143D94 - adds r1, r0, 0 - ldr r2, _08143EF0 @ =0x05000001 - mov r0, sp - bl CpuSet - bl sub_8146C88 - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_08143EF0: .4byte 0x05000001 - thumb_func_end sub_8143ED0 - - thumb_func_start sub_8143EF4 -sub_8143EF4: @ 8143EF4 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, _08143F0C @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08143F10 @ =0x00003124 - adds r4, r0, r1 - bl sub_8143E1C - cmp r0, 0 - bne _08143F14 -_08143F08: - movs r0, 0 - b _08143F2C - .align 2, 0 -_08143F0C: .4byte gSaveBlock1Ptr -_08143F10: .4byte 0x00003124 -_08143F14: - movs r2, 0 - ldr r3, _08143F34 @ =0x000001bb -_08143F18: - adds r0, r4, r2 - adds r1, r5, r2 - ldrb r0, [r0] - ldrb r1, [r1] - cmp r0, r1 - bne _08143F08 - adds r2, 0x1 - cmp r2, r3 - bls _08143F18 - movs r0, 0x1 -_08143F2C: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08143F34: .4byte 0x000001bb - thumb_func_end sub_8143EF4 - - thumb_func_start sub_8143F38 -sub_8143F38: @ 8143F38 - push {lr} - bl sub_814407C - bl sub_81440B4 - bl sub_8144790 - bl ClearRamScript - bl sub_806E2D0 - bl sub_806E370 - ldr r0, _08143F64 @ =gSaveBlock2Ptr - ldr r0, [r0] - movs r1, 0x94 - lsls r1, 3 - adds r0, r1 - bl sub_80E7524 - pop {r0} - bx r0 - .align 2, 0 -_08143F64: .4byte gSaveBlock2Ptr - thumb_func_end sub_8143F38 - - thumb_func_start sub_8143F68 -sub_8143F68: @ 8143F68 - push {r4-r7,lr} - adds r7, r0, 0 - bl sub_8144018 - cmp r0, 0 - beq _08143FC0 - bl sub_8143F38 - ldr r4, _08143FB0 @ =gSaveBlock1Ptr - ldr r0, [r4] - ldr r5, _08143FB4 @ =0x000032e4 - adds r0, r5 - movs r6, 0xA6 - lsls r6, 1 - adds r1, r7, 0 - adds r2, r6, 0 - bl memcpy - ldr r0, [r4] - adds r0, r5 - adds r1, r6, 0 - bl CalcCRC16WithTable - ldr r1, [r4] - ldr r3, _08143FB8 @ =0x000032e0 - adds r2, r1, r3 - lsls r0, 16 - lsrs r0, 16 - str r0, [r2] - ldr r0, _08143FBC @ =0x00003434 - adds r2, r1, r0 - adds r1, r5 - ldrh r0, [r1, 0x2] - strh r0, [r2, 0x6] - movs r0, 0x1 - b _08143FC2 - .align 2, 0 -_08143FB0: .4byte gSaveBlock1Ptr -_08143FB4: .4byte 0x000032e4 -_08143FB8: .4byte 0x000032e0 -_08143FBC: .4byte 0x00003434 -_08143FC0: - movs r0, 0 -_08143FC2: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8143F68 - - thumb_func_start sub_8143FC8 -sub_8143FC8: @ 8143FC8 - push {r4,r5,lr} - ldr r5, _08144004 @ =gSaveBlock1Ptr - ldr r0, [r5] - ldr r1, _08144008 @ =0x000032e0 - adds r4, r0, r1 - adds r1, 0x4 - adds r0, r1 - movs r1, 0xA6 - lsls r1, 1 - bl CalcCRC16WithTable - lsls r0, 16 - lsrs r0, 16 - ldr r1, [r4] - cmp r1, r0 - bne _08144010 - ldr r0, [r5] - ldr r1, _0814400C @ =0x000032e4 - adds r0, r1 - bl sub_8144018 - cmp r0, 0 - beq _08144010 - bl sub_8069DFC - cmp r0, 0 - beq _08144010 - movs r0, 0x1 - b _08144012 - .align 2, 0 -_08144004: .4byte gSaveBlock1Ptr -_08144008: .4byte 0x000032e0 -_0814400C: .4byte 0x000032e4 -_08144010: - movs r0, 0 -_08144012: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8143FC8 - - thumb_func_start sub_8144018 -sub_8144018: @ 8144018 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2] - cmp r0, 0 - beq _0814404E - ldrb r1, [r2, 0x8] - lsls r0, r1, 30 - lsrs r0, 30 - cmp r0, 0x2 - bhi _0814404E - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - beq _0814403C - cmp r0, 0x40 - beq _0814403C - cmp r0, 0x80 - bne _0814404E -_0814403C: - lsls r0, r1, 26 - lsrs r0, 28 - cmp r0, 0x7 - bhi _0814404E - ldrb r0, [r2, 0x9] - cmp r0, 0x7 - bhi _0814404E - movs r0, 0x1 - b _08144050 -_0814404E: - movs r0, 0 -_08144050: - pop {r1} - bx r1 - thumb_func_end sub_8144018 - - thumb_func_start sub_8144054 -sub_8144054: @ 8144054 - push {lr} - ldr r0, _0814406C @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08144070 @ =0x000032e4 - adds r0, r1 - ldrb r1, [r0, 0x8] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - beq _08144074 - movs r0, 0x1 - b _08144076 - .align 2, 0 -_0814406C: .4byte gSaveBlock1Ptr -_08144070: .4byte 0x000032e4 -_08144074: - movs r0, 0 -_08144076: - pop {r1} - bx r1 - thumb_func_end sub_8144054 - - thumb_func_start sub_814407C -sub_814407C: @ 814407C - push {r4,r5,lr} - sub sp, 0x4 - movs r5, 0 - str r5, [sp] - ldr r4, _081440A4 @ =gSaveBlock1Ptr - ldr r1, [r4] - ldr r0, _081440A8 @ =0x000032e4 - adds r1, r0 - ldr r2, _081440AC @ =0x05000053 - mov r0, sp - bl CpuSet - ldr r0, [r4] - ldr r1, _081440B0 @ =0x000032e0 - adds r0, r1 - str r5, [r0] - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081440A4: .4byte gSaveBlock1Ptr -_081440A8: .4byte 0x000032e4 -_081440AC: .4byte 0x05000053 -_081440B0: .4byte 0x000032e0 - thumb_func_end sub_814407C - - thumb_func_start sub_81440B4 -sub_81440B4: @ 81440B4 - push {r4,lr} - sub sp, 0x4 - movs r4, 0 - str r4, [sp] - bl sav1_get_mevent_buffer_2 - adds r1, r0, 0 - ldr r2, _081440DC @ =0x05000009 - mov r0, sp - bl CpuSet - ldr r0, _081440E0 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _081440E4 @ =0x00003430 - adds r0, r1 - str r4, [r0] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081440DC: .4byte 0x05000009 -_081440E0: .4byte gSaveBlock1Ptr -_081440E4: .4byte 0x00003430 - thumb_func_end sub_81440B4 - - thumb_func_start sub_81440E8 -sub_81440E8: @ 81440E8 - push {lr} - bl sub_8143FC8 - cmp r0, 0 - bne _081440F6 - movs r0, 0 - b _08144100 -_081440F6: - ldr r0, _08144104 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08144108 @ =0x000032e4 - adds r0, r1 - ldrh r0, [r0] -_08144100: - pop {r1} - bx r1 - .align 2, 0 -_08144104: .4byte gSaveBlock1Ptr -_08144108: .4byte 0x000032e4 - thumb_func_end sub_81440E8 - - thumb_func_start sub_814410C -sub_814410C: @ 814410C - push {lr} - adds r2, r0, 0 - ldrb r1, [r2, 0x8] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x40 - bne _08144120 - movs r0, 0x3F - ands r0, r1 - strb r0, [r2, 0x8] -_08144120: - pop {r0} - bx r0 - thumb_func_end sub_814410C - - thumb_func_start sub_8144124 -sub_8144124: @ 8144124 - push {lr} - lsls r0, 16 - ldr r1, _08144138 @ =0xfc180000 - adds r0, r1 - lsrs r0, 16 - cmp r0, 0x13 - bls _0814413C - movs r0, 0 - b _0814413E - .align 2, 0 -_08144138: .4byte 0xfc180000 -_0814413C: - movs r0, 0x1 -_0814413E: - pop {r1} - bx r1 - thumb_func_end sub_8144124 - - thumb_func_start sub_8144144 -sub_8144144: @ 8144144 - push {r4,lr} - bl sub_81440E8 - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r4, 0 - bl sub_8144124 - cmp r0, 0 - beq _0814417C - ldr r1, _08144174 @ =gUnknown_8466F00 - ldr r2, _08144178 @ =0xfffffc18 - adds r0, r4, r2 - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0814417C - movs r0, 0x1 - b _0814417E - .align 2, 0 -_08144174: .4byte gUnknown_8466F00 -_08144178: .4byte 0xfffffc18 -_0814417C: - movs r0, 0 -_0814417E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8144144 - - thumb_func_start sub_8144184 -sub_8144184: @ 8144184 - push {lr} - movs r3, 0 - cmp r3, r1 - bge _081441A6 - adds r2, r0, 0 - adds r2, 0x8 -_08144190: - ldrh r0, [r2, 0xE] - cmp r0, 0 - beq _0814419E - ldrh r0, [r2] - cmp r0, 0 - beq _0814419E - adds r3, 0x1 -_0814419E: - adds r2, 0x2 - subs r1, 0x1 - cmp r1, 0 - bne _08144190 -_081441A6: - adds r0, r3, 0 - pop {r1} - bx r1 - thumb_func_end sub_8144184 - - thumb_func_start sub_81441AC -sub_81441AC: @ 81441AC - push {r4-r7,lr} - adds r5, r0, 0 - adds r4, r1, 0 - movs r1, 0 - cmp r1, r2 - bge _081441E6 - ldrh r6, [r4, 0x2] - movs r0, 0x16 - adds r0, r5 - mov r12, r0 -_081441C0: - lsls r3, r1, 1 - mov r7, r12 - ldrh r0, [r7] - cmp r0, r6 - beq _081441D8 - adds r0, r5, 0 - adds r0, 0x8 - adds r0, r3 - ldrh r0, [r0] - ldrh r3, [r4] - cmp r0, r3 - bne _081441DC -_081441D8: - movs r0, 0x1 - b _081441E8 -_081441DC: - movs r7, 0x2 - add r12, r7 - adds r1, 0x1 - cmp r1, r2 - blt _081441C0 -_081441E6: - movs r0, 0 -_081441E8: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81441AC - - thumb_func_start sub_81441F0 -sub_81441F0: @ 81441F0 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x2] - cmp r0, 0 - beq _08144210 - ldrh r1, [r1] - cmp r1, 0 - beq _08144210 - ldr r0, _0814420C @ =0x0000019b - cmp r1, r0 - bhi _08144210 - movs r0, 0x1 - b _08144212 - .align 2, 0 -_0814420C: .4byte 0x0000019b -_08144210: - movs r0, 0 -_08144212: - pop {r1} - bx r1 - thumb_func_end sub_81441F0 - - thumb_func_start sub_8144218 -sub_8144218: @ 8144218 - push {lr} - bl sub_8143FC8 - cmp r0, 0 - beq _0814424C - ldr r0, _08144240 @ =gSaveBlock1Ptr - ldr r3, [r0] - ldr r0, _08144244 @ =0x000032e4 - adds r2, r3, r0 - ldrb r1, [r2, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _0814424C - ldr r1, _08144248 @ =0x00003434 - adds r0, r3, r1 - ldrb r1, [r2, 0x9] - bl sub_8144184 - b _0814424E - .align 2, 0 -_08144240: .4byte gSaveBlock1Ptr -_08144244: .4byte 0x000032e4 -_08144248: .4byte 0x00003434 -_0814424C: - movs r0, 0 -_0814424E: - pop {r1} - bx r1 - thumb_func_end sub_8144218 - - thumb_func_start sub_8144254 -sub_8144254: @ 8144254 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r6, _08144280 @ =gSaveBlock1Ptr - ldr r0, [r6] - ldr r1, _08144284 @ =0x000032e4 - adds r0, r1 - ldrb r4, [r0, 0x9] - adds r0, r5, 0 - bl sub_81441F0 - cmp r0, 0 - beq _081442BE - ldr r0, [r6] - ldr r1, _08144288 @ =0x00003434 - adds r0, r1 - adds r1, r5, 0 - adds r2, r4, 0 - bl sub_81441AC - cmp r0, 0 - beq _08144298 - b _081442BE - .align 2, 0 -_08144280: .4byte gSaveBlock1Ptr -_08144284: .4byte 0x000032e4 -_08144288: .4byte 0x00003434 -_0814428C: - ldrh r0, [r5, 0x2] - strh r0, [r1] - ldrh r0, [r5] - strh r0, [r2] - movs r0, 0x1 - b _081442C0 -_08144298: - movs r3, 0 - cmp r3, r4 - bge _081442BE - ldr r0, [r6] - ldr r6, _081442C8 @ =0x0000343c - adds r2, r0, r6 - adds r6, 0xE - adds r1, r0, r6 -_081442A8: - ldrh r0, [r2, 0xE] - cmp r0, 0 - bne _081442B4 - ldrh r0, [r2] - cmp r0, 0 - beq _0814428C -_081442B4: - adds r2, 0x2 - adds r1, 0x2 - adds r3, 0x1 - cmp r3, r4 - blt _081442A8 -_081442BE: - movs r0, 0 -_081442C0: - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_081442C8: .4byte 0x0000343c - thumb_func_end sub_8144254 - - thumb_func_start sub_81442CC -sub_81442CC: @ 81442CC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - adds r4, r0, 0 - movs r0, 0 - str r0, [sp] - ldr r2, _08144328 @ =0x05000019 - mov r0, sp - adds r1, r4, 0 - bl CpuSet - ldr r0, _0814432C @ =0x00000101 - str r0, [r4] - movs r0, 0x1 - strh r0, [r4, 0x4] - str r0, [r4, 0x8] - strh r0, [r4, 0xC] - str r0, [r4, 0x10] - bl sub_8143FC8 - cmp r0, 0 - beq _08144330 - bl sav1_get_mevent_buffer_1 - ldrh r0, [r0] - strh r0, [r4, 0x14] - bl sav1_get_mevent_buffer_2 - adds r1, r4, 0 - adds r1, 0x20 - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - bl sav1_get_mevent_buffer_1 - ldrb r1, [r0, 0x9] - adds r0, r4, 0 - adds r0, 0x44 - strb r1, [r0] - b _08144332 - .align 2, 0 -_08144328: .4byte 0x05000019 -_0814432C: .4byte 0x00000101 -_08144330: - strh r0, [r4, 0x14] -_08144332: - adds r5, r4, 0 - adds r5, 0x4C - ldr r0, _081443BC @ =gSaveBlock2Ptr - mov r8, r0 - adds r6, r4, 0 - adds r6, 0x45 - adds r7, r4, 0 - adds r7, 0x50 - movs r1, 0x5C - adds r1, r4 - mov r9, r1 - movs r2, 0x60 - adds r2, r4 - mov r10, r2 - ldr r0, _081443C0 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r3, _081443C4 @ =0x00003458 - adds r2, r0, r3 - adds r1, r4, 0 - adds r1, 0x16 - movs r3, 0x3 -_0814435C: - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x2 - adds r1, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _0814435C - mov r0, r8 - ldr r1, [r0] - adds r1, 0xA - adds r0, r5, 0 - bl CopyUnalignedWord - mov r2, r8 - ldr r1, [r2] - adds r0, r6, 0 - bl StringCopy - ldr r0, _081443C0 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r3, _081443C8 @ =0x00002ca0 - adds r2, r0, r3 - adds r1, r7, 0 - movs r3, 0x5 -_0814438C: - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x2 - adds r1, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _0814438C - ldr r1, _081443CC @ =RomHeaderGameCode - mov r0, r9 - movs r2, 0x4 - bl memcpy - ldr r0, _081443D0 @ =RomHeaderSoftwareVersion - ldrb r0, [r0] - mov r5, r10 - strb r0, [r5] - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081443BC: .4byte gSaveBlock2Ptr -_081443C0: .4byte gSaveBlock1Ptr -_081443C4: .4byte 0x00003458 -_081443C8: .4byte 0x00002ca0 -_081443CC: .4byte RomHeaderGameCode -_081443D0: .4byte RomHeaderSoftwareVersion - thumb_func_end sub_81442CC - - thumb_func_start sub_81443D4 -sub_81443D4: @ 81443D4 - push {lr} - adds r2, r0, 0 - ldr r1, [r2] - ldr r0, _0814440C @ =0x00000101 - cmp r1, r0 - bne _08144410 - ldrh r1, [r2, 0x4] - movs r3, 0x1 - adds r0, r3, 0 - ands r0, r1 - cmp r0, 0 - beq _08144410 - ldr r0, [r2, 0x8] - ands r0, r3 - cmp r0, 0 - beq _08144410 - ldrh r1, [r2, 0xC] - adds r0, r3, 0 - ands r0, r1 - cmp r0, 0 - beq _08144410 - ldr r0, [r2, 0x10] - movs r1, 0xF - ands r0, r1 - cmp r0, 0 - beq _08144410 - movs r0, 0x1 - b _08144412 - .align 2, 0 -_0814440C: .4byte 0x00000101 -_08144410: - movs r0, 0 -_08144412: - pop {r1} - bx r1 - thumb_func_end sub_81443D4 - - thumb_func_start sub_8144418 -sub_8144418: @ 8144418 - push {lr} - ldrh r1, [r1, 0x14] - cmp r1, 0 - bne _08144424 - movs r0, 0 - b _08144430 -_08144424: - ldrh r0, [r0] - cmp r0, r1 - beq _0814442E - movs r0, 0x2 - b _08144430 -_0814442E: - movs r0, 0x1 -_08144430: - pop {r1} - bx r1 - thumb_func_end sub_8144418 - - thumb_func_start sub_8144434 -sub_8144434: @ 8144434 - push {r4-r6,lr} - adds r6, r0, 0 - adds r4, r1, 0 - adds r5, r4, 0 - adds r5, 0x20 - adds r4, 0x44 - ldrb r1, [r4] - adds r0, r5, 0 - bl sub_8144184 - ldrb r2, [r4] - subs r4, r2, r0 - cmp r4, 0 - bne _08144454 - movs r0, 0x1 - b _0814446E -_08144454: - adds r0, r5, 0 - adds r1, r6, 0 - bl sub_81441AC - cmp r0, 0 - beq _08144464 - movs r0, 0x3 - b _0814446E -_08144464: - cmp r4, 0x1 - beq _0814446C - movs r0, 0x2 - b _0814446E -_0814446C: - movs r0, 0x4 -_0814446E: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8144434 - - thumb_func_start sub_8144474 -sub_8144474: @ 8144474 - push {r4,lr} - movs r3, 0 - adds r2, r0, 0 - adds r2, 0x16 -_0814447C: - ldrh r0, [r2] - ldrh r4, [r1] - cmp r0, r4 - beq _08144488 - movs r0, 0 - b _08144494 -_08144488: - adds r1, 0x2 - adds r2, 0x2 - adds r3, 0x1 - cmp r3, 0x3 - ble _0814447C - movs r0, 0x1 -_08144494: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8144474 - - thumb_func_start sub_814449C -sub_814449C: @ 814449C - push {lr} - adds r2, r0, 0 - adds r2, 0x20 - adds r0, 0x44 - ldrb r1, [r0] - adds r0, r2, 0 - bl sub_8144184 - pop {r1} - bx r1 - thumb_func_end sub_814449C - - thumb_func_start sub_81444B0 -sub_81444B0: @ 81444B0 - push {lr} - adds r2, r0, 0 - cmp r1, 0x4 - bhi _081444FC - lsls r0, r1, 2 - ldr r1, _081444C4 @ =_081444C8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081444C4: .4byte _081444C8 - .align 2, 0 -_081444C8: - .4byte _081444DC - .4byte _081444E0 - .4byte _081444E4 - .4byte _081444E8 - .4byte _081444F4 -_081444DC: - ldrh r0, [r2, 0x20] - b _0814450A -_081444E0: - ldrh r0, [r2, 0x22] - b _0814450A -_081444E4: - ldrh r0, [r2, 0x24] - b _0814450A -_081444E8: - adds r0, r2, 0 - bl sub_814449C - lsls r0, 16 - lsrs r0, 16 - b _0814450A -_081444F4: - adds r0, r2, 0 - adds r0, 0x44 - ldrb r0, [r0] - b _0814450A -_081444FC: - ldr r0, _08144510 @ =gUnknown_8466F28 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" - ldr r1, _08144514 @ =0x00000339 - ldr r2, _08144518 @ =gUnknown_8466F5C "0" - movs r3, 0x1 - bl AGBAssert - movs r0, 0 -_0814450A: - pop {r1} - bx r1 - .align 2, 0 -_08144510: .4byte gUnknown_8466F28 -_08144514: .4byte 0x00000339 -_08144518: .4byte gUnknown_8466F5C - thumb_func_end sub_81444B0 - - thumb_func_start sub_814451C -sub_814451C: @ 814451C - push {r4,lr} - adds r4, r0, 0 - ldr r2, _08144544 @ =gSaveBlock1Ptr - ldr r0, [r2] - ldr r1, _08144548 @ =0x000032e4 - adds r0, r1 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - adds r3, r2, 0 - cmp r0, 0x2 - bne _081445B6 - movs r2, 0 - cmp r4, 0x4 - bhi _08144582 - lsls r0, r4, 2 - ldr r1, _0814454C @ =_08144550 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08144544: .4byte gSaveBlock1Ptr -_08144548: .4byte 0x000032e4 -_0814454C: .4byte _08144550 - .align 2, 0 -_08144550: - .4byte _08144564 - .4byte _08144570 - .4byte _0814457C - .4byte _08144582 - .4byte _08144582 -_08144564: - ldr r0, [r3] - ldr r1, _0814456C @ =0x00003434 - b _08144580 - .align 2, 0 -_0814456C: .4byte 0x00003434 -_08144570: - ldr r0, [r3] - ldr r1, _08144578 @ =0x00003436 - b _08144580 - .align 2, 0 -_08144578: .4byte 0x00003436 -_0814457C: - ldr r0, [r3] - ldr r1, _08144598 @ =0x00003438 -_08144580: - adds r2, r0, r1 -_08144582: - cmp r2, 0 - bne _081445A4 - ldr r0, _0814459C @ =gUnknown_8466F28 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" - movs r1, 0xD9 - lsls r1, 2 - ldr r2, _081445A0 @ =gUnknown_8466F5C "0" - movs r3, 0x1 - bl AGBAssert - b _081445B6 - .align 2, 0 -_08144598: .4byte 0x00003438 -_0814459C: .4byte gUnknown_8466F28 -_081445A0: .4byte gUnknown_8466F5C -_081445A4: - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - lsls r0, 16 - lsrs r0, 16 - ldr r1, _081445BC @ =0x000003e7 - cmp r0, r1 - bls _081445B6 - strh r1, [r2] -_081445B6: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081445BC: .4byte 0x000003e7 - thumb_func_end sub_814451C - - thumb_func_start sub_81445C0 -sub_81445C0: @ 81445C0 - push {lr} - cmp r0, 0x4 - bhi _081446A4 - lsls r0, 2 - ldr r1, _081445D0 @ =_081445D4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081445D0: .4byte _081445D4 - .align 2, 0 -_081445D4: - .4byte _081445E8 - .4byte _08144610 - .4byte _08144638 - .4byte _08144660 - .4byte _08144684 -_081445E8: - ldr r0, _08144604 @ =gSaveBlock1Ptr - ldr r2, [r0] - ldr r1, _08144608 @ =0x000032e4 - adds r0, r2, r1 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x2 - bne _081446A4 - ldr r1, _0814460C @ =0x00003434 - adds r0, r2, r1 - ldrh r0, [r0] - b _081446B2 - .align 2, 0 -_08144604: .4byte gSaveBlock1Ptr -_08144608: .4byte 0x000032e4 -_0814460C: .4byte 0x00003434 -_08144610: - ldr r0, _0814462C @ =gSaveBlock1Ptr - ldr r2, [r0] - ldr r1, _08144630 @ =0x000032e4 - adds r0, r2, r1 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x2 - bne _081446A4 - ldr r1, _08144634 @ =0x00003434 - adds r0, r2, r1 - ldrh r0, [r0, 0x2] - b _081446B2 - .align 2, 0 -_0814462C: .4byte gSaveBlock1Ptr -_08144630: .4byte 0x000032e4 -_08144634: .4byte 0x00003434 -_08144638: - ldr r0, _08144654 @ =gSaveBlock1Ptr - ldr r2, [r0] - ldr r1, _08144658 @ =0x000032e4 - adds r0, r2, r1 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x2 - bne _081446A4 - ldr r1, _0814465C @ =0x00003434 - adds r0, r2, r1 - ldrh r0, [r0, 0x4] - b _081446B2 - .align 2, 0 -_08144654: .4byte gSaveBlock1Ptr -_08144658: .4byte 0x000032e4 -_0814465C: .4byte 0x00003434 -_08144660: - ldr r0, _0814467C @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08144680 @ =0x000032e4 - adds r0, r1 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _081446A4 - bl sub_8144218 - lsls r0, 16 - lsrs r0, 16 - b _081446B2 - .align 2, 0 -_0814467C: .4byte gSaveBlock1Ptr -_08144680: .4byte 0x000032e4 -_08144684: - ldr r0, _0814469C @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _081446A0 @ =0x000032e4 - adds r2, r0, r1 - ldrb r1, [r2, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _081446A4 - ldrb r0, [r2, 0x9] - b _081446B2 - .align 2, 0 -_0814469C: .4byte gSaveBlock1Ptr -_081446A0: .4byte 0x000032e4 -_081446A4: - ldr r0, _081446B8 @ =gUnknown_8466F28 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" - ldr r1, _081446BC @ =0x00000391 - ldr r2, _081446C0 @ =gUnknown_8466F5C "0" - movs r3, 0x1 - bl AGBAssert - movs r0, 0 -_081446B2: - pop {r1} - bx r1 - .align 2, 0 -_081446B8: .4byte gUnknown_8466F28 -_081446BC: .4byte 0x00000391 -_081446C0: .4byte gUnknown_8466F5C - thumb_func_end sub_81445C0 - - thumb_func_start sub_81446C4 -sub_81446C4: @ 81446C4 - ldr r1, _081446CC @ =gUnknown_203F3BC - movs r0, 0 - str r0, [r1] - bx lr - .align 2, 0 -_081446CC: .4byte gUnknown_203F3BC - thumb_func_end sub_81446C4 - - thumb_func_start sub_81446D0 -sub_81446D0: @ 81446D0 - push {r4,r5,lr} - lsls r0, 16 - lsrs r0, 16 - adds r4, r0, 0 - ldr r5, _08144700 @ =gUnknown_203F3BC - movs r0, 0 - str r0, [r5] - cmp r4, 0 - beq _0814470E - bl sub_8143FC8 - cmp r0, 0 - beq _0814470C - ldr r0, _08144704 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08144708 @ =0x000032e4 - adds r0, r1 - ldrh r0, [r0] - cmp r0, r4 - bne _0814470C - movs r0, 0x1 - str r0, [r5] - b _0814470E - .align 2, 0 -_08144700: .4byte gUnknown_203F3BC -_08144704: .4byte gSaveBlock1Ptr -_08144708: .4byte 0x000032e4 -_0814470C: - movs r0, 0 -_0814470E: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81446D0 - - thumb_func_start sub_8144714 -sub_8144714: @ 8144714 - push {lr} - adds r2, r0, 0 - ldr r0, _08144738 @ =gUnknown_203F3BC - ldr r0, [r0] - cmp r0, 0 - beq _08144782 - cmp r2, 0x1 - beq _08144758 - cmp r2, 0x1 - bcc _08144744 - cmp r2, 0x2 - bne _08144774 - ldr r0, _0814473C @ =gSaveBlock1Ptr - ldr r2, [r0] - ldr r0, _08144740 @ =0x00003478 - adds r2, r0 - movs r0, 0x2 - b _08144762 - .align 2, 0 -_08144738: .4byte gUnknown_203F3BC -_0814473C: .4byte gSaveBlock1Ptr -_08144740: .4byte 0x00003478 -_08144744: - ldr r0, _08144750 @ =gSaveBlock1Ptr - ldr r2, [r0] - ldr r0, _08144754 @ =0x00003464 - adds r2, r0 - movs r0, 0 - b _08144762 - .align 2, 0 -_08144750: .4byte gSaveBlock1Ptr -_08144754: .4byte 0x00003464 -_08144758: - ldr r0, _0814476C @ =gSaveBlock1Ptr - ldr r2, [r0] - ldr r0, _08144770 @ =0x00003464 - adds r2, r0 - movs r0, 0x1 -_08144762: - movs r3, 0x5 - bl sub_8144824 - b _08144782 - .align 2, 0 -_0814476C: .4byte gSaveBlock1Ptr -_08144770: .4byte 0x00003464 -_08144774: - ldr r0, _08144788 @ =gUnknown_8466F28 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" - movs r1, 0xF7 - lsls r1, 2 - ldr r2, _0814478C @ =gUnknown_8466F5C "0" - movs r3, 0x1 - bl AGBAssert -_08144782: - pop {r0} - bx r0 - .align 2, 0 -_08144788: .4byte gUnknown_8466F28 -_0814478C: .4byte gUnknown_8466F5C - thumb_func_end sub_8144714 - - thumb_func_start sub_8144790 -sub_8144790: @ 8144790 - push {lr} - sub sp, 0x4 - movs r0, 0 - str r0, [sp] - ldr r0, _081447B0 @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, _081447B4 @ =0x00003464 - adds r1, r0 - ldr r2, _081447B8 @ =0x0500000a - mov r0, sp - bl CpuSet - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_081447B0: .4byte gSaveBlock1Ptr -_081447B4: .4byte 0x00003464 -_081447B8: .4byte 0x0500000a - thumb_func_end sub_8144790 - - thumb_func_start sub_81447BC -sub_81447BC: @ 81447BC - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - movs r1, 0 - cmp r1, r2 - bge _081447DE - ldr r0, [r4] - cmp r0, r5 - beq _081447DE - adds r3, r4, 0 -_081447D0: - adds r3, 0x4 - adds r1, 0x1 - cmp r1, r2 - bge _081447DE - ldr r0, [r3] - cmp r0, r5 - bne _081447D0 -_081447DE: - cmp r1, r2 - bne _08144800 - subs r3, r1, 0x1 - cmp r3, 0 - ble _081447FA - lsls r0, r3, 2 - subs r0, 0x4 - adds r2, r0, r4 -_081447EE: - ldr r0, [r2] - str r0, [r2, 0x4] - subs r2, 0x4 - subs r3, 0x1 - cmp r3, 0 - bgt _081447EE -_081447FA: - str r5, [r4] - movs r0, 0x1 - b _0814481C -_08144800: - adds r3, r1, 0 - cmp r3, 0 - ble _08144818 - lsls r0, r3, 2 - subs r0, 0x4 - adds r2, r0, r4 -_0814480C: - ldr r0, [r2] - str r0, [r2, 0x4] - subs r2, 0x4 - subs r3, 0x1 - cmp r3, 0 - bgt _0814480C -_08144818: - str r5, [r4] - movs r0, 0 -_0814481C: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81447BC - - thumb_func_start sub_8144824 -sub_8144824: @ 8144824 - push {r4,lr} - adds r4, r0, 0 - adds r0, r1, 0 - adds r1, r2, 0 - adds r2, r3, 0 - bl sub_81447BC - cmp r0, 0 - beq _0814483C - adds r0, r4, 0 - bl sub_814451C -_0814483C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8144824 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s deleted file mode 100644 index 0c344853a..000000000 --- a/asm/mevent_8145654.s +++ /dev/null @@ -1,2728 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8145654 -sub_8145654: @ 8145654 - push {r4-r7,lr} - adds r5, r0, 0 - adds r6, r1, 0 - cmp r5, 0 - beq _08145670 - cmp r6, 0 - beq _08145670 - ldr r7, _08145674 @ =gUnknown_203F3C8 - ldr r0, _08145678 @ =0x0000145c - bl AllocZeroed - str r0, [r7] - cmp r0, 0 - bne _0814567C -_08145670: - movs r0, 0 - b _081456E6 - .align 2, 0 -_08145674: .4byte gUnknown_203F3C8 -_08145678: .4byte 0x0000145c -_0814567C: - movs r4, 0xA6 - lsls r4, 1 - adds r1, r5, 0 - adds r2, r4, 0 - bl memcpy - ldr r1, [r7] - adds r1, r4 - adds r0, r6, 0 - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldr r2, [r7] - ldrb r1, [r2, 0x8] - lsls r0, r1, 26 - lsrs r0, 28 - cmp r0, 0x7 - bls _081456AE - movs r0, 0x3D - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x8] -_081456AE: - ldr r2, [r7] - ldrb r1, [r2, 0x8] - lsls r0, r1, 30 - lsrs r0, 30 - cmp r0, 0x2 - bls _081456C2 - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x8] -_081456C2: - ldr r1, [r7] - ldrb r0, [r1, 0x9] - cmp r0, 0x7 - bls _081456CE - movs r0, 0 - strb r0, [r1, 0x9] -_081456CE: - ldr r0, [r7] - movs r1, 0xB8 - lsls r1, 1 - adds r2, r0, r1 - ldrb r0, [r0, 0x8] - lsls r0, 26 - lsrs r0, 28 - lsls r0, 4 - ldr r1, _081456EC @ =gUnknown_8467FB8 - adds r0, r1 - str r0, [r2] - movs r0, 0x1 -_081456E6: - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_081456EC: .4byte gUnknown_8467FB8 - thumb_func_end sub_8145654 - - thumb_func_start sub_81456F0 -sub_81456F0: @ 81456F0 - push {r4,lr} - ldr r4, _08145714 @ =gUnknown_203F3C8 - ldr r0, [r4] - cmp r0, 0 - beq _0814570C - ldr r2, _08145718 @ =0x0000145c - movs r1, 0 - bl memset - ldr r0, [r4] - bl Free - movs r0, 0 - str r0, [r4] -_0814570C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08145714: .4byte gUnknown_203F3C8 -_08145718: .4byte 0x0000145c - thumb_func_end sub_81456F0 - - thumb_func_start sub_814571C -sub_814571C: @ 814571C - push {r4-r6,lr} - sub sp, 0x24 - ldr r5, _08145730 @ =gUnknown_203F3C8 - ldr r0, [r5] - cmp r0, 0 - bne _08145734 - movs r0, 0x1 - negs r0, r0 - b _08145930 - .align 2, 0 -_08145730: .4byte gUnknown_203F3C8 -_08145734: - movs r4, 0xBA - lsls r4, 1 - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0x7 - bls _08145742 - b _08145908 -_08145742: - lsls r0, 2 - ldr r1, _0814574C @ =_08145750 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0814574C: .4byte _08145750 - .align 2, 0 -_08145750: - .4byte _08145770 - .4byte _08145782 - .4byte _08145790 - .4byte _08145834 - .4byte _081458AC - .4byte _081458B2 - .4byte _081458CC - .4byte _081458D2 -_08145770: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - b _0814591E -_08145782: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - bne _0814578E - b _0814591E -_0814578E: - b _0814592E -_08145790: - movs r5, 0x1E - str r5, [sp] - movs r4, 0x14 - str r4, [sp, 0x4] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r5, [sp] - str r4, [sp, 0x4] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r5, [sp] - str r4, [sp, 0x4] - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - ldr r5, _0814582C @ =gUnknown_203F3C8 - ldr r0, [r5] - movs r1, 0xB8 - lsls r1, 1 - adds r0, r1 - ldr r0, [r0] - ldr r1, [r0, 0x4] - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - movs r2, 0 - movs r3, 0x8 - bl decompress_and_copy_tile_data_to_vram - ldr r4, _08145830 @ =gUnknown_8467074 - adds r0, r4, 0 - bl AddWindow - ldr r1, [r5] - movs r2, 0xBB - lsls r2, 1 - adds r1, r2 - strh r0, [r1] - adds r0, r4, 0 - adds r0, 0x8 - bl AddWindow - ldr r1, [r5] - movs r2, 0xBC - lsls r2, 1 - adds r1, r2 - strh r0, [r1] - adds r4, 0x10 - adds r0, r4, 0 - bl AddWindow - ldr r1, [r5] - movs r2, 0xBD - lsls r2, 1 - adds r1, r2 - strh r0, [r1] - b _0814591E - .align 2, 0 -_0814582C: .4byte gUnknown_203F3C8 -_08145830: .4byte gUnknown_8467074 -_08145834: - bl free_temp_tile_data_buffers_if_possible - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0 - bne _0814592E - ldr r2, _081458A0 @ =gUnknown_2037AB8 - ldrb r0, [r2, 0x8] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2, 0x8] - ldr r5, _081458A4 @ =gUnknown_203F3C8 - ldr r0, [r5] - movs r4, 0xB8 - lsls r4, 1 - adds r0, r4 - ldr r0, [r0] - ldr r0, [r0, 0xC] - movs r1, 0x10 - movs r2, 0x20 - bl LoadPalette - ldr r1, [r5] - adds r4, r1, r4 - ldr r0, [r4] - ldr r0, [r0, 0x8] - ldr r4, _081458A8 @ =0x0000045c - adds r1, r4 - bl LZ77UnCompWram - ldr r1, [r5] - adds r1, r4 - movs r2, 0x1E - str r2, [sp] - movs r0, 0x14 - str r0, [sp, 0x4] - str r6, [sp, 0x8] - str r6, [sp, 0xC] - str r2, [sp, 0x10] - str r0, [sp, 0x14] - movs r0, 0x1 - str r0, [sp, 0x18] - movs r0, 0x8 - str r0, [sp, 0x1C] - str r6, [sp, 0x20] - movs r0, 0x2 - movs r2, 0 - movs r3, 0 - bl CopyRectToBgTilemapBufferRect - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - b _0814591E - .align 2, 0 -_081458A0: .4byte gUnknown_2037AB8 -_081458A4: .4byte gUnknown_203F3C8 -_081458A8: .4byte 0x0000045c -_081458AC: - bl sub_8145A98 - b _0814591E -_081458B2: - movs r0, 0 - bl sub_8145D18 - movs r0, 0x1 - bl sub_8145D18 - movs r0, 0x2 - bl sub_8145D18 - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - b _0814591E -_081458CC: - bl sub_809707C - b _0814591E -_081458D2: - movs r0, 0x1 - bl ShowBg - movs r0, 0x2 - bl ShowBg - ldr r2, _08145904 @ =gUnknown_2037AB8 - ldrb r1, [r2, 0x8] - movs r0, 0x7F - ands r0, r1 - strb r0, [r2, 0x8] - bl sub_8146060 - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - bl UpdatePaletteFade - b _0814591E - .align 2, 0 -_08145904: .4byte gUnknown_2037AB8 -_08145908: - bl UpdatePaletteFade - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - bne _0814592E - ldr r0, [r5] - adds r0, r4 - strb r1, [r0] - movs r0, 0x1 - b _08145930 -_0814591E: - ldr r0, _08145938 @ =gUnknown_203F3C8 - ldr r1, [r0] - movs r0, 0xBA - lsls r0, 1 - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_0814592E: - movs r0, 0 -_08145930: - add sp, 0x24 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08145938: .4byte gUnknown_203F3C8 - thumb_func_end sub_814571C - - thumb_func_start sub_814593C -sub_814593C: @ 814593C - push {r4,r5,lr} - sub sp, 0x8 - adds r2, r0, 0 - ldr r5, _08145950 @ =gUnknown_203F3C8 - ldr r0, [r5] - cmp r0, 0 - bne _08145954 - movs r0, 0x1 - negs r0, r0 - b _08145A8C - .align 2, 0 -_08145950: .4byte gUnknown_203F3C8 -_08145954: - movs r4, 0xBA - lsls r4, 1 - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0x6 - bls _08145962 - b _08145A64 -_08145962: - lsls r0, 2 - ldr r1, _0814596C @ =_08145970 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0814596C: .4byte _08145970 - .align 2, 0 -_08145970: - .4byte _0814598C - .4byte _0814599E - .4byte _081459AA - .4byte _081459F2 - .4byte _08145A30 - .4byte _08145A3A - .4byte _08145A4C -_0814598C: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - b _08145A7A -_0814599E: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - beq _08145A7A - b _08145A8A -_081459AA: - movs r5, 0x1E - str r5, [sp] - movs r4, 0x14 - str r4, [sp, 0x4] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r5, [sp] - str r4, [sp, 0x4] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r5, [sp] - str r4, [sp, 0x4] - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - b _08145A7A -_081459F2: - movs r0, 0x1 - bl HideBg - movs r0, 0x2 - bl HideBg - ldr r4, _08145A2C @ =gUnknown_203F3C8 - ldr r0, [r4] - movs r1, 0xBD - lsls r1, 1 - adds r0, r1 - ldrb r0, [r0] - bl RemoveWindow - ldr r0, [r4] - movs r1, 0xBC - lsls r1, 1 - adds r0, r1 - ldrb r0, [r0] - bl RemoveWindow - ldr r0, [r4] - movs r1, 0xBB - lsls r1, 1 - adds r0, r1 - ldrb r0, [r0] - bl RemoveWindow - b _08145A7A - .align 2, 0 -_08145A2C: .4byte gUnknown_203F3C8 -_08145A30: - bl sub_81461D8 - bl FreeMonIconPalettes - b _08145A7A -_08145A3A: - ldr r0, _08145A48 @ =gUnknown_203F3B8 - ldrb r0, [r0] - adds r1, r2, 0 - bl sub_8142344 - b _08145A7A - .align 2, 0 -_08145A48: .4byte gUnknown_203F3B8 -_08145A4C: - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - b _08145A7A -_08145A64: - bl UpdatePaletteFade - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - bne _08145A8A - ldr r0, [r5] - adds r0, r4 - strb r1, [r0] - movs r0, 0x1 - b _08145A8C -_08145A7A: - ldr r0, _08145A94 @ =gUnknown_203F3C8 - ldr r1, [r0] - movs r0, 0xBA - lsls r0, 1 - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_08145A8A: - movs r0, 0 -_08145A8C: - add sp, 0x8 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08145A94: .4byte gUnknown_203F3C8 - thumb_func_end sub_814593C - - thumb_func_start sub_8145A98 -sub_8145A98: @ 8145A98 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - movs r5, 0 - mov r0, sp - movs r1, 0 - movs r2, 0x6 - bl memset - ldr r4, _08145B7C @ =gUnknown_203F3C8 - ldr r1, [r4] - ldr r2, _08145B80 @ =0x0000018b - adds r0, r1, r2 - adds r1, 0xA - movs r2, 0x28 - bl memcpy - ldr r0, [r4] - ldr r3, _08145B84 @ =0x000001b3 - adds r1, r0, r3 - movs r0, 0xFF - strb r0, [r1] - ldr r1, [r4] - movs r2, 0xDA - lsls r2, 1 - adds r0, r1, r2 - adds r1, 0x32 - movs r2, 0x28 - bl memcpy - ldr r0, [r4] - movs r3, 0xEE - lsls r3, 1 - adds r0, r3 - movs r1, 0x1 - negs r1, r1 - strb r1, [r0] - ldr r1, [r4] - ldr r0, [r1, 0x4] - ldr r2, _08145B88 @ =0x000f423f - cmp r0, r2 - bls _08145AF4 - str r2, [r1, 0x4] -_08145AF4: - ldr r1, [r4] - ldr r2, _08145B8C @ =0x000001dd - adds r0, r1, r2 - ldr r1, [r1, 0x4] - movs r2, 0 - movs r3, 0x6 - bl ConvertIntToDecimalStringN - adds r6, r4, 0 -_08145B06: - ldr r2, [r6] - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r4, r1, r5 - adds r0, r4, r2 - movs r3, 0xF2 - lsls r3, 1 - adds r0, r3 - adds r1, r2 - adds r1, 0x5A - movs r2, 0x28 - bl memcpy - ldr r1, [r6] - movs r0, 0x83 - lsls r0, 2 - adds r1, r0 - adds r1, r4 - movs r2, 0x1 - negs r2, r2 - adds r7, r2, 0 - movs r0, 0xFF - strb r0, [r1] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x3 - bls _08145B06 - ldr r6, _08145B7C @ =gUnknown_203F3C8 - ldr r1, [r6] - movs r3, 0xA2 - lsls r3, 2 - adds r0, r1, r3 - adds r1, 0xFA - movs r2, 0x28 - bl memcpy - ldr r0, [r6] - movs r4, 0xAC - lsls r4, 2 - adds r0, r4 - movs r1, 0x1 - negs r1, r1 - adds r4, r1, 0 - movs r1, 0xFF - strb r1, [r0] - ldr r1, [r6] - ldrb r0, [r1, 0x8] - lsls r0, 30 - lsrs r0, 30 - cmp r0, 0x1 - beq _08145BB8 - cmp r0, 0x1 - bgt _08145B90 - cmp r0, 0 - beq _08145B96 - b _08145D08 - .align 2, 0 -_08145B7C: .4byte gUnknown_203F3C8 -_08145B80: .4byte 0x0000018b -_08145B84: .4byte 0x000001b3 -_08145B88: .4byte 0x000f423f -_08145B8C: .4byte 0x000001dd -_08145B90: - cmp r0, 0x2 - beq _08145BC8 - b _08145D08 -_08145B96: - ldr r2, _08145BB0 @ =0x000002b1 - adds r0, r1, r2 - movs r3, 0x91 - lsls r3, 1 - adds r1, r3 - movs r2, 0x28 - bl memcpy - ldr r1, [r6] - ldr r0, _08145BB4 @ =0x000002d9 - adds r1, r0 - b _08145BBC - .align 2, 0 -_08145BB0: .4byte 0x000002b1 -_08145BB4: .4byte 0x000002d9 -_08145BB8: - ldr r2, _08145BC4 @ =0x000002b1 - adds r1, r2 -_08145BBC: - ldrb r0, [r1] - orrs r0, r4 - strb r0, [r1] - b _08145D08 - .align 2, 0 -_08145BC4: .4byte 0x000002b1 -_08145BC8: - ldr r3, _08145C84 @ =0x000002b1 - adds r0, r1, r3 - ldrb r1, [r0] - orrs r1, r7 - strb r1, [r0] - mov r3, sp - ldr r1, [r6] - movs r4, 0xA6 - lsls r4, 1 - adds r0, r1, r4 - ldrh r0, [r0] - ldr r2, _08145C88 @ =0x000003e7 - cmp r0, r2 - bls _08145BE6 - adds r0, r2, 0 -_08145BE6: - strh r0, [r3] - mov r3, sp - movs r4, 0xA7 - lsls r4, 1 - adds r0, r1, r4 - ldrh r0, [r0] - cmp r0, r2 - bls _08145BF8 - adds r0, r2, 0 -_08145BF8: - strh r0, [r3, 0x2] - mov r3, sp - movs r4, 0xA8 - lsls r4, 1 - adds r0, r1, r4 - ldrh r0, [r0] - cmp r0, r2 - bls _08145C0A - adds r0, r2, 0 -_08145C0A: - strh r0, [r3, 0x4] - movs r5, 0 -_08145C0E: - lsls r4, r5, 1 - adds r4, r5 - lsls r4, 4 - movs r0, 0xB7 - lsls r0, 2 - adds r4, r0 - ldr r0, [r6] - adds r0, r4 - adds r0, 0x2A - movs r1, 0xFF - movs r2, 0x4 - bl memset - ldr r0, [r6] - adds r0, r4 - adds r0, 0x1 - movs r1, 0xFF - movs r2, 0x29 - bl memset - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x7 - bls _08145C0E - movs r5, 0 - movs r6, 0 - ldr r1, _08145C8C @ =gUnknown_203F3C8 - mov r8, r1 - movs r2, 0x91 - lsls r2, 1 - mov r10, r2 - ldr r7, _08145C90 @ =0x00000175 - movs r3, 0xB7 - lsls r3, 2 - mov r9, r3 -_08145C56: - mov r4, r8 - ldr r2, [r4] - mov r0, r10 - adds r1, r2, r0 - adds r0, r1, r5 - ldrb r3, [r0] - cmp r3, 0xF7 - beq _08145C98 - ldr r1, _08145C90 @ =0x00000175 - adds r0, r2, r1 - ldrb r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 4 - adds r0, r6, r0 - ldr r4, _08145C94 @ =0x000002dd - adds r1, r2, r4 - adds r1, r0 - strb r3, [r1] - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - b _08145CFE - .align 2, 0 -_08145C84: .4byte 0x000002b1 -_08145C88: .4byte 0x000003e7 -_08145C8C: .4byte gUnknown_203F3C8 -_08145C90: .4byte 0x00000175 -_08145C94: .4byte 0x000002dd -_08145C98: - adds r0, r5, 0x1 - adds r0, r1, r0 - ldrb r3, [r0] - cmp r3, 0x2 - bls _08145CA8 - adds r0, r5, 0x2 - lsls r0, 16 - b _08145CFC -_08145CA8: - adds r0, r2, r7 - ldrb r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 4 - add r0, r9 - adds r0, r2, r0 - adds r0, 0x2A - lsls r1, r3, 1 - add r1, sp - ldrh r1, [r1] - movs r2, 0x2 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - mov r0, r8 - ldr r1, [r0] - adds r0, r1, r7 - ldrb r2, [r0] - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 4 - adds r0, r1, r0 - adds r4, r5, 0x2 - add r1, r10 - adds r1, r4 - ldrb r1, [r1] - add r0, r9 - strb r1, [r0] - mov r2, r8 - ldr r1, [r2] - adds r1, r7 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - ldr r0, [r2] - adds r0, r7 - ldrb r0, [r0] - cmp r0, 0x7 - bhi _08145D08 - movs r6, 0 - lsls r0, r4, 16 -_08145CFC: - lsrs r5, r0, 16 -_08145CFE: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x27 - bls _08145C56 -_08145D08: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8145A98 - - thumb_func_start sub_8145D18 -sub_8145D18: @ 8145D18 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x18 - lsls r0, 24 - lsrs r4, r0, 24 - mov r8, r4 - movs r0, 0 - str r0, [sp, 0xC] - ldr r7, _08145D60 @ =gUnknown_203F3C8 - ldr r0, [r7] - lsls r1, r4, 1 - movs r2, 0xBB - lsls r2, 1 - adds r0, r2 - adds r0, r1 - ldrh r0, [r0] - lsls r6, r0, 24 - lsrs r5, r6, 24 - adds r0, r5, 0 - bl PutWindowTilemap - adds r0, r5, 0 - movs r1, 0 - bl FillWindowPixelBuffer - cmp r4, 0x1 - beq _08145E40 - cmp r4, 0x1 - bgt _08145D64 - cmp r4, 0 - beq _08145D70 - mov r9, r6 - b _08146038 - .align 2, 0 -_08145D60: .4byte gUnknown_203F3C8 -_08145D64: - mov r0, r8 - cmp r0, 0x2 - bne _08145D6C - b _08145EA4 -_08145D6C: - mov r9, r6 - b _08146038 -_08145D70: - ldr r2, [r7] - movs r1, 0xB8 - lsls r1, 1 - mov r10, r1 - adds r0, r2, r1 - ldr r0, [r0] - ldrb r0, [r0] - lsls r0, 28 - lsrs r0, 28 - lsls r1, r0, 1 - adds r1, r0 - ldr r0, _08145E34 @ =gUnknown_8467068 - mov r8, r0 - add r1, r8 - str r1, [sp] - ldr r1, [sp, 0xC] - str r1, [sp, 0x4] - ldr r0, _08145E38 @ =0x0000018b - adds r2, r0 - str r2, [sp, 0x8] - adds r0, r5, 0 - movs r1, 0x3 - movs r2, 0 - movs r3, 0x1 - bl box_print - ldr r4, [r7] - movs r1, 0xDA - lsls r1, 1 - mov r9, r1 - add r4, r9 - movs r0, 0x3 - movs r1, 0x2 - bl GetFontAttribute - adds r2, r0, 0 - lsls r2, 24 - lsrs r2, 24 - movs r0, 0x3 - adds r1, r4, 0 - bl GetStringWidth - movs r1, 0xA0 - subs r1, r0 - cmp r1, 0 - bge _08145DCE - movs r1, 0 -_08145DCE: - lsls r2, r1, 24 - lsrs r2, 24 - ldr r3, [r7] - mov r1, r10 - adds r0, r3, r1 - ldr r0, [r0] - ldrb r1, [r0] - lsls r1, 28 - lsrs r1, 28 - lsls r0, r1, 1 - adds r0, r1 - add r0, r8 - str r0, [sp] - ldr r0, [sp, 0xC] - str r0, [sp, 0x4] - add r3, r9 - str r3, [sp, 0x8] - adds r0, r5, 0 - movs r1, 0x3 - movs r3, 0x11 - bl box_print - ldr r2, [r7] - ldr r0, [r2, 0x4] - mov r9, r6 - cmp r0, 0 - bne _08145E06 - b _08146038 -_08145E06: - mov r1, r10 - adds r0, r2, r1 - ldr r0, [r0] - ldrb r1, [r0] - lsls r1, 28 - lsrs r1, 28 - lsls r0, r1, 1 - adds r0, r1 - add r0, r8 - str r0, [sp] - ldr r0, [sp, 0xC] - str r0, [sp, 0x4] - ldr r1, _08145E3C @ =0x000001dd - adds r0, r2, r1 - str r0, [sp, 0x8] - adds r0, r5, 0 - movs r1, 0x2 - movs r2, 0xA6 - movs r3, 0x11 - bl box_print - b _08146038 - .align 2, 0 -_08145E34: .4byte gUnknown_8467068 -_08145E38: .4byte 0x0000018b -_08145E3C: .4byte 0x000001dd -_08145E40: - mov r9, r6 -_08145E42: - ldr r2, [sp, 0xC] - lsls r4, r2, 24 - asrs r4, 24 - lsls r3, r4, 4 - adds r3, 0x2 - lsls r3, 24 - lsrs r3, 24 - ldr r0, _08145E9C @ =gUnknown_203F3C8 - ldr r2, [r0] - movs r1, 0xB8 - lsls r1, 1 - adds r0, r2, r1 - ldr r0, [r0] - ldrb r0, [r0] - lsrs r0, 4 - lsls r1, r0, 1 - adds r1, r0 - ldr r0, _08145EA0 @ =gUnknown_8467068 - adds r1, r0 - str r1, [sp] - movs r0, 0 - str r0, [sp, 0x4] - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r4 - movs r1, 0xF2 - lsls r1, 1 - adds r0, r1 - adds r2, r0 - str r2, [sp, 0x8] - mov r2, r9 - lsrs r0, r2, 24 - movs r1, 0x3 - movs r2, 0 - bl box_print - adds r4, 0x1 - lsls r4, 24 - lsrs r0, r4, 24 - str r0, [sp, 0xC] - asrs r4, 24 - cmp r4, 0x3 - ble _08145E42 - b _08146038 - .align 2, 0 -_08145E9C: .4byte gUnknown_203F3C8 -_08145EA0: .4byte gUnknown_8467068 -_08145EA4: - ldr r4, _08145F2C @ =gUnknown_8467070 - ldr r2, [r7] - ldrb r0, [r2, 0x8] - lsls r0, 30 - lsrs r0, 30 - adds r0, r4 - ldrb r3, [r0] - movs r1, 0xB8 - lsls r1, 1 - adds r0, r2, r1 - ldr r0, [r0] - ldrb r0, [r0, 0x1] - lsls r0, 28 - lsrs r0, 28 - lsls r1, r0, 1 - adds r1, r0 - ldr r0, _08145F30 @ =gUnknown_8467068 - mov r10, r0 - add r1, r10 - str r1, [sp] - ldr r1, [sp, 0xC] - str r1, [sp, 0x4] - movs r1, 0xA2 - lsls r1, 2 - adds r0, r2, r1 - str r0, [sp, 0x8] - adds r0, r5, 0 - movs r1, 0x3 - movs r2, 0 - bl box_print - ldr r2, [r7] - ldrb r1, [r2, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x2 - beq _08145F38 - lsls r0, r1, 30 - lsrs r0, 30 - adds r0, r4 - ldrb r3, [r0] - adds r3, 0x10 - lsls r3, 24 - lsrs r3, 24 - movs r1, 0xB8 - lsls r1, 1 - adds r0, r2, r1 - ldr r0, [r0] - ldrb r1, [r0, 0x1] - lsls r1, 28 - lsrs r1, 28 - lsls r0, r1, 1 - adds r0, r1 - add r0, r10 - str r0, [sp] - ldr r0, [sp, 0xC] - str r0, [sp, 0x4] - ldr r1, _08145F34 @ =0x000002b1 - adds r0, r2, r1 - str r0, [sp, 0x8] - adds r0, r5, 0 - movs r1, 0x3 - movs r2, 0 - bl box_print - mov r9, r6 - b _08146038 - .align 2, 0 -_08145F2C: .4byte gUnknown_8467070 -_08145F30: .4byte gUnknown_8467068 -_08145F34: .4byte 0x000002b1 -_08145F38: - movs r2, 0 - mov r8, r2 - lsls r0, r1, 30 - lsrs r0, 30 - adds r0, r4 - ldrb r0, [r0] - adds r4, r0, 0 - adds r4, 0x10 - movs r0, 0x3 - movs r1, 0x2 - bl GetFontAttribute - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, [r7] - ldr r1, _08146054 @ =0x00000175 - adds r0, r1 - mov r9, r6 - ldr r1, [sp, 0xC] - ldrb r0, [r0] - cmp r1, r0 - bge _08146038 - str r5, [sp, 0x10] - lsls r0, r4, 24 - lsrs r0, 24 - str r0, [sp, 0x14] - mov r10, r2 -_08145F6E: - mov r0, r8 - lsls r2, r0, 24 - lsrs r2, 24 - ldr r3, [r7] - movs r1, 0xB8 - lsls r1, 1 - adds r0, r3, r1 - ldr r0, [r0] - ldrb r1, [r0, 0x1] - lsls r1, 28 - lsrs r1, 28 - lsls r0, r1, 1 - adds r0, r1 - ldr r1, _08146058 @ =gUnknown_8467068 - adds r0, r1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - ldr r1, [sp, 0xC] - lsls r0, r1, 24 - asrs r6, r0, 24 - lsls r0, r6, 1 - adds r0, r6 - lsls r5, r0, 4 - movs r0, 0xB7 - lsls r0, 2 - adds r4, r5, r0 - adds r3, r4 - adds r3, 0x1 - str r3, [sp, 0x8] - ldr r0, [sp, 0x10] - movs r1, 0x3 - ldr r3, [sp, 0x14] - bl box_print - ldr r1, [r7] - adds r0, r1, r5 - ldr r2, _0814605C @ =0x00000306 - adds r0, r2 - ldrb r0, [r0] - cmp r0, 0xFF - beq _08146022 - adds r1, r4 - adds r1, 0x1 - movs r0, 0x3 - mov r2, r10 - bl GetStringWidth - add r8, r0 - mov r0, r8 - lsls r2, r0, 24 - lsrs r2, 24 - ldr r3, [r7] - movs r1, 0xB8 - lsls r1, 1 - adds r0, r3, r1 - ldr r0, [r0] - ldrb r1, [r0, 0x1] - lsls r1, 28 - lsrs r1, 28 - lsls r0, r1, 1 - adds r0, r1 - ldr r1, _08146058 @ =gUnknown_8467068 - adds r0, r1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - adds r3, r4 - adds r3, 0x2A - str r3, [sp, 0x8] - ldr r0, [sp, 0x10] - movs r1, 0x2 - ldr r3, [sp, 0x14] - bl box_print - ldr r1, [r7] - adds r1, r4 - adds r1, 0x2A - movs r0, 0x3 - mov r2, r10 - bl GetStringWidth - ldr r1, [r7] - adds r1, r5 - movs r2, 0xB7 - lsls r2, 2 - adds r1, r2 - ldrb r1, [r1] - adds r0, r1 - add r8, r0 -_08146022: - adds r1, r6, 0x1 - lsls r1, 24 - lsrs r0, r1, 24 - str r0, [sp, 0xC] - asrs r1, 24 - ldr r0, [r7] - ldr r2, _08146054 @ =0x00000175 - adds r0, r2 - ldrb r0, [r0] - cmp r1, r0 - blt _08145F6E -_08146038: - mov r1, r9 - lsrs r0, r1, 24 - movs r1, 0x3 - bl CopyWindowToVram - add sp, 0x18 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08146054: .4byte 0x00000175 -_08146058: .4byte gUnknown_8467068 -_0814605C: .4byte 0x00000306 - thumb_func_end sub_8145D18 - - thumb_func_start sub_8146060 -sub_8146060: @ 8146060 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - movs r7, 0 - ldr r4, _081461BC @ =gUnknown_203F3C8 - ldr r0, [r4] - movs r1, 0xBE - lsls r1, 1 - adds r0, r1 - movs r1, 0xFF - strb r1, [r0] - ldr r0, [r4] - movs r2, 0xA9 - lsls r2, 1 - adds r1, r0, r2 - ldrh r0, [r1] - cmp r0, 0 - beq _081460C8 - bl sub_8096FD4 - lsls r0, 16 - lsrs r0, 16 - ldr r1, _081461C0 @ =SpriteCallbackDummy - str r7, [sp] - str r7, [sp, 0x4] - movs r2, 0xDC - movs r3, 0x14 - bl sub_8096ECC - ldr r1, [r4] - movs r3, 0xBE - lsls r3, 1 - adds r1, r3 - strb r0, [r1] - ldr r2, _081461C4 @ =gSprites - ldr r0, [r4] - adds r0, r3 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - movs r2, 0x8 - orrs r1, r2 - strb r1, [r0, 0x5] -_081460C8: - ldr r1, [r4] - ldrb r0, [r1, 0x9] - cmp r0, 0 - beq _081461AC - ldrb r1, [r1, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _081461AC - ldr r0, _081461C8 @ =gUnknown_8467F58 - bl sub_800F034 - ldr r0, [r4] - movs r1, 0xB8 - lsls r1, 1 - adds r0, r1 - ldr r0, [r0] - ldrb r0, [r0, 0x1] - lsrs r0, 4 - lsls r0, 3 - ldr r1, _081461CC @ =gUnknown_8467F60 - adds r0, r1 - bl LoadSpritePalette - ldr r0, [r4] - ldrb r0, [r0, 0x9] - cmp r7, r0 - bcs _081461AC - adds r6, r4, 0 - ldr r2, _081461D0 @ =0x0000017d - mov r10, r2 - movs r3, 0 - mov r9, r3 - movs r0, 0xFF - mov r8, r0 -_0814610E: - ldr r1, [r6] - lsls r4, r7, 1 - add r1, r10 - adds r1, r4 - ldrb r0, [r1] - mov r2, r8 - orrs r0, r2 - strb r0, [r1] - ldr r1, [r6] - movs r3, 0xBF - lsls r3, 1 - adds r1, r3 - adds r1, r4 - ldrb r0, [r1] - orrs r0, r2 - strb r0, [r1] - lsls r1, r7, 5 - movs r0, 0xD8 - subs r5, r0, r1 - ldr r0, _081461D4 @ =gUnknown_8467FA0 - adds r1, r5, 0 - movs r2, 0x90 - movs r3, 0x8 - bl CreateSprite - ldr r1, [r6] - add r1, r10 - adds r1, r4 - strb r0, [r1] - ldr r0, [r6] - movs r1, 0xAA - lsls r1, 1 - adds r0, r1 - adds r1, r0, r4 - ldrh r0, [r1] - cmp r0, 0 - beq _0814619E - bl sub_8096FD4 - lsls r0, 16 - lsrs r0, 16 - mov r2, r9 - str r2, [sp] - str r2, [sp, 0x4] - ldr r1, _081461C0 @ =SpriteCallbackDummy - adds r2, r5, 0 - movs r3, 0x88 - bl sub_8096ECC - ldr r1, [r6] - movs r3, 0xBF - lsls r3, 1 - adds r1, r3 - adds r1, r4 - strb r0, [r1] - ldr r0, [r6] - adds r0, r3 - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _081461C4 @ =gSprites - adds r0, r1 - ldrb r2, [r0, 0x5] - movs r3, 0xD - negs r3, r3 - adds r1, r3, 0 - ands r2, r1 - movs r1, 0x8 - orrs r2, r1 - strb r2, [r0, 0x5] -_0814619E: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - ldr r0, [r6] - ldrb r0, [r0, 0x9] - cmp r7, r0 - bcc _0814610E -_081461AC: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081461BC: .4byte gUnknown_203F3C8 -_081461C0: .4byte SpriteCallbackDummy -_081461C4: .4byte gSprites -_081461C8: .4byte gUnknown_8467F58 -_081461CC: .4byte gUnknown_8467F60 -_081461D0: .4byte 0x0000017d -_081461D4: .4byte gUnknown_8467FA0 - thumb_func_end sub_8146060 - - thumb_func_start sub_81461D8 -sub_81461D8: @ 81461D8 - push {r4-r7,lr} - movs r6, 0 - ldr r4, _0814627C @ =gUnknown_203F3C8 - ldr r0, [r4] - movs r2, 0xBE - lsls r2, 1 - adds r1, r0, r2 - ldrb r0, [r1] - cmp r0, 0xFF - beq _081461FC - adds r1, r0, 0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08146280 @ =gSprites - adds r0, r1 - bl sub_8097070 -_081461FC: - ldr r0, [r4] - ldrb r2, [r0, 0x9] - cmp r2, 0 - beq _08146274 - ldrb r1, [r0, 0x8] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _08146274 - cmp r6, r2 - bcs _08146264 - adds r7, r4, 0 -_08146214: - ldr r0, [r7] - lsls r4, r6, 1 - ldr r1, _08146284 @ =0x0000017d - adds r0, r1 - adds r1, r0, r4 - ldrb r0, [r1] - cmp r0, 0xFF - beq _08146256 - adds r1, r0, 0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r5, _08146280 @ =gSprites - adds r0, r5 - bl DestroySprite - ldr r1, [r7] - ldr r2, _08146284 @ =0x0000017d - adds r0, r1, r2 - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0xFF - beq _08146256 - adds r2, 0x1 - adds r0, r1, r2 - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - bl sub_8097070 -_08146256: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - ldr r0, [r7] - ldrb r0, [r0, 0x9] - cmp r6, r0 - bcc _08146214 -_08146264: - movs r4, 0x80 - lsls r4, 8 - adds r0, r4, 0 - bl FreeSpriteTilesByTag - adds r0, r4, 0 - bl FreeSpritePaletteByTag -_08146274: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0814627C: .4byte gUnknown_203F3C8 -_08146280: .4byte gSprites -_08146284: .4byte 0x0000017d - thumb_func_end sub_81461D8 - - thumb_func_start sub_8146288 -sub_8146288: @ 8146288 - push {r4-r6,lr} - adds r4, r0, 0 - cmp r4, 0 - beq _0814629E - ldr r5, _081462A4 @ =gUnknown_203F3CC - ldr r0, _081462A8 @ =0x000013a4 - bl AllocZeroed - str r0, [r5] - cmp r0, 0 - bne _081462AC -_0814629E: - movs r0, 0 - b _081462DC - .align 2, 0 -_081462A4: .4byte gUnknown_203F3CC -_081462A8: .4byte 0x000013a4 -_081462AC: - movs r6, 0xDE - lsls r6, 1 - adds r1, r4, 0 - adds r2, r6, 0 - bl memcpy - ldr r1, [r5] - ldrb r0, [r1, 0x3] - cmp r0, 0x7 - bls _081462C4 - movs r0, 0 - strb r0, [r1, 0x3] -_081462C4: - ldr r2, [r5] - adds r3, r2, r6 - ldrb r0, [r2, 0x3] - lsls r0, 4 - ldr r1, _081462E4 @ =gUnknown_8468720 - adds r0, r1 - str r0, [r3] - ldr r0, _081462E8 @ =0x000001c1 - adds r1, r2, r0 - movs r0, 0xFF - strb r0, [r1] - movs r0, 0x1 -_081462DC: - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_081462E4: .4byte gUnknown_8468720 -_081462E8: .4byte 0x000001c1 - thumb_func_end sub_8146288 - - thumb_func_start sub_81462EC -sub_81462EC: @ 81462EC - push {r4,lr} - ldr r4, _08146310 @ =gUnknown_203F3CC - ldr r0, [r4] - cmp r0, 0 - beq _08146308 - ldr r2, _08146314 @ =0x000013a4 - movs r1, 0 - bl memset - ldr r0, [r4] - bl Free - movs r0, 0 - str r0, [r4] -_08146308: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08146310: .4byte gUnknown_203F3CC -_08146314: .4byte 0x000013a4 - thumb_func_end sub_81462EC - - thumb_func_start sub_8146318 -sub_8146318: @ 8146318 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x24 - ldr r5, _08146334 @ =gUnknown_203F3CC - ldr r0, [r5] - cmp r0, 0 - bne _08146338 - movs r0, 0x1 - negs r0, r0 - b _081465EE - .align 2, 0 -_08146334: .4byte gUnknown_203F3CC -_08146338: - movs r4, 0xE0 - lsls r4, 1 - adds r0, r4 - ldrb r0, [r0] - lsrs r0, 1 - cmp r0, 0x6 - bls _08146348 - b _081465B8 -_08146348: - lsls r0, 2 - ldr r1, _08146354 @ =_08146358 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08146354: .4byte _08146358 - .align 2, 0 -_08146358: - .4byte _08146374 - .4byte _08146386 - .4byte _081463EC - .4byte _08146494 - .4byte _08146544 - .4byte _0814654A - .4byte _0814655C -_08146374: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - b _081465D2 -_08146386: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - beq _08146392 - b _081465EC -_08146392: - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x40 - movs r1, 0xF0 - bl SetGpuReg - ldr r1, _081463E8 @ =0x00001a98 - movs r0, 0x44 - bl SetGpuReg - movs r0, 0x48 - movs r1, 0x1F - bl SetGpuReg - movs r0, 0x4A - movs r1, 0x1B - bl SetGpuReg - movs r1, 0x80 - lsls r1, 6 - movs r0, 0 - bl SetGpuRegBits - b _081465D2 - .align 2, 0 -_081463E8: .4byte 0x00001a98 -_081463EC: - movs r5, 0x1E - str r5, [sp] - movs r4, 0x14 - str r4, [sp, 0x4] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r5, [sp] - str r4, [sp, 0x4] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r5, [sp] - str r4, [sp, 0x4] - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r5, [sp] - str r4, [sp, 0x4] - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - movs r0, 0x3 - bl CopyBgTilemapBufferToVram - ldr r5, _0814648C @ =gUnknown_203F3CC - ldr r0, [r5] - movs r1, 0xDE - lsls r1, 1 - adds r0, r1 - ldr r0, [r0] - ldr r1, [r0, 0x4] - movs r0, 0 - str r0, [sp] - movs r0, 0x3 - movs r2, 0 - movs r3, 0x8 - bl decompress_and_copy_tile_data_to_vram - ldr r4, _08146490 @ =gUnknown_8468040 - adds r0, r4, 0 - bl AddWindow - ldr r1, [r5] - movs r2, 0xE4 - lsls r2, 1 - adds r1, r2 - strh r0, [r1] - adds r4, 0x8 - adds r0, r4, 0 - bl AddWindow - ldr r1, [r5] - movs r3, 0xE5 - lsls r3, 1 - adds r1, r3 - strh r0, [r1] - b _081465D2 - .align 2, 0 -_0814648C: .4byte gUnknown_203F3CC -_08146490: .4byte gUnknown_8468040 -_08146494: - bl free_temp_tile_data_buffers_if_possible - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0 - beq _081464A2 - b _081465EC -_081464A2: - ldr r2, _0814653C @ =gUnknown_2037AB8 - ldrb r0, [r2, 0x8] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2, 0x8] - ldr r0, _08146540 @ =gUnknown_203F3CC - mov r8, r0 - ldr r0, [r0] - movs r4, 0xDE - lsls r4, 1 - adds r0, r4 - ldr r0, [r0] - ldr r0, [r0, 0xC] - movs r1, 0x10 - movs r2, 0x20 - bl LoadPalette - mov r2, r8 - ldr r1, [r2] - adds r4, r1, r4 - ldr r0, [r4] - ldr r0, [r0, 0x8] - movs r6, 0xE9 - lsls r6, 2 - adds r1, r6 - bl LZ77UnCompWram - mov r3, r8 - ldr r1, [r3] - adds r1, r6 - movs r4, 0x1E - str r4, [sp] - movs r5, 0x3 - str r5, [sp, 0x4] - str r7, [sp, 0x8] - str r7, [sp, 0xC] - str r4, [sp, 0x10] - str r5, [sp, 0x14] - movs r0, 0x1 - mov r10, r0 - str r0, [sp, 0x18] - movs r2, 0x8 - mov r9, r2 - str r2, [sp, 0x1C] - str r7, [sp, 0x20] - movs r2, 0 - movs r3, 0 - bl CopyRectToBgTilemapBufferRect - mov r3, r8 - ldr r1, [r3] - adds r1, r6 - str r4, [sp] - movs r0, 0x17 - str r0, [sp, 0x4] - str r7, [sp, 0x8] - str r5, [sp, 0xC] - str r4, [sp, 0x10] - str r0, [sp, 0x14] - mov r0, r10 - str r0, [sp, 0x18] - mov r2, r9 - str r2, [sp, 0x1C] - str r7, [sp, 0x20] - movs r0, 0x3 - movs r2, 0 - movs r3, 0x3 - bl CopyRectToBgTilemapBufferRect - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - movs r0, 0x3 - bl CopyBgTilemapBufferToVram - b _081465D2 - .align 2, 0 -_0814653C: .4byte gUnknown_2037AB8 -_08146540: .4byte gUnknown_203F3CC -_08146544: - bl sub_8146980 - b _081465D2 -_0814654A: - bl sub_8146A30 - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - b _081465D2 -_0814655C: - movs r0, 0x1 - bl ShowBg - movs r0, 0x2 - bl ShowBg - movs r0, 0x3 - bl ShowBg - ldr r2, _081465AC @ =gUnknown_2037AB8 - ldrb r1, [r2, 0x8] - movs r0, 0x7F - ands r0, r1 - strb r0, [r2, 0x8] - ldr r4, _081465B0 @ =gUnknown_203F3CC - ldr r1, [r4] - movs r3, 0xE5 - lsls r3, 2 - adds r0, r1, r3 - movs r2, 0xE3 - lsls r2, 1 - adds r1, r2 - bl AddScrollIndicatorArrowPair - ldr r1, [r4] - ldr r3, _081465B4 @ =0x000001c1 - adds r2, r1, r3 - movs r1, 0 - strb r0, [r2] - movs r0, 0x1 - negs r0, r0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - bl UpdatePaletteFade - b _081465D2 - .align 2, 0 -_081465AC: .4byte gUnknown_2037AB8 -_081465B0: .4byte gUnknown_203F3CC -_081465B4: .4byte 0x000001c1 -_081465B8: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - bne _081465EC - ldr r0, [r5] - adds r0, r4 - ldrb r2, [r0] - movs r1, 0x1 - ands r1, r2 - strb r1, [r0] - movs r0, 0x1 - b _081465EE -_081465D2: - ldr r0, _08146600 @ =gUnknown_203F3CC - ldr r2, [r0] - movs r0, 0xE0 - lsls r0, 1 - adds r2, r0 - ldrb r3, [r2] - lsrs r1, r3, 1 - adds r1, 0x1 - lsls r1, 1 - movs r0, 0x1 - ands r0, r3 - orrs r0, r1 - strb r0, [r2] -_081465EC: - movs r0, 0 -_081465EE: - add sp, 0x24 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08146600: .4byte gUnknown_203F3CC - thumb_func_end sub_8146318 - - thumb_func_start sub_8146604 -sub_8146604: @ 8146604 - push {r4,r5,lr} - sub sp, 0x8 - adds r2, r0, 0 - ldr r5, _08146618 @ =gUnknown_203F3CC - ldr r0, [r5] - cmp r0, 0 - bne _0814661C - movs r0, 0x1 - negs r0, r0 - b _081467E0 - .align 2, 0 -_08146618: .4byte gUnknown_203F3CC -_0814661C: - movs r4, 0xE0 - lsls r4, 1 - adds r0, r4 - ldrb r0, [r0] - lsrs r0, 1 - cmp r0, 0x6 - bls _0814662C - b _081467AA -_0814662C: - lsls r0, 2 - ldr r1, _08146638 @ =_0814663C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08146638: .4byte _0814663C - .align 2, 0 -_0814663C: - .4byte _08146658 - .4byte _0814666A - .4byte _081466AC - .4byte _0814670C - .4byte _0814673C - .4byte _08146778 - .4byte _08146788 -_08146658: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - b _081467C4 -_0814666A: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - beq _08146676 - b _081467DE -_08146676: - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x40 - movs r1, 0 - bl SetGpuReg - movs r0, 0x44 - movs r1, 0 - bl SetGpuReg - movs r0, 0x48 - movs r1, 0 - bl SetGpuReg - movs r0, 0x4A - movs r1, 0 - bl SetGpuReg - movs r1, 0x80 - lsls r1, 6 - movs r0, 0 - bl ClearGpuRegBits - b _081467C4 -_081466AC: - movs r4, 0x1E - str r4, [sp] - movs r5, 0x14 - str r5, [sp, 0x4] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r4, [sp] - str r5, [sp, 0x4] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r4, [sp] - movs r5, 0x18 - str r5, [sp, 0x4] - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r4, [sp] - str r5, [sp, 0x4] - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - movs r0, 0x3 - bl CopyBgTilemapBufferToVram - b _081467C4 -_0814670C: - movs r0, 0x1 - bl HideBg - movs r0, 0x2 - bl HideBg - ldr r4, _08146738 @ =gUnknown_203F3CC - ldr r0, [r4] - movs r1, 0xE5 - lsls r1, 1 - adds r0, r1 - ldrb r0, [r0] - bl RemoveWindow - ldr r0, [r4] - movs r2, 0xE4 - lsls r2, 1 - adds r0, r2 - ldrb r0, [r0] - bl RemoveWindow - b _081467C4 - .align 2, 0 -_08146738: .4byte gUnknown_203F3CC -_0814673C: - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - ldr r4, _08146770 @ =gUnknown_203F3CC - ldr r0, [r4] - ldr r2, _08146774 @ =0x000001c1 - adds r1, r0, r2 - ldrb r0, [r1] - cmp r0, 0xFF - beq _081467C4 - bl RemoveScrollIndicatorArrowPair - ldr r0, [r4] - ldr r2, _08146774 @ =0x000001c1 - adds r1, r0, r2 - movs r0, 0xFF - strb r0, [r1] - b _081467C4 - .align 2, 0 -_08146770: .4byte gUnknown_203F3CC -_08146774: .4byte 0x000001c1 -_08146778: - ldr r0, _08146784 @ =gUnknown_203F3B8 - ldrb r0, [r0] - adds r1, r2, 0 - bl sub_8142344 - b _081467C4 - .align 2, 0 -_08146784: .4byte gUnknown_203F3B8 -_08146788: - bl sub_8142420 - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x3 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - b _081467C4 -_081467AA: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - bne _081467DE - ldr r0, [r5] - adds r0, r4 - ldrb r2, [r0] - movs r1, 0x1 - ands r1, r2 - strb r1, [r0] - movs r0, 0x1 - b _081467E0 -_081467C4: - ldr r0, _081467E8 @ =gUnknown_203F3CC - ldr r2, [r0] - movs r0, 0xE0 - lsls r0, 1 - adds r2, r0 - ldrb r3, [r2] - lsrs r1, r3, 1 - adds r1, 0x1 - lsls r1, 1 - movs r0, 0x1 - ands r0, r3 - orrs r0, r1 - strb r0, [r2] -_081467DE: - movs r0, 0 -_081467E0: - add sp, 0x8 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081467E8: .4byte gUnknown_203F3CC - thumb_func_end sub_8146604 - - thumb_func_start sub_81467EC -sub_81467EC: @ 81467EC - push {r4,r5,lr} - ldr r4, _0814682C @ =gUnknown_203F3CC - ldr r2, [r4] - movs r5, 0xE0 - lsls r5, 1 - adds r0, r2, r5 - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _08146826 - ldr r0, _08146830 @ =0x000001c1 - adds r1, r2, r0 - ldrb r0, [r1] - cmp r0, 0xFF - beq _08146826 - bl RemoveScrollIndicatorArrowPair - ldr r0, [r4] - ldr r2, _08146830 @ =0x000001c1 - adds r1, r0, r2 - movs r0, 0xFF - strb r0, [r1] - ldr r1, [r4] - adds r1, r5 - ldrb r0, [r1] - movs r2, 0x1 - orrs r0, r2 - strb r0, [r1] -_08146826: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0814682C: .4byte gUnknown_203F3CC -_08146830: .4byte 0x000001c1 - thumb_func_end sub_81467EC - - thumb_func_start sub_8146834 -sub_8146834: @ 8146834 - push {r4,lr} - ldr r4, _0814687C @ =gUnknown_203F3CC - ldr r2, [r4] - movs r1, 0xE0 - lsls r1, 1 - adds r0, r2, r1 - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08146874 - movs r3, 0xE5 - lsls r3, 2 - adds r0, r2, r3 - movs r3, 0xE3 - lsls r3, 1 - adds r1, r2, r3 - bl AddScrollIndicatorArrowPair - ldr r1, [r4] - ldr r2, _08146880 @ =0x000001c1 - adds r1, r2 - strb r0, [r1] - ldr r1, [r4] - movs r3, 0xE0 - lsls r3, 1 - adds r1, r3 - ldrb r2, [r1] - movs r0, 0x2 - negs r0, r0 - ands r0, r2 - strb r0, [r1] -_08146874: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0814687C: .4byte gUnknown_203F3CC -_08146880: .4byte 0x000001c1 - thumb_func_end sub_8146834 - - thumb_func_start sub_8146884 -sub_8146884: @ 8146884 - push {r4-r6,lr} - lsls r0, 16 - lsrs r4, r0, 16 - adds r3, r4, 0 - ldr r2, _081468B0 @ =gUnknown_203F3CC - ldr r0, [r2] - mov r12, r0 - movs r0, 0xE1 - lsls r0, 1 - add r0, r12 - ldrb r1, [r0] - movs r5, 0x1 - adds r0, r5, 0 - ands r0, r1 - adds r6, r2, 0 - cmp r0, 0 - beq _081468B4 - bl sub_8146B58 -_081468AA: - movs r0, 0xFF - b _0814697A - .align 2, 0 -_081468B0: .4byte gUnknown_203F3CC -_081468B4: - cmp r4, 0x2 - beq _081468D0 - cmp r4, 0x2 - bgt _081468C2 - cmp r4, 0x1 - beq _081468CC - b _081468AA -_081468C2: - cmp r3, 0x40 - beq _081468D4 - cmp r3, 0x80 - beq _08146904 - b _081468AA -_081468CC: - movs r0, 0 - b _0814697A -_081468D0: - movs r0, 0x1 - b _0814697A -_081468D4: - movs r0, 0xE3 - lsls r0, 1 - add r0, r12 - ldrh r0, [r0] - cmp r0, 0 - beq _081468AA - movs r0, 0xE0 - lsls r0, 1 - add r0, r12 - ldrb r1, [r0] - adds r0, r5, 0 - ands r0, r1 - cmp r0, 0 - bne _081468AA - ldr r2, _08146900 @ =0x000001c3 - add r2, r12 - ldrb r1, [r2] - movs r0, 0x2 - negs r0, r0 - ands r0, r1 - b _08146932 - .align 2, 0 -_08146900: .4byte 0x000001c3 -_08146904: - movs r0, 0xE3 - lsls r0, 1 - add r0, r12 - movs r1, 0xE2 - lsls r1, 1 - add r1, r12 - ldrh r0, [r0] - ldrh r1, [r1] - cmp r0, r1 - beq _081468AA - movs r0, 0xE0 - lsls r0, 1 - add r0, r12 - ldrb r1, [r0] - adds r0, r5, 0 - ands r0, r1 - cmp r0, 0 - bne _081468AA - ldr r2, _08146974 @ =0x000001c3 - add r2, r12 - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 -_08146932: - strb r0, [r2] - ldr r2, [r6] - movs r4, 0xE1 - lsls r4, 1 - adds r2, r4 - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2] - ldr r3, [r6] - adds r3, r4 - ldrb r1, [r3] - movs r2, 0x1 - adds r0, r2, 0 - ands r0, r1 - movs r1, 0x4 - orrs r0, r1 - strb r0, [r3] - ldr r1, [r6] - adds r4, 0x1 - adds r1, r4 - ldrb r3, [r1] - adds r0, r2, 0 - ands r0, r3 - strb r0, [r1] - ldr r0, [r6] - adds r0, r4 - ldrb r0, [r0] - ands r2, r0 - cmp r2, 0 - beq _08146978 - movs r0, 0x3 - b _0814697A - .align 2, 0 -_08146974: .4byte 0x000001c3 -_08146978: - movs r0, 0x2 -_0814697A: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8146884 - - thumb_func_start sub_8146980 -sub_8146980: @ 8146980 - push {r4-r6,lr} - movs r5, 0 - ldr r4, _08146A20 @ =gUnknown_203F3CC - ldr r1, [r4] - movs r2, 0xE7 - lsls r2, 1 - adds r0, r1, r2 - adds r1, 0x4 - movs r2, 0x28 - bl memcpy - ldr r0, [r4] - movs r3, 0xFB - lsls r3, 1 - adds r1, r0, r3 - movs r0, 0xFF - strb r0, [r1] - adds r6, r4, 0 -_081469A4: - ldr r2, [r6] - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r4, r1, r5 - adds r0, r4, r2 - ldr r3, _08146A24 @ =0x000001f7 - adds r0, r3 - adds r1, r2 - adds r1, 0x2C - movs r2, 0x28 - bl memcpy - ldr r0, [r6] - ldr r1, _08146A28 @ =0x0000021f - adds r0, r1 - adds r0, r4 - movs r1, 0xFF - strb r1, [r0] - cmp r5, 0x7 - bls _081469E8 - ldr r1, [r6] - ldr r2, _08146A24 @ =0x000001f7 - adds r0, r1, r2 - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0xFF - beq _081469E8 - movs r3, 0xE2 - lsls r3, 1 - adds r1, r3 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_081469E8: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x9 - bls _081469A4 - ldr r2, _08146A20 @ =gUnknown_203F3CC - ldr r1, [r2] - movs r4, 0xE5 - lsls r4, 2 - adds r1, r4 - ldr r0, _08146A2C @ =gUnknown_8468050 - ldm r0!, {r3-r5} - stm r1!, {r3-r5} - ldr r0, [r0] - str r0, [r1] - ldr r2, [r2] - movs r5, 0xE2 - lsls r5, 1 - adds r0, r2, r5 - ldrh r1, [r0] - movs r3, 0xE7 - lsls r3, 2 - adds r0, r2, r3 - strh r1, [r0] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08146A20: .4byte gUnknown_203F3CC -_08146A24: .4byte 0x000001f7 -_08146A28: .4byte 0x0000021f -_08146A2C: .4byte gUnknown_8468050 - thumb_func_end sub_8146980 - - thumb_func_start sub_8146A30 -sub_8146A30: @ 8146A30 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0xC - movs r5, 0 - ldr r6, _08146B4C @ =gUnknown_203F3CC - ldr r0, [r6] - movs r7, 0xE4 - lsls r7, 1 - adds r0, r7 - ldrb r0, [r0] - bl PutWindowTilemap - ldr r0, [r6] - movs r4, 0xE5 - lsls r4, 1 - adds r0, r4 - ldrb r0, [r0] - bl PutWindowTilemap - ldr r0, [r6] - adds r0, r7 - ldrb r0, [r0] - movs r1, 0 - bl FillWindowPixelBuffer - ldr r0, [r6] - adds r0, r4 - ldrb r0, [r0] - movs r1, 0 - bl FillWindowPixelBuffer - ldr r4, [r6] - movs r0, 0xE7 - lsls r0, 1 - mov r8, r0 - add r4, r8 - movs r0, 0x3 - movs r1, 0x2 - bl GetFontAttribute - adds r2, r0, 0 - lsls r2, 24 - lsrs r2, 24 - movs r0, 0x3 - adds r1, r4, 0 - bl GetStringWidth - movs r1, 0xE0 - subs r1, r0 - lsrs r0, r1, 31 - adds r1, r0 - asrs r1, 1 - cmp r1, 0 - bge _08146AA0 - movs r1, 0 -_08146AA0: - ldr r4, [r6] - adds r0, r4, r7 - ldrb r0, [r0] - lsls r2, r1, 24 - lsrs r2, 24 - movs r3, 0xDE - lsls r3, 1 - adds r1, r4, r3 - ldr r1, [r1] - ldrb r1, [r1] - lsls r1, 28 - lsrs r1, 28 - lsls r3, r1, 1 - adds r3, r1 - ldr r1, _08146B50 @ =gUnknown_8468038 - adds r3, r1 - str r3, [sp] - str r5, [sp, 0x4] - add r4, r8 - str r4, [sp, 0x8] - movs r1, 0x3 - movs r3, 0x6 - bl box_print -_08146AD0: - ldr r6, _08146B4C @ =gUnknown_203F3CC - ldr r4, [r6] - movs r1, 0xE5 - lsls r1, 1 - adds r0, r4, r1 - ldrb r0, [r0] - lsls r3, r5, 4 - adds r3, 0x2 - lsls r3, 24 - lsrs r3, 24 - movs r2, 0xDE - lsls r2, 1 - adds r1, r4, r2 - ldr r1, [r1] - ldrb r1, [r1] - lsrs r1, 4 - lsls r2, r1, 1 - adds r2, r1 - ldr r1, _08146B50 @ =gUnknown_8468038 - adds r2, r1 - str r2, [sp] - movs r1, 0 - str r1, [sp, 0x4] - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r5 - ldr r2, _08146B54 @ =0x000001f7 - adds r1, r2 - adds r4, r1 - str r4, [sp, 0x8] - movs r1, 0x3 - movs r2, 0 - bl box_print - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x9 - bls _08146AD0 - ldr r0, [r6] - movs r3, 0xE4 - lsls r3, 1 - adds r0, r3 - ldrb r0, [r0] - movs r1, 0x3 - bl CopyWindowToVram - ldr r0, [r6] - movs r1, 0xE5 - lsls r1, 1 - adds r0, r1 - ldrb r0, [r0] - movs r1, 0x3 - bl CopyWindowToVram - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08146B4C: .4byte gUnknown_203F3CC -_08146B50: .4byte gUnknown_8468038 -_08146B54: .4byte 0x000001f7 - thumb_func_end sub_8146A30 - - thumb_func_start sub_8146B58 -sub_8146B58: @ 8146B58 - push {r4-r6,lr} - ldr r0, _08146B90 @ =gUnknown_203F3CC - ldr r1, [r0] - movs r2, 0xE1 - lsls r2, 1 - adds r0, r1, r2 - ldrb r0, [r0] - lsrs r4, r0, 1 - lsls r4, 8 - ldr r6, _08146B94 @ =0x000001c3 - adds r0, r1, r6 - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08146B98 - movs r0, 0x2 - adds r1, r4, 0 - movs r2, 0x1 - bl ChangeBgY - movs r0, 0x3 - adds r1, r4, 0 - movs r2, 0x1 - bl ChangeBgY - b _08146BAC - .align 2, 0 -_08146B90: .4byte gUnknown_203F3CC -_08146B94: .4byte 0x000001c3 -_08146B98: - movs r0, 0x2 - adds r1, r4, 0 - movs r2, 0x2 - bl ChangeBgY - movs r0, 0x3 - adds r1, r4, 0 - movs r2, 0x2 - bl ChangeBgY -_08146BAC: - ldr r3, _08146BF0 @ =gUnknown_203F3CC - ldr r0, [r3] - ldr r2, _08146BF4 @ =0x000001c3 - adds r5, r0, r2 - ldrb r4, [r5] - lsrs r1, r4, 1 - movs r6, 0xE1 - lsls r6, 1 - adds r0, r6 - ldrb r0, [r0] - lsrs r0, 1 - adds r1, r0 - lsls r1, 1 - movs r6, 0x1 - adds r0, r6, 0 - ands r0, r4 - orrs r0, r1 - strb r0, [r5] - ldr r1, [r3] - adds r2, r1, r2 - ldrb r2, [r2] - lsrs r0, r2, 1 - cmp r0, 0xF - bls _08146C24 - adds r0, r6, 0 - ands r0, r2 - cmp r0, 0 - beq _08146BF8 - movs r0, 0xE3 - lsls r0, 1 - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - b _08146C02 - .align 2, 0 -_08146BF0: .4byte gUnknown_203F3CC -_08146BF4: .4byte 0x000001c3 -_08146BF8: - movs r2, 0xE3 - lsls r2, 1 - adds r1, r2 - ldrh r0, [r1] - subs r0, 0x1 -_08146C02: - strh r0, [r1] - ldr r0, [r3] - movs r6, 0xE1 - lsls r6, 1 - adds r2, r0, r6 - ldrb r1, [r2] - movs r0, 0x2 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - ldr r0, [r3] - ldr r1, _08146C2C @ =0x000001c3 - adds r2, r0, r1 - ldrb r1, [r2] - movs r0, 0x1 - ands r0, r1 - strb r0, [r2] -_08146C24: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08146C2C: .4byte 0x000001c3 - thumb_func_end sub_8146B58 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/mevent_server.s b/asm/mevent_server.s deleted file mode 100644 index 5772b19f4..000000000 --- a/asm/mevent_server.s +++ /dev/null @@ -1,1841 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8144844 -sub_8144844: @ 8144844 - push {lr} - ldr r1, [r0, 0x20] - bl _call_via_r1 - pop {r1} - bx r1 - thumb_func_end sub_8144844 - - thumb_func_start sub_8144850 -sub_8144850: @ 8144850 - push {lr} - ldr r1, [r0, 0x24] - bl _call_via_r1 - pop {r1} - bx r1 - thumb_func_end sub_8144850 - - thumb_func_start sub_814485C -sub_814485C: @ 814485C - movs r3, 0 - strb r1, [r0, 0x4] - strb r2, [r0, 0x5] - str r3, [r0] - strh r3, [r0, 0x12] - strh r3, [r0, 0x14] - strh r3, [r0, 0x10] - strh r3, [r0, 0xA] - strh r3, [r0, 0xC] - strh r3, [r0, 0x8] - str r3, [r0, 0x1C] - str r3, [r0, 0x18] - ldr r1, _08144880 @ =sub_81449E0 - str r1, [r0, 0x24] - ldr r1, _08144884 @ =sub_814490C - str r1, [r0, 0x20] - bx lr - .align 2, 0 -_08144880: .4byte sub_81449E0 -_08144884: .4byte sub_814490C - thumb_func_end sub_814485C - - thumb_func_start sub_8144888 -sub_8144888: @ 8144888 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0 - str r0, [r4] - strh r1, [r4, 0xE] - strh r0, [r4, 0x10] - strh r0, [r4, 0x12] - cmp r3, 0 - beq _0814489E - strh r3, [r4, 0x14] - b _081448A4 -_0814489E: - movs r0, 0x80 - lsls r0, 3 - strh r0, [r4, 0x14] -_081448A4: - str r2, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8144888 - - thumb_func_start sub_81448AC -sub_81448AC: @ 81448AC - movs r3, 0 - str r3, [r0] - strh r1, [r0, 0x6] - strh r3, [r0, 0x8] - strh r3, [r0, 0xA] - strh r3, [r0, 0xC] - str r2, [r0, 0x18] - bx lr - thumb_func_end sub_81448AC - - thumb_func_start sub_81448BC -sub_81448BC: @ 81448BC - push {lr} - adds r3, r0, 0 - adds r0, r1, 0 - lsls r3, 8 - ldr r1, _081448D4 @ =gUnknown_2022118 - adds r3, r1 - adds r1, r3, 0 - bl memcpy - pop {r0} - bx r0 - .align 2, 0 -_081448D4: .4byte gUnknown_2022118 - thumb_func_end sub_81448BC - - thumb_func_start sub_81448D8 -sub_81448D8: @ 81448D8 - push {r4,lr} - adds r4, r0, 0 - bl GetBlockReceivedStatus - lsls r0, 24 - lsrs r0, 24 - asrs r0, r4 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _081448F2 - movs r0, 0 - b _081448F4 -_081448F2: - movs r0, 0x1 -_081448F4: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81448D8 - - thumb_func_start sub_81448FC -sub_81448FC: @ 81448FC - push {lr} - lsls r0, 24 - lsrs r0, 24 - bl ResetBlockReceivedFlag - pop {r0} - bx r0 - thumb_func_end sub_81448FC - - thumb_func_start sub_814490C -sub_814490C: @ 814490C - push {r4-r6,lr} - sub sp, 0x8 - adds r5, r0, 0 - ldr r6, [r5] - cmp r6, 0x1 - beq _08144970 - cmp r6, 0x1 - bgt _08144922 - cmp r6, 0 - beq _08144928 - b _081449D6 -_08144922: - cmp r6, 0x2 - beq _081449BC - b _081449D6 -_08144928: - ldrb r0, [r5, 0x5] - bl sub_81448D8 - cmp r0, 0 - beq _081449D6 - ldrb r0, [r5, 0x5] - mov r4, sp - mov r1, sp - movs r2, 0x8 - bl sub_81448BC - ldrh r1, [r4, 0x4] - strh r1, [r5, 0xC] - ldrh r0, [r4, 0x2] - strh r0, [r5, 0xA] - lsls r1, 16 - movs r0, 0x80 - lsls r0, 19 - cmp r1, r0 - bls _08144956 -_08144950: - bl sub_80FA190 - b _081449D6 -_08144956: - mov r1, sp - ldrh r0, [r5, 0x6] - ldrh r1, [r1] - cmp r0, r1 - bne _08144950 - strh r6, [r5, 0x8] - ldrb r0, [r5, 0x5] - bl sub_81448FC - ldr r0, [r5] - adds r0, 0x1 - str r0, [r5] - b _081449D6 -_08144970: - ldrb r0, [r5, 0x5] - bl sub_81448D8 - cmp r0, 0 - beq _081449D6 - ldrh r0, [r5, 0x8] - lsls r1, r0, 6 - subs r1, r0 - lsls r3, r1, 2 - ldrh r0, [r5, 0xC] - subs r2, r0, r3 - cmp r2, 0xFC - bhi _081449A2 - ldrb r0, [r5, 0x5] - ldr r1, [r5, 0x18] - adds r1, r3 - bl sub_81448BC - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - ldr r0, [r5] - adds r0, 0x1 - str r0, [r5] - b _081449B4 -_081449A2: - ldrb r0, [r5, 0x5] - ldr r1, [r5, 0x18] - adds r1, r3 - movs r2, 0xFC - bl sub_81448BC - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] -_081449B4: - ldrb r0, [r5, 0x5] - bl sub_81448FC - b _081449D6 -_081449BC: - ldr r0, [r5, 0x18] - ldrh r1, [r5, 0xC] - bl CalcCRC16WithTable - lsls r0, 16 - lsrs r0, 16 - ldrh r1, [r5, 0xA] - cmp r0, r1 - bne _08144950 - movs r0, 0 - str r0, [r5] - movs r0, 0x1 - b _081449D8 -_081449D6: - movs r0, 0 -_081449D8: - add sp, 0x8 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_814490C - - thumb_func_start sub_81449E0 -sub_81449E0: @ 81449E0 - push {r4,r5,lr} - sub sp, 0x8 - adds r4, r0, 0 - ldr r5, [r4] - cmp r5, 0x1 - beq _08144A4C - cmp r5, 0x1 - bgt _081449F6 - cmp r5, 0 - beq _08144A00 - b _08144AE2 -_081449F6: - cmp r5, 0x2 - beq _08144AA0 - cmp r5, 0x3 - beq _08144ACA - b _08144AE2 -_08144A00: - bl sub_800A4BC - lsls r0, 24 - cmp r0, 0 - beq _08144AE2 - ldrh r1, [r4, 0xE] - ldr r2, _08144A44 @ =0xffff0000 - ldr r0, [sp] - ands r0, r2 - orrs r0, r1 - str r0, [sp] - ldrh r1, [r4, 0x14] - ldr r0, [sp, 0x4] - ands r0, r2 - orrs r0, r1 - str r0, [sp, 0x4] - ldr r0, [r4, 0x1C] - bl CalcCRC16WithTable - lsls r0, 16 - ldr r2, _08144A48 @ =0x0000ffff - ldr r1, [sp] - ands r1, r2 - orrs r1, r0 - str r1, [sp] - lsrs r1, 16 - strh r1, [r4, 0x12] - strh r5, [r4, 0x10] - movs r0, 0 - mov r1, sp - movs r2, 0x8 - bl SendBlock - b _08144AC2 - .align 2, 0 -_08144A44: .4byte 0xffff0000 -_08144A48: .4byte 0x0000ffff -_08144A4C: - bl sub_800A4BC - lsls r0, 24 - cmp r0, 0 - beq _08144AE2 - ldrb r0, [r4, 0x4] - bl sub_81448D8 - cmp r0, 0 - beq _08144AE2 - ldrb r0, [r4, 0x4] - bl sub_81448FC - ldrh r1, [r4, 0x10] - lsls r0, r1, 6 - subs r0, r1 - lsls r3, r0, 2 - ldrh r0, [r4, 0x14] - subs r0, r3 - cmp r0, 0xFC - bhi _08144A8C - ldr r1, [r4, 0x1C] - adds r1, r3 - lsls r2, r0, 16 - lsrs r2, 16 - movs r0, 0 - bl SendBlock - ldrh r0, [r4, 0x10] - adds r0, 0x1 - strh r0, [r4, 0x10] - b _08144AC2 -_08144A8C: - ldr r1, [r4, 0x1C] - adds r1, r3 - movs r0, 0 - movs r2, 0xFC - bl SendBlock - ldrh r0, [r4, 0x10] - adds r0, 0x1 - strh r0, [r4, 0x10] - b _08144AE2 -_08144AA0: - bl sub_800A4BC - lsls r0, 24 - cmp r0, 0 - beq _08144AE2 - ldr r0, [r4, 0x1C] - ldrh r1, [r4, 0x14] - bl CalcCRC16WithTable - lsls r0, 16 - lsrs r0, 16 - ldrh r1, [r4, 0x12] - cmp r0, r1 - beq _08144AC2 - bl sub_80FA190 - b _08144AE2 -_08144AC2: - ldr r0, [r4] - adds r0, 0x1 - str r0, [r4] - b _08144AE2 -_08144ACA: - ldrb r0, [r4, 0x4] - bl sub_81448D8 - cmp r0, 0 - beq _08144AE2 - ldrb r0, [r4, 0x4] - bl sub_81448FC - movs r0, 0 - str r0, [r4] - movs r0, 0x1 - b _08144AE4 -_08144AE2: - movs r0, 0 -_08144AE4: - add sp, 0x8 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81449E0 - - thumb_func_start sub_8144AEC -sub_8144AEC: @ 8144AEC - push {r4,lr} - ldr r4, _08144B08 @ =gUnknown_203F3C0 - movs r0, 0x4C - bl AllocZeroed - str r0, [r4] - movs r1, 0x1 - movs r2, 0 - bl mevent_srv_ish_init - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08144B08: .4byte gUnknown_203F3C0 - thumb_func_end sub_8144AEC - - thumb_func_start sub_8144B0C -sub_8144B0C: @ 8144B0C - push {r4-r6,lr} - adds r6, r0, 0 - ldr r4, _08144B1C @ =gUnknown_203F3C0 - ldr r0, [r4] - cmp r0, 0 - bne _08144B20 - movs r0, 0x6 - b _08144B40 - .align 2, 0 -_08144B1C: .4byte gUnknown_203F3C0 -_08144B20: - bl mevent_srv_ish_exec - adds r5, r0, 0 - cmp r5, 0x6 - bne _08144B3E - ldr r0, [r4] - ldr r1, [r0, 0x4] - strh r1, [r6] - bl sub_8144BC0 - ldr r0, [r4] - bl Free - movs r0, 0 - str r0, [r4] -_08144B3E: - adds r0, r5, 0 -_08144B40: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8144B0C - - thumb_func_start sub_8144B48 -sub_8144B48: @ 8144B48 - ldr r0, _08144B54 @ =gUnknown_203F3C0 - ldr r1, [r0] - ldr r0, [r1, 0xC] - adds r0, 0x1 - str r0, [r1, 0xC] - bx lr - .align 2, 0 -_08144B54: .4byte gUnknown_203F3C0 - thumb_func_end sub_8144B48 - - thumb_func_start sub_8144B58 -sub_8144B58: @ 8144B58 - ldr r0, _08144B60 @ =gUnknown_203F3C0 - ldr r0, [r0] - ldr r0, [r0, 0x20] - bx lr - .align 2, 0 -_08144B60: .4byte gUnknown_203F3C0 - thumb_func_end sub_8144B58 - - thumb_func_start sub_8144B64 -sub_8144B64: @ 8144B64 - ldr r1, _08144B6C @ =gUnknown_203F3C0 - ldr r1, [r1] - str r0, [r1, 0x4] - bx lr - .align 2, 0 -_08144B6C: .4byte gUnknown_203F3C0 - thumb_func_end sub_8144B64 - - thumb_func_start mevent_srv_ish_init -mevent_srv_ish_init: @ 8144B70 - push {r4-r6,lr} - mov r6, r8 - push {r6} - adds r4, r0, 0 - adds r6, r1, 0 - mov r8, r2 - movs r0, 0 - str r0, [r4] - str r0, [r4, 0x8] - str r0, [r4, 0xC] - movs r5, 0x80 - lsls r5, 3 - adds r0, r5, 0 - bl AllocZeroed - str r0, [r4, 0x14] - adds r0, r5, 0 - bl AllocZeroed - str r0, [r4, 0x18] - adds r0, r5, 0 - bl AllocZeroed - str r0, [r4, 0x1C] - movs r0, 0x40 - bl AllocZeroed - str r0, [r4, 0x20] - adds r4, 0x24 - adds r0, r4, 0 - adds r1, r6, 0 - mov r2, r8 - bl sub_814485C - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end mevent_srv_ish_init - - thumb_func_start sub_8144BC0 -sub_8144BC0: @ 8144BC0 - push {r4,lr} - adds r4, r0, 0 - ldr r0, [r4, 0x14] - bl Free - ldr r0, [r4, 0x18] - bl Free - ldr r0, [r4, 0x1C] - bl Free - ldr r0, [r4, 0x20] - bl Free - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8144BC0 - - thumb_func_start sub_8144BE4 -sub_8144BE4: @ 8144BE4 - push {r4,lr} - adds r4, r0, 0 - ldr r0, [r4, 0x1C] - ldr r1, [r4, 0x18] - movs r2, 0x80 - lsls r2, 3 - bl memcpy - movs r0, 0 - str r0, [r4, 0x10] - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8144BE4 - - thumb_func_start sub_8144C00 -sub_8144C00: @ 8144C00 - push {r4-r6,lr} - sub sp, 0x4 - adds r4, r0, 0 - adds r6, r1, 0 - adds r5, r2, 0 - movs r0, 0 - str r0, [sp] - ldr r1, [r4, 0x14] - ldr r2, _08144C30 @ =0x05000100 - mov r0, sp - bl CpuSet - ldr r2, [r4, 0x14] - str r5, [r2] - adds r4, 0x24 - adds r0, r4, 0 - adds r1, r6, 0 - movs r3, 0x4 - bl sub_8144888 - add sp, 0x4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08144C30: .4byte 0x05000100 - thumb_func_end sub_8144C00 - - thumb_func_start sub_8144C34 -sub_8144C34: @ 8144C34 - push {r4,lr} - adds r4, r0, 0 - ldr r0, [r4, 0x1C] - ldr r1, _08144C58 @ =gUnknown_84687E0 - movs r2, 0x80 - lsls r2, 3 - bl memcpy - movs r1, 0 - str r1, [r4, 0x10] - movs r0, 0x4 - str r0, [r4, 0x8] - str r1, [r4, 0xC] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08144C58: .4byte gUnknown_84687E0 - thumb_func_end sub_8144C34 - - thumb_func_start sub_8144C5C -sub_8144C5C: @ 8144C5C - movs r0, 0x6 - bx lr - thumb_func_end sub_8144C5C - - thumb_func_start sub_8144C60 -sub_8144C60: @ 8144C60 - push {r4,lr} - adds r4, r0, 0 - adds r0, 0x24 - bl sub_8144844 - cmp r0, 0 - beq _08144C76 - movs r0, 0x4 - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] -_08144C76: - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8144C60 - - thumb_func_start sub_8144C80 -sub_8144C80: @ 8144C80 - push {r4,lr} - adds r4, r0, 0 - adds r0, 0x24 - bl sub_8144850 - cmp r0, 0 - beq _08144C96 - movs r0, 0x4 - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] -_08144C96: - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8144C80 - - thumb_func_start sub_8144CA0 -sub_8144CA0: @ 8144CA0 - push {r4,lr} - adds r4, r0, 0 - ldr r0, [r4, 0x10] - lsls r2, r0, 3 - ldr r1, [r4, 0x1C] - adds r2, r1, r2 - adds r0, 0x1 - str r0, [r4, 0x10] - ldr r0, [r2] - cmp r0, 0x15 - bls _08144CB8 - b _08144E60 -_08144CB8: - lsls r0, 2 - ldr r1, _08144CC4 @ =_08144CC8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08144CC4: .4byte _08144CC8 - .align 2, 0 -_08144CC8: - .4byte _08144E60 - .4byte _08144D20 - .4byte _08144D28 - .4byte _08144D38 - .4byte _08144D70 - .4byte _08144D78 - .4byte _08144D62 - .4byte _08144D6A - .4byte _08144DC6 - .4byte _08144DF0 - .4byte _08144DE8 - .4byte _08144D8E - .4byte _08144DA4 - .4byte _08144DBA - .4byte _08144DDC - .4byte _08144E18 - .4byte _08144E1C - .4byte _08144E24 - .4byte _08144E30 - .4byte _08144D4E - .4byte _08144D3C - .4byte _08144E4C -_08144D20: - ldr r0, [r2, 0x4] - str r0, [r4, 0x4] - movs r0, 0x1 - b _08144E5A -_08144D28: - adds r0, r4, 0 - adds r0, 0x24 - ldr r1, [r2, 0x4] - ldr r2, [r4, 0x18] - bl sub_81448AC - movs r0, 0x2 - b _08144E5A -_08144D38: - movs r0, 0x3 - b _08144E5A -_08144D3C: - adds r0, r4, 0 - adds r0, 0x24 - ldr r2, [r4, 0x14] - movs r1, 0x14 - movs r3, 0 - bl sub_8144888 - movs r0, 0x3 - b _08144E5A -_08144D4E: - ldrb r0, [r2, 0x4] - bl GetGameStat - adds r2, r0, 0 - adds r0, r4, 0 - movs r1, 0x12 - bl sub_8144C00 - movs r0, 0x3 - b _08144E5A -_08144D62: - ldr r0, [r4, 0x4] - cmp r0, 0 - bne _08144E60 - b _08144D70 -_08144D6A: - ldr r0, [r4, 0x4] - cmp r0, 0x1 - bne _08144E60 -_08144D70: - adds r0, r4, 0 - bl sub_8144BE4 - b _08144E60 -_08144D78: - ldr r0, [r4, 0x20] - ldr r1, [r4, 0x18] - movs r2, 0x40 - bl memcpy - movs r0, 0x5 - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] - movs r0, 0x2 - b _08144E62 -_08144D8E: - ldr r0, [r4, 0x20] - ldr r1, [r4, 0x18] - movs r2, 0x40 - bl memcpy - movs r0, 0x5 - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] - movs r0, 0x3 - b _08144E62 -_08144DA4: - ldr r0, [r4, 0x20] - ldr r1, [r4, 0x18] - movs r2, 0x40 - bl memcpy - movs r0, 0x5 - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] - movs r0, 0x5 - b _08144E62 -_08144DBA: - movs r0, 0x5 - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] - movs r0, 0x4 - b _08144E62 -_08144DC6: - ldr r0, [r4, 0x14] - bl sub_81442CC - adds r0, r4, 0 - adds r0, 0x24 - ldr r2, [r4, 0x14] - movs r1, 0x11 - movs r3, 0x64 - bl sub_8144888 - b _08144E60 -_08144DDC: - ldr r2, [r4, 0x4] - adds r0, r4, 0 - movs r1, 0x13 - bl sub_8144C00 - b _08144E60 -_08144DE8: - ldr r0, [r4, 0x18] - bl sub_8143F68 - b _08144E60 -_08144DF0: - ldr r0, [r4, 0x18] - bl sub_8143EF4 - cmp r0, 0 - bne _08144E0C - ldr r0, [r4, 0x18] - bl sub_8143DC8 - adds r0, r4, 0 - movs r1, 0x13 - movs r2, 0 - bl sub_8144C00 - b _08144E60 -_08144E0C: - adds r0, r4, 0 - movs r1, 0x13 - movs r2, 0x1 - bl sub_8144C00 - b _08144E60 -_08144E18: - movs r0, 0x6 - b _08144E5A -_08144E1C: - ldr r0, [r4, 0x18] - bl sub_8144254 - b _08144E60 -_08144E24: - ldr r0, [r4, 0x18] - movs r1, 0xFA - lsls r1, 2 - bl sub_8069EA4 - b _08144E60 -_08144E30: - ldr r0, _08144E48 @ =gSaveBlock2Ptr - ldr r0, [r0] - movs r1, 0x94 - lsls r1, 3 - adds r0, r1 - ldr r1, [r4, 0x18] - movs r2, 0xBC - bl memcpy - bl sub_80E7490 - b _08144E60 - .align 2, 0 -_08144E48: .4byte gSaveBlock2Ptr -_08144E4C: - ldr r0, _08144E68 @ =gDecompressionBuffer - ldr r1, [r4, 0x18] - movs r2, 0x80 - lsls r2, 3 - bl memcpy - movs r0, 0x7 -_08144E5A: - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] -_08144E60: - movs r0, 0x1 -_08144E62: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08144E68: .4byte gDecompressionBuffer - thumb_func_end sub_8144CA0 - - thumb_func_start sub_8144E6C -sub_8144E6C: @ 8144E6C - push {lr} - adds r1, r0, 0 - ldr r0, [r1, 0xC] - cmp r0, 0 - beq _08144E7E - movs r0, 0x4 - str r0, [r1, 0x8] - movs r0, 0 - str r0, [r1, 0xC] -_08144E7E: - movs r0, 0x1 - pop {r1} - bx r1 - thumb_func_end sub_8144E6C - - thumb_func_start sub_8144E84 -sub_8144E84: @ 8144E84 - push {r4,lr} - adds r4, r0, 0 - ldr r0, [r4, 0xC] - cmp r0, 0 - beq _08144E94 - cmp r0, 0x1 - beq _08144EA2 - b _08144EB4 -_08144E94: - ldr r0, [r4, 0x18] - bl sub_80DA89C - ldr r0, [r4, 0xC] - adds r0, 0x1 - str r0, [r4, 0xC] - b _08144EB4 -_08144EA2: - adds r0, r4, 0x4 - bl sub_80DA8B0 - adds r1, r0, 0 - cmp r1, 0 - bne _08144EB4 - movs r0, 0x4 - str r0, [r4, 0x8] - str r1, [r4, 0xC] -_08144EB4: - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8144E84 - - thumb_func_start sub_8144EBC -sub_8144EBC: @ 8144EBC - push {r4,lr} - adds r4, r0, 0 - ldr r3, _08144EE4 @ =gDecompressionBuffer - adds r0, r4, 0x4 - ldr r1, _08144EE8 @ =gSaveBlock2Ptr - ldr r1, [r1] - ldr r2, _08144EEC @ =gSaveBlock1Ptr - ldr r2, [r2] - bl _call_via_r3 - cmp r0, 0x1 - bne _08144EDC - movs r0, 0x4 - str r0, [r4, 0x8] - movs r0, 0 - str r0, [r4, 0xC] -_08144EDC: - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08144EE4: .4byte gDecompressionBuffer -_08144EE8: .4byte gSaveBlock2Ptr -_08144EEC: .4byte gSaveBlock1Ptr - thumb_func_end sub_8144EBC - - thumb_func_start mevent_srv_ish_exec -mevent_srv_ish_exec: @ 8144EF0 - push {r4,r5,lr} - sub sp, 0x20 - mov r2, sp - ldr r1, _08144F18 @ =gUnknown_8466F60 - ldm r1!, {r3-r5} - stm r2!, {r3-r5} - ldm r1!, {r3-r5} - stm r2!, {r3-r5} - ldm r1!, {r3,r4} - stm r2!, {r3,r4} - ldr r1, [r0, 0x8] - lsls r1, 2 - add r1, sp - ldr r1, [r1] - bl _call_via_r1 - add sp, 0x20 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08144F18: .4byte gUnknown_8466F60 - thumb_func_end mevent_srv_ish_exec - - thumb_func_start sub_8144F1C -sub_8144F1C: @ 8144F1C - push {r4,lr} - ldr r4, _08144F38 @ =gUnknown_203F3C4 - movs r0, 0x60 - bl AllocZeroed - str r0, [r4] - ldr r1, _08144F3C @ =gUnknown_8468B6C - movs r2, 0 - movs r3, 0x1 - bl mevent_srv_init_common - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08144F38: .4byte gUnknown_203F3C4 -_08144F3C: .4byte gUnknown_8468B6C - thumb_func_end sub_8144F1C - - thumb_func_start sub_8144F40 -sub_8144F40: @ 8144F40 - push {r4,lr} - ldr r4, _08144F5C @ =gUnknown_203F3C4 - movs r0, 0x60 - bl AllocZeroed - str r0, [r4] - ldr r1, _08144F60 @ =gUnknown_8468BCC - movs r2, 0 - movs r3, 0x1 - bl mevent_srv_init_common - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08144F5C: .4byte gUnknown_203F3C4 -_08144F60: .4byte gUnknown_8468BCC - thumb_func_end sub_8144F40 - - thumb_func_start sub_8144F64 -sub_8144F64: @ 8144F64 - push {r4-r6,lr} - adds r6, r0, 0 - ldr r4, _08144F74 @ =gUnknown_203F3C4 - ldr r0, [r4] - cmp r0, 0 - bne _08144F78 - movs r0, 0x3 - b _08144F98 - .align 2, 0 -_08144F74: .4byte gUnknown_203F3C4 -_08144F78: - bl sub_8145600 - adds r5, r0, 0 - cmp r5, 0x3 - bne _08144F96 - ldr r0, [r4] - ldr r1, [r0, 0x4] - strh r1, [r6] - bl mevent_srv_free_resources - ldr r0, [r4] - bl Free - movs r0, 0 - str r0, [r4] -_08144F96: - adds r0, r5, 0 -_08144F98: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8144F64 - - thumb_func_start mevent_srv_init_common -mevent_srv_init_common: @ 8144FA0 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - adds r4, r0, 0 - adds r6, r1, 0 - mov r8, r2 - mov r9, r3 - movs r5, 0 - str r5, [r4] - str r5, [r4, 0x8] - movs r0, 0xA6 - lsls r0, 1 - bl AllocZeroed - str r0, [r4, 0x18] - movs r0, 0xDE - lsls r0, 1 - bl AllocZeroed - str r0, [r4, 0x1C] - movs r0, 0x80 - lsls r0, 3 - bl AllocZeroed - str r0, [r4, 0x14] - movs r0, 0x64 - bl AllocZeroed - str r0, [r4, 0x20] - str r6, [r4, 0x10] - str r5, [r4, 0xC] - adds r4, 0x38 - adds r0, r4, 0 - mov r1, r8 - mov r2, r9 - bl sub_814485C - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end mevent_srv_init_common - - thumb_func_start mevent_srv_free_resources -mevent_srv_free_resources: @ 8144FF8 - push {r4,lr} - adds r4, r0, 0 - ldr r0, [r4, 0x18] - bl Free - ldr r0, [r4, 0x1C] - bl Free - ldr r0, [r4, 0x14] - bl Free - ldr r0, [r4, 0x20] - bl Free - pop {r4} - pop {r0} - bx r0 - thumb_func_end mevent_srv_free_resources - - thumb_func_start sub_814501C -sub_814501C: @ 814501C - push {r4-r7,lr} - adds r5, r0, 0 - adds r6, r1, 0 - adds r7, r2, 0 - adds r4, r3, 0 - movs r0, 0x80 - lsls r0, 3 - cmp r4, r0 - bls _0814503A - ldr r0, _08145050 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _08145054 @ =0x00000101 - ldr r2, _08145058 @ =gUnknown_8466FB8 "size <= ME_SEND_BUF_SIZE" - movs r3, 0x1 - bl AGBAssert -_0814503A: - adds r0, r5, 0 - adds r0, 0x38 - adds r1, r6, 0 - adds r2, r7, 0 - adds r3, r4, 0 - bl sub_8144888 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08145050: .4byte gUnknown_8466F80 -_08145054: .4byte 0x00000101 -_08145058: .4byte gUnknown_8466FB8 - thumb_func_end sub_814501C - - thumb_func_start sub_814505C -sub_814505C: @ 814505C - push {lr} - cmp r0, 0 - bne _08145064 - adds r0, r1, 0 -_08145064: - pop {r1} - bx r1 - thumb_func_end sub_814505C - - thumb_func_start sub_8145068 -sub_8145068: @ 8145068 - push {lr} - cmp r1, r0 - bcs _08145072 - movs r0, 0 - b _0814507C -_08145072: - cmp r1, r0 - beq _0814507A - movs r0, 0x2 - b _0814507C -_0814507A: - movs r0, 0x1 -_0814507C: - pop {r1} - bx r1 - thumb_func_end sub_8145068 - - thumb_func_start sub_8145080 -sub_8145080: @ 8145080 - movs r1, 0x4 - str r1, [r0, 0x8] - movs r0, 0 - bx lr - thumb_func_end sub_8145080 - - thumb_func_start sub_8145088 -sub_8145088: @ 8145088 - movs r0, 0x3 - bx lr - thumb_func_end sub_8145088 - - thumb_func_start sub_814508C -sub_814508C: @ 814508C - push {r4,lr} - adds r4, r0, 0 - adds r0, 0x38 - bl sub_8144844 - cmp r0, 0 - beq _0814509E - movs r0, 0x4 - str r0, [r4, 0x8] -_0814509E: - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_814508C - - thumb_func_start sub_81450A8 -sub_81450A8: @ 81450A8 - push {r4,lr} - adds r4, r0, 0 - adds r0, 0x38 - bl sub_8144850 - cmp r0, 0 - beq _081450BA - movs r0, 0x4 - str r0, [r4, 0x8] -_081450BA: - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81450A8 - - thumb_func_start sub_81450C4 -sub_81450C4: @ 81450C4 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, [r5, 0xC] - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - ldr r2, [r5, 0x10] - adds r4, r2, r1 - adds r0, 0x1 - str r0, [r5, 0xC] - ldr r0, [r4] - cmp r0, 0x1D - bls _081450E0 - b _081455F8 -_081450E0: - lsls r0, 2 - ldr r1, _081450EC @ =_081450F0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081450EC: .4byte _081450F0 - .align 2, 0 -_081450F0: - .4byte _08145168 - .4byte _08145190 - .4byte _08145196 - .4byte _081451C4 - .4byte _08145268 - .4byte _081451E4 - .4byte _08145228 - .4byte _0814527C - .4byte _081452AC - .4byte _081452EC - .4byte _08145320 - .4byte _08145350 - .4byte _08145378 - .4byte _081453D8 - .4byte _081453A4 - .4byte _08145440 - .4byte _0814540C - .4byte _081454AA - .4byte _08145458 - .4byte _08145470 - .4byte _0814549C - .4byte _08145510 - .4byte _081454B8 - .4byte _081454E4 - .4byte _08145538 - .4byte _08145542 - .4byte _0814554C - .4byte _08145588 - .4byte _081455C0 - .4byte _081455EC -_08145168: - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _0814517C - ldr r0, _08145188 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xB1 - lsls r1, 1 - ldr r2, _0814518C @ =gUnknown_8466FD4 "cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_0814517C: - movs r0, 0x1 - str r0, [r5, 0x8] - ldr r0, [r4, 0x4] - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_08145188: .4byte gUnknown_8466F80 -_0814518C: .4byte gUnknown_8466FD4 -_08145190: - movs r0, 0x3 - str r0, [r5, 0x8] - b _081455F8 -_08145196: - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _081451AA - ldr r0, _081451BC @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xB6 - lsls r1, 1 - ldr r2, _081451C0 @ =gUnknown_8466FD4 "cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_081451AA: - adds r0, r5, 0 - adds r0, 0x38 - ldr r1, [r4, 0x4] - ldr r2, [r5, 0x14] - bl sub_81448AC - movs r0, 0x2 - str r0, [r5, 0x8] - b _081455F8 - .align 2, 0 -_081451BC: .4byte gUnknown_8466F80 -_081451C0: .4byte gUnknown_8466FD4 -_081451C4: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _08145272 - ldr r0, _081451DC @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xB9 - lsls r1, 1 - ldr r2, _081451E0 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert - b _08145272 - .align 2, 0 -_081451DC: .4byte gUnknown_8466F80 -_081451E0: .4byte gUnknown_8466FEC -_081451E4: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _081451F8 - ldr r0, _08145218 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xBC - lsls r1, 1 - ldr r2, _0814521C @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_081451F8: - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _0814520A - ldr r0, _08145218 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _08145220 @ =0x00000179 - ldr r2, _08145224 @ =gUnknown_8466FD4 "cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_0814520A: - ldr r0, [r5, 0x20] - ldr r1, [r5, 0x14] - movs r2, 0x64 - bl memcpy - b _081455F8 - .align 2, 0 -_08145218: .4byte gUnknown_8466F80 -_0814521C: .4byte gUnknown_8466FEC -_08145220: .4byte 0x00000179 -_08145224: .4byte gUnknown_8466FD4 -_08145228: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _0814523C - ldr r0, _08145258 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xBF - lsls r1, 1 - ldr r2, _0814525C @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_0814523C: - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _0814524E - ldr r0, _08145258 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _08145260 @ =0x0000017f - ldr r2, _08145264 @ =gUnknown_8466FD4 "cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_0814524E: - ldr r0, [r5, 0x20] - bl sub_81443D4 - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_08145258: .4byte gUnknown_8466F80 -_0814525C: .4byte gUnknown_8466FEC -_08145260: .4byte 0x0000017f -_08145264: .4byte gUnknown_8466FD4 -_08145268: - ldr r1, [r5, 0x4] - ldr r0, [r4, 0x4] - cmp r1, r0 - beq _08145272 - b _081455F8 -_08145272: - movs r0, 0 - str r0, [r5, 0xC] - ldr r0, [r4, 0x8] - str r0, [r5, 0x10] - b _081455F8 -_0814527C: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _08145290 - ldr r0, _081452A4 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xC6 - lsls r1, 1 - ldr r2, _081452A8 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_08145290: - ldr r0, [r4, 0x8] - ldr r1, [r5, 0x18] - bl sub_814505C - adds r2, r0, 0 - ldr r1, [r5, 0x20] - bl sub_8144418 - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_081452A4: .4byte gUnknown_8466F80 -_081452A8: .4byte gUnknown_8466FEC -_081452AC: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _081452C0 - ldr r0, _081452DC @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xC9 - lsls r1, 1 - ldr r2, _081452E0 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_081452C0: - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _081452D2 - ldr r0, _081452DC @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _081452E4 @ =0x00000193 - ldr r2, _081452E8 @ =gUnknown_8466FD4 "cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_081452D2: - ldr r0, [r5, 0x14] - ldr r0, [r0] - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_081452DC: .4byte gUnknown_8466F80 -_081452E0: .4byte gUnknown_8466FEC -_081452E4: .4byte 0x00000193 -_081452E8: .4byte gUnknown_8466FD4 -_081452EC: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _08145300 - ldr r0, _08145318 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xCC - lsls r1, 1 - ldr r2, _0814531C @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_08145300: - ldr r0, [r4, 0x8] - adds r1, r5, 0 - adds r1, 0x34 - bl sub_814505C - adds r2, r0, 0 - ldr r1, [r5, 0x20] - bl sub_8144434 - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_08145318: .4byte gUnknown_8466F80 -_0814531C: .4byte gUnknown_8466FEC -_08145320: - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _08145332 - ldr r0, _08145344 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _08145348 @ =0x0000019f - ldr r2, _0814534C @ =gUnknown_8466FD4 "cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_08145332: - ldr r0, [r5, 0x20] - ldr r1, [r4, 0x4] - bl sub_81444B0 - lsls r0, 16 - lsrs r0, 16 - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_08145344: .4byte gUnknown_8466F80 -_08145348: .4byte 0x0000019f -_0814534C: .4byte gUnknown_8466FD4 -_08145350: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _08145364 - ldr r0, _08145370 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xD2 - lsls r1, 1 - ldr r2, _08145374 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_08145364: - ldr r0, [r5, 0x20] - ldr r1, [r4, 0x8] - bl sub_8144474 - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_08145370: .4byte gUnknown_8466F80 -_08145374: .4byte gUnknown_8466FEC -_08145378: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _0814538C - ldr r0, _0814539C @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xD5 - lsls r1, 1 - ldr r2, _081453A0 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_0814538C: - ldr r0, [r4, 0x8] - ldr r1, [r5, 0x14] - ldr r1, [r1] - bl sub_8145068 - str r0, [r5, 0x4] - b _081455F8 - .align 2, 0 -_0814539C: .4byte gUnknown_8466F80 -_081453A0: .4byte gUnknown_8466FEC -_081453A4: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _081453B8 - ldr r0, _081453D0 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xD8 - lsls r1, 1 - ldr r2, _081453D4 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_081453B8: - ldr r0, [r4, 0x8] - ldr r1, [r5, 0x1C] - bl sub_814505C - adds r2, r0, 0 - movs r3, 0xDE - lsls r3, 1 - adds r0, r5, 0 - movs r1, 0x17 - bl sub_814501C - b _081455F8 - .align 2, 0 -_081453D0: .4byte gUnknown_8466F80 -_081453D4: .4byte gUnknown_8466FEC -_081453D8: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _081453EC - ldr r0, _08145404 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xDB - lsls r1, 1 - ldr r2, _08145408 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_081453EC: - ldr r0, [r4, 0x8] - ldr r1, [r5, 0x18] - bl sub_814505C - adds r2, r0, 0 - movs r3, 0xA6 - lsls r3, 1 - adds r0, r5, 0 - movs r1, 0x16 - bl sub_814501C - b _081455F8 - .align 2, 0 -_08145404: .4byte gUnknown_8466F80 -_08145408: .4byte gUnknown_8466FEC -_0814540C: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _08145420 - ldr r0, _08145438 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xDE - lsls r1, 1 - ldr r2, _0814543C @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_08145420: - ldr r0, [r4, 0x8] - adds r1, r5, 0 - adds r1, 0x34 - bl sub_814505C - adds r2, r0, 0 - adds r0, r5, 0 - movs r1, 0x18 - movs r3, 0x4 - bl sub_814501C - b _081455F8 - .align 2, 0 -_08145438: .4byte gUnknown_8466F80 -_0814543C: .4byte gUnknown_8466FEC -_08145440: - ldr r2, [r4, 0x8] - cmp r2, 0 - bne _0814544C - ldr r2, [r5, 0x24] - ldr r3, [r5, 0x28] - b _0814544E -_0814544C: - ldr r3, [r4, 0x4] -_0814544E: - adds r0, r5, 0 - movs r1, 0x19 - bl sub_814501C - b _081455F8 -_08145458: - ldr r2, [r4, 0x8] - cmp r2, 0 - bne _08145464 - ldr r2, [r5, 0x2C] - ldr r3, [r5, 0x30] - b _08145466 -_08145464: - ldr r3, [r4, 0x4] -_08145466: - adds r0, r5, 0 - movs r1, 0x10 - bl sub_814501C - b _081455F8 -_08145470: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _08145484 - ldr r0, _08145494 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xE9 - lsls r1, 1 - ldr r2, _08145498 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_08145484: - ldr r2, [r4, 0x8] - adds r0, r5, 0 - movs r1, 0x1A - movs r3, 0xBC - bl sub_814501C - b _081455F8 - .align 2, 0 -_08145494: .4byte gUnknown_8466F80 -_08145498: .4byte gUnknown_8466FEC -_0814549C: - ldr r2, [r4, 0x8] - ldr r3, [r4, 0x4] - adds r0, r5, 0 - movs r1, 0x15 - bl sub_814501C - b _081455F8 -_081454AA: - ldr r2, [r4, 0x8] - ldr r3, [r4, 0x4] - adds r0, r5, 0 - movs r1, 0x1C - bl sub_814501C - b _081455F8 -_081454B8: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _081454CA - ldr r0, _081454D8 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _081454DC @ =0x000001e1 - ldr r2, _081454E0 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_081454CA: - ldr r0, [r5, 0x18] - ldr r1, [r4, 0x8] - movs r2, 0xA6 - lsls r2, 1 - bl memcpy - b _081455F8 - .align 2, 0 -_081454D8: .4byte gUnknown_8466F80 -_081454DC: .4byte 0x000001e1 -_081454E0: .4byte gUnknown_8466FEC -_081454E4: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _081454F8 - ldr r0, _08145508 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xF3 - lsls r1, 1 - ldr r2, _0814550C @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_081454F8: - ldr r0, [r5, 0x1C] - ldr r1, [r4, 0x8] - movs r2, 0xDE - lsls r2, 1 - bl memcpy - b _081455F8 - .align 2, 0 -_08145508: .4byte gUnknown_8466F80 -_0814550C: .4byte gUnknown_8466FEC -_08145510: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _08145522 - ldr r0, _0814552C @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _08145530 @ =0x000001eb - ldr r2, _08145534 @ =gUnknown_8466FEC "cmd->flag == FALSE" - movs r3, 0x1 - bl AGBAssert -_08145522: - ldr r0, [r4, 0x8] - ldr r0, [r0] - str r0, [r5, 0x34] - b _081455F8 - .align 2, 0 -_0814552C: .4byte gUnknown_8466F80 -_08145530: .4byte 0x000001eb -_08145534: .4byte gUnknown_8466FEC -_08145538: - ldr r0, [r4, 0x8] - str r0, [r5, 0x24] - ldr r0, [r4, 0x4] - str r0, [r5, 0x28] - b _081455F8 -_08145542: - ldr r0, [r4, 0x8] - str r0, [r5, 0x2C] - ldr r0, [r4, 0x4] - str r0, [r5, 0x30] - b _081455F8 -_0814554C: - ldr r0, [r4, 0x4] - cmp r0, 0 - bne _08145558 - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _08145566 -_08145558: - ldr r0, _08145580 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0xFD - lsls r1, 1 - ldr r2, _08145584 @ =gUnknown_8467000 "cmd->flag == FALSE && cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_08145566: - ldr r4, [r5, 0x18] - bl sav1_get_mevent_buffer_1 - adds r1, r0, 0 - movs r2, 0xA6 - lsls r2, 1 - adds r0, r4, 0 - bl memcpy - ldr r0, [r5, 0x18] - bl sub_814410C - b _081455F8 - .align 2, 0 -_08145580: .4byte gUnknown_8466F80 -_08145584: .4byte gUnknown_8467000 -_08145588: - ldr r0, [r4, 0x4] - cmp r0, 0 - bne _08145594 - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _081455A2 -_08145594: - ldr r0, _081455B8 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0x80 - lsls r1, 2 - ldr r2, _081455BC @ =gUnknown_8467000 "cmd->flag == FALSE && cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_081455A2: - ldr r4, [r5, 0x1C] - bl sub_8143D58 - adds r1, r0, 0 - movs r2, 0xDE - lsls r2, 1 - adds r0, r4, 0 - bl memcpy - b _081455F8 - .align 2, 0 -_081455B8: .4byte gUnknown_8466F80 -_081455BC: .4byte gUnknown_8467000 -_081455C0: - ldr r0, [r4, 0x4] - cmp r0, 0 - bne _081455CC - ldr r0, [r4, 0x8] - cmp r0, 0 - beq _081455D8 -_081455CC: - ldr r0, _081455E0 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _081455E4 @ =0x00000205 - ldr r2, _081455E8 @ =gUnknown_8467000 "cmd->flag == FALSE && cmd->parameter == NULL" - movs r3, 0x1 - bl AGBAssert -_081455D8: - bl sub_8069E48 - str r0, [r5, 0x24] - b _081455F8 - .align 2, 0 -_081455E0: .4byte gUnknown_8466F80 -_081455E4: .4byte 0x00000205 -_081455E8: .4byte gUnknown_8467000 -_081455EC: - ldr r2, [r4, 0x8] - ldr r3, [r4, 0x4] - adds r0, r5, 0 - movs r1, 0x1B - bl sub_814501C -_081455F8: - movs r0, 0x1 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81450C4 - - thumb_func_start sub_8145600 -sub_8145600: @ 8145600 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r0, [r4, 0x8] - cmp r0, 0x4 - bls _08145616 - ldr r0, _08145644 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - ldr r1, _08145648 @ =0x00000222 - ldr r2, _0814564C @ =gUnknown_8467044 "svr->mainseqno < NELEMS(func_tbl)" - movs r3, 0x1 - bl AGBAssert -_08145616: - ldr r1, _08145650 @ =gUnknown_8467030 - ldr r0, [r4, 0x8] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - adds r5, r0, 0 - ldr r0, [r4, 0x8] - cmp r0, 0x4 - bls _0814563C - ldr r0, _08145644 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - movs r1, 0x89 - lsls r1, 2 - ldr r2, _0814564C @ =gUnknown_8467044 "svr->mainseqno < NELEMS(func_tbl)" - movs r3, 0x1 - bl AGBAssert -_0814563C: - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08145644: .4byte gUnknown_8466F80 -_08145648: .4byte 0x00000222 -_0814564C: .4byte gUnknown_8467044 -_08145650: .4byte gUnknown_8467030 - thumb_func_end sub_8145600 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s deleted file mode 100644 index b150bb586..000000000 --- a/asm/mystery_event_script.s +++ /dev/null @@ -1,722 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_80DA800 -sub_80DA800: @ 80DA800 - push {r4,lr} - lsls r0, 16 - lsrs r0, 16 - lsls r2, 16 - lsrs r2, 16 - movs r4, 0x1 - ands r0, r4 - cmp r0, 0 - beq _080DA828 - ands r1, r4 - cmp r1, 0 - beq _080DA828 - ands r2, r4 - cmp r2, 0 - beq _080DA828 - ands r3, r4 - cmp r3, 0 - beq _080DA828 - movs r0, 0x1 - b _080DA82A -_080DA828: - movs r0, 0 -_080DA82A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80DA800 - - thumb_func_start SetIncompatible -SetIncompatible: @ 80DA830 - push {lr} - ldr r0, _080DA844 @ =gStringVar4 - ldr r1, _080DA848 @ =gUnknown_8488DFD - bl StringExpandPlaceholders - movs r0, 0x3 - bl sub_80DA8E8 - pop {r0} - bx r0 - .align 2, 0 -_080DA844: .4byte gStringVar4 -_080DA848: .4byte gUnknown_8488DFD - thumb_func_end SetIncompatible - - thumb_func_start InitMysteryEventScript -InitMysteryEventScript: @ 80DA84C - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldr r1, _080DA874 @ =gUnknown_81DBCF0 - ldr r2, _080DA878 @ =0x081dbd34 - bl InitScriptContext - adds r0, r4, 0 - adds r1, r5, 0 - bl SetupBytecodeScript - str r5, [r4, 0x64] - movs r0, 0 - str r0, [r4, 0x68] - str r0, [r4, 0x6C] - str r0, [r4, 0x70] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DA874: .4byte gUnknown_81DBCF0 -_080DA878: .4byte 0x081dbd34 - thumb_func_end InitMysteryEventScript - - thumb_func_start RunMysteryEventScriptCommand -RunMysteryEventScriptCommand: @ 80DA87C - push {r4,lr} - adds r4, r0, 0 - bl RunScriptCommand - lsls r0, 24 - cmp r0, 0 - beq _080DA894 - ldr r0, [r4, 0x70] - cmp r0, 0 - beq _080DA894 - movs r0, 0x1 - b _080DA896 -_080DA894: - movs r0, 0 -_080DA896: - pop {r4} - pop {r1} - bx r1 - thumb_func_end RunMysteryEventScriptCommand - - thumb_func_start sub_80DA89C -sub_80DA89C: @ 80DA89C - push {lr} - adds r1, r0, 0 - ldr r0, _080DA8AC @ =gUnknown_203AA3C - bl InitMysteryEventScript - pop {r0} - bx r0 - .align 2, 0 -_080DA8AC: .4byte gUnknown_203AA3C - thumb_func_end sub_80DA89C - - thumb_func_start sub_80DA8B0 -sub_80DA8B0: @ 80DA8B0 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _080DA8C8 @ =gUnknown_203AA3C - adds r0, r4, 0 - bl RunMysteryEventScriptCommand - ldr r1, [r4, 0x6C] - str r1, [r5] - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_080DA8C8: .4byte gUnknown_203AA3C - thumb_func_end sub_80DA8B0 - - thumb_func_start sub_80DA8CC -sub_80DA8CC: @ 80DA8CC - push {lr} - sub sp, 0x4 - bl sub_80DA89C -_080DA8D4: - mov r0, sp - bl sub_80DA8B0 - cmp r0, 0 - bne _080DA8D4 - ldr r0, [sp] - add sp, 0x4 - pop {r1} - bx r1 - thumb_func_end sub_80DA8CC - - thumb_func_start sub_80DA8E8 -sub_80DA8E8: @ 80DA8E8 - ldr r1, _080DA8F0 @ =gUnknown_203AA3C - str r0, [r1, 0x6C] - bx lr - .align 2, 0 -_080DA8F0: .4byte gUnknown_203AA3C - thumb_func_end sub_80DA8E8 - - thumb_func_start script_status_stop_and_ret_1 -script_status_stop_and_ret_1: @ 80DA8F4 - push {lr} - bl StopScript - movs r0, 0x1 - pop {r1} - bx r1 - thumb_func_end script_status_stop_and_ret_1 - - thumb_func_start MEScrCmd_checkcompat -MEScrCmd_checkcompat: @ 80DA900 - push {r4-r7,lr} - adds r7, r0, 0 - bl ScriptReadWord - str r0, [r7, 0x68] - adds r0, r7, 0 - bl ScriptReadHalfword - adds r5, r0, 0 - lsls r5, 16 - lsrs r5, 16 - adds r0, r7, 0 - bl ScriptReadWord - adds r6, r0, 0 - adds r0, r7, 0 - bl ScriptReadHalfword - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r7, 0 - bl ScriptReadWord - adds r3, r0, 0 - adds r0, r5, 0 - adds r1, r6, 0 - adds r2, r4, 0 - bl sub_80DA800 - cmp r0, 0x1 - bne _080DA944 - str r0, [r7, 0x70] - b _080DA948 -_080DA944: - bl SetIncompatible -_080DA948: - movs r0, 0x1 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end MEScrCmd_checkcompat - - thumb_func_start sub_80DA950 -sub_80DA950: @ 80DA950 - movs r0, 0 - bx lr - thumb_func_end sub_80DA950 - - thumb_func_start MEScrCmd_setstatus -MEScrCmd_setstatus: @ 80DA954 - ldr r1, [r0, 0x8] - ldrb r2, [r1] - adds r1, 0x1 - str r1, [r0, 0x8] - str r2, [r0, 0x6C] - movs r0, 0 - bx lr - thumb_func_end MEScrCmd_setstatus - - thumb_func_start MEScrCmd_setmsg -MEScrCmd_setmsg: @ 80DA964 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r0, [r4, 0x8] - ldrb r5, [r0] - adds r0, 0x1 - str r0, [r4, 0x8] - adds r0, r4, 0 - bl ScriptReadWord - ldr r1, [r4, 0x68] - subs r0, r1 - ldr r1, [r4, 0x64] - adds r1, r0, r1 - cmp r5, 0xFF - beq _080DA988 - ldr r0, [r4, 0x6C] - cmp r5, r0 - bne _080DA98E -_080DA988: - ldr r0, _080DA998 @ =gStringVar4 - bl StringExpandPlaceholders -_080DA98E: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_080DA998: .4byte gStringVar4 - thumb_func_end MEScrCmd_setmsg - - thumb_func_start MEScrCmd_runscript -MEScrCmd_runscript: @ 80DA99C - push {r4,lr} - adds r4, r0, 0 - bl ScriptReadWord - ldr r1, [r4, 0x68] - subs r0, r1 - ldr r1, [r4, 0x64] - adds r0, r1 - bl ScriptContext2_RunNewScript - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end MEScrCmd_runscript - - thumb_func_start MEScrCmd_setenigmaberry -MEScrCmd_setenigmaberry: @ 80DA9B8 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r7, r0, 0 - bl IsEnigmaBerryValid - mov r8, r0 - adds r0, r7, 0 - bl ScriptReadWord - adds r4, r0, 0 - ldr r0, [r7, 0x68] - subs r4, r0 - ldr r0, [r7, 0x64] - adds r4, r0 - ldr r0, _080DAA0C @ =gStringVar1 - mov r9, r0 - ldr r6, _080DAA10 @ =gSaveBlock1Ptr - ldr r1, [r6] - ldr r5, _080DAA14 @ =0x000030ec - adds r1, r5 - movs r2, 0x7 - bl StringCopyN - adds r0, r4, 0 - bl sub_809C7C4 - ldr r4, _080DAA18 @ =gStringVar2 - ldr r1, [r6] - adds r1, r5 - adds r0, r4, 0 - movs r2, 0x7 - bl StringCopyN - mov r0, r8 - cmp r0, 0 - bne _080DAA24 - ldr r0, _080DAA1C @ =gStringVar4 - ldr r1, _080DAA20 @ =gUnknown_8488C70 - b _080DAA44 - .align 2, 0 -_080DAA0C: .4byte gStringVar1 -_080DAA10: .4byte gSaveBlock1Ptr -_080DAA14: .4byte 0x000030ec -_080DAA18: .4byte gStringVar2 -_080DAA1C: .4byte gStringVar4 -_080DAA20: .4byte gUnknown_8488C70 -_080DAA24: - mov r0, r9 - adds r1, r4, 0 - bl StringCompare - cmp r0, 0 - beq _080DAA40 - ldr r0, _080DAA38 @ =gStringVar4 - ldr r1, _080DAA3C @ =gUnknown_8488CA2 - b _080DAA44 - .align 2, 0 -_080DAA38: .4byte gStringVar4 -_080DAA3C: .4byte gUnknown_8488CA2 -_080DAA40: - ldr r0, _080DAA60 @ =gStringVar4 - ldr r1, _080DAA64 @ =gUnknown_8488CCE -_080DAA44: - bl StringExpandPlaceholders - movs r0, 0x2 - str r0, [r7, 0x6C] - bl IsEnigmaBerryValid - cmp r0, 0x1 - bne _080DAA6C - ldr r0, _080DAA68 @ =0x00004033 - movs r1, 0x1 - bl VarSet - b _080DAA70 - .align 2, 0 -_080DAA60: .4byte gStringVar4 -_080DAA64: .4byte gUnknown_8488CCE -_080DAA68: .4byte 0x00004033 -_080DAA6C: - movs r0, 0x1 - str r0, [r7, 0x6C] -_080DAA70: - movs r0, 0 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end MEScrCmd_setenigmaberry - - thumb_func_start MEScrCmd_giveribbon -MEScrCmd_giveribbon: @ 80DAA80 - push {r4,lr} - adds r4, r0, 0 - ldr r2, [r4, 0x8] - ldrb r0, [r2] - adds r2, 0x1 - str r2, [r4, 0x8] - ldrb r1, [r2] - adds r2, 0x1 - str r2, [r4, 0x8] - bl GiveGiftRibbonToParty - ldr r0, _080DAAAC @ =gStringVar4 - ldr r1, _080DAAB0 @ =gUnknown_8488CF6 - bl StringExpandPlaceholders - movs r0, 0x2 - str r0, [r4, 0x6C] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080DAAAC: .4byte gStringVar4 -_080DAAB0: .4byte gUnknown_8488CF6 - thumb_func_end MEScrCmd_giveribbon - - thumb_func_start MEScrCmd_initramscript -MEScrCmd_initramscript: @ 80DAAB4 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - sub sp, 0x4 - adds r4, r0, 0 - ldr r0, [r4, 0x8] - ldrb r1, [r0] - mov r9, r1 - adds r0, 0x1 - str r0, [r4, 0x8] - ldrb r1, [r0] - mov r8, r1 - adds r1, r0, 0x1 - str r1, [r4, 0x8] - ldrb r6, [r0, 0x1] - adds r1, 0x1 - str r1, [r4, 0x8] - adds r0, r4, 0 - bl ScriptReadWord - adds r5, r0, 0 - ldr r0, [r4, 0x68] - subs r5, r0 - ldr r0, [r4, 0x64] - adds r5, r0 - adds r0, r4, 0 - bl ScriptReadWord - adds r1, r0, 0 - ldr r0, [r4, 0x68] - subs r1, r0 - ldr r0, [r4, 0x64] - adds r1, r0 - subs r1, r5 - lsls r1, 16 - lsrs r1, 16 - str r6, [sp] - adds r0, r5, 0 - mov r2, r9 - mov r3, r8 - bl InitRamScript - movs r0, 0 - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end MEScrCmd_initramscript - - thumb_func_start sub_80DAB1C -sub_80DAB1C: @ 80DAB1C - push {r4,lr} - adds r4, r0, 0 - bl sub_806E22C - ldr r0, _080DAB38 @ =gStringVar4 - ldr r1, _080DAB3C @ =gUnknown_8488D2A - bl StringExpandPlaceholders - movs r0, 0x2 - str r0, [r4, 0x6C] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080DAB38: .4byte gStringVar4 -_080DAB3C: .4byte gUnknown_8488D2A - thumb_func_end sub_80DAB1C - - thumb_func_start MEScrCmd_addrareword -MEScrCmd_addrareword: @ 80DAB40 - push {r4,lr} - adds r4, r0, 0 - ldr r1, [r4, 0x8] - ldrb r0, [r1] - adds r1, 0x1 - str r1, [r4, 0x8] - bl sub_80BDB70 - ldr r0, _080DAB64 @ =gStringVar4 - ldr r1, _080DAB68 @ =gUnknown_8488D60 - bl StringExpandPlaceholders - movs r0, 0x2 - str r0, [r4, 0x6C] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080DAB64: .4byte gStringVar4 -_080DAB68: .4byte gUnknown_8488D60 - thumb_func_end MEScrCmd_addrareword - - thumb_func_start sub_80DAB6C -sub_80DAB6C: @ 80DAB6C - push {r4,lr} - adds r4, r0, 0 - bl SetIncompatible - movs r0, 0 - str r0, [r4, 0x70] - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80DAB6C - - thumb_func_start sub_80DAB80 -sub_80DAB80: @ 80DAB80 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x88 - adds r6, r0, 0 - bl ScriptReadWord - ldr r1, [r6, 0x68] - subs r0, r1 - ldr r1, [r6, 0x64] - adds r5, r0, r1 - movs r0, 0x64 - adds r0, r5 - mov r8, r0 - add r4, sp, 0x24 - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0x64 - bl memcpy - adds r0, r4, 0 - movs r1, 0x41 - bl GetMonData - lsls r0, 16 - lsrs r4, r0, 16 - movs r0, 0xCE - lsls r0, 1 - cmp r4, r0 - bne _080DABD0 - ldr r0, _080DABC8 @ =gStringVar1 - ldr r1, _080DABCC @ =gText_EggNickname - movs r2, 0xB - bl StringCopyN - b _080DABDA - .align 2, 0 -_080DABC8: .4byte gStringVar1 -_080DABCC: .4byte gText_EggNickname -_080DABD0: - ldr r0, _080DABF0 @ =gStringVar1 - ldr r1, _080DABF4 @ =gUnknown_8415A66 - movs r2, 0xB - bl StringCopyN -_080DABDA: - ldr r0, _080DABF8 @ =gPlayerPartyCount - ldrb r0, [r0] - cmp r0, 0x6 - bne _080DAC04 - ldr r0, _080DABFC @ =gStringVar4 - ldr r1, _080DAC00 @ =gUnknown_8488D8E - bl StringExpandPlaceholders - movs r0, 0x3 - b _080DAC6E - .align 2, 0 -_080DABF0: .4byte gStringVar1 -_080DABF4: .4byte gUnknown_8415A66 -_080DABF8: .4byte gPlayerPartyCount -_080DABFC: .4byte gStringVar4 -_080DAC00: .4byte gUnknown_8488D8E -_080DAC04: - ldr r7, _080DAC80 @ =gUnknown_2024478 - adds r0, r7, 0 - adds r1, r5, 0 - movs r2, 0x64 - bl memcpy - mov r0, sp - mov r1, r8 - movs r2, 0x24 - bl memcpy - movs r0, 0xCE - lsls r0, 1 - cmp r4, r0 - beq _080DAC3E - adds r0, r4, 0 - bl SpeciesToNationalPokedexNum - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r4, 0 - movs r1, 0x2 - bl sub_8088E74 - adds r0, r4, 0 - movs r1, 0x3 - bl sub_8088E74 -_080DAC3E: - adds r0, r7, 0 - movs r1, 0xC - bl GetMonData - lsls r0, 16 - lsrs r0, 16 - bl itemid_is_mail - lsls r0, 24 - cmp r0, 0 - beq _080DAC5C - adds r0, r7, 0 - mov r1, sp - bl GiveMailToMon2 -_080DAC5C: - bl CompactPartySlots - bl CalculatePlayerPartyCount - ldr r0, _080DAC84 @ =gStringVar4 - ldr r1, _080DAC88 @ =gUnknown_8488D7C - bl StringExpandPlaceholders - movs r0, 0x2 -_080DAC6E: - str r0, [r6, 0x6C] - movs r0, 0 - add sp, 0x88 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080DAC80: .4byte gUnknown_2024478 -_080DAC84: .4byte gStringVar4 -_080DAC88: .4byte gUnknown_8488D7C - thumb_func_end sub_80DAB80 - - thumb_func_start sub_80DAC8C -sub_80DAC8C: @ 80DAC8C - push {r4,lr} - adds r4, r0, 0 - bl ScriptReadWord - adds r1, r0, 0 - ldr r0, [r4, 0x68] - subs r1, r0 - ldr r0, [r4, 0x64] - adds r1, r0 - ldr r0, _080DACC8 @ =gSaveBlock2Ptr - ldr r0, [r0] - movs r2, 0x94 - lsls r2, 3 - adds r0, r2 - movs r2, 0xBC - bl memcpy - bl sub_80E7490 - ldr r0, _080DACCC @ =gStringVar4 - ldr r1, _080DACD0 @ =gUnknown_8488DBD - bl StringExpandPlaceholders - movs r0, 0x2 - str r0, [r4, 0x6C] - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080DACC8: .4byte gSaveBlock2Ptr -_080DACCC: .4byte gStringVar4 -_080DACD0: .4byte gUnknown_8488DBD - thumb_func_end sub_80DAC8C - - thumb_func_start sub_80DACD4 -sub_80DACD4: @ 80DACD4 - push {r4,lr} - adds r4, r0, 0 - bl SetIncompatible - movs r0, 0 - str r0, [r4, 0x70] - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80DACD4 - - thumb_func_start MEScrCmd_checksum -MEScrCmd_checksum: @ 80DACE8 - push {r4-r6,lr} - adds r6, r0, 0 - bl ScriptReadWord - adds r5, r0, 0 - adds r0, r6, 0 - bl ScriptReadWord - adds r4, r0, 0 - ldr r0, [r6, 0x68] - subs r4, r0 - ldr r0, [r6, 0x64] - adds r4, r0 - adds r0, r6, 0 - bl ScriptReadWord - adds r1, r0, 0 - ldr r0, [r6, 0x68] - subs r1, r0 - ldr r0, [r6, 0x64] - adds r1, r0 - subs r1, r4 - adds r0, r4, 0 - bl CalcByteArraySum - cmp r5, r0 - beq _080DAD26 - movs r0, 0 - str r0, [r6, 0x70] - movs r0, 0x1 - str r0, [r6, 0x6C] -_080DAD26: - movs r0, 0x1 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end MEScrCmd_checksum - - thumb_func_start MEScrCmd_crc -MEScrCmd_crc: @ 80DAD30 - push {r4-r6,lr} - adds r6, r0, 0 - bl ScriptReadWord - adds r5, r0, 0 - adds r0, r6, 0 - bl ScriptReadWord - adds r4, r0, 0 - ldr r0, [r6, 0x68] - subs r4, r0 - ldr r0, [r6, 0x64] - adds r4, r0 - adds r0, r6, 0 - bl ScriptReadWord - adds r1, r0, 0 - ldr r0, [r6, 0x68] - subs r1, r0 - ldr r0, [r6, 0x64] - adds r1, r0 - subs r1, r4 - adds r0, r4, 0 - bl CalcCRC16 - lsls r0, 16 - lsrs r0, 16 - cmp r5, r0 - beq _080DAD72 - movs r0, 0 - str r0, [r6, 0x70] - movs r0, 0x1 - str r0, [r6, 0x6C] -_080DAD72: - movs r0, 0x1 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end MEScrCmd_crc - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/naming_screen.s b/asm/naming_screen.s index 320cbe788..b3c9d1f73 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 @@ -1648,18 +1648,18 @@ sub_809E6B8: @ 809E6B8 lsrs r0, 24 bl sub_809E644 lsls r0, 16 - ldr r2, _0809E6D8 @ =gUnknown_20375F8 + ldr r2, _0809E6D8 @ =gPlttBufferFaded lsrs r0, 15 adds r2, r0, r2 - ldr r1, _0809E6DC @ =gUnknown_20371F8 + ldr r1, _0809E6DC @ =gPlttBufferUnfaded adds r0, r1 ldrh r0, [r0] strh r0, [r2] pop {r0} bx r0 .align 2, 0 -_0809E6D8: .4byte gUnknown_20375F8 -_0809E6DC: .4byte gUnknown_20371F8 +_0809E6D8: .4byte gPlttBufferFaded +_0809E6DC: .4byte gPlttBufferUnfaded thumb_func_end sub_809E6B8 thumb_func_start sub_809E6E0 diff --git a/asm/new_game.s b/asm/new_game.s index 80affe1cb..cec2b2c9a 100644 --- a/asm/new_game.s +++ b/asm/new_game.s @@ -241,7 +241,7 @@ sub_8054A60: @ 8054A60 bl PlayTimeCounter_Reset bl sub_80549AC bl sub_806E0D0 - bl sub_812D304 + bl ResetFameChecker ldr r0, [r6] movs r1, 0xA4 lsls r1, 2 diff --git a/asm/oak_speech.s b/asm/oak_speech.s index 95b77de17..5f2326487 100644 --- a/asm/oak_speech.s +++ b/asm/oak_speech.s @@ -270,10 +270,10 @@ sub_812EB10: @ 812EB10 thumb_func_start sub_812EB2C sub_812EB2C: @ 812EB2C push {lr} - ldr r0, _0812EB48 @ =gUnknown_20371F8 + ldr r0, _0812EB48 @ =gPlttBufferUnfaded movs r1, 0 strh r1, [r0] - ldr r0, _0812EB4C @ =gUnknown_20375F8 + ldr r0, _0812EB4C @ =gPlttBufferFaded strh r1, [r0] ldr r0, _0812EB50 @ =sub_812EB58 bl CreateTask @@ -282,8 +282,8 @@ sub_812EB2C: @ 812EB2C pop {r0} bx r0 .align 2, 0 -_0812EB48: .4byte gUnknown_20371F8 -_0812EB4C: .4byte gUnknown_20375F8 +_0812EB48: .4byte gPlttBufferUnfaded +_0812EB4C: .4byte gPlttBufferFaded _0812EB50: .4byte sub_812EB58 _0812EB54: .4byte sub_812EB10 thumb_func_end sub_812EB2C @@ -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] @@ -4188,9 +4188,9 @@ _08130B4A: cmp r1, 0xE ble _08130B96 movs r2, 0 - ldr r6, _08130BA0 @ =gUnknown_20375F8 + ldr r6, _08130BA0 @ =gPlttBufferFaded adds r3, r7, 0 - ldr r4, _08130BA4 @ =gUnknown_20371F8 + ldr r4, _08130BA4 @ =gPlttBufferUnfaded _08130B78: adds r0, r2, 0 adds r0, 0x40 @@ -4212,8 +4212,8 @@ _08130B96: bx r0 .align 2, 0 _08130B9C: .4byte 0x00007fff -_08130BA0: .4byte gUnknown_20375F8 -_08130BA4: .4byte gUnknown_20371F8 +_08130BA0: .4byte gPlttBufferFaded +_08130BA4: .4byte gPlttBufferUnfaded thumb_func_end sub_8130B10 thumb_func_start sub_8130BA8 @@ -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 874d3aed9..7ee737053 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 fd8949d2f..2b3ca139d 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -2190,7 +2190,7 @@ sub_8055C74: @ 8055C74 adds r1, 0x7 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r0, 16 pop {r1} @@ -2677,7 +2677,7 @@ sub_8055FE0: @ 8055FE0 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsSurfable @@ -3263,7 +3263,7 @@ sub_805644C: @ 805644C mov r0, sp adds r1, r5, 0 adds r2, r4, 0 - bl sub_806C8BC + bl FieldGetPlayerInput mov r0, sp bl sub_806CD30 bl ScriptContext2_IsEnabled @@ -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 @@ -3727,7 +3727,7 @@ c2_8056854: @ 8056854 ldr r0, _08056878 @ =c1_link_related bl sub_80565E0 bl sub_80578D8 - ldr r0, _0805687C @ =gUnknown_3003F3C + ldr r0, _0805687C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08056888 @@ -3736,7 +3736,7 @@ c2_8056854: @ 8056854 b _0805688C .align 2, 0 _08056878: .4byte c1_link_related -_0805687C: .4byte gUnknown_3003F3C +_0805687C: .4byte gWirelessCommType _08056880: .4byte gUnknown_3005020 _08056884: .4byte sub_807DE58 _08056888: @@ -3892,7 +3892,7 @@ sub_80569BC: @ 80569BC bne _080569CE bl sub_80098B8 _080569CE: - ldr r0, _080569E4 @ =gUnknown_3003F3C + ldr r0, _080569E4 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _080569E8 @@ -3902,7 +3902,7 @@ _080569CE: bl DisableInterrupts b _080569F4 .align 2, 0 -_080569E4: .4byte gUnknown_3003F3C +_080569E4: .4byte gWirelessCommType _080569E8: movs r0, 0x2 bl DisableInterrupts @@ -4054,7 +4054,7 @@ _08056B36: bl cur_mapheader_run_tileset_funcs_after_some_cpuset b _08056B62 _08056B3C: - ldr r0, _08056B54 @ =gUnknown_3003F3C + ldr r0, _08056B54 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08056B62 @@ -4064,7 +4064,7 @@ _08056B3C: bl sub_80FCD74 b _08056B62 .align 2, 0 -_08056B54: .4byte gUnknown_3003F3C +_08056B54: .4byte gWirelessCommType _08056B58: bl map_post_load_hook_exec lsls r0, 24 @@ -4385,7 +4385,7 @@ _08056E12: bl cur_mapheader_run_tileset_funcs_after_some_cpuset b _08056E3E _08056E18: - ldr r0, _08056E30 @ =gUnknown_3003F3C + ldr r0, _08056E30 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08056E3E @@ -4395,7 +4395,7 @@ _08056E18: bl sub_80FCD74 b _08056E3E .align 2, 0 -_08056E30: .4byte gUnknown_3003F3C +_08056E30: .4byte gWirelessCommType _08056E34: bl map_post_load_hook_exec lsls r0, 24 @@ -4735,7 +4735,7 @@ sub_8057100: @ 8057100 sub_8057114: @ 8057114 push {lr} ldr r2, _08057138 @ =gMapObjects - ldr r3, _0805713C @ =gUnknown_2037078 + ldr r3, _0805713C @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4751,7 +4751,7 @@ sub_8057114: @ 8057114 bx r0 .align 2, 0 _08057138: .4byte gMapObjects -_0805713C: .4byte gUnknown_2037078 +_0805713C: .4byte gPlayerAvatar thumb_func_end sub_8057114 thumb_func_start sub_8057140 @@ -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,14 +5629,14 @@ _08057876: pop {r0} bx r0 .align 2, 0 -_0805787C: .4byte gUnknown_2037AB8 +_0805787C: .4byte gPaletteFade _08057880: .4byte sub_805671C thumb_func_end sub_8057854 thumb_func_start c1_link_related c1_link_related: @ 8057884 push {r4,lr} - ldr r0, _080578C8 @ =gUnknown_3003F3C + ldr r0, _080578C8 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0805789E @@ -5665,7 +5665,7 @@ _080578C0: pop {r0} bx r0 .align 2, 0 -_080578C8: .4byte gUnknown_3003F3C +_080578C8: .4byte gWirelessCommType _080578CC: .4byte gUnknown_300502C _080578D0: .4byte gUnknown_3003E60 _080578D4: .4byte gUnknown_3000E84 @@ -5710,7 +5710,7 @@ _0805790C: .4byte gUnknown_3000E84 thumb_func_start sub_8057910 sub_8057910: @ 8057910 push {lr} - ldr r0, _08057934 @ =gUnknown_3003F3C + ldr r0, _08057934 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0805792E @@ -5727,7 +5727,7 @@ _0805792E: pop {r0} bx r0 .align 2, 0 -_08057934: .4byte gUnknown_3003F3C +_08057934: .4byte gWirelessCommType _08057938: .4byte gUnknown_3000E89 thumb_func_end sub_8057910 @@ -6137,7 +6137,7 @@ _08057C6C: movs r0, 0x11 strh r0, [r1] _08057C72: - ldr r0, _08057CB4 @ =gUnknown_3003F3C + ldr r0, _08057CB4 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08057CA8 @@ -6168,7 +6168,7 @@ _08057CA8: bx r0 .align 2, 0 _08057CB0: .4byte gUnknown_3005028 -_08057CB4: .4byte gUnknown_3003F3C +_08057CB4: .4byte gWirelessCommType thumb_func_end sub_8057C4C thumb_func_start sub_8057CB8 @@ -6640,7 +6640,7 @@ _08057F96: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt strh r0, [r6, 0xC] add sp, 0x4 pop {r4-r6} @@ -6913,7 +6913,7 @@ sub_80581C8: @ 80581C8 push {lr} movs r0, 0x6 bl PlaySE - bl sub_806F258 + bl ShowStartMenu bl ScriptContext2_Enable pop {r0} bx r0 @@ -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: @@ -7089,7 +7089,7 @@ _08058312: thumb_func_start sub_8058318 sub_8058318: @ 8058318 push {lr} - ldr r0, _08058330 @ =gUnknown_3003F3C + ldr r0, _08058330 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _08058334 @@ -7099,7 +7099,7 @@ sub_8058318: @ 8058318 movs r0, 0x1 b _08058336 .align 2, 0 -_08058330: .4byte gUnknown_3003F3C +_08058330: .4byte gWirelessCommType _08058334: movs r0, 0 _08058336: @@ -7110,7 +7110,7 @@ _08058336: thumb_func_start sub_805833C sub_805833C: @ 805833C push {lr} - ldr r0, _08058350 @ =gUnknown_3003F3C + ldr r0, _08058350 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0805835C @@ -7120,7 +7120,7 @@ sub_805833C: @ 805833C ldrb r0, [r0] b _08058364 .align 2, 0 -_08058350: .4byte gUnknown_3003F3C +_08058350: .4byte gWirelessCommType _08058354: .4byte gUnknown_3003FB0 _08058358: .4byte 0x00000339 _0805835C: diff --git a/asm/palette.s b/asm/palette.s index a99aeda10..ed9327106 100644 --- a/asm/palette.s +++ b/asm/palette.s @@ -17,13 +17,13 @@ LoadCompressedPalette: @ 80703A8 adds r1, r6, 0 bl LZDecompressWram lsls r4, 1 - ldr r1, _080703E4 @ =gUnknown_20371F8 + ldr r1, _080703E4 @ =gPlttBufferUnfaded adds r1, r4, r1 lsrs r5, 17 adds r0, r6, 0 adds r2, r5, 0 bl CpuSet - ldr r0, _080703E8 @ =gUnknown_20375F8 + ldr r0, _080703E8 @ =gPlttBufferFaded adds r4, r0 adds r0, r6, 0 adds r1, r4, 0 @@ -34,8 +34,8 @@ LoadCompressedPalette: @ 80703A8 bx r0 .align 2, 0 _080703E0: .4byte gUnknown_2037ACC -_080703E4: .4byte gUnknown_20371F8 -_080703E8: .4byte gUnknown_20375F8 +_080703E4: .4byte gPlttBufferUnfaded +_080703E8: .4byte gPlttBufferFaded thumb_func_end LoadCompressedPalette thumb_func_start LoadPalette @@ -47,12 +47,12 @@ LoadPalette: @ 80703EC lsls r4, 16 lsls r5, 16 lsrs r4, 15 - ldr r1, _0807041C @ =gUnknown_20371F8 + ldr r1, _0807041C @ =gPlttBufferUnfaded adds r1, r4, r1 lsrs r5, 17 adds r2, r5, 0 bl CpuSet - ldr r0, _08070420 @ =gUnknown_20375F8 + ldr r0, _08070420 @ =gPlttBufferFaded adds r4, r0 adds r0, r6, 0 adds r1, r4, 0 @@ -62,8 +62,8 @@ LoadPalette: @ 80703EC pop {r0} bx r0 .align 2, 0 -_0807041C: .4byte gUnknown_20371F8 -_08070420: .4byte gUnknown_20375F8 +_0807041C: .4byte gPlttBufferUnfaded +_08070420: .4byte gPlttBufferFaded thumb_func_end LoadPalette thumb_func_start FillPalette @@ -80,7 +80,7 @@ FillPalette: @ 8070424 mov r0, sp strh r6, [r0] lsrs r4, 15 - ldr r1, _0807046C @ =gUnknown_20371F8 + ldr r1, _0807046C @ =gPlttBufferUnfaded adds r1, r4, r1 lsrs r5, 17 movs r0, 0x80 @@ -92,7 +92,7 @@ FillPalette: @ 8070424 mov r0, sp adds r0, 0x2 strh r6, [r0] - ldr r1, _08070470 @ =gUnknown_20375F8 + ldr r1, _08070470 @ =gPlttBufferFaded adds r4, r1 adds r1, r4, 0 adds r2, r5, 0 @@ -102,14 +102,14 @@ FillPalette: @ 8070424 pop {r0} bx r0 .align 2, 0 -_0807046C: .4byte gUnknown_20371F8 -_08070470: .4byte gUnknown_20375F8 +_0807046C: .4byte gPlttBufferUnfaded +_08070470: .4byte gPlttBufferFaded thumb_func_end FillPalette thumb_func_start TransferPlttBuffer 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 @@ -118,7 +118,7 @@ TransferPlttBuffer: @ 8070474 lsrs r3, r0, 24 cmp r3, 0 bne _080704B6 - ldr r1, _080704C0 @ =gUnknown_20375F8 + ldr r1, _080704C0 @ =gPlttBufferFaded movs r2, 0xA0 lsls r2, 19 ldr r0, _080704C4 @ =0x040000d4 @@ -145,8 +145,8 @@ _080704B6: pop {r0} bx r0 .align 2, 0 -_080704BC: .4byte gUnknown_2037AB8 -_080704C0: .4byte gUnknown_20375F8 +_080704BC: .4byte gPaletteFade +_080704C0: .4byte gPlttBufferFaded _080704C4: .4byte 0x040000d4 _080704C8: .4byte 0x80000200 _080704CC: .4byte gUnknown_2037AC8 @@ -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 @@ -224,8 +224,8 @@ ReadPlttIntoBuffers: @ 8070548 lsls r0, 19 mov r12, r0 movs r4, 0 - ldr r7, _0807057C @ =gUnknown_20371F8 - ldr r6, _08070580 @ =gUnknown_20375F8 + ldr r7, _0807057C @ =gPlttBufferUnfaded + ldr r6, _08070580 @ =gPlttBufferFaded ldr r5, _08070584 @ =0x000001ff _08070558: lsls r1, r4, 1 @@ -246,8 +246,8 @@ _08070558: pop {r0} bx r0 .align 2, 0 -_0807057C: .4byte gUnknown_20371F8 -_08070580: .4byte gUnknown_20375F8 +_0807057C: .4byte gPlttBufferUnfaded +_08070580: .4byte gPlttBufferFaded _08070584: .4byte 0x000001ff thumb_func_end ReadPlttIntoBuffers @@ -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,13 +367,13 @@ _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 ands r0, r1 strb r0, [r4, 0x8] - ldr r0, _080706C4 @ =gUnknown_20375F8 + ldr r0, _080706C4 @ =gPlttBufferFaded movs r1, 0xA0 lsls r1, 19 ldr r2, _080706C8 @ =0x04000100 @@ -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,8 +408,8 @@ _080706B4: pop {r1} bx r1 .align 2, 0 -_080706C0: .4byte gUnknown_2037AB8 -_080706C4: .4byte gUnknown_20375F8 +_080706C0: .4byte gPaletteFade +_080706C4: .4byte gPlttBufferFaded _080706C8: .4byte 0x04000100 _080706CC: .4byte gUnknown_2037AC8 thumb_func_end BeginNormalPaletteFade @@ -542,9 +542,9 @@ unused_sub_80A1CDC: @ 8070790 lsrs r0, r2, 27 cmp r6, r0 bcs _08070878 - ldr r0, _0807081C @ =gUnknown_20371F8 + ldr r0, _0807081C @ =gPlttBufferUnfaded mov r12, r0 - ldr r7, _08070820 @ =gUnknown_20375F8 + ldr r7, _08070820 @ =gPlttBufferFaded _080707C4: ldr r0, [r4, 0x4] lsls r0, 11 @@ -591,15 +591,15 @@ _080707C4: bcc _080707C4 b _08070878 .align 2, 0 -_0807081C: .4byte gUnknown_20371F8 -_08070820: .4byte gUnknown_20375F8 +_0807081C: .4byte gPlttBufferUnfaded +_08070820: .4byte gPlttBufferFaded _08070824: .4byte 0x000003ff _08070828: .4byte 0xffe007ff _0807082C: lsrs r0, r2, 27 cmp r6, r0 bcs _08070878 - ldr r3, _080708E4 @ =gUnknown_20375F8 + ldr r3, _080708E4 @ =gPlttBufferFaded _08070834: ldr r1, [r4, 0x4] lsls r1, 11 @@ -693,7 +693,7 @@ _080708C8: pop {r0} bx r0 .align 2, 0 -_080708E4: .4byte gUnknown_20375F8 +_080708E4: .4byte gPlttBufferFaded _080708E8: .4byte 0x000003ff _080708EC: .4byte 0xffe007ff _080708F0: .4byte 0xfffff01f @@ -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 @@ -768,7 +768,7 @@ _08070950: adds r1, r2, 0 cmp r3, r1 bcs _080709A8 - ldr r6, _080709B0 @ =gUnknown_20375F8 + ldr r6, _080709B0 @ =gPlttBufferFaded _0807097C: ldrh r1, [r4, 0x4] lsls r1, 21 @@ -797,7 +797,7 @@ _080709A8: pop {r0} bx r0 .align 2, 0 -_080709B0: .4byte gUnknown_20375F8 +_080709B0: .4byte gPlttBufferFaded thumb_func_end unused_sub_80A1E40 thumb_func_start unused_sub_80A1F00 @@ -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 @@ -1237,7 +1237,7 @@ InvertPlttBuffer: @ 8070CCC movs r3, 0 cmp r1, 0 beq _08070D0A - ldr r7, _08070D10 @ =gUnknown_20375F8 + ldr r7, _08070D10 @ =gPlttBufferFaded _08070CD8: movs r0, 0x1 ands r0, r1 @@ -1271,7 +1271,7 @@ _08070D0A: pop {r0} bx r0 .align 2, 0 -_08070D10: .4byte gUnknown_20375F8 +_08070D10: .4byte gPlttBufferFaded thumb_func_end InvertPlttBuffer thumb_func_start TintPlttBuffer @@ -1308,7 +1308,7 @@ _08070D3E: cmp r0, 0 beq _08070DC2 movs r4, 0 - ldr r2, _08070DE0 @ =gUnknown_20375F8 + ldr r2, _08070DE0 @ =gPlttBufferFaded mov r8, r2 ldr r1, [sp] lsls r0, r1, 24 @@ -1383,7 +1383,7 @@ _08070DD0: pop {r0} bx r0 .align 2, 0 -_08070DE0: .4byte gUnknown_20375F8 +_08070DE0: .4byte gPlttBufferFaded _08070DE4: .4byte 0xfffffc1f thumb_func_end TintPlttBuffer @@ -1396,9 +1396,9 @@ UnfadePlttBuffer: @ 8070DE8 movs r3, 0 cmp r1, 0 beq _08070E32 - ldr r0, _08070E3C @ =gUnknown_20375F8 + ldr r0, _08070E3C @ =gPlttBufferFaded mov r8, r0 - ldr r0, _08070E40 @ =gUnknown_20371F8 + ldr r0, _08070E40 @ =gPlttBufferUnfaded mov r12, r0 _08070DFE: movs r0, 0x1 @@ -1436,8 +1436,8 @@ _08070E32: pop {r0} bx r0 .align 2, 0 -_08070E3C: .4byte gUnknown_20375F8 -_08070E40: .4byte gUnknown_20371F8 +_08070E3C: .4byte gPlttBufferFaded +_08070E40: .4byte gPlttBufferUnfaded thumb_func_end UnfadePlttBuffer thumb_func_start BeginFastPaletteFade @@ -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 @@ -1498,7 +1498,7 @@ BeginFastPaletteFadeInternal: @ 8070E68 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r1, _08070EE0 @ =gUnknown_20375F8 + ldr r1, _08070EE0 @ =gPlttBufferFaded ldr r2, _08070EE4 @ =0x01000200 mov r0, sp bl CpuSet @@ -1510,7 +1510,7 @@ _08070EBA: ldr r2, _08070EE8 @ =0x00007fff adds r1, r2, 0 strh r1, [r0] - ldr r1, _08070EE0 @ =gUnknown_20375F8 + ldr r1, _08070EE0 @ =gPlttBufferFaded ldr r2, _08070EE4 @ =0x01000200 bl CpuSet _08070ED0: @@ -1520,8 +1520,8 @@ _08070ED0: pop {r0} bx r0 .align 2, 0 -_08070EDC: .4byte gUnknown_2037AB8 -_08070EE0: .4byte gUnknown_20375F8 +_08070EDC: .4byte gPaletteFade +_08070EE0: .4byte gPlttBufferFaded _08070EE4: .4byte 0x01000200 _08070EE8: .4byte 0x00007fff thumb_func_end BeginFastPaletteFadeInternal @@ -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 @@ -1599,7 +1599,7 @@ _08070F62: b _08071148 _08070F6A: lsls r2, r7, 1 - ldr r0, _08070FF0 @ =gUnknown_20371F8 + ldr r0, _08070FF0 @ =gPlttBufferUnfaded adds r0, r2, r0 ldr r1, [r0] lsls r3, r1, 27 @@ -1609,7 +1609,7 @@ _08070F6A: lsls r1, 17 lsrs r1, 27 mov r8, r1 - ldr r0, _08070FF4 @ =gUnknown_20375F8 + ldr r0, _08070FF4 @ =gPlttBufferFaded adds r2, r0 mov r9, r2 ldr r1, [r2] @@ -1669,8 +1669,8 @@ _08070FD0: bcc _08070F6A b _08071148 .align 2, 0 -_08070FF0: .4byte gUnknown_20371F8 -_08070FF4: .4byte gUnknown_20375F8 +_08070FF0: .4byte gPlttBufferUnfaded +_08070FF4: .4byte gPlttBufferFaded _08070FF8: adds r7, r2, 0 cmp r7, r10 @@ -1678,7 +1678,7 @@ _08070FF8: b _08071148 _08071000: lsls r1, r7, 1 - ldr r0, _08071058 @ =gUnknown_20375F8 + ldr r0, _08071058 @ =gPlttBufferFaded adds r2, r1, r0 ldr r1, [r2] lsls r0, r1, 27 @@ -1725,14 +1725,14 @@ _0807103A: bcc _08071000 b _08071148 .align 2, 0 -_08071058: .4byte gUnknown_20375F8 +_08071058: .4byte gPlttBufferFaded _0807105C: adds r7, r2, 0 cmp r7, r10 bcs _08071148 _08071062: lsls r2, r7, 1 - ldr r0, _080710DC @ =gUnknown_20371F8 + ldr r0, _080710DC @ =gPlttBufferUnfaded adds r0, r2, r0 ldr r1, [r0] lsls r3, r1, 27 @@ -1742,7 +1742,7 @@ _08071062: lsls r1, 17 lsrs r1, 27 mov r8, r1 - ldr r0, _080710E0 @ =gUnknown_20375F8 + ldr r0, _080710E0 @ =gPlttBufferFaded adds r2, r0 ldr r1, [r2] lsls r0, r1, 27 @@ -1795,13 +1795,13 @@ _080710BC: bcc _08071062 b _08071148 .align 2, 0 -_080710DC: .4byte gUnknown_20371F8 -_080710E0: .4byte gUnknown_20375F8 +_080710DC: .4byte gPlttBufferUnfaded +_080710E0: .4byte gPlttBufferFaded _080710E4: adds r7, r2, 0 cmp r7, r10 bcs _08071148 - ldr r4, _08071170 @ =gUnknown_20375F8 + ldr r4, _08071170 @ =gPlttBufferFaded mov r8, r4 _080710EE: lsls r0, r7, 1 @@ -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 @@ -1873,10 +1873,10 @@ _08071148: ldrb r0, [r1, 0x7] b _08071244 .align 2, 0 -_08071170: .4byte gUnknown_20375F8 -_08071174: .4byte gUnknown_2037AB8 +_08071170: .4byte gPlttBufferFaded +_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 @@ -1934,35 +1934,35 @@ _080711E0: beq _08071220 b _0807122C _080711EA: - ldr r0, _080711F8 @ =gUnknown_20371F8 - ldr r1, _080711FC @ =gUnknown_20375F8 + ldr r0, _080711F8 @ =gPlttBufferUnfaded + ldr r1, _080711FC @ =gPlttBufferFaded ldr r2, _08071200 @ =0x04000100 bl CpuSet b _0807122C .align 2, 0 -_080711F8: .4byte gUnknown_20371F8 -_080711FC: .4byte gUnknown_20375F8 +_080711F8: .4byte gPlttBufferUnfaded +_080711FC: .4byte gPlttBufferFaded _08071200: .4byte 0x04000100 _08071204: movs r0, 0x1 negs r0, r0 str r0, [sp] - ldr r1, _08071218 @ =gUnknown_20375F8 + ldr r1, _08071218 @ =gPlttBufferFaded ldr r2, _0807121C @ =0x05000100 mov r0, sp bl CpuSet b _0807122C .align 2, 0 -_08071218: .4byte gUnknown_20375F8 +_08071218: .4byte gPlttBufferFaded _0807121C: .4byte 0x05000100 _08071220: str r1, [sp, 0x4] add r0, sp, 0x4 - ldr r1, _08071258 @ =gUnknown_20375F8 + ldr r1, _08071258 @ =gPlttBufferFaded ldr r2, _0807125C @ =0x05000100 bl CpuSet _0807122C: - 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 @@ -1987,9 +1987,9 @@ _08071246: pop {r1} bx r1 .align 2, 0 -_08071258: .4byte gUnknown_20375F8 +_08071258: .4byte gPlttBufferFaded _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 @@ -2371,8 +2371,8 @@ BlendPalettesUnfaded: @ 8071510 lsrs r4, 24 lsls r5, 16 lsrs r5, 16 - ldr r0, _0807153C @ =gUnknown_20371F8 - ldr r1, _08071540 @ =gUnknown_20375F8 + ldr r0, _0807153C @ =gPlttBufferUnfaded + ldr r1, _08071540 @ =gPlttBufferFaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -2384,8 +2384,8 @@ BlendPalettesUnfaded: @ 8071510 pop {r0} bx r0 .align 2, 0 -_0807153C: .4byte gUnknown_20371F8 -_08071540: .4byte gUnknown_20375F8 +_0807153C: .4byte gPlttBufferUnfaded +_08071540: .4byte gPlttBufferFaded thumb_func_end BlendPalettesUnfaded thumb_func_start TintPalette_GrayScale diff --git a/asm/party_menu.s b/asm/party_menu.s index 411fbb92a..c4980f984 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 @@ -647,7 +647,7 @@ _0811EF6C: .4byte _0811F010 _0811EF8C: ldr r4, _0811EFAC @ =gUnknown_203B0B8 - ldr r0, _0811EFB0 @ =gUnknown_8E82700 + ldr r0, _0811EFB0 @ =gFile_graphics_interface_party_menu_misc_sheet mov r1, sp bl malloc_and_decompress adds r1, r0, 0 @@ -661,19 +661,19 @@ _0811EF8C: b _0811F016 .align 2, 0 _0811EFAC: .4byte gUnknown_203B0B8 -_0811EFB0: .4byte gUnknown_8E82700 +_0811EFB0: .4byte gFile_graphics_interface_party_menu_misc_sheet _0811EFB4: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 bne _0811F030 - ldr r0, _0811EFCC @ =gUnknown_8E82AB0 + ldr r0, _0811EFCC @ =gFile_graphics_interface_party_menu_misc_tilemap ldr r1, _0811EFD0 @ =gUnknown_203B0BC ldr r1, [r1] bl LZDecompressWram b _0811F016 .align 2, 0 -_0811EFCC: .4byte gUnknown_8E82AB0 +_0811EFCC: .4byte gFile_graphics_interface_party_menu_misc_tilemap _0811EFD0: .4byte gUnknown_203B0BC _0811EFD4: ldr r0, _0811EFF4 @ =gUnknown_8E829C8 @@ -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 @@ -1245,13 +1245,13 @@ sub_811F430: @ 811F430 muls r1, r0 ldr r0, _0811F468 @ =gPlayerParty adds r6, r1, r0 - ldr r0, _0811F46C @ =gUnknown_203AD30 + ldr r0, _0811F46C @ =gSpecialVar_ItemId ldrh r4, [r0] ldr r0, _0811F470 @ =gUnknown_203B0A0 ldrb r0, [r0, 0xB] cmp r0, 0xC bne _0811F47C - ldr r0, _0811F474 @ =gUnknown_20370D0 + ldr r0, _0811F474 @ =gSpecialVar_Result movs r1, 0 strh r1, [r0] ldr r0, _0811F478 @ =gSpecialVar_0x8005 @@ -1266,9 +1266,9 @@ sub_811F430: @ 811F430 b _0811F4C6 .align 2, 0 _0811F468: .4byte gPlayerParty -_0811F46C: .4byte gUnknown_203AD30 +_0811F46C: .4byte gSpecialVar_ItemId _0811F470: .4byte gUnknown_203B0A0 -_0811F474: .4byte gUnknown_20370D0 +_0811F474: .4byte gSpecialVar_Result _0811F478: .4byte gSpecialVar_0x8005 _0811F47C: cmp r0, 0x3 @@ -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 @@ -2364,7 +2364,7 @@ _0811FCDA: _0811FCE8: movs r0, 0x5 bl PlaySE - ldr r1, _0811FD24 @ =gUnknown_20370C0 + ldr r1, _0811FD24 @ =gSpecialVar_0x8004 movs r0, 0 ldrsb r0, [r5, r0] strh r0, [r1] @@ -2390,7 +2390,7 @@ _0811FD1A: bl sub_811FA78 b _0811FD56 .align 2, 0 -_0811FD24: .4byte gUnknown_20370C0 +_0811FD24: .4byte gSpecialVar_0x8004 _0811FD28: .4byte gUnknown_203B0A0 _0811FD2C: .4byte gSpecialVar_0x8005 _0811FD30: .4byte gPlayerParty @@ -2498,7 +2498,7 @@ _0811FDF4: lsls r0, 24 cmp r0, 0 bne _0811FE04 - ldr r1, _0811FE1C @ =gUnknown_20370C0 + ldr r1, _0811FE1C @ =gSpecialVar_0x8004 movs r0, 0x7 strh r0, [r1] _0811FE04: @@ -2514,7 +2514,7 @@ _0811FE14: pop {r0} bx r0 .align 2, 0 -_0811FE1C: .4byte gUnknown_20370C0 +_0811FE1C: .4byte gSpecialVar_0x8004 _0811FE20: .4byte gUnknown_203B0C0 thumb_func_end sub_811FD88 @@ -4107,13 +4107,13 @@ sub_81209F4: @ 81209F4 bne _08120A24 movs r0, 0x5 bl PlaySE - ldr r0, _08120A20 @ =gUnknown_20370C0 + ldr r0, _08120A20 @ =gSpecialVar_0x8004 strh r5, [r0] adds r0, r4, 0 bl sub_811FA78 b _08120A46 .align 2, 0 -_08120A20: .4byte gUnknown_20370C0 +_08120A20: .4byte gSpecialVar_0x8004 _08120A24: movs r0, 0x1A bl PlaySE @@ -4215,14 +4215,14 @@ _08120AE4: beq _08120B02 b _08120B10 _08120AEA: - ldr r1, _08120AF8 @ =gUnknown_20370C0 + ldr r1, _08120AF8 @ =gSpecialVar_0x8004 movs r0, 0x7 strh r0, [r1] adds r0, r4, 0 bl sub_811FA78 b _08120B10 .align 2, 0 -_08120AF8: .4byte gUnknown_20370C0 +_08120AF8: .4byte gSpecialVar_0x8004 _08120AFC: movs r0, 0x5 bl PlaySE @@ -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] @@ -5118,7 +5118,7 @@ _08121194: ands r0, r1 cmp r0, 0xA beq _081211F0 - ldr r4, _081211E8 @ =gUnknown_84161C1 + ldr r4, _081211E8 @ =gFameCheckerText_Cancel movs r0, 0 adds r1, r4, 0 movs r2, 0 @@ -5146,7 +5146,7 @@ _08121194: .align 2, 0 _081211E0: .4byte gUnknown_845A108 _081211E4: .4byte gUnknown_203B0A0 -_081211E8: .4byte gUnknown_84161C1 +_081211E8: .4byte gFameCheckerText_Cancel _081211EC: .4byte gUnknown_8459FFC _081211F0: ldr r4, _08121240 @ =gUnknown_84161C8 @@ -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 @@ -9878,7 +9878,7 @@ c2_8123744: @ 8123744 mov r7, r8 push {r7} sub sp, 0xC - ldr r6, _0812376C @ =gUnknown_203AD30 + ldr r6, _0812376C @ =gSpecialVar_ItemId ldrh r0, [r6] cmp r0, 0 bne _08123778 @@ -9894,7 +9894,7 @@ c2_8123744: @ 8123744 ldr r1, [r3] b _081237AE .align 2, 0 -_0812376C: .4byte gUnknown_203AD30 +_0812376C: .4byte gSpecialVar_ItemId _08123770: .4byte gUnknown_203B0A0 _08123774: .4byte sub_8122C30 _08123778: @@ -9986,13 +9986,13 @@ 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 cmp r0, 0 bne _08123880 - ldr r0, _08123890 @ =gUnknown_203AD30 + ldr r0, _08123890 @ =gSpecialVar_ItemId ldrh r4, [r0] ldr r0, _08123894 @ =gUnknown_203B0A0 mov r8, r0 @@ -10031,8 +10031,8 @@ _08123880: pop {r0} bx r0 .align 2, 0 -_0812388C: .4byte gUnknown_2037AB8 -_08123890: .4byte gUnknown_203AD30 +_0812388C: .4byte gPaletteFade +_08123890: .4byte gSpecialVar_ItemId _08123894: .4byte gUnknown_203B0A0 _08123898: .4byte gPlayerParty _0812389C: .4byte gTasks @@ -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 @@ -10130,7 +10130,7 @@ _08123950: beq _08123A32 b _08123A40 _08123956: - ldr r5, _08123998 @ =gUnknown_203AD30 + ldr r5, _08123998 @ =gSpecialVar_ItemId ldrh r0, [r5] movs r1, 0x1 bl sub_809A1D8 @@ -10158,7 +10158,7 @@ _08123956: str r1, [r0] b _08123A40 .align 2, 0 -_08123998: .4byte gUnknown_203AD30 +_08123998: .4byte gSpecialVar_ItemId _0812399C: .4byte gUnknown_203B0D8 _081239A0: .4byte gStringVar4 _081239A4: .4byte gTasks @@ -10317,7 +10317,7 @@ sub_8123ACC: @ 8123ACC lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, _08123B40 @ =gUnknown_20370D0 + ldr r0, _08123B40 @ =gSpecialVar_Result ldrh r7, [r0] cmp r7, 0 bne _08123B4C @@ -10350,7 +10350,7 @@ sub_8123ACC: @ 8123ACC .align 2, 0 _08123B38: .4byte gUnknown_203B0A0 _08123B3C: .4byte gPlayerParty -_08123B40: .4byte gUnknown_20370D0 +_08123B40: .4byte gSpecialVar_Result _08123B44: .4byte gUnknown_203B0D8 _08123B48: .4byte sub_8122C30 _08123B4C: @@ -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 @@ -10400,20 +10400,20 @@ sub_8123B78: @ 8123B78 muls r0, r1 ldr r1, _08123BBC @ =gPlayerParty adds r0, r1 - ldr r1, _08123BC0 @ =gUnknown_203AD30 + ldr r1, _08123BC0 @ =gSpecialVar_ItemId ldrh r1, [r1] movs r2, 0 movs r3, 0 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 -_08123BC0: .4byte gUnknown_203AD30 +_08123BC0: .4byte gSpecialVar_ItemId _08123BC4: - ldr r0, _08123BE4 @ =gUnknown_203AD30 + ldr r0, _08123BE4 @ =gSpecialVar_ItemId ldrh r0, [r0] ldrh r1, [r1] movs r2, 0 @@ -10431,7 +10431,7 @@ _08123BDE: pop {r0} bx r0 .align 2, 0 -_08123BE4: .4byte gUnknown_203AD30 +_08123BE4: .4byte gSpecialVar_ItemId _08123BE8: .4byte gTasks _08123BEC: .4byte sub_8123BF0 thumb_func_end sub_8123B78 @@ -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 @@ -11337,7 +11337,7 @@ sub_8124354: @ 8124354 lsrs r4, 24 movs r0, 0x5 bl PlaySE - ldr r1, _0812437C @ =gUnknown_20370C0 + ldr r1, _0812437C @ =gSpecialVar_0x8004 ldr r0, _08124380 @ =gUnknown_203B0A0 ldrb r0, [r0, 0x9] lsls r0, 24 @@ -11349,7 +11349,7 @@ sub_8124354: @ 8124354 pop {r0} bx r0 .align 2, 0 -_0812437C: .4byte gUnknown_20370C0 +_0812437C: .4byte gSpecialVar_0x8004 _08124380: .4byte gUnknown_203B0A0 thumb_func_end sub_8124354 @@ -11984,7 +11984,7 @@ task_launch_hm_phase_2: @ 81248C8 cmp r0, 0x1 bne _081248F4 bl brm_get_selected_species - ldr r1, _081248FC @ =gUnknown_20386E0 + ldr r1, _081248FC @ =gFieldEffectArguments lsls r0, 16 lsrs r0, 16 str r0, [r1] @@ -11998,7 +11998,7 @@ _081248F4: pop {r0} bx r0 .align 2, 0 -_081248FC: .4byte gUnknown_20386E0 +_081248FC: .4byte gFieldEffectArguments _08124900: .4byte gUnknown_203B0C4 thumb_func_end task_launch_hm_phase_2 @@ -12074,7 +12074,7 @@ _08124976: hm_surf_run_dp02scr: @ 812497C push {lr} bl GetCursorSelectionMonId - ldr r1, _08124994 @ =gUnknown_20386E0 + ldr r1, _08124994 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -12083,7 +12083,7 @@ hm_surf_run_dp02scr: @ 812497C pop {r0} bx r0 .align 2, 0 -_08124994: .4byte gUnknown_20386E0 +_08124994: .4byte gFieldEffectArguments thumb_func_end hm_surf_run_dp02scr thumb_func_start sub_8124998 @@ -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 @@ -12250,7 +12250,7 @@ _08124AD8: .4byte sub_80568A8 hm2_waterfall: @ 8124ADC push {lr} bl GetCursorSelectionMonId - ldr r1, _08124AF4 @ =gUnknown_20386E0 + ldr r1, _08124AF4 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -12259,7 +12259,7 @@ hm2_waterfall: @ 8124ADC pop {r0} bx r0 .align 2, 0 -_08124AF4: .4byte gUnknown_20386E0 +_08124AF4: .4byte gFieldEffectArguments thumb_func_end hm2_waterfall thumb_func_start hm_prepare_waterfall @@ -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 @@ -12495,7 +12495,7 @@ _08124CCC: mov r8, r1 movs r7, 0 _08124CD2: - ldr r4, _08124D30 @ =gUnknown_203AD30 + ldr r4, _08124D30 @ =gSpecialVar_ItemId ldrh r0, [r4] bl GetItemEffectType lsls r0, 24 @@ -12529,7 +12529,7 @@ _08124D0C: cmp r5, 0x5 bls _08124CEA _08124D16: - ldr r0, _08124D30 @ =gUnknown_203AD30 + ldr r0, _08124D30 @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetPocketByItemId lsls r0, 24 @@ -12542,7 +12542,7 @@ _08124D28: movs r0, 0x7F b _08124D6A .align 2, 0 -_08124D30: .4byte gUnknown_203AD30 +_08124D30: .4byte gSpecialVar_ItemId _08124D34: .4byte gUnknown_203B0A0 _08124D38: .4byte gPlayerParty _08124D3C: .4byte sub_8124DB0 @@ -12642,7 +12642,7 @@ _08124DDC: .4byte sub_8124DE0 thumb_func_start sub_8124DE0 sub_8124DE0: @ 8124DE0 push {r4,lr} - ldr r4, _08124E0C @ =gUnknown_203AD30 + ldr r4, _08124E0C @ =gSpecialVar_ItemId ldrh r0, [r4] bl sub_80A1150 lsls r0, 24 @@ -12661,7 +12661,7 @@ sub_8124DE0: @ 8124DE0 bl sub_811C540 b _08124E38 .align 2, 0 -_08124E0C: .4byte gUnknown_203AD30 +_08124E0C: .4byte gSpecialVar_ItemId _08124E10: .4byte gUnknown_203B0A0 _08124E14: .4byte sub_8126BD4 _08124E18: @@ -12694,7 +12694,7 @@ sub_8124E48: @ 8124E48 mov r7, r8 push {r7} sub sp, 0xC - ldr r7, _08124EBC @ =gUnknown_203AD30 + ldr r7, _08124EBC @ =gSpecialVar_ItemId ldrh r0, [r7] bl ItemId_GetPocket lsls r0, 24 @@ -12742,7 +12742,7 @@ _08124EB0: bl SetMainCallback2 b _08124EE6 .align 2, 0 -_08124EBC: .4byte gUnknown_203AD30 +_08124EBC: .4byte gSpecialVar_ItemId _08124EC0: .4byte gUnknown_203B0A0 _08124EC4: .4byte gPlayerParty _08124EC8: @@ -12804,7 +12804,7 @@ sub_8124EFC: @ 8124EFC adds r0, r5, 0 adds r1, r4, 0 bl RemoveMonPPBonus - ldr r7, _08124F90 @ =gUnknown_203AD30 + ldr r7, _08124F90 @ =gSpecialVar_ItemId ldrh r0, [r7] bl ItemIdToBattleMoveId adds r1, r0, 0 @@ -12837,7 +12837,7 @@ _08124F7C: .align 2, 0 _08124F88: .4byte gUnknown_203B0A0 _08124F8C: .4byte gPlayerParty -_08124F90: .4byte gUnknown_203AD30 +_08124F90: .4byte gSpecialVar_ItemId _08124F94: ldr r4, _08124FC0 @ =gUnknown_203B0A0 ldrb r0, [r4, 0x8] @@ -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 @@ -13242,7 +13242,7 @@ sub_81252D0: @ 81252D0 muls r1, r0 ldr r0, _08125304 @ =gPlayerParty adds r5, r1, r0 - ldr r0, _08125308 @ =gUnknown_203AD30 + ldr r0, _08125308 @ =gSpecialVar_ItemId ldrh r6, [r0] adds r0, r5, 0 adds r1, r6, 0 @@ -13255,7 +13255,7 @@ sub_81252D0: @ 81252D0 .align 2, 0 _08125300: .4byte gUnknown_203B0A0 _08125304: .4byte gPlayerParty -_08125308: .4byte gUnknown_203AD30 +_08125308: .4byte gSpecialVar_ItemId _0812530C: adds r0, r6, 0 bl IsHPRecoveryItem @@ -13351,7 +13351,7 @@ ItemUseCB_Medicine: @ 81253B0 muls r1, r0 ldr r0, _0812543C @ =gPlayerParty adds r5, r1, r0 - ldr r0, _08125440 @ =gUnknown_203AD30 + ldr r0, _08125440 @ =gSpecialVar_ItemId ldrh r6, [r0] adds r0, r5, 0 adds r1, r6, 0 @@ -13399,7 +13399,7 @@ _08125428: .align 2, 0 _08125438: .4byte gUnknown_203B0A0 _0812543C: .4byte gPlayerParty -_08125440: .4byte gUnknown_203AD30 +_08125440: .4byte gSpecialVar_ItemId _08125444: .4byte gUnknown_203B0C0 _08125448: .4byte gUnknown_84169DC _0812544C: @@ -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 @@ -13735,7 +13735,7 @@ sub_81256F8: @ 81256F8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08125710 @ =gUnknown_203AD30 + ldr r0, _08125710 @ =gSpecialVar_ItemId ldrh r0, [r0] cmp r0, 0xAF bne _0812571C @@ -13745,7 +13745,7 @@ sub_81256F8: @ 81256F8 adds r0, r1 b _08125726 .align 2, 0 -_08125710: .4byte gUnknown_203AD30 +_08125710: .4byte gSpecialVar_ItemId _08125714: .4byte gSaveBlock1Ptr _08125718: .4byte 0x00003108 _0812571C: @@ -13878,7 +13878,7 @@ sub_812580C: @ 812580C muls r0, r1 ldr r1, _08125864 @ =gPlayerParty adds r0, r1 - ldr r1, _08125868 @ =gUnknown_203AD30 + ldr r1, _08125868 @ =gSpecialVar_ItemId ldrh r1, [r1] ldrb r2, [r3, 0x9] ldrb r3, [r3, 0xE] @@ -13909,7 +13909,7 @@ sub_812580C: @ 812580C .align 2, 0 _08125860: .4byte gUnknown_203B0A0 _08125864: .4byte gPlayerParty -_08125868: .4byte gUnknown_203AD30 +_08125868: .4byte gSpecialVar_ItemId _0812586C: .4byte gUnknown_203B0C0 _08125870: .4byte gUnknown_84169DC _08125874: .4byte gTasks @@ -13947,7 +13947,7 @@ sub_8125898: @ 8125898 ldr r0, _08125934 @ =gPlayerParty adds r4, r0 ldrb r0, [r5, 0x9] - ldr r6, _08125938 @ =gUnknown_203AD30 + ldr r6, _08125938 @ =gSpecialVar_ItemId ldrh r1, [r6] ldrb r2, [r5, 0xE] bl ExecuteTableBasedItemEffect__ @@ -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 @@ -14001,11 +14001,11 @@ sub_8125898: @ 8125898 .align 2, 0 _08125930: .4byte gUnknown_203B0A0 _08125934: .4byte gPlayerParty -_08125938: .4byte gUnknown_203AD30 +_08125938: .4byte gSpecialVar_ItemId _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 @@ -14020,7 +14020,7 @@ sub_8125958: @ 8125958 lsrs r6, r0, 24 movs r4, 0 ldr r7, _08125990 @ =gUnknown_203B0AE - ldr r0, _08125994 @ =gUnknown_203AD30 + ldr r0, _08125994 @ =gSpecialVar_ItemId ldrh r5, [r0] movs r0, 0xE negs r0, r0 @@ -14041,7 +14041,7 @@ sub_8125958: @ 8125958 b _081259F6 .align 2, 0 _08125990: .4byte gUnknown_203B0AE -_08125994: .4byte gUnknown_203AD30 +_08125994: .4byte gSpecialVar_ItemId _08125998: .4byte gUnknown_203B0C0 _0812599C: .4byte gUnknown_84169DC _081259A0: @@ -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 @@ -14275,7 +14275,7 @@ sub_8125B40: @ 8125B40 movs r0, 0xE adds r0, r7 mov r8, r0 - ldr r0, _08125BD8 @ =gUnknown_203AD30 + ldr r0, _08125BD8 @ =gSpecialVar_ItemId ldrh r5, [r0] ldr r1, _08125BDC @ =gStringVar1 adds r0, r4, 0 @@ -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 @@ -14325,10 +14325,10 @@ sub_8125B40: @ 8125B40 .align 2, 0 _08125BD0: .4byte gUnknown_203B0A0 _08125BD4: .4byte gPlayerParty -_08125BD8: .4byte gUnknown_203AD30 +_08125BD8: .4byte gSpecialVar_ItemId _08125BDC: .4byte gStringVar1 _08125BE0: .4byte gStringVar2 -_08125BE4: .4byte gUnknown_8247094 +_08125BE4: .4byte gMoveNames _08125BE8: .4byte 0x0000ffff _08125BEC: .4byte gUnknown_3005E98 _08125BF0: .4byte sub_8125C38 @@ -14391,7 +14391,7 @@ sub_8125C48: @ 8125C48 adds r5, r1, r0 adds r6, r2, 0 adds r6, 0xE - ldr r0, _08125CD4 @ =gUnknown_203AD30 + ldr r0, _08125CD4 @ =gSpecialVar_ItemId ldrh r4, [r0] movs r1, 0x2 ldrsh r0, [r6, r1] @@ -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 @@ -14441,10 +14441,10 @@ _08125C84: .align 2, 0 _08125CCC: .4byte gUnknown_203B0A0 _08125CD0: .4byte gPlayerParty -_08125CD4: .4byte gUnknown_203AD30 +_08125CD4: .4byte gSpecialVar_ItemId _08125CD8: .4byte gStringVar1 _08125CDC: .4byte gStringVar2 -_08125CE0: .4byte gUnknown_8247094 +_08125CE0: .4byte gMoveNames _08125CE4: .4byte gStringVar4 _08125CE8: .4byte gUnknown_8416DB3 _08125CEC: .4byte gTasks @@ -14516,7 +14516,7 @@ _08125D6C: .4byte gUnknown_203B0A0 _08125D70: cmp r0, 0x2 bne _08125D78 - ldr r0, _08125D84 @ =gUnknown_20370D0 + ldr r0, _08125D84 @ =gSpecialVar_Result strh r2, [r0] _08125D78: adds r0, r5, 0 @@ -14526,7 +14526,7 @@ _08125D7E: pop {r0} bx r0 .align 2, 0 -_08125D84: .4byte gUnknown_20370D0 +_08125D84: .4byte gSpecialVar_Result thumb_func_end sub_8125D2C thumb_func_start sub_8125D88 @@ -14684,7 +14684,7 @@ sub_8125E84: @ 8125E84 lsls r2, 16 lsrs r2, 16 ldrb r0, [r4, 0x9] - ldr r1, _08125ED8 @ =gUnknown_203AD30 + ldr r1, _08125ED8 @ =gSpecialVar_ItemId ldrh r1, [r1] ldr r3, _08125EDC @ =sub_8124EFC bl sub_811C568 @@ -14696,7 +14696,7 @@ sub_8125E84: @ 8125E84 .align 2, 0 _08125ED0: .4byte gUnknown_203B0A0 _08125ED4: .4byte gPlayerParty -_08125ED8: .4byte gUnknown_203AD30 +_08125ED8: .4byte gSpecialVar_ItemId _08125EDC: .4byte sub_8124EFC _08125EE0: .4byte gUnknown_3005E98 _08125EE4: .4byte sub_8125F4C @@ -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 @@ -14794,7 +14794,7 @@ sub_8125F5C: @ 8125F5C adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _08125FEC @ =gUnknown_203AD30 + ldr r0, _08125FEC @ =gSpecialVar_ItemId ldrh r2, [r0] movs r0, 0x4 adds r1, r6, 0 @@ -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 @@ -14828,10 +14828,10 @@ sub_8125F5C: @ 8125F5C .align 2, 0 _08125FE4: .4byte gUnknown_203B0A0 _08125FE8: .4byte gPlayerParty -_08125FEC: .4byte gUnknown_203AD30 +_08125FEC: .4byte gSpecialVar_ItemId _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 @@ -15077,7 +15077,7 @@ _0812620C: .4byte sub_812628C _08126210: cmp r0, 0x2 bne _08126218 - ldr r0, _08126228 @ =gUnknown_20370D0 + ldr r0, _08126228 @ =gSpecialVar_Result strh r5, [r0] _08126218: ldr r0, _0812622C @ =gTasks @@ -15089,7 +15089,7 @@ _08126218: str r0, [r1] b _0812626A .align 2, 0 -_08126228: .4byte gUnknown_20370D0 +_08126228: .4byte gSpecialVar_Result _0812622C: .4byte gTasks _08126230: .4byte sub_81255BC _08126234: @@ -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 @@ -15164,7 +15164,7 @@ dp05_rare_candy: @ 81262AC muls r1, r0 ldr r0, _081262EC @ =gPlayerParty adds r4, r1, r0 - ldr r0, _081262F0 @ =gUnknown_203AD30 + ldr r0, _081262F0 @ =gSpecialVar_ItemId ldrh r5, [r0] adds r0, r4, 0 movs r1, 0x38 @@ -15182,7 +15182,7 @@ dp05_rare_candy: @ 81262AC .align 2, 0 _081262E8: .4byte gUnknown_203B0A0 _081262EC: .4byte gPlayerParty -_081262F0: .4byte gUnknown_203AD30 +_081262F0: .4byte gSpecialVar_ItemId _081262F4: movs r4, 0x1 _081262F6: @@ -15252,7 +15252,7 @@ sub_8126350: @ 8126350 adds r0, r4, 0 bl sub_811D130 ldrb r0, [r6, 0x9] - ldr r5, _0812641C @ =gUnknown_203AD30 + ldr r5, _0812641C @ =gSpecialVar_ItemId ldrh r1, [r5] movs r2, 0 bl ExecuteTableBasedItemEffect__ @@ -15316,7 +15316,7 @@ sub_8126350: @ 8126350 _08126410: .4byte gUnknown_203B0A0 _08126414: .4byte gPlayerParty _08126418: .4byte gUnknown_203B09C -_0812641C: .4byte gUnknown_203AD30 +_0812641C: .4byte gSpecialVar_ItemId _08126420: .4byte gUnknown_203B0C0 _08126424: .4byte 0x0000ffff _08126428: .4byte gStringVar1 @@ -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 @@ -15919,7 +15919,7 @@ sub_81268D4: @ 81268D4 lsrs r0, 16 mov r8, r0 ldrb r0, [r6, 0x9] - ldr r1, _08126938 @ =gUnknown_203AD30 + ldr r1, _08126938 @ =gSpecialVar_ItemId ldrh r1, [r1] movs r2, 0 bl ExecuteTableBasedItemEffect__ @@ -15938,7 +15938,7 @@ _08126920: .align 2, 0 _08126930: .4byte gUnknown_203B0A0 _08126934: .4byte gPlayerParty -_08126938: .4byte gUnknown_203AD30 +_08126938: .4byte gSpecialVar_ItemId _0812693C: .4byte gTasks _08126940: .4byte sub_8126A18 _08126944: @@ -16108,13 +16108,13 @@ _08126A94: beq _08126AB4 ldr r0, _08126AD8 @ =gUnknown_203B0D0 ldr r1, [r0] - ldr r0, _08126ADC @ =gUnknown_203AD30 + ldr r0, _08126ADC @ =gSpecialVar_ItemId ldrh r2, [r0] ldr r3, _08126AE0 @ =0x0000ffff movs r0, 0x4 bl sub_80A2294 _08126AB4: - ldr r0, _08126ADC @ =gUnknown_203AD30 + ldr r0, _08126ADC @ =gSpecialVar_ItemId ldrh r0, [r0] movs r1, 0x1 bl sub_809A1D8 @@ -16133,7 +16133,7 @@ _08126ABE: .align 2, 0 _08126AD4: .4byte gUnknown_203B0C0 _08126AD8: .4byte gUnknown_203B0D0 -_08126ADC: .4byte gUnknown_203AD30 +_08126ADC: .4byte gSpecialVar_ItemId _08126AE0: .4byte 0x0000ffff _08126AE4: .4byte gTasks _08126AE8: .4byte sub_81255BC @@ -16206,7 +16206,7 @@ sub_8126B60: @ 8126B60 muls r0, r1 ldr r1, _08126BB4 @ =gPlayerParty adds r0, r1 - ldr r1, _08126BB8 @ =gUnknown_203AD30 + ldr r1, _08126BB8 @ =gSpecialVar_ItemId ldrh r1, [r1] ldrb r2, [r2, 0x9] movs r3, 0 @@ -16232,7 +16232,7 @@ sub_8126B60: @ 8126B60 .align 2, 0 _08126BB0: .4byte gUnknown_203B0A0 _08126BB4: .4byte gPlayerParty -_08126BB8: .4byte gUnknown_203AD30 +_08126BB8: .4byte gSpecialVar_ItemId _08126BBC: .4byte gUnknown_203B0C0 _08126BC0: .4byte gUnknown_84169DC _08126BC4: .4byte gTasks @@ -16253,7 +16253,7 @@ sub_8126BD4: @ 8126BD4 ldr r0, [r4] str r0, [r1] ldrb r0, [r4, 0x9] - ldr r5, _08126C18 @ =gUnknown_203AD30 + ldr r5, _08126C18 @ =gSpecialVar_ItemId ldrh r1, [r5] movs r2, 0 bl ExecuteTableBasedItemEffect__ @@ -16276,7 +16276,7 @@ sub_8126BD4: @ 8126BD4 .align 2, 0 _08126C10: .4byte gUnknown_300537C _08126C14: .4byte gUnknown_203B0A0 -_08126C18: .4byte gUnknown_203AD30 +_08126C18: .4byte gSpecialVar_ItemId _08126C1C: .4byte gPlayerParty _08126C20: .4byte 0x0000ffff thumb_func_end sub_8126BD4 @@ -16294,7 +16294,7 @@ sub_8126C24: @ 8126C24 muls r0, r1 ldr r1, _08126C58 @ =gPlayerParty adds r0, r1 - ldr r1, _08126C5C @ =gUnknown_203AD30 + ldr r1, _08126C5C @ =gSpecialVar_ItemId ldrh r2, [r1] movs r1, 0x2 bl GetEvolutionTargetSpecies @@ -16307,7 +16307,7 @@ sub_8126C24: @ 8126C24 .align 2, 0 _08126C54: .4byte gUnknown_203B0A0 _08126C58: .4byte gPlayerParty -_08126C5C: .4byte gUnknown_203AD30 +_08126C5C: .4byte gSpecialVar_ItemId _08126C60: movs r0, 0x1 _08126C62: @@ -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 @@ -16653,7 +16653,7 @@ _08126ED8: .4byte sub_80568A8 sub_8126EDC: @ 8126EDC push {lr} sub sp, 0xC - ldr r0, _08126EF8 @ =gUnknown_203AD30 + ldr r0, _08126EF8 @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetPocketByItemId lsls r0, 24 @@ -16665,7 +16665,7 @@ sub_8126EDC: @ 8126EDC ldr r1, _08126EFC @ =sub_8124D90 b _08126F0A .align 2, 0 -_08126EF8: .4byte gUnknown_203AD30 +_08126EF8: .4byte gSpecialVar_ItemId _08126EFC: .4byte sub_8124D90 _08126F00: ldr r1, _08126F04 @ =sub_8124DA0 @@ -16686,7 +16686,7 @@ _08126F0A: movs r3, 0 bl sub_811EA44 ldr r1, _08126F38 @ =gUnknown_203B0A0 - ldr r0, _08126F3C @ =gUnknown_203AD30 + ldr r0, _08126F3C @ =gSpecialVar_ItemId ldrh r0, [r0] strh r0, [r1, 0xC] add sp, 0xC @@ -16696,7 +16696,7 @@ _08126F0A: _08126F30: .4byte sub_8124DB0 _08126F34: .4byte sub_811FB28 _08126F38: .4byte gUnknown_203B0A0 -_08126F3C: .4byte gUnknown_203AD30 +_08126F3C: .4byte gSpecialVar_ItemId thumb_func_end sub_8126EDC thumb_func_start sub_8126F40 @@ -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 @@ -16958,7 +16958,7 @@ sub_812713C: @ 812713C bl GetMonData lsls r0, 16 lsrs r7, r0, 16 - ldr r0, _08127194 @ =gUnknown_20370D0 + ldr r0, _08127194 @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0 bne _0812719C @@ -16980,7 +16980,7 @@ sub_812713C: @ 812713C .align 2, 0 _0812718C: .4byte gUnknown_203B0A0 _08127190: .4byte gPlayerParty -_08127194: .4byte gUnknown_20370D0 +_08127194: .4byte gSpecialVar_Result _08127198: .4byte gUnknown_203B0D8 _0812719C: ldrb r0, [r6, 0x8] @@ -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: @@ -17869,7 +17869,7 @@ _08127850: movs r3, 0 bl sub_811EA44 ldr r1, _08127880 @ =gUnknown_203B0A0 - ldr r0, _08127884 @ =gUnknown_20370C6 + ldr r0, _08127884 @ =gSpecialVar_0x8007 ldrh r0, [r0] strb r0, [r1, 0x9] _08127870: @@ -17880,7 +17880,7 @@ _08127870: _08127878: .4byte sub_8126DC8 _0812787C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _08127880: .4byte gUnknown_203B0A0 -_08127884: .4byte gUnknown_20370C6 +_08127884: .4byte gSpecialVar_0x8007 thumb_func_end sub_812781C thumb_func_start sub_8127888 @@ -18088,7 +18088,7 @@ _08127A24: .4byte gBattleTypeFlags _08127A28: .4byte sub_8120C3C _08127A2C: .4byte sub_8107ECC _08127A30: - ldr r0, _08127A74 @ =gUnknown_203AD30 + ldr r0, _08127A74 @ =gSpecialVar_ItemId ldrh r0, [r0] bl GetPocketByItemId lsls r0, 24 @@ -18119,7 +18119,7 @@ _08127A62: pop {r0} bx r0 .align 2, 0 -_08127A74: .4byte gUnknown_203AD30 +_08127A74: .4byte gSpecialVar_ItemId _08127A78: .4byte sub_8107ECC _08127A7C: .4byte sub_8124DB0 _08127A80: .4byte sub_811FB28 @@ -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/pc_screen_effect.s b/asm/pc_screen_effect.s index b8e48f91c..61c47a719 100644 --- a/asm/pc_screen_effect.s +++ b/asm/pc_screen_effect.s @@ -226,7 +226,7 @@ _080A0BCC: movs r1, 0 movs r2, 0 bl BlendPalettes - ldr r0, _080A0C0C @ =gUnknown_20375F8 + ldr r0, _080A0C0C @ =gPlttBufferFaded strh r5, [r0] _080A0BF2: ldrh r1, [r4, 0xE] @@ -241,7 +241,7 @@ _080A0BF2: ldrsh r0, [r4, r1] b _080A0C54 .align 2, 0 -_080A0C0C: .4byte gUnknown_20375F8 +_080A0C0C: .4byte gPlttBufferFaded _080A0C10: ldrh r0, [r4, 0x12] ldrh r1, [r4, 0xC] @@ -326,11 +326,11 @@ _080A0CA0: beq _080A0D54 b _080A0DA8 _080A0CAA: - ldr r0, _080A0CB0 @ =gUnknown_20375F8 + ldr r0, _080A0CB0 @ =gPlttBufferFaded strh r1, [r0] b _080A0DCA .align 2, 0 -_080A0CB0: .4byte gUnknown_20375F8 +_080A0CB0: .4byte gPlttBufferFaded _080A0CB4: movs r1, 0 strh r1, [r4, 0xE] @@ -431,7 +431,7 @@ _080A0D72: movs r1, 0x10 movs r2, 0 bl BlendPalettes - ldr r1, _080A0DA4 @ =gUnknown_20375F8 + ldr r1, _080A0DA4 @ =gPlttBufferFaded movs r0, 0 strh r0, [r1] _080A0D88: @@ -449,7 +449,7 @@ _080A0D88: bne _080A0DD0 b _080A0DCA .align 2, 0 -_080A0DA4: .4byte gUnknown_20375F8 +_080A0DA4: .4byte gPlttBufferFaded _080A0DA8: movs r1, 0x80 lsls r1, 6 diff --git a/asm/player_pc.s b/asm/player_pc.s index f36e89545..c4eab0f30 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/pokeball.s b/asm/pokeball.s index b5d718a13..11572c80f 100644 --- a/asm/pokeball.s +++ b/asm/pokeball.s @@ -2811,7 +2811,7 @@ _0804BF2C: bl GetSpriteTileStartByTag adds r1, r0, 0 lsls r1, 16 - ldr r0, _0804BF5C @ =gUnknown_8D022E8 + ldr r0, _0804BF5C @ =gFile_graphics_interface_ball_Open_sheet lsrs r1, 11 ldr r2, _0804BF60 @ =0x06010100 adds r1, r2 @@ -2824,7 +2824,7 @@ _0804BF48: _0804BF50: .4byte gUnknown_826056C _0804BF54: .4byte 0xffff0000 _0804BF58: .4byte gUnknown_82605CC -_0804BF5C: .4byte gUnknown_8D022E8 +_0804BF5C: .4byte gFile_graphics_interface_ball_Open_sheet _0804BF60: .4byte 0x06010100 thumb_func_end LoadBallGfx diff --git a/asm/pokedex.s b/asm/pokedex.s index 6ec2ca7be..279270fbb 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -57,8 +57,8 @@ _08088E6C: _08088E70: .4byte gUnknown_844E850 thumb_func_end sub_8088E38 - thumb_func_start sub_8088E74 -sub_8088E74: @ 8088E74 + thumb_func_start GetSetPokedexFlag +GetSetPokedexFlag: @ 8088E74 push {lr} lsls r0, 16 lsrs r0, 16 @@ -70,7 +70,7 @@ sub_8088E74: @ 8088E74 asrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_8088E74 + thumb_func_end GetSetPokedexFlag thumb_func_start pokedex_count pokedex_count: @ 8088E8C @@ -101,7 +101,7 @@ _08088EB2: lsrs r0, 16 movs r1, 0x1 _08088EBA: - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _08088ECA @@ -145,7 +145,7 @@ _08088EFC: lsrs r0, 16 movs r1, 0x1 _08088F04: - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _08088F14 @@ -176,7 +176,7 @@ _08088F28: lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 bne _08088F48 @@ -203,7 +203,7 @@ _08088F5C: lsrs r4, r0, 16 adds r0, r4, 0 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 bne _08088F74 @@ -230,7 +230,7 @@ _08088F88: lsrs r4, r0, 16 adds r0, r4, 0 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _08088FD6 @@ -244,7 +244,7 @@ _08088FA4: lsrs r4, r0, 16 adds r0, r4, 0 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _08088FD6 @@ -259,7 +259,7 @@ _08088FC2: lsrs r4, r0, 16 adds r0, r4, 0 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 bne _08088FE0 diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s index 280cda46d..3d3ca02ea 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_3.s b/asm/pokemon_3.s index fab76b56f..0d4ee1bcb 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -424,11 +424,11 @@ _08044834: .4byte gUnknown_825E032 sub_8044838: @ 8044838 push {r4-r7,lr} sub sp, 0x14 - ldr r0, _08044888 @ =gUnknown_20370C0 + ldr r0, _08044888 @ =gSpecialVar_0x8004 ldrh r5, [r0] ldr r0, _0804488C @ =gSpecialVar_0x8005 ldrh r4, [r0] - ldr r0, _08044890 @ =gUnknown_20370C4 + ldr r0, _08044890 @ =gSpecialVar_0x8006 ldrh r6, [r0] bl ZeroEnemyPartyMons ldr r7, _08044894 @ =gEnemyParty @@ -461,9 +461,9 @@ _08044880: pop {r0} bx r0 .align 2, 0 -_08044888: .4byte gUnknown_20370C0 +_08044888: .4byte gSpecialVar_0x8004 _0804488C: .4byte gSpecialVar_0x8005 -_08044890: .4byte gUnknown_20370C4 +_08044890: .4byte gSpecialVar_0x8006 _08044894: .4byte gEnemyParty thumb_func_end sub_8044838 @@ -482,13 +482,13 @@ sub_8044898: @ 8044898 orrs r1, r0 lsrs r1, 31 adds r0, r4, 0 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 bne _080448EE adds r0, r4, 0 adds r1, r5, 0 - bl sub_8088E74 + bl GetSetPokedexFlag adds r0, r4, 0 bl NationalPokedexNumToSpecies lsls r0, 16 diff --git a/asm/pokemon_size_record.s b/asm/pokemon_size_record.s index 50ddd41a4..ac1f2a017 100644 --- a/asm/pokemon_size_record.s +++ b/asm/pokemon_size_record.s @@ -211,14 +211,14 @@ sub_80A082C: @ 80A082C adds r7, r1, 0 lsls r0, 16 lsrs r6, r0, 16 - ldr r1, _080A0844 @ =gUnknown_20370D0 + ldr r1, _080A0844 @ =gSpecialVar_Result ldrh r0, [r1] cmp r0, 0x5 bls _080A0848 movs r0, 0 b _080A08C4 .align 2, 0 -_080A0844: .4byte gUnknown_20370D0 +_080A0844: .4byte gSpecialVar_Result _080A0848: ldrh r1, [r1] movs r0, 0x64 @@ -327,7 +327,7 @@ _080A0914: .4byte 0x0000403d sub_80A0918: @ 80A0918 push {lr} ldr r0, _080A092C @ =0x0000403d - bl sub_806E454 + bl GetVarPointer adds r1, r0, 0 movs r0, 0xD6 bl sub_80A08CC @@ -341,9 +341,9 @@ _080A092C: .4byte 0x0000403d sub_80A0930: @ 80A0930 push {r4,lr} ldr r0, _080A0950 @ =0x0000403d - bl sub_806E454 + bl GetVarPointer adds r1, r0, 0 - ldr r4, _080A0954 @ =gUnknown_20370D0 + ldr r4, _080A0954 @ =gSpecialVar_Result movs r0, 0xD6 bl sub_80A082C lsls r0, 24 @@ -354,7 +354,7 @@ sub_80A0930: @ 80A0930 bx r0 .align 2, 0 _080A0950: .4byte 0x0000403d -_080A0954: .4byte gUnknown_20370D0 +_080A0954: .4byte gSpecialVar_Result thumb_func_end sub_80A0930 thumb_func_start sub_80A0958 @@ -373,7 +373,7 @@ _080A0968: .4byte 0x00004040 sub_80A096C: @ 80A096C push {lr} ldr r0, _080A0980 @ =0x00004040 - bl sub_806E454 + bl GetVarPointer adds r1, r0, 0 movs r0, 0x81 bl sub_80A08CC @@ -387,9 +387,9 @@ _080A0980: .4byte 0x00004040 sub_80A0984: @ 80A0984 push {r4,lr} ldr r0, _080A09A4 @ =0x00004040 - bl sub_806E454 + bl GetVarPointer adds r1, r0, 0 - ldr r4, _080A09A8 @ =gUnknown_20370D0 + ldr r4, _080A09A8 @ =gSpecialVar_Result movs r0, 0x81 bl sub_80A082C lsls r0, 24 @@ -400,7 +400,7 @@ sub_80A0984: @ 80A0984 bx r0 .align 2, 0 _080A09A4: .4byte 0x00004040 -_080A09A8: .4byte gUnknown_20370D0 +_080A09A8: .4byte gSpecialVar_Result thumb_func_end sub_80A0984 thumb_func_start GiveGiftRibbonToParty diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s index 9ebfd51bb..fa72d3c8e 100644 --- a/asm/pokemon_special_anim.s +++ b/asm/pokemon_special_anim.s @@ -50,7 +50,7 @@ _0811C58C: adds r0, 0x77 movs r1, 0xD muls r1, r6 - ldr r2, _0811C5A8 @ =gUnknown_8247094 + ldr r2, _0811C5A8 @ =gMoveNames adds r1, r2 bl StringCopy adds r0, r4, 0 @@ -60,7 +60,7 @@ _0811C5A2: pop {r0} bx r0 .align 2, 0 -_0811C5A8: .4byte gUnknown_8247094 +_0811C5A8: .4byte gMoveNames thumb_func_end sub_811C568 thumb_func_start sub_811C5AC @@ -194,7 +194,7 @@ _0811C628: adds r2, 0x84 movs r1, 0xD muls r1, r0 - ldr r0, _0811C6E4 @ =gUnknown_8247094 + ldr r0, _0811C6E4 @ =gMoveNames adds r1, r0 adds r0, r2, 0 bl StringCopy @@ -209,7 +209,7 @@ _0811C6D2: bx r1 .align 2, 0 _0811C6E0: .4byte gPlayerParty -_0811C6E4: .4byte gUnknown_8247094 +_0811C6E4: .4byte gMoveNames thumb_func_end sub_811C5D4 thumb_func_start sub_811C6E8 @@ -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 490a48815..37f9e9762 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1139,7 +1139,7 @@ _0808C1DC: .4byte gPlayerParty thumb_func_start CountPartyAliveNonEggMons_IgnoreVar0x8004Slot CountPartyAliveNonEggMons_IgnoreVar0x8004Slot: @ 808C1E0 push {lr} - ldr r0, _0808C1F4 @ =gUnknown_20370C0 + ldr r0, _0808C1F4 @ =gSpecialVar_0x8004 ldrb r0, [r0] bl CountPartyAliveNonEggMonsExcept lsls r0, 24 @@ -1147,7 +1147,7 @@ CountPartyAliveNonEggMons_IgnoreVar0x8004Slot: @ 808C1E0 pop {r1} bx r1 .align 2, 0 -_0808C1F4: .4byte gUnknown_20370C0 +_0808C1F4: .4byte gSpecialVar_0x8004 thumb_func_end CountPartyAliveNonEggMons_IgnoreVar0x8004Slot thumb_func_start CountPartyMons @@ -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 @@ -6609,7 +6609,7 @@ _0808EF08: .4byte sub_808CE60 sub_808EF0C: @ 808EF0C push {lr} sub sp, 0x4 - ldr r0, _0808EF40 @ =gUnknown_203AD30 + ldr r0, _0808EF40 @ =gSpecialVar_ItemId ldrh r1, [r0] mov r0, sp strh r1, [r0] @@ -6631,7 +6631,7 @@ sub_808EF0C: @ 808EF0C bl SetMonData b _0808EF56 .align 2, 0 -_0808EF40: .4byte gUnknown_203AD30 +_0808EF40: .4byte gSpecialVar_ItemId _0808EF44: .4byte gUnknown_20397B4 _0808EF48: .4byte gPlayerParty _0808EF4C: @@ -12030,7 +12030,7 @@ _08091924: adds r1, r2 ldrb r1, [r1] lsls r1, 6 - ldr r2, _08091964 @ =gUnknown_2037278 + ldr r2, _08091964 @ =gPlttBufferUnfaded + 0x80 adds r1, r2 movs r2, 0x20 bl CpuSet @@ -12055,7 +12055,7 @@ _08091938: bx r0 .align 2, 0 _08091960: .4byte 0x000002d2 -_08091964: .4byte gUnknown_2037278 +_08091964: .4byte gPlttBufferUnfaded + 0x80 _08091968: .4byte gUnknown_20397B0 thumb_func_end sub_8091850 @@ -12786,7 +12786,7 @@ sub_8091EF0: @ 8091EF0 adds r1, r2, r3 ldrh r1, [r1] lsls r1, 1 - ldr r2, _08091F34 @ =gUnknown_20371F8 + ldr r2, _08091F34 @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x2 bl CpuSet @@ -12794,7 +12794,7 @@ sub_8091EF0: @ 8091EF0 .align 2, 0 _08091F2C: .4byte gUnknown_20397B0 _08091F30: .4byte gUnknown_83D29D0 -_08091F34: .4byte gUnknown_20371F8 +_08091F34: .4byte gPlttBufferUnfaded _08091F38: lsls r0, r1, 2 ldr r1, _08091F54 @ =gUnknown_83D29D0 @@ -12803,7 +12803,7 @@ _08091F38: adds r1, r2, r3 ldrh r1, [r1] lsls r1, 1 - ldr r2, _08091F5C @ =gUnknown_20371F8 + ldr r2, _08091F5C @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x2 bl CpuSet @@ -12813,7 +12813,7 @@ _08091F50: .align 2, 0 _08091F54: .4byte gUnknown_83D29D0 _08091F58: .4byte 0x0000071e -_08091F5C: .4byte gUnknown_20371F8 +_08091F5C: .4byte gPlttBufferUnfaded thumb_func_end sub_8091EF0 thumb_func_start sub_8091F60 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index a7b748eb7..8db247b2b 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 @@ -1293,7 +1293,7 @@ _08134FC8: ands r0, r1 cmp r0, 0 bne _08135004 - ldr r0, _08134FFC @ =gUnknown_3003F64 + ldr r0, _08134FFC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08135004 @@ -1304,7 +1304,7 @@ _08134FC8: _08134FF0: .4byte gUnknown_8419C39 _08134FF4: .4byte gMain _08134FF8: .4byte 0x00000439 -_08134FFC: .4byte gUnknown_3003F64 +_08134FFC: .4byte gReceivedRemoteLinkPlayers _08135000: .4byte gUnknown_8419C92 _08135004: ldr r0, _0813500C @ =gUnknown_8419CA2 @@ -4241,7 +4241,7 @@ _081368B0: adds r0, r1 ldrh r1, [r3] muls r1, r2 - ldr r2, _0813695C @ =gUnknown_8247094 + ldr r2, _0813695C @ =gMoveNames adds r1, r2 bl StringCopy cmp r7, 0x3 @@ -4292,7 +4292,7 @@ _0813694C: .4byte 0x0000324e _08136950: .4byte gBattleMoves _08136954: .4byte 0x00003258 _08136958: .4byte 0x00003128 -_0813695C: .4byte gUnknown_8247094 +_0813695C: .4byte gMoveNames _08136960: .4byte 0x00003208 _08136964: .4byte 0x000030b8 _08136968: .4byte 0x000030f0 @@ -5401,7 +5401,7 @@ _081372B0: movs r1, 0x1 negs r1, r1 str r1, [sp, 0x4] - ldr r1, _081372E0 @ =gUnknown_84161C1 + ldr r1, _081372E0 @ =gFameCheckerText_Cancel str r1, [sp, 0x8] movs r1, 0x2 movs r2, 0x3 @@ -5415,7 +5415,7 @@ _081372CE: .align 2, 0 _081372D8: .4byte 0x00003003 _081372DC: .4byte gUnknown_8463EF0 -_081372E0: .4byte gUnknown_84161C1 +_081372E0: .4byte gFameCheckerText_Cancel thumb_func_end sub_8137270 thumb_func_start sub_81372E4 @@ -8439,7 +8439,7 @@ sub_8138B4C: @ 8138B4C lsrs r0, 24 cmp r0, 0x1 bne _08138B84 - ldr r0, _08138B7C @ =gUnknown_3003F64 + ldr r0, _08138B7C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _08138B84 @@ -8453,7 +8453,7 @@ _08138B76: movs r0, 0x1 b _08138B86 .align 2, 0 -_08138B7C: .4byte gUnknown_3003F64 +_08138B7C: .4byte gReceivedRemoteLinkPlayers _08138B80: .4byte gUnknown_203B16C _08138B84: movs r0, 0 @@ -8931,7 +8931,7 @@ _08138EE0: beq _08138EF0 b _08139094 _08138EF0: - ldr r0, _08138F10 @ =gUnknown_3003F64 + ldr r0, _08138F10 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08138EFA @@ -8946,7 +8946,7 @@ _08138EFA: _08138F04: .4byte 0x00003268 _08138F08: .4byte 0x00003024 _08138F0C: .4byte 0x00000439 -_08138F10: .4byte gUnknown_3003F64 +_08138F10: .4byte gReceivedRemoteLinkPlayers _08138F14: .4byte gUnknown_203B16E _08138F18: strb r4, [r2] @@ -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 @@ -13242,7 +13242,7 @@ _0813B198: bl sub_805642C cmp r0, 0 bne _0813B1C4 - ldr r0, _0813B1C0 @ =gUnknown_3003F64 + ldr r0, _0813B1C0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _0813B1C4 @@ -13256,7 +13256,7 @@ _0813B198: bl sub_813B38C b _0813B1CC .align 2, 0 -_0813B1C0: .4byte gUnknown_3003F64 +_0813B1C0: .4byte gReceivedRemoteLinkPlayers _0813B1C4: lsls r0, r5, 24 asrs r0, 24 diff --git a/asm/prof_pc.s b/asm/prof_pc.s index ae8c68ded..9c9dfa79c 100644 --- a/asm/prof_pc.s +++ b/asm/prof_pc.s @@ -8,7 +8,7 @@ thumb_func_start sub_80CA3D8 sub_80CA3D8: @ 80CA3D8 push {lr} - ldr r0, _080CA3F4 @ =gUnknown_20370C0 + ldr r0, _080CA3F4 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _080CA3FC @@ -20,7 +20,7 @@ sub_80CA3D8: @ 80CA3D8 bl sub_8088EDC b _080CA40C .align 2, 0 -_080CA3F4: .4byte gUnknown_20370C0 +_080CA3F4: .4byte gSpecialVar_0x8004 _080CA3F8: .4byte gSpecialVar_0x8005 _080CA3FC: movs r0, 0 @@ -30,7 +30,7 @@ _080CA3FC: movs r0, 0x1 bl pokedex_count _080CA40C: - ldr r1, _080CA420 @ =gUnknown_20370C4 + ldr r1, _080CA420 @ =gSpecialVar_0x8006 strh r0, [r1] bl sub_806E25C lsls r0, 16 @@ -39,7 +39,7 @@ _080CA40C: bx r1 .align 2, 0 _080CA41C: .4byte gSpecialVar_0x8005 -_080CA420: .4byte gUnknown_20370C4 +_080CA420: .4byte gSpecialVar_0x8006 thumb_func_end sub_80CA3D8 thumb_func_start sub_80CA424 @@ -47,7 +47,7 @@ sub_80CA424: @ 80CA424 push {lr} lsls r0, 16 lsrs r2, r0, 16 - ldr r1, _080CA440 @ =gUnknown_20370D0 + ldr r1, _080CA440 @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] cmp r2, 0x9 @@ -59,7 +59,7 @@ _080CA436: ldr r0, _080CA444 @ =gUnknown_81A6D6D b _080CA51A .align 2, 0 -_080CA440: .4byte gUnknown_20370D0 +_080CA440: .4byte gSpecialVar_Result _080CA444: .4byte gUnknown_81A6D6D _080CA448: cmp r2, 0x1D @@ -155,7 +155,7 @@ _080CA4D8: lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl sub_8088E74 + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _080CA500 @@ -165,10 +165,10 @@ _080CA4F6: .align 2, 0 _080CA4FC: .4byte gUnknown_81A7137 _080CA500: - ldr r1, _080CA504 @ =gUnknown_20370D0 + ldr r1, _080CA504 @ =gSpecialVar_Result b _080CA514 .align 2, 0 -_080CA504: .4byte gUnknown_20370D0 +_080CA504: .4byte gSpecialVar_Result _080CA508: cmp r2, 0x97 beq _080CA514 @@ -191,14 +191,14 @@ _080CA520: .4byte gUnknown_81A7175 thumb_func_start sub_80CA524 sub_80CA524: @ 80CA524 push {lr} - ldr r0, _080CA538 @ =gUnknown_20370C0 + ldr r0, _080CA538 @ =gSpecialVar_0x8004 ldrh r0, [r0] bl sub_80CA424 bl ShowFieldMessage pop {r0} bx r0 .align 2, 0 -_080CA538: .4byte gUnknown_20370C0 +_080CA538: .4byte gSpecialVar_0x8004 thumb_func_end sub_80CA524 .align 2, 0 @ Don't pad with nop. diff --git a/asm/quest_log.s b/asm/quest_log.s deleted file mode 100644 index 485e6377b..000000000 --- a/asm/quest_log.s +++ /dev/null @@ -1,10369 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8110840 -sub_8110840: @ 8110840 - push {lr} - ldr r1, _08110888 @ =gSaveBlock1Ptr - ldr r1, [r1] - subs r1, r0 - ldr r2, _0811088C @ =gUnknown_203AE04 - ldr r0, [r2] - cmp r0, 0 - beq _08110854 - adds r0, r1 - str r0, [r2] -_08110854: - ldr r0, _08110890 @ =gUnknown_203ADFA - ldrb r2, [r0] - cmp r2, 0 - beq _08110882 - ldr r3, _08110894 @ =gUnknown_203AE08 - ldr r0, [r3] - cmp r0, 0 - beq _08110868 - adds r0, r1 - str r0, [r3] -_08110868: - cmp r2, 0x2 - bne _08110882 - ldr r2, _08110898 @ =gUnknown_203AE0C - movs r3, 0x1F -_08110870: - ldr r0, [r2] - cmp r0, 0 - beq _0811087A - adds r0, r1 - str r0, [r2] -_0811087A: - adds r2, 0x4 - subs r3, 0x1 - cmp r3, 0 - bge _08110870 -_08110882: - pop {r0} - bx r0 - .align 2, 0 -_08110888: .4byte gSaveBlock1Ptr -_0811088C: .4byte gUnknown_203AE04 -_08110890: .4byte gUnknown_203ADFA -_08110894: .4byte gUnknown_203AE08 -_08110898: .4byte gUnknown_203AE0C - thumb_func_end sub_8110840 - - thumb_func_start sub_811089C -sub_811089C: @ 811089C - push {lr} - ldr r0, _081108D8 @ =gSaveBlock1Ptr - ldr r0, [r0] - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - movs r2, 0xCD - lsls r2, 5 - movs r1, 0 - bl memset - ldr r0, _081108DC @ =gUnknown_203ADF8 - movs r1, 0 - strb r1, [r0] - ldr r0, _081108E0 @ =gUnknown_203ADFA - strb r1, [r0] - ldr r0, _081108E4 @ =gUnknown_203AE8C - movs r1, 0 - str r1, [r0] - ldr r0, _081108E8 @ =gUnknown_203AE08 - str r1, [r0] - ldr r0, _081108EC @ =gUnknown_203AE04 - str r1, [r0] - bl sub_8113BD8 - bl sub_81138F8 - pop {r0} - bx r0 - .align 2, 0 -_081108D8: .4byte gSaveBlock1Ptr -_081108DC: .4byte gUnknown_203ADF8 -_081108E0: .4byte gUnknown_203ADFA -_081108E4: .4byte gUnknown_203AE8C -_081108E8: .4byte gUnknown_203AE08 -_081108EC: .4byte gUnknown_203AE04 - thumb_func_end sub_811089C - - thumb_func_start sub_81108F0 -sub_81108F0: @ 81108F0 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _08110918 @ =gSaveBlock1Ptr - ldr r1, [r1] - movs r2, 0xCD - lsls r2, 3 - muls r0, r2 - adds r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - movs r1, 0 - bl memset - ldr r1, _0811091C @ =gUnknown_203AE04 - movs r0, 0 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_08110918: .4byte gSaveBlock1Ptr -_0811091C: .4byte gUnknown_203AE04 - thumb_func_end sub_81108F0 - - thumb_func_start sub_8110920 -sub_8110920: @ 8110920 - ldr r1, _08110928 @ =gUnknown_203AE04 - movs r0, 0 - str r0, [r1] - bx lr - .align 2, 0 -_08110928: .4byte gUnknown_203AE04 - thumb_func_end sub_8110920 - - thumb_func_start sub_811092C -sub_811092C: @ 811092C - push {lr} - ldr r0, _08110940 @ =gUnknown_203AE8C - ldr r0, [r0] - cmp r0, 0 - beq _0811093A - bl _call_via_r0 -_0811093A: - pop {r0} - bx r0 - .align 2, 0 -_08110940: .4byte gUnknown_203AE8C - thumb_func_end sub_811092C - - thumb_func_start sub_8110944 -sub_8110944: @ 8110944 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _08110978 @ =gSaveBlock1Ptr - ldr r0, _0811097C @ =gUnknown_203ADF8 - ldrb r0, [r0] - movs r3, 0xCD - lsls r3, 3 - adds r2, r0, 0 - muls r2, r3 - movs r0, 0x98 - lsls r0, 5 - adds r2, r0 - ldr r0, [r4] - adds r0, r2 - movs r4, 0xAD - lsls r4, 3 - adds r2, r0, r4 - adds r0, r3 - subs r0, r1 - cmp r5, r2 - bcc _08110972 - cmp r5, r0 - bls _08110980 -_08110972: - movs r0, 0 - b _08110982 - .align 2, 0 -_08110978: .4byte gSaveBlock1Ptr -_0811097C: .4byte gUnknown_203ADF8 -_08110980: - movs r0, 0x1 -_08110982: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8110944 - - thumb_func_start sub_8110988 -sub_8110988: @ 8110988 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _081109BC @ =gSaveBlock1Ptr - ldr r0, _081109C0 @ =gUnknown_203ADF8 - ldrb r0, [r0] - movs r3, 0xCD - lsls r3, 3 - adds r2, r0, 0 - muls r2, r3 - movs r0, 0x98 - lsls r0, 5 - adds r2, r0 - ldr r0, [r4] - adds r0, r2 - movs r4, 0xAD - lsls r4, 3 - adds r2, r0, r4 - adds r0, r3 - subs r0, r1 - cmp r5, r2 - bcc _081109B6 - cmp r5, r0 - bls _081109C4 -_081109B6: - movs r0, 0 - b _081109C6 - .align 2, 0 -_081109BC: .4byte gSaveBlock1Ptr -_081109C0: .4byte gUnknown_203ADF8 -_081109C4: - movs r0, 0x1 -_081109C6: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8110988 - - thumb_func_start sub_81109CC -sub_81109CC: @ 81109CC - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _081109E0 @ =gUnknown_203ADFA - strb r0, [r1] - cmp r0, 0x1 - bne _081109EC - ldr r1, _081109E4 @ =gUnknown_203AE8C - ldr r0, _081109E8 @ =sub_8110A00 - b _081109F0 - .align 2, 0 -_081109E0: .4byte gUnknown_203ADFA -_081109E4: .4byte gUnknown_203AE8C -_081109E8: .4byte sub_8110A00 -_081109EC: - ldr r1, _081109F8 @ =gUnknown_203AE8C - ldr r0, _081109FC @ =sub_8110A3C -_081109F0: - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_081109F8: .4byte gUnknown_203AE8C -_081109FC: .4byte sub_8110A3C - thumb_func_end sub_81109CC - - thumb_func_start sub_8110A00 -sub_8110A00: @ 8110A00 - push {r4,lr} - ldr r0, _08110A2C @ =gUnknown_203AE98 - bl sub_8110E68 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08110A24 - ldr r0, _08110A30 @ =gUnknown_3005E88 - movs r4, 0 - strb r4, [r0] - bl sub_8110E3C - ldr r0, _08110A34 @ =gUnknown_203ADFA - strb r4, [r0] - ldr r1, _08110A38 @ =gUnknown_203AE8C - movs r0, 0 - str r0, [r1] -_08110A24: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08110A2C: .4byte gUnknown_203AE98 -_08110A30: .4byte gUnknown_3005E88 -_08110A34: .4byte gUnknown_203ADFA -_08110A38: .4byte gUnknown_203AE8C - thumb_func_end sub_8110A00 - - thumb_func_start sub_8110A3C -sub_8110A3C: @ 8110A3C - push {r4,lr} - ldr r1, _08110A8C @ =gUnknown_203AE94 - ldrb r2, [r1] - movs r4, 0xF - adds r0, r4, 0 - ands r0, r2 - adds r3, r1, 0 - cmp r0, 0x2 - bne _08110A56 - movs r0, 0x10 - negs r0, r0 - ands r0, r2 - strb r0, [r3] -_08110A56: - ldrb r1, [r3] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - bne _08110AAE - ldr r0, _08110A90 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0 - bne _08110A84 - adds r0, r4, 0 - ands r0, r1 - cmp r0, 0x1 - beq _08110A84 - ldrb r0, [r3, 0x1] - cmp r0, 0x1F - bhi _08110A98 - ldr r0, _08110A94 @ =gUnknown_203AE0C - ldrb r1, [r3, 0x1] - lsls r1, 2 - adds r1, r0 - ldr r0, [r1] - cmp r0, 0 - beq _08110A98 -_08110A84: - bl sub_8111AD8 - b _08110AAE - .align 2, 0 -_08110A8C: .4byte gUnknown_203AE94 -_08110A90: .4byte gUnknown_3005E88 -_08110A94: .4byte gUnknown_203AE0C -_08110A98: - ldrb r0, [r3] - movs r1, 0x3F - ands r1, r0 - movs r0, 0x80 - orrs r1, r0 - strb r1, [r3] - bl ScriptContext2_Enable - movs r0, 0 - bl sub_81118F4 -_08110AAE: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8110A3C - - thumb_func_start sub_8110AB4 -sub_8110AB4: @ 8110AB4 - ldr r0, _08110AC0 @ =gUnknown_20370D0 - ldr r1, _08110AC4 @ =gUnknown_203ADFA - ldrb r1, [r1] - strh r1, [r0] - bx lr - .align 2, 0 -_08110AC0: .4byte gUnknown_20370D0 -_08110AC4: .4byte gUnknown_203ADFA - thumb_func_end sub_8110AB4 - - thumb_func_start sub_8110AC8 -sub_8110AC8: @ 8110AC8 - ldr r0, _08110AE4 @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, _08110AE8 @ =gUnknown_203ADF8 - ldrb r2, [r0] - movs r0, 0xCD - lsls r0, 3 - muls r0, r2 - adds r1, r0 - movs r0, 0x98 - lsls r0, 5 - adds r1, r0 - ldrb r0, [r1] - bx lr - .align 2, 0 -_08110AE4: .4byte gSaveBlock1Ptr -_08110AE8: .4byte gUnknown_203ADF8 - thumb_func_end sub_8110AC8 - - thumb_func_start sub_8110AEC -sub_8110AEC: @ 8110AEC - push {r4-r7,lr} - lsls r0, 16 - lsrs r6, r0, 16 - ldr r4, _08110B44 @ =gUnknown_203ADF8 - ldrb r0, [r4] - cmp r0, 0x3 - bls _08110AFE - movs r0, 0 - strb r0, [r4] -_08110AFE: - ldrb r0, [r4] - bl sub_81108F0 - bl sub_8113B88 - ldr r2, _08110B48 @ =gUnknown_203AE08 - ldr r1, _08110B4C @ =gSaveBlock1Ptr - ldrb r0, [r4] - movs r3, 0xCD - lsls r3, 3 - muls r0, r3 - movs r5, 0x98 - lsls r5, 5 - adds r0, r5 - ldr r1, [r1] - adds r0, r1, r0 - movs r7, 0xAD - lsls r7, 3 - adds r0, r7 - str r0, [r2] - adds r0, r6, 0 - subs r0, 0xC - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x7 - bls _08110B36 - cmp r6, 0x23 - bne _08110B50 -_08110B36: - ldrb r0, [r4] - muls r0, r3 - adds r0, r1, r0 - adds r0, r5 - movs r1, 0x2 - b _08110B5A - .align 2, 0 -_08110B44: .4byte gUnknown_203ADF8 -_08110B48: .4byte gUnknown_203AE08 -_08110B4C: .4byte gSaveBlock1Ptr -_08110B50: - ldrb r0, [r4] - muls r0, r3 - adds r0, r1, r0 - adds r0, r5 - movs r1, 0x1 -_08110B5A: - strb r1, [r0] - bl sub_81115E8 - ldr r4, _08110BA4 @ =gUnknown_203ADF8 - ldrb r0, [r4] - bl sub_8110BB0 - ldrb r0, [r4] - bl sub_8110BE8 - bl sub_8110D94 - bl sub_8110E20 - ldrb r0, [r4] - bl sub_8110D48 - ldr r1, _08110BA8 @ =gUnknown_203ADFC - movs r0, 0 - strh r0, [r1] - ldr r4, _08110BAC @ =gUnknown_203AE98 - movs r2, 0x80 - lsls r2, 1 - movs r0, 0x2 - adds r1, r4, 0 - bl sub_8112940 - adds r0, r4, 0 - bl sub_8110E68 - movs r0, 0x1 - bl sub_81109CC - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08110BA4: .4byte gUnknown_203ADF8 -_08110BA8: .4byte gUnknown_203ADFC -_08110BAC: .4byte gUnknown_203AE98 - thumb_func_end sub_8110AEC - - thumb_func_start sub_8110BB0 -sub_8110BB0: @ 8110BB0 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08110BE4 @ =gSaveBlock1Ptr - movs r1, 0xCD - lsls r1, 3 - muls r1, r0 - movs r0, 0x98 - lsls r0, 5 - adds r1, r0 - ldr r0, [r2] - adds r1, r0, r1 - ldrb r0, [r0, 0x4] - strb r0, [r1, 0x1] - ldr r0, [r2] - ldrb r0, [r0, 0x5] - strb r0, [r1, 0x2] - ldr r0, [r2] - ldrb r0, [r0, 0x6] - strb r0, [r1, 0x3] - ldr r2, [r2] - ldrh r0, [r2] - strh r0, [r1, 0x4] - ldrh r0, [r2, 0x2] - strh r0, [r1, 0x6] - bx lr - .align 2, 0 -_08110BE4: .4byte gSaveBlock1Ptr - thumb_func_end sub_8110BB0 - - thumb_func_start sub_8110BE8 -sub_8110BE8: @ 8110BE8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - ldr r4, _08110C54 @ =gSaveBlock1Ptr - movs r1, 0xCD - lsls r1, 3 - muls r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - ldr r1, [r4] - adds r7, r1, r0 - adds r0, r7, 0 - bl sub_815A008 - movs r6, 0 - mov r9, r4 - movs r2, 0x8D - lsls r2, 3 - mov r8, r2 - ldr r3, _08110C58 @ =0x0000046a - mov r10, r3 -_08110C1C: - mov r4, r9 - ldr r1, [r4] - lsls r2, r6, 1 - adds r0, r2, r6 - lsls r0, 3 - adds r1, r0 - ldr r0, _08110C5C @ =0x000008e4 - adds r1, r0 - ldrh r4, [r1] - movs r3, 0 - ldrsh r0, [r1, r3] - mov r12, r2 - cmp r0, 0 - bge _08110C64 - lsls r3, r6, 2 - adds r2, r7, r3 - negs r0, r0 - mov r4, r8 - adds r1, r2, r4 - strb r0, [r1] - ldr r0, _08110C60 @ =0x00000469 - adds r2, r0 - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2] - b _08110C7C - .align 2, 0 -_08110C54: .4byte gSaveBlock1Ptr -_08110C58: .4byte 0x0000046a -_08110C5C: .4byte 0x000008e4 -_08110C60: .4byte 0x00000469 -_08110C64: - lsls r3, r6, 2 - adds r1, r7, r3 - mov r2, r8 - adds r0, r1, r2 - strb r4, [r0] - ldr r4, _08110CBC @ =0x00000469 - adds r1, r4 - ldrb r2, [r1] - movs r0, 0x2 - negs r0, r0 - ands r0, r2 - strb r0, [r1] -_08110C7C: - adds r5, r3, 0 - mov r1, r9 - ldr r0, [r1] - mov r2, r12 - adds r1, r2, r6 - lsls r1, 3 - adds r0, r1 - ldr r3, _08110CC0 @ =0x000008e6 - adds r1, r0, r3 - ldrh r2, [r1] - movs r4, 0 - ldrsh r0, [r1, r4] - cmp r0, 0 - bge _08110CC8 - adds r3, r7, r5 - adds r1, r0, 0 - negs r1, r1 - lsls r1, 24 - mov r2, r8 - adds r4, r3, r2 - lsrs r1, 15 - ldr r0, [r4] - ldr r2, _08110CC4 @ =0xfffe01ff - ands r0, r2 - orrs r0, r1 - str r0, [r4] - add r3, r10 - ldrb r0, [r3] - movs r1, 0x2 - orrs r0, r1 - b _08110CE6 - .align 2, 0 -_08110CBC: .4byte 0x00000469 -_08110CC0: .4byte 0x000008e6 -_08110CC4: .4byte 0xfffe01ff -_08110CC8: - adds r3, r7, r5 - lsls r2, 24 - mov r0, r8 - adds r4, r3, r0 - lsrs r2, 15 - ldr r0, [r4] - ldr r1, _08110D38 @ =0xfffe01ff - ands r0, r1 - orrs r0, r2 - str r0, [r4] - add r3, r10 - ldrb r1, [r3] - movs r0, 0x3 - negs r0, r0 - ands r0, r1 -_08110CE6: - strb r0, [r3] - adds r5, r7, r5 - mov r1, r9 - ldr r0, [r1] - mov r2, r12 - adds r3, r2, r6 - lsls r3, 3 - adds r0, r3 - ldr r4, _08110D3C @ =0x000008e8 - adds r0, r4 - ldrb r1, [r0] - mov r0, r10 - adds r4, r5, r0 - lsls r1, 2 - ldrb r2, [r4] - movs r0, 0x3 - ands r0, r2 - orrs r0, r1 - strb r0, [r4] - mov r1, r9 - ldr r0, [r1] - adds r0, r3 - ldr r2, _08110D40 @ =0x000008e9 - adds r0, r2 - ldrb r0, [r0] - ldr r3, _08110D44 @ =0x0000046b - adds r5, r3 - strb r0, [r5] - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x3F - bhi _08110D2A - b _08110C1C -_08110D2A: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08110D38: .4byte 0xfffe01ff -_08110D3C: .4byte 0x000008e8 -_08110D40: .4byte 0x000008e9 -_08110D44: .4byte 0x0000046b - thumb_func_end sub_8110BE8 - - thumb_func_start sub_8110D48 -sub_8110D48: @ 8110D48 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r4, _08110D90 @ =gSaveBlock1Ptr - movs r1, 0xCD - lsls r1, 3 - muls r1, r0 - movs r0, 0x98 - lsls r0, 5 - adds r1, r0 - ldr r0, [r4] - adds r5, r0, r1 - movs r1, 0xEE - lsls r1, 4 - adds r0, r1 - movs r2, 0xA4 - lsls r2, 1 - adds r1, r5, r2 - movs r2, 0x90 - bl CpuSet - ldr r0, [r4] - movs r1, 0x80 - lsls r1, 5 - adds r0, r1 - movs r2, 0x9A - lsls r2, 2 - adds r1, r5, r2 - movs r2, 0x80 - lsls r2, 1 - bl CpuSet - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08110D90: .4byte gSaveBlock1Ptr - thumb_func_end sub_8110D48 - - thumb_func_start sub_8110D94 -sub_8110D94: @ 8110D94 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - movs r4, 0 - ldr r0, _08110E14 @ =gSaveBlock1Ptr - mov r10, r0 - ldr r1, _08110E18 @ =0x0000063a - mov r9, r1 - movs r2, 0x1 - mov r8, r2 -_08110DAE: - lsls r1, r4, 1 - mov r7, sp - adds r2, r7, r1 - movs r0, 0 - strh r0, [r2] - movs r3, 0 - adds r6, r1, 0 - adds r0, r4, 0x1 - str r0, [sp, 0x8] - mov r1, r10 - ldr r0, [r1] - mov r7, r9 - adds r5, r0, r7 - lsls r1, r4, 4 -_08110DCA: - adds r0, r1, r3 - adds r0, r5, r0 - ldrb r0, [r0] - cmp r0, 0 - beq _08110DDE - mov r0, r8 - lsls r0, r3 - ldrh r7, [r2] - adds r0, r7 - strh r0, [r2] -_08110DDE: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0xF - bls _08110DCA - ldr r1, _08110E1C @ =0x000040aa - adds r0, r4, r1 - lsls r0, 16 - lsrs r0, 16 - mov r2, sp - adds r1, r2, r6 - ldrh r1, [r1] - bl VarSet - ldr r7, [sp, 0x8] - lsls r0, r7, 16 - lsrs r4, r0, 16 - cmp r4, 0x3 - bls _08110DAE - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08110E14: .4byte gSaveBlock1Ptr -_08110E18: .4byte 0x0000063a -_08110E1C: .4byte 0x000040aa - thumb_func_end sub_8110D94 - - thumb_func_start sub_8110E20 -sub_8110E20: @ 8110E20 - push {lr} - ldr r0, _08110E34 @ =0x000040ae - ldr r1, _08110E38 @ =gSaveBlock1Ptr - ldr r1, [r1] - ldrh r1, [r1, 0x32] - bl VarSet - pop {r0} - bx r0 - .align 2, 0 -_08110E34: .4byte 0x000040ae -_08110E38: .4byte gSaveBlock1Ptr - thumb_func_end sub_8110E20 - - thumb_func_start sub_8110E3C -sub_8110E3C: @ 8110E3C - push {lr} - ldr r0, _08110E60 @ =gUnknown_203AE08 - ldr r0, [r0] - bl sub_8113BF4 - ldr r1, _08110E64 @ =gUnknown_203ADF8 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bls _08110E5A - movs r0, 0 - strb r0, [r1] -_08110E5A: - pop {r0} - bx r0 - .align 2, 0 -_08110E60: .4byte gUnknown_203AE08 -_08110E64: .4byte gUnknown_203ADF8 - thumb_func_end sub_8110E3C - - thumb_func_start sub_8110E68 -sub_8110E68: @ 8110E68 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r7, r0, 0 - ldr r0, _08110EA0 @ =gUnknown_203ADFC - ldrh r5, [r0] - ldr r0, _08110EA4 @ =gUnknown_203AF98 - mov r8, r0 - ldrh r0, [r0] - cmp r5, r0 - bcs _08110ECA - ldr r6, _08110EA8 @ =gUnknown_203AE08 -_08110E80: - ldr r4, [r6] - cmp r4, 0 - beq _08110F02 - lsls r0, r5, 3 - adds r1, r0, r7 - ldrb r2, [r1, 0x6] - adds r3, r0, 0 - cmp r2, 0x1 - bgt _08110EAC - cmp r2, 0 - blt _08110EAC - adds r0, r4, 0 - bl sub_8113D48 - b _08110EB4 - .align 2, 0 -_08110EA0: .4byte gUnknown_203ADFC -_08110EA4: .4byte gUnknown_203AF98 -_08110EA8: .4byte gUnknown_203AE08 -_08110EAC: - ldr r0, [r6] - adds r1, r7, r3 - bl sub_8113CC8 -_08110EB4: - str r0, [r6] - ldr r1, [r6] - cmp r1, 0 - beq _08110EEC - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r0, _08110EE0 @ =gUnknown_203AF98 - ldrh r0, [r0] - cmp r5, r0 - bcc _08110E80 -_08110ECA: - ldr r0, _08110EE4 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0 - beq _08110EF8 - ldr r1, _08110EE8 @ =gUnknown_203ADFC - mov r2, r8 - ldrh r0, [r2] - strh r0, [r1] - movs r0, 0x1 - b _08110F04 - .align 2, 0 -_08110EE0: .4byte gUnknown_203AF98 -_08110EE4: .4byte gUnknown_3005E88 -_08110EE8: .4byte gUnknown_203ADFC -_08110EEC: - ldr r0, _08110EF4 @ =gUnknown_3005E88 - strb r1, [r0] - b _08110F02 - .align 2, 0 -_08110EF4: .4byte gUnknown_3005E88 -_08110EF8: - ldr r4, _08110F10 @ =gUnknown_203AE08 - ldr r0, [r4] - bl sub_8113BF4 - str r0, [r4] -_08110F02: - movs r0, 0 -_08110F04: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08110F10: .4byte gUnknown_203AE08 - thumb_func_end sub_8110E68 - - thumb_func_start sub_8110F14 -sub_8110F14: @ 8110F14 - push {r4-r7,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_811381C - ldr r1, _08110F6C @ =gUnknown_203ADF9 - movs r0, 0 - strb r0, [r1] - movs r2, 0 - ldr r0, _08110F70 @ =gSaveBlock1Ptr - ldr r5, [r0] - movs r7, 0xCD - lsls r7, 3 - movs r6, 0x98 - lsls r6, 5 -_08110F32: - adds r0, r2, 0 - muls r0, r7 - adds r0, r5, r0 - adds r0, r6 - ldrb r0, [r0] - ldr r3, _08110F6C @ =gUnknown_203ADF9 - cmp r0, 0 - beq _08110F48 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_08110F48: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3 - bls _08110F32 - ldrb r0, [r3] - cmp r0, 0 - beq _08110F78 - ldr r1, _08110F74 @ =gUnknown_3005ECC - movs r0, 0 - strb r0, [r1] - adds r0, r4, 0 - bl sub_8110F90 - adds r0, r4, 0 - bl DestroyTask - b _08110F84 - .align 2, 0 -_08110F6C: .4byte gUnknown_203ADF9 -_08110F70: .4byte gSaveBlock1Ptr -_08110F74: .4byte gUnknown_3005ECC -_08110F78: - ldr r0, _08110F8C @ =sub_8056938 - bl SetMainCallback2 - adds r0, r4, 0 - bl DestroyTask -_08110F84: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08110F8C: .4byte sub_8056938 - thumb_func_end sub_8110F14 - - thumb_func_start sub_8110F90 -sub_8110F90: @ 8110F90 - push {lr} - ldr r1, _08110FC0 @ =gSaveBlock1Ptr - ldr r2, [r1] - movs r3, 0 - movs r0, 0x3 - strb r0, [r2, 0x4] - ldr r2, [r1] - movs r0, 0x13 - strb r0, [r2, 0x5] - ldr r1, [r1] - movs r0, 0xFF - strb r0, [r1, 0x6] - ldr r0, _08110FC4 @ =gUnknown_203ADF8 - strb r3, [r0] - ldr r1, _08110FC8 @ =gUnknown_2031DD8 - movs r0, 0x1 - strb r0, [r1] - movs r0, 0x1 - bl sub_8082740 - bl sub_8111368 - pop {r0} - bx r0 - .align 2, 0 -_08110FC0: .4byte gSaveBlock1Ptr -_08110FC4: .4byte gUnknown_203ADF8 -_08110FC8: .4byte gUnknown_2031DD8 - thumb_func_end sub_8110F90 - - thumb_func_start sub_8110FCC -sub_8110FCC: @ 8110FCC - push {r4,r5,lr} - ldr r5, _08110FF8 @ =gUnknown_203ADF8 - ldrb r0, [r5] - ldr r4, _08110FFC @ =gUnknown_203AE98 - adds r1, r4, 0 - bl sub_811175C - bl sub_8113B88 - movs r2, 0x80 - lsls r2, 1 - movs r0, 0x1 - adds r1, r4, 0 - bl sub_8112940 - ldrb r0, [r5] - bl sub_8111150 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08110FF8: .4byte gUnknown_203ADF8 -_08110FFC: .4byte gUnknown_203AE98 - thumb_func_end sub_8110FCC - - thumb_func_start sub_8111000 -sub_8111000: @ 8111000 - push {lr} - movs r0, 0x4 - bl stdpal_get - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r0, 0x2 - bl sub_81109CC - bl sub_807DF64 - ldr r2, _08111034 @ =gUnknown_203AE94 - movs r0, 0 - str r0, [r2] - ldrb r1, [r2] - subs r0, 0x10 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2] - movs r0, 0x1 - pop {r1} - bx r1 - .align 2, 0 -_08111034: .4byte gUnknown_203AE94 - thumb_func_end sub_8111000 - - thumb_func_start sub_8111038 -sub_8111038: @ 8111038 - push {lr} - movs r0, 0x4 - bl stdpal_get - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r0, 0x2 - bl sub_81109CC - bl sub_807DF7C - ldr r2, _0811106C @ =gUnknown_203AE94 - movs r0, 0 - str r0, [r2] - ldrb r1, [r2] - subs r0, 0x10 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2] - movs r0, 0x1 - pop {r1} - bx r1 - .align 2, 0 -_0811106C: .4byte gUnknown_203AE94 - thumb_func_end sub_8111038 - - thumb_func_start sub_8111070 -sub_8111070: @ 8111070 - push {r4-r7,lr} - sub sp, 0x14 - lsls r0, 24 - lsrs r7, r0, 24 - movs r5, 0 -_0811107A: - lsls r4, r5, 3 - ldr r0, _0811111C @ =gUnknown_845661C - adds r4, r0 - adds r0, r4, 0 - bl AddWindow - ldr r6, _08111120 @ =gUnknown_203ADFE - adds r1, r5, r6 - strb r0, [r1] - ldrb r0, [r1] - ldrb r1, [r4, 0x3] - lsls r1, 3 - str r1, [sp] - ldrb r1, [r4, 0x4] - lsls r1, 3 - str r1, [sp, 0x4] - movs r1, 0xF - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x2 - bls _0811107A - ldr r5, _08111124 @ =gStringVar4 - ldr r1, _08111128 @ =gUnknown_841A155 - adds r0, r5, 0 - bl StringExpandPlaceholders - cmp r7, 0 - beq _081110D2 - ldr r4, _0811112C @ =gStringVar1 - adds r0, r4, 0 - adds r1, r7, 0 - movs r2, 0 - movs r3, 0x1 - bl ConvertIntToDecimalStringN - adds r0, r5, 0 - adds r1, r4, 0 - bl StringAppend -_081110D2: - ldrb r0, [r6] - movs r1, 0x1 - str r1, [sp] - movs r1, 0x2 - str r1, [sp, 0x4] - ldr r1, _08111130 @ =gUnknown_8456634 - str r1, [sp, 0x8] - movs r1, 0 - str r1, [sp, 0xC] - str r5, [sp, 0x10] - movs r1, 0x2 - movs r2, 0x2 - movs r3, 0x2 - bl AddTextPrinterParametrized2 - ldrb r0, [r6] - bl PutWindowTilemap - ldrb r0, [r6, 0x1] - bl PutWindowTilemap - ldrb r0, [r6] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r6, 0x2] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r6, 0x1] - movs r1, 0x3 - bl CopyWindowToVram - add sp, 0x14 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811111C: .4byte gUnknown_845661C -_08111120: .4byte gUnknown_203ADFE -_08111124: .4byte gStringVar4 -_08111128: .4byte gUnknown_841A155 -_0811112C: .4byte gStringVar1 -_08111130: .4byte gUnknown_8456634 - thumb_func_end sub_8111070 - - thumb_func_start sub_8111134 -sub_8111134: @ 8111134 - push {r4,lr} - ldr r4, _0811114C @ =gUnknown_203ADFE - ldrb r0, [r4, 0x1] - bl PutWindowTilemap - ldrb r0, [r4, 0x1] - movs r1, 0x1 - bl CopyWindowToVram - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0811114C: .4byte gUnknown_203ADFE - thumb_func_end sub_8111134 - - thumb_func_start sub_8111150 -sub_8111150: @ 8111150 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - ldr r2, _081111A8 @ =gSaveBlock1Ptr - movs r1, 0xCD - lsls r1, 3 - muls r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - ldr r1, [r2] - adds r5, r1, r0 - movs r4, 0 - mov r9, r2 - mov r6, r9 - movs r2, 0x8D - lsls r2, 3 - mov r12, r2 - ldr r7, _081111AC @ =0x000008e4 - mov r8, r7 -_08111180: - lsls r0, r4, 2 - adds r3, r5, r0 - ldr r2, _081111B0 @ =0x00000469 - adds r1, r3, r2 - ldrb r1, [r1] - lsls r1, 31 - mov r10, r0 - cmp r1, 0 - beq _081111B4 - ldr r1, [r6] - lsls r2, r4, 1 - adds r0, r2, r4 - lsls r0, 3 - adds r1, r0 - mov r7, r12 - adds r0, r3, r7 - ldrb r0, [r0] - negs r0, r0 - b _081111C4 - .align 2, 0 -_081111A8: .4byte gSaveBlock1Ptr -_081111AC: .4byte 0x000008e4 -_081111B0: .4byte 0x00000469 -_081111B4: - ldr r1, [r6] - lsls r2, r4, 1 - adds r0, r2, r4 - lsls r0, 3 - adds r1, r0 - mov r7, r12 - adds r0, r3, r7 - ldrb r0, [r0] -_081111C4: - add r1, r8 - strh r0, [r1] - adds r3, r2, 0 - mov r0, r10 - adds r2, r5, r0 - ldr r1, _081111F0 @ =0x0000046a - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 30 - cmp r0, 0 - bge _081111F4 - ldr r1, [r6] - adds r0, r3, r4 - lsls r0, 3 - adds r1, r0 - mov r7, r12 - adds r0, r2, r7 - ldr r0, [r0] - lsls r0, 15 - lsrs r0, 24 - negs r0, r0 - b _08111206 - .align 2, 0 -_081111F0: .4byte 0x0000046a -_081111F4: - ldr r1, [r6] - adds r0, r3, r4 - lsls r0, 3 - adds r1, r0 - mov r7, r12 - adds r0, r2, r7 - ldr r0, [r0] - lsls r0, 15 - lsrs r0, 24 -_08111206: - ldr r2, _08111260 @ =0x000008e6 - adds r1, r2 - strh r0, [r1] - ldr r1, [r6] - adds r3, r4 - lsls r3, 3 - adds r1, r3 - mov r7, r10 - adds r2, r5, r7 - ldr r7, _08111264 @ =0x0000046a - adds r0, r2, r7 - ldrb r0, [r0] - lsrs r0, 2 - ldr r7, _08111268 @ =0x000008e8 - adds r1, r7 - strb r0, [r1] - ldr r0, [r6] - adds r0, r3 - ldr r1, _0811126C @ =0x0000046b - adds r2, r1 - ldrb r1, [r2] - ldr r2, _08111270 @ =0x000008e9 - adds r0, r2 - strb r1, [r0] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x3F - bls _08111180 - mov r7, r9 - ldr r1, [r7] - movs r0, 0x8E - lsls r0, 4 - adds r1, r0 - adds r0, r5, 0 - bl sub_815A1F8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08111260: .4byte 0x000008e6 -_08111264: .4byte 0x0000046a -_08111268: .4byte 0x000008e8 -_0811126C: .4byte 0x0000046b -_08111270: .4byte 0x000008e9 - thumb_func_end sub_8111150 - - thumb_func_start sub_8111274 -sub_8111274: @ 8111274 - push {r4,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, 24 - cmp r1, 0 - bne _081112D4 - ldr r3, _081112C8 @ =gSaveBlock1Ptr - ldr r2, [r3] - movs r0, 0xCD - lsls r0, 3 - adds r1, r4, 0 - muls r1, r0 - adds r0, r2, r1 - ldr r4, _081112CC @ =0x00001301 - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2, 0x4] - ldr r2, [r3] - adds r0, r2, r1 - adds r4, 0x1 - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2, 0x5] - ldr r2, [r3] - adds r0, r2, r1 - adds r4, 0x1 - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2, 0x6] - ldr r2, [r3] - adds r1, r2, r1 - ldr r3, _081112D0 @ =0x00001304 - adds r0, r1, r3 - ldrh r0, [r0] - strh r0, [r2] - adds r4, 0x3 - adds r1, r4 - ldrh r0, [r1] - strh r0, [r2, 0x2] - b _08111336 - .align 2, 0 -_081112C8: .4byte gSaveBlock1Ptr -_081112CC: .4byte 0x00001301 -_081112D0: .4byte 0x00001304 -_081112D4: - ldr r0, _08111340 @ =gSaveBlock1Ptr - ldr r3, [r0] - movs r0, 0xCD - lsls r0, 3 - muls r0, r4 - adds r3, r0 - ldr r1, _08111344 @ =0x00001301 - adds r0, r3, r1 - ldrb r2, [r0] - ldr r0, _08111348 @ =0xffffff00 - ldr r1, [sp] - ands r1, r0 - orrs r1, r2 - str r1, [sp] - ldr r2, _0811134C @ =0x00001302 - adds r0, r3, r2 - ldrb r0, [r0] - lsls r0, 8 - ldr r2, _08111350 @ =0xffff00ff - ands r2, r1 - orrs r2, r0 - str r2, [sp] - ldr r4, _08111354 @ =0x00001303 - adds r0, r3, r4 - ldrb r1, [r0] - lsls r1, 16 - ldr r0, _08111358 @ =0xff00ffff - ands r0, r2 - orrs r0, r1 - str r0, [sp] - ldr r1, _0811135C @ =0x00001304 - adds r0, r3, r1 - ldrh r1, [r0] - ldr r0, _08111360 @ =0xffff0000 - ldr r2, [sp, 0x4] - ands r2, r0 - orrs r2, r1 - str r2, [sp, 0x4] - adds r4, 0x3 - adds r3, r4 - ldrh r1, [r3] - lsls r1, 16 - ldr r0, _08111364 @ =0x0000ffff - ands r0, r2 - orrs r0, r1 - str r0, [sp, 0x4] - mov r0, sp - bl sub_8055D5C -_08111336: - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111340: .4byte gSaveBlock1Ptr -_08111344: .4byte 0x00001301 -_08111348: .4byte 0xffffff00 -_0811134C: .4byte 0x00001302 -_08111350: .4byte 0xffff00ff -_08111354: .4byte 0x00001303 -_08111358: .4byte 0xff00ffff -_0811135C: .4byte 0x00001304 -_08111360: .4byte 0xffff0000 -_08111364: .4byte 0x0000ffff - thumb_func_end sub_8111274 - - thumb_func_start sub_8111368 -sub_8111368: @ 8111368 - push {lr} - ldr r1, _081113A0 @ =gUnknown_203ADFA - movs r0, 0x2 - strb r0, [r1] - bl sub_806E6FC - bl sub_809A2DC - bl sub_809A2A4 - bl sub_8110AC8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _081113B4 - ldr r0, _081113A4 @ =gUnknown_203ADF8 - ldrb r0, [r0] - movs r1, 0 - bl sub_8111274 - ldr r1, _081113A8 @ =gUnknown_3005024 - ldr r0, _081113AC @ =sub_8111038 - str r0, [r1] - ldr r0, _081113B0 @ =sub_80572A8 - bl SetMainCallback2 - b _081113CE - .align 2, 0 -_081113A0: .4byte gUnknown_203ADFA -_081113A4: .4byte gUnknown_203ADF8 -_081113A8: .4byte gUnknown_3005024 -_081113AC: .4byte sub_8111038 -_081113B0: .4byte sub_80572A8 -_081113B4: - ldr r0, _081113D4 @ =gUnknown_203ADF8 - ldrb r0, [r0] - movs r1, 0x1 - bl sub_8111274 - bl warp_in - ldr r1, _081113D8 @ =gUnknown_3005024 - ldr r0, _081113DC @ =sub_8111000 - str r0, [r1] - ldr r0, _081113E0 @ =sub_805726C - bl SetMainCallback2 -_081113CE: - pop {r0} - bx r0 - .align 2, 0 -_081113D4: .4byte gUnknown_203ADF8 -_081113D8: .4byte gUnknown_3005024 -_081113DC: .4byte sub_8111000 -_081113E0: .4byte sub_805726C - thumb_func_end sub_8111368 - - thumb_func_start sub_81113E4 -sub_81113E4: @ 81113E4 - push {r4,r5,lr} - ldr r4, _08111430 @ =gSaveBlock1Ptr - ldr r0, _08111434 @ =gUnknown_203ADF8 - ldrb r1, [r0] - movs r0, 0xCD - lsls r0, 3 - muls r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - ldr r1, [r4] - adds r5, r1, r0 - movs r2, 0xA4 - lsls r2, 1 - adds r0, r5, r2 - movs r2, 0xEE - lsls r2, 4 - adds r1, r2 - movs r2, 0x90 - bl CpuSet - movs r1, 0x9A - lsls r1, 2 - adds r0, r5, r1 - ldr r1, [r4] - movs r2, 0x80 - lsls r2, 5 - adds r1, r2 - movs r2, 0x80 - lsls r2, 1 - bl CpuSet - bl sub_8111688 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08111430: .4byte gSaveBlock1Ptr -_08111434: .4byte gUnknown_203ADF8 - thumb_func_end sub_81113E4 - - thumb_func_start sub_8111438 -sub_8111438: @ 8111438 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - movs r0, 0x68 - bl AllocZeroed - mov r9, r0 - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - str r0, [sp, 0x8] - str r0, [sp, 0xC] - mov r0, r9 - movs r1, 0x13 - movs r2, 0x1 - movs r3, 0x20 - bl CreateMon - ldr r0, _081114BC @ =0x00004027 - bl VarGet - lsls r0, 16 - lsrs r1, r0, 28 - mov r6, r9 - adds r6, 0x64 - strh r1, [r6] - lsls r0, 4 - lsrs r0, 20 - mov r4, r9 - adds r4, 0x66 - strh r0, [r4] - bl sub_8111618 - lsls r0, 16 - lsrs r5, r0, 16 - ldrh r0, [r6] - cmp r5, r0 - bls _081114C4 - movs r3, 0 - subs r0, r5, r0 - mov r8, r4 - cmp r3, r0 - bge _0811150E -_08111492: - movs r0, 0x5 - subs r0, r3 - movs r1, 0x64 - muls r0, r1 - ldr r1, _081114C0 @ =gPlayerParty - adds r0, r1 - str r3, [sp, 0x10] - bl ZeroMonData - ldr r3, [sp, 0x10] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - mov r0, r9 - adds r0, 0x64 - ldrh r0, [r0] - subs r0, r5, r0 - cmp r3, r0 - blt _08111492 - b _0811150E - .align 2, 0 -_081114BC: .4byte 0x00004027 -_081114C0: .4byte gPlayerParty -_081114C4: - mov r8, r4 - cmp r5, r0 - bcs _0811150E - movs r3, 0 - adds r4, r6, 0 -_081114CE: - lsls r1, r3, 24 - lsrs r1, 24 - movs r0, 0 - str r3, [sp, 0x10] - bl sub_808BCB4 - ldr r3, [sp, 0x10] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x4 - bls _081114CE - adds r3, r5, 0 - ldrh r0, [r4] - cmp r3, r0 - bcs _0811150E -_081114EE: - movs r0, 0x64 - muls r0, r3 - ldr r1, _08111574 @ =gPlayerParty - adds r0, r1 - mov r1, r9 - movs r2, 0x64 - str r3, [sp, 0x10] - bl CopyMon - ldr r3, [sp, 0x10] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - ldrh r1, [r4] - cmp r3, r1 - bcc _081114EE -_0811150E: - bl sub_811164C - lsls r0, 16 - lsrs r5, r0, 16 - mov r1, r8 - ldrh r0, [r1] - cmp r5, r0 - bls _08111578 - movs r3, 0 -_08111520: - movs r6, 0 - lsls r7, r3, 24 - lsrs r7, 24 -_08111526: - lsls r0, r6, 24 - lsrs r4, r0, 24 - adds r0, r7, 0 - adds r1, r4, 0 - movs r2, 0x5 - str r3, [sp, 0x10] - bl GetBoxMonDataFromAnyBox - ldr r3, [sp, 0x10] - cmp r0, 0 - beq _08111554 - adds r0, r7, 0 - adds r1, r4, 0 - bl sub_808BCB4 - subs r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r3, [sp, 0x10] - mov r0, r8 - ldrh r0, [r0] - cmp r5, r0 - beq _081115D2 -_08111554: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x1D - bls _08111526 - mov r1, r8 - ldrh r1, [r1] - cmp r5, r1 - beq _081115D2 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0xD - bls _08111520 - b _081115D2 - .align 2, 0 -_08111574: .4byte gPlayerParty -_08111578: - cmp r5, r0 - bcs _081115D2 - movs r3, 0 -_0811157E: - movs r6, 0 - lsls r7, r3, 24 -_08111582: - lsls r1, r6, 24 - lsrs r1, 24 - lsrs r0, r7, 24 - str r3, [sp, 0x10] - bl GetBoxedMonPtr - adds r4, r0, 0 - movs r1, 0x5 - bl GetBoxMonData - ldr r3, [sp, 0x10] - cmp r0, 0 - bne _081115B6 - adds r0, r4, 0 - mov r1, r9 - movs r2, 0x50 - bl CopyMon - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r3, [sp, 0x10] - mov r0, r8 - ldrh r0, [r0] - cmp r5, r0 - beq _081115D2 -_081115B6: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x1D - bls _08111582 - mov r1, r8 - ldrh r1, [r1] - cmp r5, r1 - beq _081115D2 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0xD - bls _0811157E -_081115D2: - mov r0, r9 - bl Free - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8111438 - - thumb_func_start sub_81115E8 -sub_81115E8: @ 81115E8 - push {r4,lr} - bl sub_8111618 - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - bl sub_811164C - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldr r0, _08111614 @ =0x00004027 - lsls r4, 12 - adds r1, r4 - lsls r1, 16 - lsrs r1, 16 - bl VarSet - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111614: .4byte 0x00004027 - thumb_func_end sub_81115E8 - - thumb_func_start sub_8111618 -sub_8111618: @ 8111618 - push {r4,r5,lr} - movs r5, 0 - movs r4, 0 -_0811161E: - movs r0, 0x64 - muls r0, r4 - ldr r1, _08111648 @ =gPlayerParty - adds r0, r1 - movs r1, 0x5 - bl GetMonData - cmp r0, 0 - beq _08111636 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_08111636: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x5 - bls _0811161E - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08111648: .4byte gPlayerParty - thumb_func_end sub_8111618 - - thumb_func_start sub_811164C -sub_811164C: @ 811164C - push {r4-r7,lr} - movs r6, 0 - movs r0, 0 -_08111652: - movs r4, 0 - lsls r5, r0, 24 - adds r7, r0, 0x1 -_08111658: - lsls r1, r4, 24 - lsrs r1, 24 - lsrs r0, r5, 24 - movs r2, 0x5 - bl GetBoxMonDataFromAnyBox - cmp r0, 0 - beq _0811166E - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 -_0811166E: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1D - bls _08111658 - lsls r0, r7, 16 - lsrs r0, 16 - cmp r0, 0xD - bls _08111652 - adds r0, r6, 0 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_811164C - - thumb_func_start sub_8111688 -sub_8111688: @ 8111688 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r5, 0 - ldr r0, _081116CC @ =gSaveBlock1Ptr - mov r8, r0 - ldr r7, _081116D0 @ =0x0000063a -_08111698: - ldr r1, _081116D4 @ =0x000040aa - adds r0, r5, r1 - lsls r0, 16 - lsrs r0, 16 - bl VarGet - lsls r1, r5, 1 - add r1, sp - strh r0, [r1] - movs r4, 0 - adds r6, r5, 0x1 - adds r3, r1, 0 - lsls r5, 4 -_081116B2: - ldrh r0, [r3] - movs r2, 0x1 - ands r2, r0 - cmp r2, 0 - beq _081116D8 - mov r1, r8 - ldr r0, [r1] - adds r1, r5, r4 - adds r0, r7 - adds r0, r1 - movs r1, 0x1E - strb r1, [r0] - b _081116E4 - .align 2, 0 -_081116CC: .4byte gSaveBlock1Ptr -_081116D0: .4byte 0x0000063a -_081116D4: .4byte 0x000040aa -_081116D8: - mov r1, r8 - ldr r0, [r1] - adds r1, r5, r4 - adds r0, r7 - adds r0, r1 - strb r2, [r0] -_081116E4: - ldrh r0, [r3] - lsrs r0, 1 - strh r0, [r3] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0xF - bls _081116B2 - lsls r0, r6, 16 - lsrs r5, r0, 16 - cmp r5, 0x3 - bls _08111698 - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8111688 - - thumb_func_start sub_8111708 -sub_8111708: @ 8111708 - push {r4,r5,lr} - sub sp, 0x1C - ldr r0, _08111754 @ =0x000040ae - bl VarGet - ldr r4, _08111758 @ =gSaveBlock1Ptr - ldr r1, [r4] - strh r0, [r1, 0x32] - lsls r0, 16 - cmp r0, 0 - bne _0811174A - movs r0, 0x4 - ldrsb r0, [r1, r0] - lsls r0, 16 - lsrs r0, 16 - ldrb r1, [r1, 0x5] - lsls r1, 24 - asrs r1, 24 - lsls r1, 16 - lsrs r1, 16 - bl get_mapheader_by_bank_and_number - mov r1, sp - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldr r0, [r0] - str r0, [r1] - ldr r1, [r4] - mov r0, sp - ldrh r0, [r0, 0x12] - strh r0, [r1, 0x32] -_0811174A: - add sp, 0x1C - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08111754: .4byte 0x000040ae -_08111758: .4byte gSaveBlock1Ptr - thumb_func_end sub_8111708 - - thumb_func_start sub_811175C -sub_811175C: @ 811175C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - mov r8, r1 - lsls r0, 24 - lsrs r4, r0, 24 - movs r6, 0 - mov r9, r6 - movs r2, 0x80 - lsls r2, 1 - mov r0, r8 - movs r1, 0 - bl memset - movs r7, 0 - ldr r2, _081117B8 @ =gUnknown_203AE0C - movs r1, 0 -_08111780: - lsls r0, r7, 2 - adds r0, r2 - str r1, [r0] - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x1F - bls _08111780 - ldr r1, _081117BC @ =gSaveBlock1Ptr - movs r0, 0xCD - lsls r0, 3 - muls r0, r4 - ldr r1, [r1] - adds r0, r1 - ldr r1, _081117C0 @ =0x00001868 - adds r4, r0, r1 - movs r7, 0 -_081117A2: - ldrh r0, [r4] - ldr r1, _081117C4 @ =0x00000fff - ands r1, r0 - cmp r1, 0x29 - bls _081117AE - b _081118AC -_081117AE: - lsls r0, r1, 2 - ldr r1, _081117C8 @ =_081117CC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081117B8: .4byte gUnknown_203AE0C -_081117BC: .4byte gSaveBlock1Ptr -_081117C0: .4byte 0x00001868 -_081117C4: .4byte 0x00000fff -_081117C8: .4byte _081117CC - .align 2, 0 -_081117CC: - .4byte _08111874 - .4byte _08111880 - .4byte _08111880 - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _0811188C - .4byte _081118AC - .4byte _08111898 -_08111874: - lsls r1, r6, 3 - add r1, r8 - adds r0, r4, 0 - bl sub_8113D08 - b _081118A2 -_08111880: - lsls r1, r6, 3 - add r1, r8 - adds r0, r4, 0 - bl sub_8113D94 - b _081118A2 -_0811188C: - lsls r1, r6, 3 - add r1, r8 - adds r0, r4, 0 - bl sub_8113C20 - b _081118A2 -_08111898: - lsls r1, r6, 3 - add r1, r8 - adds r0, r4, 0 - bl sub_8113C8C -_081118A2: - adds r4, r0, 0 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - b _081118D2 -_081118AC: - mov r0, r9 - lsls r1, r0, 2 - ldr r5, _081118F0 @ =gUnknown_203AE0C - adds r1, r5 - adds r0, r4, 0 - bl sub_8113A78 - adds r4, r0, 0 - mov r1, r9 - cmp r1, 0 - bne _081118C8 - ldr r0, [r5] - bl sub_8113ABC -_081118C8: - mov r0, r9 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 -_081118D2: - cmp r4, 0 - beq _081118E2 - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x1F - bhi _081118E2 - b _081117A2 -_081118E2: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081118F0: .4byte gUnknown_203AE0C - thumb_func_end sub_811175C - - thumb_func_start sub_81118F4 -sub_81118F4: @ 81118F4 - push {lr} - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0x1 - bl fade_screen - ldr r1, _0811190C @ =gUnknown_203AE8C - ldr r0, _08111910 @ =sub_8111914 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_0811190C: .4byte gUnknown_203AE8C -_08111910: .4byte sub_8111914 - thumb_func_end sub_81118F4 - - thumb_func_start sub_8111914 -sub_8111914: @ 8111914 - push {lr} - ldr r0, _08111960 @ =gUnknown_2037AB8 - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0811197A - bl ScriptContext2_Enable - ldr r1, _08111964 @ =gUnknown_203ADF8 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bhi _08111970 - ldr r0, _08111968 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldrb r2, [r1] - 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 _08111970 - ldr r1, _0811196C @ =gUnknown_203ADF9 - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - bl sub_8111368 - b _0811197A - .align 2, 0 -_08111960: .4byte gUnknown_2037AB8 -_08111964: .4byte gUnknown_203ADF8 -_08111968: .4byte gSaveBlock1Ptr -_0811196C: .4byte gUnknown_203ADF9 -_08111970: - ldr r1, _08111980 @ =gUnknown_3005E88 - movs r0, 0 - strb r0, [r1] - bl sub_8111984 -_0811197A: - pop {r0} - bx r0 - .align 2, 0 -_08111980: .4byte gUnknown_3005E88 - thumb_func_end sub_8111914 - - thumb_func_start sub_8111984 -sub_8111984: @ 8111984 - push {lr} - bl sub_806E6FC - bl Save_ResetSaveCounters - movs r0, 0 - bl Save_LoadGameData - ldr r0, _081119B4 @ =sub_8057430 - bl SetMainCallback2 - ldr r1, _081119B8 @ =gUnknown_3005024 - ldr r0, _081119BC @ =sub_8111F60 - str r0, [r1] - bl FreeAllWindowBuffers - ldr r1, _081119C0 @ =gUnknown_203ADFA - movs r0, 0x3 - strb r0, [r1] - ldr r1, _081119C4 @ =gUnknown_203AE8C - movs r0, 0 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_081119B4: .4byte sub_8057430 -_081119B8: .4byte gUnknown_3005024 -_081119BC: .4byte sub_8111F60 -_081119C0: .4byte gUnknown_203ADFA -_081119C4: .4byte gUnknown_203AE8C - thumb_func_end sub_8111984 - - thumb_func_start sub_81119C8 -sub_81119C8: @ 81119C8 - push {lr} - bl sub_8111914 - pop {r0} - bx r0 - thumb_func_end sub_81119C8 - - thumb_func_start sub_81119D4 -sub_81119D4: @ 81119D4 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _081119E8 @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x1 - beq _081119EC - cmp r0, 0x2 - beq _081119F2 - b _08111A2C - .align 2, 0 -_081119E8: .4byte gUnknown_203ADFA -_081119EC: - bl sub_8112364 - b _08111A2C -_081119F2: - ldr r1, _08111A20 @ =gUnknown_3005E88 - movs r0, 0x3 - strb r0, [r1] - ldr r0, _08111A24 @ =sub_8111A34 - movs r1, 0x50 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08111A28 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r2, 0 - strh r2, [r1, 0x8] - strh r2, [r1, 0xA] - movs r1, 0xE - adds r2, r4, 0 - bl SetWordTaskArg - movs r0, 0x1 - b _08111A2E - .align 2, 0 -_08111A20: .4byte gUnknown_3005E88 -_08111A24: .4byte sub_8111A34 -_08111A28: .4byte gTasks -_08111A2C: - movs r0, 0 -_08111A2E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81119D4 - - thumb_func_start sub_8111A34 -sub_8111A34: @ 8111A34 - push {r4,r5,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _08111A54 @ =gTasks+0x8 - adds r4, r0, r1 - movs r0, 0x2 - ldrsh r1, [r4, r0] - cmp r1, 0 - beq _08111A58 - cmp r1, 0x1 - beq _08111A90 - b _08111AC0 - .align 2, 0 -_08111A54: .4byte gTasks+0x8 -_08111A58: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x7F - bne _08111AC0 - movs r0, 0x1 - negs r0, r0 - str r1, [sp] - movs r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldr r2, _08111A8C @ =gUnknown_203AE94 - ldrb r1, [r2] - movs r0, 0x3F - ands r0, r1 - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2] - ldrh r0, [r4, 0x2] - adds r0, 0x1 - strh r0, [r4, 0x2] - b _08111AC0 - .align 2, 0 -_08111A8C: .4byte gUnknown_203AE94 -_08111A90: - ldr r0, _08111AC8 @ =gUnknown_2037AB8 - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - bne _08111AC0 - ldr r0, _08111ACC @ =gUnknown_3005E88 - strb r1, [r0] - adds r0, r5, 0 - movs r1, 0xE - bl GetWordTaskArg - cmp r0, 0 - beq _08111AB4 - bl _call_via_r0 -_08111AB4: - adds r0, r5, 0 - bl DestroyTask - ldr r1, _08111AD0 @ =gUnknown_203AE8C - ldr r0, _08111AD4 @ =sub_8111914 - str r0, [r1] -_08111AC0: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08111AC8: .4byte gUnknown_2037AB8 -_08111ACC: .4byte gUnknown_3005E88 -_08111AD0: .4byte gUnknown_203AE8C -_08111AD4: .4byte sub_8111914 - thumb_func_end sub_8111A34 - - thumb_func_start sub_8111AD8 -sub_8111AD8: @ 8111AD8 - push {r4,r5,lr} - ldr r4, _08111B58 @ =gUnknown_203AE94 - ldrb r1, [r4] - movs r0, 0xF - ands r0, r1 - cmp r0, 0x1 - bne _08111B0A - ldrb r0, [r4, 0x2] - subs r0, 0x1 - strb r0, [r4, 0x2] - lsls r0, 24 - cmp r0, 0 - bne _08111B78 - movs r0, 0x10 - negs r0, r0 - ands r0, r1 - movs r1, 0x31 - negs r1, r1 - ands r0, r1 - movs r1, 0x10 - orrs r0, r1 - strb r0, [r4] - movs r0, 0x2 - bl sub_8112888 -_08111B0A: - ldrb r1, [r4] - movs r0, 0x30 - ands r0, r1 - cmp r0, 0x10 - bne _08111B34 - ldrb r0, [r4, 0x3] - adds r0, 0x1 - strb r0, [r4, 0x3] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xF - bls _08111B34 - bl sub_8111E20 - ldrb r0, [r4] - movs r1, 0x31 - negs r1, r1 - ands r1, r0 - strb r1, [r4] - movs r0, 0 - strb r0, [r4, 0x3] -_08111B34: - ldr r4, _08111B58 @ =gUnknown_203AE94 - ldrb r0, [r4, 0x1] - cmp r0, 0x1F - bhi _08111B78 - ldr r5, _08111B5C @ =gUnknown_203AE0C - lsls r0, 2 - adds r0, r5 - ldr r0, [r0] - bl sub_8113B44 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08111B60 - bl sub_8111B80 - b _08111B78 - .align 2, 0 -_08111B58: .4byte gUnknown_203AE94 -_08111B5C: .4byte gUnknown_203AE0C -_08111B60: - ldrb r0, [r4, 0x1] - lsls r0, 2 - adds r0, r5 - ldr r0, [r0] - bl sub_8113AE8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08111B78 - bl sub_8111B80 -_08111B78: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8111AD8 - - thumb_func_start sub_8111B80 -sub_8111B80: @ 8111B80 - push {r4,lr} - ldr r4, _08111BCC @ =gUnknown_203AE94 - ldrb r1, [r4] - movs r2, 0xF - ands r2, r1 - cmp r2, 0 - bne _08111BC0 - movs r0, 0x10 - negs r0, r0 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - movs r1, 0x31 - negs r1, r1 - ands r0, r1 - strb r0, [r4] - strb r2, [r4, 0x3] - bl sub_8111BD4 - strb r0, [r4, 0x2] - ldr r0, _08111BD0 @ =gUnknown_203B044 - ldrh r0, [r0, 0x2] - cmp r0, 0 - bne _08111BB6 - ldrb r0, [r4, 0x1] - adds r0, 0x1 - strb r0, [r4, 0x1] -_08111BB6: - ldrb r0, [r4, 0x1] - cmp r0, 0x20 - bhi _08111BC6 - bl sub_8111D10 -_08111BC0: - movs r0, 0x1 - bl sub_8112888 -_08111BC6: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111BCC: .4byte gUnknown_203AE94 -_08111BD0: .4byte gUnknown_203B044 - thumb_func_end sub_8111B80 - - thumb_func_start sub_8111BD4 -sub_8111BD4: @ 8111BD4 - push {r4,lr} - movs r2, 0 - movs r1, 0 - ldr r3, _08111C0C @ =gStringVar4 - ldrb r0, [r3] - cmp r0, 0xFF - beq _08111C04 - ldr r4, _08111C10 @ =0x000003ff -_08111BE4: - adds r0, r1, r3 - ldrb r0, [r0] - cmp r0, 0xFE - beq _08111BF2 - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 -_08111BF2: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, r4 - bhi _08111C04 - adds r0, r1, r3 - ldrb r0, [r0] - cmp r0, 0xFF - bne _08111BE4 -_08111C04: - cmp r2, 0x13 - bhi _08111C14 - movs r0, 0x5F - b _08111C26 - .align 2, 0 -_08111C0C: .4byte gStringVar4 -_08111C10: .4byte 0x000003ff -_08111C14: - cmp r2, 0x23 - bhi _08111C1C - movs r0, 0x7F - b _08111C26 -_08111C1C: - cmp r2, 0x2D - bls _08111C24 - movs r0, 0xFF - b _08111C26 -_08111C24: - movs r0, 0xBF -_08111C26: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8111BD4 - - thumb_func_start sub_8111C2C -sub_8111C2C: @ 8111C2C - push {lr} - ldr r0, _08111C54 @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x2 - bne _08111C60 - ldr r0, _08111C58 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0 - beq _08111C4E - ldr r0, _08111C5C @ =gUnknown_203AE94 - ldrb r0, [r0] - movs r1, 0xF - ands r1, r0 - cmp r1, 0x1 - beq _08111C4E - cmp r1, 0x2 - bne _08111C60 -_08111C4E: - movs r0, 0x1 - b _08111C62 - .align 2, 0 -_08111C54: .4byte gUnknown_203ADFA -_08111C58: .4byte gUnknown_3005E88 -_08111C5C: .4byte gUnknown_203AE94 -_08111C60: - movs r0, 0 -_08111C62: - pop {r1} - bx r1 - thumb_func_end sub_8111C2C - - thumb_func_start sub_8111C68 -sub_8111C68: @ 8111C68 - push {r4,r5,lr} - ldr r5, _08111C9C @ =gUnknown_203AE94 - ldrb r2, [r5] - movs r4, 0xC0 - ands r4, r2 - cmp r4, 0 - bne _08111CC6 - ldr r0, _08111CA0 @ =gMain - ldrh r1, [r0, 0x2E] - movs r3, 0x1 - ands r3, r1 - cmp r3, 0 - beq _08111CA8 - movs r0, 0x3F - ands r0, r2 - movs r1, 0x80 - orrs r0, r1 - strb r0, [r5] - ldr r0, _08111CA4 @ =gUnknown_3005E88 - strb r4, [r0] - movs r0, 0x3 - negs r0, r0 - bl sub_81118F4 - b _08111CC6 - .align 2, 0 -_08111C9C: .4byte gUnknown_203AE94 -_08111CA0: .4byte gMain -_08111CA4: .4byte gUnknown_3005E88 -_08111CA8: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08111CC6 - movs r0, 0x3F - ands r0, r2 - movs r1, 0x40 - orrs r0, r1 - strb r0, [r5] - ldr r0, _08111CCC @ =gUnknown_3005E88 - strb r3, [r0] - movs r0, 0x3 - negs r0, r0 - bl sub_8111E64 -_08111CC6: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08111CCC: .4byte gUnknown_3005E88 - thumb_func_end sub_8111C68 - - thumb_func_start sub_8111CD0 -sub_8111CD0: @ 8111CD0 - push {lr} - ldr r0, _08111CE4 @ =gUnknown_203AE94 - ldrb r1, [r0] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - bne _08111CE8 - movs r0, 0 - b _08111CEA - .align 2, 0 -_08111CE4: .4byte gUnknown_203AE94 -_08111CE8: - movs r0, 0x1 -_08111CEA: - pop {r1} - bx r1 - thumb_func_end sub_8111CD0 - - thumb_func_start sub_8111CF0 -sub_8111CF0: @ 8111CF0 - push {lr} - ldr r0, _08111D08 @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x2 - bne _08111D02 - ldr r0, _08111D0C @ =gUnknown_203ADF9 - ldrb r0, [r0] - bl sub_8111070 -_08111D02: - pop {r0} - bx r0 - .align 2, 0 -_08111D08: .4byte gUnknown_203ADFA -_08111D0C: .4byte gUnknown_203ADF9 - thumb_func_end sub_8111CF0 - - thumb_func_start sub_8111D10 -sub_8111D10: @ 8111D10 - push {r4,r5,lr} - sub sp, 0x14 - movs r4, 0 - movs r1, 0 - ldr r2, _08111D80 @ =gStringVar4 - ldrb r0, [r2] - ldr r5, _08111D84 @ =gUnknown_203ADFE - cmp r0, 0xFF - beq _08111D42 -_08111D22: - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0xFE - bne _08111D30 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 -_08111D30: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0xFF - bhi _08111D42 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0xFF - bne _08111D22 -_08111D42: - ldrb r0, [r5, 0x2] - bl PutWindowTilemap - ldrb r0, [r5, 0x2] - bl sub_8111D90 - ldrb r0, [r5, 0x2] - ldr r1, _08111D88 @ =gUnknown_8456698 - adds r1, r4, r1 - ldrb r3, [r1] - movs r1, 0x1 - str r1, [sp] - movs r2, 0 - str r2, [sp, 0x4] - ldr r1, _08111D8C @ =gUnknown_8456634 - str r1, [sp, 0x8] - str r2, [sp, 0xC] - ldr r1, _08111D80 @ =gStringVar4 - str r1, [sp, 0x10] - movs r1, 0x2 - movs r2, 0x2 - bl AddTextPrinterParametrized2 - movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram - add sp, 0x14 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08111D80: .4byte gStringVar4 -_08111D84: .4byte gUnknown_203ADFE -_08111D88: .4byte gUnknown_8456698 -_08111D8C: .4byte gUnknown_8456634 - thumb_func_end sub_8111D10 - - thumb_func_start sub_8111D90 -sub_8111D90: @ 8111D90 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - ldr r0, _08111DC0 @ =gUnknown_8456638 - mov r9, r0 - movs r0, 0xB4 - lsls r0, 5 - bl Alloc - mov r8, r0 - cmp r0, 0 - beq _08111E0C - movs r1, 0 -_08111DB4: - cmp r1, 0 - beq _08111DC4 - cmp r1, 0x5 - beq _08111DC8 - movs r0, 0x1 - b _08111DCA - .align 2, 0 -_08111DC0: .4byte gUnknown_8456638 -_08111DC4: - movs r0, 0 - b _08111DCA -_08111DC8: - movs r0, 0x2 -_08111DCA: - movs r4, 0 - lsls r6, r0, 5 - lsls r0, r1, 4 - adds r7, r1, 0x1 - subs r0, r1 - lsls r5, r0, 1 -_08111DD6: - adds r1, r5, r4 - lsls r1, 5 - add r1, r8 - mov r2, r9 - adds r0, r2, r6 - ldr r2, _08111E1C @ =0x04000008 - bl CpuSet - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x1D - bls _08111DD6 - lsls r0, r7, 24 - lsrs r1, r0, 24 - cmp r1, 0x5 - bls _08111DB4 - movs r2, 0xB4 - lsls r2, 5 - mov r0, r10 - mov r1, r8 - movs r3, 0 - bl CopyToWindowPixelBuffer - mov r0, r8 - bl Free -_08111E0C: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08111E1C: .4byte 0x04000008 - thumb_func_end sub_8111D90 - - 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} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _08112024 @ =gTasks - adds r5, r1, r0 - ldr r0, _08112028 @ =gUnknown_2037AB8 - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - bne _0811201E - ldr r0, _0811202C @ =gUnknown_203AE94 - ldrb r1, [r0] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x40 - beq _0811200E - ldr r0, _08112030 @ =gStringVar1 - ldr r1, _08112034 @ =gMapHeader - ldrb r1, [r1, 0x14] - bl sub_80C4DF8 - ldr r0, _08112038 @ =gStringVar4 - ldr r1, _0811203C @ =gUnknown_841B073 - bl StringExpandPlaceholders - bl sub_8111D10 -_0811200E: - strh r4, [r5, 0x8] - strh r4, [r5, 0xA] - ldr r0, _08112040 @ =sub_8112044 - str r0, [r5] - bl player_bitmagic - bl ScriptContext2_Enable -_0811201E: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08112024: .4byte gTasks -_08112028: .4byte gUnknown_2037AB8 -_0811202C: .4byte gUnknown_203AE94 -_08112030: .4byte gStringVar1 -_08112034: .4byte gMapHeader -_08112038: .4byte gStringVar4 -_0811203C: .4byte gUnknown_841B073 -_08112040: .4byte sub_8112044 - thumb_func_end sub_8111FCC - - thumb_func_start sub_8112044 -sub_8112044: @ 8112044 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _0811208C @ =gTasks - adds r4, r1, r0 - ldr r0, _08112090 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - bne _08112076 - ldrh r2, [r4, 0x8] - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x7E - bgt _08112076 - ldr r0, _08112094 @ =gUnknown_203AE94 - ldrb r1, [r0] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x40 - bne _081120A0 -_08112076: - bl sub_8111E20 - movs r1, 0 - movs r0, 0 - strh r0, [r4, 0x8] - ldr r0, _08112098 @ =sub_81120AC - str r0, [r4] - ldr r0, _0811209C @ =gUnknown_203ADFA - strb r1, [r0] - b _081120A4 - .align 2, 0 -_0811208C: .4byte gTasks -_08112090: .4byte gMain -_08112094: .4byte gUnknown_203AE94 -_08112098: .4byte sub_81120AC -_0811209C: .4byte gUnknown_203ADFA -_081120A0: - adds r0, r2, 0x1 - strh r0, [r4, 0x8] -_081120A4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8112044 - - thumb_func_start sub_81120AC -sub_81120AC: @ 81120AC - push {r4-r6,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _081120D0 @ =gTasks+0x8 - adds r6, r0, r1 - movs r0, 0 - ldrsh r1, [r6, r0] - cmp r1, 0x1 - beq _08112110 - cmp r1, 0x1 - bgt _081120D4 - cmp r1, 0 - beq _081120DA - b _08112164 - .align 2, 0 -_081120D0: .4byte gTasks+0x8 -_081120D4: - cmp r1, 0x2 - beq _0811214C - b _08112164 -_081120DA: - ldr r0, _08112104 @ =gUnknown_2031DD8 - strb r1, [r0] - bl sub_8055DC4 - bl sub_811229C - ldr r0, _08112108 @ =gUnknown_203ADFE - ldrb r0, [r0] - ldr r2, _0811210C @ =gUnknown_845661C - ldrb r1, [r2, 0x3] - lsls r1, 3 - str r1, [sp] - ldrb r1, [r2, 0x4] - lsls r1, 3 - str r1, [sp, 0x4] - movs r1, 0xF - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - b _0811215C - .align 2, 0 -_08112104: .4byte gUnknown_2031DD8 -_08112108: .4byte gUnknown_203ADFE -_0811210C: .4byte gUnknown_845661C -_08112110: - adds r0, r5, 0 - bl sub_81121D8 - lsls r0, 24 - cmp r0, 0 - beq _081121B8 - movs r5, 0 -_0811211E: - ldr r4, _08112148 @ =gUnknown_203ADFE - adds r4, r5, r4 - ldrb r0, [r4] - bl ClearWindowTilemap - ldrb r0, [r4] - movs r1, 0x1 - bl CopyWindowToVram - ldrb r0, [r4] - bl RemoveWindow - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x2 - bls _0811211E - movs r0, 0 - strh r0, [r6, 0x2] - b _0811215C - .align 2, 0 -_08112148: .4byte gUnknown_203ADFE -_0811214C: - ldrh r1, [r6, 0x2] - movs r2, 0x2 - ldrsh r0, [r6, r2] - cmp r0, 0x1F - bgt _0811215C - adds r0, r1, 0x1 - strh r0, [r6, 0x2] - b _081121B8 -_0811215C: - ldrh r0, [r6] - adds r0, 0x1 - strh r0, [r6] - b _081121B8 -_08112164: - ldr r6, _081121C0 @ =gUnknown_203AE94 - ldrb r1, [r6] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x40 - bne _08112176 - movs r0, 0x1 - bl sub_8098110 -_08112176: - ldr r4, _081121C4 @ =gUnknown_203AE90 - ldr r0, [r4] - ldr r1, _081121C8 @ =gUnknown_20371F8 - movs r2, 0x80 - lsls r2, 2 - bl CpuSet - ldr r0, [r4] - bl Free - movs r4, 0 - str r4, [r6] - bl sub_80696C0 - bl ScriptContext2_Disable - ldr r2, _081121CC @ =gTextFlags - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - ldr r0, _081121D0 @ =gUnknown_2036E28 - strb r4, [r0] - movs r0, 0 - bl sub_8082740 - ldr r1, _081121D4 @ =gUnknown_3005ECC - movs r0, 0x1 - strb r0, [r1] - adds r0, r5, 0 - bl DestroyTask -_081121B8: - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081121C0: .4byte gUnknown_203AE94 -_081121C4: .4byte gUnknown_203AE90 -_081121C8: .4byte gUnknown_20371F8 -_081121CC: .4byte gTextFlags -_081121D0: .4byte gUnknown_2036E28 -_081121D4: .4byte gUnknown_3005ECC - thumb_func_end sub_81120AC - - thumb_func_start sub_81121D8 -sub_81121D8: @ 81121D8 - push {r4-r7,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _0811227C @ =gTasks+0x8 - adds r7, r1, r0 - ldrh r1, [r7, 0x2] - movs r2, 0x2 - ldrsh r0, [r7, r2] - cmp r0, 0xF - bgt _08112290 - ldr r5, _08112280 @ =gUnknown_20371FA - ldr r6, _08112284 @ =gUnknown_20375FA - movs r4, 0xF - subs r3, r4, r1 - lsls r3, 24 - lsrs r3, 24 - adds r0, r5, 0 - adds r1, r6, 0 - movs r2, 0xDF - bl sub_80716F8 - movs r0, 0xFF - lsls r0, 1 - adds r5, r0 - adds r6, r0 - movs r2, 0x80 - lsls r2, 1 - ldrb r0, [r7, 0x2] - subs r4, r0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - adds r1, r6, 0 - adds r3, r4, 0 - bl sub_80716F8 - ldr r5, _08112288 @ =gUnknown_203ADFE - ldrb r0, [r5] - ldr r4, _0811228C @ =gUnknown_845661C - ldrb r3, [r4, 0x4] - lsls r3, 3 - subs r3, 0x1 - ldrh r1, [r7, 0x2] - subs r3, r1 - lsls r3, 16 - lsrs r3, 16 - ldrb r1, [r4, 0x3] - lsls r1, 3 - str r1, [sp] - movs r6, 0x1 - str r6, [sp, 0x4] - movs r1, 0 - movs r2, 0 - bl FillWindowPixelRect - ldrb r0, [r5, 0x1] - ldrh r3, [r7, 0x2] - ldrb r1, [r4, 0xB] - lsls r1, 3 - str r1, [sp] - str r6, [sp, 0x4] - movs r1, 0 - movs r2, 0 - bl FillWindowPixelRect - ldrb r0, [r5] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r5, 0x1] - movs r1, 0x2 - bl CopyWindowToVram - ldrh r0, [r7, 0x2] - adds r0, 0x1 - strh r0, [r7, 0x2] - movs r0, 0 - b _08112292 - .align 2, 0 -_0811227C: .4byte gTasks+0x8 -_08112280: .4byte gUnknown_20371FA -_08112284: .4byte gUnknown_20375FA -_08112288: .4byte gUnknown_203ADFE -_0811228C: .4byte gUnknown_845661C -_08112290: - movs r0, 0x1 -_08112292: - add sp, 0x8 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81121D8 - - thumb_func_start sub_811229C -sub_811229C: @ 811229C - push {r4-r6,lr} - movs r0, 0x80 - lsls r0, 3 - bl Alloc - adds r6, r0, 0 - ldr r4, _08112314 @ =gUnknown_203AE90 - ldr r0, [r4] - movs r5, 0x80 - lsls r5, 2 - adds r1, r6, 0 - adds r2, r5, 0 - bl CpuSet - ldr r1, [r4] - adds r0, r1, 0 - movs r2, 0xD0 - bl sub_807B0C4 - ldr r1, [r4] - movs r0, 0x88 - lsls r0, 2 - adds r1, r0 - adds r0, r1, 0 - movs r2, 0x10 - bl sub_807B0C4 - ldr r1, [r4] - movs r0, 0xB0 - lsls r0, 2 - adds r1, r0 - adds r0, r1, 0 - movs r2, 0x40 - bl sub_807B0C4 - ldr r1, [r4] - movs r0, 0xD8 - lsls r0, 2 - adds r1, r0 - adds r0, r1, 0 - movs r2, 0x50 - bl sub_807B0C4 - ldr r0, [r4] - ldr r1, _08112318 @ =gUnknown_20371F8 - adds r2, r5, 0 - bl CpuSet - ldr r1, [r4] - adds r0, r6, 0 - adds r2, r5, 0 - bl CpuSet - adds r0, r6, 0 - bl Free - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08112314: .4byte gUnknown_203AE90 -_08112318: .4byte gUnknown_20371F8 - thumb_func_end sub_811229C - - thumb_func_start sub_811231C -sub_811231C: @ 811231C - push {r4,lr} - ldr r4, _0811234C @ =gUnknown_203ADFA - ldrb r0, [r4] - cmp r0, 0x1 - bne _08112346 - ldr r0, _08112350 @ =gUnknown_203AE98 - bl sub_8110E68 - bl sub_8110E3C - movs r0, 0 - strb r0, [r4] - ldr r0, _08112354 @ =gUnknown_203AE8C - movs r1, 0 - str r1, [r0] - ldr r0, _08112358 @ =gUnknown_203AE04 - str r1, [r0] - ldr r0, _0811235C @ =gUnknown_203AE08 - str r1, [r0] - ldr r0, _08112360 @ =gUnknown_3005E88 - strb r1, [r0] -_08112346: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0811234C: .4byte gUnknown_203ADFA -_08112350: .4byte gUnknown_203AE98 -_08112354: .4byte gUnknown_203AE8C -_08112358: .4byte gUnknown_203AE04 -_0811235C: .4byte gUnknown_203AE08 -_08112360: .4byte gUnknown_3005E88 - thumb_func_end sub_811231C - - thumb_func_start sub_8112364 -sub_8112364: @ 8112364 - push {r4,r5,lr} - ldr r5, _081123A4 @ =gUnknown_3005E88 - ldrb r0, [r5] - cmp r0, 0 - beq _08112392 - ldr r4, _081123A8 @ =gUnknown_203ADFA - ldrb r0, [r4] - cmp r0, 0x1 - bne _08112392 - ldr r0, _081123AC @ =gUnknown_203AE98 - bl sub_8110E68 - movs r0, 0x1 - bl sub_8113A1C - bl sub_8110E3C - movs r0, 0 - strb r0, [r5] - strb r0, [r4] - ldr r1, _081123B0 @ =gUnknown_203AE8C - movs r0, 0 - str r0, [r1] -_08112392: - ldr r0, _081123B4 @ =gUnknown_203AE04 - movs r1, 0 - str r1, [r0] - ldr r0, _081123B8 @ =gUnknown_203AE08 - str r1, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081123A4: .4byte gUnknown_3005E88 -_081123A8: .4byte gUnknown_203ADFA -_081123AC: .4byte gUnknown_203AE98 -_081123B0: .4byte gUnknown_203AE8C -_081123B4: .4byte gUnknown_203AE04 -_081123B8: .4byte gUnknown_203AE08 - thumb_func_end sub_8112364 - - thumb_func_start sub_81123BC -sub_81123BC: @ 81123BC - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r0, 0xCD - lsls r0, 5 - bl AllocZeroed - mov r8, r0 - ldr r0, _08112448 @ =gUnknown_203ADF8 - ldrb r4, [r0] - movs r5, 0 - movs r6, 0 -_081123D6: - cmp r4, 0x3 - bls _081123DC - movs r4, 0 -_081123DC: - ldr r3, _0811244C @ =gSaveBlock1Ptr - ldr r0, [r3] - movs r2, 0xCD - lsls r2, 3 - adds r1, r4, 0 - muls r1, r2 - adds r0, r1 - movs r7, 0x98 - lsls r7, 5 - adds r1, r0, r7 - ldrb r0, [r1] - cmp r0, 0 - beq _0811240A - adds r0, r5, 0 - muls r0, r2 - add r0, r8 - str r3, [sp] - bl memcpy - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r3, [sp] -_0811240A: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x3 - bls _081123D6 - ldr r1, _08112448 @ =gUnknown_203ADF8 - movs r0, 0x3 - ands r5, r0 - strb r5, [r1] - ldr r1, [r3] - movs r0, 0x98 - lsls r0, 5 - adds r1, r0 - movs r2, 0xCD - lsls r2, 4 - mov r0, r8 - bl CpuSet - mov r0, r8 - bl Free - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112448: .4byte gUnknown_203ADF8 -_0811244C: .4byte gSaveBlock1Ptr - thumb_func_end sub_81123BC - - thumb_func_start sub_8112450 -sub_8112450: @ 8112450 - push {lr} - bl sub_80BF708 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08112466 - bl sub_8112364 - bl sub_81123BC -_08112466: - pop {r0} - bx r0 - thumb_func_end sub_8112450 - - thumb_func_start sub_811246C -sub_811246C: @ 811246C - push {r4-r6,lr} - adds r6, r0, 0 - movs r0, 0x2E - ldrsh r1, [r6, r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _081124B0 @ =gMapObjects - adds r4, r0, r1 - ldrb r0, [r4, 0x8] - cmp r0, 0xFF - bne _081124B8 - ldr r5, _081124B4 @ =gUnknown_203AF9A - ldrb r0, [r5] - cmp r0, 0xFF - beq _08112498 - adds r1, r0, 0 - adds r0, r4, 0 - bl sub_8063CA4 - movs r0, 0xFF - strb r0, [r5] -_08112498: - ldrb r0, [r5, 0x1] - cmp r0, 0xFF - beq _081124A6 - bl sub_8150454 - movs r0, 0xFF - strb r0, [r5, 0x1] -_081124A6: - adds r0, r4, 0 - adds r1, r6, 0 - bl sub_8063E28 - b _081124E0 - .align 2, 0 -_081124B0: .4byte gMapObjects -_081124B4: .4byte gUnknown_203AF9A -_081124B8: - ldr r5, _081124E8 @ =gUnknown_203AF9A - ldrb r0, [r4, 0x8] - lsls r0, 1 - adds r1, r0, r5 - ldrb r0, [r1] - cmp r0, 0xFF - beq _081124D8 - adds r1, r0, 0 - adds r0, r4, 0 - bl sub_8063CA4 - ldrb r0, [r4, 0x8] - lsls r0, 1 - adds r0, r5 - movs r1, 0xFF - strb r1, [r0] -_081124D8: - adds r0, r4, 0 - adds r1, r6, 0 - bl sub_8063E28 -_081124E0: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081124E8: .4byte gUnknown_203AF9A - thumb_func_end sub_811246C - - thumb_func_start sub_81124EC -sub_81124EC: @ 81124EC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r6, r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - lsls r2, 24 - lsrs r2, 24 - mov r9, r2 - lsls r3, 24 - lsrs r3, 24 - mov r10, r3 - bl sub_8112CEC - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0 - bne _0811256E - ldr r2, _0811257C @ =gUnknown_203AF98 - ldrh r0, [r2] - ldr r3, _08112580 @ =gUnknown_3005E94 - ldr r5, [r3] - lsls r0, 3 - adds r0, r5 - ldr r1, _08112584 @ =gUnknown_203B01A - mov r12, r1 - ldrh r1, [r1] - movs r4, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r5 - strb r4, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r6, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r4, r8 - strb r4, [r0, 0x1] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r1, r9 - strb r1, [r0, 0x2] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r4, r10 - strb r4, [r0, 0x3] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - mov r0, r12 - strh r7, [r0] -_0811256E: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811257C: .4byte gUnknown_203AF98 -_08112580: .4byte gUnknown_3005E94 -_08112584: .4byte gUnknown_203B01A - thumb_func_end sub_81124EC - - thumb_func_start sub_8112588 -sub_8112588: @ 8112588 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r4, [sp, 0x20] - lsls r0, 24 - lsrs r7, r0, 24 - lsls r1, 24 - lsrs r6, r1, 24 - lsls r2, 24 - lsrs r2, 24 - mov r8, r2 - lsls r3, 24 - lsrs r3, 24 - mov r9, r3 - lsls r4, 24 - lsrs r4, 24 - mov r10, r4 - bl sub_8112D1C - lsls r0, 24 - cmp r0, 0 - bne _0811260E - ldr r2, _0811261C @ =gUnknown_203AF98 - ldrh r0, [r2] - ldr r3, _08112620 @ =gUnknown_3005E94 - ldr r5, [r3] - lsls r0, 3 - adds r0, r5 - ldr r1, _08112624 @ =gUnknown_203B01A - mov r12, r1 - ldrh r1, [r1] - movs r4, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r5 - strb r4, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r7, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r6, [r0, 0x1] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r4, r8 - strb r4, [r0, 0x2] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r1, r9 - strb r1, [r0, 0x3] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - mov r0, r10 - mov r4, r12 - strh r0, [r4] -_0811260E: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811261C: .4byte gUnknown_203AF98 -_08112620: .4byte gUnknown_3005E94 -_08112624: .4byte gUnknown_203B01A - thumb_func_end sub_8112588 - - thumb_func_start sub_8112628 -sub_8112628: @ 8112628 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r4, r0, 24 - mov r8, r4 - bl sub_8112CEC - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0 - bne _08112692 - ldr r0, _0811269C @ =gUnknown_203B01C - mov r12, r0 - ldrh r0, [r0] - ldr r6, _081126A0 @ =gUnknown_3005E94 - ldr r5, [r6] - lsls r0, 3 - adds r0, r5 - ldrb r0, [r0, 0x3] - cmp r4, r0 - bne _08112658 - cmp r4, 0x3 - bls _08112692 -_08112658: - ldr r2, _081126A4 @ =gUnknown_203AF98 - ldrh r0, [r2] - lsls r0, 3 - adds r0, r5 - ldr r4, _081126A8 @ =gUnknown_203B01A - ldrh r1, [r4] - movs r3, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r5 - strb r3, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r6] - lsls r0, 3 - adds r0, r1 - strb r3, [r0] - ldrh r0, [r2] - ldr r1, [r6] - lsls r0, 3 - adds r0, r1 - mov r1, r8 - strb r1, [r0, 0x3] - ldrh r0, [r2] - mov r1, r12 - strh r0, [r1] - adds r0, 0x1 - strh r0, [r2] - strh r7, [r4] -_08112692: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811269C: .4byte gUnknown_203B01C -_081126A0: .4byte gUnknown_3005E94 -_081126A4: .4byte gUnknown_203AF98 -_081126A8: .4byte gUnknown_203B01A - thumb_func_end sub_8112628 - - thumb_func_start sub_81126AC -sub_81126AC: @ 81126AC - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r7, r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - bl sub_8112D1C - lsls r0, 24 - cmp r0, 0 - bne _08112704 - ldr r2, _08112710 @ =gUnknown_203AF98 - ldrh r0, [r2] - ldr r3, _08112714 @ =gUnknown_3005E94 - ldr r4, [r3] - lsls r0, 3 - adds r0, r4 - ldr r6, _08112718 @ =gUnknown_203B01A - ldrh r1, [r6] - movs r5, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r4 - strb r5, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r7, [r0, 0x3] - ldr r1, _0811271C @ =gUnknown_203B01C - ldrh r0, [r2] - strh r0, [r1] - adds r0, 0x1 - strh r0, [r2] - mov r0, r8 - strh r0, [r6] -_08112704: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112710: .4byte gUnknown_203AF98 -_08112714: .4byte gUnknown_3005E94 -_08112718: .4byte gUnknown_203B01A -_0811271C: .4byte gUnknown_203B01C - thumb_func_end sub_81126AC - - thumb_func_start sub_8112720 -sub_8112720: @ 8112720 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - bl sub_8112D1C - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0 - bne _08112774 - ldr r2, _08112780 @ =gUnknown_203AF98 - ldrh r0, [r2] - ldr r3, _08112784 @ =gUnknown_3005E94 - ldr r4, [r3] - lsls r0, 3 - adds r0, r4 - ldr r6, _08112788 @ =gUnknown_203B01A - ldrh r1, [r6] - movs r5, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r4 - movs r1, 0x1 - strb r1, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r1, r8 - strb r1, [r0, 0x3] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - strh r7, [r6] -_08112774: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112780: .4byte gUnknown_203AF98 -_08112784: .4byte gUnknown_3005E94 -_08112788: .4byte gUnknown_203B01A - thumb_func_end sub_8112720 - - thumb_func_start sub_811278C -sub_811278C: @ 811278C - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r7, r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - bl sub_8112D1C - lsls r0, 24 - cmp r0, 0 - bne _081127E2 - ldr r2, _081127EC @ =gUnknown_203AF98 - ldrh r0, [r2] - ldr r3, _081127F0 @ =gUnknown_3005E94 - ldr r4, [r3] - lsls r0, 3 - adds r0, r4 - ldr r6, _081127F4 @ =gUnknown_203B01A - ldrh r1, [r6] - movs r5, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r4 - movs r1, 0x1 - strb r1, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r7, [r0, 0x3] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - mov r0, r8 - strh r0, [r6] -_081127E2: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081127EC: .4byte gUnknown_203AF98 -_081127F0: .4byte gUnknown_3005E94 -_081127F4: .4byte gUnknown_203B01A - thumb_func_end sub_811278C - - thumb_func_start sub_81127F8 -sub_81127F8: @ 81127F8 - push {r4-r6,lr} - adds r2, r0, 0 - ldr r5, _08112874 @ =gUnknown_203AF98 - ldr r1, _08112878 @ =gUnknown_3005E8C - ldrh r0, [r5] - ldrh r1, [r1] - cmp r0, r1 - bcs _0811286C - ldr r2, [r2] - ldr r0, _0811287C @ =0x00ff00f3 - ands r2, r0 - ldrh r1, [r5] - ldr r3, _08112880 @ =gUnknown_3005E94 - ldr r4, [r3] - lsls r1, 3 - adds r1, r4 - ldr r6, _08112884 @ =gUnknown_203B01A - ldrh r0, [r6] - strh r0, [r1, 0x4] - ldrh r0, [r5] - lsls r0, 3 - adds r0, r4 - movs r1, 0x2 - strb r1, [r0, 0x6] - ldrh r0, [r5] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r2, [r0] - ldrh r0, [r5] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - lsrs r1, r2, 8 - strb r1, [r0, 0x1] - ldrh r0, [r5] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - lsrs r1, r2, 16 - strb r1, [r0, 0x2] - ldrh r0, [r5] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - lsrs r2, 24 - strb r2, [r0, 0x3] - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r5] - bl ScriptContext2_IsEnabled - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _0811286A - movs r0, 0x1 -_0811286A: - strh r0, [r6] -_0811286C: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08112874: .4byte gUnknown_203AF98 -_08112878: .4byte gUnknown_3005E8C -_0811287C: .4byte 0x00ff00f3 -_08112880: .4byte gUnknown_3005E94 -_08112884: .4byte gUnknown_203B01A - thumb_func_end sub_81127F8 - - thumb_func_start sub_8112888 -sub_8112888: @ 8112888 - push {lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08112898 - cmp r0, 0x2 - beq _081128A8 - b _081128B4 -_08112898: - ldr r1, _081128A4 @ =gUnknown_3005E88 - ldrb r0, [r1] - cmp r0, 0x1 - bne _081128B4 - movs r0, 0x3 - b _081128B2 - .align 2, 0 -_081128A4: .4byte gUnknown_3005E88 -_081128A8: - ldr r1, _081128B8 @ =gUnknown_3005E88 - ldrb r0, [r1] - cmp r0, 0x3 - bne _081128B4 - movs r0, 0x1 -_081128B2: - strb r0, [r1] -_081128B4: - pop {r0} - bx r0 - .align 2, 0 -_081128B8: .4byte gUnknown_3005E88 - thumb_func_end sub_8112888 - - thumb_func_start sub_81128BC -sub_81128BC: @ 81128BC - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_8112CAC - lsls r0, 24 - lsrs r1, r0, 24 - cmp r4, 0x1 - beq _081128D4 - cmp r4, 0x2 - beq _08112928 - b _08112934 -_081128D4: - cmp r1, 0x1 - bne _081128E4 - ldr r1, _081128E0 @ =gUnknown_3005E88 - movs r0, 0x3 - strb r0, [r1] - b _08112934 - .align 2, 0 -_081128E0: .4byte gUnknown_3005E88 -_081128E4: - cmp r1, 0x2 - bne _08112934 - ldr r2, _08112918 @ =gUnknown_203AF98 - ldrh r1, [r2] - ldr r0, _0811291C @ =gUnknown_3005E94 - ldr r3, [r0] - lsls r1, 3 - adds r1, r3 - ldr r4, _08112920 @ =gUnknown_203B01A - ldrh r0, [r4] - movs r5, 0 - strh r0, [r1, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r3 - movs r1, 0x3 - strb r1, [r0, 0x6] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - strh r5, [r4] - ldr r1, _08112924 @ =gUnknown_3005E88 - movs r0, 0x4 - strb r0, [r1] - b _08112934 - .align 2, 0 -_08112918: .4byte gUnknown_203AF98 -_0811291C: .4byte gUnknown_3005E94 -_08112920: .4byte gUnknown_203B01A -_08112924: .4byte gUnknown_3005E88 -_08112928: - cmp r1, 0x1 - beq _08112930 - cmp r1, 0x2 - bne _08112934 -_08112930: - ldr r0, _0811293C @ =gUnknown_3005E88 - strb r1, [r0] -_08112934: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0811293C: .4byte gUnknown_3005E88 - thumb_func_end sub_81128BC - - thumb_func_start sub_8112940 -sub_8112940: @ 8112940 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r3, r1, 0 - lsls r0, 24 - lsrs r0, 24 - lsls r4, r2, 16 - cmp r0, 0x1 - beq _08112964 - cmp r0, 0x2 - beq _081129E0 - ldr r1, _08112960 @ =gUnknown_3005E88 - movs r0, 0 - strb r0, [r1] - b _08112B20 - .align 2, 0 -_08112960: .4byte gUnknown_3005E88 -_08112964: - ldr r2, _081129C0 @ =gUnknown_3005E94 - str r3, [r2] - ldr r1, _081129C4 @ =gUnknown_3005E8C - lsrs r0, r4, 19 - strh r0, [r1] - ldr r0, _081129C8 @ =gUnknown_3005E88 - mov r9, r0 - adds r1, r2, 0 - ldr r6, _081129CC @ =gUnknown_203AF9A - ldr r2, _081129D0 @ =gUnknown_203AF98 - ldr r7, _081129D4 @ =gUnknown_203B01C - ldr r0, _081129D8 @ =gUnknown_3005E90 - mov r12, r0 - ldr r0, _081129DC @ =gUnknown_203B01A - mov r8, r0 - movs r5, 0xFF - adds r3, r6, 0 - movs r4, 0x3F -_08112988: - ldrb r0, [r3] - orrs r0, r5 - strb r0, [r3] - ldrb r0, [r3, 0x1] - orrs r0, r5 - strb r0, [r3, 0x1] - adds r3, 0x2 - subs r4, 0x1 - cmp r4, 0 - bge _08112988 - movs r0, 0 - strh r0, [r2] - strh r0, [r7] - movs r0, 0 - mov r2, r12 - str r0, [r2] - ldr r1, [r1] - ldrh r0, [r1, 0x4] - mov r2, r8 - strh r0, [r2] - ldrb r0, [r1, 0x3] - strb r0, [r6] - movs r0, 0xFF - strb r0, [r6, 0x1] - movs r0, 0x1 - mov r1, r9 - strb r0, [r1] - b _08112B20 - .align 2, 0 -_081129C0: .4byte gUnknown_3005E94 -_081129C4: .4byte gUnknown_3005E8C -_081129C8: .4byte gUnknown_3005E88 -_081129CC: .4byte gUnknown_203AF9A -_081129D0: .4byte gUnknown_203AF98 -_081129D4: .4byte gUnknown_203B01C -_081129D8: .4byte gUnknown_3005E90 -_081129DC: .4byte gUnknown_203B01A -_081129E0: - ldr r1, _08112A44 @ =gUnknown_3005E94 - str r3, [r1] - ldr r5, _08112A48 @ =gUnknown_3005E8C - lsrs r0, r4, 19 - strh r0, [r5] - movs r4, 0 - ldr r2, _08112A4C @ =gUnknown_203B01A - mov r8, r2 - cmp r4, r0 - bge _08112A0E - adds r6, r1, 0 - ldr r0, _08112A50 @ =gUnknown_845669C - ldr r2, [r0] - ldr r3, [r0, 0x4] -_081129FC: - ldr r1, [r6] - lsls r0, r4, 3 - adds r0, r1 - str r2, [r0] - str r3, [r0, 0x4] - adds r4, 0x1 - ldrh r0, [r5] - cmp r4, r0 - blt _081129FC -_08112A0E: - ldr r4, _08112A54 @ =gUnknown_203AF98 - movs r2, 0 - strh r2, [r4] - mov r1, r8 - strh r2, [r1] - movs r1, 0 - ldr r3, _08112A44 @ =gUnknown_3005E94 - ldr r0, [r3] - strh r1, [r0, 0x4] - strb r2, [r0, 0x6] - ldrh r0, [r4] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r2, [r0] - bl player_get_direction_lower_nybble - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bhi _08112AC8 - lsls r0, 2 - ldr r1, _08112A58 @ =_08112A5C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08112A44: .4byte gUnknown_3005E94 -_08112A48: .4byte gUnknown_3005E8C -_08112A4C: .4byte gUnknown_203B01A -_08112A50: .4byte gUnknown_845669C -_08112A54: .4byte gUnknown_203AF98 -_08112A58: .4byte _08112A5C - .align 2, 0 -_08112A5C: - .4byte _08112A70 - .4byte _08112A70 - .4byte _08112AA0 - .4byte _08112AB8 - .4byte _08112A88 -_08112A70: - ldr r0, _08112A80 @ =gUnknown_203AF98 - ldrh r0, [r0] - ldr r1, _08112A84 @ =gUnknown_3005E94 - ldr r1, [r1] - lsls r0, 3 - adds r0, r1 - movs r1, 0 - b _08112AC6 - .align 2, 0 -_08112A80: .4byte gUnknown_203AF98 -_08112A84: .4byte gUnknown_3005E94 -_08112A88: - ldr r0, _08112A98 @ =gUnknown_203AF98 - ldrh r0, [r0] - ldr r1, _08112A9C @ =gUnknown_3005E94 - ldr r1, [r1] - lsls r0, 3 - adds r0, r1 - movs r1, 0x3 - b _08112AC6 - .align 2, 0 -_08112A98: .4byte gUnknown_203AF98 -_08112A9C: .4byte gUnknown_3005E94 -_08112AA0: - ldr r0, _08112AB0 @ =gUnknown_203AF98 - ldrh r0, [r0] - ldr r1, _08112AB4 @ =gUnknown_3005E94 - ldr r1, [r1] - lsls r0, 3 - adds r0, r1 - movs r1, 0x1 - b _08112AC6 - .align 2, 0 -_08112AB0: .4byte gUnknown_203AF98 -_08112AB4: .4byte gUnknown_3005E94 -_08112AB8: - ldr r0, _08112B2C @ =gUnknown_203AF98 - ldrh r0, [r0] - ldr r1, _08112B30 @ =gUnknown_3005E94 - ldr r1, [r1] - lsls r0, 3 - adds r0, r1 - movs r1, 0x2 -_08112AC6: - strb r1, [r0, 0x3] -_08112AC8: - ldr r0, _08112B34 @ =gUnknown_203B01C - movs r5, 0 - strh r5, [r0] - ldr r2, _08112B2C @ =gUnknown_203AF98 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - ldrh r0, [r2] - ldr r3, _08112B30 @ =gUnknown_3005E94 - ldr r4, [r3] - lsls r0, 3 - adds r0, r4 - movs r1, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r4 - movs r4, 0x2 - strb r4, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0, 0x1] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0, 0x2] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0, 0x3] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - ldr r0, _08112B38 @ =gUnknown_3005E88 - strb r4, [r0] -_08112B20: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112B2C: .4byte gUnknown_203AF98 -_08112B30: .4byte gUnknown_3005E94 -_08112B34: .4byte gUnknown_203B01C -_08112B38: .4byte gUnknown_3005E88 - thumb_func_end sub_8112940 - - thumb_func_start sub_8112B3C -sub_8112B3C: @ 8112B3C - push {r4-r7,lr} - ldr r0, _08112B54 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0x4 - bls _08112B48 - b _08112C84 -_08112B48: - lsls r0, 2 - ldr r1, _08112B58 @ =_08112B5C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08112B54: .4byte gUnknown_3005E88 -_08112B58: .4byte _08112B5C - .align 2, 0 -_08112B5C: - .4byte _08112C84 - .4byte _08112B70 - .4byte _08112C5E - .4byte _08112C84 - .4byte _08112C84 -_08112B70: - bl sub_8112CEC - lsls r0, 24 - cmp r0, 0 - beq _08112B7C - b _08112C72 -_08112B7C: - ldr r0, _08112B8C @ =gUnknown_203B01A - ldrh r1, [r0] - adds r7, r0, 0 - cmp r1, 0 - beq _08112B90 - subs r0, r1, 0x1 - strh r0, [r7] - b _08112C84 - .align 2, 0 -_08112B8C: .4byte gUnknown_203B01A -_08112B90: - ldr r5, _08112B98 @ =gUnknown_3005E88 - ldr r4, _08112B9C @ =gUnknown_203AF98 - ldr r6, _08112BA0 @ =gUnknown_3005E94 - b _08112BD4 - .align 2, 0 -_08112B98: .4byte gUnknown_3005E88 -_08112B9C: .4byte gUnknown_203AF98 -_08112BA0: .4byte gUnknown_3005E94 -_08112BA4: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - ldr r1, _08112BF0 @ =gUnknown_3005E8C - lsls r0, 16 - lsrs r0, 16 - ldrh r1, [r1] - cmp r0, r1 - bcs _08112C58 - ldrh r0, [r4] - ldr r1, [r6] - lsls r0, 3 - adds r0, r1 - ldrh r0, [r0, 0x4] - strh r0, [r7] - cmp r2, 0x3 - beq _08112C84 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0 - beq _08112BD4 - ldr r0, _08112BF4 @ =0x0000ffff - cmp r1, r0 - bne _08112C84 -_08112BD4: - ldrh r0, [r4] - ldr r1, [r6] - lsls r0, 3 - adds r3, r0, r1 - ldrb r0, [r3, 0x6] - cmp r0, 0x2 - beq _08112C2C - cmp r0, 0x2 - bgt _08112BF8 - cmp r0, 0 - beq _08112C0C - cmp r0, 0x1 - beq _08112C18 - b _08112C50 - .align 2, 0 -_08112BF0: .4byte gUnknown_3005E8C -_08112BF4: .4byte 0x0000ffff -_08112BF8: - cmp r0, 0xFE - beq _08112C50 - cmp r0, 0xFE - bgt _08112C06 - cmp r0, 0x3 - beq _08112C4E - b _08112C50 -_08112C06: - cmp r0, 0xFF - beq _08112C4C - b _08112C50 -_08112C0C: - ldr r0, _08112C14 @ =gUnknown_203AF9A - ldrb r1, [r3] - lsls r1, 1 - b _08112C20 - .align 2, 0 -_08112C14: .4byte gUnknown_203AF9A -_08112C18: - ldr r0, _08112C28 @ =gUnknown_203AF9A - ldrb r1, [r3] - lsls r1, 1 - adds r0, 0x1 -_08112C20: - adds r1, r0 - ldrb r0, [r3, 0x3] - strb r0, [r1] - b _08112C50 - .align 2, 0 -_08112C28: .4byte gUnknown_203AF9A -_08112C2C: - ldr r2, _08112C48 @ =gUnknown_3005E90 - ldrb r1, [r3, 0x3] - lsls r1, 24 - ldrb r0, [r3, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3] - orrs r1, r0 - str r1, [r2] - b _08112C50 - .align 2, 0 -_08112C48: .4byte gUnknown_3005E90 -_08112C4C: - movs r0, 0 -_08112C4E: - strb r0, [r5] -_08112C50: - ldrb r2, [r5] - cmp r2, 0 - bne _08112BA4 - b _08112C84 -_08112C58: - movs r0, 0 - strb r0, [r5] - b _08112C84 -_08112C5E: - bl ScriptContext2_IsEnabled - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08112C84 - ldr r1, _08112C8C @ =gUnknown_203B01A - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_08112C72: - ldr r0, _08112C90 @ =gUnknown_203AF98 - ldr r1, _08112C94 @ =gUnknown_3005E8C - ldrh r0, [r0] - ldrh r1, [r1] - cmp r0, r1 - bcc _08112C84 - ldr r1, _08112C98 @ =gUnknown_3005E88 - movs r0, 0 - strb r0, [r1] -_08112C84: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112C8C: .4byte gUnknown_203B01A -_08112C90: .4byte gUnknown_203AF98 -_08112C94: .4byte gUnknown_3005E8C -_08112C98: .4byte gUnknown_3005E88 - thumb_func_end sub_8112B3C - - thumb_func_start sub_8112C9C -sub_8112C9C: @ 8112C9C - ldr r1, _08112CA8 @ =gUnknown_203B01A - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - bx lr - .align 2, 0 -_08112CA8: .4byte gUnknown_203B01A - thumb_func_end sub_8112C9C - - thumb_func_start sub_8112CAC -sub_8112CAC: @ 8112CAC - push {lr} - ldr r0, _08112CC0 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0x4 - bhi _08112CDC - lsls r0, 2 - ldr r1, _08112CC4 @ =_08112CC8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08112CC0: .4byte gUnknown_3005E88 -_08112CC4: .4byte _08112CC8 - .align 2, 0 -_08112CC8: - .4byte _08112CDC - .4byte _08112CE0 - .4byte _08112CE4 - .4byte _08112CE0 - .4byte _08112CE4 -_08112CDC: - movs r0, 0 - b _08112CE6 -_08112CE0: - movs r0, 0x1 - b _08112CE6 -_08112CE4: - movs r0, 0x2 -_08112CE6: - pop {r1} - bx r1 - thumb_func_end sub_8112CAC - - thumb_func_start sub_8112CEC -sub_8112CEC: @ 8112CEC - push {lr} - ldr r0, _08112D0C @ =gUnknown_203AF98 - ldr r1, _08112D10 @ =gUnknown_3005E8C - ldrh r0, [r0] - ldrh r1, [r1] - cmp r0, r1 - bcs _08112D06 - bl ScriptContext2_IsEnabled - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08112D14 -_08112D06: - movs r0, 0x1 - b _08112D16 - .align 2, 0 -_08112D0C: .4byte gUnknown_203AF98 -_08112D10: .4byte gUnknown_3005E8C -_08112D14: - movs r0, 0 -_08112D16: - pop {r1} - bx r1 - thumb_func_end sub_8112CEC - - thumb_func_start sub_8112D1C -sub_8112D1C: @ 8112D1C - push {lr} - ldr r0, _08112D30 @ =gUnknown_203AF98 - ldr r1, _08112D34 @ =gUnknown_3005E8C - ldrh r0, [r0] - ldrh r1, [r1] - cmp r0, r1 - bcs _08112D38 - movs r0, 0 - b _08112D3A - .align 2, 0 -_08112D30: .4byte gUnknown_203AF98 -_08112D34: .4byte gUnknown_3005E8C -_08112D38: - movs r0, 0x1 -_08112D3A: - pop {r1} - bx r1 - thumb_func_end sub_8112D1C - - thumb_func_start sub_8112D40 -sub_8112D40: @ 8112D40 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - lsls r1, 16 - lsrs r5, r1, 16 - ldr r0, _08112D6C @ =gUnknown_203AF98 - ldrh r1, [r0] - cmp r1, 0 - beq _08112D66 - ldr r0, _08112D70 @ =gUnknown_3005E8C - ldrh r0, [r0] - cmp r1, r0 - bcs _08112D66 - ldr r4, _08112D74 @ =gUnknown_203B01E - ldr r1, _08112D78 @ =gUnknown_3002020 - ldrh r0, [r4] - ldrh r1, [r1] - cmp r0, r1 - bcc _08112D7C -_08112D66: - movs r0, 0 - b _08112DA8 - .align 2, 0 -_08112D6C: .4byte gUnknown_203AF98 -_08112D70: .4byte gUnknown_3005E8C -_08112D74: .4byte gUnknown_203B01E -_08112D78: .4byte gUnknown_3002020 -_08112D7C: - ldrh r3, [r4] - ldr r0, _08112DA0 @ =gUnknown_300201C - ldr r1, [r0] - lsls r0, r3, 2 - adds r2, r0, r1 - ldr r1, [r2] - lsls r0, r1, 17 - lsrs r0, 17 - cmp r0, r5 - bne _08112DA4 - lsls r0, r1, 16 - lsrs r0, 31 - cmp r0, r6 - bne _08112DA4 - adds r1, r2, 0x2 - adds r0, r3, 0x1 - strh r0, [r4] - b _08112DA6 - .align 2, 0 -_08112DA0: .4byte gUnknown_300201C -_08112DA4: - movs r1, 0 -_08112DA6: - adds r0, r1, 0 -_08112DA8: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8112D40 - - thumb_func_start sub_8112DB0 -sub_8112DB0: @ 8112DB0 - push {r4-r7,lr} - lsls r0, 24 - lsrs r7, r0, 24 - lsls r1, 16 - lsrs r3, r1, 16 - lsls r2, 16 - lsrs r2, 16 - mov r12, r2 - ldr r0, _08112E20 @ =gUnknown_203AF98 - ldrh r1, [r0] - cmp r1, 0 - beq _08112E18 - ldr r0, _08112E24 @ =gUnknown_3005E8C - ldrh r0, [r0] - cmp r1, r0 - bcs _08112E18 - ldr r6, _08112E28 @ =gUnknown_203B01E - ldr r1, _08112E2C @ =gUnknown_3002020 - ldrh r0, [r6] - ldrh r1, [r1] - cmp r0, r1 - bcs _08112E18 - adds r2, r0, 0 - ldr r5, _08112E30 @ =gUnknown_300201C - ldr r4, [r5] - lsls r2, 2 - adds r2, r4 - ldr r1, _08112E34 @ =0x00007fff - ands r1, r3 - ldrh r3, [r2] - ldr r0, _08112E38 @ =0xffff8000 - ands r0, r3 - orrs r0, r1 - strh r0, [r2] - ldrh r1, [r6] - lsls r1, 2 - adds r1, r4 - lsls r3, r7, 7 - ldrb r2, [r1, 0x1] - movs r0, 0x7F - ands r0, r2 - orrs r0, r3 - strb r0, [r1, 0x1] - ldrh r0, [r6] - ldr r1, [r5] - lsls r0, 2 - adds r0, r1 - mov r1, r12 - strh r1, [r0, 0x2] - ldrh r0, [r6] - adds r0, 0x1 - strh r0, [r6] -_08112E18: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112E20: .4byte gUnknown_203AF98 -_08112E24: .4byte gUnknown_3005E8C -_08112E28: .4byte gUnknown_203B01E -_08112E2C: .4byte gUnknown_3002020 -_08112E30: .4byte gUnknown_300201C -_08112E34: .4byte 0x00007fff -_08112E38: .4byte 0xffff8000 - thumb_func_end sub_8112DB0 - - thumb_func_start sub_8112E3C -sub_8112E3C: @ 8112E3C - push {r4,r5,lr} - lsls r0, 24 - lsls r2, 16 - lsrs r3, r0, 24 - movs r4, 0xFF - lsls r4, 24 - adds r0, r4 - lsrs r0, 24 - cmp r0, 0x1 - bls _08112E5C - ldr r1, _08112E58 @ =gUnknown_3005E88 - movs r0, 0 - strb r0, [r1] - b _08112E8E - .align 2, 0 -_08112E58: .4byte gUnknown_3005E88 -_08112E5C: - ldr r5, _08112E94 @ =gUnknown_300201C - str r1, [r5] - ldr r1, _08112E98 @ =gUnknown_3002020 - lsrs r0, r2, 18 - strh r0, [r1] - ldr r1, _08112E9C @ =gUnknown_203B01E - movs r0, 0 - strh r0, [r1] - cmp r3, 0x2 - bne _08112E8E - movs r2, 0 - ldr r4, _08112EA0 @ =gUnknown_3005E8C - ldrh r0, [r4] - cmp r2, r0 - bge _08112E8E - ldr r0, _08112EA4 @ =gUnknown_84566A4 - ldr r3, [r0] -_08112E7E: - ldr r1, [r5] - lsls r0, r2, 2 - adds r0, r1 - str r3, [r0] - adds r2, 0x1 - ldrh r0, [r4] - cmp r2, r0 - blt _08112E7E -_08112E8E: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08112E94: .4byte gUnknown_300201C -_08112E98: .4byte gUnknown_3002020 -_08112E9C: .4byte gUnknown_203B01E -_08112EA0: .4byte gUnknown_3005E8C -_08112EA4: .4byte gUnknown_84566A4 - thumb_func_end sub_8112E3C - - thumb_func_start sub_8112EA8 -sub_8112EA8: @ 8112EA8 - ldr r1, _08112EB0 @ =gUnknown_203B020 - movs r0, 0xFF - strb r0, [r1] - bx lr - .align 2, 0 -_08112EB0: .4byte gUnknown_203B020 - thumb_func_end sub_8112EA8 - - thumb_func_start sub_8112EB4 -sub_8112EB4: @ 8112EB4 - push {r4,lr} - ldr r4, _08112ED4 @ =gUnknown_203B020 - ldrb r0, [r4] - cmp r0, 0xFF - bne _08112ECC - ldr r0, _08112ED8 @ =gUnknown_8456928 - bl AddWindow - strb r0, [r4] - ldrb r0, [r4] - bl PutWindowTilemap -_08112ECC: - ldrb r0, [r4] - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08112ED4: .4byte gUnknown_203B020 -_08112ED8: .4byte gUnknown_8456928 - thumb_func_end sub_8112EB4 - - thumb_func_start sub_8112EDC -sub_8112EDC: @ 8112EDC - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r4, _08112F14 @ =gUnknown_203B020 - ldrb r0, [r4] - cmp r0, 0xFF - beq _08112F0C - movs r1, 0 - bl FillWindowPixelBuffer - ldrb r0, [r4] - bl ClearWindowTilemap - cmp r5, 0 - beq _08112F02 - ldrb r0, [r4] - adds r1, r5, 0 - bl CopyWindowToVram -_08112F02: - ldrb r0, [r4] - bl RemoveWindow - movs r0, 0xFF - strb r0, [r4] -_08112F0C: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08112F14: .4byte gUnknown_203B020 - thumb_func_end sub_8112EDC - - thumb_func_start sub_8112F18 -sub_8112F18: @ 8112F18 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - movs r1, 0x3 - bl GetWindowAttribute - lsls r0, 24 - lsrs r6, r0, 24 - mov r0, r10 - movs r1, 0x4 - bl GetWindowAttribute - lsls r0, 24 - lsrs r7, r0, 24 - lsls r0, r7, 5 - muls r0, r6 - bl Alloc - mov r8, r0 - cmp r0, 0 - beq _08112FB8 - movs r5, 0 - adds r0, r6, 0 - muls r0, r7 - str r0, [sp] - cmp r5, r7 - bcs _08112FA2 -_08112F5A: - movs r4, 0 - adds r1, r5, 0x1 - mov r9, r1 - cmp r4, r6 - bcs _08112F98 - subs r3, r7, 0x1 -_08112F66: - movs r0, 0 - cmp r5, 0 - beq _08112F74 - movs r0, 0x5 - cmp r5, r3 - bne _08112F74 - movs r0, 0xE -_08112F74: - lsls r0, 5 - ldr r1, _08112FC8 @ =gUnknown_84566A8 - adds r0, r1, r0 - adds r1, r5, 0 - muls r1, r6 - adds r1, r4 - lsls r1, 5 - add r1, r8 - ldr r2, _08112FCC @ =0x04000008 - str r3, [sp, 0x4] - bl CpuSet - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r3, [sp, 0x4] - cmp r4, r6 - bcc _08112F66 -_08112F98: - mov r1, r9 - lsls r0, r1, 24 - lsrs r5, r0, 24 - cmp r5, r7 - bcc _08112F5A -_08112FA2: - ldr r0, [sp] - lsls r2, r0, 21 - lsrs r2, 16 - mov r0, r10 - mov r1, r8 - movs r3, 0 - bl CopyToWindowPixelBuffer - mov r0, r8 - bl Free -_08112FB8: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112FC8: .4byte gUnknown_84566A8 -_08112FCC: .4byte 0x04000008 - thumb_func_end sub_8112F18 - - thumb_func_start sub_8112FD0 -sub_8112FD0: @ 8112FD0 - push {lr} - ldr r0, _08112FE0 @ =gUnknown_203B020 - ldrb r0, [r0] - bl sub_8112F18 - pop {r0} - bx r0 - .align 2, 0 -_08112FE0: .4byte gUnknown_203B020 - thumb_func_end sub_8112FD0 - - thumb_func_start sub_8112FE4 -sub_8112FE4: @ 8112FE4 - push {lr} - sub sp, 0x14 - adds r2, r0, 0 - ldr r0, _08113010 @ =gUnknown_203B020 - ldrb r0, [r0] - movs r1, 0x1 - str r1, [sp] - str r1, [sp, 0x4] - ldr r1, _08113014 @ =gUnknown_8456930 - str r1, [sp, 0x8] - movs r1, 0x1 - negs r1, r1 - str r1, [sp, 0xC] - str r2, [sp, 0x10] - movs r1, 0x2 - movs r2, 0x2 - movs r3, 0x5 - bl AddTextPrinterParametrized2 - add sp, 0x14 - pop {r0} - bx r0 - .align 2, 0 -_08113010: .4byte gUnknown_203B020 -_08113014: .4byte gUnknown_8456930 - thumb_func_end sub_8112FE4 - - thumb_func_start sub_8113018 -sub_8113018: @ 8113018 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r1, 24 - lsrs r5, r1, 24 - bl sub_8112FD0 - adds r0, r4, 0 - bl sub_8112FE4 - cmp r5, 0 - beq _08113038 - ldr r0, _08113040 @ =gUnknown_203B020 - ldrb r0, [r0] - adds r1, r5, 0 - bl CopyWindowToVram -_08113038: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08113040: .4byte gUnknown_203B020 - thumb_func_end sub_8113018 - - thumb_func_start sub_8113044 -sub_8113044: @ 8113044 - push {lr} - ldr r0, _0811305C @ =0x00004038 - movs r1, 0 - bl VarSet - ldr r0, _08113060 @ =0x00004039 - movs r1, 0 - bl VarSet - pop {r0} - bx r0 - .align 2, 0 -_0811305C: .4byte 0x00004038 -_08113060: .4byte 0x00004039 - thumb_func_end sub_8113044 - - thumb_func_start sub_8113064 -sub_8113064: @ 8113064 - push {lr} - ldr r0, _08113074 @ =0x00004038 - bl sub_806E454 - bl sub_8113078 - pop {r0} - bx r0 - .align 2, 0 -_08113074: .4byte 0x00004038 - thumb_func_end sub_8113064 - - thumb_func_start sub_8113078 -sub_8113078: @ 8113078 - push {r4,lr} - adds r4, r0, 0 - bl sub_8113508 - lsls r0, 24 - cmp r0, 0 - beq _08113098 - adds r0, r4, 0 - bl sub_81132E0 - ldr r0, _081130A0 @ =0x00004039 - ldr r1, _081130A4 @ =gSaveBlock2Ptr - ldr r1, [r1] - ldrh r1, [r1, 0xE] - bl VarSet -_08113098: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081130A0: .4byte 0x00004039 -_081130A4: .4byte gSaveBlock2Ptr - thumb_func_end sub_8113078 - - thumb_func_start sub_81130A8 -sub_81130A8: @ 81130A8 - push {lr} - ldr r0, _081130B8 @ =0x00004038 - bl sub_806E454 - bl sub_81130BC - pop {r0} - bx r0 - .align 2, 0 -_081130B8: .4byte 0x00004038 - thumb_func_end sub_81130A8 - - thumb_func_start sub_81130BC -sub_81130BC: @ 81130BC - push {r4,lr} - adds r4, r0, 0 - ldrb r1, [r4] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08113102 - adds r0, r4, 0 - bl sub_8113524 - adds r0, r4, 0 - bl sub_8113390 - ldr r0, _08113108 @ =0x00004039 - ldr r1, _0811310C @ =gSaveBlock2Ptr - ldr r1, [r1] - ldrh r1, [r1, 0xE] - bl VarSet - movs r0, 0x6C - bl FlagClear - movs r0, 0x6D - bl FlagClear - movs r0, 0x6E - bl FlagClear - movs r0, 0x6F - bl FlagClear - ldr r0, _08113110 @ =0x00004073 - movs r1, 0x1 - bl VarSet -_08113102: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08113108: .4byte 0x00004039 -_0811310C: .4byte gSaveBlock2Ptr -_08113110: .4byte 0x00004073 - thumb_func_end sub_81130BC - - thumb_func_start sub_8113114 -sub_8113114: @ 8113114 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r1, 24 - lsrs r5, r1, 24 - ldr r0, _0811315C @ =0x00004073 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x2 - bne _08113188 - ldr r0, [r4] - lsls r2, r0, 25 - lsrs r1, r2, 25 - ldr r0, _08113160 @ =gUnknown_8456934 - adds r0, r5, r0 - ldrb r0, [r0] - adds r1, r0 - cmp r1, 0x13 - ble _08113174 - adds r0, r4, 0 - bl sub_81132A0 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x2 - bhi _08113164 - adds r0, r4, 0 - bl sub_8113194 - ldrb r1, [r4] - movs r0, 0x80 - negs r0, r0 - ands r0, r1 - b _08113186 - .align 2, 0 -_0811315C: .4byte 0x00004073 -_08113160: .4byte gUnknown_8456934 -_08113164: - ldrb r0, [r4] - movs r1, 0x80 - negs r1, r1 - ands r1, r0 - movs r0, 0x14 - orrs r1, r0 - strb r1, [r4] - b _08113188 -_08113174: - lsrs r1, r2, 25 - adds r1, r0 - movs r0, 0x7F - ands r1, r0 - ldrb r2, [r4] - movs r0, 0x80 - negs r0, r0 - ands r0, r2 - orrs r0, r1 -_08113186: - strb r0, [r4] -_08113188: - ldr r0, [r4] - lsls r0, 25 - lsrs r0, 25 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8113114 - - thumb_func_start sub_8113194 -sub_8113194: @ 8113194 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r5, r0, 0 - movs r0, 0 - mov r8, r0 - movs r6, 0 - movs r7, 0x1 -_081131A4: - ldrb r1, [r5, 0x1] - ldr r0, _081131D0 @ =gUnknown_8456938 - adds r0, r6, r0 - ldrb r4, [r0] - asrs r1, r4 - ands r1, r7 - cmp r1, 0 - bne _081131D4 - mov r8, r6 - bl Random - adds r1, r7, 0 - ands r1, r0 - cmp r1, 0 - beq _081131D4 - adds r0, r7, 0 - lsls r0, r4 - ldrb r1, [r5, 0x1] - orrs r0, r1 - strb r0, [r5, 0x1] - adds r0, r4, 0 - b _081131EE - .align 2, 0 -_081131D0: .4byte gUnknown_8456938 -_081131D4: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x7 - bls _081131A4 - ldr r0, _081131F8 @ =gUnknown_8456938 - add r0, r8 - ldrb r0, [r0] - movs r1, 0x1 - lsls r1, r0 - ldrb r2, [r5, 0x1] - orrs r1, r2 - strb r1, [r5, 0x1] -_081131EE: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_081131F8: .4byte gUnknown_8456938 - thumb_func_end sub_8113194 - - thumb_func_start sub_81131FC -sub_81131FC: @ 81131FC - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - adds r7, r0, 0 - movs r0, 0 - mov r8, r0 - adds r0, r7, 0 - bl sub_81132A0 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bne _08113228 - movs r0, 0 - b _08113276 -_0811321C: - lsls r4, r6 - ldrb r0, [r7, 0x1] - eors r4, r0 - strb r4, [r7, 0x1] - adds r0, r6, 0 - b _08113276 -_08113228: - movs r5, 0 - movs r4, 0x1 -_0811322C: - ldrb r1, [r7, 0x1] - ldr r2, _08113284 @ =gUnknown_8456940 - adds r0, r5, r2 - ldrb r6, [r0] - asrs r1, r6 - ands r1, r4 - cmp r1, 0 - beq _0811324E - mov r8, r5 - str r2, [sp] - bl Random - adds r1, r4, 0 - ands r1, r0 - ldr r2, [sp] - cmp r1, 0 - bne _0811321C -_0811324E: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x7 - bls _0811322C - ldrb r1, [r7, 0x1] - mov r3, r8 - adds r0, r3, r2 - ldrb r2, [r0] - adds r0, r1, 0 - asrs r0, r2 - movs r3, 0x1 - ands r0, r3 - cmp r0, 0 - beq _08113274 - adds r0, r3, 0 - lsls r0, r2 - eors r1, r0 - strb r1, [r7, 0x1] -_08113274: - adds r0, r2, 0 -_08113276: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08113284: .4byte gUnknown_8456940 - thumb_func_end sub_81131FC - - thumb_func_start sub_8113288 -sub_8113288: @ 8113288 - push {lr} - ldr r0, _0811329C @ =0x00004038 - bl sub_806E454 - bl sub_81132A0 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - .align 2, 0 -_0811329C: .4byte 0x00004038 - thumb_func_end sub_8113288 - - thumb_func_start sub_81132A0 -sub_81132A0: @ 81132A0 - push {r4,lr} - movs r2, 0 - movs r1, 0 - ldrb r3, [r0, 0x1] - movs r4, 0x1 -_081132AA: - adds r0, r3, 0 - asrs r0, r1 - ands r0, r4 - cmp r0, 0 - beq _081132BA - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 -_081132BA: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x7 - bls _081132AA - adds r0, r2, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81132A0 - - thumb_func_start sub_81132CC -sub_81132CC: @ 81132CC - push {lr} - ldr r0, _081132DC @ =0x00004038 - bl sub_806E454 - bl sub_81132E0 - pop {r0} - bx r0 - .align 2, 0 -_081132DC: .4byte 0x00004038 - thumb_func_end sub_81132CC - - thumb_func_start sub_81132E0 -sub_81132E0: @ 81132E0 - push {r4-r6,lr} - adds r4, r0, 0 - movs r5, 0 - ldr r2, _081132F8 @ =gSaveBlock2Ptr - ldr r0, [r2] - ldrh r1, [r0, 0xE] - ldr r0, _081132FC @ =0x000003e6 - cmp r1, r0 - bhi _0811335C - adds r6, r2, 0 - b _08113338 - .align 2, 0 -_081132F8: .4byte gSaveBlock2Ptr -_081132FC: .4byte 0x000003e6 -_08113300: - ldr r0, _08113354 @ =0x00004039 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - ldr r1, [r6] - ldrh r1, [r1, 0xE] - subs r1, r0 - cmp r1, 0xB - ble _0811335C - adds r0, r4, 0 - bl sub_81131FC - ldr r0, _08113354 @ =0x00004039 - bl VarGet - adds r1, r0, 0 - lsls r1, 16 - movs r0, 0xC0 - lsls r0, 12 - adds r1, r0 - lsrs r1, 16 - ldr r0, _08113354 @ =0x00004039 - bl VarSet - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_08113338: - adds r0, r4, 0 - bl sub_81132A0 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x4 - bhi _08113358 - ldr r0, [r6] - ldrh r1, [r0, 0xE] - ldr r0, _08113354 @ =0x00004039 - bl VarSet - b _0811335C - .align 2, 0 -_08113354: .4byte 0x00004039 -_08113358: - cmp r5, 0x8 - bne _08113300 -_0811335C: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_81132E0 - - thumb_func_start sub_8113364 -sub_8113364: @ 8113364 - push {lr} - ldr r0, _08113378 @ =0x00004038 - bl sub_806E454 - bl sub_811337C - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - .align 2, 0 -_08113378: .4byte 0x00004038 - thumb_func_end sub_8113364 - - thumb_func_start sub_811337C -sub_811337C: @ 811337C - ldrb r0, [r0, 0x1] - ldr r1, _0811338C @ =gUnknown_20370C0 - ldrh r1, [r1] - asrs r0, r1 - movs r1, 0x1 - ands r0, r1 - bx lr - .align 2, 0 -_0811338C: .4byte gUnknown_20370C0 - thumb_func_end sub_811337C - - thumb_func_start sub_8113390 -sub_8113390: @ 8113390 - ldrb r2, [r0, 0x1] - movs r1, 0x1 - orrs r1, r2 - movs r2, 0x2 - orrs r1, r2 - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0, 0x1] - bx lr - thumb_func_end sub_8113390 - - thumb_func_start sub_81133A4 -sub_81133A4: @ 81133A4 - push {lr} - movs r3, 0 - movs r2, 0 - ldr r0, _081133BC @ =gUnknown_20370C0 - ldrh r0, [r0] - cmp r0, 0x7 - bhi _081133F8 - lsls r0, 2 - ldr r1, _081133C0 @ =_081133C4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081133BC: .4byte gUnknown_20370C0 -_081133C0: .4byte _081133C4 - .align 2, 0 -_081133C4: - .4byte _081133E4 - .4byte _081133F8 - .4byte _081133F8 - .4byte _081133F8 - .4byte _081133EA - .4byte _081133F0 - .4byte _081133F4 - .4byte _081133F8 -_081133E4: - movs r2, 0 - movs r3, 0 - b _081133F8 -_081133EA: - movs r2, 0x1 - movs r3, 0 - b _081133F8 -_081133F0: - movs r2, 0 - b _081133F6 -_081133F4: - movs r2, 0x2 -_081133F6: - movs r3, 0x1 -_081133F8: - ldr r0, _0811340C @ =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, _08113410 @ =0x00000a98 - adds r0, r1 - adds r1, r3, 0 - bl sub_8113414 - pop {r0} - bx r0 - .align 2, 0 -_0811340C: .4byte gSaveBlock2Ptr -_08113410: .4byte 0x00000a98 - thumb_func_end sub_81133A4 - - thumb_func_start sub_8113414 -sub_8113414: @ 8113414 - push {r4,lr} - lsls r1, 24 - lsls r2, 24 - lsrs r2, 24 - adds r3, r2, 0 - lsrs r1, 20 - adds r1, r0, r1 - ldrb r0, [r1] - cmp r0, 0xFF - bne _08113478 - cmp r2, 0x1 - beq _08113436 - cmp r2, 0x1 - ble _0811345C - cmp r3, 0x2 - beq _08113448 - b _0811345C -_08113436: - ldr r0, _08113440 @ =gStringVar1 - ldr r1, _08113444 @ =gUnknown_84178D0 - bl StringCopy - b _081134B2 - .align 2, 0 -_08113440: .4byte gStringVar1 -_08113444: .4byte gUnknown_84178D0 -_08113448: - ldr r0, _08113454 @ =gStringVar1 - ldr r1, _08113458 @ =gUnknown_84178DA - bl StringCopy - b _081134B2 - .align 2, 0 -_08113454: .4byte gStringVar1 -_08113458: .4byte gUnknown_84178DA -_0811345C: - ldr r0, _0811346C @ =gStringVar1 - ldr r1, _08113470 @ =gSaveBlock1Ptr - ldr r1, [r1] - ldr r2, _08113474 @ =0x00003a4c - adds r1, r2 - bl StringCopy - b _081134B2 - .align 2, 0 -_0811346C: .4byte gStringVar1 -_08113470: .4byte gSaveBlock1Ptr -_08113474: .4byte 0x00003a4c -_08113478: - ldr r4, _08113498 @ =gStringVar1 - adds r0, r4, 0 - movs r2, 0x7 - bl StringCopyN - movs r0, 0xFF - strb r0, [r4, 0x7] - ldrb r0, [r4] - cmp r0, 0xFC - bne _081134B2 - ldrb r0, [r4, 0x1] - cmp r0, 0x15 - bne _081134B2 - adds r4, 0x2 - b _0811349E - .align 2, 0 -_08113498: .4byte gStringVar1 -_0811349C: - adds r4, 0x1 -_0811349E: - ldrb r0, [r4] - cmp r0, 0xFF - bne _0811349C - movs r0, 0xFC - strb r0, [r4] - adds r4, 0x1 - movs r0, 0x16 - strb r0, [r4] - movs r0, 0xFF - strb r0, [r4, 0x1] -_081134B2: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8113414 - - thumb_func_start sub_81134B8 -sub_81134B8: @ 81134B8 - push {lr} - ldr r0, _081134C8 @ =0x00004038 - bl sub_806E454 - bl sub_81134CC - pop {r0} - bx r0 - .align 2, 0 -_081134C8: .4byte 0x00004038 - thumb_func_end sub_81134B8 - - thumb_func_start sub_81134CC -sub_81134CC: @ 81134CC - push {r4,lr} - adds r4, r0, 0 - ldr r0, _081134F4 @ =0x00004073 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x2 - bne _08113502 - adds r0, r4, 0 - bl sub_8113078 - ldr r0, _081134F8 @ =gUnknown_2023E8A - ldrb r0, [r0] - cmp r0, 0x1 - bne _081134FC - adds r0, r4, 0 - bl sub_8113194 - b _08113502 - .align 2, 0 -_081134F4: .4byte 0x00004073 -_081134F8: .4byte gUnknown_2023E8A -_081134FC: - adds r0, r4, 0 - bl sub_81131FC -_08113502: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81134CC - - thumb_func_start sub_8113508 -sub_8113508: @ 8113508 - ldr r0, [r0] - lsls r0, 24 - lsrs r0, 31 - bx lr - thumb_func_end sub_8113508 - - thumb_func_start sub_8113510 -sub_8113510: @ 8113510 - push {lr} - ldr r0, _08113520 @ =0x00004038 - bl sub_806E454 - bl sub_8113524 - pop {r0} - bx r0 - .align 2, 0 -_08113520: .4byte 0x00004038 - thumb_func_end sub_8113510 - - thumb_func_start sub_8113524 -sub_8113524: @ 8113524 - ldrb r1, [r0] - movs r2, 0x80 - orrs r1, r2 - strb r1, [r0] - bx lr - thumb_func_end sub_8113524 - - thumb_func_start sub_8113530 -sub_8113530: @ 8113530 - push {lr} - ldr r0, _08113548 @ =0x00004038 - bl sub_806E454 - ldr r1, _0811354C @ =gUnknown_20370C0 - ldrb r1, [r1] - bl sub_8113114 - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .align 2, 0 -_08113548: .4byte 0x00004038 -_0811354C: .4byte gUnknown_20370C0 - thumb_func_end sub_8113530 - - thumb_func_start sub_8113550 -sub_8113550: @ 8113550 - push {r4,r5,lr} - adds r5, r1, 0 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x23 - bne _08113570 - ldr r0, _0811356C @ =gUnknown_203B048 - ldrb r0, [r0] - cmp r0, 0x2 - bne _08113570 - bl sub_811381C - b _081136BC - .align 2, 0 -_0811356C: .4byte gUnknown_203B048 -_08113570: - bl sub_811381C - ldr r0, _0811362C @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x2 - bne _0811357E - b _081136BC -_0811357E: - subs r0, r4, 0x3 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x27 - bls _0811358A - b _081136BC -_0811358A: - bl sub_81136D4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08113598 - b _081136BC -_08113598: - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81138A0 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _081135AA - b _081136BC -_081135AA: - bl sub_80BF708 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _081135B8 - b _081136BC -_081135B8: - bl InUnionRoom - cmp r0, 0x1 - bne _081135C2 - b _081136BC -_081135C2: - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_8113954 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _081136BC - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_8113A44 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _081136BC - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81153E4 - lsls r0, 24 - cmp r0, 0 - beq _081136BC - ldr r0, _08113630 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0 - bne _08113638 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_8113778 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _081136BC - cmp r4, 0x1F - bne _08113614 - ldr r0, _08113634 @ =gUnknown_203AE04 - ldr r0, [r0] - cmp r0, 0 - bne _0811363C -_08113614: - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81153A8 - lsls r0, 24 - cmp r0, 0 - beq _081136BC - adds r0, r4, 0 - bl sub_8110AEC - b _0811363C - .align 2, 0 -_0811362C: .4byte gUnknown_203ADFA -_08113630: .4byte gUnknown_3005E88 -_08113634: .4byte gUnknown_203AE04 -_08113638: - cmp r4, 0x28 - beq _081136BC -_0811363C: - adds r0, r4, 0 - bl sub_8113B94 - cmp r4, 0x1F - bne _0811367C - ldr r2, _0811365C @ =gUnknown_203AE04 - ldr r1, [r2] - cmp r1, 0 - bne _08113668 - ldr r0, _08113660 @ =gUnknown_203AE08 - ldr r0, [r0] - str r0, [r2] - ldr r1, _08113664 @ =gUnknown_8456948 - ldr r2, [r1, 0x7C] - b _0811368E - .align 2, 0 -_0811365C: .4byte gUnknown_203AE04 -_08113660: .4byte gUnknown_203AE08 -_08113664: .4byte gUnknown_8456948 -_08113668: - ldr r0, _08113678 @ =gUnknown_8456948 - ldr r2, [r0, 0x7C] - adds r0, r1, 0 - adds r1, r5, 0 - bl _call_via_r2 - b _081136BC - .align 2, 0 -_08113678: .4byte gUnknown_8456948 -_0811367C: - ldr r1, _081136C4 @ =gUnknown_203AE04 - movs r0, 0 - str r0, [r1] - ldr r0, _081136C8 @ =gUnknown_8456948 - lsls r1, r4, 2 - adds r1, r0 - ldr r0, _081136CC @ =gUnknown_203AE08 - ldr r0, [r0] - ldr r2, [r1] -_0811368E: - adds r1, r5, 0 - bl _call_via_r2 - adds r1, r0, 0 - cmp r1, 0 - bne _081136AC - bl sub_811231C - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_8113828 - adds r1, r0, 0 - cmp r1, 0 - beq _081136BC -_081136AC: - ldr r0, _081136CC @ =gUnknown_203AE08 - str r1, [r0] - ldr r0, _081136D0 @ =gUnknown_203B048 - ldrb r0, [r0] - cmp r0, 0 - beq _081136BC - bl sub_811231C -_081136BC: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081136C4: .4byte gUnknown_203AE04 -_081136C8: .4byte gUnknown_8456948 -_081136CC: .4byte gUnknown_203AE08 -_081136D0: .4byte gUnknown_203B048 - thumb_func_end sub_8113550 - - thumb_func_start sub_81136D4 -sub_81136D4: @ 81136D4 - push {lr} - ldr r0, _08113728 @ =gSaveBlock1Ptr - ldr r2, [r0] - movs r1, 0x4 - ldrsb r1, [r2, r1] - adds r3, r0, 0 - cmp r1, 0x2 - bne _081136F0 - ldrb r0, [r2, 0x5] - subs r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xA - bls _08113724 -_081136F0: - ldr r2, [r3] - ldrh r1, [r2, 0x4] - ldr r0, _0811372C @ =0x0000090e - cmp r1, r0 - beq _08113724 - movs r0, 0x4 - ldrsb r0, [r2, r0] - cmp r0, 0x1F - bne _08113708 - ldrb r0, [r2, 0x5] - cmp r0, 0x1 - bls _08113724 -_08113708: - ldr r0, [r3] - ldrh r1, [r0, 0x4] - ldr r0, _08113730 @ =0x00002e01 - cmp r1, r0 - beq _08113724 - ldr r0, _08113734 @ =0x00003a01 - cmp r1, r0 - beq _08113724 - ldr r0, _08113738 @ =0x00000b02 - cmp r1, r0 - beq _08113724 - ldr r0, _0811373C @ =0x0000060a - cmp r1, r0 - bne _08113740 -_08113724: - movs r0, 0x1 - b _08113742 - .align 2, 0 -_08113728: .4byte gSaveBlock1Ptr -_0811372C: .4byte 0x0000090e -_08113730: .4byte 0x00002e01 -_08113734: .4byte 0x00003a01 -_08113738: .4byte 0x00000b02 -_0811373C: .4byte 0x0000060a -_08113740: - movs r0, 0 -_08113742: - pop {r1} - bx r1 - thumb_func_end sub_81136D4 - - thumb_func_start sub_8113748 -sub_8113748: @ 8113748 - push {lr} - bl sub_81136D4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08113770 - ldr r0, _08113764 @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x2 - bne _08113768 - movs r0, 0x1 - b _08113772 - .align 2, 0 -_08113764: .4byte gUnknown_203ADFA -_08113768: - cmp r0, 0x1 - bne _08113770 - bl sub_8112364 -_08113770: - movs r0, 0 -_08113772: - pop {r1} - bx r1 - thumb_func_end sub_8113748 - - thumb_func_start sub_8113778 -sub_8113778: @ 8113778 - push {r4,r5,lr} - adds r5, r1, 0 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x24 - beq _081137CE - cmp r4, 0xB - beq _081137CE - ldr r0, _081137D4 @ =0x0000082c - bl FlagGet - lsls r0, 24 - cmp r0, 0 - bne _081137AC - cmp r4, 0x3 - beq _081137CE - cmp r4, 0x1F - beq _081137CE - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81137E4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _081137CE -_081137AC: - ldr r0, _081137D8 @ =0x00000844 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - bne _081137DC - subs r0, r4, 0x4 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x6 - bls _081137CE - cmp r4, 0x16 - beq _081137CE - cmp r4, 0x19 - beq _081137CE - cmp r4, 0x1A - bne _081137DC -_081137CE: - movs r0, 0x1 - b _081137DE - .align 2, 0 -_081137D4: .4byte 0x0000082c -_081137D8: .4byte 0x00000844 -_081137DC: - movs r0, 0 -_081137DE: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8113778 - - thumb_func_start sub_81137E4 -sub_81137E4: @ 81137E4 - push {lr} - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x22 - bne _08113814 - ldr r2, _08113810 @ =gTrainers - ldrh r1, [r1] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrb r1, [r0, 0x1] - cmp r1, 0x51 - beq _08113814 - cmp r1, 0x59 - beq _08113814 - cmp r1, 0x5A - beq _08113814 - cmp r1, 0x53 - beq _08113814 - movs r0, 0x1 - b _08113816 - .align 2, 0 -_08113810: .4byte gTrainers -_08113814: - movs r0, 0 -_08113816: - pop {r1} - bx r1 - thumb_func_end sub_81137E4 - - thumb_func_start sub_811381C -sub_811381C: @ 811381C - ldr r1, _08113824 @ =gUnknown_203B048 - movs r0, 0 - strb r0, [r1] - bx lr - .align 2, 0 -_08113824: .4byte gUnknown_203B048 - thumb_func_end sub_811381C - - thumb_func_start sub_8113828 -sub_8113828: @ 8113828 - push {r4,r5,lr} - adds r5, r1, 0 - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r4, 0 - bl sub_8113778 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0811384C - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81153A8 - lsls r0, 24 - cmp r0, 0 - bne _08113850 -_0811384C: - movs r0, 0 - b _0811388C -_08113850: - adds r0, r4, 0 - bl sub_8110AEC - adds r0, r4, 0 - bl sub_8113B94 - cmp r4, 0x1F - bne _08113874 - ldr r2, _0811386C @ =gUnknown_203AE04 - ldr r1, _08113870 @ =gUnknown_203AE08 - ldr r0, [r1] - str r0, [r2] - adds r2, r1, 0 - b _0811387C - .align 2, 0 -_0811386C: .4byte gUnknown_203AE04 -_08113870: .4byte gUnknown_203AE08 -_08113874: - ldr r1, _08113894 @ =gUnknown_203AE04 - movs r0, 0 - str r0, [r1] - ldr r2, _08113898 @ =gUnknown_203AE08 -_0811387C: - ldr r0, _0811389C @ =gUnknown_8456948 - lsls r1, r4, 2 - adds r1, r0 - ldr r0, [r2] - ldr r2, [r1] - adds r1, r5, 0 - bl _call_via_r2 -_0811388C: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08113894: .4byte gUnknown_203AE04 -_08113898: .4byte gUnknown_203AE08 -_0811389C: .4byte gUnknown_8456948 - thumb_func_end sub_8113828 - - thumb_func_start sub_81138A0 -sub_81138A0: @ 81138A0 - push {r4,r5,lr} - adds r5, r1, 0 - lsls r0, 16 - lsrs r0, 16 - adds r4, r0, 0 - subs r0, 0xC - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x7 - bls _081138B8 - movs r0, 0 - b _081138F0 -_081138B8: - bl sub_81138F8 - ldr r1, _081138E0 @ =gUnknown_203B024 - strh r4, [r1] - adds r0, r4, 0 - subs r0, 0x10 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bls _081138EE - cmp r4, 0xC - beq _081138D4 - cmp r4, 0x12 - bne _081138E4 -_081138D4: - adds r0, r1, 0x4 - adds r1, r5, 0 - movs r2, 0xC - bl memcpy - b _081138EE - .align 2, 0 -_081138E0: .4byte gUnknown_203B024 -_081138E4: - adds r0, r1, 0x4 - adds r1, r5, 0 - movs r2, 0x18 - bl memcpy -_081138EE: - movs r0, 0x1 -_081138F0: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81138A0 - - thumb_func_start sub_81138F8 -sub_81138F8: @ 81138F8 - push {lr} - ldr r0, _08113908 @ =gUnknown_203B024 - movs r1, 0 - movs r2, 0x20 - bl memset - pop {r0} - bx r0 - .align 2, 0 -_08113908: .4byte gUnknown_203B024 - thumb_func_end sub_81138F8 - - thumb_func_start sub_811390C -sub_811390C: @ 811390C - push {r4,r5,lr} - ldr r5, _08113944 @ =gUnknown_203B024 - ldrh r0, [r5] - cmp r0, 0 - beq _0811393C - ldr r1, _08113948 @ =gUnknown_203B04A - movs r0, 0 - strb r0, [r1] - ldrh r0, [r5] - bl sub_8110AEC - ldr r0, _0811394C @ =gUnknown_8456948 - ldrh r2, [r5] - lsls r2, 2 - adds r2, r0 - ldr r4, _08113950 @ =gUnknown_203AE08 - ldr r0, [r4] - adds r1, r5, 0x4 - ldr r2, [r2] - bl _call_via_r2 - str r0, [r4] - bl sub_81138F8 -_0811393C: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08113944: .4byte gUnknown_203B024 -_08113948: .4byte gUnknown_203B04A -_0811394C: .4byte gUnknown_8456948 -_08113950: .4byte gUnknown_203AE08 - thumb_func_end sub_811390C - - thumb_func_start sub_8113954 -sub_8113954: @ 8113954 - push {r4,r5,lr} - adds r5, r1, 0 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x22 - beq _08113970 - cmp r4, 0x1E - beq _08113970 - cmp r4, 0x20 - beq _08113970 - cmp r4, 0x21 - beq _08113970 - movs r0, 0 - b _081139A8 -_08113970: - bl sub_81138F8 - ldr r0, _081139B0 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0 - bne _08113998 - ldr r0, _081139B4 @ =0x0000082c - bl FlagGet - lsls r0, 24 - cmp r0, 0 - bne _08113998 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_81137E4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _081139A6 -_08113998: - ldr r0, _081139B8 @ =gUnknown_203B024 - strh r4, [r0] - adds r0, 0x4 - adds r1, r5, 0 - movs r2, 0x8 - bl memcpy -_081139A6: - movs r0, 0x1 -_081139A8: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081139B0: .4byte gUnknown_3005E88 -_081139B4: .4byte 0x0000082c -_081139B8: .4byte gUnknown_203B024 - thumb_func_end sub_8113954 - - thumb_func_start sub_81139BC -sub_81139BC: @ 81139BC - push {r4,r5,lr} - ldr r5, _08113A08 @ =gUnknown_203B024 - ldrh r0, [r5] - cmp r0, 0 - beq _08113A02 - ldr r0, _08113A0C @ =gUnknown_3005E88 - ldrb r1, [r0] - cmp r1, 0 - bne _081139D8 - ldr r0, _08113A10 @ =gUnknown_203B04A - strb r1, [r0] - ldrh r0, [r5] - bl sub_8110AEC -_081139D8: - ldrh r0, [r5] - bl sub_8113B94 - ldr r0, _08113A14 @ =gUnknown_8456948 - ldrh r2, [r5] - lsls r2, 2 - adds r2, r0 - ldr r4, _08113A18 @ =gUnknown_203AE08 - ldr r0, [r4] - adds r1, r5, 0x4 - ldr r2, [r2] - bl _call_via_r2 - str r0, [r4] - movs r0, 0x1 - bl sub_8113A1C - bl sub_81138F8 - bl sub_811231C -_08113A02: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08113A08: .4byte gUnknown_203B024 -_08113A0C: .4byte gUnknown_3005E88 -_08113A10: .4byte gUnknown_203B04A -_08113A14: .4byte gUnknown_8456948 -_08113A18: .4byte gUnknown_203AE08 - thumb_func_end sub_81139BC - - thumb_func_start sub_8113A1C -sub_8113A1C: @ 8113A1C - push {r4,lr} - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldr r4, _08113A3C @ =gUnknown_203AE08 - ldr r0, [r4] - bl sub_8113C5C - str r0, [r4] - ldr r1, _08113A40 @ =gUnknown_203AF98 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08113A3C: .4byte gUnknown_203AE08 -_08113A40: .4byte gUnknown_203AF98 - thumb_func_end sub_8113A1C - - thumb_func_start sub_8113A44 -sub_8113A44: @ 8113A44 - push {r4,lr} - adds r4, r1, 0 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1F - bne _08113A6C - ldrh r0, [r4] - bl sub_8114FBC - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08113A70 - ldrh r0, [r4, 0x2] - bl sub_8114FBC - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08113A70 -_08113A6C: - movs r0, 0 - b _08113A72 -_08113A70: - movs r0, 0x1 -_08113A72: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8113A44 - - thumb_func_start sub_8113A78 -sub_8113A78: @ 8113A78 - push {r4,r5,lr} - adds r3, r0, 0 - adds r5, r1, 0 - ldrh r1, [r3] - ldr r0, _08113AAC @ =0x00000fff - ands r0, r1 - adds r2, r0, 0 - lsrs r4, r1, 12 - cmp r2, 0x21 - bne _08113A8E - movs r4, 0 -_08113A8E: - subs r0, r2, 0x3 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x27 - bhi _08113AB4 - str r3, [r5] - ldr r0, _08113AB0 @ =gUnknown_8456AA0 - adds r0, r2, r0 - ldrb r0, [r0] - subs r1, r0, 0x4 - muls r1, r4 - adds r0, r1 - adds r0, r3, r0 - b _08113AB6 - .align 2, 0 -_08113AAC: .4byte 0x00000fff -_08113AB0: .4byte gUnknown_8456AA0 -_08113AB4: - movs r0, 0 -_08113AB6: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8113A78 - - thumb_func_start sub_8113ABC -sub_8113ABC: @ 8113ABC - push {lr} - adds r2, r0, 0x4 - ldrh r1, [r0] - ldr r0, _08113AD0 @ =0x00000fff - ands r0, r1 - cmp r0, 0x23 - beq _08113AD8 - ldr r1, _08113AD4 @ =gUnknown_203B04A - movs r0, 0 - b _08113ADE - .align 2, 0 -_08113AD0: .4byte 0x00000fff -_08113AD4: .4byte gUnknown_203B04A -_08113AD8: - ldr r1, _08113AE4 @ =gUnknown_203B04A - ldrb r0, [r2, 0x1] - adds r0, 0x1 -_08113ADE: - strb r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_08113AE4: .4byte gUnknown_203B04A - thumb_func_end sub_8113ABC - - thumb_func_start sub_8113AE8 -sub_8113AE8: @ 8113AE8 - push {r4,lr} - adds r4, r0, 0 - cmp r0, 0 - beq _08113AFA - ldr r1, _08113B00 @ =gUnknown_203AF98 - ldrh r0, [r0, 0x2] - ldrh r1, [r1] - cmp r0, r1 - bls _08113B04 -_08113AFA: - movs r0, 0 - b _08113B32 - .align 2, 0 -_08113B00: .4byte gUnknown_203AF98 -_08113B04: - ldr r2, _08113B38 @ =gUnknown_84569F4 - ldrh r1, [r4] - ldr r0, _08113B3C @ =0x00000fff - ands r0, r1 - lsls r0, 2 - adds r0, r2 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - ldr r2, _08113B40 @ =gUnknown_203B044 - ldrh r1, [r4] - strb r1, [r2] - movs r0, 0xF0 - lsls r0, 8 - ands r0, r1 - lsrs r0, 12 - strb r0, [r2, 0x1] - cmp r0, 0 - beq _08113B30 - movs r0, 0x1 - strh r0, [r2, 0x2] -_08113B30: - movs r0, 0x1 -_08113B32: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08113B38: .4byte gUnknown_84569F4 -_08113B3C: .4byte 0x00000fff -_08113B40: .4byte gUnknown_203B044 - thumb_func_end sub_8113AE8 - - thumb_func_start sub_8113B44 -sub_8113B44: @ 8113B44 - push {r4,lr} - adds r2, r0, 0 - ldr r4, _08113B54 @ =gUnknown_203B044 - ldrh r0, [r4, 0x2] - cmp r0, 0 - bne _08113B58 - movs r0, 0 - b _08113B7E - .align 2, 0 -_08113B54: .4byte gUnknown_203B044 -_08113B58: - ldr r1, _08113B84 @ =gUnknown_84569F4 - ldrb r0, [r4] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - adds r0, r2, 0 - bl _call_via_r1 - ldrh r0, [r4, 0x2] - adds r0, 0x1 - strh r0, [r4, 0x2] - lsls r0, 16 - lsrs r0, 16 - ldrb r4, [r4, 0x1] - cmp r0, r4 - bls _08113B7C - bl sub_8113B88 -_08113B7C: - movs r0, 0x1 -_08113B7E: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08113B84: .4byte gUnknown_84569F4 - thumb_func_end sub_8113B44 - - thumb_func_start sub_8113B88 -sub_8113B88: @ 8113B88 - ldr r1, _08113B90 @ =gUnknown_203B044 - movs r0, 0 - str r0, [r1] - bx lr - .align 2, 0 -_08113B90: .4byte gUnknown_203B044 - thumb_func_end sub_8113B88 - - thumb_func_start sub_8113B94 -sub_8113B94: @ 8113B94 - push {r4,lr} - lsls r0, 16 - lsrs r0, 16 - adds r4, r0, 0 - ldr r2, _08113BC0 @ =gUnknown_203B044 - ldrb r1, [r2] - lsls r0, r4, 24 - lsrs r0, 24 - ldr r3, _08113BC4 @ =gUnknown_203AF98 - cmp r1, r0 - bne _08113BB2 - ldrh r1, [r2, 0x2] - ldrh r0, [r3] - cmp r1, r0 - beq _08113BC8 -_08113BB2: - movs r0, 0 - strb r4, [r2] - strb r0, [r2, 0x1] - ldrh r0, [r3] - strh r0, [r2, 0x2] - b _08113BD2 - .align 2, 0 -_08113BC0: .4byte gUnknown_203B044 -_08113BC4: .4byte gUnknown_203AF98 -_08113BC8: - ldrb r0, [r2, 0x1] - cmp r0, 0x4 - bhi _08113BD2 - adds r0, 0x1 - strb r0, [r2, 0x1] -_08113BD2: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8113B94 - - thumb_func_start sub_8113BD8 -sub_8113BD8: @ 8113BD8 - ldr r0, _08113BE8 @ =gUnknown_203B049 - movs r1, 0 - strb r1, [r0] - ldr r0, _08113BEC @ =gUnknown_203B04A - strb r1, [r0] - ldr r0, _08113BF0 @ =gUnknown_203B04B - strb r1, [r0] - bx lr - .align 2, 0 -_08113BE8: .4byte gUnknown_203B049 -_08113BEC: .4byte gUnknown_203B04A -_08113BF0: .4byte gUnknown_203B04B - thumb_func_end sub_8113BD8 - - thumb_func_start sub_8113BF4 -sub_8113BF4: @ 8113BF4 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _08113C14 @ =gUnknown_8456AA0 - adds r0, 0x27 - ldrb r1, [r0] - adds r0, r4, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - beq _08113C18 - movs r0, 0x27 - strh r0, [r4] - adds r0, r4, 0x2 - b _08113C1A - .align 2, 0 -_08113C14: .4byte gUnknown_8456AA0 -_08113C18: - movs r0, 0 -_08113C1A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8113BF4 - - thumb_func_start sub_8113C20 -sub_8113C20: @ 8113C20 - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - ldr r0, _08113C50 @ =gUnknown_8456AA0 - adds r0, 0x27 - ldrb r1, [r0] - adds r0, r5, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - beq _08113C54 - movs r0, 0xFF - strb r0, [r4, 0x6] - movs r1, 0 - movs r0, 0 - strh r0, [r4, 0x4] - strb r1, [r4] - strb r1, [r4, 0x1] - strb r1, [r4, 0x2] - strb r1, [r4, 0x3] - adds r0, r5, 0x2 - b _08113C56 - .align 2, 0 -_08113C50: .4byte gUnknown_8456AA0 -_08113C54: - movs r0, 0 -_08113C56: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8113C20 - - thumb_func_start sub_8113C5C -sub_8113C5C: @ 8113C5C - push {r4,r5,lr} - adds r4, r0, 0 - lsls r1, 16 - lsrs r5, r1, 16 - ldr r0, _08113C80 @ =gUnknown_8456AA0 - adds r0, 0x29 - ldrb r1, [r0] - adds r0, r4, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - beq _08113C84 - movs r0, 0x29 - strh r0, [r4] - strh r5, [r4, 0x2] - adds r0, r4, 0x4 - b _08113C86 - .align 2, 0 -_08113C80: .4byte gUnknown_8456AA0 -_08113C84: - movs r0, 0 -_08113C86: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8113C5C - - thumb_func_start sub_8113C8C -sub_8113C8C: @ 8113C8C - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - ldr r0, _08113CBC @ =gUnknown_8456AA0 - adds r0, 0x29 - ldrb r1, [r0] - adds r0, r5, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - beq _08113CC0 - movs r0, 0xFE - strb r0, [r4, 0x6] - ldrh r1, [r5, 0x2] - movs r0, 0 - strh r1, [r4, 0x4] - strb r0, [r4] - strb r0, [r4, 0x1] - strb r0, [r4, 0x2] - strb r0, [r4, 0x3] - adds r0, r5, 0x4 - b _08113CC2 - .align 2, 0 -_08113CBC: .4byte gUnknown_8456AA0 -_08113CC0: - movs r0, 0 -_08113CC2: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8113C8C - - thumb_func_start sub_8113CC8 -sub_8113CC8: @ 8113CC8 - push {r4-r6,lr} - adds r4, r0, 0 - adds r5, r1, 0 - adds r6, r4, 0x4 - ldr r0, _08113CFC @ =gUnknown_8456AA0 - ldrb r1, [r0] - adds r0, r4, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - beq _08113D00 - movs r0, 0 - strh r0, [r4] - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x2] - ldrb r0, [r5] - strb r0, [r4, 0x4] - ldrb r0, [r5, 0x1] - strb r0, [r6, 0x1] - ldrb r0, [r5, 0x2] - strb r0, [r6, 0x2] - ldrb r0, [r5, 0x3] - strb r0, [r6, 0x3] - adds r0, r6, 0x4 - b _08113D02 - .align 2, 0 -_08113CFC: .4byte gUnknown_8456AA0 -_08113D00: - movs r0, 0 -_08113D02: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8113CC8 - - thumb_func_start sub_8113D08 -sub_8113D08: @ 8113D08 - push {r4-r6,lr} - adds r5, r0, 0 - adds r4, r1, 0 - adds r6, r5, 0x4 - ldr r0, _08113D3C @ =gUnknown_8456AA0 - ldrb r1, [r0] - adds r0, r5, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - beq _08113D40 - movs r0, 0x2 - strb r0, [r4, 0x6] - ldrh r0, [r5, 0x2] - strh r0, [r4, 0x4] - ldrb r0, [r5, 0x4] - strb r0, [r4] - ldrb r0, [r6, 0x1] - strb r0, [r4, 0x1] - ldrb r0, [r6, 0x2] - strb r0, [r4, 0x2] - ldrb r0, [r6, 0x3] - strb r0, [r4, 0x3] - adds r0, r6, 0x4 - b _08113D42 - .align 2, 0 -_08113D3C: .4byte gUnknown_8456AA0 -_08113D40: - movs r0, 0 -_08113D42: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8113D08 - - thumb_func_start sub_8113D48 -sub_8113D48: @ 8113D48 - push {r4-r6,lr} - adds r5, r1, 0 - adds r4, r0, 0 - adds r6, r4, 0x4 - ldr r0, _08113D64 @ =gUnknown_8456AA0 - ldrb r1, [r0, 0x2] - adds r0, r4, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - bne _08113D68 - movs r0, 0 - b _08113D8C - .align 2, 0 -_08113D64: .4byte gUnknown_8456AA0 -_08113D68: - ldrb r0, [r5, 0x6] - cmp r0, 0 - bne _08113D72 - movs r0, 0x2 - b _08113D74 -_08113D72: - movs r0, 0x1 -_08113D74: - strh r0, [r4] - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x2] - ldrb r0, [r5] - strb r0, [r6] - ldrb r0, [r5, 0x1] - strb r0, [r6, 0x1] - ldrb r0, [r5, 0x2] - strb r0, [r6, 0x2] - ldrb r0, [r5, 0x3] - strb r0, [r6, 0x3] - adds r0, r6, 0x4 -_08113D8C: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8113D48 - - thumb_func_start sub_8113D94 -sub_8113D94: @ 8113D94 - push {r4-r6,lr} - adds r4, r1, 0 - adds r5, r0, 0 - adds r6, r5, 0x4 - ldr r0, _08113DB0 @ =gUnknown_8456AA0 - ldrb r1, [r0, 0x2] - adds r0, r5, 0 - bl sub_8110988 - lsls r0, 24 - cmp r0, 0 - bne _08113DB4 - movs r0, 0 - b _08113DD8 - .align 2, 0 -_08113DB0: .4byte gUnknown_8456AA0 -_08113DB4: - ldrh r0, [r5] - cmp r0, 0x2 - bne _08113DBE - movs r0, 0 - b _08113DC0 -_08113DBE: - movs r0, 0x1 -_08113DC0: - strb r0, [r4, 0x6] - ldrh r0, [r5, 0x2] - strh r0, [r4, 0x4] - ldrb r0, [r6] - strb r0, [r4] - ldrb r0, [r6, 0x1] - strb r0, [r4, 0x1] - ldrb r0, [r6, 0x2] - strb r0, [r4, 0x2] - ldrb r0, [r6, 0x3] - strb r0, [r4, 0x3] - adds r0, r6, 0x4 -_08113DD8: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8113D94 - - thumb_func_start sub_8113DE0 -sub_8113DE0: @ 8113DE0 - push {r4-r7,lr} - adds r4, r1, 0 - lsls r0, 16 - lsrs r7, r0, 16 - ldr r0, _08113DF8 @ =gUnknown_203B044 - ldrb r0, [r0, 0x1] - cmp r0, 0 - bne _08113E00 - ldr r0, _08113DFC @ =gUnknown_8456AA0 - adds r0, r7, r0 - ldrb r6, [r0] - b _08113E0C - .align 2, 0 -_08113DF8: .4byte gUnknown_203B044 -_08113DFC: .4byte gUnknown_8456AA0 -_08113E00: - ldr r0, _08113E20 @ =gUnknown_8456AA0 - adds r0, r7, r0 - ldrb r0, [r0] - subs r0, 0x4 - lsls r0, 24 - lsrs r6, r0, 24 -_08113E0C: - adds r0, r4, 0 - adds r1, r6, 0 - bl sub_8110944 - lsls r0, 24 - cmp r0, 0 - bne _08113E24 - movs r0, 0 - b _08113E7C - .align 2, 0 -_08113E20: .4byte gUnknown_8456AA0 -_08113E24: - adds r5, r4, 0 - ldr r2, _08113E60 @ =gUnknown_203B044 - ldrb r1, [r2, 0x1] - cmp r1, 0 - beq _08113E36 - adds r0, r1, 0 - muls r0, r6 - adds r0, 0x4 - subs r5, r0 -_08113E36: - cmp r1, 0x5 - bne _08113E64 - movs r4, 0 -_08113E3C: - adds r0, r4, 0 - muls r0, r6 - adds r0, r5 - adds r0, 0x4 - adds r4, 0x1 - adds r1, r4, 0 - muls r1, r6 - adds r1, r5 - adds r1, 0x4 - adds r2, r6, 0 - bl memcpy - lsls r4, 24 - lsrs r4, 24 - cmp r4, 0x3 - bls _08113E3C - movs r1, 0x4 - b _08113E66 - .align 2, 0 -_08113E60: .4byte gUnknown_203B044 -_08113E64: - ldrb r1, [r2, 0x1] -_08113E66: - lsls r0, r1, 12 - adds r0, r7, r0 - strh r0, [r5] - ldr r0, _08113E84 @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r5, 0x2] - adds r0, r1, 0 - muls r0, r6 - adds r0, 0x4 - adds r5, r0 - adds r0, r5, 0 -_08113E7C: - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08113E84: .4byte gUnknown_203AF98 - thumb_func_end sub_8113DE0 - - thumb_func_start sub_8113E88 -sub_8113E88: @ 8113E88 - lsls r0, 16 - lsrs r0, 16 - ldr r2, _08113EA4 @ =gUnknown_203B044 - ldrh r3, [r2, 0x2] - ldr r2, _08113EA8 @ =gUnknown_8456AA0 - adds r0, r2 - ldrb r0, [r0] - subs r0, 0x4 - muls r0, r3 - adds r0, 0x4 - adds r1, r0 - adds r0, r1, 0 - bx lr - .align 2, 0 -_08113EA4: .4byte gUnknown_203B044 -_08113EA8: .4byte gUnknown_8456AA0 - thumb_func_end sub_8113E88 - - thumb_func_start sub_8113EAC -sub_8113EAC: @ 8113EAC - push {r4,r5,lr} - adds r3, r1, 0 - lsls r0, 16 - lsrs r1, r0, 16 - adds r4, r1, 0 - lsls r2, 24 - lsrs r2, 24 - adds r5, r2, 0 - cmp r3, 0 - beq _08113EE0 - movs r0, 0xCE - lsls r0, 1 - cmp r1, r0 - beq _08113ED0 - adds r0, r3, 0 - bl GetSpeciesName - b _08113F08 -_08113ED0: - ldr r1, _08113EDC @ =gText_EggNickname - adds r0, r3, 0 - bl StringCopy - b _08113F08 - .align 2, 0 -_08113EDC: .4byte gText_EggNickname -_08113EE0: - movs r0, 0xCE - lsls r0, 1 - cmp r4, r0 - beq _08113F00 - movs r0, 0xB - adds r1, r4, 0 - muls r1, r0 - ldr r0, _08113EFC @ =gSpeciesNames - adds r1, r0 - adds r0, r2, 0 - bl UnkTextUtil_SetPtrI - b _08113F08 - .align 2, 0 -_08113EFC: .4byte gSpeciesNames -_08113F00: - ldr r1, _08113F10 @ =gText_EggNickname - adds r0, r5, 0 - bl UnkTextUtil_SetPtrI -_08113F08: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08113F10: .4byte gText_EggNickname - thumb_func_end sub_8113EAC - - thumb_func_start sub_8113F14 -sub_8113F14: @ 8113F14 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x3 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08113F34 - ldrh r0, [r4] - strh r0, [r2] - ldrh r0, [r4, 0x2] - strh r0, [r2, 0x2] - adds r0, r2, 0x4 - b _08113F36 -_08113F34: - movs r0, 0 -_08113F36: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8113F14 - - thumb_func_start sub_8113F3C -sub_8113F3C: @ 8113F3C - push {r4,lr} - adds r1, r0, 0 - movs r0, 0x3 - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4] - ldr r1, _08113F70 @ =gStringVar1 - movs r2, 0 - bl sub_8113EAC - ldrh r0, [r4, 0x2] - ldr r1, _08113F74 @ =gStringVar2 - movs r2, 0 - bl sub_8113EAC - ldr r0, _08113F78 @ =gStringVar4 - ldr r1, _08113F7C @ =gUnknown_841A16F - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08113F70: .4byte gStringVar1 -_08113F74: .4byte gStringVar2 -_08113F78: .4byte gStringVar4 -_08113F7C: .4byte gUnknown_841A16F - thumb_func_end sub_8113F3C - - thumb_func_start sub_8113F80 -sub_8113F80: @ 8113F80 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x4 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - bne _08113F98 - movs r0, 0 - b _08113FB2 -_08113F98: - ldrh r0, [r4] - strh r0, [r2] - ldrh r0, [r4, 0x4] - strh r0, [r2, 0x2] - ldrh r0, [r4, 0x6] - strh r0, [r2, 0x4] - ldrh r0, [r4] - cmp r0, 0x55 - bne _08113FB0 - ldr r1, _08113FB8 @ =gUnknown_203B048 - movs r0, 0x2 - strb r0, [r1] -_08113FB0: - adds r0, r2, 0x6 -_08113FB2: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08113FB8: .4byte gUnknown_203B048 - thumb_func_end sub_8113F80 - - thumb_func_start sub_8113FBC -sub_8113FBC: @ 8113FBC - push {r4-r7,lr} - adds r1, r0, 0 - movs r0, 0x4 - bl sub_8113E88 - adds r5, r0, 0 - ldrh r0, [r5] - bl ItemId_GetPocket - lsls r0, 24 - lsrs r0, 24 - subs r0, 0x1 - cmp r0, 0x4 - bls _08113FDA - b _0811413C -_08113FDA: - lsls r0, 2 - ldr r1, _08113FE4 @ =_08113FE8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08113FE4: .4byte _08113FE8 - .align 2, 0 -_08113FE8: - .4byte _08113FFC - .4byte _08114074 - .4byte _08113FFC - .4byte _0811409C - .4byte _08113FFC -_08113FFC: - ldr r4, _08114024 @ =gStringVar1 - ldrh r0, [r5] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r4, 0 - bl StringCopy - ldrh r0, [r5] - cmp r0, 0x55 - bne _08114034 - ldr r0, _08114028 @ =gStringVar2 - ldrb r1, [r5, 0x4] - bl sub_80C4DF8 - ldr r0, _0811402C @ =gStringVar4 - ldr r1, _08114030 @ =gUnknown_841AFA6 - bl StringExpandPlaceholders - b _0811413C - .align 2, 0 -_08114024: .4byte gStringVar1 -_08114028: .4byte gStringVar2 -_0811402C: .4byte gStringVar4 -_08114030: .4byte gUnknown_841AFA6 -_08114034: - ldrh r1, [r5, 0x2] - ldr r0, _08114050 @ =0x0000ffff - cmp r1, r0 - beq _08114060 - adds r0, r1, 0 - ldr r1, _08114054 @ =gStringVar2 - movs r2, 0 - bl sub_8113EAC - ldr r0, _08114058 @ =gStringVar4 - ldr r1, _0811405C @ =gUnknown_841A1E7 - bl StringExpandPlaceholders - b _0811413C - .align 2, 0 -_08114050: .4byte 0x0000ffff -_08114054: .4byte gStringVar2 -_08114058: .4byte gStringVar4 -_0811405C: .4byte gUnknown_841A1E7 -_08114060: - ldr r0, _0811406C @ =gStringVar4 - ldr r1, _08114070 @ =gUnknown_841A210 - bl StringExpandPlaceholders - b _0811413C - .align 2, 0 -_0811406C: .4byte gStringVar4 -_08114070: .4byte gUnknown_841A210 -_08114074: - ldr r4, _08114090 @ =gStringVar1 - ldrh r0, [r5] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r4, 0 - bl StringCopy - ldr r0, _08114094 @ =gStringVar4 - ldr r1, _08114098 @ =gUnknown_841A220 - bl StringExpandPlaceholders - b _0811413C - .align 2, 0 -_08114090: .4byte gStringVar1 -_08114094: .4byte gStringVar4 -_08114098: .4byte gUnknown_841A220 -_0811409C: - ldrh r0, [r5, 0x2] - ldr r1, _081140E8 @ =gStringVar1 - movs r2, 0 - bl sub_8113EAC - ldr r4, _081140EC @ =gStringVar2 - ldrh r0, [r5] - bl ItemIdToBattleMoveId - lsls r0, 16 - lsrs r0, 16 - movs r7, 0xD - adds r1, r0, 0 - muls r1, r7 - ldr r6, _081140F0 @ =gUnknown_8247094 - adds r1, r6 - adds r0, r4, 0 - bl StringCopy - ldrh r1, [r5, 0x4] - ldr r0, _081140F4 @ =0x0000ffff - cmp r1, r0 - beq _08114118 - ldr r0, _081140F8 @ =gStringVar3 - muls r1, r7 - adds r1, r6 - bl StringCopy - ldrh r1, [r5] - movs r0, 0xA9 - lsls r0, 1 - cmp r1, r0 - bls _08114104 - ldr r0, _081140FC @ =gStringVar4 - ldr r1, _08114100 @ =gUnknown_841A965 - bl StringExpandPlaceholders - b _0811413C - .align 2, 0 -_081140E8: .4byte gStringVar1 -_081140EC: .4byte gStringVar2 -_081140F0: .4byte gUnknown_8247094 -_081140F4: .4byte 0x0000ffff -_081140F8: .4byte gStringVar3 -_081140FC: .4byte gStringVar4 -_08114100: .4byte gUnknown_841A965 -_08114104: - ldr r0, _08114110 @ =gStringVar4 - ldr r1, _08114114 @ =gUnknown_841A277 - bl StringExpandPlaceholders - b _0811413C - .align 2, 0 -_08114110: .4byte gStringVar4 -_08114114: .4byte gUnknown_841A277 -_08114118: - ldrh r1, [r5] - movs r0, 0xA9 - lsls r0, 1 - cmp r1, r0 - bls _08114134 - ldr r0, _0811412C @ =gStringVar4 - ldr r1, _08114130 @ =gUnknown_841A938 - bl StringExpandPlaceholders - b _0811413C - .align 2, 0 -_0811412C: .4byte gStringVar4 -_08114130: .4byte gUnknown_841A938 -_08114134: - ldr r0, _08114144 @ =gStringVar4 - ldr r1, _08114148 @ =gUnknown_841A255 - bl StringExpandPlaceholders -_0811413C: - adds r0, r5, 0x6 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08114144: .4byte gStringVar4 -_08114148: .4byte gUnknown_841A255 - thumb_func_end sub_8113FBC - - thumb_func_start sub_811414C -sub_811414C: @ 811414C - push {r4,lr} - adds r4, r2, 0 - lsls r0, 16 - lsrs r0, 16 - bl sub_8113DE0 - adds r1, r0, 0 - cmp r1, 0 - beq _0811416A - ldrh r0, [r4] - strh r0, [r1] - ldrh r0, [r4, 0x4] - strh r0, [r1, 0x2] - adds r0, r1, 0x4 - b _0811416C -_0811416A: - movs r0, 0 -_0811416C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811414C - - thumb_func_start sub_8114174 -sub_8114174: @ 8114174 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - movs r0, 0x5 - adds r1, r3, 0 - bl sub_811414C - pop {r1} - bx r1 - thumb_func_end sub_8114174 - - thumb_func_start sub_8114188 -sub_8114188: @ 8114188 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x5 - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4, 0x2] - ldr r1, _081141C0 @ =gStringVar1 - movs r2, 0 - bl sub_8113EAC - ldr r5, _081141C4 @ =gStringVar2 - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r0, _081141C8 @ =gStringVar4 - ldr r1, _081141CC @ =gUnknown_841AB74 - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081141C0: .4byte gStringVar1 -_081141C4: .4byte gStringVar2 -_081141C8: .4byte gStringVar4 -_081141CC: .4byte gUnknown_841AB74 - thumb_func_end sub_8114188 - - thumb_func_start sub_81141D0 -sub_81141D0: @ 81141D0 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - movs r0, 0x6 - adds r1, r3, 0 - bl sub_811414C - pop {r1} - bx r1 - thumb_func_end sub_81141D0 - - thumb_func_start sub_81141E4 -sub_81141E4: @ 81141E4 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x6 - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4, 0x2] - ldr r1, _0811421C @ =gStringVar1 - movs r2, 0 - bl sub_8113EAC - ldr r5, _08114220 @ =gStringVar2 - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r0, _08114224 @ =gStringVar4 - ldr r1, _08114228 @ =gUnknown_841AB8E - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_0811421C: .4byte gStringVar1 -_08114220: .4byte gStringVar2 -_08114224: .4byte gStringVar4 -_08114228: .4byte gUnknown_841AB8E - thumb_func_end sub_81141E4 - - thumb_func_start sub_811422C -sub_811422C: @ 811422C - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - movs r0, 0x7 - adds r1, r3, 0 - bl sub_811414C - pop {r1} - bx r1 - thumb_func_end sub_811422C - - thumb_func_start sub_8114240 -sub_8114240: @ 8114240 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x7 - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4, 0x2] - ldr r1, _08114278 @ =gStringVar2 - movs r2, 0 - bl sub_8113EAC - ldr r5, _0811427C @ =gStringVar1 - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r0, _08114280 @ =gStringVar4 - ldr r1, _08114284 @ =gUnknown_841A6A5 - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114278: .4byte gStringVar2 -_0811427C: .4byte gStringVar1 -_08114280: .4byte gStringVar4 -_08114284: .4byte gUnknown_841A6A5 - thumb_func_end sub_8114240 - - thumb_func_start sub_8114288 -sub_8114288: @ 8114288 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - movs r0, 0x8 - adds r1, r3, 0 - bl sub_811414C - pop {r1} - bx r1 - thumb_func_end sub_8114288 - - thumb_func_start sub_811429C -sub_811429C: @ 811429C - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x8 - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4, 0x2] - ldr r1, _081142D4 @ =gStringVar1 - movs r2, 0 - bl sub_8113EAC - ldr r5, _081142D8 @ =gStringVar2 - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r0, _081142DC @ =gStringVar4 - ldr r1, _081142E0 @ =gUnknown_841A1CD - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081142D4: .4byte gStringVar1 -_081142D8: .4byte gStringVar2 -_081142DC: .4byte gStringVar4 -_081142E0: .4byte gUnknown_841A1CD - thumb_func_end sub_811429C - - thumb_func_start sub_81142E4 -sub_81142E4: @ 81142E4 - push {r4,lr} - adds r4, r2, 0 - lsls r0, 16 - lsrs r0, 16 - bl sub_8113DE0 - adds r1, r0, 0 - cmp r1, 0 - beq _08114306 - ldrh r0, [r4] - strh r0, [r1] - ldrh r0, [r4, 0x2] - strh r0, [r1, 0x2] - ldrh r0, [r4, 0x4] - strh r0, [r1, 0x4] - adds r0, r1, 0x6 - b _08114308 -_08114306: - movs r0, 0 -_08114308: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81142E4 - - thumb_func_start sub_8114310 -sub_8114310: @ 8114310 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - movs r0, 0x9 - adds r1, r3, 0 - bl sub_81142E4 - pop {r1} - bx r1 - thumb_func_end sub_8114310 - - thumb_func_start sub_8114324 -sub_8114324: @ 8114324 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x9 - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4, 0x4] - ldr r1, _0811436C @ =gStringVar1 - movs r2, 0 - bl sub_8113EAC - ldr r5, _08114370 @ =gStringVar2 - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r5, _08114374 @ =gStringVar3 - ldrh r0, [r4, 0x2] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r0, _08114378 @ =gStringVar4 - ldr r1, _0811437C @ =gUnknown_841A193 - bl StringExpandPlaceholders - adds r4, 0x6 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_0811436C: .4byte gStringVar1 -_08114370: .4byte gStringVar2 -_08114374: .4byte gStringVar3 -_08114378: .4byte gStringVar4 -_0811437C: .4byte gUnknown_841A193 - thumb_func_end sub_8114324 - - thumb_func_start sub_8114380 -sub_8114380: @ 8114380 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - movs r0, 0xA - adds r1, r3, 0 - bl sub_81142E4 - pop {r1} - bx r1 - thumb_func_end sub_8114380 - - thumb_func_start sub_8114394 -sub_8114394: @ 8114394 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0xA - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4, 0x4] - ldr r1, _081143DC @ =gStringVar2 - movs r2, 0 - bl sub_8113EAC - ldr r5, _081143E0 @ =gStringVar3 - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r5, _081143E4 @ =gStringVar1 - ldrh r0, [r4, 0x2] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r5, 0 - bl StringCopy - ldr r0, _081143E8 @ =gStringVar4 - ldr r1, _081143EC @ =gUnknown_841A6E1 - bl StringExpandPlaceholders - adds r4, 0x6 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081143DC: .4byte gStringVar2 -_081143E0: .4byte gStringVar3 -_081143E4: .4byte gStringVar1 -_081143E8: .4byte gStringVar4 -_081143EC: .4byte gUnknown_841A6E1 - thumb_func_end sub_8114394 - - thumb_func_start sub_81143F0 -sub_81143F0: @ 81143F0 - push {r4,lr} - adds r4, r0, 0 - adds r2, r4, 0 - ldr r1, _08114408 @ =gUnknown_203B044 - ldrb r0, [r1] - cmp r0, 0xB - bne _0811440C - ldrb r0, [r1, 0x1] - cmp r0, 0 - beq _0811440C - adds r0, r4, 0 - b _08114436 - .align 2, 0 -_08114408: .4byte gUnknown_203B044 -_0811440C: - ldr r0, _0811442C @ =gUnknown_8456AA0 - ldrb r1, [r0, 0xB] - adds r0, r2, 0 - bl sub_8110944 - lsls r0, 24 - cmp r0, 0 - beq _08114434 - movs r0, 0xB - strh r0, [r4] - ldr r0, _08114430 @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r4, 0x2] - adds r0, r4, 0x4 - b _08114436 - .align 2, 0 -_0811442C: .4byte gUnknown_8456AA0 -_08114430: .4byte gUnknown_203AF98 -_08114434: - movs r0, 0 -_08114436: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81143F0 - - thumb_func_start sub_811443C -sub_811443C: @ 811443C - push {r4,lr} - adds r4, r0, 0 - ldr r0, _08114454 @ =gStringVar4 - ldr r1, _08114458 @ =gUnknown_841A2B0 - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114454: .4byte gStringVar4 -_08114458: .4byte gUnknown_841A2B0 - thumb_func_end sub_811443C - - thumb_func_start sub_811445C -sub_811445C: @ 811445C - push {r4,lr} - adds r4, r0, 0 - adds r4, 0x8 - movs r2, 0xC - strh r2, [r0] - ldr r2, _08114488 @ =gUnknown_203AF98 - ldrh r2, [r2] - strh r2, [r0, 0x2] - ldrh r2, [r1] - strh r2, [r0, 0x4] - ldrh r2, [r1, 0x2] - strh r2, [r0, 0x6] - adds r1, 0x4 - adds r0, r4, 0 - movs r2, 0x7 - bl memcpy - adds r4, 0x8 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114488: .4byte gUnknown_203AF98 - thumb_func_end sub_811445C - - thumb_func_start sub_811448C -sub_811448C: @ 811448C - push {r4-r6,lr} - adds r5, r0, 0 - adds r6, r5, 0 - adds r6, 0x8 - ldr r4, _081144D8 @ =gStringVar1 - adds r0, r4, 0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - adds r0, r4, 0 - adds r1, r6, 0 - movs r2, 0x7 - bl memcpy - adds r0, r4, 0 - bl sub_8115834 - ldrh r0, [r5, 0x6] - ldr r1, _081144DC @ =gStringVar2 - movs r2, 0 - bl sub_8113EAC - ldrh r0, [r5, 0x4] - ldr r1, _081144E0 @ =gStringVar3 - movs r2, 0 - bl sub_8113EAC - ldr r0, _081144E4 @ =gStringVar4 - ldr r1, _081144E8 @ =gUnknown_841A3FF - bl StringExpandPlaceholders - adds r6, 0x8 - adds r0, r6, 0 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_081144D8: .4byte gStringVar1 -_081144DC: .4byte gStringVar2 -_081144E0: .4byte gStringVar3 -_081144E4: .4byte gStringVar4 -_081144E8: .4byte gUnknown_841A3FF - thumb_func_end sub_811448C - - thumb_func_start sub_81144EC -sub_81144EC: @ 81144EC - push {r4,lr} - adds r4, r0, 0 - movs r0, 0xD - strh r0, [r4] - ldr r0, _08114514 @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r4, 0x2] - ldrb r0, [r1] - strb r0, [r4, 0x4] - adds r0, r4, 0x5 - adds r1, 0x1 - movs r2, 0x7 - bl memcpy - adds r4, 0xC - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114514: .4byte gUnknown_203AF98 - thumb_func_end sub_81144EC - - thumb_func_start sub_8114518 -sub_8114518: @ 8114518 - push {r4,r5,lr} - adds r5, r0, 0 - bl UnkTextUtil_Reset - ldr r4, _08114568 @ =gStringVar1 - adds r0, r4, 0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - adds r1, r5, 0x5 - adds r0, r4, 0 - movs r2, 0x7 - bl memcpy - adds r0, r4, 0 - bl sub_8115834 - movs r0, 0 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldr r1, _0811456C @ =gUnknown_8456AE4 - ldrb r0, [r5, 0x4] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - ldr r0, _08114570 @ =gStringVar4 - ldr r1, _08114574 @ =gUnknown_841A422 - bl UnkTextUtil_StringExpandPlaceholders - adds r5, 0xC - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114568: .4byte gStringVar1 -_0811456C: .4byte gUnknown_8456AE4 -_08114570: .4byte gStringVar4 -_08114574: .4byte gUnknown_841A422 - thumb_func_end sub_8114518 - - thumb_func_start sub_8114578 -sub_8114578: @ 8114578 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0xE - strh r0, [r4] - ldr r0, _081145A0 @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r4, 0x2] - ldrb r0, [r1] - strb r0, [r4, 0x4] - adds r0, r4, 0x5 - adds r1, 0x1 - movs r2, 0x7 - bl memcpy - adds r4, 0xC - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_081145A0: .4byte gUnknown_203AF98 - thumb_func_end sub_8114578 - - thumb_func_start sub_81145A4 -sub_81145A4: @ 81145A4 - push {r4,r5,lr} - adds r5, r0, 0 - bl UnkTextUtil_Reset - ldr r4, _081145F4 @ =gStringVar1 - adds r0, r4, 0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - adds r1, r5, 0x5 - adds r0, r4, 0 - movs r2, 0x7 - bl memcpy - adds r0, r4, 0 - bl sub_8115834 - movs r0, 0 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldr r1, _081145F8 @ =gUnknown_8456AE4 - ldrb r0, [r5, 0x4] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - ldr r0, _081145FC @ =gStringVar4 - ldr r1, _08114600 @ =gUnknown_841A477 - bl UnkTextUtil_StringExpandPlaceholders - adds r5, 0xC - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081145F4: .4byte gStringVar1 -_081145F8: .4byte gUnknown_8456AE4 -_081145FC: .4byte gStringVar4 -_08114600: .4byte gUnknown_841A477 - thumb_func_end sub_81145A4 - - thumb_func_start sub_8114604 -sub_8114604: @ 8114604 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - movs r0, 0xF - strh r0, [r4] - ldr r0, _08114648 @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r4, 0x2] - ldrb r0, [r5] - strb r0, [r4, 0x4] - adds r0, r4, 0x5 - adds r1, r5, 0x1 - movs r2, 0x7 - bl memcpy - adds r0, r4, 0 - adds r0, 0xC - adds r1, r5, 0 - adds r1, 0x8 - movs r2, 0x7 - bl memcpy - adds r0, r4, 0 - adds r0, 0x13 - adds r5, 0xF - adds r1, r5, 0 - movs r2, 0x7 - bl memcpy - adds r4, 0x1A - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114648: .4byte gUnknown_203AF98 - thumb_func_end sub_8114604 - - thumb_func_start sub_811464C -sub_811464C: @ 811464C - push {r4-r6,lr} - mov r6, r8 - push {r6} - adds r4, r0, 0 - bl UnkTextUtil_Reset - ldr r0, _081146F4 @ =gStringVar1 - mov r8, r0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - ldr r6, _081146F8 @ =gStringVar2 - adds r0, r6, 0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - ldr r5, _081146FC @ =gStringVar3 - adds r0, r5, 0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - adds r1, r4, 0x5 - mov r0, r8 - bl StringCopy7 - adds r1, r4, 0 - adds r1, 0xC - adds r0, r6, 0 - bl StringCopy7 - adds r1, r4, 0 - adds r1, 0x13 - adds r0, r5, 0 - bl StringCopy7 - mov r0, r8 - bl sub_8115834 - adds r0, r6, 0 - bl sub_8115834 - adds r0, r5, 0 - bl sub_8115834 - ldr r0, _08114700 @ =gSaveBlock2Ptr - ldr r1, [r0] - movs r0, 0 - bl UnkTextUtil_SetPtrI - movs r0, 0x1 - mov r1, r8 - bl UnkTextUtil_SetPtrI - movs r0, 0x2 - adds r1, r6, 0 - bl UnkTextUtil_SetPtrI - movs r0, 0x3 - adds r1, r5, 0 - bl UnkTextUtil_SetPtrI - ldr r1, _08114704 @ =gUnknown_8456AE4 - ldrb r0, [r4, 0x4] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x4 - bl UnkTextUtil_SetPtrI - ldr r0, _08114708 @ =gStringVar4 - ldr r1, _0811470C @ =gUnknown_841A4C6 - bl UnkTextUtil_StringExpandPlaceholders - adds r4, 0x1A - adds r0, r4, 0 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_081146F4: .4byte gStringVar1 -_081146F8: .4byte gStringVar2 -_081146FC: .4byte gStringVar3 -_08114700: .4byte gSaveBlock2Ptr -_08114704: .4byte gUnknown_8456AE4 -_08114708: .4byte gStringVar4 -_0811470C: .4byte gUnknown_841A4C6 - thumb_func_end sub_811464C - - thumb_func_start sub_8114710 -sub_8114710: @ 8114710 - movs r1, 0x10 - strh r1, [r0] - ldr r1, _08114720 @ =gUnknown_203AF98 - ldrh r1, [r1] - strh r1, [r0, 0x2] - adds r0, 0x4 - bx lr - .align 2, 0 -_08114720: .4byte gUnknown_203AF98 - thumb_func_end sub_8114710 - - thumb_func_start sub_8114724 -sub_8114724: @ 8114724 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _0811473C @ =gStringVar4 - ldr r1, _08114740 @ =gUnknown_841A50B - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_0811473C: .4byte gStringVar4 -_08114740: .4byte gUnknown_841A50B - thumb_func_end sub_8114724 - - thumb_func_start sub_8114744 -sub_8114744: @ 8114744 - movs r1, 0x11 - strh r1, [r0] - ldr r1, _08114754 @ =gUnknown_203AF98 - ldrh r1, [r1] - strh r1, [r0, 0x2] - adds r0, 0x4 - bx lr - .align 2, 0 -_08114754: .4byte gUnknown_203AF98 - thumb_func_end sub_8114744 - - thumb_func_start sub_8114758 -sub_8114758: @ 8114758 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _08114770 @ =gStringVar4 - ldr r1, _08114774 @ =gUnknown_841A732 - bl StringExpandPlaceholders - adds r4, 0x4 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114770: .4byte gStringVar4 -_08114774: .4byte gUnknown_841A732 - thumb_func_end sub_8114758 - - thumb_func_start sub_8114778 -sub_8114778: @ 8114778 - push {r4,lr} - adds r4, r0, 0 - adds r4, 0x8 - movs r2, 0x12 - strh r2, [r0] - ldr r2, _081147A4 @ =gUnknown_203AF98 - ldrh r2, [r2] - strh r2, [r0, 0x2] - ldrh r2, [r1] - strh r2, [r0, 0x4] - ldrh r2, [r1, 0x2] - strh r2, [r0, 0x6] - adds r1, 0x4 - adds r0, r4, 0 - movs r2, 0x7 - bl memcpy - adds r4, 0x8 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_081147A4: .4byte gUnknown_203AF98 - thumb_func_end sub_8114778 - - thumb_func_start sub_81147A8 -sub_81147A8: @ 81147A8 - push {r4-r6,lr} - adds r5, r0, 0 - adds r6, r5, 0 - adds r6, 0x8 - ldr r4, _081147F4 @ =gStringVar1 - adds r0, r4, 0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - adds r0, r4, 0 - adds r1, r6, 0 - movs r2, 0x7 - bl memcpy - adds r0, r4, 0 - bl sub_8115834 - ldrh r0, [r5, 0x6] - ldr r1, _081147F8 @ =gStringVar2 - movs r2, 0 - bl sub_8113EAC - ldrh r0, [r5, 0x4] - ldr r1, _081147FC @ =gStringVar3 - movs r2, 0 - bl sub_8113EAC - ldr r0, _08114800 @ =gStringVar4 - ldr r1, _08114804 @ =gUnknown_841A76A - bl StringExpandPlaceholders - adds r6, 0x8 - adds r0, r6, 0 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_081147F4: .4byte gStringVar1 -_081147F8: .4byte gStringVar2 -_081147FC: .4byte gStringVar3 -_08114800: .4byte gStringVar4 -_08114804: .4byte gUnknown_841A76A - thumb_func_end sub_81147A8 - - thumb_func_start sub_8114808 -sub_8114808: @ 8114808 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0x13 - strh r0, [r4] - ldr r0, _08114830 @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r4, 0x2] - ldrb r0, [r1] - strb r0, [r4, 0x4] - adds r0, r4, 0x5 - adds r1, 0x1 - movs r2, 0x7 - bl memcpy - adds r4, 0xC - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114830: .4byte gUnknown_203AF98 - thumb_func_end sub_8114808 - - thumb_func_start sub_8114834 -sub_8114834: @ 8114834 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _08114878 @ =gStringVar1 - adds r0, r4, 0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - adds r1, r5, 0x5 - adds r0, r4, 0 - movs r2, 0x7 - bl memcpy - adds r0, r4, 0 - bl sub_8115834 - ldr r0, _0811487C @ =gStringVar2 - ldr r2, _08114880 @ =gUnknown_8456AE4 - ldrb r1, [r5, 0x4] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - ldr r0, _08114884 @ =gStringVar4 - ldr r1, _08114888 @ =gUnknown_841A7B0 - bl StringExpandPlaceholders - adds r5, 0xC - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114878: .4byte gStringVar1 -_0811487C: .4byte gStringVar2 -_08114880: .4byte gUnknown_8456AE4 -_08114884: .4byte gStringVar4 -_08114888: .4byte gUnknown_841A7B0 - thumb_func_end sub_8114834 - - thumb_func_start sub_811488C -sub_811488C: @ 811488C - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x14 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _081148B4 - ldrh r0, [r4] - strh r0, [r2] - ldrh r0, [r4, 0x2] - strh r0, [r2, 0x2] - ldrb r0, [r4, 0x4] - strb r0, [r2, 0x4] - ldrb r0, [r4, 0x5] - strb r0, [r2, 0x5] - adds r0, r2, 0x6 - b _081148B6 -_081148B4: - movs r0, 0 -_081148B6: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_811488C - - thumb_func_start sub_81148BC -sub_81148BC: @ 81148BC - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x14 - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x4 - bl UnkTextUtil_Reset - ldrb r0, [r4, 0x4] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x1 - bl sub_8113EAC - ldrb r0, [r5, 0x1] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0x2 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4, 0x2] - movs r1, 0 - movs r2, 0x3 - bl sub_8113EAC - ldr r0, _08114910 @ =gStringVar4 - ldr r1, _08114914 @ =gUnknown_841A566 - bl UnkTextUtil_StringExpandPlaceholders - adds r4, 0x6 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114910: .4byte gStringVar4 -_08114914: .4byte gUnknown_841A566 - thumb_func_end sub_81148BC - - thumb_func_start sub_8114918 -sub_8114918: @ 8114918 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x15 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _0811493C - ldrh r0, [r4] - strh r0, [r2] - ldrh r0, [r4, 0x2] - strh r0, [r2, 0x2] - ldrb r0, [r4, 0x4] - strb r0, [r2, 0x4] - adds r0, r2, 0x6 - b _0811493E -_0811493C: - movs r0, 0 -_0811493E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114918 - - thumb_func_start sub_8114944 -sub_8114944: @ 8114944 - push {r4,lr} - adds r1, r0, 0 - movs r0, 0x15 - bl sub_8113E88 - adds r4, r0, 0 - bl UnkTextUtil_Reset - ldrb r0, [r4, 0x4] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x1 - bl sub_8113EAC - ldrh r0, [r4, 0x2] - movs r1, 0 - movs r2, 0x2 - bl sub_8113EAC - ldr r0, _08114988 @ =gStringVar4 - ldr r1, _0811498C @ =gUnknown_841A5D9 - bl UnkTextUtil_StringExpandPlaceholders - adds r4, 0x6 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114988: .4byte gStringVar4 -_0811498C: .4byte gUnknown_841A5D9 - thumb_func_end sub_8114944 - - thumb_func_start sub_8114990 -sub_8114990: @ 8114990 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x16 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - bne _081149A8 - movs r0, 0 - b _081149CA -_081149A8: - adds r1, r2, 0x4 - ldrb r0, [r4, 0x4] - cmp r0, 0xE - bne _081149BC - ldrh r0, [r4, 0x2] - strh r0, [r2] - ldrh r0, [r4] - strh r0, [r2, 0x2] - ldrb r0, [r4, 0x5] - b _081149C6 -_081149BC: - ldrh r0, [r4] - strh r0, [r2] - ldrh r0, [r4, 0x2] - strh r0, [r2, 0x2] - ldrb r0, [r4, 0x4] -_081149C6: - strb r0, [r2, 0x4] - adds r0, r1, 0x2 -_081149CA: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114990 - - thumb_func_start sub_81149D0 -sub_81149D0: @ 81149D0 - push {r4,lr} - adds r1, r0, 0 - movs r0, 0x16 - bl sub_8113E88 - adds r4, r0, 0 - bl UnkTextUtil_Reset - ldrb r0, [r4, 0x4] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x1 - bl sub_8113EAC - ldrh r0, [r4, 0x2] - movs r1, 0 - movs r2, 0x2 - bl sub_8113EAC - ldr r0, _08114A14 @ =gStringVar4 - ldr r1, _08114A18 @ =gUnknown_841A60A - bl UnkTextUtil_StringExpandPlaceholders - adds r4, 0x6 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114A14: .4byte gStringVar4 -_08114A18: .4byte gUnknown_841A60A - thumb_func_end sub_81149D0 - - thumb_func_start sub_8114A1C -sub_8114A1C: @ 8114A1C - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x17 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08114A42 - ldrh r0, [r4] - strh r0, [r2] - adds r0, r2, 0x2 - ldrb r1, [r4, 0x4] - strb r1, [r2, 0x2] - ldrb r1, [r4, 0x5] - strb r1, [r0, 0x1] - adds r0, 0x2 - b _08114A44 -_08114A42: - movs r0, 0 -_08114A44: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114A1C - - thumb_func_start sub_8114A4C -sub_8114A4C: @ 8114A4C - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x17 - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x2 - bl UnkTextUtil_Reset - ldrb r0, [r4, 0x2] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x1 - bl sub_8113EAC - ldrb r0, [r5, 0x1] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0x2 - bl UnkTextUtil_SetPtrI - ldr r0, _08114A98 @ =gStringVar4 - ldr r1, _08114A9C @ =gUnknown_841A59C - bl UnkTextUtil_StringExpandPlaceholders - adds r5, 0x2 - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114A98: .4byte gStringVar4 -_08114A9C: .4byte gUnknown_841A59C - thumb_func_end sub_8114A4C - - thumb_func_start sub_8114AA0 -sub_8114AA0: @ 8114AA0 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x18 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08114AC0 - ldrh r0, [r4] - strh r0, [r2] - ldrb r0, [r4, 0x4] - strb r0, [r2, 0x2] - adds r0, r2, 0x4 - b _08114AC2 -_08114AC0: - movs r0, 0 -_08114AC2: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114AA0 - - thumb_func_start sub_8114AC8 -sub_8114AC8: @ 8114AC8 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x18 - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x2 - bl UnkTextUtil_Reset - ldrb r0, [r4, 0x2] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x1 - bl sub_8113EAC - ldr r0, _08114B04 @ =gStringVar4 - ldr r1, _08114B08 @ =gUnknown_841A5FA - bl UnkTextUtil_StringExpandPlaceholders - adds r5, 0x2 - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114B04: .4byte gStringVar4 -_08114B08: .4byte gUnknown_841A5FA - thumb_func_end sub_8114AC8 - - thumb_func_start sub_8114B0C -sub_8114B0C: @ 8114B0C - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x19 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08114B2C - ldrh r0, [r4] - strh r0, [r2] - ldrb r0, [r4, 0x4] - strb r0, [r2, 0x2] - adds r0, r2, 0x4 - b _08114B2E -_08114B2C: - movs r0, 0 -_08114B2E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114B0C - - thumb_func_start sub_8114B34 -sub_8114B34: @ 8114B34 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x19 - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x2 - bl UnkTextUtil_Reset - ldrb r0, [r4, 0x2] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x1 - bl sub_8113EAC - ldr r0, _08114B70 @ =gStringVar4 - ldr r1, _08114B74 @ =gUnknown_841A632 - bl UnkTextUtil_StringExpandPlaceholders - adds r5, 0x2 - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114B70: .4byte gStringVar4 -_08114B74: .4byte gUnknown_841A632 - thumb_func_end sub_8114B34 - - thumb_func_start sub_8114B78 -sub_8114B78: @ 8114B78 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x1A - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08114B98 - ldrh r0, [r4] - strh r0, [r2] - ldrb r0, [r4, 0x4] - strb r0, [r2, 0x2] - adds r0, r2, 0x4 - b _08114B9A -_08114B98: - movs r0, 0 -_08114B9A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114B78 - - thumb_func_start sub_8114BA0 -sub_8114BA0: @ 8114BA0 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x1A - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x2 - bl UnkTextUtil_Reset - ldrh r0, [r4] - movs r1, 0 - movs r2, 0 - bl sub_8113EAC - ldrb r0, [r4, 0x2] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - ldr r0, _08114BDC @ =gStringVar4 - ldr r1, _08114BE0 @ =gUnknown_841A64F - bl UnkTextUtil_StringExpandPlaceholders - adds r5, 0x2 - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08114BDC: .4byte gStringVar4 -_08114BE0: .4byte gUnknown_841A64F - thumb_func_end sub_8114BA0 - - thumb_func_start sub_8114BE4 -sub_8114BE4: @ 8114BE4 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x1B - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08114C04 - ldrb r0, [r4, 0x4] - strb r0, [r2] - ldrb r0, [r4, 0x5] - strb r0, [r2, 0x1] - adds r0, r2, 0x2 - b _08114C06 -_08114C04: - movs r0, 0 -_08114C06: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114BE4 - - thumb_func_start sub_8114C0C -sub_8114C0C: @ 8114C0C - push {r4,lr} - adds r1, r0, 0 - movs r0, 0x1B - bl sub_8113E88 - adds r4, r0, 0 - bl UnkTextUtil_Reset - ldrb r0, [r4] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrb r0, [r4] - ldrb r1, [r4, 0x1] - cmp r0, r1 - bne _08114C40 - ldr r1, _08114C3C @ =gUnknown_841A694 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - b _08114C4E - .align 2, 0 -_08114C3C: .4byte gUnknown_841A694 -_08114C40: - ldrb r0, [r4, 0x1] - bl GetBoxNamePtr - adds r1, r0, 0 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI -_08114C4E: - ldr r0, _08114C60 @ =gStringVar4 - ldr r1, _08114C64 @ =gUnknown_841A66E - bl UnkTextUtil_StringExpandPlaceholders - adds r0, r4, 0x2 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114C60: .4byte gStringVar4 -_08114C64: .4byte gUnknown_841A66E - thumb_func_end sub_8114C0C - - thumb_func_start sub_8114C68 -sub_8114C68: @ 8114C68 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x1C - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08114C84 - ldrh r0, [r4] - strh r0, [r2] - adds r0, r2, 0x2 - b _08114C86 -_08114C84: - movs r0, 0 -_08114C86: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114C68 - - thumb_func_start sub_8114C8C -sub_8114C8C: @ 8114C8C - push {r4,lr} - adds r1, r0, 0 - movs r0, 0x1C - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4] - ldr r1, _08114CB4 @ =gStringVar1 - bl sub_8099E90 - ldr r0, _08114CB8 @ =gStringVar4 - ldr r1, _08114CBC @ =gUnknown_841A391 - bl StringExpandPlaceholders - adds r4, 0x2 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114CB4: .4byte gStringVar1 -_08114CB8: .4byte gStringVar4 -_08114CBC: .4byte gUnknown_841A391 - thumb_func_end sub_8114C8C - - thumb_func_start sub_8114CC0 -sub_8114CC0: @ 8114CC0 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x1D - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _08114CDC - ldrh r0, [r4] - strh r0, [r2] - adds r0, r2, 0x2 - b _08114CDE -_08114CDC: - movs r0, 0 -_08114CDE: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114CC0 - - thumb_func_start sub_8114CE4 -sub_8114CE4: @ 8114CE4 - push {r4,lr} - adds r1, r0, 0 - movs r0, 0x1D - bl sub_8113E88 - adds r4, r0, 0 - ldrh r0, [r4] - ldr r1, _08114D0C @ =gStringVar1 - bl sub_8099E90 - ldr r0, _08114D10 @ =gStringVar4 - ldr r1, _08114D14 @ =gUnknown_841A3DA - bl StringExpandPlaceholders - adds r4, 0x2 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08114D0C: .4byte gStringVar1 -_08114D10: .4byte gStringVar4 -_08114D14: .4byte gUnknown_841A3DA - thumb_func_end sub_8114CE4 - - thumb_func_start sub_8114D18 -sub_8114D18: @ 8114D18 - push {r4,lr} - adds r4, r2, 0 - lsls r0, 16 - lsrs r0, 16 - bl sub_8113DE0 - adds r1, r0, 0 - cmp r1, 0 - beq _08114D44 - ldrh r0, [r4, 0x2] - strh r0, [r1] - ldrh r0, [r4, 0x4] - strh r0, [r1, 0x2] - ldrh r0, [r4] - strh r0, [r1, 0x4] - ldrb r0, [r4, 0x7] - strb r0, [r1, 0x6] - ldrb r0, [r4, 0x6] - strb r0, [r1, 0x7] - adds r0, r1, 0 - adds r0, 0x8 - b _08114D46 -_08114D44: - movs r0, 0 -_08114D46: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8114D18 - - thumb_func_start sub_8114D4C -sub_8114D4C: @ 8114D4C - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - ldr r1, _08114D64 @ =gUnknown_203B048 - movs r0, 0x1 - strb r0, [r1] - movs r0, 0x1E - adds r1, r3, 0 - bl sub_8114D18 - pop {r1} - bx r1 - .align 2, 0 -_08114D64: .4byte gUnknown_203B048 - thumb_func_end sub_8114D4C - - thumb_func_start sub_8114D68 -sub_8114D68: @ 8114D68 - push {r4-r6,lr} - adds r1, r0, 0 - movs r0, 0x1E - bl sub_8113E88 - adds r4, r0, 0 - adds r6, r4, 0x6 - bl UnkTextUtil_Reset - ldr r5, _08114DD4 @ =gStringVar1 - ldrb r1, [r4, 0x6] - adds r0, r5, 0 - bl sub_80C4DF8 - movs r0, 0 - adds r1, r5, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4, 0x4] - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _08114DD8 @ =gTrainers+0x4 - adds r1, r0 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x2 - bl sub_8113EAC - ldrh r0, [r4, 0x2] - movs r1, 0 - movs r2, 0x3 - bl sub_8113EAC - ldr r1, _08114DDC @ =gUnknown_8456ACC - ldrb r0, [r6, 0x1] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x4 - bl UnkTextUtil_SetPtrI - ldr r0, _08114DE0 @ =gStringVar4 - ldr r1, _08114DE4 @ =gUnknown_841AF0C - bl UnkTextUtil_StringExpandPlaceholders - adds r4, 0x8 - adds r0, r4, 0 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08114DD4: .4byte gStringVar1 -_08114DD8: .4byte gTrainers+0x4 -_08114DDC: .4byte gUnknown_8456ACC -_08114DE0: .4byte gStringVar4 -_08114DE4: .4byte gUnknown_841AF0C - thumb_func_end sub_8114D68 - - thumb_func_start sub_8114DE8 -sub_8114DE8: @ 8114DE8 - push {r4-r6,lr} - adds r6, r1, 0 - adds r4, r0, 0 - adds r5, r4, 0 - adds r5, 0x8 - ldr r0, _08114E08 @ =gUnknown_8456AA0 - ldrb r1, [r0, 0x1F] - adds r0, r4, 0 - bl sub_8110944 - lsls r0, 24 - cmp r0, 0 - bne _08114E0C - movs r0, 0 - b _08114E5E - .align 2, 0 -_08114E08: .4byte gUnknown_8456AA0 -_08114E0C: - ldrb r0, [r4, 0x8] - cmp r0, 0 - bne _08114E22 - ldrb r0, [r5, 0x1] - cmp r0, 0 - bne _08114E22 - movs r0, 0x1F - strh r0, [r4] - ldr r0, _08114E64 @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r4, 0x2] -_08114E22: - ldrh r0, [r6] - adds r2, r0, 0 - cmp r2, 0 - beq _08114E2C - strh r0, [r4, 0x4] -_08114E2C: - ldrh r0, [r6, 0x2] - adds r1, r0, 0 - cmp r1, 0 - beq _08114E36 - strh r1, [r4, 0x6] -_08114E36: - cmp r2, 0 - beq _08114E46 - ldrb r2, [r5] - adds r0, r2, 0 - cmp r0, 0xFF - beq _08114E46 - adds r0, r2, 0x1 - strb r0, [r5] -_08114E46: - lsls r0, r1, 16 - cmp r0, 0 - beq _08114E58 - ldrb r1, [r5, 0x1] - adds r0, r1, 0 - cmp r0, 0xFF - beq _08114E58 - adds r0, r1, 0x1 - strb r0, [r5, 0x1] -_08114E58: - ldrb r0, [r6, 0x4] - strb r0, [r5, 0x2] - adds r0, r5, 0x4 -_08114E5E: - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08114E64: .4byte gUnknown_203AF98 - thumb_func_end sub_8114DE8 - - thumb_func_start sub_8114E68 -sub_8114E68: @ 8114E68 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r0, _08114E80 @ =gUnknown_8456AA0 - ldrb r1, [r0, 0x1F] - adds r0, r5, 0 - bl sub_8110944 - lsls r0, 24 - cmp r0, 0 - bne _08114E84 - movs r0, 0 - b _08114FAE - .align 2, 0 -_08114E80: .4byte gUnknown_8456AA0 -_08114E84: - adds r6, r5, 0 - adds r6, 0x8 - bl UnkTextUtil_Reset - ldr r4, _08114F00 @ =gStringVar1 - ldrb r1, [r6, 0x2] - adds r0, r4, 0 - bl sub_80C4DF8 - movs r0, 0 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r5, 0x4] - movs r1, 0 - movs r2, 0x1 - bl sub_8113EAC - ldr r4, _08114F04 @ =gStringVar2 - ldrb r1, [r5, 0x8] - adds r0, r4, 0 - movs r2, 0 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - movs r0, 0x2 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r5, 0x6] - movs r1, 0 - movs r2, 0x3 - bl sub_8113EAC - ldr r4, _08114F08 @ =gStringVar3 - ldrb r1, [r6, 0x1] - adds r0, r4, 0 - movs r2, 0 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - movs r0, 0x4 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldr r0, _08114F0C @ =gSaveBlock2Ptr - ldr r1, [r0] - movs r0, 0x5 - bl UnkTextUtil_SetPtrI - ldrb r0, [r5, 0x8] - cmp r0, 0 - bne _08114F2C - ldrb r0, [r6, 0x1] - cmp r0, 0x1 - bne _08114F18 - ldr r0, _08114F10 @ =gStringVar4 - ldr r1, _08114F14 @ =gUnknown_841AA01 - bl UnkTextUtil_StringExpandPlaceholders - b _08114FAC - .align 2, 0 -_08114F00: .4byte gStringVar1 -_08114F04: .4byte gStringVar2 -_08114F08: .4byte gStringVar3 -_08114F0C: .4byte gSaveBlock2Ptr -_08114F10: .4byte gStringVar4 -_08114F14: .4byte gUnknown_841AA01 -_08114F18: - ldr r0, _08114F24 @ =gStringVar4 - ldr r1, _08114F28 @ =gUnknown_841AA2B - bl UnkTextUtil_StringExpandPlaceholders - b _08114FAC - .align 2, 0 -_08114F24: .4byte gStringVar4 -_08114F28: .4byte gUnknown_841AA2B -_08114F2C: - ldrb r1, [r6, 0x1] - cmp r1, 0 - bne _08114F5C - cmp r0, 0x1 - bne _08114F48 - ldr r0, _08114F40 @ =gStringVar4 - ldr r1, _08114F44 @ =gUnknown_841A9A9 - bl UnkTextUtil_StringExpandPlaceholders - b _08114FAC - .align 2, 0 -_08114F40: .4byte gStringVar4 -_08114F44: .4byte gUnknown_841A9A9 -_08114F48: - ldr r0, _08114F54 @ =gStringVar4 - ldr r1, _08114F58 @ =gUnknown_841A9D4 - bl UnkTextUtil_StringExpandPlaceholders - b _08114FAC - .align 2, 0 -_08114F54: .4byte gStringVar4 -_08114F58: .4byte gUnknown_841A9D4 -_08114F5C: - cmp r0, 0x1 - bne _08114F8C - cmp r1, 0x1 - bne _08114F78 - ldr r0, _08114F70 @ =gStringVar4 - ldr r1, _08114F74 @ =gUnknown_841AA76 - bl UnkTextUtil_StringExpandPlaceholders - b _08114FAC - .align 2, 0 -_08114F70: .4byte gStringVar4 -_08114F74: .4byte gUnknown_841AA76 -_08114F78: - ldr r0, _08114F84 @ =gStringVar4 - ldr r1, _08114F88 @ =gUnknown_841AAAA - bl UnkTextUtil_StringExpandPlaceholders - b _08114FAC - .align 2, 0 -_08114F84: .4byte gStringVar4 -_08114F88: .4byte gUnknown_841AAAA -_08114F8C: - cmp r1, 0x1 - bne _08114FA4 - ldr r0, _08114F9C @ =gStringVar4 - ldr r1, _08114FA0 @ =gUnknown_841AAEC - bl UnkTextUtil_StringExpandPlaceholders - b _08114FAC - .align 2, 0 -_08114F9C: .4byte gStringVar4 -_08114FA0: .4byte gUnknown_841AAEC -_08114FA4: - ldr r0, _08114FB4 @ =gStringVar4 - ldr r1, _08114FB8 @ =gUnknown_841AB29 - bl UnkTextUtil_StringExpandPlaceholders -_08114FAC: - adds r0, r6, 0x4 -_08114FAE: - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08114FB4: .4byte gStringVar4 -_08114FB8: .4byte gUnknown_841AB29 - thumb_func_end sub_8114E68 - - thumb_func_start sub_8114FBC -sub_8114FBC: @ 8114FBC - push {lr} - lsls r0, 16 - lsrs r0, 16 - adds r1, r0, 0 - cmp r0, 0x96 - beq _08114FE6 - cmp r0, 0x96 - bgt _08114FD6 - cmp r0, 0x92 - bgt _08114FEA - cmp r0, 0x8F - blt _08114FEA - b _08114FE6 -_08114FD6: - cmp r1, 0xF9 - blt _08114FEA - cmp r1, 0xFA - ble _08114FE6 - movs r0, 0xCD - lsls r0, 1 - cmp r1, r0 - bne _08114FEA -_08114FE6: - movs r0, 0x1 - b _08114FEC -_08114FEA: - movs r0, 0 -_08114FEC: - pop {r1} - bx r1 - thumb_func_end sub_8114FBC - - thumb_func_start sub_8114FF0 -sub_8114FF0: @ 8114FF0 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - ldr r1, _08115008 @ =gUnknown_203B048 - movs r0, 0x1 - strb r0, [r1] - movs r0, 0x20 - adds r1, r3, 0 - bl sub_8114D18 - pop {r1} - bx r1 - .align 2, 0 -_08115008: .4byte gUnknown_203B048 - thumb_func_end sub_8114FF0 - - thumb_func_start sub_811500C -sub_811500C: @ 811500C - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x20 - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x6 - bl UnkTextUtil_Reset - ldrh r0, [r4, 0x4] - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _08115068 @ =gTrainers+0x4 - adds r1, r0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - movs r1, 0 - movs r2, 0x1 - bl sub_8113EAC - ldrh r0, [r4, 0x2] - movs r1, 0 - movs r2, 0x2 - bl sub_8113EAC - ldr r1, _0811506C @ =gUnknown_8456ACC - ldrb r0, [r5, 0x1] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x3 - bl UnkTextUtil_SetPtrI - ldr r0, _08115070 @ =gStringVar4 - ldr r1, _08115074 @ =gUnknown_841AF3E - bl UnkTextUtil_StringExpandPlaceholders - adds r4, 0x8 - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08115068: .4byte gTrainers+0x4 -_0811506C: .4byte gUnknown_8456ACC -_08115070: .4byte gStringVar4 -_08115074: .4byte gUnknown_841AF3E - thumb_func_end sub_811500C - - thumb_func_start sub_8115078 -sub_8115078: @ 8115078 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldr r0, _081150B4 @ =gUnknown_8456AA0 - adds r0, 0x21 - ldrb r1, [r0] - adds r0, r4, 0 - bl sub_8110944 - lsls r0, 24 - cmp r0, 0 - beq _081150C4 - ldr r1, _081150B8 @ =0x00002021 - adds r0, r1, 0 - strh r0, [r4] - ldr r0, _081150BC @ =gUnknown_203AF98 - ldrh r0, [r0] - strh r0, [r4, 0x2] - ldrh r0, [r5, 0x2] - strh r0, [r4, 0x4] - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x6] - ldrb r0, [r5, 0x6] - strb r0, [r4, 0x8] - ldr r1, _081150C0 @ =gUnknown_203B048 - movs r0, 0x1 - strb r0, [r1] - adds r0, r4, 0 - adds r0, 0xA - b _081150C6 - .align 2, 0 -_081150B4: .4byte gUnknown_8456AA0 -_081150B8: .4byte 0x00002021 -_081150BC: .4byte gUnknown_203AF98 -_081150C0: .4byte gUnknown_203B048 -_081150C4: - movs r0, 0 -_081150C6: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8115078 - - thumb_func_start sub_81150CC -sub_81150CC: @ 81150CC - push {r4,r5,lr} - adds r4, r0, 0 - ldr r0, _081150E8 @ =gUnknown_8456AA0 - adds r0, 0x21 - ldrb r1, [r0] - adds r0, r4, 0 - bl sub_8110944 - lsls r0, 24 - cmp r0, 0 - bne _081150EC - movs r0, 0 - b _081151AE - .align 2, 0 -_081150E8: .4byte gUnknown_8456AA0 -_081150EC: - adds r5, r4, 0 - adds r5, 0x8 - bl UnkTextUtil_Reset - ldr r0, _08115108 @ =gUnknown_203B044 - ldrh r0, [r0, 0x2] - cmp r0, 0x1 - beq _08115148 - cmp r0, 0x1 - bgt _0811510C - cmp r0, 0 - beq _08115112 - b _081151AC - .align 2, 0 -_08115108: .4byte gUnknown_203B044 -_0811510C: - cmp r0, 0x2 - beq _08115194 - b _081151AC -_08115112: - ldr r0, _08115134 @ =gSaveBlock2Ptr - ldr r1, [r0] - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldr r0, _08115138 @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, _0811513C @ =0x00003a4c - adds r1, r0 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - ldr r0, _08115140 @ =gStringVar4 - ldr r1, _08115144 @ =gUnknown_841A2E1 - bl UnkTextUtil_StringExpandPlaceholders - b _081151AC - .align 2, 0 -_08115134: .4byte gSaveBlock2Ptr -_08115138: .4byte gSaveBlock1Ptr -_0811513C: .4byte 0x00003a4c -_08115140: .4byte gStringVar4 -_08115144: .4byte gUnknown_841A2E1 -_08115148: - ldr r0, _08115180 @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, _08115184 @ =0x00003a4c - adds r1, r0 - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4, 0x4] - movs r1, 0 - movs r2, 0x1 - bl sub_8113EAC - ldr r0, _08115188 @ =gSaveBlock2Ptr - ldr r1, [r0] - movs r0, 0x2 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4, 0x6] - movs r1, 0 - movs r2, 0x3 - bl sub_8113EAC - ldr r0, _0811518C @ =gStringVar4 - ldr r1, _08115190 @ =gUnknown_841A312 - bl UnkTextUtil_StringExpandPlaceholders - b _081151AC - .align 2, 0 -_08115180: .4byte gSaveBlock1Ptr -_08115184: .4byte 0x00003a4c -_08115188: .4byte gSaveBlock2Ptr -_0811518C: .4byte gStringVar4 -_08115190: .4byte gUnknown_841A312 -_08115194: - ldr r1, _081151B4 @ =gUnknown_8456AD8 - ldrb r0, [r4, 0x8] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0 - bl UnkTextUtil_SetPtrI - ldr r0, _081151B8 @ =gStringVar4 - ldr r1, _081151BC @ =gUnknown_841A349 - bl UnkTextUtil_StringExpandPlaceholders -_081151AC: - adds r0, r5, 0x2 -_081151AE: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081151B4: .4byte gUnknown_8456AD8 -_081151B8: .4byte gStringVar4 -_081151BC: .4byte gUnknown_841A349 - thumb_func_end sub_81150CC - - thumb_func_start sub_81151C0 -sub_81151C0: @ 81151C0 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - ldr r1, _081151D8 @ =gUnknown_203B048 - movs r0, 0x1 - strb r0, [r1] - movs r0, 0x22 - adds r1, r3, 0 - bl sub_8114D18 - pop {r1} - bx r1 - .align 2, 0 -_081151D8: .4byte gUnknown_203B048 - thumb_func_end sub_81151C0 - - thumb_func_start sub_81151DC -sub_81151DC: @ 81151DC - push {r4-r6,lr} - adds r1, r0, 0 - movs r0, 0x22 - bl sub_8113E88 - adds r5, r0, 0 - adds r6, r5, 0x6 - bl UnkTextUtil_Reset - ldr r4, _0811522C @ =gStringVar1 - ldrb r1, [r5, 0x6] - adds r0, r4, 0 - bl sub_80C4DF8 - movs r0, 0 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldr r3, _08115230 @ =gTrainers - ldrh r1, [r5, 0x4] - lsls r0, r1, 2 - adds r0, r1 - lsls r2, r0, 3 - adds r0, r2, r3 - ldrb r0, [r0, 0x1] - cmp r0, 0x51 - beq _0811521A - cmp r0, 0x59 - beq _0811521A - cmp r0, 0x5A - bne _08115234 -_0811521A: - movs r0, 0x6 - bl GetExpandedPlaceholder - adds r1, r0, 0 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - b _0811523E - .align 2, 0 -_0811522C: .4byte gStringVar1 -_08115230: .4byte gTrainers -_08115234: - adds r1, r3, 0x4 - adds r1, r2, r1 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI -_0811523E: - ldrh r0, [r5] - movs r1, 0 - movs r2, 0x2 - bl sub_8113EAC - ldrh r0, [r5, 0x2] - movs r1, 0 - movs r2, 0x3 - bl sub_8113EAC - ldr r1, _08115274 @ =gUnknown_8456ACC - ldrb r0, [r6, 0x1] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x4 - bl UnkTextUtil_SetPtrI - ldr r0, _08115278 @ =gStringVar4 - ldr r1, _0811527C @ =gUnknown_841AF6D - bl UnkTextUtil_StringExpandPlaceholders - adds r0, r6, 0x2 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08115274: .4byte gUnknown_8456ACC -_08115278: .4byte gStringVar4 -_0811527C: .4byte gUnknown_841AF6D - thumb_func_end sub_81151DC - - thumb_func_start sub_8115280 -sub_8115280: @ 8115280 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x23 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - bne _08115298 - movs r0, 0 - b _081152B0 -_08115298: - ldrb r0, [r4] - strb r0, [r2] - ldrb r0, [r4, 0x1] - strb r0, [r2, 0x1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x24 - bne _081152AE - ldr r1, _081152B8 @ =gUnknown_203B048 - movs r0, 0x1 - strb r0, [r1] -_081152AE: - adds r0, r2, 0x2 -_081152B0: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_081152B8: .4byte gUnknown_203B048 - thumb_func_end sub_8115280 - - thumb_func_start sub_81152BC -sub_81152BC: @ 81152BC - push {r4-r7,lr} - adds r1, r0, 0 - movs r0, 0x23 - bl sub_8113E88 - adds r5, r0, 0 - ldrb r6, [r5, 0x1] - ldr r0, _08115318 @ =gStringVar1 - ldrb r1, [r5] - bl sub_80C4DF8 - ldr r0, _0811531C @ =gStringVar2 - ldr r2, _08115320 @ =gUnknown_8456AF0 - lsls r1, r6, 2 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - ldr r0, _08115324 @ =gUnknown_8456BE4 - adds r1, r6, r0 - ldrb r0, [r1] - cmp r0, 0x5 - bne _08115378 - movs r4, 0 - ldr r2, _08115328 @ =gUnknown_8456C17 - adds r7, r5, 0x2 - ldrb r1, [r5] -_081152F2: - adds r0, r4, r2 - ldrb r0, [r0] - cmp r1, r0 - bne _08115334 - movs r1, 0x82 - lsls r1, 4 - adds r0, r4, r1 - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08115364 - ldr r0, _0811532C @ =gStringVar4 - ldr r1, _08115330 @ =gUnknown_841AE48 - bl StringExpandPlaceholders - b _0811533E - .align 2, 0 -_08115318: .4byte gStringVar1 -_0811531C: .4byte gStringVar2 -_08115320: .4byte gUnknown_8456AF0 -_08115324: .4byte gUnknown_8456BE4 -_08115328: .4byte gUnknown_8456C17 -_0811532C: .4byte gStringVar4 -_08115330: .4byte gUnknown_841AE48 -_08115334: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x7 - bls _081152F2 -_0811533E: - cmp r4, 0x8 - bne _0811538A - ldr r0, _08115358 @ =gStringVar4 - ldr r2, _0811535C @ =gUnknown_8456BBC - ldr r1, _08115360 @ =gUnknown_8456BE4 - adds r1, r6, r1 - ldrb r1, [r1] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringExpandPlaceholders - b _0811538A - .align 2, 0 -_08115358: .4byte gStringVar4 -_0811535C: .4byte gUnknown_8456BBC -_08115360: .4byte gUnknown_8456BE4 -_08115364: - ldr r0, _08115370 @ =gStringVar4 - ldr r1, _08115374 @ =gUnknown_841AE8F - bl StringExpandPlaceholders - b _0811533E - .align 2, 0 -_08115370: .4byte gStringVar4 -_08115374: .4byte gUnknown_841AE8F -_08115378: - ldr r0, _08115394 @ =gStringVar4 - ldr r2, _08115398 @ =gUnknown_8456BBC - ldrb r1, [r1] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringExpandPlaceholders - adds r7, r5, 0x2 -_0811538A: - adds r0, r7, 0 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08115394: .4byte gStringVar4 -_08115398: .4byte gUnknown_8456BBC - thumb_func_end sub_81152BC - - thumb_func_start sub_811539C -sub_811539C: @ 811539C - ldr r1, _081153A4 @ =gUnknown_203B04B - movs r0, 0x1 - strb r0, [r1] - bx lr - .align 2, 0 -_081153A4: .4byte gUnknown_203B04B - thumb_func_end sub_811539C - - thumb_func_start sub_81153A8 -sub_81153A8: @ 81153A8 - push {lr} - adds r2, r1, 0 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x23 - beq _081153C4 - ldr r1, _081153C0 @ =gUnknown_203B04A - movs r0, 0 - strb r0, [r1] - movs r0, 0x1 - b _081153DE - .align 2, 0 -_081153C0: .4byte gUnknown_203B04A -_081153C4: - ldr r3, _081153D8 @ =gUnknown_203B04A - ldrb r1, [r3] - ldrb r0, [r2, 0x1] - adds r0, 0x1 - cmp r1, r0 - beq _081153DC - strb r0, [r3] - movs r0, 0x1 - b _081153DE - .align 2, 0 -_081153D8: .4byte gUnknown_203B04A -_081153DC: - movs r0, 0 -_081153DE: - pop {r1} - bx r1 - thumb_func_end sub_81153A8 - - thumb_func_start sub_81153E4 -sub_81153E4: @ 81153E4 - push {lr} - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x23 - bne _08115408 - ldrb r0, [r1, 0x1] - ldr r1, _08115400 @ =gUnknown_203B04B - cmp r0, 0x20 - bne _08115404 - ldrb r0, [r1] - cmp r0, 0 - bne _08115404 - movs r0, 0 - b _0811540A - .align 2, 0 -_08115400: .4byte gUnknown_203B04B -_08115404: - movs r0, 0 - strb r0, [r1] -_08115408: - movs r0, 0x1 -_0811540A: - pop {r1} - bx r1 - thumb_func_end sub_81153E4 - - thumb_func_start sub_8115410 -sub_8115410: @ 8115410 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x24 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - bne _08115428 - movs r0, 0 - b _08115454 -_08115428: - ldrh r0, [r4] - strh r0, [r2] - adds r3, r2, 0x2 - ldrb r0, [r4, 0x2] - strb r0, [r2, 0x2] - ldrb r0, [r4, 0x3] - strb r0, [r3, 0x1] - ldrb r0, [r2, 0x2] - subs r0, 0x7 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bhi _0811544C - ldr r1, _08115448 @ =gUnknown_203B048 - movs r0, 0x2 - b _08115450 - .align 2, 0 -_08115448: .4byte gUnknown_203B048 -_0811544C: - ldr r1, _0811545C @ =gUnknown_203B048 - movs r0, 0x1 -_08115450: - strb r0, [r1] - adds r0, r3, 0x2 -_08115454: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_0811545C: .4byte gUnknown_203B048 - thumb_func_end sub_8115410 - - thumb_func_start sub_8115460 -sub_8115460: @ 8115460 - push {r4,r5,lr} - adds r1, r0, 0 - movs r0, 0x24 - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x2 - ldrh r0, [r4] - ldr r1, _0811549C @ =gStringVar1 - movs r2, 0 - bl sub_8113EAC - ldrb r0, [r5, 0x1] - cmp r0, 0xFF - beq _08115486 - ldr r0, _081154A0 @ =gStringVar2 - ldrb r1, [r5, 0x1] - bl sub_80C4DF8 -_08115486: - ldrb r0, [r4, 0x2] - cmp r0, 0x7 - bne _081154B4 - ldrb r0, [r5, 0x1] - cmp r0, 0x58 - bne _081154AC - ldr r0, _081154A4 @ =gStringVar3 - ldr r1, _081154A8 @ =gUnknown_841B09F - bl StringCopy - b _081154B4 - .align 2, 0 -_0811549C: .4byte gStringVar1 -_081154A0: .4byte gStringVar2 -_081154A4: .4byte gStringVar3 -_081154A8: .4byte gUnknown_841B09F -_081154AC: - ldr r0, _081154CC @ =gStringVar3 - ldr r1, _081154D0 @ =gUnknown_8418C1B - bl StringCopy -_081154B4: - ldr r0, _081154D4 @ =gStringVar4 - ldr r2, _081154D8 @ =gUnknown_8456C20 - ldrb r1, [r5] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringExpandPlaceholders - adds r0, r5, 0x2 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_081154CC: .4byte gStringVar3 -_081154D0: .4byte gUnknown_8418C1B -_081154D4: .4byte gStringVar4 -_081154D8: .4byte gUnknown_8456C20 - thumb_func_end sub_8115460 - - thumb_func_start sub_81154DC -sub_81154DC: @ 81154DC - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x25 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _0811550E - ldrh r0, [r4, 0x4] - strh r0, [r2] - ldrh r0, [r4, 0x6] - strh r0, [r2, 0x2] - ldr r1, [r4] - lsrs r0, r1, 16 - strh r0, [r2, 0x4] - strh r1, [r2, 0x6] - ldrb r0, [r4, 0x8] - strb r0, [r2, 0x8] - movs r0, 0x1 - strb r0, [r2, 0x9] - adds r0, r2, 0 - adds r0, 0xA - b _08115510 -_0811550E: - movs r0, 0 -_08115510: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81154DC - - thumb_func_start sub_8115518 -sub_8115518: @ 8115518 - push {r4-r7,lr} - adds r1, r0, 0 - movs r0, 0x25 - bl sub_8113E88 - adds r4, r0, 0 - adds r7, r4, 0 - adds r7, 0x8 - ldrh r0, [r4, 0x4] - lsls r0, 16 - ldrh r1, [r4, 0x6] - adds r6, r0, r1 - bl UnkTextUtil_Reset - ldr r5, _08115564 @ =gStringVar1 - ldrb r1, [r4, 0x8] - adds r0, r5, 0 - bl sub_80C4DF8 - movs r0, 0 - adds r1, r5, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - ldrh r0, [r4, 0x2] - cmp r0, 0x1 - bhi _08115570 - ldr r0, _08115568 @ =gStringVar4 - ldr r1, _0811556C @ =gUnknown_841A7DD - bl UnkTextUtil_StringExpandPlaceholders - b _0811558E - .align 2, 0 -_08115564: .4byte gStringVar1 -_08115568: .4byte gStringVar4 -_0811556C: .4byte gUnknown_841A7DD -_08115570: - ldr r4, _08115598 @ =gStringVar2 - adds r0, r4, 0 - adds r1, r6, 0 - movs r2, 0 - movs r3, 0x6 - bl ConvertIntToDecimalStringN - movs r0, 0x2 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldr r0, _0811559C @ =gStringVar4 - ldr r1, _081155A0 @ =gUnknown_841A810 - bl UnkTextUtil_StringExpandPlaceholders -_0811558E: - adds r0, r7, 0x2 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08115598: .4byte gStringVar2 -_0811559C: .4byte gStringVar4 -_081155A0: .4byte gUnknown_841A810 - thumb_func_end sub_8115518 - - thumb_func_start sub_81155A4 -sub_81155A4: @ 81155A4 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x26 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _081155D6 - ldrh r0, [r4, 0x4] - strh r0, [r2] - ldrh r0, [r4, 0x6] - strh r0, [r2, 0x2] - ldr r1, [r4] - lsrs r0, r1, 16 - strh r0, [r2, 0x4] - strh r1, [r2, 0x6] - ldrb r0, [r4, 0x8] - strb r0, [r2, 0x8] - ldrb r0, [r4, 0x9] - strb r0, [r2, 0x9] - adds r0, r2, 0 - adds r0, 0xA - b _081155D8 -_081155D6: - movs r0, 0 -_081155D8: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81155A4 - - thumb_func_start sub_81155E0 -sub_81155E0: @ 81155E0 - push {r4-r7,lr} - adds r1, r0, 0 - movs r0, 0x26 - bl sub_8113E88 - adds r5, r0, 0 - adds r7, r5, 0 - adds r7, 0x8 - ldrh r0, [r5, 0x4] - lsls r0, 16 - ldrh r1, [r5, 0x6] - adds r6, r0, r1 - bl UnkTextUtil_Reset - ldr r4, _0811563C @ =gStringVar1 - ldrb r1, [r5, 0x8] - adds r0, r4, 0 - bl sub_80C4DF8 - ldrb r0, [r7, 0x1] - cmp r0, 0 - bne _08115690 - ldr r0, _08115640 @ =gSaveBlock2Ptr - ldr r1, [r0] - movs r0, 0 - bl UnkTextUtil_SetPtrI - movs r0, 0x1 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r5] - bl ItemId_GetItem - adds r1, r0, 0 - movs r0, 0x2 - bl UnkTextUtil_SetPtrI - ldrh r0, [r5, 0x2] - cmp r0, 0x1 - bne _08115648 - ldr r1, _08115644 @ =gUnknown_841A8D4 - movs r0, 0x3 - bl UnkTextUtil_SetPtrI - b _08115670 - .align 2, 0 -_0811563C: .4byte gStringVar1 -_08115640: .4byte gSaveBlock2Ptr -_08115644: .4byte gUnknown_841A8D4 -_08115648: - ldr r4, _0811567C @ =gStringVar2 - ldrh r1, [r5, 0x2] - adds r0, r4, 0 - movs r2, 0 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - movs r0, 0x4 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldr r4, _08115680 @ =gStringVar3 - ldr r1, _08115684 @ =gUnknown_841A8DD - adds r0, r4, 0 - bl UnkTextUtil_StringExpandPlaceholders - movs r0, 0x3 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI -_08115670: - ldr r0, _08115688 @ =gStringVar4 - ldr r1, _0811568C @ =gUnknown_841A858 - bl UnkTextUtil_StringExpandPlaceholders - b _081156C4 - .align 2, 0 -_0811567C: .4byte gStringVar2 -_08115680: .4byte gStringVar3 -_08115684: .4byte gUnknown_841A8DD -_08115688: .4byte gStringVar4 -_0811568C: .4byte gUnknown_841A858 -_08115690: - movs r0, 0 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldrh r0, [r5] - bl ItemId_GetItem - adds r1, r0, 0 - movs r0, 0x1 - bl UnkTextUtil_SetPtrI - ldr r4, _081156CC @ =gStringVar2 - adds r0, r4, 0 - adds r1, r6, 0 - movs r2, 0 - movs r3, 0x6 - bl ConvertIntToDecimalStringN - movs r0, 0x2 - adds r1, r4, 0 - bl UnkTextUtil_SetPtrI - ldr r0, _081156D0 @ =gStringVar4 - ldr r1, _081156D4 @ =gUnknown_841A896 - bl UnkTextUtil_StringExpandPlaceholders -_081156C4: - adds r0, r7, 0x2 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_081156CC: .4byte gStringVar2 -_081156D0: .4byte gStringVar4 -_081156D4: .4byte gUnknown_841A896 - thumb_func_end sub_81155E0 - - thumb_func_start sub_81156D8 -sub_81156D8: @ 81156D8 - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x28 - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _081156F8 - ldrh r0, [r4] - strh r0, [r2] - ldrb r0, [r4, 0x2] - strb r0, [r2, 0x2] - adds r0, r2, 0x4 - b _081156FA -_081156F8: - movs r0, 0 -_081156FA: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81156D8 - - thumb_func_start sub_8115700 -sub_8115700: @ 8115700 - push {r4-r6,lr} - adds r1, r0, 0 - movs r0, 0x28 - bl sub_8113E88 - adds r4, r0, 0 - adds r5, r4, 0x2 - ldr r0, _08115738 @ =gStringVar1 - ldrb r1, [r4, 0x2] - bl sub_80C4DF8 - ldr r6, _0811573C @ =gStringVar2 - ldrh r0, [r4] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r6, 0 - bl StringCopy - ldr r0, _08115740 @ =gStringVar4 - ldr r1, _08115744 @ =gUnknown_841B03F - bl StringExpandPlaceholders - adds r5, 0x2 - adds r0, r5, 0 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08115738: .4byte gStringVar1 -_0811573C: .4byte gStringVar2 -_08115740: .4byte gStringVar4 -_08115744: .4byte gUnknown_841B03F - thumb_func_end sub_8115700 - - thumb_func_start sub_8115748 -sub_8115748: @ 8115748 - push {r4,lr} - lsls r0, 16 - lsrs r2, r0, 16 - ldr r0, _08115764 @ =gUnknown_203ADFA - ldrb r0, [r0] - subs r0, 0x2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _08115792 - movs r1, 0 - ldr r4, _08115768 @ =gUnknown_203B049 - ldr r0, _0811576C @ =gUnknown_8456C50 - b _08115778 - .align 2, 0 -_08115764: .4byte gUnknown_203ADFA -_08115768: .4byte gUnknown_203B049 -_0811576C: .4byte gUnknown_8456C50 -_08115770: - movs r0, 0 - b _08115790 -_08115774: - adds r0, 0x2 - adds r1, 0x1 -_08115778: - cmp r1, 0x10 - bgt _08115792 - ldrh r3, [r0] - cmp r2, r3 - bne _08115774 - adds r0, r2, 0 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - bne _08115770 - movs r0, 0x1 -_08115790: - strb r0, [r4] -_08115792: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8115748 - - thumb_func_start sub_8115798 -sub_8115798: @ 8115798 - push {r4,lr} - sub sp, 0x4 - ldr r0, _081157D0 @ =gUnknown_203ADFA - ldrb r0, [r0] - subs r0, 0x2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _081157C6 - ldr r4, _081157D4 @ =gUnknown_203B049 - ldrb r0, [r4] - cmp r0, 0 - beq _081157C6 - ldr r0, _081157D8 @ =gMapHeader - ldrb r1, [r0, 0x14] - mov r0, sp - strh r1, [r0] - movs r0, 0x2A - mov r1, sp - bl sub_8113550 - movs r0, 0 - strb r0, [r4] -_081157C6: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081157D0: .4byte gUnknown_203ADFA -_081157D4: .4byte gUnknown_203B049 -_081157D8: .4byte gMapHeader - thumb_func_end sub_8115798 - - thumb_func_start sub_81157DC -sub_81157DC: @ 81157DC - push {r4,lr} - adds r2, r0, 0 - adds r4, r1, 0 - movs r0, 0x2A - adds r1, r2, 0 - bl sub_8113DE0 - adds r2, r0, 0 - cmp r2, 0 - beq _081157F8 - ldrh r0, [r4] - strh r0, [r2] - adds r0, r2, 0x2 - b _081157FA -_081157F8: - movs r0, 0 -_081157FA: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81157DC - - thumb_func_start sub_8115800 -sub_8115800: @ 8115800 - push {r4,lr} - adds r1, r0, 0 - movs r0, 0x2A - bl sub_8113E88 - adds r4, r0, 0 - ldr r0, _08115828 @ =gStringVar1 - ldrb r1, [r4] - bl sub_80C4DF8 - ldr r0, _0811582C @ =gStringVar4 - ldr r1, _08115830 @ =gUnknown_841B064 - bl StringExpandPlaceholders - adds r4, 0x2 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08115828: .4byte gStringVar1 -_0811582C: .4byte gStringVar4 -_08115830: .4byte gUnknown_841B064 - thumb_func_end sub_8115800 - - thumb_func_start sub_8115834 -sub_8115834: @ 8115834 - push {lr} - adds r1, r0, 0 - ldrb r0, [r1] - adds r1, 0x1 - cmp r0, 0xFC - bne _08115868 - ldrb r0, [r1] - adds r1, 0x1 - cmp r0, 0x15 - bne _08115868 - movs r2, 0 - b _08115854 -_0811584C: - adds r1, 0x1 - adds r2, 0x1 - cmp r2, 0x4 - bgt _0811585A -_08115854: - ldrb r0, [r1] - cmp r0, 0xFC - bne _0811584C -_0811585A: - movs r0, 0xFC - strb r0, [r1] - adds r1, 0x1 - movs r0, 0x16 - strb r0, [r1] - movs r0, 0xFF - strb r0, [r1, 0x1] -_08115868: - pop {r0} - bx r0 - thumb_func_end sub_8115834 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/quest_log_8150454.s b/asm/quest_log_8150454.s deleted file mode 100644 index 76dadd6e0..000000000 --- a/asm/quest_log_8150454.s +++ /dev/null @@ -1,482 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8150454 -sub_8150454: @ 8150454 - push {lr} - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x8 - bhi _0815046A - ldr r0, _08150470 @ =gUnknown_8471EDC - lsls r1, 2 - adds r1, r0 - ldr r0, [r1] - bl _call_via_r0 -_0815046A: - pop {r0} - bx r0 - .align 2, 0 -_08150470: .4byte gUnknown_8471EDC - thumb_func_end sub_8150454 - - thumb_func_start sub_8150474 -sub_8150474: @ 8150474 - push {lr} - lsls r0, 24 - lsrs r1, r0, 24 - ldr r0, _08150488 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0x2 - beq _0815048C - movs r0, 0 - b _08150494 - .align 2, 0 -_08150488: .4byte gUnknown_3005E88 -_0815048C: - adds r0, r1, 0 - bl sub_8112720 - movs r0, 0x1 -_08150494: - pop {r1} - bx r1 - thumb_func_end sub_8150474 - - thumb_func_start sub_8150498 -sub_8150498: @ 8150498 - push {lr} - lsls r0, 24 - lsrs r0, 24 - bl sub_8150454 - pop {r0} - bx r0 - thumb_func_end sub_8150498 - - thumb_func_start sub_81504A8 -sub_81504A8: @ 81504A8 - push {r4,lr} - ldr r0, _081504E0 @ =gUnknown_2037078 - ldrb r0, [r0, 0x5] - lsls r4, r0, 3 - adds r4, r0 - lsls r4, 2 - ldr r0, _081504E4 @ =gMapObjects - adds r4, r0 - movs r0, 0 - bl sub_805C808 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl sub_81507BC - ldrb r1, [r4, 0x18] - lsrs r1, 4 - adds r0, r4, 0 - bl FieldObjectTurn - movs r0, 0x1 - bl SetPlayerAvatarStateMask - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081504E0: .4byte gUnknown_2037078 -_081504E4: .4byte gMapObjects - thumb_func_end sub_81504A8 - - thumb_func_start sub_81504E8 -sub_81504E8: @ 81504E8 - push {r4,lr} - ldr r0, _08150528 @ =gUnknown_2037078 - ldrb r0, [r0, 0x5] - lsls r4, r0, 3 - adds r4, r0 - lsls r4, 2 - ldr r0, _0815052C @ =gMapObjects - adds r4, r0 - movs r0, 0x1 - bl sub_805C808 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl sub_81507BC - ldrb r1, [r4, 0x18] - lsrs r1, 4 - adds r0, r4, 0 - bl FieldObjectTurn - movs r0, 0x2 - bl SetPlayerAvatarStateMask - movs r0, 0 - movs r1, 0 - bl sub_80BD620 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08150528: .4byte gUnknown_2037078 -_0815052C: .4byte gMapObjects - thumb_func_end sub_81504E8 - - thumb_func_start sub_8150530 -sub_8150530: @ 8150530 - push {r4-r6,lr} - ldr r6, _0815057C @ =gUnknown_2037078 - ldrb r1, [r6, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _08150580 @ =gMapObjects - adds r4, r0, r1 - ldrb r1, [r4, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08150584 @ =gSprites - adds r5, r0, r1 - ldr r0, _08150588 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0x1 - beq _08150558 - cmp r0, 0x3 - bne _08150594 -_08150558: - bl ScriptContext2_Enable - movs r4, 0 - movs r0, 0x1 - strb r0, [r6, 0x6] - ldr r0, _0815058C @ =sub_81505C4 - movs r1, 0xFF - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08150590 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - strh r4, [r1, 0x8] - b _081505BC - .align 2, 0 -_0815057C: .4byte gUnknown_2037078 -_08150580: .4byte gMapObjects -_08150584: .4byte gSprites -_08150588: .4byte gUnknown_3005E88 -_0815058C: .4byte sub_81505C4 -_08150590: .4byte gTasks -_08150594: - movs r0, 0x4 - bl sub_805C808 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl sub_81507BC - ldrb r0, [r4, 0x18] - lsls r0, 28 - lsrs r0, 28 - bl sub_80634F0 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl StartSpriteAnim -_081505BC: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8150530 - - thumb_func_start sub_81505C4 -sub_81505C4: @ 81505C4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r0, _0815060C @ =gUnknown_2037078 - mov r9, r0 - ldrb r1, [r0, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _08150610 @ =gMapObjects - adds r5, r0, r1 - ldrb r1, [r5, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08150614 @ =gSprites - adds r7, r0, r1 - ldr r1, _08150618 @ =gTasks - mov r2, r8 - lsls r0, r2, 2 - add r0, r8 - lsls r0, 3 - adds r4, r0, r1 - movs r0, 0x8 - ldrsh r6, [r4, r0] - cmp r6, 0x1 - beq _08150666 - cmp r6, 0x1 - bgt _0815061C - cmp r6, 0 - beq _08150626 - b _081506FC - .align 2, 0 -_0815060C: .4byte gUnknown_2037078 -_08150610: .4byte gMapObjects -_08150614: .4byte gSprites -_08150618: .4byte gTasks -_0815061C: - cmp r6, 0x2 - beq _0815067C - cmp r6, 0x3 - beq _0815069C - b _081506FC -_08150626: - adds r0, r5, 0 - bl FieldObjectClearAnimIfSpecialAnimActive - ldrb r0, [r5, 0x1] - movs r1, 0x8 - orrs r0, r1 - strb r0, [r5, 0x1] - movs r0, 0x4 - bl sub_805C808 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl sub_81507BC - ldrb r0, [r5, 0x18] - lsls r0, 28 - lsrs r0, 28 - bl sub_80634F0 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r7, 0 - bl StartSpriteAnim - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - strh r6, [r4, 0xA] - b _081506FC -_08150666: - adds r0, r7, 0 - bl sub_805D9C4 - ldrh r1, [r4, 0xA] - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r0, 0x3B - bgt _08150694 - adds r0, r1, 0x1 - strh r0, [r4, 0xA] - b _081506FC -_0815067C: - bl player_get_direction_lower_nybble - lsls r0, 24 - lsrs r0, 24 - bl sub_8063500 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r7, 0 - bl StartSpriteAnim -_08150694: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _081506FC -_0815069C: - adds r0, r7, 0 - bl sub_805D9C4 - adds r0, r7, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _081506FC - mov r0, r9 - ldrb r1, [r0] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - bne _081506D0 - movs r0, 0 - bl sub_805C808 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl sub_81507BC - b _081506E2 -_081506D0: - movs r0, 0x2 - bl sub_805C808 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl sub_81507BC -_081506E2: - ldrb r1, [r5, 0x18] - lsrs r1, 4 - adds r0, r5, 0 - bl FieldObjectTurn - movs r0, 0 - strh r0, [r7, 0x24] - strh r0, [r7, 0x26] - bl ScriptContext2_Disable - mov r0, r8 - bl DestroyTask -_081506FC: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81505C4 - - thumb_func_start sub_8150708 -sub_8150708: @ 8150708 - push {r4,r5,lr} - ldr r5, _08150770 @ =gUnknown_2037078 - ldrb r1, [r5, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _08150774 @ =gMapObjects - adds r4, r0, r1 - ldrb r1, [r5] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - bne _08150768 - movs r0, 0x2 - bl sub_805C808 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl sub_81507BC - ldrb r1, [r4, 0x18] - lsrs r1, 4 - adds r0, r4, 0 - bl FieldObjectTurn - movs r0, 0x8 - bl SetPlayerAvatarStateMask - ldr r1, _08150778 @ =gUnknown_20386E0 - movs r2, 0x10 - ldrsh r0, [r4, r2] - str r0, [r1] - movs r2, 0x12 - ldrsh r0, [r4, r2] - str r0, [r1, 0x4] - ldrb r0, [r5, 0x5] - str r0, [r1, 0x8] - movs r0, 0x8 - bl FieldEffectStart - lsls r0, 24 - lsrs r0, 24 - strb r0, [r4, 0x1A] - movs r1, 0x1 - bl sub_80DC44C -_08150768: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08150770: .4byte gUnknown_2037078 -_08150774: .4byte gMapObjects -_08150778: .4byte gUnknown_20386E0 - thumb_func_end sub_8150708 - - thumb_func_start sub_815077C -sub_815077C: @ 815077C - push {lr} - movs r0, 0x41 - bl FieldEffectStart - ldr r0, _08150790 @ =sub_8150794 - movs r1, 0 - bl CreateTask - pop {r0} - bx r0 - .align 2, 0 -_08150790: .4byte sub_8150794 - thumb_func_end sub_815077C - - thumb_func_start sub_8150794 -sub_8150794: @ 8150794 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0x41 - bl FieldEffectActiveListContains - lsls r0, 24 - cmp r0, 0 - bne _081507B4 - bl UnfreezeMapObjects - bl ScriptContext2_Disable - adds r0, r4, 0 - bl DestroyTask -_081507B4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8150794 - - thumb_func_start sub_81507BC -sub_81507BC: @ 81507BC - push {lr} - lsls r1, 24 - lsrs r1, 24 - bl sub_805F060 - pop {r0} - bx r0 - thumb_func_end sub_81507BC - - thumb_func_start sub_81507CC -sub_81507CC: @ 81507CC - push {lr} - movs r0, 0x1 - bl sub_805D154 - pop {r0} - bx r0 - thumb_func_end sub_81507CC - - thumb_func_start sub_81507D8 -sub_81507D8: @ 81507D8 - push {lr} - movs r0, 0x2 - bl sub_805D154 - pop {r0} - bx r0 - thumb_func_end sub_81507D8 - - thumb_func_start sub_81507E4 -sub_81507E4: @ 81507E4 - push {lr} - movs r0, 0x3 - bl sub_805D154 - pop {r0} - bx r0 - thumb_func_end sub_81507E4 - - thumb_func_start sub_81507F0 -sub_81507F0: @ 81507F0 - push {lr} - movs r0, 0x4 - bl sub_805D154 - pop {r0} - bx r0 - thumb_func_end sub_81507F0 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/quest_log_battle.s b/asm/quest_log_battle.s deleted file mode 100644 index 1870395e9..000000000 --- a/asm/quest_log_battle.s +++ /dev/null @@ -1,474 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_812BFDC -sub_812BFDC: @ 812BFDC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r4, _0812C03C @ =gBattleTypeFlags - ldr r0, [r4] - ldr r1, _0812C040 @ =0x00010202 - ands r0, r1 - cmp r0, 0 - beq _0812BFF4 - b _0812C212 -_0812BFF4: - ldr r5, _0812C044 @ =gUnknown_2023E8A - ldrb r0, [r5] - cmp r0, 0x1 - beq _0812C002 - cmp r0, 0x7 - beq _0812C002 - b _0812C212 -_0812C002: - movs r0, 0x8 - bl Alloc - adds r7, r0, 0 - movs r0, 0x8 - bl Alloc - mov r9, r0 - ldr r4, [r4] - movs r0, 0x8 - ands r4, r0 - cmp r4, 0 - bne _0812C01E - b _0812C1CC -_0812C01E: - ldr r3, _0812C048 @ =gTrainers - ldr r2, _0812C04C @ =gTrainerBattleOpponent_A - ldrh r1, [r2] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r3 - ldrb r1, [r0, 0x1] - cmp r1, 0x57 - beq _0812C060 - cmp r1, 0x57 - bgt _0812C050 - cmp r1, 0x54 - beq _0812C056 - b _0812C066 - .align 2, 0 -_0812C03C: .4byte gBattleTypeFlags -_0812C040: .4byte 0x00010202 -_0812C044: .4byte gUnknown_2023E8A -_0812C048: .4byte gTrainers -_0812C04C: .4byte gTrainerBattleOpponent_A -_0812C050: - cmp r1, 0x5A - beq _0812C05C - b _0812C066 -_0812C056: - movs r0, 0x1E - mov r10, r0 - b _0812C06A -_0812C05C: - movs r1, 0x21 - b _0812C068 -_0812C060: - movs r0, 0x20 - mov r10, r0 - b _0812C06A -_0812C066: - movs r1, 0x22 -_0812C068: - mov r10, r1 -_0812C06A: - ldrh r0, [r2] - strh r0, [r7] - ldr r0, _0812C0AC @ =gBattleTypeFlags - ldr r0, [r0] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0812C150 - ldr r0, _0812C0B0 @ =gBattleResults - ldrh r0, [r0, 0x20] - strh r0, [r7, 0x2] - ldr r4, _0812C0B4 @ =gBattleStruct - ldr r0, [r4] - movs r1, 0xC1 - lsls r1, 1 - adds r0, r1 - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _0812C0BC - ldr r2, _0812C0B8 @ =gBattleMons - ldr r0, [r4] - movs r1, 0xC1 - lsls r1, 1 - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x58 - muls r0, r1 - adds r0, r2 - b _0812C0EA - .align 2, 0 -_0812C0AC: .4byte gBattleTypeFlags -_0812C0B0: .4byte gBattleResults -_0812C0B4: .4byte gBattleStruct -_0812C0B8: .4byte gBattleMons -_0812C0BC: - ldr r5, _0812C0D8 @ =gBattleMons - movs r0, 0 - bl GetBattlerAtPosition - lsls r0, 24 - lsrs r0, 24 - movs r4, 0x58 - muls r0, r4 - adds r0, r5 - ldrh r0, [r0, 0x28] - cmp r0, 0 - beq _0812C0DC - movs r0, 0 - b _0812C0DE - .align 2, 0 -_0812C0D8: .4byte gBattleMons -_0812C0DC: - movs r0, 0x2 -_0812C0DE: - bl GetBattlerAtPosition - lsls r0, 24 - lsrs r0, 24 - muls r0, r4 - adds r0, r5 -_0812C0EA: - ldrh r0, [r0] - strh r0, [r7, 0x4] - movs r0, 0 - bl GetBattlerAtPosition - adds r4, r0, 0 - movs r0, 0x2 - bl GetBattlerAtPosition - ldr r6, _0812C14C @ =gBattleMons - lsls r4, 24 - lsrs r4, 24 - movs r5, 0x58 - adds r1, r4, 0 - muls r1, r5 - adds r1, r6 - lsls r0, 24 - lsrs r0, 24 - muls r0, r5 - adds r0, r6 - ldrh r0, [r0, 0x28] - ldrh r1, [r1, 0x28] - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - movs r0, 0 - bl GetBattlerAtPosition - adds r4, r0, 0 - movs r0, 0x2 - bl GetBattlerAtPosition - lsls r4, 24 - lsrs r4, 24 - adds r1, r4, 0 - muls r1, r5 - adds r1, r6 - lsls r0, 24 - lsrs r0, 24 - muls r0, r5 - adds r0, r6 - ldrh r0, [r0, 0x2C] - ldrh r1, [r1, 0x2C] - adds r0, r1 - lsls r0, 16 - lsrs r4, r0, 16 - b _0812C18E - .align 2, 0 -_0812C14C: .4byte gBattleMons -_0812C150: - ldr r0, _0812C1C4 @ =gBattleResults - ldrh r0, [r0, 0x20] - strh r0, [r7, 0x2] - movs r0, 0 - bl GetBattlerAtPosition - ldr r5, _0812C1C8 @ =gBattleMons - lsls r0, 24 - lsrs r0, 24 - movs r4, 0x58 - muls r0, r4 - adds r0, r5 - ldrh r0, [r0] - strh r0, [r7, 0x4] - movs r0, 0 - bl GetBattlerAtPosition - lsls r0, 24 - lsrs r0, 24 - muls r0, r4 - adds r0, r5 - ldrh r0, [r0, 0x28] - mov r8, r0 - movs r0, 0 - bl GetBattlerAtPosition - lsls r0, 24 - lsrs r0, 24 - muls r0, r4 - adds r0, r5 - ldrh r4, [r0, 0x2C] -_0812C18E: - bl sav1_map_get_name - movs r1, 0 - strb r0, [r7, 0x7] - strb r1, [r7, 0x6] - adds r0, r4, 0 - movs r1, 0x3 - bl __udivsi3 - lsls r0, 16 - lsrs r1, r0, 16 - lsls r0, r1, 1 - cmp r8, r0 - bge _0812C1AE - movs r0, 0x1 - strb r0, [r7, 0x6] -_0812C1AE: - cmp r8, r1 - bcs _0812C1B8 - ldrb r0, [r7, 0x6] - adds r0, 0x1 - strb r0, [r7, 0x6] -_0812C1B8: - mov r0, r10 - adds r1, r7, 0 - bl sub_8113550 - b _0812C206 - .align 2, 0 -_0812C1C4: .4byte gBattleResults -_0812C1C8: .4byte gBattleMons -_0812C1CC: - ldrb r0, [r5] - cmp r0, 0x1 - bne _0812C1E8 - ldr r0, _0812C1E4 @ =gEnemyParty - movs r1, 0xB - bl GetMonData - mov r1, r9 - strh r0, [r1] - strh r4, [r1, 0x2] - b _0812C1F8 - .align 2, 0 -_0812C1E4: .4byte gEnemyParty -_0812C1E8: - mov r0, r9 - strh r4, [r0] - ldr r0, _0812C220 @ =gEnemyParty - movs r1, 0xB - bl GetMonData - mov r1, r9 - strh r0, [r1, 0x2] -_0812C1F8: - bl sav1_map_get_name - mov r1, r9 - strb r0, [r1, 0x4] - movs r0, 0x1F - bl sub_8113550 -_0812C206: - adds r0, r7, 0 - bl Free - mov r0, r9 - bl Free -_0812C212: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812C220: .4byte gEnemyParty - thumb_func_end sub_812BFDC - - thumb_func_start sub_812C224 -sub_812C224: @ 812C224 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0xC - ldr r4, _0812C2B8 @ =gBattleTypeFlags - ldr r0, [r4] - movs r1, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0812C31C - movs r0, 0x18 - bl Alloc - adds r5, r0, 0 - ldr r0, _0812C2BC @ =gUnknown_2023E8A - ldrb r0, [r0] - subs r0, 0x1 - strb r0, [r5] - ldr r1, [r4] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _0812C2C4 - movs r0, 0xF - mov r8, r0 - add r4, sp, 0x4 - mov r0, sp - adds r1, r4, 0 - bl sub_812C334 - movs r3, 0 - mov r9, r4 - adds r1, r5, 0x1 - mov r12, r1 - adds r7, r5, 0 - adds r7, 0x8 - adds r6, r5, 0 - adds r6, 0xF - ldr r4, _0812C2C0 @ =gUnknown_2022744 -_0812C274: - mov r0, r12 - adds r2, r0, r3 - ldr r1, [sp] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r3, r0 - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2] - adds r2, r7, r3 - ldr r1, [sp, 0x4] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r3, r0 - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2] - adds r2, r6, r3 - mov r0, r9 - ldr r1, [r0, 0x4] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r3, r0 - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2] - adds r3, 0x1 - cmp r3, 0x6 - ble _0812C274 - b _0812C30E - .align 2, 0 -_0812C2B8: .4byte gBattleTypeFlags -_0812C2BC: .4byte gUnknown_2023E8A -_0812C2C0: .4byte gUnknown_2022744 -_0812C2C4: - movs r0, 0x1 - ands r1, r0 - cmp r1, 0 - beq _0812C2D2 - movs r1, 0xE - mov r8, r1 - b _0812C2E2 -_0812C2D2: - bl InUnionRoom - movs r1, 0xD - mov r8, r1 - cmp r0, 0x1 - bne _0812C2E2 - movs r0, 0x13 - mov r8, r0 -_0812C2E2: - movs r3, 0 - adds r4, r5, 0x1 - ldr r1, _0812C32C @ =gUnknown_2022744 - mov r12, r1 - ldr r7, _0812C330 @ =gBattleStruct - movs r6, 0x1 -_0812C2EE: - adds r2, r4, r3 - ldr r0, [r7] - adds r0, 0xB5 - ldrb r0, [r0] - adds r1, r6, 0 - eors r1, r0 - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r3, r0 - add r0, r12 - ldrb r0, [r0] - strb r0, [r2] - adds r3, 0x1 - cmp r3, 0x6 - ble _0812C2EE -_0812C30E: - mov r0, r8 - adds r1, r5, 0 - bl sub_8113550 - adds r0, r5, 0 - bl Free -_0812C31C: - add sp, 0xC - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812C32C: .4byte gUnknown_2022744 -_0812C330: .4byte gBattleStruct - thumb_func_end sub_812C224 - - thumb_func_start sub_812C334 -sub_812C334: @ 812C334 - push {r4-r6,lr} - adds r6, r0, 0 - ldr r3, _0812C35C @ =gLinkPlayers - ldr r4, _0812C360 @ =gBattleStruct - ldr r0, [r4] - adds r0, 0xB5 - ldrb r2, [r0] - lsls r0, r2, 3 - subs r0, r2 - lsls r0, 2 - adds r0, r3 - ldrb r2, [r0, 0x18] - movs r0, 0x2 - movs r5, 0 - eors r2, r0 -_0812C352: - ldrh r0, [r3, 0x18] - cmp r2, r0 - bne _0812C364 - str r5, [r6] - b _0812C370 - .align 2, 0 -_0812C35C: .4byte gLinkPlayers -_0812C360: .4byte gBattleStruct -_0812C364: - ldr r0, [r4] - adds r0, 0xB5 - ldrb r0, [r0] - cmp r5, r0 - beq _0812C370 - stm r1!, {r5} -_0812C370: - adds r3, 0x1C - adds r5, 0x1 - cmp r5, 0x3 - ble _0812C352 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_812C334 - - .align 2, 0 @ Don't pad with nop. 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 a30d8e833..6fb09f439 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: @@ -324,11 +324,11 @@ _08077A14: ldrb r0, [r0] movs r1, 0 bl ActionSelectionCreateCursorAt - ldr r0, _08077A54 @ =gUnknown_3003F3C + ldr r0, _08077A54 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08077A8A - ldr r0, _08077A58 @ =gUnknown_3003F64 + ldr r0, _08077A58 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08077A8A @@ -342,8 +342,8 @@ _08077A44: .4byte gBattlerPartyIndexes _08077A48: .4byte gEnemyParty _08077A4C: .4byte gUnknown_2023FF8 _08077A50: .4byte gBattlerInMenuId -_08077A54: .4byte gUnknown_3003F3C -_08077A58: .4byte gUnknown_3003F64 +_08077A54: .4byte gWirelessCommType +_08077A58: .4byte gReceivedRemoteLinkPlayers _08077A5C: ldr r0, _08077A9C @ =sub_80116F4 bl SetVBlankCallback @@ -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/rom6.s b/asm/rom6.s index 76da35ac8..06c2d30a2 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -31,7 +31,7 @@ npc_before_player_of_type: @ 80C97A8 ldrb r0, [r2, 0x5] cmp r0, r5 bne _080C97F4 - ldr r1, _080C97F0 @ =gUnknown_20370D2 + ldr r1, _080C97F0 @ =gSpecialVar_LastTalked ldrb r0, [r2, 0x8] strh r0, [r1] movs r0, 0x1 @@ -39,7 +39,7 @@ npc_before_player_of_type: @ 80C97A8 .align 2, 0 _080C97E8: .4byte gUnknown_2039A04 _080C97EC: .4byte gMapObjects -_080C97F0: .4byte gUnknown_20370D2 +_080C97F0: .4byte gSpecialVar_LastTalked _080C97F4: movs r0, 0 _080C97F6: @@ -73,7 +73,7 @@ task08_080C9820: @ 80C9820 lsrs r5, r0, 24 adds r6, r5, 0 bl ScriptContext2_Enable - ldr r1, _080C9874 @ =gUnknown_2037078 + ldr r1, _080C9874 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrb r1, [r1, 0x5] @@ -107,7 +107,7 @@ _080C9856: ldr r0, _080C9884 @ =sub_80C98FC b _080C98A0 .align 2, 0 -_080C9874: .4byte gUnknown_2037078 +_080C9874: .4byte gPlayerAvatar _080C9878: .4byte gMapObjects _080C987C: .4byte gMapHeader _080C9880: .4byte gTasks @@ -139,7 +139,7 @@ sub_80C98B0: @ 80C98B0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080C98EC @ =gUnknown_2037078 + ldr r0, _080C98EC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -165,7 +165,7 @@ _080C98E4: pop {r0} bx r0 .align 2, 0 -_080C98EC: .4byte gUnknown_2037078 +_080C98EC: .4byte gPlayerAvatar _080C98F0: .4byte gMapObjects _080C98F4: .4byte gTasks _080C98F8: .4byte sub_80C98FC @@ -183,7 +183,7 @@ sub_80C98FC: @ 80C98FC cmp r4, 0 bne _080C9980 bl player_get_direction_lower_nybble - ldr r6, _080C9988 @ =gUnknown_20386E0 + ldr r6, _080C9988 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r6, 0x4] @@ -207,7 +207,7 @@ _080C9934: movs r0, 0x3 str r0, [r6, 0x8] _080C993C: - ldr r5, _080C998C @ =gUnknown_2037078 + ldr r5, _080C998C @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -242,8 +242,8 @@ _080C9980: pop {r0} bx r0 .align 2, 0 -_080C9988: .4byte gUnknown_20386E0 -_080C998C: .4byte gUnknown_2037078 +_080C9988: .4byte gFieldEffectArguments +_080C998C: .4byte gPlayerAvatar _080C9990: .4byte gMapObjects _080C9994: .4byte gSprites _080C9998: .4byte gTasks @@ -266,7 +266,7 @@ sub_80C99A0: @ 80C99A0 ldrh r0, [r0, 0x1A] orrs r1, r0 bl _call_via_r1 - ldr r1, _080C99D4 @ =gUnknown_2037078 + ldr r1, _080C99D4 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] adds r0, r4, 0 @@ -276,7 +276,7 @@ sub_80C99A0: @ 80C99A0 bx r0 .align 2, 0 _080C99D0: .4byte gTasks -_080C99D4: .4byte gUnknown_2037078 +_080C99D4: .4byte gPlayerAvatar thumb_func_end sub_80C99A0 thumb_func_start SetUpFieldMove_RockSmash @@ -312,7 +312,7 @@ _080C9A0C: .4byte sub_80C9A10 sub_80C9A10: @ 80C9A10 push {lr} bl GetCursorSelectionMonId - ldr r1, _080C9A28 @ =gUnknown_20386E0 + ldr r1, _080C9A28 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -321,7 +321,7 @@ sub_80C9A10: @ 80C9A10 pop {r0} bx r0 .align 2, 0 -_080C9A28: .4byte gUnknown_20386E0 +_080C9A28: .4byte gFieldEffectArguments _080C9A2C: .4byte gUnknown_81BE064 thumb_func_end sub_80C9A10 @@ -397,14 +397,14 @@ hm2_dig: @ 80C9AAC movs r0, 0x26 bl FieldEffectStart bl GetCursorSelectionMonId - ldr r1, _080C9AC8 @ =gUnknown_20386E0 + ldr r1, _080C9AC8 @ =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080C9AC8: .4byte gUnknown_20386E0 +_080C9AC8: .4byte gFieldEffectArguments thumb_func_end hm2_dig thumb_func_start sub_80C9ACC diff --git a/asm/roulette_util.s b/asm/roulette_util.s index 8e60a9fe2..532bf4684 100644 --- a/asm/roulette_util.s +++ b/asm/roulette_util.s @@ -151,9 +151,9 @@ _080D8CD8: ldrh r0, [r5, 0x6] add r0, r12 lsls r0, 1 - ldr r1, _080D8CFC @ =gUnknown_20375F8 + ldr r1, _080D8CFC @ =gPlttBufferFaded adds r3, r0, r1 - ldr r1, _080D8D00 @ =gUnknown_20371F8 + ldr r1, _080D8D00 @ =gPlttBufferUnfaded adds r6, r0, r1 ldrb r0, [r5] lsls r0, 25 @@ -165,8 +165,8 @@ _080D8CD8: b _080D8E4E .align 2, 0 _080D8CF8: .4byte 0xfffffc1f -_080D8CFC: .4byte gUnknown_20375F8 -_080D8D00: .4byte gUnknown_20371F8 +_080D8CFC: .4byte gPlttBufferFaded +_080D8D00: .4byte gPlttBufferUnfaded _080D8D04: ldr r0, [r3] lsls r2, r0, 27 @@ -422,7 +422,7 @@ _080D8ECE: ldrb r0, [r3, 0x8] cmp r2, r0 bcs _080D8EEE - ldr r4, _080D8EF8 @ =gUnknown_20375F8 + ldr r4, _080D8EF8 @ =gPlttBufferFaded _080D8ED6: ldrh r0, [r3, 0x6] adds r0, r2 @@ -443,13 +443,13 @@ _080D8EEE: adds r1, 0x1 b _080D8F28 .align 2, 0 -_080D8EF8: .4byte gUnknown_20375F8 +_080D8EF8: .4byte gPlttBufferFaded _080D8EFC: ldrb r0, [r3, 0x8] cmp r2, r0 bcs _080D8F20 - ldr r5, _080D8F40 @ =gUnknown_20375F8 - ldr r4, _080D8F44 @ =gUnknown_20371F8 + ldr r5, _080D8F40 @ =gPlttBufferFaded + ldr r4, _080D8F44 @ =gPlttBufferUnfaded _080D8F06: ldrh r0, [r3, 0x6] adds r0, r2 @@ -483,8 +483,8 @@ _080D8F36: pop {r1} bx r1 .align 2, 0 -_080D8F40: .4byte gUnknown_20375F8 -_080D8F44: .4byte gUnknown_20371F8 +_080D8F40: .4byte gPlttBufferFaded +_080D8F44: .4byte gPlttBufferUnfaded thumb_func_end sub_80D8EB8 thumb_func_start task_tutorial_controls_fadein @@ -625,9 +625,9 @@ _080D9016: beq _080D907E ldrh r1, [r4, 0xA] lsls r1, 1 - ldr r0, _080D9074 @ =gUnknown_20375F8 + ldr r0, _080D9074 @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _080D9078 @ =gUnknown_20371F8 + ldr r2, _080D9078 @ =gPlttBufferUnfaded adds r1, r2 ldrb r2, [r4, 0xC] lsls r2, 1 @@ -651,8 +651,8 @@ _080D9016: strb r0, [r4, 0x7] b _080D907E .align 2, 0 -_080D9074: .4byte gUnknown_20375F8 -_080D9078: .4byte gUnknown_20371F8 +_080D9074: .4byte gPlttBufferFaded +_080D9078: .4byte gPlttBufferUnfaded _080D907C: strb r3, [r4, 0x7] _080D907E: @@ -787,8 +787,8 @@ sub_80D9140: @ 80D9140 adds r0, r2, r0 cmp r2, r0 bge _080D9182 - ldr r5, _080D91B4 @ =gUnknown_20375F8 - ldr r3, _080D91B8 @ =gUnknown_20371F8 + ldr r5, _080D91B4 @ =gPlttBufferFaded + ldr r3, _080D91B8 @ =gPlttBufferUnfaded _080D9168: lsls r0, r2, 1 adds r1, r0, r5 @@ -829,8 +829,8 @@ _080D9182: pop {r0} bx r0 .align 2, 0 -_080D91B4: .4byte gUnknown_20375F8 -_080D91B8: .4byte gUnknown_20371F8 +_080D91B4: .4byte gPlttBufferFaded +_080D91B8: .4byte gPlttBufferUnfaded thumb_func_end sub_80D9140 thumb_func_start sub_80D91BC @@ -992,8 +992,8 @@ sub_80D9294: @ 80D9294 adds r0, r2, r0 cmp r2, r0 bge _080D92FA - ldr r5, _080D9314 @ =gUnknown_20375F8 - ldr r4, _080D9318 @ =gUnknown_20371F8 + ldr r5, _080D9314 @ =gPlttBufferFaded + ldr r4, _080D9318 @ =gPlttBufferUnfaded _080D92E0: lsls r0, r2, 1 adds r1, r0, r5 @@ -1022,8 +1022,8 @@ _080D92FA: strh r0, [r2] b _080D93A6 .align 2, 0 -_080D9314: .4byte gUnknown_20375F8 -_080D9318: .4byte gUnknown_20371F8 +_080D9314: .4byte gPlttBufferFaded +_080D9318: .4byte gPlttBufferUnfaded _080D931C: movs r0, 0x1 mov r9, r0 @@ -1066,8 +1066,8 @@ _080D9350: adds r0, r2, r0 cmp r2, r0 bge _080D9386 - ldr r6, _080D93B4 @ =gUnknown_20375F8 - ldr r4, _080D93B8 @ =gUnknown_20371F8 + ldr r6, _080D93B4 @ =gPlttBufferFaded + ldr r4, _080D93B8 @ =gPlttBufferUnfaded _080D936C: lsls r0, r2, 1 adds r1, r0, r6 @@ -1109,8 +1109,8 @@ _080D93A6: pop {r0} bx r0 .align 2, 0 -_080D93B4: .4byte gUnknown_20375F8 -_080D93B8: .4byte gUnknown_20371F8 +_080D93B4: .4byte gPlttBufferFaded +_080D93B8: .4byte gPlttBufferUnfaded thumb_func_end sub_80D9294 thumb_func_start sub_80D93BC @@ -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 22337b6f3..e8ffcf3ab 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -46,17 +46,17 @@ sub_8069EFC: @ 8069EFC bl ScriptReadHalfword lsls r0, 16 lsrs r0, 14 - ldr r1, _08069F18 @ =gUnknown_815FD60 + ldr r1, _08069F18 @ =gSpecials adds r1, r0, r1 - ldr r0, _08069F1C @ =gUnknown_8160450 + ldr r0, _08069F1C @ =gStdScripts cmp r1, r0 bcs _08069F20 ldr r0, [r1] bl _call_via_r0 b _08069F2C .align 2, 0 -_08069F18: .4byte gUnknown_815FD60 -_08069F1C: .4byte gUnknown_8160450 +_08069F18: .4byte gSpecials +_08069F1C: .4byte gStdScripts _08069F20: ldr r0, _08069F34 @ =gUnknown_83A725C "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c" ldr r2, _08069F38 @ =gUnknown_83A7290 "0" @@ -79,15 +79,15 @@ sub_8069F3C: @ 8069F3C bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r5, r0, 0 adds r0, r4, 0 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 14 - ldr r1, _08069F6C @ =gUnknown_815FD60 + ldr r1, _08069F6C @ =gSpecials adds r1, r0, r1 - ldr r0, _08069F70 @ =gUnknown_8160450 + ldr r0, _08069F70 @ =gStdScripts cmp r1, r0 bcs _08069F74 ldr r0, [r1] @@ -95,8 +95,8 @@ sub_8069F3C: @ 8069F3C strh r0, [r5] b _08069F80 .align 2, 0 -_08069F6C: .4byte gUnknown_815FD60 -_08069F70: .4byte gUnknown_8160450 +_08069F6C: .4byte gSpecials +_08069F70: .4byte gStdScripts _08069F74: ldr r0, _08069F88 @ =gUnknown_83A725C "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c" ldr r1, _08069F8C @ =0x00000107 @@ -368,7 +368,7 @@ ScrCmd_gotostd: @ 806A150 adds r0, 0x1 str r0, [r2, 0x8] lsls r1, 2 - ldr r0, _0806A178 @ =gUnknown_8160450 + ldr r0, _0806A178 @ =gStdScripts adds r1, r0 ldr r0, _0806A17C @ =gUnknown_8160478 cmp r1, r0 @@ -381,7 +381,7 @@ _0806A170: pop {r1} bx r1 .align 2, 0 -_0806A178: .4byte gUnknown_8160450 +_0806A178: .4byte gStdScripts _0806A17C: .4byte gUnknown_8160478 thumb_func_end ScrCmd_gotostd @@ -394,7 +394,7 @@ ScrCmd_callstd: @ 806A180 adds r0, 0x1 str r0, [r2, 0x8] lsls r1, 2 - ldr r0, _0806A1A8 @ =gUnknown_8160450 + ldr r0, _0806A1A8 @ =gStdScripts adds r1, r0 ldr r0, _0806A1AC @ =gUnknown_8160478 cmp r1, r0 @@ -407,7 +407,7 @@ _0806A1A0: pop {r1} bx r1 .align 2, 0 -_0806A1A8: .4byte gUnknown_8160450 +_0806A1A8: .4byte gStdScripts _0806A1AC: .4byte gUnknown_8160478 thumb_func_end ScrCmd_callstd @@ -432,7 +432,7 @@ ScrCmd_gotostd_if: @ 806A1B0 cmp r0, 0x1 bne _0806A1E8 lsls r0, r4, 2 - ldr r1, _0806A1F4 @ =gUnknown_8160450 + ldr r1, _0806A1F4 @ =gStdScripts adds r1, r0, r1 ldr r0, _0806A1F8 @ =gUnknown_8160478 cmp r1, r0 @@ -447,7 +447,7 @@ _0806A1E8: bx r1 .align 2, 0 _0806A1F0: .4byte gUnknown_83A7248 -_0806A1F4: .4byte gUnknown_8160450 +_0806A1F4: .4byte gStdScripts _0806A1F8: .4byte gUnknown_8160478 thumb_func_end ScrCmd_gotostd_if @@ -472,7 +472,7 @@ ScrCmd_callstd_if: @ 806A1FC cmp r0, 0x1 bne _0806A234 lsls r0, r4, 2 - ldr r1, _0806A240 @ =gUnknown_8160450 + ldr r1, _0806A240 @ =gStdScripts adds r1, r0, r1 ldr r0, _0806A244 @ =gUnknown_8160478 cmp r1, r0 @@ -487,7 +487,7 @@ _0806A234: bx r1 .align 2, 0 _0806A23C: .4byte gUnknown_83A7248 -_0806A240: .4byte gUnknown_8160450 +_0806A240: .4byte gStdScripts _0806A244: .4byte gUnknown_8160478 thumb_func_end ScrCmd_callstd_if @@ -525,7 +525,7 @@ ScrCmd_setmysteryeventstatus: @ 806A274 adds r1, 0x1 str r1, [r0, 0x8] adds r0, r2, 0 - bl sub_80DA8E8 + bl SetMysteryEventScriptStatus movs r0, 0 pop {r1} bx r1 @@ -692,7 +692,7 @@ ScrCmd_setvar: @ 806A390 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r4, r0, 0 adds r0, r5, 0 bl ScriptReadHalfword @@ -710,13 +710,13 @@ ScrCmd_copyvar: @ 806A3B4 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r5, r0, 0 adds r0, r4, 0 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer ldrh r0, [r0] strh r0, [r5] movs r0, 0 @@ -732,7 +732,7 @@ ScrCmd_setorcopyvar: @ 806A3E0 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r5, r0, 0 adds r0, r4, 0 bl ScriptReadHalfword @@ -909,7 +909,7 @@ ScrCmd_compare_var_to_value: @ 806A520 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer ldrh r5, [r0] adds r0, r4, 0 bl ScriptReadHalfword @@ -932,13 +932,13 @@ ScrCmd_compare_var_to_var: @ 806A550 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r5, r0, 0 adds r0, r4, 0 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer ldrh r2, [r5] ldrh r1, [r0] adds r0, r2, 0 @@ -957,7 +957,7 @@ ScrCmd_addvar: @ 806A584 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r4, r0, 0 adds r0, r5, 0 bl ScriptReadHalfword @@ -977,7 +977,7 @@ ScrCmd_subvar: @ 806A5AC bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r5, r0, 0 adds r0, r4, 0 bl ScriptReadHalfword @@ -1003,7 +1003,7 @@ ScrCmd_random: @ 806A5DC adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r5, _0806A60C @ =gUnknown_20370D0 + ldr r5, _0806A60C @ =gSpecialVar_Result bl Random lsls r0, 16 lsrs r0, 16 @@ -1015,7 +1015,7 @@ ScrCmd_random: @ 806A5DC pop {r1} bx r1 .align 2, 0 -_0806A60C: .4byte gUnknown_20370D0 +_0806A60C: .4byte gSpecialVar_Result thumb_func_end ScrCmd_random thumb_func_start sub_806A610 @@ -1035,7 +1035,7 @@ sub_806A610: @ 806A610 lsrs r0, 16 bl VarGet adds r1, r0, 0 - ldr r5, _0806A658 @ =gUnknown_20370D0 + ldr r5, _0806A658 @ =gSpecialVar_Result lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 @@ -1050,7 +1050,7 @@ sub_806A610: @ 806A610 pop {r1} bx r1 .align 2, 0 -_0806A658: .4byte gUnknown_20370D0 +_0806A658: .4byte gSpecialVar_Result thumb_func_end sub_806A610 thumb_func_start ScrCmd_takeitem @@ -1070,7 +1070,7 @@ ScrCmd_takeitem: @ 806A65C lsrs r0, 16 bl VarGet adds r1, r0, 0 - ldr r5, _0806A69C @ =gUnknown_20370D0 + ldr r5, _0806A69C @ =gSpecialVar_Result lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 @@ -1083,7 +1083,7 @@ ScrCmd_takeitem: @ 806A65C pop {r1} bx r1 .align 2, 0 -_0806A69C: .4byte gUnknown_20370D0 +_0806A69C: .4byte gSpecialVar_Result thumb_func_end ScrCmd_takeitem thumb_func_start sub_806A6A0 @@ -1103,7 +1103,7 @@ sub_806A6A0: @ 806A6A0 lsrs r0, 16 bl VarGet adds r1, r0, 0 - ldr r5, _0806A6E0 @ =gUnknown_20370D0 + ldr r5, _0806A6E0 @ =gSpecialVar_Result lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 @@ -1116,7 +1116,7 @@ sub_806A6A0: @ 806A6A0 pop {r1} bx r1 .align 2, 0 -_0806A6E0: .4byte gUnknown_20370D0 +_0806A6E0: .4byte gSpecialVar_Result thumb_func_end sub_806A6A0 thumb_func_start sub_806A6E4 @@ -1136,7 +1136,7 @@ sub_806A6E4: @ 806A6E4 lsrs r0, 16 bl VarGet adds r1, r0, 0 - ldr r5, _0806A724 @ =gUnknown_20370D0 + ldr r5, _0806A724 @ =gSpecialVar_Result lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 @@ -1149,7 +1149,7 @@ sub_806A6E4: @ 806A6E4 pop {r1} bx r1 .align 2, 0 -_0806A724: .4byte gUnknown_20370D0 +_0806A724: .4byte gSpecialVar_Result thumb_func_end sub_806A6E4 thumb_func_start ScrCmd_checkitemtype @@ -1161,7 +1161,7 @@ ScrCmd_checkitemtype: @ 806A728 bl VarGet lsls r0, 16 lsrs r0, 16 - ldr r4, _0806A750 @ =gUnknown_20370D0 + ldr r4, _0806A750 @ =gSpecialVar_Result bl GetPocketByItemId lsls r0, 24 lsrs r0, 24 @@ -1171,7 +1171,7 @@ ScrCmd_checkitemtype: @ 806A728 pop {r1} bx r1 .align 2, 0 -_0806A750: .4byte gUnknown_20370D0 +_0806A750: .4byte gSpecialVar_Result thumb_func_end ScrCmd_checkitemtype thumb_func_start ScrCmd_givepcitem @@ -1193,7 +1193,7 @@ ScrCmd_givepcitem: @ 806A754 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r5, _0806A794 @ =gUnknown_20370D0 + ldr r5, _0806A794 @ =gSpecialVar_Result adds r0, r4, 0 bl sub_809A3C8 lsls r0, 24 @@ -1204,7 +1204,7 @@ ScrCmd_givepcitem: @ 806A754 pop {r1} bx r1 .align 2, 0 -_0806A794: .4byte gUnknown_20370D0 +_0806A794: .4byte gSpecialVar_Result thumb_func_end ScrCmd_givepcitem thumb_func_start ScrCmd_checkpcitem @@ -1226,7 +1226,7 @@ ScrCmd_checkpcitem: @ 806A798 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r5, _0806A7D8 @ =gUnknown_20370D0 + ldr r5, _0806A7D8 @ =gSpecialVar_Result adds r0, r4, 0 bl sub_809A374 lsls r0, 24 @@ -1237,7 +1237,7 @@ ScrCmd_checkpcitem: @ 806A798 pop {r1} bx r1 .align 2, 0 -_0806A7D8: .4byte gUnknown_20370D0 +_0806A7D8: .4byte gSpecialVar_Result thumb_func_end ScrCmd_checkpcitem thumb_func_start sub_806A7DC @@ -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: @@ -1540,19 +1540,19 @@ sub_806A9D8: @ 806A9D8 thumb_func_start sub_806A9DC sub_806A9DC: @ 806A9DC - ldr r0, _0806A9F0 @ =gUnknown_20370B8 + ldr r0, _0806A9F0 @ =gSpecialVar_0x8000 movs r1, 0 strh r1, [r0] - ldr r0, _0806A9F4 @ =gUnknown_20370BA + ldr r0, _0806A9F4 @ =gSpecialVar_0x8001 strh r1, [r0] - ldr r0, _0806A9F8 @ =gUnknown_20370BC + ldr r0, _0806A9F8 @ =gSpecialVar_0x8002 strh r1, [r0] movs r0, 0 bx lr .align 2, 0 -_0806A9F0: .4byte gUnknown_20370B8 -_0806A9F4: .4byte gUnknown_20370BA -_0806A9F8: .4byte gUnknown_20370BC +_0806A9F0: .4byte gSpecialVar_0x8000 +_0806A9F4: .4byte gSpecialVar_0x8001 +_0806A9F8: .4byte gSpecialVar_0x8002 thumb_func_end sub_806A9DC thumb_func_start ScrCmd_setweather @@ -2319,13 +2319,13 @@ ScrCmd_getplayerxy: @ 806B010 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r5, r0, 0 adds r0, r4, 0 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer ldr r2, _0806B048 @ =gSaveBlock1Ptr ldr r1, [r2] ldrh r1, [r1] @@ -2344,7 +2344,7 @@ _0806B048: .4byte gSaveBlock1Ptr thumb_func_start ScrCmd_getpartysize ScrCmd_getpartysize: @ 806B04C push {r4,lr} - ldr r4, _0806B064 @ =gUnknown_20370D0 + ldr r4, _0806B064 @ =gSpecialVar_Result bl CalculatePlayerPartyCount lsls r0, 24 lsrs r0, 24 @@ -2354,7 +2354,7 @@ ScrCmd_getpartysize: @ 806B04C pop {r1} bx r1 .align 2, 0 -_0806B064: .4byte gUnknown_20370D0 +_0806B064: .4byte gSpecialVar_Result thumb_func_end ScrCmd_getpartysize thumb_func_start ScrCmd_playse @@ -3569,7 +3569,7 @@ sub_806B96C: @ 806B96C ands r0, r1 cmp r0, 0 beq _0806B990 - ldr r0, _0806B98C @ =gUnknown_20370D4 + ldr r0, _0806B98C @ =gSpecialVar_Facing ldrh r0, [r0] cmp r0, 0x2 beq _0806B990 @@ -3577,49 +3577,49 @@ sub_806B96C: @ 806B96C b _0806BA36 .align 2, 0 _0806B988: .4byte gMain -_0806B98C: .4byte gUnknown_20370D4 +_0806B98C: .4byte gSpecialVar_Facing _0806B990: ldrh r1, [r2, 0x2C] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _0806B9AC - ldr r0, _0806B9A8 @ =gUnknown_20370D4 + ldr r0, _0806B9A8 @ =gSpecialVar_Facing ldrh r0, [r0] cmp r0, 0x1 beq _0806B9AC movs r0, 0x2 b _0806BA36 .align 2, 0 -_0806B9A8: .4byte gUnknown_20370D4 +_0806B9A8: .4byte gSpecialVar_Facing _0806B9AC: ldrh r1, [r2, 0x2C] movs r0, 0x20 ands r0, r1 cmp r0, 0 beq _0806B9C8 - ldr r0, _0806B9C4 @ =gUnknown_20370D4 + ldr r0, _0806B9C4 @ =gSpecialVar_Facing ldrh r0, [r0] cmp r0, 0x3 beq _0806B9C8 movs r0, 0x3 b _0806BA36 .align 2, 0 -_0806B9C4: .4byte gUnknown_20370D4 +_0806B9C4: .4byte gSpecialVar_Facing _0806B9C8: ldrh r1, [r2, 0x2C] movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _0806B9E4 - ldr r0, _0806B9E0 @ =gUnknown_20370D4 + ldr r0, _0806B9E0 @ =gSpecialVar_Facing ldrh r0, [r0] cmp r0, 0x4 beq _0806B9E4 movs r0, 0x4 b _0806BA36 .align 2, 0 -_0806B9E0: .4byte gUnknown_20370D4 +_0806B9E0: .4byte gSpecialVar_Facing _0806B9E4: ldrh r1, [r2, 0x2E] movs r0, 0x80 @@ -3974,7 +3974,7 @@ sub_806BC40: @ 806BC40 bne _0806BC50 ldr r1, [r4, 0x64] _0806BC50: - ldr r4, _0806BC68 @ =gUnknown_20370C0 + ldr r4, _0806BC68 @ =gSpecialVar_0x8004 movs r2, 0x1 negs r2, r2 movs r0, 0x6 @@ -3985,7 +3985,7 @@ _0806BC50: pop {r1} bx r1 .align 2, 0 -_0806BC68: .4byte gUnknown_20370C0 +_0806BC68: .4byte gSpecialVar_0x8004 thumb_func_end sub_806BC40 thumb_func_start ScrCmd_vmessage @@ -4243,7 +4243,7 @@ ScrCmd_buffermovename: @ 806BE50 ldr r2, [r4] movs r1, 0xD muls r1, r0 - ldr r0, _0806BE8C @ =gUnknown_8247094 + ldr r0, _0806BE8C @ =gMoveNames adds r1, r0 adds r0, r2, 0 bl StringCopy @@ -4253,7 +4253,7 @@ ScrCmd_buffermovename: @ 806BE50 bx r1 .align 2, 0 _0806BE88: .4byte gUnknown_83A7294 -_0806BE8C: .4byte gUnknown_8247094 +_0806BE8C: .4byte gMoveNames thumb_func_end ScrCmd_buffermovename thumb_func_start ScrCmd_buffernumberstring @@ -4453,7 +4453,7 @@ ScrCmd_givemon: @ 806BFD0 ldrb r2, [r1] adds r1, 0x1 str r1, [r4, 0x8] - ldr r4, _0806C04C @ =gUnknown_20370D0 + ldr r4, _0806C04C @ =gSpecialVar_Result str r0, [sp] str r2, [sp, 0x4] adds r0, r6, 0 @@ -4473,7 +4473,7 @@ ScrCmd_givemon: @ 806BFD0 pop {r1} bx r1 .align 2, 0 -_0806C04C: .4byte gUnknown_20370D0 +_0806C04C: .4byte gSpecialVar_Result thumb_func_end ScrCmd_givemon thumb_func_start ScrCmd_giveegg @@ -4485,7 +4485,7 @@ ScrCmd_giveegg: @ 806C050 bl VarGet lsls r0, 16 lsrs r0, 16 - ldr r4, _0806C078 @ =gUnknown_20370D0 + ldr r4, _0806C078 @ =gSpecialVar_Result bl sub_80A01AC lsls r0, 24 lsrs r0, 24 @@ -4495,7 +4495,7 @@ ScrCmd_giveegg: @ 806C050 pop {r1} bx r1 .align 2, 0 -_0806C078: .4byte gUnknown_20370D0 +_0806C078: .4byte gSpecialVar_Result thumb_func_end ScrCmd_giveegg thumb_func_start ScrCmd_setmonmove @@ -4527,13 +4527,13 @@ ScrCmd_checkpartymove: @ 806C0A8 bl ScriptReadHalfword lsls r0, 16 lsrs r7, r0, 16 - ldr r1, _0806C0BC @ =gUnknown_20370D0 + ldr r1, _0806C0BC @ =gSpecialVar_Result movs r0, 0x6 strh r0, [r1] movs r6, 0 b _0806C0F6 .align 2, 0 -_0806C0BC: .4byte gUnknown_20370D0 +_0806C0BC: .4byte gSpecialVar_Result _0806C0C0: adds r0, r4, 0 movs r1, 0x2D @@ -4547,14 +4547,14 @@ _0806C0C0: lsrs r0, 24 cmp r0, 0x1 bne _0806C0F0 - ldr r0, _0806C0E8 @ =gUnknown_20370D0 + ldr r0, _0806C0E8 @ =gSpecialVar_Result strh r6, [r0] - ldr r0, _0806C0EC @ =gUnknown_20370C0 + ldr r0, _0806C0EC @ =gSpecialVar_0x8004 strh r5, [r0] b _0806C116 .align 2, 0 -_0806C0E8: .4byte gUnknown_20370D0 -_0806C0EC: .4byte gUnknown_20370C0 +_0806C0E8: .4byte gSpecialVar_Result +_0806C0EC: .4byte gSpecialVar_0x8004 _0806C0F0: adds r0, r6, 0x1 lsls r0, 24 @@ -4652,7 +4652,7 @@ ScrCmd_checkmoney: @ 806C18C str r0, [r4, 0x8] cmp r1, 0 bne _0806C1BA - ldr r4, _0806C1C4 @ =gUnknown_20370D0 + ldr r4, _0806C1C4 @ =gSpecialVar_Result ldr r0, _0806C1C8 @ =gSaveBlock1Ptr ldr r0, [r0] movs r1, 0xA4 @@ -4669,7 +4669,7 @@ _0806C1BA: pop {r1} bx r1 .align 2, 0 -_0806C1C4: .4byte gUnknown_20370D0 +_0806C1C4: .4byte gSpecialVar_Result _0806C1C8: .4byte gSaveBlock1Ptr thumb_func_end ScrCmd_checkmoney @@ -5060,7 +5060,7 @@ ScrCmd_setfieldeffectarg: @ 806C458 lsls r0, 16 lsrs r0, 16 bl VarGet - ldr r1, _0806C484 @ =gUnknown_20386E0 + ldr r1, _0806C484 @ =gFieldEffectArguments lsls r4, 2 adds r4, r1 lsls r0, 16 @@ -5071,7 +5071,7 @@ ScrCmd_setfieldeffectarg: @ 806C458 pop {r1} bx r1 .align 2, 0 -_0806C484: .4byte gUnknown_20386E0 +_0806C484: .4byte gFieldEffectArguments thumb_func_end ScrCmd_setfieldeffectarg thumb_func_start WaitForFieldEffectFinish @@ -5133,7 +5133,7 @@ ScrCmd_setrespawn: @ 806C4D4 thumb_func_start ScrCmd_checkplayergender ScrCmd_checkplayergender: @ 806C4F0 - ldr r1, _0806C500 @ =gUnknown_20370D0 + ldr r1, _0806C500 @ =gSpecialVar_Result ldr r0, _0806C504 @ =gSaveBlock2Ptr ldr r0, [r0] ldrb r0, [r0, 0x8] @@ -5141,7 +5141,7 @@ ScrCmd_checkplayergender: @ 806C4F0 movs r0, 0 bx lr .align 2, 0 -_0806C500: .4byte gUnknown_20370D0 +_0806C500: .4byte gSpecialVar_Result _0806C504: .4byte gSaveBlock2Ptr thumb_func_end ScrCmd_checkplayergender @@ -5428,7 +5428,7 @@ ScrCmd_checkcoins: @ 806C72C bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_806E454 + bl GetVarPointer adds r4, r0, 0 bl GetCoins strh r0, [r4] @@ -5452,13 +5452,13 @@ ScrCmd_givecoins: @ 806C74C lsrs r0, 24 cmp r0, 0x1 bne _0806C774 - ldr r1, _0806C770 @ =gUnknown_20370D0 + ldr r1, _0806C770 @ =gSpecialVar_Result movs r0, 0 b _0806C778 .align 2, 0 -_0806C770: .4byte gUnknown_20370D0 +_0806C770: .4byte gSpecialVar_Result _0806C774: - ldr r1, _0806C780 @ =gUnknown_20370D0 + ldr r1, _0806C780 @ =gSpecialVar_Result movs r0, 0x1 _0806C778: strh r0, [r1] @@ -5466,7 +5466,7 @@ _0806C778: pop {r1} bx r1 .align 2, 0 -_0806C780: .4byte gUnknown_20370D0 +_0806C780: .4byte gSpecialVar_Result thumb_func_end ScrCmd_givecoins thumb_func_start ScrCmd_takecoins @@ -5483,13 +5483,13 @@ ScrCmd_takecoins: @ 806C784 lsrs r0, 24 cmp r0, 0x1 bne _0806C7AC - ldr r1, _0806C7A8 @ =gUnknown_20370D0 + ldr r1, _0806C7A8 @ =gSpecialVar_Result movs r0, 0 b _0806C7B0 .align 2, 0 -_0806C7A8: .4byte gUnknown_20370D0 +_0806C7A8: .4byte gSpecialVar_Result _0806C7AC: - ldr r1, _0806C7B8 @ =gUnknown_20370D0 + ldr r1, _0806C7B8 @ =gSpecialVar_Result movs r0, 0x1 _0806C7B0: strh r0, [r1] @@ -5497,7 +5497,7 @@ _0806C7B0: pop {r1} bx r1 .align 2, 0 -_0806C7B8: .4byte gUnknown_20370D0 +_0806C7B8: .4byte gSpecialVar_Result thumb_func_end ScrCmd_takecoins thumb_func_start sub_806C7BC @@ -5555,7 +5555,7 @@ ScrCmd_checkmonobedience: @ 806C80C bl VarGet lsls r0, 16 lsrs r0, 16 - ldr r4, _0806C83C @ =gUnknown_20370D0 + ldr r4, _0806C83C @ =gSpecialVar_Result movs r1, 0x64 muls r0, r1 ldr r1, _0806C840 @ =gPlayerParty @@ -5569,7 +5569,7 @@ ScrCmd_checkmonobedience: @ 806C80C pop {r1} bx r1 .align 2, 0 -_0806C83C: .4byte gUnknown_20370D0 +_0806C83C: .4byte gSpecialVar_Result _0806C840: .4byte gPlayerParty thumb_func_end ScrCmd_checkmonobedience diff --git a/asm/script_menu.s b/asm/script_menu.s index 7707a7f52..f1127591d 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -78,7 +78,7 @@ ScriptMenu_Multichoice: @ 809C9B4 lsrs r0, 24 cmp r0, 0x1 beq _0809C9F8 - ldr r0, _0809C9F4 @ =gUnknown_20370D0 + ldr r0, _0809C9F4 @ =gSpecialVar_Result movs r1, 0xFF strh r1, [r0] movs r0, 0 @@ -92,7 +92,7 @@ ScriptMenu_Multichoice: @ 809C9B4 b _0809C9FA .align 2, 0 _0809C9F0: .4byte sub_809CC98 -_0809C9F4: .4byte gUnknown_20370D0 +_0809C9F4: .4byte gSpecialVar_Result _0809C9F8: movs r0, 0 _0809C9FA: @@ -126,7 +126,7 @@ ScriptMenu_MultichoiceWithDefault: @ 809CA04 lsrs r0, 24 cmp r0, 0x1 beq _0809CA54 - ldr r1, _0809CA50 @ =gUnknown_20370D0 + ldr r1, _0809CA50 @ =gSpecialVar_Result movs r0, 0xFF strh r0, [r1] str r4, [sp] @@ -139,7 +139,7 @@ ScriptMenu_MultichoiceWithDefault: @ 809CA04 b _0809CA56 .align 2, 0 _0809CA4C: .4byte sub_809CC98 -_0809CA50: .4byte gUnknown_20370D0 +_0809CA50: .4byte gSpecialVar_Result _0809CA54: movs r0, 0 _0809CA56: @@ -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 @@ -506,15 +506,15 @@ _0809CCF8: bne _0809CD3C movs r0, 0x5 bl PlaySE - ldr r1, _0809CD24 @ =gUnknown_20370D0 + ldr r1, _0809CD24 @ =gSpecialVar_Result movs r0, 0x7F strh r0, [r1] b _0809CD2C .align 2, 0 _0809CD20: .4byte gMain -_0809CD24: .4byte gUnknown_20370D0 +_0809CD24: .4byte gSpecialVar_Result _0809CD28: - ldr r0, _0809CD44 @ =gUnknown_20370D0 + ldr r0, _0809CD44 @ =gSpecialVar_Result strh r1, [r0] _0809CD2C: ldrb r0, [r5, 0xC] @@ -527,7 +527,7 @@ _0809CD3C: pop {r0} bx r0 .align 2, 0 -_0809CD44: .4byte gUnknown_20370D0 +_0809CD44: .4byte gSpecialVar_Result thumb_func_end sub_809CC98 thumb_func_start sub_809CD48 @@ -628,7 +628,7 @@ sub_809CDEC: @ 809CDEC .align 2, 0 _0809CE04: .4byte task_yes_no_maybe _0809CE08: - ldr r1, _0809CE30 @ =gUnknown_20370D0 + ldr r1, _0809CE30 @ =gSpecialVar_Result movs r0, 0xFF strh r0, [r1] ldr r0, _0809CE34 @ =sub_809D6D4 @@ -647,21 +647,21 @@ _0809CE28: pop {r1} bx r1 .align 2, 0 -_0809CE30: .4byte gUnknown_20370D0 +_0809CE30: .4byte gSpecialVar_Result _0809CE34: .4byte sub_809D6D4 thumb_func_end sub_809CDEC thumb_func_start sub_809CE38 sub_809CE38: @ 809CE38 push {lr} - ldr r0, _0809CE48 @ =gUnknown_20370D0 + ldr r0, _0809CE48 @ =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0xFF beq _0809CE4C movs r0, 0x1 b _0809CE4E .align 2, 0 -_0809CE48: .4byte gUnknown_20370D0 +_0809CE48: .4byte gSpecialVar_Result _0809CE4C: movs r0, 0 _0809CE4E: @@ -711,13 +711,13 @@ _0809CE94: _0809CE9C: movs r0, 0x5 bl PlaySE - ldr r1, _0809CEA8 @ =gUnknown_20370D0 + ldr r1, _0809CEA8 @ =gSpecialVar_Result movs r0, 0 b _0809CEB0 .align 2, 0 -_0809CEA8: .4byte gUnknown_20370D0 +_0809CEA8: .4byte gSpecialVar_Result _0809CEAC: - ldr r1, _0809CEC4 @ =gUnknown_20370D0 + ldr r1, _0809CEC4 @ =gSpecialVar_Result movs r0, 0x1 _0809CEB0: strh r0, [r1] @@ -730,7 +730,7 @@ _0809CEBC: pop {r0} bx r0 .align 2, 0 -_0809CEC4: .4byte gUnknown_20370D0 +_0809CEC4: .4byte gSpecialVar_Result thumb_func_end task_yes_no_maybe thumb_func_start sub_809CEC8 @@ -767,7 +767,7 @@ sub_809CEC8: @ 809CEC8 .align 2, 0 _0809CF04: .4byte sub_809CFDC _0809CF08: - ldr r1, _0809CFCC @ =gUnknown_20370D0 + ldr r1, _0809CFCC @ =gSpecialVar_Result movs r0, 0xFF strh r0, [r1] ldr r0, _0809CFD0 @ =sub_809D6D4 @@ -858,7 +858,7 @@ _0809CFBA: pop {r1} bx r1 .align 2, 0 -_0809CFCC: .4byte gUnknown_20370D0 +_0809CFCC: .4byte gSpecialVar_Result _0809CFD0: .4byte sub_809D6D4 _0809CFD4: .4byte gUnknown_83E04B0 _0809CFD8: .4byte gTasks @@ -890,15 +890,15 @@ sub_809CFDC: @ 809CFDC bne _0809D034 movs r0, 0x5 bl PlaySE - ldr r1, _0809D01C @ =gUnknown_20370D0 + ldr r1, _0809D01C @ =gSpecialVar_Result movs r0, 0x7F strh r0, [r1] b _0809D024 .align 2, 0 _0809D018: .4byte gTasks+0x8 -_0809D01C: .4byte gUnknown_20370D0 +_0809D01C: .4byte gSpecialVar_Result _0809D020: - ldr r0, _0809D03C @ =gUnknown_20370D0 + ldr r0, _0809D03C @ =gSpecialVar_Result strh r1, [r0] _0809D024: ldrb r0, [r5, 0xC] @@ -911,7 +911,7 @@ _0809D034: pop {r0} bx r0 .align 2, 0 -_0809D03C: .4byte gUnknown_20370D0 +_0809D03C: .4byte gSpecialVar_Result thumb_func_end sub_809CFDC thumb_func_start sp109_CreatePCMenu @@ -923,7 +923,7 @@ sp109_CreatePCMenu: @ 809D040 lsrs r0, 24 cmp r0, 0x1 beq _0809D068 - ldr r1, _0809D064 @ =gUnknown_20370D0 + ldr r1, _0809D064 @ =gSpecialVar_Result movs r0, 0xFF strh r0, [r1] bl sub_809D070 @@ -931,7 +931,7 @@ sp109_CreatePCMenu: @ 809D040 b _0809D06A .align 2, 0 _0809D060: .4byte sub_809CC98 -_0809D064: .4byte gUnknown_20370D0 +_0809D064: .4byte gSpecialVar_Result _0809D068: movs r0, 0 _0809D06A: @@ -1524,7 +1524,7 @@ sub_809D504: @ 809D504 lsrs r0, 24 cmp r0, 0xFF bne _0809D55C - ldr r0, _0809D54C @ =gUnknown_20370C0 + ldr r0, _0809D54C @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x8D bne _0809D558 @@ -1539,7 +1539,7 @@ sub_809D504: @ 809D504 .align 2, 0 _0809D544: .4byte sub_809D6D4 _0809D548: .4byte sub_809D494 -_0809D54C: .4byte gUnknown_20370C0 +_0809D54C: .4byte gSpecialVar_0x8004 _0809D550: .4byte gUnknown_83E17C0 _0809D554: .4byte gUnknown_83E17A0 _0809D558: @@ -1566,7 +1566,7 @@ _0809D572: lsls r2, 14 adds r1, r2 asrs r1, 16 - ldr r6, _0809D610 @ =gUnknown_20370C4 + ldr r6, _0809D610 @ =gSpecialVar_0x8006 ldrh r2, [r6] lsls r2, 19 movs r3, 0xA0 @@ -1629,7 +1629,7 @@ _0809D600: .4byte gUnknown_83E17D0 _0809D604: .4byte gUnknown_83E0F80 _0809D608: .4byte gUnknown_83E0768 _0809D60C: .4byte gSpecialVar_0x8005 -_0809D610: .4byte gUnknown_20370C4 +_0809D610: .4byte gSpecialVar_0x8006 _0809D614: .4byte gSprites _0809D618: .4byte sub_809D494 _0809D61C: .4byte gTasks @@ -1803,7 +1803,7 @@ sub_809D764: @ 809D764 mov r6, r8 push {r6,r7} sub sp, 0xC - ldr r1, _0809D7A0 @ =gUnknown_20370D0 + ldr r1, _0809D7A0 @ =gSpecialVar_Result movs r0, 0xFF strh r0, [r1] ldr r0, _0809D7A4 @ =sub_809D6D4 @@ -1818,7 +1818,7 @@ _0809D784: ldrh r0, [r0] cmp r0, 0x1 bne _0809D7B0 - ldr r0, _0809D7AC @ =gUnknown_20370C0 + ldr r0, _0809D7AC @ =gSpecialVar_0x8004 ldrh r0, [r0] movs r4, 0x4 cmp r0, 0x4 @@ -1830,10 +1830,10 @@ _0809D798: movs r5, 0x2 b _0809D7B8 .align 2, 0 -_0809D7A0: .4byte gUnknown_20370D0 +_0809D7A0: .4byte gSpecialVar_Result _0809D7A4: .4byte sub_809D6D4 _0809D7A8: .4byte gSpecialVar_0x8005 -_0809D7AC: .4byte gUnknown_20370C0 +_0809D7AC: .4byte gSpecialVar_0x8004 _0809D7B0: movs r4, 0 movs r0, 0x6 @@ -1866,7 +1866,7 @@ _0809D7B8: cmp r6, r5 bge _0809D844 _0809D7F2: - ldr r0, _0809D820 @ =gUnknown_20370C0 + ldr r0, _0809D820 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r4, r0 beq _0809D828 @@ -1889,7 +1889,7 @@ _0809D7F2: bl AddTextPrinterParameterized b _0809D82E .align 2, 0 -_0809D820: .4byte gUnknown_20370C0 +_0809D820: .4byte gSpecialVar_0x8004 _0809D824: .4byte gUnknown_83E17E0 _0809D828: subs r0, r6, 0x1 @@ -1970,7 +1970,7 @@ _0809D8BC: .4byte gUnknown_84161C8 thumb_func_start sub_809D8C0 sub_809D8C0: @ 809D8C0 push {lr} - ldr r3, _0809D8EC @ =gUnknown_20370D0 + ldr r3, _0809D8EC @ =gSpecialVar_Result ldrh r2, [r3] adds r1, r2, 0 cmp r1, 0x7F @@ -1985,20 +1985,20 @@ sub_809D8C0: @ 809D8C0 beq _0809D930 cmp r1, 0 bne _0809D8F8 - ldr r0, _0809D8F4 @ =gUnknown_20370C0 + ldr r0, _0809D8F4 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x4 bls _0809D904 movs r0, 0x4 b _0809D94E .align 2, 0 -_0809D8EC: .4byte gUnknown_20370D0 +_0809D8EC: .4byte gSpecialVar_Result _0809D8F0: .4byte gSpecialVar_0x8005 -_0809D8F4: .4byte gUnknown_20370C0 +_0809D8F4: .4byte gSpecialVar_0x8004 _0809D8F8: cmp r1, 0x1 bne _0809D90C - ldr r0, _0809D908 @ =gUnknown_20370C0 + ldr r0, _0809D908 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x5 bls _0809D918 @@ -2006,11 +2006,11 @@ _0809D904: movs r0, 0x5 b _0809D94E .align 2, 0 -_0809D908: .4byte gUnknown_20370C0 +_0809D908: .4byte gSpecialVar_0x8004 _0809D90C: cmp r1, 0x2 bne _0809D94C - ldr r0, _0809D91C @ =gUnknown_20370C0 + ldr r0, _0809D91C @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x6 bls _0809D920 @@ -2018,7 +2018,7 @@ _0809D918: movs r0, 0x6 b _0809D94E .align 2, 0 -_0809D91C: .4byte gUnknown_20370C0 +_0809D91C: .4byte gSpecialVar_0x8004 _0809D920: movs r0, 0x7 b _0809D94E @@ -2035,7 +2035,7 @@ _0809D930: movs r0, 0x7F b _0809D94E _0809D934: - ldr r0, _0809D944 @ =gUnknown_20370C0 + ldr r0, _0809D944 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r1, r0 bcc _0809D948 @@ -2044,7 +2044,7 @@ _0809D934: lsrs r0, 16 b _0809D94E .align 2, 0 -_0809D944: .4byte gUnknown_20370C0 +_0809D944: .4byte gSpecialVar_0x8004 _0809D948: ldrh r0, [r3] b _0809D94E diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s index 18c2d7ecb..191457abe 100644 --- a/asm/script_pokemon_util_80A0058.s +++ b/asm/script_pokemon_util_80A0058.s @@ -154,10 +154,10 @@ ScriptGiveMon: @ 80A011C blt _080A0196 adds r0, r5, 0 movs r1, 0x2 - bl sub_8088E74 + bl GetSetPokedexFlag adds r0, r5, 0 movs r1, 0x3 - bl sub_8088E74 + bl GetSetPokedexFlag _080A0196: adds r0, r7, 0 bl Free @@ -221,13 +221,13 @@ _080A020C: cmp r1, 0x2 bne _080A0214 _080A0210: - ldr r0, _080A0218 @ =gUnknown_20370D0 + ldr r0, _080A0218 @ =gSpecialVar_Result strh r1, [r0] _080A0214: pop {r0} bx r0 .align 2, 0 -_080A0218: .4byte gUnknown_20370D0 +_080A0218: .4byte gSpecialVar_Result thumb_func_end CheckForAlivePartyMons thumb_func_start CheckPartyMonHasHeldItem @@ -400,14 +400,14 @@ sub_80A0350: @ 80A0350 ldrb r1, [r0] cmp r1, 0 bne _080A0368 - ldr r0, _080A0364 @ =gUnknown_20370D0 + ldr r0, _080A0364 @ =gSpecialVar_Result strh r1, [r0] b _080A036E .align 2, 0 _080A0360: .4byte gUnknown_203B0D4 -_080A0364: .4byte gUnknown_20370D0 +_080A0364: .4byte gSpecialVar_Result _080A0368: - ldr r1, _080A0378 @ =gUnknown_20370D0 + ldr r1, _080A0378 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] _080A036E: @@ -416,7 +416,7 @@ _080A036E: pop {r0} bx r0 .align 2, 0 -_080A0378: .4byte gUnknown_20370D0 +_080A0378: .4byte gSpecialVar_Result _080A037C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_end sub_80A0350 @@ -443,15 +443,15 @@ sub_80A039C: @ 80A039C cmp r4, 0 bne _080A03B8 bl LoadPlayerParty - ldr r0, _080A03B4 @ =gUnknown_20370D0 + ldr r0, _080A03B4 @ =gSpecialVar_Result strh r4, [r0] b _080A03C2 .align 2, 0 _080A03B0: .4byte gUnknown_203B0D4 -_080A03B4: .4byte gUnknown_20370D0 +_080A03B4: .4byte gSpecialVar_Result _080A03B8: bl sub_80A03D8 - ldr r1, _080A03D0 @ =gUnknown_20370D0 + ldr r1, _080A03D0 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] _080A03C2: @@ -461,7 +461,7 @@ _080A03C2: pop {r0} bx r0 .align 2, 0 -_080A03D0: .4byte gUnknown_20370D0 +_080A03D0: .4byte gSpecialVar_Result _080A03D4: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_end sub_80A039C diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index 8ff65922e..eec41cf11 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 @@ -105,7 +105,7 @@ sub_80BF9BC: @ 80BF9BC push {r4,lr} sub sp, 0x4 ldr r0, _080BF9F0 @ =gPlayerParty - ldr r1, _080BF9F4 @ =gUnknown_20370C0 + ldr r1, _080BF9F4 @ =gSpecialVar_0x8004 ldrb r1, [r1] ldr r2, _080BF9F8 @ =gPlayerPartyCount ldrb r2, [r2] @@ -127,7 +127,7 @@ sub_80BF9BC: @ 80BF9BC bx r0 .align 2, 0 _080BF9F0: .4byte gPlayerParty -_080BF9F4: .4byte gUnknown_20370C0 +_080BF9F4: .4byte gSpecialVar_0x8004 _080BF9F8: .4byte gPlayerPartyCount _080BF9FC: .4byte c2_exit_to_overworld_2_switch _080BFA00: .4byte gUnknown_3005020 @@ -137,13 +137,13 @@ _080BFA04: .4byte sub_807DD24 thumb_func_start ScrSpecial_CountPokemonMoves ScrSpecial_CountPokemonMoves: @ 80BFA08 push {r4,r5,lr} - ldr r1, _080BFA44 @ =gUnknown_20370D0 + ldr r1, _080BFA44 @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] movs r4, 0 adds r5, r1, 0 _080BFA14: - ldr r0, _080BFA48 @ =gUnknown_20370C0 + ldr r0, _080BFA48 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -167,15 +167,15 @@ _080BFA32: pop {r0} bx r0 .align 2, 0 -_080BFA44: .4byte gUnknown_20370D0 -_080BFA48: .4byte gUnknown_20370C0 +_080BFA44: .4byte gSpecialVar_Result +_080BFA48: .4byte gSpecialVar_0x8004 _080BFA4C: .4byte gPlayerParty thumb_func_end ScrSpecial_CountPokemonMoves thumb_func_start ScrSpecial_GetPokemonNicknameAndMoveName ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50 push {r4,r5,lr} - ldr r0, _080BFA90 @ =gUnknown_20370C0 + ldr r0, _080BFA90 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 adds r5, r1, 0 @@ -196,19 +196,19 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50 ldr r0, _080BFAA0 @ =gStringVar2 movs r1, 0xD muls r1, r4 - ldr r2, _080BFAA4 @ =gUnknown_8247094 + ldr r2, _080BFAA4 @ =gMoveNames adds r1, r2 bl StringCopy pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080BFA90: .4byte gUnknown_20370C0 +_080BFA90: .4byte gSpecialVar_0x8004 _080BFA94: .4byte gPlayerParty _080BFA98: .4byte gSpecialVar_0x8005 _080BFA9C: .4byte gStringVar1 _080BFAA0: .4byte gStringVar2 -_080BFAA4: .4byte gUnknown_8247094 +_080BFAA4: .4byte gMoveNames thumb_func_end ScrSpecial_GetPokemonNicknameAndMoveName thumb_func_start sub_80BFAA8 @@ -338,7 +338,7 @@ sub_80BFBA8: @ 80BFBA8 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _080BFC08 @ =gUnknown_20370C0 + ldr r0, _080BFC08 @ =gSpecialVar_0x8004 mov r8, r0 ldrh r0, [r0] movs r6, 0x64 @@ -359,7 +359,7 @@ sub_80BFBA8: @ 80BFBA8 cmp r4, 0x2 bhi _080BFBFC _080BFBDA: - ldr r0, _080BFC08 @ =gUnknown_20370C0 + ldr r0, _080BFC08 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -382,7 +382,7 @@ _080BFBFC: pop {r0} bx r0 .align 2, 0 -_080BFC08: .4byte gUnknown_20370C0 +_080BFC08: .4byte gSpecialVar_0x8004 _080BFC0C: .4byte gPlayerParty _080BFC10: .4byte gSpecialVar_0x8005 thumb_func_end sub_80BFBA8 @@ -390,7 +390,7 @@ _080BFC10: .4byte gSpecialVar_0x8005 thumb_func_start sub_80BFC14 sub_80BFC14: @ 80BFC14 push {lr} - ldr r0, _080BFC38 @ =gUnknown_20370C0 + ldr r0, _080BFC38 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -401,22 +401,22 @@ sub_80BFC14: @ 80BFC14 adds r1, r0, 0 cmp r1, 0 beq _080BFC44 - ldr r1, _080BFC40 @ =gUnknown_20370D0 + ldr r1, _080BFC40 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] b _080BFC48 .align 2, 0 -_080BFC38: .4byte gUnknown_20370C0 +_080BFC38: .4byte gSpecialVar_0x8004 _080BFC3C: .4byte gPlayerParty -_080BFC40: .4byte gUnknown_20370D0 +_080BFC40: .4byte gSpecialVar_Result _080BFC44: - ldr r0, _080BFC4C @ =gUnknown_20370D0 + ldr r0, _080BFC4C @ =gSpecialVar_Result strh r1, [r0] _080BFC48: pop {r0} bx r0 .align 2, 0 -_080BFC4C: .4byte gUnknown_20370D0 +_080BFC4C: .4byte gSpecialVar_Result thumb_func_end sub_80BFC14 .align 2, 0 @ Don't pad with nop. diff --git a/asm/seagallop.s b/asm/seagallop.s index 45ff92759..89f8c2867 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,14 +331,14 @@ _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 sub_8147140: @ 8147140 push {r4,lr} sub sp, 0x4 - ldr r1, _081471AC @ =gUnknown_20370C4 + ldr r1, _081471AC @ =gSpecialVar_0x8006 ldrh r0, [r1] cmp r0, 0xA bls _08147150 @@ -382,7 +382,7 @@ _08147150: pop {r0} bx r0 .align 2, 0 -_081471AC: .4byte gUnknown_20370C4 +_081471AC: .4byte gSpecialVar_0x8006 _081471B0: .4byte gUnknown_846AEFC _081471B4: .4byte gUnknown_3005020 _081471B8: .4byte sub_807DF64 @@ -767,7 +767,7 @@ _081474C6: thumb_func_start sub_81474CC sub_81474CC: @ 81474CC push {lr} - ldr r2, _081474EC @ =gUnknown_20370C0 + ldr r2, _081474EC @ =gSpecialVar_0x8004 ldrh r0, [r2] cmp r0, 0xA bhi _081474F8 @@ -775,16 +775,16 @@ sub_81474CC: @ 81474CC lsls r0, 1 adds r0, r1 ldrh r0, [r0] - ldr r1, _081474F4 @ =gUnknown_20370C4 + ldr r1, _081474F4 @ =gSpecialVar_0x8006 ldrh r1, [r1] asrs r0, r1 movs r1, 0x1 ands r0, r1 b _081474FA .align 2, 0 -_081474EC: .4byte gUnknown_20370C0 +_081474EC: .4byte gSpecialVar_0x8004 _081474F0: .4byte gUnknown_846AF28 -_081474F4: .4byte gUnknown_20370C4 +_081474F4: .4byte gSpecialVar_0x8006 _081474F8: movs r0, 0x1 _081474FA: diff --git a/asm/shop.s b/asm/shop.s index d9f548c1d..60b92410d 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 @@ -892,7 +892,7 @@ _0809B1F2: muls r4, r0 ldr r0, [r5] adds r0, r4 - ldr r1, _0809B2CC @ =gUnknown_84161C1 + ldr r1, _0809B2CC @ =gFameCheckerText_Cancel bl StringCopy ldr r0, _0809B2D0 @ =gUnknown_2039964 ldr r2, [r0] @@ -990,7 +990,7 @@ _0809B2BC: b _0809B2E6 .align 2, 0 _0809B2C8: .4byte gUnknown_2039968 -_0809B2CC: .4byte gUnknown_84161C1 +_0809B2CC: .4byte gFameCheckerText_Cancel _0809B2D0: .4byte gUnknown_2039964 _0809B2D4: .4byte gUnknown_3005E70 _0809B2D8: .4byte gUnknown_2039934 @@ -1259,7 +1259,7 @@ sub_809B494: @ 809B494 lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _0809B524 @ =gUnknown_8247094 + ldr r0, _0809B524 @ =gMoveNames adds r1, r0 adds r0, r5, 0 bl StringCopy @@ -1280,7 +1280,7 @@ _0809B514: .4byte gStringVar1 _0809B518: .4byte 0xfffffee0 _0809B51C: .4byte gStringVar4 _0809B520: .4byte gUnknown_8416226 -_0809B524: .4byte gUnknown_8247094 +_0809B524: .4byte gMoveNames _0809B528: ldr r2, _0809B564 @ =gUnknown_8416213 movs r4, 0 @@ -1378,7 +1378,7 @@ sub_809B59C: @ 809B59C bl CopyWindowToVram b _0809B5F8 _0809B5E0: - ldr r2, _0809B600 @ =gUnknown_841623B + ldr r2, _0809B600 @ =gFameCheckerText_ListMenuCursor str r5, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -1395,7 +1395,7 @@ _0809B5F8: pop {r0} bx r0 .align 2, 0 -_0809B600: .4byte gUnknown_841623B +_0809B600: .4byte gFameCheckerText_ListMenuCursor thumb_func_end sub_809B59C thumb_func_start sub_809B604 @@ -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 @@ -3280,7 +3280,7 @@ sub_809C4A8: @ 809C4A8 adds r0, r1, 0x4 adds r1, 0x6 bl PlayerGetDestCoords - ldr r0, _0809C4E8 @ =gUnknown_20370C0 + ldr r0, _0809C4E8 @ =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0 bne _0809C4EC @@ -3290,7 +3290,7 @@ sub_809C4A8: @ 809C4A8 .align 2, 0 _0809C4E0: .4byte sub_809C500 _0809C4E4: .4byte gTasks -_0809C4E8: .4byte gUnknown_20370C0 +_0809C4E8: .4byte gSpecialVar_0x8004 _0809C4EC: ldrh r0, [r4, 0xC] subs r0, 0x1 diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 2350a210e..2d1be0535 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: @@ -4503,9 +4503,9 @@ _08141A00: bl BlendPalettes _08141A2C: movs r4, 0 - ldr r5, _08141A4C @ =gUnknown_20375F8 + ldr r5, _08141A4C @ =gPlttBufferFaded ldr r3, _08141A50 @ =gUnknown_8466C34 - ldr r2, _08141A54 @ =gUnknown_20371F8 + ldr r2, _08141A54 @ =gPlttBufferUnfaded _08141A34: adds r0, r4, r3 ldrb r0, [r0] @@ -4520,9 +4520,9 @@ _08141A34: bls _08141A34 b _08141AA8 .align 2, 0 -_08141A4C: .4byte gUnknown_20375F8 +_08141A4C: .4byte gPlttBufferFaded _08141A50: .4byte gUnknown_8466C34 -_08141A54: .4byte gUnknown_20371F8 +_08141A54: .4byte gPlttBufferUnfaded _08141A58: movs r4, 0 _08141A5A: diff --git a/asm/start_menu.s b/asm/start_menu.s index d31fb0723..1d81d0392 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -631,8 +631,8 @@ _0806F24E: _0806F254: .4byte gUnknown_20370F0 thumb_func_end sub_806F1F0 - thumb_func_start sub_806F258 -sub_806F258: @ 806F258 + thumb_func_start ShowStartMenu +ShowStartMenu: @ 806F258 push {lr} bl sub_805642C cmp r0, 0 @@ -648,7 +648,7 @@ _0806F26E: bx r0 .align 2, 0 _0806F27C: .4byte sub_806F1F0 - thumb_func_end sub_806F258 + thumb_func_end ShowStartMenu thumb_func_start sub_806F280 sub_806F280: @ 806F280 @@ -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,25 +906,25 @@ 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 bl sub_80563F0 - ldr r0, _0806F4B0 @ =sub_8107EB8 + ldr r0, _0806F4B0 @ =UseFameCheckerFromMenu bl SetMainCallback2 movs r0, 0x1 _0806F4AC: pop {r1} bx r1 .align 2, 0 -_0806F4B0: .4byte sub_8107EB8 +_0806F4B0: .4byte UseFameCheckerFromMenu thumb_func_end sub_806F480 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 @@ -1212,14 +1212,14 @@ task50_save_game: @ 806F6D4 _0806F6F0: cmp r1, 0x3 bgt _0806F704 - ldr r1, _0806F6FC @ =gUnknown_20370D0 + ldr r1, _0806F6FC @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] b _0806F704 .align 2, 0 -_0806F6FC: .4byte gUnknown_20370D0 +_0806F6FC: .4byte gSpecialVar_Result _0806F700: - ldr r0, _0806F718 @ =gUnknown_20370D0 + ldr r0, _0806F718 @ =gSpecialVar_Result strh r1, [r0] _0806F704: adds r0, r4, 0 @@ -1231,7 +1231,7 @@ _0806F712: pop {r0} bx r0 .align 2, 0 -_0806F718: .4byte gUnknown_20370D0 +_0806F718: .4byte gSpecialVar_Result thumb_func_end task50_save_game thumb_func_start sub_806F71C @@ -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: @@ -1925,7 +1925,7 @@ _0806FC14: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r0, _0806FC78 @ =gUnknown_3003F3C + ldr r0, _0806FC78 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0806FC7C @@ -1936,7 +1936,7 @@ _0806FC14: b _0806FCE6 .align 2, 0 _0806FC74: .4byte gUnknown_8419F54 -_0806FC78: .4byte gUnknown_3003F3C +_0806FC78: .4byte gWirelessCommType _0806FC7C: movs r0, 0x1 b _0806FCE6 diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s index 523fb786e..bdd06dfff 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 @@ -915,7 +915,7 @@ sub_815B2C0: @ 815B2C0 beq _0815B30A subs r0, r4, 0x6 ldr r1, [r0] - ldr r0, _0815B32C @ =sub_8107EB8 + ldr r0, _0815B32C @ =UseFameCheckerFromMenu cmp r1, r0 bne _0815B330 _0815B30A: @@ -929,10 +929,10 @@ _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 +_0815B32C: .4byte UseFameCheckerFromMenu _0815B330: movs r0, 0x5 bl PlaySE @@ -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 @@ -2154,7 +2154,7 @@ sub_815BC90: @ 815BC90 ldr r1, _0815BCCC @ =gTasks+0x8 adds r5, r0, r1 bl sub_815B220 - ldr r1, _0815BCD0 @ =gUnknown_20370C0 + ldr r1, _0815BCD0 @ =gSpecialVar_0x8004 ldr r4, _0815BCD4 @ =gUnknown_203F444 ldrb r0, [r4, 0x5] strh r0, [r1] @@ -2172,7 +2172,7 @@ sub_815BC90: @ 815BC90 b _0815BCE2 .align 2, 0 _0815BCCC: .4byte gTasks+0x8 -_0815BCD0: .4byte gUnknown_20370C0 +_0815BCD0: .4byte gSpecialVar_0x8004 _0815BCD4: .4byte gUnknown_203F444 _0815BCD8: .4byte gMain _0815BCDC: .4byte sub_815BD58 diff --git a/asm/title_screen.s b/asm/title_screen.s index 3ff269d8f..c07978623 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -577,7 +577,7 @@ _08078DF2: bgt _08078E02 b _08078FB6 _08078E02: - ldr r0, _08078E20 @ =gUnknown_2037398 + ldr r0, _08078E20 @ =gPlttBufferUnfaded + 0x1A0 movs r1, 0x10 bl TintPalette_GrayScale2 movs r0, 0x80 @@ -590,9 +590,9 @@ _08078E02: bl BeginNormalPaletteFade b _08078F80 .align 2, 0 -_08078E20: .4byte gUnknown_2037398 +_08078E20: .4byte gPlttBufferUnfaded + 0x1A0 _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 @@ -749,7 +749,7 @@ _08078F24: movs r0, 0 bl ShowBg ldr r0, _08078F90 @ =gUnknown_8EAD5E8 - ldr r1, _08078F94 @ =gUnknown_2037398 + ldr r1, _08078F94 @ =gPlttBufferUnfaded + 0x1A0 movs r2, 0x10 bl CpuSet movs r0, 0x80 @@ -772,13 +772,13 @@ _08078F80: _08078F88: .4byte 0x00001fff _08078F8C: .4byte 0x00007fde _08078F90: .4byte gUnknown_8EAD5E8 -_08078F94: .4byte gUnknown_2037398 +_08078F94: .4byte gPlttBufferUnfaded + 0x1A0 _08078F98: movs r0, 0 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 gSaveFileStatus _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] @@ -1381,9 +1381,9 @@ _08079478: lsls r0, 16 cmp r0, 0 beq _080794CC - ldr r2, _080794C0 @ =gUnknown_20371F8 + ldr r2, _080794C0 @ =gPlttBufferUnfaded ldr r4, _080794C4 @ =gUnknown_8EAE094 - ldr r1, _080794C8 @ =gUnknown_20375F8 + ldr r1, _080794C8 @ =gPlttBufferFaded movs r0, 0xF1 lsls r0, 1 adds r1, r0 @@ -1401,14 +1401,14 @@ _080794AC: bge _080794AC b _080794F2 .align 2, 0 -_080794C0: .4byte gUnknown_20371F8 +_080794C0: .4byte gPlttBufferUnfaded _080794C4: .4byte gUnknown_8EAE094 -_080794C8: .4byte gUnknown_20375F8 +_080794C8: .4byte gPlttBufferFaded _080794CC: movs r3, 0 - ldr r2, _08079518 @ =gUnknown_20371F8 + ldr r2, _08079518 @ =gPlttBufferUnfaded ldr r0, _0807951C @ =gUnknown_8EAE094 - ldr r1, _08079520 @ =gUnknown_20375F8 + ldr r1, _08079520 @ =gPlttBufferFaded adds r4, r0, 0x2 movs r0, 0xF1 lsls r0, 1 @@ -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 @@ -1445,10 +1445,10 @@ _08079510: pop {r0} bx r0 .align 2, 0 -_08079518: .4byte gUnknown_20371F8 +_08079518: .4byte gPlttBufferUnfaded _0807951C: .4byte gUnknown_8EAE094 -_08079520: .4byte gUnknown_20375F8 -_08079524: .4byte gUnknown_2037AB8 +_08079520: .4byte gPlttBufferFaded +_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 76c0a384e..1539343e8 100644 --- a/asm/tm_case.s +++ b/asm/tm_case.s @@ -704,7 +704,7 @@ _08131DC4: lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _08131E14 @ =gUnknown_8247094 + ldr r0, _08131E14 @ =gMoveNames adds r1, r0 adds r0, r4, 0 bl StringAppend @@ -721,7 +721,7 @@ _08131E04: .4byte 0xfffffee0 _08131E08: .4byte gStringVar4 _08131E0C: .4byte gUnknown_846317C _08131E10: .4byte gUnknown_8416703 -_08131E14: .4byte gUnknown_8247094 +_08131E14: .4byte gMoveNames thumb_func_end sub_8131D48 thumb_func_start sub_8131E18 @@ -963,7 +963,7 @@ sub_8131FB0: @ 8131FB0 bl CopyWindowToVram b _0813200A _08131FF4: - ldr r2, _08132014 @ =gUnknown_841623B + ldr r2, _08132014 @ =gFameCheckerText_ListMenuCursor str r5, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -979,7 +979,7 @@ _0813200A: pop {r0} bx r0 .align 2, 0 -_08132014: .4byte gUnknown_841623B +_08132014: .4byte gFameCheckerText_ListMenuCursor thumb_func_end sub_8131FB0 thumb_func_start sub_8132018 @@ -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 @@ -1400,16 +1400,16 @@ sub_81322D4: @ 81322D4 bne _08132354 movs r0, 0x5 bl PlaySE - ldr r0, _08132350 @ =gUnknown_203AD30 + ldr r0, _08132350 @ =gSpecialVar_ItemId mov r1, r8 strh r1, [r0] 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 +_08132350: .4byte gSpecialVar_ItemId _08132354: movs r0, 0x2 negs r0, r0 @@ -1422,7 +1422,7 @@ _08132354: _08132364: movs r0, 0x5 bl PlaySE - ldr r1, _08132378 @ =gUnknown_203AD30 + ldr r1, _08132378 @ =gSpecialVar_ItemId movs r0, 0 strh r0, [r1] _08132370: @@ -1430,7 +1430,7 @@ _08132370: bl sub_8132230 b _081323C8 .align 2, 0 -_08132378: .4byte gUnknown_203AD30 +_08132378: .4byte gSpecialVar_ItemId _0813237C: movs r0, 0x5 bl PlaySE @@ -1450,7 +1450,7 @@ _0813237C: movs r0, 0x4 adds r1, r4, 0 bl sub_809A798 - ldr r1, _081323D4 @ =gUnknown_203AD30 + ldr r1, _081323D4 @ =gSpecialVar_ItemId strh r0, [r1] ldr r0, _081323D8 @ =gTasks lsls r1, r7, 2 @@ -1471,7 +1471,7 @@ _081323C8: pop {r0} bx r0 .align 2, 0 -_081323D4: .4byte gUnknown_203AD30 +_081323D4: .4byte gSpecialVar_ItemId _081323D8: .4byte gTasks _081323DC: .4byte gUnknown_8463140 _081323E0: .4byte gUnknown_203B10C @@ -1591,7 +1591,7 @@ _08132468: lsls r0, 1 bl Alloc adds r4, r0, 0 - ldr r6, _08132558 @ =gUnknown_203AD30 + ldr r6, _08132558 @ =gSpecialVar_ItemId ldrh r1, [r6] bl sub_8131D48 ldr r1, _0813255C @ =gUnknown_8416301 @@ -1643,7 +1643,7 @@ _08132528: _0813254C: .4byte gUnknown_203B118 _08132550: .4byte gUnknown_846316B _08132554: .4byte gUnknown_8463150 -_08132558: .4byte gUnknown_203AD30 +_08132558: .4byte gSpecialVar_ItemId _0813255C: .4byte gUnknown_8416301 _08132560: .4byte gTasks _08132564: .4byte sub_8132568 @@ -1852,7 +1852,7 @@ sub_8132714: @ 8132714 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08132744 @ =gUnknown_203AD30 + ldr r0, _08132744 @ =gSpecialVar_ItemId ldrh r0, [r0] ldr r1, _08132748 @ =gStringVar1 bl sub_8099E90 @@ -1869,7 +1869,7 @@ sub_8132714: @ 8132714 pop {r0} bx r0 .align 2, 0 -_08132744: .4byte gUnknown_203AD30 +_08132744: .4byte gSpecialVar_ItemId _08132748: .4byte gStringVar1 _0813274C: .4byte gStringVar4 _08132750: .4byte gUnknown_841635E @@ -2085,7 +2085,7 @@ sub_8132908: @ 8132908 lsls r0, 3 ldr r1, _08132950 @ =gTasks+0x8 adds r4, r0, r1 - ldr r6, _08132954 @ =gUnknown_203AD30 + ldr r6, _08132954 @ =gSpecialVar_ItemId ldrh r0, [r6] bl itemid_get_market_price lsls r0, 16 @@ -2109,7 +2109,7 @@ sub_8132908: @ 8132908 b _081329AE .align 2, 0 _08132950: .4byte gTasks+0x8 -_08132954: .4byte gUnknown_203AD30 +_08132954: .4byte gSpecialVar_ItemId _08132958: .4byte gStringVar1 _0813295C: .4byte gStringVar4 _08132960: .4byte gUnknown_84168F1 @@ -2503,7 +2503,7 @@ sub_8132CAC: @ 8132CAC bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _08132D1C @ =gUnknown_203AD30 + ldr r0, _08132D1C @ =gSpecialVar_ItemId ldrh r0, [r0] ldr r1, _08132D20 @ =gStringVar1 bl sub_8099E90 @@ -2537,7 +2537,7 @@ sub_8132CAC: @ 8132CAC bx r0 .align 2, 0 _08132D18: .4byte gTasks+0x8 -_08132D1C: .4byte gUnknown_203AD30 +_08132D1C: .4byte gSpecialVar_ItemId _08132D20: .4byte gStringVar1 _08132D24: .4byte gStringVar3 _08132D28: .4byte gStringVar4 @@ -2564,7 +2564,7 @@ sub_8132D34: @ 8132D34 mov r8, r1 movs r0, 0xF8 bl PlaySE - ldr r5, _08132DF8 @ =gUnknown_203AD30 + ldr r5, _08132DF8 @ =gSpecialVar_ItemId ldrh r0, [r5] mov r2, r8 ldrh r1, [r2, 0x10] @@ -2632,7 +2632,7 @@ sub_8132D34: @ 8132D34 bx r0 .align 2, 0 _08132DF4: .4byte gTasks+0x8 -_08132DF8: .4byte gUnknown_203AD30 +_08132DF8: .4byte gSpecialVar_ItemId _08132DFC: .4byte gSaveBlock1Ptr _08132E00: .4byte gUnknown_203B116 _08132E04: .4byte gUnknown_3005E70 @@ -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 @@ -3075,8 +3075,8 @@ _08133170: ldrh r1, [r1] strh r1, [r2, 0xA] bl Free - ldr r0, _08133208 @ =gUnknown_20375F8 - ldr r1, _0813320C @ =gUnknown_20371F8 + ldr r0, _08133208 @ =gPlttBufferFaded + ldr r1, _0813320C @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -3095,15 +3095,15 @@ _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 _08133204: .4byte gUnknown_203B10C -_08133208: .4byte gUnknown_20375F8 -_0813320C: .4byte gUnknown_20371F8 +_08133208: .4byte gPlttBufferFaded +_0813320C: .4byte gPlttBufferUnfaded _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 a12a9fcd0..e9fcddf2d 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 @@ -246,11 +246,11 @@ _0804C80A: bl sub_804F5BC movs r0, 0 bl ShowBg - ldr r0, _0804C86C @ =gUnknown_3003F64 + ldr r0, _0804C86C @ =gReceivedRemoteLinkPlayers ldrb r2, [r0] cmp r2, 0 bne _0804C8B4 - ldr r1, _0804C870 @ =gUnknown_202271A + ldr r1, _0804C870 @ =gLinkType ldr r5, _0804C874 @ =0x00001122 adds r0, r5, 0 strh r0, [r1] @@ -258,7 +258,7 @@ _0804C80A: ldr r0, [r0] adds r0, 0xA8 strb r2, [r0] - ldr r0, _0804C87C @ =gUnknown_3003F3C + ldr r0, _0804C87C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804C880 @@ -267,13 +267,13 @@ _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 +_0804C86C: .4byte gReceivedRemoteLinkPlayers +_0804C870: .4byte gLinkType _0804C874: .4byte 0x00001122 _0804C878: .4byte gUnknown_2031DA8 -_0804C87C: .4byte gUnknown_3003F3C +_0804C87C: .4byte gWirelessCommType _0804C880: bl sub_8009804 ldr r1, _0804C8A8 @ =gMain @@ -284,7 +284,7 @@ _0804C880: adds r0, 0x1 strb r0, [r1] _0804C892: - ldr r0, _0804C8AC @ =gUnknown_3003F3C + ldr r0, _0804C8AC @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804C89C @@ -296,7 +296,7 @@ _0804C89C: b _0804CEE6 .align 2, 0 _0804C8A8: .4byte gMain -_0804C8AC: .4byte gUnknown_3003F3C +_0804C8AC: .4byte gWirelessCommType _0804C8B0: .4byte sub_8081A90 _0804C8B4: ldr r0, _0804C8C4 @ =gMain @@ -375,7 +375,7 @@ _0804C940: .align 2, 0 _0804C94C: .4byte gMain _0804C950: - ldr r0, _0804C9A0 @ =gUnknown_3003F64 + ldr r0, _0804C9A0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 beq _0804C95A @@ -402,7 +402,7 @@ _0804C968: ldr r0, [r0] adds r0, 0xA8 strb r2, [r0] - ldr r0, _0804C9AC @ =gUnknown_3003F3C + ldr r0, _0804C9AC @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0804C992 @@ -413,12 +413,12 @@ _0804C992: bl sub_800AB9C b _0804CEE6 .align 2, 0 -_0804C9A0: .4byte gUnknown_3003F64 +_0804C9A0: .4byte gReceivedRemoteLinkPlayers _0804C9A4: .4byte gMain _0804C9A8: .4byte gUnknown_2031DA8 -_0804C9AC: .4byte gUnknown_3003F3C +_0804C9AC: .4byte gWirelessCommType _0804C9B0: - ldr r0, _0804C9E0 @ =gUnknown_3003F3C + ldr r0, _0804C9E0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804C9E8 @@ -441,7 +441,7 @@ _0804C9C4: bl sub_80FCD74 b _0804CEE6 .align 2, 0 -_0804C9E0: .4byte gUnknown_3003F3C +_0804C9E0: .4byte gWirelessCommType _0804C9E4: .4byte gMain _0804C9E8: movs r2, 0x87 @@ -664,7 +664,7 @@ _0804CB9C: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _0804CC20 @ =gUnknown_2022744 + ldr r1, _0804CC20 @ =gLinkPlayers + 8 adds r0, r1 ldr r1, [r6, 0xC] str r5, [sp] @@ -702,7 +702,7 @@ _0804CB9C: _0804CC14: .4byte gSaveBlock2Ptr _0804CC18: .4byte gUnknown_2031C94 _0804CC1C: .4byte gDecompressionBuffer -_0804CC20: .4byte gUnknown_2022744 +_0804CC20: .4byte gLinkPlayers + 8 _0804CC24: .4byte gUnknown_8261ECC _0804CC28: .4byte gMain _0804CC2C: .4byte gUnknown_2031DA8 @@ -762,7 +762,7 @@ _0804CC62: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _0804CD08 @ =gUnknown_2022744 + ldr r1, _0804CD08 @ =gLinkPlayers + 8 adds r1, r0, r1 movs r0, 0x1 movs r2, 0 @@ -811,7 +811,7 @@ _0804CCC6: _0804CCFC: .4byte gSaveBlock2Ptr _0804CD00: .4byte gUnknown_8261E8A _0804CD04: .4byte gUnknown_8261CC8 -_0804CD08: .4byte gUnknown_2022744 +_0804CD08: .4byte gLinkPlayers + 8 _0804CD0C: .4byte gMain _0804CD10: ldr r4, _0804CDCC @ =gUnknown_8261CC8 @@ -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 @@ -1130,7 +1130,7 @@ _0804CFC8: .align 2, 0 _0804CFD8: .4byte gMain _0804CFDC: - ldr r0, _0804CFFC @ =gUnknown_3003F3C + ldr r0, _0804CFFC @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804CFF0 @@ -1145,7 +1145,7 @@ _0804CFF0: adds r1, r3 b _0804D4B4 .align 2, 0 -_0804CFFC: .4byte gUnknown_3003F3C +_0804CFFC: .4byte gWirelessCommType _0804D000: .4byte gMain _0804D004: movs r5, 0x87 @@ -1354,7 +1354,7 @@ _0804D19C: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _0804D220 @ =gUnknown_2022744 + ldr r1, _0804D220 @ =gLinkPlayers + 8 adds r0, r1 ldr r1, [r6, 0xC] str r5, [sp] @@ -1393,7 +1393,7 @@ _0804D200: _0804D214: .4byte gSaveBlock2Ptr _0804D218: .4byte gUnknown_2031C94 _0804D21C: .4byte gDecompressionBuffer -_0804D220: .4byte gUnknown_2022744 +_0804D220: .4byte gLinkPlayers + 8 _0804D224: .4byte gUnknown_8261ECC _0804D228: .4byte gMain _0804D22C: .4byte gUnknown_2031DA8 @@ -1459,7 +1459,7 @@ _0804D270: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _0804D318 @ =gUnknown_2022744 + ldr r1, _0804D318 @ =gLinkPlayers + 8 adds r1, r0, r1 movs r0, 0x1 movs r2, 0 @@ -1508,7 +1508,7 @@ _0804D2D4: _0804D30C: .4byte gSaveBlock2Ptr _0804D310: .4byte gUnknown_8261E8A _0804D314: .4byte gUnknown_8261CC8 -_0804D318: .4byte gUnknown_2022744 +_0804D318: .4byte gLinkPlayers + 8 _0804D31C: .4byte gMain _0804D320: ldr r4, _0804D3B0 @ =gUnknown_8261CC8 @@ -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 @@ -1795,7 +1795,7 @@ sub_804D548: @ 804D548 adds r0, 0x7E ldrb r0, [r0] strb r0, [r1, 0x1] - ldr r0, _0804D58C @ =gUnknown_3003F3C + ldr r0, _0804D58C @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804D590 @@ -1805,10 +1805,10 @@ 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 +_0804D58C: .4byte gWirelessCommType _0804D590: movs r0, 0x20 bl sub_800AA80 @@ -1828,7 +1828,7 @@ sub_804D5A4: @ 804D5A4 ldr r5, _0804D5E4 @ =gMain ldr r0, _0804D5E8 @ =sub_804C718 str r0, [r5, 0x8] - ldr r0, _0804D5EC @ =gUnknown_3003F3C + ldr r0, _0804D5EC @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804D5FC @@ -1852,12 +1852,12 @@ sub_804D5A4: @ 804D5A4 .align 2, 0 _0804D5E4: .4byte gMain _0804D5E8: .4byte sub_804C718 -_0804D5EC: .4byte gUnknown_3003F3C +_0804D5EC: .4byte gWirelessCommType _0804D5F0: .4byte gUnknown_2031C90 _0804D5F4: .4byte gUnknown_2031DA8 _0804D5F8: .4byte sub_8050138 _0804D5FC: - ldr r0, _0804D628 @ =gUnknown_3003F64 + ldr r0, _0804D628 @ =gReceivedRemoteLinkPlayers ldrb r4, [r0] cmp r4, 0 bne _0804D620 @@ -1876,7 +1876,7 @@ _0804D620: pop {r0} bx r0 .align 2, 0 -_0804D628: .4byte gUnknown_3003F64 +_0804D628: .4byte gReceivedRemoteLinkPlayers _0804D62C: .4byte gUnknown_2031C90 _0804D630: .4byte gUnknown_2031DA8 _0804D634: .4byte sub_8050138 @@ -2181,7 +2181,7 @@ _0804D860: .4byte _0804DAE0 .4byte _0804DB14 _0804D8B8: - ldr r0, _0804D8D8 @ =gUnknown_2022618 + ldr r0, _0804D8D8 @ =gBlockSendBuffer ldr r1, _0804D8DC @ =gPlayerParty movs r2, 0xC8 bl sub_804D814 @@ -2197,7 +2197,7 @@ _0804D8B8: strb r2, [r0] b _0804DB9E .align 2, 0 -_0804D8D8: .4byte gUnknown_2022618 +_0804D8D8: .4byte gBlockSendBuffer _0804D8DC: .4byte gPlayerParty _0804D8E0: .4byte gUnknown_2031DA8 _0804D8E4: @@ -2247,7 +2247,7 @@ _0804D936: adds r1, r5, 0 eors r1, r2 lsls r1, 8 - ldr r2, _0804D958 @ =gUnknown_2022118 + ldr r2, _0804D958 @ =gBlockRecvBuffer adds r1, r2 movs r2, 0xC8 bl sub_804D814 @@ -2257,10 +2257,10 @@ _0804D936: b _0804DB96 .align 2, 0 _0804D954: .4byte gEnemyParty -_0804D958: .4byte gUnknown_2022118 +_0804D958: .4byte gBlockRecvBuffer _0804D95C: .4byte gUnknown_2031DA8 _0804D960: - ldr r0, _0804D970 @ =gUnknown_2022618 + ldr r0, _0804D970 @ =gBlockSendBuffer ldr r1, _0804D974 @ =gUnknown_202434C movs r2, 0xC8 bl sub_804D814 @@ -2268,7 +2268,7 @@ _0804D960: ldr r1, [r0] b _0804DB96 .align 2, 0 -_0804D970: .4byte gUnknown_2022618 +_0804D970: .4byte gBlockSendBuffer _0804D974: .4byte gUnknown_202434C _0804D978: .4byte gUnknown_2031DA8 _0804D97C: @@ -2295,7 +2295,7 @@ _0804D99E: adds r1, r5, 0 eors r1, r2 lsls r1, 8 - ldr r2, _0804D9C0 @ =gUnknown_2022118 + ldr r2, _0804D9C0 @ =gBlockRecvBuffer adds r1, r2 movs r2, 0xC8 bl sub_804D814 @@ -2305,10 +2305,10 @@ _0804D99E: b _0804DB96 .align 2, 0 _0804D9BC: .4byte gUnknown_20240F4 -_0804D9C0: .4byte gUnknown_2022118 +_0804D9C0: .4byte gBlockRecvBuffer _0804D9C4: .4byte gUnknown_2031DA8 _0804D9C8: - ldr r0, _0804D9D8 @ =gUnknown_2022618 + ldr r0, _0804D9D8 @ =gBlockSendBuffer ldr r1, _0804D9DC @ =gUnknown_2024414 movs r2, 0xC8 bl sub_804D814 @@ -2316,7 +2316,7 @@ _0804D9C8: ldr r1, [r0] b _0804DB96 .align 2, 0 -_0804D9D8: .4byte gUnknown_2022618 +_0804D9D8: .4byte gBlockSendBuffer _0804D9DC: .4byte gUnknown_2024414 _0804D9E0: .4byte gUnknown_2031DA8 _0804D9E4: @@ -2343,7 +2343,7 @@ _0804DA06: adds r1, r5, 0 eors r1, r2 lsls r1, 8 - ldr r2, _0804DA28 @ =gUnknown_2022118 + ldr r2, _0804DA28 @ =gBlockRecvBuffer adds r1, r2 movs r2, 0xC8 bl sub_804D814 @@ -2353,10 +2353,10 @@ _0804DA06: b _0804DB96 .align 2, 0 _0804DA24: .4byte gUnknown_20241BC -_0804DA28: .4byte gUnknown_2022118 +_0804DA28: .4byte gBlockRecvBuffer _0804DA2C: .4byte gUnknown_2031DA8 _0804DA30: - ldr r0, _0804DA48 @ =gUnknown_2022618 + ldr r0, _0804DA48 @ =gBlockSendBuffer ldr r1, _0804DA4C @ =gSaveBlock1Ptr ldr r1, [r1] ldr r2, _0804DA50 @ =0x00002cd0 @@ -2367,7 +2367,7 @@ _0804DA30: ldr r1, [r0] b _0804DB96 .align 2, 0 -_0804DA48: .4byte gUnknown_2022618 +_0804DA48: .4byte gBlockSendBuffer _0804DA4C: .4byte gSaveBlock1Ptr _0804DA50: .4byte 0x00002cd0 _0804DA54: .4byte gUnknown_2031DA8 @@ -2395,7 +2395,7 @@ _0804DA7A: adds r1, r5, 0 eors r1, r2 lsls r1, 8 - ldr r2, _0804DA9C @ =gUnknown_2022118 + ldr r2, _0804DA9C @ =gBlockRecvBuffer adds r1, r2 movs r2, 0xD8 bl sub_804D814 @@ -2405,10 +2405,10 @@ _0804DA7A: b _0804DB96 .align 2, 0 _0804DA98: .4byte gUnknown_2031CCC -_0804DA9C: .4byte gUnknown_2022118 +_0804DA9C: .4byte gBlockRecvBuffer _0804DAA0: .4byte gUnknown_2031DA8 _0804DAA4: - ldr r0, _0804DABC @ =gUnknown_2022618 + ldr r0, _0804DABC @ =gBlockSendBuffer ldr r1, _0804DAC0 @ =gSaveBlock1Ptr ldr r1, [r1] ldr r2, _0804DAC4 @ =0x0000309c @@ -2419,7 +2419,7 @@ _0804DAA4: ldr r1, [r0] b _0804DB96 .align 2, 0 -_0804DABC: .4byte gUnknown_2022618 +_0804DABC: .4byte gBlockSendBuffer _0804DAC0: .4byte gSaveBlock1Ptr _0804DAC4: .4byte 0x0000309c _0804DAC8: .4byte gUnknown_2031DA8 @@ -2447,7 +2447,7 @@ _0804DAE0: adds r1, r5, 0 eors r1, r2 lsls r1, 8 - ldr r2, _0804DB10 @ =gUnknown_2022118 + ldr r2, _0804DB10 @ =gBlockRecvBuffer adds r1, r2 movs r2, 0xB bl sub_804D814 @@ -2456,7 +2456,7 @@ _0804DAE0: b _0804DB96 .align 2, 0 _0804DB0C: .4byte gUnknown_2031DA8 -_0804DB10: .4byte gUnknown_2022118 +_0804DB10: .4byte gBlockRecvBuffer _0804DB14: ldr r4, _0804DB68 @ =gEnemyParty ldr r6, _0804DB6C @ =0x0000012f @@ -2564,7 +2564,7 @@ sub_804DBD4: @ 804DBD4 ands r0, r2 cmp r0, 0 beq _0804DC58 - ldr r0, _0804DBFC @ =gUnknown_2022118 + ldr r0, _0804DBFC @ =gBlockRecvBuffer ldrh r1, [r0] ldr r0, _0804DC00 @ =0x0000bbbb cmp r1, r0 @@ -2576,7 +2576,7 @@ sub_804DBD4: @ 804DBD4 beq _0804DC28 b _0804DC52 .align 2, 0 -_0804DBFC: .4byte gUnknown_2022118 +_0804DBFC: .4byte gBlockRecvBuffer _0804DC00: .4byte 0x0000bbbb _0804DC04: .4byte 0x0000aabb _0804DC08: @@ -2626,7 +2626,7 @@ _0804DC58: ands r0, r2 cmp r0, 0 beq _0804DCEA - ldr r3, _0804DC84 @ =gUnknown_2022118 + ldr r3, _0804DC84 @ =gBlockRecvBuffer movs r1, 0x80 lsls r1, 1 adds r0, r3, r1 @@ -2642,7 +2642,7 @@ _0804DC58: b _0804DCE4 .align 2, 0 _0804DC80: .4byte gUnknown_2031DA8 -_0804DC84: .4byte gUnknown_2022118 +_0804DC84: .4byte gBlockRecvBuffer _0804DC88: .4byte 0x0000bbbb _0804DC8C: .4byte 0x0000aabb _0804DC90: @@ -2712,7 +2712,7 @@ sub_804DCF4: @ 804DCF4 ands r0, r5 cmp r0, 0 beq _0804DDD6 - ldr r2, _0804DD20 @ =gUnknown_2022118 + ldr r2, _0804DD20 @ =gBlockRecvBuffer ldrh r1, [r2] ldr r0, _0804DD24 @ =0x0000ddee cmp r1, r0 @@ -2727,7 +2727,7 @@ sub_804DCF4: @ 804DCF4 beq _0804DD6C b _0804DDD0 .align 2, 0 -_0804DD20: .4byte gUnknown_2022118 +_0804DD20: .4byte gBlockRecvBuffer _0804DD24: .4byte 0x0000ddee _0804DD28: .4byte 0x0000ccdd _0804DD2C: .4byte 0x0000dddd @@ -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,21 +4247,21 @@ _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 cmp r0, 0 bne _0804E93C - ldr r0, _0804E928 @ =gUnknown_3003F3C + ldr r0, _0804E928 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804E92C bl sub_800AB9C b _0804E932 .align 2, 0 -_0804E924: .4byte gUnknown_2037AB8 -_0804E928: .4byte gUnknown_3003F3C +_0804E924: .4byte gPaletteFade +_0804E928: .4byte gWirelessCommType _0804E92C: movs r0, 0xC bl sub_800AA80 @@ -4281,7 +4281,7 @@ _0804E940: .4byte gUnknown_2031DA8 thumb_func_start sub_804E944 sub_804E944: @ 804E944 push {lr} - ldr r0, _0804E978 @ =gUnknown_3003F3C + ldr r0, _0804E978 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0804E988 @@ -4301,12 +4301,12 @@ sub_804E944: @ 804E944 bl SetMainCallback2 b _0804E9AA .align 2, 0 -_0804E978: .4byte gUnknown_3003F3C +_0804E978: .4byte gWirelessCommType _0804E97C: .4byte gUnknown_2031C90 _0804E980: .4byte gUnknown_2031DA8 _0804E984: .4byte c2_8056854 _0804E988: - ldr r0, _0804E9B0 @ =gUnknown_3003F64 + ldr r0, _0804E9B0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0804E9AA @@ -4323,7 +4323,7 @@ _0804E9AA: pop {r0} bx r0 .align 2, 0 -_0804E9B0: .4byte gUnknown_3003F64 +_0804E9B0: .4byte gReceivedRemoteLinkPlayers _0804E9B4: .4byte gUnknown_2031C90 _0804E9B8: .4byte gUnknown_2031DA8 _0804E9BC: .4byte c2_8056854 @@ -5033,7 +5033,7 @@ _0804EF50: adds r1, r0, 0 movs r0, 0xD muls r1, r0 - ldr r0, _0804EF84 @ =gUnknown_8247094 + ldr r0, _0804EF84 @ =gMoveNames adds r1, r0 adds r0, r6, 0 bl StringAppend @@ -5049,7 +5049,7 @@ _0804EF6C: b _0804EF9C .align 2, 0 _0804EF80: .4byte gUnknown_8261EB6 -_0804EF84: .4byte gUnknown_8247094 +_0804EF84: .4byte gMoveNames _0804EF88: .4byte gUnknown_8261EC7 _0804EF8C: ldr r1, _0804EFAC @ =gUnknown_8261EB6 @@ -6573,7 +6573,7 @@ _0804FB24: thumb_func_start sub_804FB34 sub_804FB34: @ 804FB34 push {r4-r7,lr} - ldr r0, _0804FBB4 @ =gUnknown_3003F64 + ldr r0, _0804FBB4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _0804FBC0 @@ -6634,7 +6634,7 @@ _0804FB6E: movs r0, 0x2 b _0804FBC2 .align 2, 0 -_0804FBB4: .4byte gUnknown_3003F64 +_0804FBB4: .4byte gReceivedRemoteLinkPlayers _0804FBB8: .4byte gLinkPlayers _0804FBBC: movs r0, 0x1 @@ -7209,14 +7209,14 @@ _0804FFC0: .4byte c2_800ACD4 thumb_func_start sub_804FFC4 sub_804FFC4: @ 804FFC4 push {lr} - ldr r0, _0804FFD4 @ =gUnknown_3003F64 + ldr r0, _0804FFD4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0804FFD8 movs r0, 0 b _0804FFE0 .align 2, 0 -_0804FFD4: .4byte gUnknown_3003F64 +_0804FFD4: .4byte gReceivedRemoteLinkPlayers _0804FFD8: bl GetMultiplayerId lsls r0, 24 @@ -7424,11 +7424,11 @@ _08050160: .4byte _08050430 .4byte _0805044C _08050194: - ldr r0, _08050228 @ =gUnknown_3003F64 + ldr r0, _08050228 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _080501A8 - ldr r1, _0805022C @ =gUnknown_202271A + ldr r1, _0805022C @ =gLinkType ldr r2, _08050230 @ =0x00001144 adds r0, r2, 0 strh r0, [r1] @@ -7490,14 +7490,14 @@ _080501A8: strh r2, [r0] b _08050472 .align 2, 0 -_08050228: .4byte gUnknown_3003F64 -_0805022C: .4byte gUnknown_202271A +_08050228: .4byte gReceivedRemoteLinkPlayers +_0805022C: .4byte gLinkType _08050230: .4byte 0x00001144 _08050234: .4byte gUnknown_2031DAC _08050238: .4byte sub_804FF0C _0805023C: .4byte gMain _08050240: - ldr r0, _08050270 @ =gUnknown_3003F64 + ldr r0, _08050270 @ =gReceivedRemoteLinkPlayers ldrb r5, [r0] cmp r5, 0 bne _0805027C @@ -7520,7 +7520,7 @@ _08050240: str r5, [r0, 0x64] b _08050472 .align 2, 0 -_08050270: .4byte gUnknown_3003F64 +_08050270: .4byte gReceivedRemoteLinkPlayers _08050274: .4byte gUnknown_2031DAC _08050278: .4byte gMain _0805027C: @@ -7585,7 +7585,7 @@ _080502EC: b _08050472 _080502F2: bl sub_804FF4C - ldr r0, _08050318 @ =gUnknown_3003F64 + ldr r0, _08050318 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 beq _08050300 @@ -7604,7 +7604,7 @@ _0805030E: adds r1, r2 b _08050440 .align 2, 0 -_08050318: .4byte gUnknown_3003F64 +_08050318: .4byte gReceivedRemoteLinkPlayers _0805031C: .4byte gMain _08050320: ldr r2, _08050340 @ =gUnknown_2031DAC @@ -7706,7 +7706,7 @@ _0805039C: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _08050428 @ =gUnknown_2022744 + ldr r0, _08050428 @ =gLinkPlayers + 8 adds r1, r0 adds r0, r4, 0 movs r2, 0x7 @@ -7721,7 +7721,7 @@ _08050418: .4byte gUnknown_2031DA4 _0805041C: .4byte gPlayerParty _08050420: .4byte gUnknown_2031DAC _08050424: .4byte gEnemyParty -_08050428: .4byte gUnknown_2022744 +_08050428: .4byte gLinkPlayers + 8 _0805042C: .4byte gMain _08050430: bl sub_805049C @@ -7739,13 +7739,13 @@ _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 cmp r0, 0 bne _08050472 - ldr r0, _08050494 @ =gUnknown_3003F3C + ldr r0, _08050494 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0805046C @@ -7767,8 +7767,8 @@ _08050472: pop {r0} bx r0 .align 2, 0 -_08050490: .4byte gUnknown_2037AB8 -_08050494: .4byte gUnknown_3003F3C +_08050490: .4byte gPaletteFade +_08050494: .4byte gWirelessCommType _08050498: .4byte sub_8053D84 thumb_func_end sub_8050138 @@ -7850,7 +7850,7 @@ sub_80504CC: @ 80504CC movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r0, _080505BC @ =gUnknown_8D0051C + ldr r0, _080505BC @ =gFile_graphics_interface_menu_map_tilemap mov r8, r0 ldr r4, _080505C0 @ =gDecompressionBuffer adds r1, r4, 0 @@ -7897,7 +7897,7 @@ sub_80504CC: @ 80504CC .align 2, 0 _080505B4: .4byte gUnknown_826D1D4 _080505B8: .4byte gUnknown_8D00000 -_080505BC: .4byte gUnknown_8D0051C +_080505BC: .4byte gFile_graphics_interface_menu_map_tilemap _080505C0: .4byte gDecompressionBuffer _080505C4: .4byte gUnknown_8D004D8 _080505C8: .4byte gUnknown_826D1BC @@ -7947,7 +7947,7 @@ _08050628: strb r0, [r1] movs r0, 0x6 strb r0, [r1, 0x1] - ldr r4, _080506D4 @ =gUnknown_2022744 + ldr r4, _080506D4 @ =gLinkPlayers + 8 ldr r0, _080506D8 @ =gSaveBlock2Ptr ldr r1, [r0] adds r0, r4, 0 @@ -8014,7 +8014,7 @@ _08050628: .align 2, 0 _080506CC: .4byte gUnknown_2031DA4 _080506D0: .4byte gSpecialVar_0x8005 -_080506D4: .4byte gUnknown_2022744 +_080506D4: .4byte gLinkPlayers + 8 _080506D8: .4byte gSaveBlock2Ptr _080506DC: .4byte gEnemyParty _080506E0: .4byte gUnknown_2031DAC @@ -8131,7 +8131,7 @@ sub_80507A0: @ 80507A0 lsrs r4, 16 adds r0, r4, 0 movs r1, 0x2 - bl sub_8088E74 + bl GetSetPokedexFlag adds r0, r4, 0 movs r1, 0x3 adds r2, r5, 0 @@ -8236,7 +8236,7 @@ _080508A2: _080508B8: mov r0, r9 bl sub_80507A0 - ldr r0, _080508F0 @ =gUnknown_3003F64 + ldr r0, _080508F0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _080508CA @@ -8256,7 +8256,7 @@ _080508E0: .4byte gSaveBlock1Ptr _080508E4: .4byte 0x00002cd0 _080508E8: .4byte gUnknown_2031DAC _080508EC: .4byte gUnknown_2031CCC -_080508F0: .4byte gUnknown_3003F64 +_080508F0: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_805080C thumb_func_start sub_80508F4 @@ -8490,7 +8490,7 @@ _08050AC4: ldr r1, _08050AF8 @ =0x00001241 movs r0, 0 bl SetGpuReg - ldr r0, _08050AFC @ =gUnknown_826BA5C + ldr r0, _08050AFC @ =gUnknown_3379A0Bin ldr r1, _08050B00 @ =0x06002800 bl LZ77UnCompVram movs r0, 0x8 @@ -8498,7 +8498,7 @@ _08050AC4: .align 2, 0 _08050AF4: .4byte gUnknown_2031DAC _08050AF8: .4byte 0x00001241 -_08050AFC: .4byte gUnknown_826BA5C +_08050AFC: .4byte gUnknown_3379A0Bin _08050B00: .4byte 0x06002800 _08050B04: ldr r1, _08050B28 @ =0x00001241 @@ -8529,7 +8529,7 @@ _08050B3C: movs r1, 0x30 movs r2, 0x20 bl LoadPalette - ldr r0, _08050B70 @ =gUnknown_826BF7C + ldr r0, _08050B70 @ =gWirelessSignal4bpp ldr r1, _08050B74 @ =0x06004000 bl LZ77UnCompVram ldr r0, _08050B78 @ =gUnknown_826C60C @@ -8548,7 +8548,7 @@ _08050B64: b _08050DB4 .align 2, 0 _08050B6C: .4byte gUnknown_826BF5C -_08050B70: .4byte gUnknown_826BF7C +_08050B70: .4byte gWirelessSignal4bpp _08050B74: .4byte 0x06004000 _08050B78: .4byte gUnknown_826C60C _08050B7C: .4byte 0x06009000 @@ -8871,7 +8871,7 @@ sub_8050E24: @ 8050E24 lsls r1, r2, 3 subs r1, r2 lsls r1, 2 - ldr r0, _08050E9C @ =gUnknown_2022744 + ldr r0, _08050E9C @ =gLinkPlayers + 8 adds r1, r0 adds r0, r3, 0 bl StringCopy @@ -8905,14 +8905,14 @@ sub_8050E24: @ 8050E24 .align 2, 0 _08050E94: .4byte gUnknown_2031DAC _08050E98: .4byte gStringVar1 -_08050E9C: .4byte gUnknown_2022744 +_08050E9C: .4byte gLinkPlayers + 8 _08050EA0: .4byte gUnknown_2031DA4 _08050EA4: .4byte gEnemyParty _08050EA8: .4byte gStringVar3 _08050EAC: .4byte gPlayerParty _08050EB0: .4byte gStringVar2 _08050EB4: - ldr r0, _08050EF8 @ =gUnknown_20370C0 + ldr r0, _08050EF8 @ =gSpecialVar_0x8004 ldrh r0, [r0] lsls r4, r0, 4 subs r4, r0 @@ -8944,7 +8944,7 @@ _08050EF0: pop {r0} bx r0 .align 2, 0 -_08050EF8: .4byte gUnknown_20370C0 +_08050EF8: .4byte gSpecialVar_0x8004 _08050EFC: .4byte gUnknown_826CF8C _08050F00: .4byte gStringVar1 _08050F04: .4byte gStringVar3 @@ -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 @@ -13477,7 +13477,7 @@ sub_805383C: @ 805383C ands r0, r6 cmp r0, 0 beq _0805387A - ldr r4, _080538A8 @ =gUnknown_2022118 + ldr r4, _080538A8 @ =gBlockRecvBuffer ldrh r1, [r4] ldr r0, _080538AC @ =0x0000dcba cmp r1, r0 @@ -13501,7 +13501,7 @@ _0805387A: ands r0, r5 cmp r0, 0 beq _080538A2 - ldr r0, _080538A8 @ =gUnknown_2022118 + ldr r0, _080538A8 @ =gBlockRecvBuffer movs r1, 0x80 lsls r1, 1 adds r0, r1 @@ -13522,7 +13522,7 @@ _080538A2: pop {r0} bx r0 .align 2, 0 -_080538A8: .4byte gUnknown_2022118 +_080538A8: .4byte gBlockRecvBuffer _080538AC: .4byte 0x0000dcba _080538B0: .4byte sub_8053788 _080538B4: .4byte 0x0000abcd @@ -13782,7 +13782,7 @@ _08053A98: .4byte SpriteCallbackDummy thumb_func_start sub_8053A9C sub_8053A9C: @ 8053A9C push {r4-r6,lr} - ldr r0, _08053AD0 @ =gUnknown_20370C0 + ldr r0, _08053AD0 @ =gSpecialVar_0x8004 ldrh r0, [r0] lsls r4, r0, 4 subs r4, r0 @@ -13806,7 +13806,7 @@ sub_8053A9C: @ 8053A9C pop {r1} bx r1 .align 2, 0 -_08053AD0: .4byte gUnknown_20370C0 +_08053AD0: .4byte gSpecialVar_0x8004 _08053AD4: .4byte gUnknown_826CF8C _08053AD8: .4byte gStringVar1 _08053ADC: .4byte gSpeciesNames @@ -13817,7 +13817,7 @@ _08053AE0: .4byte gStringVar2 sub_8053AE4: @ 8053AE4 push {r4,lr} sub sp, 0x20 - ldr r0, _08053B2C @ =gUnknown_20370C0 + ldr r0, _08053B2C @ =gSpecialVar_0x8004 ldrh r0, [r0] lsls r4, r0, 4 subs r4, r0 @@ -13848,7 +13848,7 @@ sub_8053AE4: @ 8053AE4 pop {r0} bx r0 .align 2, 0 -_08053B2C: .4byte gUnknown_20370C0 +_08053B2C: .4byte gSpecialVar_0x8004 _08053B30: .4byte gUnknown_826CF8C _08053B34: .4byte gSpecialVar_0x8005 _08053B38: .4byte gPlayerParty @@ -14115,14 +14115,14 @@ sub_8053D68: @ 8053D68 push {lr} ldr r0, _08053D7C @ =gSpecialVar_0x8005 ldrb r0, [r0] - ldr r1, _08053D80 @ =gUnknown_20370C0 + ldr r1, _08053D80 @ =gSpecialVar_0x8004 ldrb r1, [r1] bl sub_8053B48 pop {r0} bx r0 .align 2, 0 _08053D7C: .4byte gSpecialVar_0x8005 -_08053D80: .4byte gUnknown_20370C0 +_08053D80: .4byte gSpecialVar_0x8004 thumb_func_end sub_8053D68 thumb_func_start sub_8053D84 @@ -14476,7 +14476,7 @@ _08054120: movs r0, 0x15 bl IncrementGameStat _08054132: - ldr r0, _08054178 @ =gUnknown_3003F3C + ldr r0, _08054178 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _0805415A @@ -14508,7 +14508,7 @@ _0805415A: b _080541F2 .align 2, 0 _08054174: .4byte gUnknown_2031DAC -_08054178: .4byte gUnknown_3003F3C +_08054178: .4byte gWirelessCommType _0805417C: .4byte gLinkPlayers _08054180: .4byte gMain _08054184: @@ -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 @@ -14707,7 +14707,7 @@ _08054304: lsrs r0, 24 cmp r0, 0x1 bne _08054396 - ldr r0, _08054328 @ =gUnknown_3003F3C + ldr r0, _08054328 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08054334 @@ -14719,7 +14719,7 @@ _08054304: bl sub_800AB9C b _08054338 .align 2, 0 -_08054328: .4byte gUnknown_3003F3C +_08054328: .4byte gWirelessCommType _0805432C: .4byte gMain _08054330: .4byte sub_804C718 _08054334: @@ -14737,7 +14737,7 @@ _08054340: .align 2, 0 _08054348: .4byte gMain _0805434C: - ldr r0, _08054374 @ =gUnknown_3003F3C + ldr r0, _08054374 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08054384 @@ -14756,12 +14756,12 @@ _0805434C: bl SetMainCallback2 b _08054396 .align 2, 0 -_08054374: .4byte gUnknown_3003F3C +_08054374: .4byte gWirelessCommType _08054378: .4byte sub_804C718 _0805437C: .4byte gSoftResetDisabled _08054380: .4byte sub_80543C4 _08054384: - ldr r0, _080543B8 @ =gUnknown_3003F64 + ldr r0, _080543B8 @ =gReceivedRemoteLinkPlayers ldrb r1, [r0] cmp r1, 0 bne _08054396 @@ -14784,7 +14784,7 @@ _080543A4: pop {r0} bx r0 .align 2, 0 -_080543B8: .4byte gUnknown_3003F64 +_080543B8: .4byte gReceivedRemoteLinkPlayers _080543BC: .4byte gSoftResetDisabled _080543C0: .4byte sub_80543C4 thumb_func_end sub_8053E8C @@ -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 @@ -14815,7 +14815,7 @@ sub_80543C4: @ 80543C4 ldr r0, [r4] bl Free str r5, [r4] - ldr r0, _08054438 @ =gUnknown_3003F3C + ldr r0, _08054438 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08054412 @@ -14833,9 +14833,9 @@ _0805441A: pop {r0} bx r0 .align 2, 0 -_08054430: .4byte gUnknown_2037AB8 +_08054430: .4byte gPaletteFade _08054434: .4byte gUnknown_2031DAC -_08054438: .4byte gUnknown_3003F3C +_08054438: .4byte gWirelessCommType _0805443C: .4byte gMain thumb_func_end sub_80543C4 @@ -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/trainer_card.s b/asm/trainer_card.s index 7f330c8f9..e44503915 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -200,11 +200,11 @@ _08089194: bl sub_808AF74 b _08089214 _0808919A: - ldr r0, _080891D0 @ =gUnknown_3003F3C + ldr r0, _080891D0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0x1 bne _080891B6 - ldr r0, _080891D4 @ =gUnknown_3003F64 + ldr r0, _080891D4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _080891B6 @@ -224,8 +224,8 @@ _080891B6: bl SetVBlankCallback b _08089214 .align 2, 0 -_080891D0: .4byte gUnknown_3003F3C -_080891D4: .4byte gUnknown_3003F64 +_080891D0: .4byte gWirelessCommType +_080891D4: .4byte gReceivedRemoteLinkPlayers _080891D8: .4byte sub_8088FF0 _080891DC: bl UpdatePaletteFade @@ -266,7 +266,7 @@ _08089218: .align 2, 0 _08089220: .4byte gUnknown_20397A4 _08089224: - ldr r0, _08089270 @ =gUnknown_3003F64 + ldr r0, _08089270 @ =gReceivedRemoteLinkPlayers ldrb r5, [r0] cmp r5, 0 bne _0808924A @@ -301,7 +301,7 @@ _0808924A: strb r0, [r1] b _08089416 .align 2, 0 -_08089270: .4byte gUnknown_3003F64 +_08089270: .4byte gReceivedRemoteLinkPlayers _08089274: .4byte 0x00007bce _08089278: .4byte gMain _0808927C: .4byte gUnknown_20397A4 @@ -312,7 +312,7 @@ _08089280: bne _0808928A b _08089416 _0808928A: - ldr r0, _080892B0 @ =gUnknown_3003F64 + ldr r0, _080892B0 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _080892A4 @@ -331,7 +331,7 @@ _080892A4: str r1, [sp] b _080893C8 .align 2, 0 -_080892B0: .4byte gUnknown_3003F64 +_080892B0: .4byte gReceivedRemoteLinkPlayers _080892B4: .4byte gUnknown_20397A4 _080892B8: bl sub_808B1FC @@ -361,7 +361,7 @@ _080892E4: ands r0, r1 cmp r0, 0 beq _08089344 - ldr r0, _08089320 @ =gUnknown_3003F64 + ldr r0, _08089320 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08089324 @@ -373,7 +373,7 @@ _080892E4: cmp r0, 0x1 beq _08089364 _08089308: - ldr r0, _08089320 @ =gUnknown_3003F64 + ldr r0, _08089320 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08089324 @@ -384,7 +384,7 @@ _08089308: b _080893C8 .align 2, 0 _0808931C: .4byte gMain -_08089320: .4byte gUnknown_3003F64 +_08089320: .4byte gReceivedRemoteLinkPlayers _08089324: movs r0, 0xA bl sub_812B1F0 @@ -403,7 +403,7 @@ _08089344: ands r0, r1 cmp r0, 0 beq _08089416 - ldr r0, _0808936C @ =gUnknown_3003F64 + ldr r0, _0808936C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08089370 @@ -420,7 +420,7 @@ _08089364: strb r0, [r1] b _08089416 .align 2, 0 -_0808936C: .4byte gUnknown_3003F64 +_0808936C: .4byte gReceivedRemoteLinkPlayers _08089370: movs r0, 0x1 negs r0, r0 @@ -454,7 +454,7 @@ _0808937A: _080893B0: .4byte gUnknown_8419D89 _080893B4: .4byte gUnknown_20397A4 _080893B8: - ldr r0, _080893DC @ =gUnknown_3003F64 + ldr r0, _080893DC @ =gReceivedRemoteLinkPlayers ldrb r1, [r0] cmp r1, 0 bne _08089416 @@ -472,7 +472,7 @@ _080893C8: strb r0, [r1] b _08089416 .align 2, 0 -_080893DC: .4byte gUnknown_3003F64 +_080893DC: .4byte gReceivedRemoteLinkPlayers _080893E0: .4byte gUnknown_20397A4 _080893E4: bl UpdatePaletteFade @@ -1418,7 +1418,7 @@ sub_8089B64: @ 8089B64 movs r0, 0x40 movs r1, 0xF0 bl SetGpuReg - ldr r0, _08089BC8 @ =gUnknown_3003F64 + ldr r0, _08089BC8 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08089BCC @@ -1426,7 +1426,7 @@ sub_8089B64: @ 8089B64 bl EnableInterrupts b _08089BD2 .align 2, 0 -_08089BC8: .4byte gUnknown_3003F64 +_08089BC8: .4byte gReceivedRemoteLinkPlayers _08089BCC: movs r0, 0x3 bl EnableInterrupts @@ -4482,7 +4482,7 @@ _0808B4B2: ldrb r0, [r1, 0x4] adds r0, 0x1 strb r0, [r1, 0x4] - ldr r0, _0808B4D4 @ =gUnknown_3003F64 + ldr r0, _0808B4D4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _0808B3DC @@ -4494,7 +4494,7 @@ _0808B4C4: bx r1 .align 2, 0 _0808B4D0: .4byte gUnknown_20397A4 -_0808B4D4: .4byte gUnknown_3003F64 +_0808B4D4: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_808B3C4 thumb_func_start sub_808B4D8 @@ -4946,7 +4946,7 @@ sub_808B838: @ 808B838 bl InUnionRoom cmp r0, 0x1 bne _0808B8A4 - ldr r0, _0808B898 @ =gUnknown_3003F64 + ldr r0, _0808B898 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0x1 bne _0808B8A4 @@ -4970,7 +4970,7 @@ _0808B888: .4byte gUnknown_83CD8F4 _0808B88C: .4byte gUnknown_20397A4 _0808B890: .4byte 0x0000045c _0808B894: .4byte 0x00000457 -_0808B898: .4byte gUnknown_3003F64 +_0808B898: .4byte gReceivedRemoteLinkPlayers _0808B89C: .4byte 0x000004ab _0808B8A0: .4byte gUnknown_83CD8EC _0808B8A4: diff --git a/asm/trainer_see.s b/asm/trainer_see.s index cfdd02906..6cc322609 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_8081B30 -sub_8081B30: @ 8081B30 + thumb_func_start CheckForTrainersWantingBattle +CheckForTrainersWantingBattle: @ 8081B30 push {r4,r5,lr} bl sub_8111C2C lsls r0, 24 @@ -54,7 +54,7 @@ _08081B7A: bx r1 .align 2, 0 _08081B80: .4byte gMapObjects - thumb_func_end sub_8081B30 + thumb_func_end CheckForTrainersWantingBattle thumb_func_start sub_8081B84 sub_8081B84: @ 8081B84 @@ -585,7 +585,7 @@ sub_8081F38: @ 8081F38 movs r0, 0xC b _08081F82 _08081F54: - ldr r1, _08081F8C @ =gUnknown_20386E0 + ldr r1, _08081F8C @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -611,7 +611,7 @@ _08081F82: pop {r1} bx r1 .align 2, 0 -_08081F8C: .4byte gUnknown_20386E0 +_08081F8C: .4byte gFieldEffectArguments thumb_func_end sub_8081F38 thumb_func_start sub_8081F90 @@ -735,7 +735,7 @@ _0808204A: bl sub_805FE7C adds r0, r4, 0 bl sub_805FE5C - ldr r0, _080820B4 @ =gUnknown_2037078 + ldr r0, _080820B4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -763,7 +763,7 @@ _080820AC: pop {r1} bx r1 .align 2, 0 -_080820B4: .4byte gUnknown_2037078 +_080820B4: .4byte gPlayerAvatar _080820B8: .4byte gMapObjects thumb_func_end sub_808202C @@ -772,7 +772,7 @@ sub_80820BC: @ 80820BC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080820F8 @ =gUnknown_2037078 + ldr r0, _080820F8 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -798,7 +798,7 @@ _080820EE: pop {r1} bx r1 .align 2, 0 -_080820F8: .4byte gUnknown_2037078 +_080820F8: .4byte gPlayerAvatar _080820FC: .4byte gMapObjects thumb_func_end sub_80820BC @@ -888,7 +888,7 @@ sub_8082184: @ 8082184 lsls r0, 24 cmp r0, 0 beq _080821CA - ldr r2, _080821D4 @ =gUnknown_20386E0 + ldr r2, _080821D4 @ =gFieldEffectArguments movs r1, 0x10 ldrsh r0, [r4, r1] str r0, [r2] @@ -919,7 +919,7 @@ _080821CA: pop {r1} bx r1 .align 2, 0 -_080821D4: .4byte gUnknown_20386E0 +_080821D4: .4byte gFieldEffectArguments _080821D8: .4byte gSprites thumb_func_end sub_8082184 @@ -1113,7 +1113,7 @@ _08082312: _08082348: .4byte gSaveBlock1Ptr _0808234C: .4byte gMapObjects _08082350: - ldr r1, _08082378 @ =gUnknown_20386E0 + ldr r1, _08082378 @ =gFieldEffectArguments adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -1133,7 +1133,7 @@ _0808236E: pop {r1} bx r1 .align 2, 0 -_08082378: .4byte gUnknown_20386E0 +_08082378: .4byte gFieldEffectArguments thumb_func_end sub_80822CC thumb_func_start sub_808237C @@ -1525,7 +1525,7 @@ sub_808265C: @ 808265C orrs r3, r4 mov r4, r12 strb r3, [r4] - ldr r4, _080826A0 @ =gUnknown_20386E0 + ldr r4, _080826A0 @ =gFieldEffectArguments ldr r3, [r4] strh r3, [r0, 0x2E] ldr r3, [r4, 0x4] @@ -1541,7 +1541,7 @@ sub_808265C: @ 808265C pop {r0} bx r0 .align 2, 0 -_080826A0: .4byte gUnknown_20386E0 +_080826A0: .4byte gFieldEffectArguments _080826A4: .4byte 0x0000fffb thumb_func_end sub_808265C diff --git a/asm/trainer_tower.s b/asm/trainer_tower.s index 6ef1e7468..5b65927d5 100644 --- a/asm/trainer_tower.s +++ b/asm/trainer_tower.s @@ -303,7 +303,7 @@ sub_815D9E8: @ 815D9E8 push {lr} bl sub_815DC8C ldr r1, _0815DA08 @ =gUnknown_847A230 - ldr r0, _0815DA0C @ =gUnknown_20370C0 + ldr r0, _0815DA0C @ =gSpecialVar_0x8004 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -314,7 +314,7 @@ sub_815D9E8: @ 815D9E8 bx r0 .align 2, 0 _0815DA08: .4byte gUnknown_847A230 -_0815DA0C: .4byte gUnknown_20370C0 +_0815DA0C: .4byte gSpecialVar_0x8004 thumb_func_end sub_815D9E8 thumb_func_start sub_815DA10 @@ -741,7 +741,7 @@ sub_815DD44: @ 815DD44 ldrb r1, [r4, 0x4] cmp r0, r1 ble _0815DD78 - ldr r0, _0815DD74 @ =gUnknown_20370D0 + ldr r0, _0815DD74 @ =gSpecialVar_Result movs r1, 0x3 strh r1, [r0] movs r0, 0x99 @@ -752,9 +752,9 @@ sub_815DD44: @ 815DD44 _0815DD68: .4byte gMapHeader _0815DD6C: .4byte 0xfffffed7 _0815DD70: .4byte gUnknown_203F458 -_0815DD74: .4byte gUnknown_20370D0 +_0815DD74: .4byte gSpecialVar_Result _0815DD78: - ldr r3, _0815DDA8 @ =gUnknown_20370D0 + ldr r3, _0815DDA8 @ =gSpecialVar_Result ldrb r1, [r4] lsls r0, r1, 5 subs r0, r1 @@ -778,7 +778,7 @@ _0815DDA2: pop {r0} bx r0 .align 2, 0 -_0815DDA8: .4byte gUnknown_20370D0 +_0815DDA8: .4byte gSpecialVar_Result _0815DDAC: .4byte gUnknown_847A284 thumb_func_end sub_815DD44 @@ -1015,7 +1015,7 @@ _0815DF4E: thumb_func_start sub_815DF54 sub_815DF54: @ 815DF54 push {r4,r5,lr} - ldr r0, _0815DF90 @ =gUnknown_20370C4 + ldr r0, _0815DF90 @ =gSpecialVar_0x8006 ldrh r4, [r0] ldr r2, _0815DF94 @ =gUnknown_203F458 ldr r3, [r2] @@ -1046,7 +1046,7 @@ _0815DF7C: beq _0815DFA6 b _0815E05C .align 2, 0 -_0815DF90: .4byte gUnknown_20370C4 +_0815DF90: .4byte gSpecialVar_0x8006 _0815DF94: .4byte gUnknown_203F458 _0815DF98: .4byte gSpecialVar_0x8005 _0815DF9C: @@ -1335,7 +1335,7 @@ sub_815E1C0: @ 815E1C0 ldrh r0, [r0] cmp r0, 0 bne _0815E1DE - ldr r3, _0815E1E8 @ =gUnknown_20370D0 + ldr r3, _0815E1E8 @ =gSpecialVar_Result ldr r0, _0815E1EC @ =gUnknown_203F458 ldr r1, [r0] ldrb r2, [r1] @@ -1350,7 +1350,7 @@ _0815E1DE: bx r0 .align 2, 0 _0815E1E4: .4byte gSpecialVar_0x8005 -_0815E1E8: .4byte gUnknown_20370D0 +_0815E1E8: .4byte gSpecialVar_Result _0815E1EC: .4byte gUnknown_203F458 thumb_func_end sub_815E1C0 @@ -1412,7 +1412,7 @@ sub_815E218: @ 815E218 ldrb r1, [r1, 0xD] cmp r3, r1 bgt _0815E27C - ldr r1, _0815E278 @ =gUnknown_20370D0 + ldr r1, _0815E278 @ =gSpecialVar_Result movs r0, 0 b _0815E280 .align 2, 0 @@ -1422,16 +1422,16 @@ _0815E268: .4byte gSaveBlock1Ptr _0815E26C: .4byte 0x00003d34 _0815E270: .4byte 0xfffffed7 _0815E274: .4byte gUnknown_203F458 -_0815E278: .4byte gUnknown_20370D0 +_0815E278: .4byte gSpecialVar_Result _0815E27C: - ldr r1, _0815E288 @ =gUnknown_20370D0 + ldr r1, _0815E288 @ =gSpecialVar_Result movs r0, 0x1 _0815E280: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_0815E288: .4byte gUnknown_20370D0 +_0815E288: .4byte gSpecialVar_Result thumb_func_end sub_815E218 thumb_func_start sub_815E28C @@ -1566,7 +1566,7 @@ _0815E390: .4byte 0x00003d38 sub_815E394: @ 815E394 push {lr} bl DisableVBlankCounter1 - ldr r3, _0815E3F8 @ =gUnknown_20370D0 + ldr r3, _0815E3F8 @ =gSpecialVar_Result movs r0, 0 strh r0, [r3] ldr r0, _0815E3FC @ =gSaveBlock1Ptr @@ -1616,7 +1616,7 @@ _0815E3D6: pop {r0} bx r0 .align 2, 0 -_0815E3F8: .4byte gUnknown_20370D0 +_0815E3F8: .4byte gSpecialVar_Result _0815E3FC: .4byte gSaveBlock1Ptr _0815E400: .4byte 0x00003d34 _0815E404: .4byte 0x00003d42 @@ -1651,7 +1651,7 @@ sub_815E408: @ 815E408 lsrs r5, r0, 31 cmp r5, 0 beq _0815E45C - ldr r1, _0815E458 @ =gUnknown_20370D0 + ldr r1, _0815E458 @ =gSpecialVar_Result movs r0, 0x2 b _0815E4A0 .align 2, 0 @@ -1660,7 +1660,7 @@ _0815E448: .4byte gUnknown_203F458 _0815E44C: .4byte gSaveBlock1Ptr _0815E450: .4byte 0x00003d34 _0815E454: .4byte 0x00003d42 -_0815E458: .4byte gUnknown_20370D0 +_0815E458: .4byte gSpecialVar_Result _0815E45C: adds r0, r4, 0 movs r1, 0x1 @@ -1685,14 +1685,14 @@ _0815E45C: movs r2, 0x1 orrs r0, r2 strb r0, [r1] - ldr r0, _0815E498 @ =gUnknown_20370D0 + ldr r0, _0815E498 @ =gSpecialVar_Result strh r5, [r0] b _0815E4A2 .align 2, 0 _0815E494: .4byte gStringVar2 -_0815E498: .4byte gUnknown_20370D0 +_0815E498: .4byte gSpecialVar_Result _0815E49C: - ldr r1, _0815E4AC @ =gUnknown_20370D0 + ldr r1, _0815E4AC @ =gSpecialVar_Result movs r0, 0x1 _0815E4A0: strh r0, [r1] @@ -1703,7 +1703,7 @@ _0815E4A2: pop {r0} bx r0 .align 2, 0 -_0815E4AC: .4byte gUnknown_20370D0 +_0815E4AC: .4byte gSpecialVar_Result thumb_func_end sub_815E408 thumb_func_start sub_815E4B0 @@ -1725,14 +1725,14 @@ sub_815E4B0: @ 815E4B0 lsrs r5, r0, 31 cmp r5, 0 beq _0815E4E8 - ldr r1, _0815E4E4 @ =gUnknown_20370D0 + ldr r1, _0815E4E4 @ =gSpecialVar_Result movs r0, 0x2 b _0815E534 .align 2, 0 _0815E4D8: .4byte gSaveBlock1Ptr _0815E4DC: .4byte 0x00003d34 _0815E4E0: .4byte 0x00003d42 -_0815E4E4: .4byte gUnknown_20370D0 +_0815E4E4: .4byte gSpecialVar_Result _0815E4E8: ldr r4, _0815E520 @ =0x00003d38 adds r0, r1, r4 @@ -1756,16 +1756,16 @@ _0815E4E8: adds r0, r3 adds r1, r4, 0 bl sub_815EDF4 - ldr r0, _0815E52C @ =gUnknown_20370D0 + ldr r0, _0815E52C @ =gSpecialVar_Result strh r5, [r0] b _0815E536 .align 2, 0 _0815E520: .4byte 0x00003d38 _0815E524: .4byte 0x00003d34 _0815E528: .4byte 0x00003d3c -_0815E52C: .4byte gUnknown_20370D0 +_0815E52C: .4byte gSpecialVar_Result _0815E530: - ldr r1, _0815E55C @ =gUnknown_20370D0 + ldr r1, _0815E55C @ =gSpecialVar_Result movs r0, 0x1 _0815E534: strh r0, [r1] @@ -1789,7 +1789,7 @@ _0815E536: pop {r0} bx r0 .align 2, 0 -_0815E55C: .4byte gUnknown_20370D0 +_0815E55C: .4byte gSpecialVar_Result _0815E560: .4byte gSaveBlock1Ptr _0815E564: .4byte 0x00003d34 _0815E568: .4byte 0x00003d42 @@ -1887,14 +1887,14 @@ sub_815E5F0: @ 815E5F0 negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r1, _0815E62C @ =gUnknown_20370D0 + ldr r1, _0815E62C @ =gSpecialVar_Result movs r0, 0 b _0815E64C .align 2, 0 _0815E620: .4byte gSaveBlock1Ptr _0815E624: .4byte 0x00003d34 _0815E628: .4byte 0x00003d42 -_0815E62C: .4byte gUnknown_20370D0 +_0815E62C: .4byte gSpecialVar_Result _0815E630: lsls r0, r1, 27 cmp r0, 0 @@ -1903,20 +1903,20 @@ _0815E630: negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r1, _0815E644 @ =gUnknown_20370D0 + ldr r1, _0815E644 @ =gSpecialVar_Result movs r0, 0x1 b _0815E64C .align 2, 0 -_0815E644: .4byte gUnknown_20370D0 +_0815E644: .4byte gSpecialVar_Result _0815E648: - ldr r1, _0815E654 @ =gUnknown_20370D0 + ldr r1, _0815E654 @ =gSpecialVar_Result movs r0, 0x2 _0815E64C: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_0815E654: .4byte gUnknown_20370D0 +_0815E654: .4byte gSpecialVar_Result thumb_func_end sub_815E5F0 thumb_func_start sub_815E658 @@ -2187,7 +2187,7 @@ _0815E8B0: .4byte 0x00004001 thumb_func_start sub_815E8B4 sub_815E8B4: @ 815E8B4 push {r4,lr} - ldr r4, _0815E8C8 @ =gUnknown_20370D0 + ldr r4, _0815E8C8 @ =gSpecialVar_Result bl GetMonsStateToDoubles lsls r0, 24 lsrs r0, 24 @@ -2196,7 +2196,7 @@ sub_815E8B4: @ 815E8B4 pop {r0} bx r0 .align 2, 0 -_0815E8C8: .4byte gUnknown_20370D0 +_0815E8C8: .4byte gSpecialVar_Result thumb_func_end sub_815E8B4 thumb_func_start sub_815E8CC @@ -2213,22 +2213,22 @@ sub_815E8CC: @ 815E8CC movs r2, 0 movs r3, 0x1 bl ConvertIntToDecimalStringN - ldr r1, _0815E8F4 @ =gUnknown_20370D0 + ldr r1, _0815E8F4 @ =gSpecialVar_Result movs r0, 0x1 b _0815E8FC .align 2, 0 _0815E8EC: .4byte gUnknown_203F458 _0815E8F0: .4byte gStringVar1 -_0815E8F4: .4byte gUnknown_20370D0 +_0815E8F4: .4byte gSpecialVar_Result _0815E8F8: - ldr r1, _0815E904 @ =gUnknown_20370D0 + ldr r1, _0815E904 @ =gSpecialVar_Result movs r0, 0 _0815E8FC: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_0815E904: .4byte gUnknown_20370D0 +_0815E904: .4byte gSpecialVar_Result thumb_func_end sub_815E8CC thumb_func_start sub_815E908 @@ -2245,23 +2245,23 @@ sub_815E908: @ 815E908 lsrs r1, r0, 16 cmp r1, 0 bne _0815E938 - ldr r0, _0815E934 @ =gUnknown_20370D0 + ldr r0, _0815E934 @ =gSpecialVar_Result strh r1, [r0] b _0815E93E .align 2, 0 _0815E928: .4byte gMapHeader _0815E92C: .4byte 0x00000129 _0815E930: .4byte 0x00004082 -_0815E934: .4byte gUnknown_20370D0 +_0815E934: .4byte gSpecialVar_Result _0815E938: - ldr r1, _0815E944 @ =gUnknown_20370D0 + ldr r1, _0815E944 @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] _0815E93E: pop {r0} bx r0 .align 2, 0 -_0815E944: .4byte gUnknown_20370D0 +_0815E944: .4byte gSpecialVar_Result thumb_func_end sub_815E908 thumb_func_start sub_815E948 @@ -2332,7 +2332,7 @@ _0815E9C4: .4byte gUnknown_847A2D2 thumb_func_start sub_815E9C8 sub_815E9C8: @ 815E9C8 - ldr r3, _0815E9EC @ =gUnknown_20370D0 + ldr r3, _0815E9EC @ =gSpecialVar_Result ldr r0, _0815E9F0 @ =gSaveBlock1Ptr ldr r1, [r0] ldr r2, _0815E9F4 @ =0x00003d34 @@ -2350,7 +2350,7 @@ sub_815E9C8: @ 815E9C8 strh r0, [r3] bx lr .align 2, 0 -_0815E9EC: .4byte gUnknown_20370D0 +_0815E9EC: .4byte gSpecialVar_Result _0815E9F0: .4byte gSaveBlock1Ptr _0815E9F4: .4byte 0x00003d34 _0815E9F8: .4byte 0x00003d42 diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s index a4c60d00f..c61c9a3d8 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 @@ -797,7 +797,7 @@ _08128A80: strh r0, [r1, 0x6] b _08128A94 _08128A86: - ldr r0, _08128A9C @ =gUnknown_3003F64 + ldr r0, _08128A9C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08128A94 @@ -808,7 +808,7 @@ _08128A94: pop {r0} bx r0 .align 2, 0 -_08128A9C: .4byte gUnknown_3003F64 +_08128A9C: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_81288D4 thumb_func_start sub_8128AA0 @@ -948,7 +948,7 @@ _08128BC4: adds r0, 0x1 strh r0, [r1, 0xA] _08128BD0: - ldr r0, _08128BE4 @ =gUnknown_3003F64 + ldr r0, _08128BE4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08128BFC @@ -959,7 +959,7 @@ _08128BDA: strh r0, [r1, 0x6] b _08128BFC .align 2, 0 -_08128BE4: .4byte gUnknown_3003F64 +_08128BE4: .4byte gReceivedRemoteLinkPlayers _08128BE8: ldr r1, [r2] ldrh r0, [r1, 0xA] @@ -1035,7 +1035,7 @@ _08128C6E: adds r0, 0x1 strh r0, [r1, 0xA] _08128C78: - ldr r0, _08128C8C @ =gUnknown_3003F64 + ldr r0, _08128C8C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08128CA2 @@ -1047,7 +1047,7 @@ _08128C82: strh r0, [r1, 0x6] b _08128CA2 .align 2, 0 -_08128C8C: .4byte gUnknown_3003F64 +_08128C8C: .4byte gReceivedRemoteLinkPlayers _08128C90: ldrh r0, [r1, 0xA] cmp r0, 0x95 @@ -1157,7 +1157,7 @@ _08128D64: adds r0, 0x1 strh r0, [r1, 0xA] _08128D70: - ldr r0, _08128D84 @ =gUnknown_3003F64 + ldr r0, _08128D84 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08128D9C @@ -1168,7 +1168,7 @@ _08128D7A: strh r0, [r1, 0x6] b _08128D9C .align 2, 0 -_08128D84: .4byte gUnknown_3003F64 +_08128D84: .4byte gReceivedRemoteLinkPlayers _08128D88: ldr r1, [r2] ldrh r0, [r1, 0xA] @@ -1211,7 +1211,7 @@ _08128DC4: .4byte _08128E42 .4byte _08128E60 _08128DD8: - ldr r0, _08128DE8 @ =gUnknown_3003F64 + ldr r0, _08128DE8 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08128DEC @@ -1219,7 +1219,7 @@ _08128DD8: bl sub_8129218 b _08128E70 .align 2, 0 -_08128DE8: .4byte gUnknown_3003F64 +_08128DE8: .4byte gReceivedRemoteLinkPlayers _08128DEC: ldr r0, [r4] movs r1, 0xC8 @@ -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 @@ -2740,7 +2740,7 @@ _08129924: .4byte _08129AD8 .4byte _08129A7C _08129944: - ldr r0, _08129978 @ =gUnknown_3003F64 + ldr r0, _08129978 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0812994E @@ -2767,7 +2767,7 @@ _08129952: strb r2, [r0, 0xD] b _08129B08 .align 2, 0 -_08129978: .4byte gUnknown_3003F64 +_08129978: .4byte gReceivedRemoteLinkPlayers _0812997C: .4byte gUnknown_203B0E0 _08129980: bl GetBlockReceivedStatus @@ -2831,7 +2831,7 @@ _081299E6: movs r1, 0x2 ldrsh r0, [r4, r1] lsls r0, 8 - ldr r1, _08129A0C @ =gUnknown_2022118 + ldr r1, _08129A0C @ =gBlockRecvBuffer adds r0, r1 ldrb r0, [r0] subs r0, 0x1 @@ -2843,7 +2843,7 @@ _081299E6: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08129A0C: .4byte gUnknown_2022118 +_08129A0C: .4byte gBlockRecvBuffer _08129A10: .4byte _08129A14 .align 2, 0 _08129A14: @@ -2874,7 +2874,7 @@ _08129A3A: movs r2, 0x2 ldrsh r1, [r4, r2] lsls r1, 8 - ldr r2, _08129A6C @ =gUnknown_2022118 + ldr r2, _08129A6C @ =gBlockRecvBuffer adds r1, r2 bl sub_812963C cmp r0, 0 @@ -2889,7 +2889,7 @@ _08129A3A: b _08129A72 .align 2, 0 _08129A68: .4byte gUnknown_203B0E0 -_08129A6C: .4byte gUnknown_2022118 +_08129A6C: .4byte gBlockRecvBuffer _08129A70: ldrh r0, [r4, 0xA] _08129A72: diff --git a/asm/unk_8147500.s b/asm/unk_8147500.s index 23a3b1b9c..53fc6a8a0 100644 --- a/asm/unk_8147500.s +++ b/asm/unk_8147500.s @@ -8,9 +8,9 @@ thumb_func_start sub_8147500 sub_8147500: @ 8147500 push {lr} - ldr r0, _08147518 @ =gUnknown_20370C0 + ldr r0, _08147518 @ =gSpecialVar_0x8004 ldrh r1, [r0] - ldr r0, _0814751C @ =gUnknown_20370C4 + ldr r0, _0814751C @ =gSpecialVar_0x8006 ldrh r2, [r0] cmp r1, 0x8 beq _08147512 @@ -20,8 +20,8 @@ _08147512: movs r0, 0x1 b _0814758E .align 2, 0 -_08147518: .4byte gUnknown_20370C0 -_0814751C: .4byte gUnknown_20370C4 +_08147518: .4byte gSpecialVar_0x8004 +_0814751C: .4byte gSpecialVar_0x8006 _08147520: cmp r1, 0 beq _08147528 @@ -704,7 +704,7 @@ sub_8147A34: @ 8147A34 lsls r1, 3 ldr r0, _08147A88 @ =gTasks+0x8 adds r4, r1, r0 - ldr r0, _08147A8C @ =gUnknown_3003F64 + ldr r0, _08147A8C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08147A98 @@ -737,7 +737,7 @@ _08147A5C: b _08147A9E .align 2, 0 _08147A88: .4byte gTasks+0x8 -_08147A8C: .4byte gUnknown_3003F64 +_08147A8C: .4byte gReceivedRemoteLinkPlayers _08147A90: .4byte gUnknown_3003ED0 _08147A94: .4byte 0x00007fff _08147A98: diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s index d117d5359..a7761148d 100644 --- a/asm/unk_8147AA8.s +++ b/asm/unk_8147AA8.s @@ -11,7 +11,7 @@ sub_8147AA8: @ 8147AA8 adds r6, r1, 0 lsls r0, 16 lsrs r7, r0, 16 - ldr r0, _08147B20 @ =gUnknown_3003F64 + ldr r0, _08147B20 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08147B3C @@ -59,7 +59,7 @@ sub_8147AA8: @ 8147AA8 bl SetMainCallback2 b _08147B42 .align 2, 0 -_08147B20: .4byte gUnknown_3003F64 +_08147B20: .4byte gReceivedRemoteLinkPlayers _08147B24: .4byte gUnknown_203F3D4 _08147B28: .4byte 0x000083b0 _08147B2C: .4byte sub_8147DA0 @@ -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,17 +2545,17 @@ _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 + ldr r0, _08148E1C @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _08148E20 movs r0, 0 b _08148E22 .align 2, 0 -_08148E1C: .4byte gUnknown_3003F64 +_08148E1C: .4byte gReceivedRemoteLinkPlayers _08148E20: movs r0, 0x1 _08148E22: @@ -2687,7 +2687,7 @@ _08148EFA: ldr r2, [sp] cmp r0, 0 beq _08148F34 - ldr r1, _08148F58 @ =gUnknown_2022744 + ldr r1, _08148F58 @ =gLinkPlayers + 8 add r1, r9 adds r0, r7, 0 bl StringCopy @@ -2723,7 +2723,7 @@ _08148F44: bx r0 .align 2, 0 _08148F54: .4byte 0x000082a8 -_08148F58: .4byte gUnknown_2022744 +_08148F58: .4byte gLinkPlayers + 8 thumb_func_end sub_8148E80 thumb_func_start sub_8148F5C @@ -4267,17 +4267,17 @@ _08149A1C: bl sub_8149A00 cmp r0, 0 beq _08149A54 - ldr r1, _08149A50 @ =gUnknown_20370D0 + ldr r1, _08149A50 @ =gSpecialVar_Result movs r0, 0x1 b _08149A5E .align 2, 0 _08149A4C: .4byte gPlayerParty -_08149A50: .4byte gUnknown_20370D0 +_08149A50: .4byte gSpecialVar_Result _08149A54: adds r5, 0x1 cmp r5, 0x5 ble _08149A1C - ldr r1, _08149A68 @ =gUnknown_20370D0 + ldr r1, _08149A68 @ =gSpecialVar_Result movs r0, 0 _08149A5E: strh r0, [r1] @@ -4285,7 +4285,7 @@ _08149A5E: pop {r0} bx r0 .align 2, 0 -_08149A68: .4byte gUnknown_20370D0 +_08149A68: .4byte gSpecialVar_Result thumb_func_end sub_8149A18 thumb_func_start sub_8149A6C diff --git a/asm/unk_814B6F0.s b/asm/unk_814B6F0.s index 2e3d2e112..90882d61c 100644 --- a/asm/unk_814B6F0.s +++ b/asm/unk_814B6F0.s @@ -67,11 +67,11 @@ sub_814B754: @ 814B754 adds r4, r0, 0 movs r0, 0 mov r8, r0 - ldr r0, _0814B784 @ =gUnknown_3003F64 + ldr r0, _0814B784 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _0814B772 - ldr r0, _0814B788 @ =gUnknown_3003F3C + ldr r0, _0814B788 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _0814B790 @@ -84,8 +84,8 @@ _0814B772: strh r1, [r0, 0x12] b _0814B7DC .align 2, 0 -_0814B784: .4byte gUnknown_3003F64 -_0814B788: .4byte gUnknown_3003F3C +_0814B784: .4byte gReceivedRemoteLinkPlayers +_0814B788: .4byte gWirelessCommType _0814B78C: .4byte gUnknown_3005450 _0814B790: bl GetLinkPlayerCount @@ -189,7 +189,7 @@ _0814B85C: .4byte sub_814BA98 sub_814B860: @ 814B860 push {r4,lr} sub sp, 0xC - ldr r1, _0814B878 @ =gUnknown_203AD30 + ldr r1, _0814B878 @ =gSpecialVar_ItemId ldrh r0, [r1] subs r0, 0x85 lsls r0, 16 @@ -200,7 +200,7 @@ sub_814B860: @ 814B860 strh r0, [r1] b _0814B884 .align 2, 0 -_0814B878: .4byte gUnknown_203AD30 +_0814B878: .4byte gSpecialVar_ItemId _0814B87C: ldrh r0, [r1] movs r1, 0x1 @@ -211,7 +211,7 @@ _0814B884: ldrb r0, [r2, 0x8] lsls r0, 5 adds r0, r2, r0 - ldr r1, _0814B8E4 @ =gUnknown_203AD30 + ldr r1, _0814B8E4 @ =gSpecialVar_ItemId ldrh r1, [r1] subs r1, 0x85 adds r0, 0xA4 @@ -250,7 +250,7 @@ _0814B884: bx r0 .align 2, 0 _0814B8E0: .4byte gUnknown_203F3DC -_0814B8E4: .4byte gUnknown_203AD30 +_0814B8E4: .4byte gSpecialVar_ItemId _0814B8E8: .4byte sub_814BA98 _0814B8EC: .4byte sub_814BA80 thumb_func_end sub_814B860 @@ -508,7 +508,7 @@ _0814BAC4: lsls r1, r5, 3 subs r1, r5 lsls r1, 2 - ldr r2, _0814BB2C @ =gUnknown_2022744 + ldr r2, _0814BB2C @ =gLinkPlayers + 8 adds r1, r2 bl StringCopy adds r4, r6, r4 @@ -555,7 +555,7 @@ _0814BB14: beq _0814BB3A b _0814BB46 .align 2, 0 -_0814BB2C: .4byte gUnknown_2022744 +_0814BB2C: .4byte gLinkPlayers + 8 _0814BB30: .4byte gSaveBlock2Ptr _0814BB34: cmp r0, 0x2 diff --git a/asm/unk_814BB4C.s b/asm/unk_814BB4C.s index bb11cca7f..9c0e0503b 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 @@ -540,7 +540,7 @@ _0814BF1A: movs r3, 0 cmp r3, r4 bcs _0814BF7E - ldr r7, _0814BF9C @ =gUnknown_2022118 + ldr r7, _0814BF9C @ =gBlockRecvBuffer movs r6, 0 ldr r4, _0814BFA0 @ =gUnknown_83DFC9C _0814BF3C: @@ -592,7 +592,7 @@ _0814BF7E: b _0814BFC0 .align 2, 0 _0814BF98: .4byte gUnknown_846E3C8 -_0814BF9C: .4byte gUnknown_2022118 +_0814BF9C: .4byte gBlockRecvBuffer _0814BFA0: .4byte gUnknown_83DFC9C _0814BFA4: movs r0, 0 @@ -2299,7 +2299,7 @@ _0814CCB0: adds r4, 0x42 cmp r8, r3 bcs _0814CCDE - ldr r2, _0814CCF8 @ =gUnknown_2022118 + ldr r2, _0814CCF8 @ =gBlockRecvBuffer _0814CCBE: mov r3, r8 lsls r1, r3, 5 @@ -2329,7 +2329,7 @@ _0814CCDE: b _0814CF92 .align 2, 0 _0814CCF4: .4byte gUnknown_846E3C8 -_0814CCF8: .4byte gUnknown_2022118 +_0814CCF8: .4byte gBlockRecvBuffer _0814CCFC: movs r0, 0x6 b _0814CF92 @@ -2635,7 +2635,7 @@ _0814CF3C: movs r1, 0 movs r2, 0x30 bl memset - ldr r1, _0814CF6C @ =gUnknown_2022118 + ldr r1, _0814CF6C @ =gBlockRecvBuffer adds r0, r4, 0 movs r2, 0x30 bl memcpy @@ -2645,7 +2645,7 @@ _0814CF64: strh r0, [r7, 0x10] b _0814CF8E .align 2, 0 -_0814CF6C: .4byte gUnknown_2022118 +_0814CF6C: .4byte gBlockRecvBuffer _0814CF70: bl sub_814B930 movs r0, 0x12 @@ -3071,7 +3071,7 @@ _0814D296: cmp r5, r3 bcs _0814D2D4 adds r1, r6, 0 - ldr r2, _0814D2EC @ =gUnknown_2022118 + ldr r2, _0814D2EC @ =gBlockRecvBuffer _0814D2BC: lsls r0, r5, 8 adds r0, r2 @@ -3096,7 +3096,7 @@ _0814D2D4: b _0814D2FA .align 2, 0 _0814D2E8: .4byte gUnknown_846E3C8 -_0814D2EC: .4byte gUnknown_2022118 +_0814D2EC: .4byte gBlockRecvBuffer _0814D2F0: movs r0, 0x16 movs r1, 0x1 @@ -3326,7 +3326,7 @@ _0814D488: bl sub_800AAC0 b _0814D4B8 _0814D498: - ldr r0, _0814D4B4 @ =gUnknown_3003F64 + ldr r0, _0814D4B4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _0814D4BE @@ -3339,7 +3339,7 @@ _0814D498: strb r4, [r5, 0xC] b _0814D4BE .align 2, 0 -_0814D4B4: .4byte gUnknown_3003F64 +_0814D4B4: .4byte gReceivedRemoteLinkPlayers _0814D4B8: ldrb r0, [r5, 0xC] adds r0, 0x1 diff --git a/asm/unk_814D5C8.s b/asm/unk_814D5C8.s index b3094ca40..4c78d4459 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 7e55e957d..0118eff4b 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -14,7 +14,7 @@ sub_81507FC: @ 81507FC ldr r1, _081508A4 @ =gUnknown_3002044 movs r0, 0 str r0, [r1] - ldr r0, _081508A8 @ =gUnknown_3003F64 + ldr r0, _081508A8 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _081508CC @@ -81,7 +81,7 @@ sub_81507FC: @ 81507FC b _081508D2 .align 2, 0 _081508A4: .4byte gUnknown_3002044 -_081508A8: .4byte gUnknown_3003F64 +_081508A8: .4byte gReceivedRemoteLinkPlayers _081508AC: .4byte gUnknown_203F3E0 _081508B0: .4byte 0x00003330 _081508B4: .4byte 0x000032cc @@ -389,7 +389,7 @@ _08150B16: lsls r0, 24 cmp r0, 0 beq _08150BFC - ldr r0, _08150B38 @ =gUnknown_3003F64 + ldr r0, _08150B38 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 beq _08150BDC @@ -399,7 +399,7 @@ _08150B16: bl sub_80FCD74 b _08150BDC .align 2, 0 -_08150B38: .4byte gUnknown_3003F64 +_08150B38: .4byte gReceivedRemoteLinkPlayers _08150B3C: ldr r0, _08150B88 @ =gUnknown_203F3E0 ldr r0, [r0] @@ -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 @@ -1150,7 +1150,7 @@ _081510F4: beq _08151116 ldr r0, [r6] adds r0, 0x4A - ldr r1, _08151148 @ =gUnknown_2022118 + ldr r1, _08151148 @ =gBlockRecvBuffer movs r2, 0x3C bl memcpy adds r0, r4, 0 @@ -1188,7 +1188,7 @@ _08151140: strb r0, [r1, 0x10] b _0815118A .align 2, 0 -_08151148: .4byte gUnknown_2022118 +_08151148: .4byte gBlockRecvBuffer _0815114C: .4byte gUnknown_203F3E0 _08151150: movs r0, 0x1 @@ -1305,7 +1305,7 @@ _08151228: lsls r0, 1 adds r2, r0 lsls r0, r4, 8 - ldr r1, _08151294 @ =gUnknown_2022118 + ldr r1, _08151294 @ =gBlockRecvBuffer adds r0, r1 ldrb r0, [r0] strb r0, [r2] @@ -1350,7 +1350,7 @@ _0815128A: strb r0, [r1, 0x10] b _081512AA .align 2, 0 -_08151294: .4byte gUnknown_2022118 +_08151294: .4byte gBlockRecvBuffer _08151298: .4byte gUnknown_203F3E0 _0815129C: bl sub_8155E68 @@ -1501,7 +1501,7 @@ _081513C4: lsls r0, 1 adds r2, r0 lsls r0, r4, 8 - ldr r1, _08151438 @ =gUnknown_2022118 + ldr r1, _08151438 @ =gBlockRecvBuffer adds r0, r1 ldrb r0, [r0] strb r0, [r2] @@ -1548,7 +1548,7 @@ _0815142A: b _08151480 .align 2, 0 _08151434: .4byte gUnknown_203F3E0 -_08151438: .4byte gUnknown_2022118 +_08151438: .4byte gBlockRecvBuffer _0815143C: bl sub_81532B8 b _08151480 @@ -1633,7 +1633,7 @@ _081514CC: strb r0, [r1, 0x10] b _081514E4 _081514D6: - ldr r0, _081514EC @ =gUnknown_3003F64 + ldr r0, _081514EC @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _081514E4 @@ -1644,7 +1644,7 @@ _081514E4: pop {r0} bx r0 .align 2, 0 -_081514EC: .4byte gUnknown_3003F64 +_081514EC: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_8151488 thumb_func_start sub_81514F0 @@ -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] @@ -1852,7 +1852,7 @@ _0815169C: bl sub_8154730 ldr r0, [r4] bl sub_81508EC - ldr r0, _081516D8 @ =gUnknown_3003F64 + ldr r0, _081516D8 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _081516C2 @@ -1871,7 +1871,7 @@ _081516CC: bx r0 .align 2, 0 _081516D4: .4byte sub_81516DC -_081516D8: .4byte gUnknown_3003F64 +_081516D8: .4byte gReceivedRemoteLinkPlayers thumb_func_end sub_815159C thumb_func_start sub_81516DC @@ -2016,7 +2016,7 @@ _081517D2: ldr r0, _08151844 @ =0x0000318c adds r2, r0 lsls r0, r4, 8 - ldr r1, _08151848 @ =gUnknown_2022118 + ldr r1, _08151848 @ =gBlockRecvBuffer adds r0, r1 ldrb r0, [r0] strb r0, [r2] @@ -2063,7 +2063,7 @@ _08151836: .align 2, 0 _08151840: .4byte gUnknown_203F3E0 _08151844: .4byte 0x0000318c -_08151848: .4byte gUnknown_2022118 +_08151848: .4byte gBlockRecvBuffer thumb_func_end sub_8151750 thumb_func_start sub_815184C @@ -5743,7 +5743,7 @@ sub_81533C4: @ 81533C4 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081533E4 @ =gUnknown_3003F64 + ldr r0, _081533E4 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _081533F0 @@ -5756,20 +5756,20 @@ sub_81533C4: @ 81533C4 ldr r0, [r0] b _081533F8 .align 2, 0 -_081533E4: .4byte gUnknown_3003F64 +_081533E4: .4byte gReceivedRemoteLinkPlayers _081533E8: .4byte gUnknown_203F3E0 _081533EC: .4byte 0x000031a0 _081533F0: lsls r0, r2, 3 subs r0, r2 lsls r0, 2 - ldr r1, _08153400 @ =gUnknown_2022744 + ldr r1, _08153400 @ =gLinkPlayers + 8 _081533F8: adds r0, r1 pop {r1} bx r1 .align 2, 0 -_08153400: .4byte gUnknown_2022744 +_08153400: .4byte gLinkPlayers + 8 thumb_func_end sub_81533C4 thumb_func_start sub_8153404 @@ -6310,7 +6310,7 @@ _081537BC: .4byte gUnknown_203F3E0 sub_81537C0: @ 81537C0 push {r4-r6,lr} movs r5, 0 - ldr r6, _081537F0 @ =gUnknown_20370D0 + ldr r6, _081537F0 @ =gSpecialVar_Result _081537C6: movs r0, 0x64 adds r1, r5, 0 @@ -6331,13 +6331,13 @@ _081537C6: strh r0, [r6] b _08153804 .align 2, 0 -_081537F0: .4byte gUnknown_20370D0 +_081537F0: .4byte gSpecialVar_Result _081537F4: .4byte gPlayerParty _081537F8: adds r5, 0x1 cmp r5, 0x5 ble _081537C6 - ldr r1, _0815380C @ =gUnknown_20370D0 + ldr r1, _0815380C @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] _08153804: @@ -6345,7 +6345,7 @@ _08153804: pop {r0} bx r0 .align 2, 0 -_0815380C: .4byte gUnknown_20370D0 +_0815380C: .4byte gSpecialVar_Result thumb_func_end sub_81537C0 thumb_func_start sub_8153810 @@ -6605,7 +6605,7 @@ _08153A14: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r1, _08153A94 @ =gUnknown_2022744 + ldr r1, _08153A94 @ =gLinkPlayers + 8 adds r0, r1 lsls r1, r4, 2 adds r1, r5 @@ -6668,7 +6668,7 @@ _08153A7E: .align 2, 0 _08153A8C: .4byte gUnknown_203F3E0 _08153A90: .4byte gUnknown_8475648 -_08153A94: .4byte gUnknown_2022744 +_08153A94: .4byte gLinkPlayers + 8 _08153A98: .4byte gUnknown_8475608 thumb_func_end sub_8153A04 @@ -10348,7 +10348,7 @@ _0815579C: ldr r0, [r3] adds r0, r7 ldrb r0, [r0] - ldr r2, _08155860 @ =gUnknown_841623B + ldr r2, _08155860 @ =gFameCheckerText_ListMenuCursor mov r1, r9 str r1, [sp] str r5, [sp, 0x4] @@ -10379,7 +10379,7 @@ _08155850: .4byte 0x00003009 _08155854: .4byte gUnknown_841CDD7 _08155858: .4byte gUnknown_8417938 _0815585C: .4byte gUnknown_841793C -_08155860: .4byte gUnknown_841623B +_08155860: .4byte gFameCheckerText_ListMenuCursor _08155864: .4byte 0x00003014 _08155868: bl IsDma3ManagerBusyWithBgCopy @@ -10453,7 +10453,7 @@ _081558B0: ldr r0, [r1] adds r0, r4 ldrb r1, [r0] - ldr r2, _0815591C @ =gUnknown_841623B + ldr r2, _0815591C @ =gFameCheckerText_ListMenuCursor cmp r7, 0x1 bne _08155920 mov r3, r8 @@ -10464,7 +10464,7 @@ _0815590C: .4byte 0x00003020 _08155910: .4byte 0x00003009 _08155914: .4byte gUnknown_8417938 _08155918: .4byte gUnknown_841793C -_0815591C: .4byte gUnknown_841623B +_0815591C: .4byte gFameCheckerText_ListMenuCursor _08155920: str r6, [sp] _08155922: diff --git a/asm/unk_8159F40.s b/asm/unk_8159F40.s index 9c82a3d8d..aefa4ecff 100644 --- a/asm/unk_8159F40.s +++ b/asm/unk_8159F40.s @@ -23,7 +23,7 @@ sub_8159F40: @ 8159F40 bl ZeroPlayerPartyMons bl ZeroEnemyPartyMons ldr r1, _08159F94 @ =gUnknown_84792D0 - ldr r0, _08159F98 @ =gUnknown_20370C0 + ldr r0, _08159F98 @ =gSpecialVar_0x8004 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -49,7 +49,7 @@ _08159F72: .align 2, 0 _08159F90: .4byte gBattleTypeFlags _08159F94: .4byte gUnknown_84792D0 -_08159F98: .4byte gUnknown_20370C0 +_08159F98: .4byte gSpecialVar_0x8004 _08159F9C: .4byte gPlayerParty _08159FA0: movs r0, 0x64 @@ -669,14 +669,14 @@ _0815A444: ldrsh r0, [r6, r2] movs r2, 0x12 ldrsh r1, [r6, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt strb r0, [r6, 0x1E] ldrb r4, [r6, 0x1F] movs r1, 0x10 ldrsh r0, [r6, r1] movs r2, 0x12 ldrsh r1, [r6, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r4, r0 bne _0815A488 ldrh r0, [r6, 0x10] @@ -694,7 +694,7 @@ _0815A488: asrs r0, 16 movs r2, 0x12 ldrsh r1, [r6, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r4, r0 bne _0815A4A8 ldrh r0, [r6, 0x10] @@ -710,7 +710,7 @@ _0815A4A8: asrs r0, 16 movs r2, 0x12 ldrsh r1, [r6, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r4, r0 bne _0815A4C8 ldrh r0, [r6, 0x10] @@ -726,7 +726,7 @@ _0815A4C8: subs r1, 0x1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r4, r0 bne _0815A4E8 ldrh r0, [r6, 0x10] @@ -742,7 +742,7 @@ _0815A4E8: adds r1, 0x1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r4, r0 bne _0815A508 ldrh r0, [r6, 0x10] @@ -798,7 +798,7 @@ sub_815A540: @ 815A540 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsSurfable @@ -810,7 +810,7 @@ sub_815A540: @ 815A540 lsls r0, 24 cmp r0, 0 beq _0815A5A4 - ldr r0, _0815A5B0 @ =gUnknown_2037078 + ldr r0, _0815A5B0 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 @@ -833,7 +833,7 @@ _0815A5A4: bx r0 .align 2, 0 _0815A5AC: .4byte gUnknown_203ADFA -_0815A5B0: .4byte gUnknown_2037078 +_0815A5B0: .4byte gPlayerAvatar _0815A5B4: .4byte gMapObjects _0815A5B8: .4byte gSprites thumb_func_end sub_815A540 diff --git a/asm/unk_815EDDC.s b/asm/unk_815EDDC.s index 6acbf447d..116458940 100644 --- a/asm/unk_815EDDC.s +++ b/asm/unk_815EDDC.s @@ -138,7 +138,7 @@ sub_815EEB0: @ 815EEB0 ldr r1, _0815EED0 @ =0x00000af8 adds r0, r1 bl sub_815EE3C - ldr r1, _0815EED4 @ =gUnknown_20370C0 + ldr r1, _0815EED4 @ =gSpecialVar_0x8004 ldrh r1, [r1] cmp r0, r1 bcc _0815EED8 @@ -147,7 +147,7 @@ sub_815EEB0: @ 815EEB0 .align 2, 0 _0815EECC: .4byte gSaveBlock2Ptr _0815EED0: .4byte 0x00000af8 -_0815EED4: .4byte gUnknown_20370C0 +_0815EED4: .4byte gSpecialVar_0x8004 _0815EED8: movs r0, 0 _0815EEDA: @@ -227,7 +227,7 @@ sub_815EF5C: @ 815EF5C ldr r0, [r0] ldr r1, _0815EF90 @ =0x00000af8 adds r4, r0, r1 - ldr r5, _0815EF94 @ =gUnknown_20370C0 + ldr r5, _0815EF94 @ =gSpecialVar_0x8004 ldrh r0, [r5] bl sub_815EE88 lsls r0, 24 @@ -245,7 +245,7 @@ sub_815EF5C: @ 815EF5C .align 2, 0 _0815EF8C: .4byte gSaveBlock2Ptr _0815EF90: .4byte 0x00000af8 -_0815EF94: .4byte gUnknown_20370C0 +_0815EF94: .4byte gSpecialVar_0x8004 _0815EF98: movs r0, 0 _0815EF9A: diff --git a/asm/wild_encounter.s b/asm/wild_encounter.s index c57ca5366..67c159abc 100644 --- a/asm/wild_encounter.s +++ b/asm/wild_encounter.s @@ -1001,15 +1001,15 @@ sub_8082E54: @ 8082E54 bne _08082EB0 bl sub_807F704 _08082E9C: - ldr r0, _08082EAC @ =gUnknown_20370D0 + ldr r0, _08082EAC @ =gSpecialVar_Result strh r4, [r0] b _08082EB6 .align 2, 0 _08082EA4: .4byte 0x0000ffff _08082EA8: .4byte gUnknown_83C9CB8 -_08082EAC: .4byte gUnknown_20370D0 +_08082EAC: .4byte gSpecialVar_Result _08082EB0: - ldr r1, _08082EBC @ =gUnknown_20370D0 + ldr r1, _08082EBC @ =gSpecialVar_Result movs r0, 0 strh r0, [r1] _08082EB6: @@ -1017,7 +1017,7 @@ _08082EB6: pop {r0} bx r0 .align 2, 0 -_08082EBC: .4byte gUnknown_20370D0 +_08082EBC: .4byte gSpecialVar_Result thumb_func_end sub_8082E54 thumb_func_start sub_8082EC0 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 |