diff options
-rw-r--r-- | asm/battle_2.s | 44 | ||||
-rw-r--r-- | asm/battle_controller_player.s | 12 | ||||
-rw-r--r-- | asm/battle_controllers.s | 16 | ||||
-rw-r--r-- | asm/cable_club.s | 36 | ||||
-rw-r--r-- | asm/evolution_scene.s | 8 | ||||
-rw-r--r-- | asm/field_fadetransition.s | 4 | ||||
-rw-r--r-- | asm/help_system_812B1E0.s | 4 | ||||
-rw-r--r-- | asm/link.s | 136 | ||||
-rw-r--r-- | asm/link_rfu_2.s | 64 | ||||
-rw-r--r-- | asm/link_rfu_3.s | 52 | ||||
-rw-r--r-- | asm/link_rfu_4.s | 8 | ||||
-rw-r--r-- | asm/menu_helpers.s | 4 | ||||
-rw-r--r-- | asm/overworld.s | 36 | ||||
-rw-r--r-- | asm/pokemon_summary_screen.s | 16 | ||||
-rw-r--r-- | asm/reshow_battle_screen.s | 8 | ||||
-rw-r--r-- | asm/start_menu.s | 4 | ||||
-rw-r--r-- | asm/trade.s | 100 | ||||
-rw-r--r-- | asm/trainer_card.s | 42 | ||||
-rw-r--r-- | asm/union_room_chat.s | 24 | ||||
-rw-r--r-- | asm/unk_8147500.s | 4 | ||||
-rw-r--r-- | asm/unk_8147AA8.s | 8 | ||||
-rw-r--r-- | asm/unk_814B6F0.s | 8 | ||||
-rw-r--r-- | asm/unk_814BB4C.s | 4 | ||||
-rw-r--r-- | asm/unk_81507FC.s | 20 | ||||
-rw-r--r-- | include/global.h | 49 | ||||
-rw-r--r-- | include/link.h | 2 | ||||
-rw-r--r-- | src/main.c | 4 | ||||
-rw-r--r-- | src/mevent.c | 6 | ||||
-rw-r--r-- | src/quest_log.c | 8 | ||||
-rw-r--r-- | sym_common.txt | 4 |
30 files changed, 379 insertions, 356 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s index b11014d6b..1ecfe6ad3 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -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 @@ -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 @@ -1628,7 +1628,7 @@ _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 @@ -1636,12 +1636,12 @@ _08010AFC: b _08010B82 .align 2, 0 _08010B1C: .4byte gPaletteFade -_08010B20: .4byte gUnknown_3003F3C +_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 @@ -11647,7 +11647,7 @@ _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 @@ -11696,7 +11696,7 @@ _08015BD4: .align 2, 0 _08015BDC: .4byte gBattleTypeFlags _08015BE0: .4byte gPlayerParty -_08015BE4: .4byte gUnknown_3003F64 +_08015BE4: .4byte gReceivedRemoteLinkPlayers _08015BE8: .4byte gSpecialVar_Result _08015BEC: .4byte gUnknown_2023E8A _08015BF0: .4byte gMain diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 477f73144..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 @@ -2408,7 +2408,7 @@ 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 @@ -2417,7 +2417,7 @@ sub_802F6A8: @ 802F6A8 .align 2, 0 _0802F6D0: .4byte gPaletteFade _0802F6D4: .4byte gBattleTypeFlags -_0802F6D8: .4byte gUnknown_3003F3C +_0802F6D8: .4byte gWirelessCommType _0802F6DC: bl sub_800AB9C _0802F6E0: diff --git a/asm/battle_controllers.s b/asm/battle_controllers.s index 8ef9408a0..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 @@ -1424,7 +1424,7 @@ sub_800DD28: @ 800DD28 mov r10, r0 b _0800DE1C .align 2, 0 -_0800DD5C: .4byte gUnknown_3003F64 +_0800DD5C: .4byte gReceivedRemoteLinkPlayers _0800DD60: .4byte gBattleTypeFlags _0800DD64: .4byte gLinkPlayers _0800DD68: .4byte 0x00002211 diff --git a/asm/cable_club.s b/asm/cable_club.s index 03b1e3497..45967283c 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -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 @@ -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 @@ -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] @@ -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 @@ -1952,7 +1952,7 @@ _080816B0: .4byte gBattleTypeFlags _080816B4: .4byte 0x0000ffdf _080816B8: .4byte gSpecialVar_0x8004 _080816BC: .4byte gUnknown_300502C -_080816C0: .4byte gUnknown_3003F3C +_080816C0: .4byte gWirelessCommType _080816C4: .4byte gUnknown_2023E8A _080816C8: ldr r4, _080816E8 @ =gLinkPlayers @@ -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 @@ -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 @@ -2347,7 +2347,7 @@ sub_80819C8: @ 80819C8 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 @@ -2357,7 +2357,7 @@ sub_80819C8: @ 80819C8 .align 2, 0 _080819E4: .4byte gLinkType _080819E8: .4byte 0x00002211 -_080819EC: .4byte gUnknown_3003F3C +_080819EC: .4byte gWirelessCommType _080819F0: .4byte sub_8081454 _080819F4: ldr r0, _08081A00 @ =sub_8081318 @@ -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/evolution_scene.s b/asm/evolution_scene.s index f6f5a83e2..d343c68d4 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -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 @@ -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 @@ -3725,7 +3725,7 @@ _080CFDC6: b _080D003A .align 2, 0 _080CFE14: .4byte gPaletteFade -_080CFE18: .4byte gUnknown_3003F3C +_080CFE18: .4byte gWirelessCommType _080CFE1C: .4byte gPlayerParty _080CFE20: .4byte gTasks _080CFE24: .4byte gPlayerPartyCount diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index d0176941a..8ccc347e9 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -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 diff --git a/asm/help_system_812B1E0.s b/asm/help_system_812B1E0.s index d254207a4..f9fb50cf7 100644 --- a/asm/help_system_812B1E0.s +++ b/asm/help_system_812B1E0.s @@ -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/link.s b/asm/link.s index 929180d83..a0ba7f9cb 100644 --- a/asm/link.s +++ b/asm/link.s @@ -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,10 +510,10 @@ _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 @@ -526,8 +526,8 @@ _080098CC: pop {r0} bx r0 .align 2, 0 -_080098DC: .4byte gUnknown_3003F64 -_080098E0: .4byte gUnknown_3003F3C +_080098DC: .4byte gReceivedRemoteLinkPlayers +_080098E0: .4byte gWirelessCommType _080098E4: .4byte gLinkOpen thumb_func_end sub_80098B8 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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] @@ -3253,7 +3253,7 @@ 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 @@ -3337,7 +3337,7 @@ _0800ADE0: .4byte gMPlayInfo_SE1 _0800ADE4: .4byte gMPlayInfo_SE2 _0800ADE8: .4byte gMPlayInfo_SE3 _0800ADEC: .4byte gHeap -_0800ADF0: .4byte gUnknown_3003F3C +_0800ADF0: .4byte gWirelessCommType _0800ADF4: .4byte sLinkErrorBuffer _0800ADF8: .4byte sub_800978C _0800ADFC: .4byte gUnknown_82345E8 @@ -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 @@ -3572,7 +3572,7 @@ _0800AFC4: _0800AFFC: .4byte gUnknown_8234610 _0800B000: .4byte gUnknown_841DF4C _0800B004: .4byte gMain -_0800B008: .4byte gUnknown_3003F3C +_0800B008: .4byte gWirelessCommType _0800B00C: .4byte sLinkErrorBuffer _0800B010: cmp r2, 0x2 @@ -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_2.s b/asm/link_rfu_2.s index 0bfd71538..d36eeca20 100644 --- a/asm/link_rfu_2.s +++ b/asm/link_rfu_2.s @@ -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 @@ -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 @@ -2625,7 +2625,7 @@ _080F9A88: .4byte gUnknown_3005450 _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 @@ -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 @@ -5123,7 +5123,7 @@ _080FAD66: 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 @@ -5133,7 +5133,7 @@ _080FAD8A: bx r0 .align 2, 0 _080FAD90: .4byte gBlockRecvBuffer -_080FAD94: .4byte gUnknown_3003F64 +_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 @@ -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 diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index d9f172a81..c5947ebc0 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -5941,7 +5941,7 @@ _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 @@ -5958,7 +5958,7 @@ _08118BCE: .align 2, 0 _08118BE4: .4byte gUnknown_8457F90 _08118BE8: .4byte gUnknown_203B058 -_08118BEC: .4byte gUnknown_3003F64 +_08118BEC: .4byte gReceivedRemoteLinkPlayers _08118BF0: .4byte gBlockSendBuffer _08118BF4: .4byte sub_8117280 _08118BF8: @@ -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: @@ -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,7 +6512,7 @@ _081190CA: movs r0, 0x2 bl _081198DA _081190DE: - ldr r0, _08119100 @ =gUnknown_3003F64 + ldr r0, _08119100 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _081190EA @@ -6527,7 +6527,7 @@ _081190EA: movs r0, 0x27 bl _081198DA .align 2, 0 -_08119100: .4byte gUnknown_3003F64 +_08119100: .4byte gReceivedRemoteLinkPlayers _08119104: .4byte gBlockSendBuffer _08119108: .4byte sub_8117280 _0811910C: @@ -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: @@ -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 1ec24a43c..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 @@ -1660,7 +1660,7 @@ _081430B8: bl mevent_srv_ish_do_init b _081435C6 .align 2, 0 -_081430D0: .4byte gUnknown_3003F64 +_081430D0: .4byte gReceivedRemoteLinkPlayers _081430D4: ldr r0, _081430E8 @ =gSpecialVar_Result ldrh r0, [r0] @@ -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,7 +2170,7 @@ _0814349C: strb r0, [r5, 0x8] b _081435C6 .align 2, 0 -_081434B0: .4byte gUnknown_3003F64 +_081434B0: .4byte gReceivedRemoteLinkPlayers _081434B4: ldr r0, _081434CC @ =gSpecialVar_Result ldrh r0, [r0] 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/overworld.s b/asm/overworld.s index f1587d154..2b3ca139d 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -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 @@ -5636,7 +5636,7 @@ _08057880: .4byte sub_805671C 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 @@ -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/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 05256c776..8db247b2b 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -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 @@ -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] @@ -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/reshow_battle_screen.s b/asm/reshow_battle_screen.s index f7c412cde..6fb09f439 100644 --- a/asm/reshow_battle_screen.s +++ b/asm/reshow_battle_screen.s @@ -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 diff --git a/asm/start_menu.s b/asm/start_menu.s index 73a82fb5c..1d81d0392 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -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/trade.s b/asm/trade.s index 6ce974675..e9fcddf2d 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -246,7 +246,7 @@ _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 @@ -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 @@ -269,11 +269,11 @@ _0804C80A: .align 2, 0 _0804C864: .4byte gPaletteFade _0804C868: .4byte gEnemyParty -_0804C86C: .4byte gUnknown_3003F64 +_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 @@ -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 @@ -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 @@ -1808,7 +1808,7 @@ sub_804D548: @ 804D548 _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 @@ -4253,7 +4253,7 @@ sub_804E908: @ 804E908 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 @@ -4261,7 +4261,7 @@ sub_804E908: @ 804E908 b _0804E932 .align 2, 0 _0804E924: .4byte gPaletteFade -_0804E928: .4byte gUnknown_3003F3C +_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 @@ -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,7 +7424,7 @@ _08050160: .4byte _08050430 .4byte _0805044C _08050194: - ldr r0, _08050228 @ =gUnknown_3003F64 + ldr r0, _08050228 @ =gReceivedRemoteLinkPlayers ldrb r0, [r0] cmp r0, 0 bne _080501A8 @@ -7490,14 +7490,14 @@ _080501A8: strh r2, [r0] b _08050472 .align 2, 0 -_08050228: .4byte gUnknown_3003F64 +_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 @@ -7745,7 +7745,7 @@ _0805044C: 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 @@ -7768,7 +7768,7 @@ _08050472: bx r0 .align 2, 0 _08050490: .4byte gPaletteFade -_08050494: .4byte gUnknown_3003F3C +_08050494: .4byte gWirelessCommType _08050498: .4byte sub_8053D84 thumb_func_end sub_8050138 @@ -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 @@ -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: @@ -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 @@ -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 @@ -14835,7 +14835,7 @@ _0805441A: .align 2, 0 _08054430: .4byte gPaletteFade _08054434: .4byte gUnknown_2031DAC -_08054438: .4byte gUnknown_3003F3C +_08054438: .4byte gWirelessCommType _0805443C: .4byte gMain thumb_func_end sub_80543C4 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/union_room_chat.s b/asm/union_room_chat.s index 4c7d6769f..c61c9a3d8 100644 --- a/asm/union_room_chat.s +++ b/asm/union_room_chat.s @@ -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 @@ -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 diff --git a/asm/unk_8147500.s b/asm/unk_8147500.s index d9867d69f..53fc6a8a0 100644 --- a/asm/unk_8147500.s +++ b/asm/unk_8147500.s @@ -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 5b4fbd0ad..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 @@ -2548,14 +2548,14 @@ _08148DFE: _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: diff --git a/asm/unk_814B6F0.s b/asm/unk_814B6F0.s index dc7d8d9f8..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 diff --git a/asm/unk_814BB4C.s b/asm/unk_814BB4C.s index c3f054fc7..9c0e0503b 100644 --- a/asm/unk_814BB4C.s +++ b/asm/unk_814BB4C.s @@ -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_81507FC.s b/asm/unk_81507FC.s index 141ff4d18..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] @@ -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 @@ -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 @@ -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,7 +5756,7 @@ 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: diff --git a/include/global.h b/include/global.h index 1d2152af7..c47bd2d15 100644 --- a/include/global.h +++ b/include/global.h @@ -224,6 +224,23 @@ struct BerryCrush #define PLAYER_NAME_LENGTH 8 +#define LINK_B_RECORDS_COUNT 5 + +struct LinkBattleRecord +{ + u8 name[PLAYER_NAME_LENGTH]; + u16 trainerId; + u16 wins; + u16 losses; + u16 draws; +}; + +struct LinkBattleRecords +{ + struct LinkBattleRecord entries[LINK_B_RECORDS_COUNT]; + u8 languages[LINK_B_RECORDS_COUNT]; +}; + struct UnknownSaveBlock2Struct { u8 field_0; @@ -244,6 +261,21 @@ struct UnknownSaveBlock2Struct u8 field_EB; }; // sizeof = 0xEC +struct UnkSaveBlock2Substruct_55C +{ + /* 0x000:0x55C */ u8 unk_00_0:1; + u8 unk_00_1:1; + /* 0x001:0x55D */ u8 unk_01; + /* 0x002:0x55E */ u8 unk_02[2]; + /* 0x004:0x560 */ u16 unk_04[2]; + /* 0x008:0x564 */ u16 unk_08[2]; + /* 0x00C:0x568 */ u16 unk_0C[2]; + /* 0x010:0x56C */ u8 unk_10; + /* 0x011:0x56D */ u8 unk_11[3]; + /* 0x014:0x570 */ u16 unk_14; + /* 0x016:0x572 */ u8 unk_16; +}; // size: 0x018 + struct SaveBlock2 { /*0x000*/ u8 playerName[PLAYER_NAME_LENGTH]; @@ -268,9 +300,11 @@ struct SaveBlock2 /*0x0A8*/ u32 field_A8; /*0x0AC*/ u8 filler_AC[0x3F4]; /*0x4A0*/ u32 unk_4A0[0x2F]; - /*0x55c*/ u8 filler_55C[0x53C]; - /*0xA98*/ u8 unk_A98[2][16]; - /*0xAB8*/ u8 filler_AB8[0x468]; + /*0x55c*/ struct UnkSaveBlock2Substruct_55C unk_55C; + /*0x574*/ u8 filler_574[0x524]; + /*0xA98*/ struct LinkBattleRecords linkBattleRecords; + /*0xAF0*/ struct BerryCrush berryCrush; + /*0xB00*/ u8 filler_B00[0x420]; /*0xF20*/ u32 encryptionKey; }; @@ -438,15 +472,6 @@ struct RecordMixing_UnknownStruct u16 unk74[0x2]; }; -struct LinkBattleRecord -{ - u8 name[8]; - u16 trainerId; - u16 wins; - u16 losses; - u16 draws; -}; - struct RecordMixingGiftData { u8 unk0; diff --git a/include/link.h b/include/link.h index ef8776c64..93ad9dfe1 100644 --- a/include/link.h +++ b/include/link.h @@ -146,10 +146,8 @@ extern u16 word_3002910[]; extern bool8 gReceivedRemoteLinkPlayers; extern bool8 gLinkVSyncDisabled; -extern u8 gUnknown_3003F64; extern u8 gUnknown_3003F84; extern u64 gUnknown_3003FB4; -extern u16 gLinkType; void Task_DestroySelf(u8); void OpenLink(void); diff --git a/src/main.c b/src/main.c index a625386b2..068cc8578 100644 --- a/src/main.c +++ b/src/main.c @@ -98,7 +98,7 @@ static IntrFunc * const sTimerIntrFunc = gIntrTable + 0x7; extern u16 gTrainerId; extern bool8 gUnknown_3005ECC; -extern bool8 gUnknown_3003F3C; +extern bool8 gWirelessCommType; extern bool8 gUnknown_3005E88; EWRAM_DATA void (**gFlashTimerIntrFunc)(void) = NULL; @@ -348,7 +348,7 @@ extern void ProcessDma3Requests(void); static void VBlankIntr(void) { - if (gUnknown_3003F3C) + if (gWirelessCommType) RFUVSync(); else if (!gLinkVSyncDisabled) LinkVSync(); diff --git a/src/mevent.c b/src/mevent.c index 7a7fcc399..a62286f21 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -211,7 +211,7 @@ u32 sub_8143770(u8 * r4, u16 * r5) } else if (IsLinkConnectionEstablished()) { - if (gUnknown_3003F64) + if (gReceivedRemoteLinkPlayers) { if (IsLinkPlayerDataExchangeComplete()) { @@ -230,7 +230,7 @@ u32 sub_8143770(u8 * r4, u16 * r5) *r4 = 5; break; case 5: - if (!gUnknown_3003F64) + if (!gReceivedRemoteLinkPlayers) { *r4 = 0; return 4; @@ -428,7 +428,7 @@ void sub_8143910(u8 taskId) data->t08 = 16; break; case 16: - if (!gUnknown_3003F64) + if (!gReceivedRemoteLinkPlayers) { if (data->t0E == 1) data->t08 = 17; diff --git a/src/quest_log.c b/src/quest_log.c index 8e890af21..4f462505a 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -165,7 +165,7 @@ u16 sub_81132A0(struct Var4038Struct *); void sub_81132E0(struct Var4038Struct *); bool16 sub_811337C(struct Var4038Struct *); void sub_8113390(struct Var4038Struct *); -void sub_8113414(u8 (*)[16], u8, u8); +void sub_8113414(struct LinkBattleRecords *, u8, u8); void sub_81134CC(struct Var4038Struct *); bool8 sub_8113508(struct Var4038Struct * ); void sub_8113524(struct Var4038Struct *); @@ -2693,13 +2693,13 @@ void sub_81133A4(void) r3 = 1; break; } - sub_8113414(gSaveBlock2Ptr->unk_A98, r3, r2); + sub_8113414(&gSaveBlock2Ptr->linkBattleRecords, r3, r2); } -void sub_8113414(u8 (* a0)[16], u8 a1, u8 a2) +void sub_8113414(struct LinkBattleRecords * a0, u8 a1, u8 a2) { u8 * str; - const u8 * src = a0[a1]; + const u8 * src = a0->entries[a1].name; if (src[0] == EOS) { switch (a2) diff --git a/sym_common.txt b/sym_common.txt index d71702d05..f63c4f277 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -60,7 +60,7 @@ gUnknown_3003F34: @ 3003F34 gUnknown_3003F38: @ 3003F38 .space 0x4 -gUnknown_3003F3C: @ 3003F3C +gWirelessCommType: @ 3003F3C .space 0x4 gUnknown_3003F40: @ 3003F40 @@ -72,7 +72,7 @@ gUnknown_3003F50: @ 3003F50 gUnknown_3003F60: @ 3003F60 .space 0x4 -gUnknown_3003F64: @ 3003F64 +gReceivedRemoteLinkPlayers: @ 3003F64 .space 0xC gUnknown_3003F70: @ 3003F70 |