dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Guess a small struct in save block 2

Browse Source
This commit is contained in:
PikalaxALT
2018-12-21 11:43:24 -05:00
parent 7f5addc626
commit a7ab82a948
30 changed files with 379 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/link.s
+68 -68
View File
@@ -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: