diff options
-rw-r--r-- | asm/battle_2.s | 48 | ||||
-rw-r--r-- | asm/battle_controllers.s | 8 | ||||
-rw-r--r-- | asm/cable_club.s | 92 | ||||
-rw-r--r-- | asm/link.s | 114 | ||||
-rw-r--r-- | asm/link_rfu_2.s | 42 | ||||
-rw-r--r-- | asm/link_rfu_3.s | 62 | ||||
-rw-r--r-- | asm/mevent_server.s | 237 | ||||
-rw-r--r-- | asm/trade.s | 66 | ||||
-rw-r--r-- | asm/union_room_chat.s | 8 | ||||
-rw-r--r-- | asm/unk_814BB4C.s | 16 | ||||
-rw-r--r-- | asm/unk_81507FC.s | 16 | ||||
-rw-r--r-- | include/link.h | 2 | ||||
-rw-r--r-- | include/link_rfu.h | 8 | ||||
-rw-r--r-- | include/link_rfu_4.h | 7 | ||||
-rw-r--r-- | include/mevent_server.h | 4 | ||||
-rw-r--r-- | src/mevent.c | 4 | ||||
-rw-r--r-- | src/mevent_server.c | 178 | ||||
-rw-r--r-- | sym_ewram.txt | 41 |
18 files changed, 453 insertions, 500 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s index eba29102c..011bb6d56 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] @@ -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 @@ -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,7 +1613,7 @@ _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 @@ -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 diff --git a/asm/battle_controllers.s b/asm/battle_controllers.s index 71c39120f..8ef9408a0 100644 --- a/asm/battle_controllers.s +++ b/asm/battle_controllers.s @@ -1420,7 +1420,7 @@ 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 @@ -1428,7 +1428,7 @@ _0800DD5C: .4byte gUnknown_3003F64 _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/cable_club.s b/asm/cable_club.s index 1d49bfcaa..830cff288 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 @@ -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 @@ -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 @@ -988,7 +988,7 @@ _08080EF8: 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 +_08080F48: .4byte gLinkType _08080F4C: .4byte 0x00004411 _08080F50: .4byte gTasks _08080F54: @@ -1170,24 +1170,24 @@ _08081080: 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 @@ -1231,7 +1231,7 @@ sub_80810F4: @ 80810F4 ldr r1, _08081118 @ =gUnknown_20370D0 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] @@ -1245,7 +1245,7 @@ sub_80810F4: @ 80810F4 bx r0 .align 2, 0 _08081118: .4byte gUnknown_20370D0 -_0808111C: .4byte gUnknown_202271A +_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 @@ -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 @@ -1537,14 +1537,14 @@ _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 @ =gPaletteFade @@ -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,7 +1703,7 @@ _080814A0: strh r0, [r6] b _0808160A .align 2, 0 -_080814BC: .4byte gUnknown_202271A +_080814BC: .4byte gLinkType _080814C0: .4byte 0x00002211 _080814C4: ldr r0, _080814D8 @ =gPaletteFade @@ -1720,7 +1720,7 @@ _080814D2: .align 2, 0 _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 @@ -2343,7 +2343,7 @@ 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] @@ -2355,7 +2355,7 @@ 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 _080819F0: .4byte sub_8081454 diff --git a/asm/link.s b/asm/link.s index 586ee46a8..63178e0dc 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 @@ -519,7 +519,7 @@ sub_80098B8: @ 80098B8 beq _080098CC bl sub_80F8DC0 _080098CC: - ldr r0, _080098E4 @ =gUnknown_2022718 + ldr r0, _080098E4 @ =gLinkOpen strb r4, [r0] bl sub_800B29C pop {r4} @@ -528,7 +528,7 @@ _080098CC: .align 2, 0 _080098DC: .4byte gUnknown_3003F64 _080098E0: .4byte gUnknown_3003F3C -_080098E4: .4byte gUnknown_2022718 +_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 @@ -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] @@ -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 @@ -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 @@ -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 @@ -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 @@ -3257,7 +3257,7 @@ c2_800ACD4: @ 800ACD4 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 @@ -3338,7 +3338,7 @@ _0800ADE4: .4byte gMPlayInfo_SE2 _0800ADE8: .4byte gMPlayInfo_SE3 _0800ADEC: .4byte gHeap _0800ADF0: .4byte gUnknown_3003F3C -_0800ADF4: .4byte gUnknown_2022854 +_0800ADF4: .4byte sLinkErrorBuffer _0800ADF8: .4byte sub_800978C _0800ADFC: .4byte gUnknown_82345E8 _0800AE00: .4byte gUnknown_2022860 @@ -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 @@ -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 @@ -3573,7 +3573,7 @@ _0800AFFC: .4byte gUnknown_8234610 _0800B000: .4byte gUnknown_841DF4C _0800B004: .4byte gMain _0800B008: .4byte gUnknown_3003F3C -_0800B00C: .4byte gUnknown_2022854 +_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 diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s index f59f1ea87..0bfd71538 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 @@ -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 @@ -2617,12 +2617,12 @@ _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 @@ -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 @@ -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,7 +5119,7 @@ _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 @@ -5132,7 +5132,7 @@ _080FAD8A: pop {r0} bx r0 .align 2, 0 -_080FAD90: .4byte gUnknown_2022118 +_080FAD90: .4byte gBlockRecvBuffer _080FAD94: .4byte gUnknown_3003F64 thumb_func_end sub_80FACF0 @@ -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 diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index d67176ed4..56bbd2c51 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -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: @@ -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 @@ -5947,7 +5947,7 @@ _08118BC2: 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 @@ -5959,7 +5959,7 @@ _08118BCE: _08118BE4: .4byte gUnknown_8457F90 _08118BE8: .4byte gUnknown_203B058 _08118BEC: .4byte gUnknown_3003F64 -_08118BF0: .4byte gUnknown_2022618 +_08118BF0: .4byte gBlockSendBuffer _08118BF4: .4byte sub_8117280 _08118BF8: ldr r0, _08118C1C @ =sub_8117280 @@ -6518,7 +6518,7 @@ _081190DE: 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 @@ -6528,7 +6528,7 @@ _081190EA: bl _081198DA .align 2, 0 _08119100: .4byte gUnknown_3003F64 -_08119104: .4byte gUnknown_2022618 +_08119104: .4byte gBlockSendBuffer _08119108: .4byte sub_8117280 _0811910C: adds r0, r6, 0 @@ -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 diff --git a/asm/mevent_server.s b/asm/mevent_server.s index 5772b19f4..833212ea4 100644 --- a/asm/mevent_server.s +++ b/asm/mevent_server.s @@ -5,243 +5,6 @@ .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} diff --git a/asm/trade.s b/asm/trade.s index b5d1dcac6..5df1c0534 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -250,7 +250,7 @@ _0804C80A: 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] @@ -270,7 +270,7 @@ _0804C80A: _0804C864: .4byte gPaletteFade _0804C868: .4byte gEnemyParty _0804C86C: .4byte gUnknown_3003F64 -_0804C870: .4byte gUnknown_202271A +_0804C870: .4byte gLinkType _0804C874: .4byte 0x00001122 _0804C878: .4byte gUnknown_2031DA8 _0804C87C: .4byte gUnknown_3003F3C @@ -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 @@ -7428,7 +7428,7 @@ _08050194: 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] @@ -7491,7 +7491,7 @@ _080501A8: b _08050472 .align 2, 0 _08050228: .4byte gUnknown_3003F64 -_0805022C: .4byte gUnknown_202271A +_0805022C: .4byte gLinkType _08050230: .4byte 0x00001144 _08050234: .4byte gUnknown_2031DAC _08050238: .4byte sub_804FF0C @@ -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 diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s index e7454d31f..4c7d6769f 100644 --- a/asm/union_room_chat.s +++ b/asm/union_room_chat.s @@ -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_814BB4C.s b/asm/unk_814BB4C.s index 1895133dc..c3f054fc7 100644 --- a/asm/unk_814BB4C.s +++ b/asm/unk_814BB4C.s @@ -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 diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s index 40d5a13b0..97711bd33 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -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 @@ -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 diff --git a/include/link.h b/include/link.h index 321a28d11..1c13de37e 100644 --- a/include/link.h +++ b/include/link.h @@ -149,7 +149,7 @@ extern bool8 gLinkVSyncDisabled; extern u8 gUnknown_3003F64; extern u8 gUnknown_3003F84; extern u64 gUnknown_3003FB4; -extern u16 gUnknown_202271A; +extern u16 gLinkType; void Task_DestroySelf(u8); void OpenLink(void); diff --git a/include/link_rfu.h b/include/link_rfu.h new file mode 100644 index 000000000..065d23f9f --- /dev/null +++ b/include/link_rfu.h @@ -0,0 +1,8 @@ +#ifndef GUARD_LINK_RFU_H +#define GUARD_LINK_RFU_H + +void sub_8142504(const u8 *str); +bool32 mevent_0814257C(u8 * cmdPtr, const u8 * src); +void sub_80FA190(void); + +#endif //GUARD_LINK_RFU_H diff --git a/include/link_rfu_4.h b/include/link_rfu_4.h deleted file mode 100644 index 91ae86e4c..000000000 --- a/include/link_rfu_4.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef GUARD_LINK_RFU_4_H -#define GUARD_LINK_RFU_4_H - -void sub_8142504(const u8 *str); -bool32 mevent_0814257C(u8 * cmdPtr, const u8 * src); - -#endif //GUARD_LINK_RFU_4_H diff --git a/include/mevent_server.h b/include/mevent_server.h new file mode 100644 index 000000000..0d46d8fc5 --- /dev/null +++ b/include/mevent_server.h @@ -0,0 +1,4 @@ +#ifndef GUARD_MEVENT_SERVER_H +#define GUARD_MEVENT_SERVER_H + +#endif //GUARD_MEVENT_SERVER_H diff --git a/src/mevent.c b/src/mevent.c index c81712de6..b04ac5462 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -8,7 +8,7 @@ #include "task.h" #include "decompress.h" #include "link.h" -#include "link_rfu_4.h" +#include "link_rfu.h" #include "unk_815c27c.h" #include "util.h" #include "script.h" @@ -134,7 +134,7 @@ u8 sub_8143674(struct MEvent_Str_1 *a0) void sub_81436BC(void) { memset(gDecompressionBuffer, 0, 0x2000); - gUnknown_202271A = 0x5502; + gLinkType = 0x5502; sub_8009804(); SetSuppressLinkErrorMessage(TRUE); } diff --git a/src/mevent_server.c b/src/mevent_server.c index 529b4ba77..0c94980ff 100644 --- a/src/mevent_server.c +++ b/src/mevent_server.c @@ -1,2 +1,180 @@ #include "global.h" +#include "malloc.h" +#include "util.h" +#include "link.h" +#include "link_rfu.h" #include "mevent.h" + +extern u16 gBlockRecvBuffer[][128]; + +struct mevent_srv_sub +{ + s32 unk_00; + u8 unk_04; + u8 unk_05; + u16 unk_06; + u16 unk_08; + u16 unk_0A; + u16 unk_0C; + u16 unk_0E; + u16 unk_10; + u16 unk_12; + u16 unk_14; + void * unk_18; + u32 unk_1C; + u32 (*unk_20)(struct mevent_srv_sub *); + u32 (*unk_24)(struct mevent_srv_sub *); +}; + +struct mevent_srv_ish +{ + u32 unk_00; + u32 unk_04; + u32 unk_08; + u32 unk_0C; + u32 unk_10; + void * unk_14; + void * unk_18; + void * unk_1C; + void * unk_20; + struct mevent_srv_sub unk_24; +}; + +EWRAM_DATA struct mevent_srv_ish * gUnknown_203F3C0 = NULL; + +u32 sub_814490C(struct mevent_srv_sub *); +u32 sub_81449E0(struct mevent_srv_sub *); + +u32 sub_8144844(struct mevent_srv_sub * srv) +{ + return srv->unk_20(srv); +} + +u32 sub_8144850(struct mevent_srv_sub * srv) +{ + return srv->unk_24(srv); +} + +void sub_814485C(struct mevent_srv_sub * srv, u8 a1, u8 a2) +{ + srv->unk_04 = a1; + srv->unk_05 = a2; + srv->unk_00 = 0; + srv->unk_12 = 0; + srv->unk_14 = 0; + srv->unk_10 = 0; + srv->unk_0A = 0; + srv->unk_0C = 0; + srv->unk_08 = 0; + srv->unk_1C = 0; + srv->unk_18 = NULL; + srv->unk_24 = sub_81449E0; + srv->unk_20 = sub_814490C; +} + +void sub_8144888(struct mevent_srv_sub * srv, u16 a1, u32 a2, u32 a3) +{ + srv->unk_00 = 0; + srv->unk_0E = a1; + srv->unk_10 = 0; + srv->unk_12 = 0; + if (a3 != 0) + srv->unk_14 = a3; + else + srv->unk_14 = 0x400; + srv->unk_1C = a2; +} + +void sub_81448AC(struct mevent_srv_sub * srv, u16 a1, void * a2) +{ + srv->unk_00 = 0; + srv->unk_06 = a1; + srv->unk_08 = 0; + srv->unk_0A = 0; + srv->unk_0C = 0; + srv->unk_18 = a2; +} + +void sub_81448BC(u32 recv_idx, u16 * dest, size_t size) +{ + memcpy(dest, gBlockRecvBuffer[recv_idx], size); +} + +bool32 sub_81448D8(u32 recv_idx) +{ + if ((GetBlockReceivedStatus() >> recv_idx) & 1) + return TRUE; + else + return FALSE; +} + +void sub_81448FC(u32 recv_idx) +{ + ResetBlockReceivedFlag(recv_idx); +} + +bool32 sub_814490C(struct mevent_srv_sub * srv) +{ + u16 buff[4]; + switch (srv->unk_00) + { + case 0: + if (sub_81448D8(srv->unk_05)) + { + u16 * r4; + sub_81448BC(srv->unk_05, (r4 = buff), sizeof(buff)); + srv->unk_0C = r4[2]; + srv->unk_0A = r4[1]; + if (srv->unk_0C > 0x400) + { + sub_80FA190(); + return FALSE; + } + else if (srv->unk_06 != buff[0]) + { + sub_80FA190(); + return FALSE; + } + else + { + srv->unk_08 = 0; + sub_81448FC(srv->unk_05); + ++srv->unk_00; + } + } + break; + case 1: + if (sub_81448D8(srv->unk_05)) + { + size_t r3 = srv->unk_08 * 252; + if (srv->unk_0C - r3 <= 252) + { + sub_81448BC(srv->unk_05, srv->unk_18 + r3, srv->unk_0C - r3); + ++srv->unk_08; + ++srv->unk_00; + } + else + { + sub_81448BC(srv->unk_05, srv->unk_18 + r3, 252); + ++srv->unk_08; + } + sub_81448FC(srv->unk_05); + } + break; + case 2: + if (CalcCRC16WithTable(srv->unk_18, srv->unk_0C) != srv->unk_0A) + { + sub_80FA190(); + return FALSE; + } + else + { + srv->unk_00 = 0; + return TRUE; + } + break; + + } + + return FALSE; +} diff --git a/sym_ewram.txt b/sym_ewram.txt index 83fdcf763..cb35591a1 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -49,51 +49,58 @@ gStringVar4: @ 2021D18 .include "src/string_util.o" -gUnknown_2022110: @ 2022110 + @ .include "src/link.o" +gLinkTestDebugValuesEnabled: @ 2022110 .space 0x1 gUnknown_2022111: @ 2022111 - .space 0x3 + .space 0x1 + .align 2 gUnknown_2022114: @ 2022114 .space 0x4 -gUnknown_2022118: @ 2022118 - .space 0x4 - -gUnknown_202211C: @ 202211C - .space 0x4FC +gBlockRecvBuffer: @ 2022118 + .space 0x500 -gUnknown_2022618: @ 2022618 +gBlockSendBuffer: @ 2022618 .space 0x100 -gUnknown_2022718: @ 2022718 - .space 0x2 +gLinkOpen: @ 2022718 + .space 0x1 -gUnknown_202271A: @ 202271A + .align 1 +gLinkType: @ 202271A .space 0x2 -gUnknown_202271C: @ 202271C - .space 0x4 +gLinkTimeOutCounter: @ 202271C + .space 0x2 -gUnknown_2022720: @ 2022720 + .align 2 +gLocalLinkPlayer: @ 2022720 .space 0x1C + .align 2 gLinkPlayers: @ 202273C .space 0x8C -gUnknown_20227C8: @ 20227C8 + .align 2 +gSavedLinkPlayers: @ 20227C8 .space 0x8C -gUnknown_2022854: @ 2022854 + .align 2 +sLinkErrorBuffer: @ 2022854 .space 0x8 + .align 1 gUnknown_202285C: @ 202285C - .space 0x4 + .space 0x2 + .align 2 gUnknown_2022860: @ 2022860 .space 0xC + @ .include "src/link_rfu.o" gUnknown_202286C: @ 202286C .space 0x1 |