Skip to content

Commit

Permalink
Merge pull request #593 from MokhaLeee/sioutils
Browse files Browse the repository at this point in the history 
sio_utils decompiled
  • Loading branch information
@RevoSucks
RevoSucks authored Mar 18, 2024
2 parents 16ca5b8 + cd3f93a commit 1089ae3
Show file tree
Hide file tree
Showing 15 changed files with 507 additions and 959 deletions.
32 changes: 16 additions & 16 deletions asm/code_sio.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1177,7 +1177,7 @@ _08045B4C:
bl SetUnitStatus
movs r1, #0
strb r1, [r5, #0x1b]
ldr r0, _08045B88 @ gUnk_Sio_0203DB10
ldr r0, _08045B88 @ gSioSaveConfig
ldrb r1, [r0]
movs r0, #4
ands r0, r1
Expand All @@ -1191,7 +1191,7 @@ _08045B78: .4byte gUnknown_080D9E44
_08045B7C: .4byte gLinkArenaSt
_08045B80: .4byte gUnk_Sio_0203DAC5
_08045B84: .4byte gUnk_Sio_0203DDB4
_08045B88: .4byte gUnk_Sio_0203DB10
_08045B88: .4byte gSioSaveConfig
_08045B8C:
adds r0, r5, #0
bl sub_804D40C
Expand All @@ -1206,7 +1206,7 @@ _08045BA0:
strb r4, [r5, #0xb]
cmp r6, #0
beq _08045BB8
ldr r0, _08045C04 @ gUnk_Sio_0203DB10
ldr r0, _08045C04 @ gSioSaveConfig
ldrb r1, [r0]
movs r0, #1
ands r0, r1
Expand Down Expand Up @@ -1256,7 +1256,7 @@ _08045BCC:
pop {r0}
bx r0
.align 2, 0
_08045C04: .4byte gUnk_Sio_0203DB10
_08045C04: .4byte gSioSaveConfig
_08045C08: .4byte gUnk_Sio_0203DD90
_08045C0C: .4byte gSioSt
_08045C10: .4byte gLinkArenaSt
Expand Down Expand Up @@ -2946,7 +2946,7 @@ sub_80469C4: @ 0x080469C4
movs r1, #0x10
adds r2, r7, #0
bl sub_804C2EC
ldr r4, _08046AC4 @ gUnk_Sio_0203DD0C
ldr r4, _08046AC4 @ gSioTexts
adds r0, r4, #0
movs r1, #0x18
bl InitText
Expand Down Expand Up @@ -3032,7 +3032,7 @@ _08046AAC:
_08046AB8: .4byte Img_TacticianSelObj
_08046ABC: .4byte 0x06014800
_08046AC0: .4byte Font_0203DB64
_08046AC4: .4byte gUnk_Sio_0203DD0C
_08046AC4: .4byte gSioTexts
_08046AC8: .4byte 0x0000074C
_08046ACC: .4byte 0x0000074D
_08046AD0:
Expand Down Expand Up @@ -3796,7 +3796,7 @@ _08047094:
subs r4, #1
cmp r4, #0
bge _08047094
ldr r4, _080471E8 @ gUnk_Sio_0203DD0C
ldr r4, _080471E8 @ gSioTexts
adds r0, r4, #0
movs r1, #0x18
bl InitText
Expand Down Expand Up @@ -3928,7 +3928,7 @@ _080471D8: .4byte gBG2TilemapBuffer+0x102
_080471DC: .4byte gUnknown_085AE464
_080471E0: .4byte Font_0203DB64
_080471E4: .4byte Texts_0203DB14
_080471E8: .4byte gUnk_Sio_0203DD0C
_080471E8: .4byte gSioTexts
_080471EC: .4byte 0x00000772
_080471F0: .4byte 0x00000773
_080471F4: .4byte 0x00000774
Expand Down Expand Up @@ -4170,7 +4170,7 @@ _080473D2:
subs r4, #1
cmp r4, #0
bge _080473D2
ldr r4, _08047550 @ gUnk_Sio_0203DD0C
ldr r4, _08047550 @ gSioTexts
adds r0, r4, #0
movs r1, #0x18
bl InitText
Expand Down Expand Up @@ -4325,7 +4325,7 @@ _08047540: .4byte gBG2TilemapBuffer+0x102
_08047544: .4byte gUnknown_085AE464
_08047548: .4byte Font_0203DB64
_0804754C: .4byte Texts_0203DB14
_08047550: .4byte gUnk_Sio_0203DD0C
_08047550: .4byte gSioTexts
_08047554: .4byte 0x00000772
_08047558: .4byte 0x00000773
_0804755C: .4byte 0x00000774
Expand Down Expand Up @@ -4803,7 +4803,7 @@ sub_8047928: @ 0x08047928
beq _08047952
movs r0, #1
bl SioPlaySoundEffect
ldr r0, _08047A48 @ gUnk_Sio_0203DB10
ldr r0, _08047A48 @ gSioSaveConfig
bl WriteMultiArenaSaveConfig
adds r0, r6, #0
bl Proc_Break
Expand Down Expand Up @@ -4929,7 +4929,7 @@ _08047A3A:
bx r0
.align 2, 0
_08047A44: .4byte gKeyStatusPtr
_08047A48: .4byte gUnk_Sio_0203DB10
_08047A48: .4byte gSioSaveConfig
_08047A4C: .4byte gUnknown_080D9E50
_08047A50: .4byte 0x00000745

Expand Down Expand Up @@ -5063,7 +5063,7 @@ sub_8047B34: @ 0x08047B34
push {r4, r5, r6, r7, lr}
sub sp, #4
adds r6, r0, #0
ldr r4, _08047BC4 @ gUnk_Sio_0203DB10
ldr r4, _08047BC4 @ gSioSaveConfig
adds r0, r4, #0
bl ReadMultiArenaSaveConfig
ldrb r0, [r4]
Expand Down Expand Up @@ -5122,7 +5122,7 @@ sub_8047B34: @ 0x08047B34
movs r0, #3
b _08047BDC
.align 2, 0
_08047BC4: .4byte gUnk_Sio_0203DB10
_08047BC4: .4byte gSioSaveConfig
_08047BC8: .4byte gUnknown_085AB358
_08047BCC: .4byte 0x06014800
_08047BD0: .4byte gUnknown_085ADBE8
Expand Down Expand Up @@ -5350,7 +5350,7 @@ sub_8047D88: @ 0x08047D88
push {r5, r6, r7}
sub sp, #4
adds r6, r0, #0
ldr r4, _08047E20 @ gUnk_Sio_0203DB10
ldr r4, _08047E20 @ gSioSaveConfig
adds r0, r4, #0
bl ReadMultiArenaSaveConfig
ldrb r0, [r4]
Expand Down Expand Up @@ -5409,7 +5409,7 @@ sub_8047D88: @ 0x08047D88
movs r0, #3
b _08047E38
.align 2, 0
_08047E20: .4byte gUnk_Sio_0203DB10
_08047E20: .4byte gSioSaveConfig
_08047E24: .4byte gUnknown_085AB358
_08047E28: .4byte 0x06014800
_08047E2C: .4byte gUnknown_085ADBE8
Expand Down
120 changes: 6 additions & 114 deletions asm/code_sio_8042DC8.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,124 +2,16 @@

.SYNTAX UNIFIED

THUMB_FUNC_START sub_8043244
sub_8043244: @ 0x08043244
push {r4, lr}
ldr r4, _08043264 @ gUnk_Sio_0203DB10
adds r0, r4, #0
bl ReadMultiArenaSaveConfig
ldrb r0, [r4]
movs r1, #8
orrs r0, r1
strb r0, [r4]
adds r0, r4, #0
bl WriteMultiArenaSaveConfig
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08043264: .4byte gUnk_Sio_0203DB10

THUMB_FUNC_END sub_8043244

THUMB_FUNC_START sub_8043268
sub_8043268: @ 0x08043268
push {r4, r5, r6, lr}
adds r5, r0, #0
ldr r0, _0804328C @ gKeyStatusPtr
ldr r0, [r0]
ldrh r4, [r0, #8]
adds r3, r4, #0
cmp r3, #0
bne _08043298
ldr r1, _08043290 @ gUnk_Sio_0203DD4C
ldr r0, [r1]
adds r0, #1
str r0, [r1]
cmp r0, #0x3b
ble _080432EC
ldr r0, _08043294 @ gUnknown_0300180C
str r3, [r1]
str r3, [r0]
b _080432EC
.align 2, 0
_0804328C: .4byte gKeyStatusPtr
_08043290: .4byte gUnk_Sio_0203DD4C
_08043294: .4byte gUnknown_0300180C
_08043298:
ldr r0, _080432CC @ gUnk_Sio_0203DD4C
movs r6, #0
str r6, [r0]
ldr r1, _080432D0 @ gUnk_Sio_0203DD2C
ldr r2, _080432D4 @ gUnknown_03001808
ldr r0, [r2]
lsls r0, r0, #1
adds r0, r0, r1
strh r4, [r0]
ldr r1, _080432D8 @ gUnknown_0300180C
ldr r4, [r1]
lsls r0, r4, #1
adds r0, r0, r5
ldrh r0, [r0]
cmp r3, r0
bne _080432E0
adds r0, r4, #1
str r0, [r1]
lsls r0, r0, #1
adds r0, r0, r5
ldrh r1, [r0]
ldr r0, _080432DC @ 0x0000FFFF
cmp r1, r0
bne _080432E2
movs r0, #1
b _080432EE
.align 2, 0
_080432CC: .4byte gUnk_Sio_0203DD4C
_080432D0: .4byte gUnk_Sio_0203DD2C
_080432D4: .4byte gUnknown_03001808
_080432D8: .4byte gUnknown_0300180C
_080432DC: .4byte 0x0000FFFF
_080432E0:
str r6, [r1]
_080432E2:
ldr r0, [r2]
adds r0, #1
movs r1, #0xf
ands r0, r1
str r0, [r2]
_080432EC:
movs r0, #0
_080432EE:
pop {r4, r5, r6}
pop {r1}
bx r1

THUMB_FUNC_END sub_8043268

THUMB_FUNC_START sub_80432F4
sub_80432F4: @ 0x080432F4
push {lr}
ldr r0, _08043304 @ gUnknown_085A93F0
bl sub_8043268
lsls r0, r0, #0x18
asrs r0, r0, #0x18
pop {r1}
bx r1
.align 2, 0
_08043304: .4byte gUnknown_085A93F0

THUMB_FUNC_END sub_80432F4

THUMB_FUNC_START sub_8043308
sub_8043308: @ 0x08043308
push {lr}
adds r1, r0, #0
ldr r0, _08043318 @ gUnknown_085A94AC
ldr r0, _08043318 @ ProcScr_Sio_085A94AC
bl Proc_StartBlocking
pop {r0}
bx r0
.align 2, 0
_08043318: .4byte gUnknown_085A94AC
_08043318: .4byte ProcScr_Sio_085A94AC

THUMB_FUNC_END sub_8043308

Expand Down Expand Up @@ -1462,7 +1354,7 @@ sub_8043D8C: @ 0x08043D8C
mov r9, r0
ldr r1, [r7, #0x2c]
str r1, [sp, #4]
ldr r0, _08043DD0 @ gUnknown_085A93E0
ldr r0, _08043DD0 @ gSioList_085A93E0
bl sub_8043268
lsls r0, r0, #0x18
cmp r0, #0
Expand All @@ -1483,7 +1375,7 @@ sub_8043D8C: @ 0x08043D8C
bl Proc_Goto
b _08044270
.align 2, 0
_08043DD0: .4byte gUnknown_085A93E0
_08043DD0: .4byte gSioList_085A93E0
_08043DD4: .4byte gUnk_Sio_0203DB7C
_08043DD8:
ldr r1, [sp, #4]
Expand Down Expand Up @@ -1704,7 +1596,7 @@ _08043F84:
adds r0, r7, #0
movs r1, #0x50
movs r3, #0x88
bl sub_8042FFC
bl StartSioHold
str r0, [r7, #0x30]
mov r1, r9
adds r1, #1
Expand Down Expand Up @@ -1762,7 +1654,7 @@ _08043FEE:
adds r0, r7, #0
movs r1, #0x50
movs r3, #0x88
bl sub_8042FFC
bl StartSioHold
str r0, [r7, #0x30]
adds r0, r7, #0
movs r1, #7
Expand Down
Loading

0 comments on commit 1089ae3

Please sign in to comment.