Decompile some subtask2 functions

This commit is contained in:
Tal Hayon
2022-04-02 20:42:30 +03:00
parent 9233701a5d
commit 53dd89e3b6
23 changed files with 338 additions and 702 deletions
@@ -1,33 +0,0 @@
.syntax unified
push {r4, lr}
bl FlushSprites
ldr r1, _080A6AF4 @ =gUnk_08128F1C
ldr r4, _080A6AF8 @ =gMenu
ldrb r0, [r4, #5]
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl _call_via_r0
ldrb r1, [r4, #3]
lsls r1, r1, #3
ldr r0, _080A6AFC @ =gUnk_08128E94
adds r1, r1, r0
ldr r2, _080A6B00 @ =gScreen
movs r0, #5
ldrsb r0, [r1, r0]
rsbs r0, r0, #0
strh r0, [r2, #0x18]
ldrb r1, [r1, #6]
lsls r1, r1, #0x18
asrs r1, r1, #0x18
ldrh r0, [r4, #0xa]
subs r0, r0, r1
strh r0, [r2, #0x24]
bl CopyOAM
pop {r4, pc}
.align 2, 0
_080A6AF4: .4byte gUnk_08128F1C
_080A6AF8: .4byte gMenu
_080A6AFC: .4byte gUnk_08128E94
_080A6B00: .4byte gScreen
.syntax divided
@@ -1,25 +0,0 @@
.syntax unified
push {r4, lr}
bl FlushSprites
ldr r1, _080A652C @ =gUnk_08128E70
ldr r4, _080A6530 @ =gMenu
ldrb r0, [r4, #5]
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl _call_via_r0
adds r4, #0x2c
ldrb r1, [r4]
movs r0, #0x20
ands r0, r1
cmp r0, #0
beq _080A6522
bl sub_080A6438
_080A6522:
bl sub_080A6498
bl CopyOAM
pop {r4, pc}
.align 2, 0
_080A652C: .4byte gUnk_08128E70
_080A6530: .4byte gMenu
.syntax divided
@@ -1,40 +0,0 @@
.syntax unified
push {lr}
ldr r2, _080A5AA4 @ =gMenu
ldrh r0, [r2, #8]
cmp r0, #0
beq _080A5AA8
cmp r0, #0xff
beq _080A5AC0
subs r0, #1
strh r0, [r2, #8]
b _080A5AD2
.align 2, 0
_080A5AA4: .4byte gMenu
_080A5AA8:
ldr r0, _080A5ABC @ =gInput
ldrh r1, [r0, #2]
movs r0, #0xb
ands r0, r1
cmp r0, #0
beq _080A5AD2
movs r0, #0xff
strh r0, [r2, #8]
b _080A5AD2
.align 2, 0
_080A5ABC: .4byte gInput
_080A5AC0:
ldr r0, _080A5AD4 @ =gPauseMenuOptions
ldrb r0, [r0, #1]
movs r1, #1
cmp r0, #0xa
bne _080A5ACC
movs r1, #2
_080A5ACC:
adds r0, r1, #0
bl sub_080A4E84
_080A5AD2:
pop {pc}
.align 2, 0
_080A5AD4: .4byte gPauseMenuOptions
.syntax divided
@@ -1,14 +0,0 @@
.syntax unified
push {lr}
ldr r1, _080A5AEC @ =gUnk_08128D24
ldr r0, _080A5AF0 @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl _call_via_r0
pop {pc}
.align 2, 0
_080A5AEC: .4byte gUnk_08128D24
_080A5AF0: .4byte gMenu
.syntax divided
@@ -1,48 +0,0 @@
.syntax unified
.ifdef EU
push {lr}
ldr r1, _080A5B18 @ =gMenu
movs r0, #0
strb r0, [r1, #3]
.else
push {r4, lr}
ldr r0, _080A5B18 @ =gMenu
movs r4, #0
strb r4, [r0, #3]
.endif
movs r0, #2
movs r1, #0
bl SetPopupState
.ifndef EU
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
cmp r0, #0
bne _080A5B24
ldr r1, _080A5B1C @ =gScreen
ldr r0, _080A5B20 @ =0x0000FFFC
strh r0, [r1, #0x18]
b _080A5B28
.align 2, 0
_080A5B18: .4byte gMenu
_080A5B1C: .4byte gScreen
_080A5B20: .4byte 0x0000FFFC
_080A5B24:
ldr r0, _080A5B30 @ =gScreen
strh r4, [r0, #0x18]
.endif
_080A5B28:
movs r0, #1
bl SetMenuType
.ifdef EU
pop {pc}
.else
pop {r4, pc}
.endif
.align 2, 0
.ifdef EU
_080A5B18: .4byte gMenu
.else
_080A5B30: .4byte gScreen
.endif
.syntax divided
@@ -1,26 +0,0 @@
.syntax unified
push {lr}
ldr r0, _080A5BE4 @ =gFadeControl
ldrb r0, [r0]
cmp r0, #0
bne _080A5BE2
bl sub_08050384
ldr r1, _080A5BE8 @ =gMain
ldrb r0, [r1, #1]
movs r0, #1
strb r0, [r1, #1]
movs r0, #6
movs r1, #8
bl SetFade
movs r0, #2
bl sub_080A4E84
ldr r1, _080A5BEC @ =gPauseMenuOptions
movs r0, #0x10
strb r0, [r1, #0x16]
_080A5BE2:
pop {pc}
.align 2, 0
_080A5BE4: .4byte gFadeControl
_080A5BE8: .4byte gMain
_080A5BEC: .4byte gPauseMenuOptions
.syntax divided
@@ -1,38 +0,0 @@
.syntax unified
push {r4, r5, lr}
ldr r1, _080A5C30 @ =gUnk_08128D30
ldr r0, _080A5C34 @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl _call_via_r0
bl sub_080A5D1C
ldr r0, _080A5C38 @ =gMain
ldrh r0, [r0, #0xc]
movs r1, #7
ands r0, r1
cmp r0, #0
bne _080A5C2E
ldr r4, _080A5C3C @ =gUnk_02017830
ldrh r5, [r4]
adds r0, r4, #2
adds r1, r4, #0
movs r2, #0xe
bl MemCopy
strh r5, [r4, #0xe]
ldr r2, _080A5C40 @ =gUsedPalettes
ldr r0, [r2]
movs r1, #0x80
lsls r1, r1, #5
orrs r0, r1
str r0, [r2]
_080A5C2E:
pop {r4, r5, pc}
.align 2, 0
_080A5C30: .4byte gUnk_08128D30
_080A5C34: .4byte gMenu
_080A5C38: .4byte gMain
_080A5C3C: .4byte gUnk_02017830
_080A5C40: .4byte gUsedPalettes
.syntax divided
@@ -1,47 +0,0 @@
.syntax unified
push {lr}
bl sub_080A51F4
cmp r0, #0
beq _080A5CFA
ldr r0, _080A5CC4 @ =gArea
ldrb r0, [r0, #3]
lsls r0, r0, #2
ldr r1, _080A5CC8 @ =gUnk_080C9C6C
adds r3, r0, r1
ldr r1, _080A5CCC @ =gMenu
ldrb r2, [r1, #3]
ldr r0, _080A5CD0 @ =gInput
ldrh r0, [r0, #2]
cmp r0, #0x40
beq _080A5CD4
cmp r0, #0x80
beq _080A5CDC
b _080A5CE6
.align 2, 0
_080A5CC4: .4byte gArea
_080A5CC8: .4byte gUnk_080C9C6C
_080A5CCC: .4byte gMenu
_080A5CD0: .4byte gInput
_080A5CD4:
cmp r2, #0
ble _080A5CE6
subs r2, #1
b _080A5CE6
_080A5CDC:
ldrb r0, [r3]
subs r0, #1
cmp r0, r2
ble _080A5CE6
adds r2, #1
_080A5CE6:
ldrb r0, [r1, #3]
cmp r0, r2
beq _080A5CFA
strb r2, [r1, #3]
adds r0, r2, #0
bl sub_080A5CFC
movs r0, #0x69
bl SoundReq
_080A5CFA:
pop {pc}
.syntax divided
@@ -1,42 +0,0 @@
.syntax unified
push {lr}
bl sub_080A51F4
cmp r0, #0
beq _080A6178
ldr r1, _080A614C @ =gMenu
ldrb r2, [r1, #3]
ldr r0, _080A6150 @ =gInput
ldrh r0, [r0, #2]
cmp r0, #0x10
beq _080A6154
cmp r0, #0x20
bne _080A6156
subs r2, #1
b _080A6156
.align 2, 0
_080A614C: .4byte gMenu
_080A6150: .4byte gInput
_080A6154:
adds r2, #1
_080A6156:
adds r3, r2, #0
adds r3, #8
adds r0, r3, #0
cmp r3, #0
bge _080A6164
adds r0, r2, #0
adds r0, #0xf
_080A6164:
asrs r2, r0, #3
lsls r0, r2, #3
subs r2, r3, r0
ldrb r0, [r1, #3]
cmp r0, r2
beq _080A6178
strb r2, [r1, #3]
movs r0, #0x69
bl SoundReq
_080A6178:
pop {pc}
.align 2, 0
.syntax divided
@@ -1,32 +0,0 @@
.syntax unified
push {r4, lr}
ldr r0, _080A62C4 @ =gUnk_08128DD8
bl sub_080A70AC
ldr r4, _080A62C8 @ =gMenu
ldr r0, _080A62CC @ =gUnk_08128DD4
str r0, [r4, #0xc]
movs r0, #0x81
bl LoadGfxGroup
ldr r1, _080A62D0 @ =gScreen
ldr r0, _080A62D4 @ =0x0000FFFC
strh r0, [r1, #0x18]
strh r0, [r1, #0x24]
ldr r2, _080A62D8 @ =gSave
ldr r0, [r2, #0x40]
ldr r1, _080A62DC @ =0x00010780
orrs r0, r1
str r0, [r2, #0x40]
bl sub_080A6F40
strh r0, [r4, #0x10]
movs r0, #1
strb r0, [r4, #5]
pop {r4, pc}
.align 2, 0
_080A62C4: .4byte gUnk_08128DD8
_080A62C8: .4byte gMenu
_080A62CC: .4byte gUnk_08128DD4
_080A62D0: .4byte gScreen
_080A62D4: .4byte 0x0000FFFC
_080A62D8: .4byte gSave
_080A62DC: .4byte 0x00010780
.syntax divided
@@ -1,97 +0,0 @@
.syntax unified
.ifdef EU
push {r4, r5, r6, r7, lr}
ldr r2, _080A5C7C @ =gOamCmd
movs r1, #0
movs r0, #0x80
lsls r0, r0, #3
strh r0, [r2, #4]
strh r1, [r2, #6]
strh r1, [r2, #8]
ldr r0, _080A5C80 @ =gSave
ldr r1, _080A5C84 @ =gMenu
ldrh r0, [r0, #0x20]
ldrh r5, [r1, #0x10]
ands r5, r0
ldr r4, _080A5C88EU @ =gUnk_08128F58
movs r6, #0
ldrb r0, [r4]
cmp r0, #0
beq _080A5C78
adds r7, r2, #0
_080A5C52:
movs r0, #1
lsls r0, r6
ands r0, r5
cmp r0, #0
beq _080A5C6E
ldrb r0, [r4, #1]
strh r0, [r7]
ldrb r0, [r4, #2]
strh r0, [r7, #2]
ldrb r1, [r4]
movs r0, #0xfd
lsls r0, r0, #1
bl DrawDirect
_080A5C6E:
adds r6, #1
adds r4, #8
ldrb r0, [r4]
cmp r0, #0
bne _080A5C52
_080A5C78:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A5C7C: .4byte gOamCmd
_080A5C80: .4byte gSave
_080A5C84: .4byte gMenu
_080A5C88EU: .4byte gUnk_08128F58
.else
push {r4, r5, r6, r7, lr}
ldr r2, _080A6484 @ =gOamCmd
movs r1, #0
movs r0, #0x80
lsls r0, r0, #3
strh r0, [r2, #4]
strh r1, [r2, #6]
strh r1, [r2, #8]
ldr r0, _080A6488 @ =gSave
ldr r1, _080A648C @ =gMenu
ldrh r0, [r0, #0x20]
ldrh r5, [r1, #0x10]
ands r5, r0
ldr r4, _080A6490 @ =gUnk_08128F58
movs r6, #0
ldrb r0, [r4]
cmp r0, #0
beq _080A6482
adds r7, r2, #0
_080A645E:
movs r0, #1
lsls r0, r6
ands r0, r5
cmp r0, #0
beq _080A6478
ldrb r0, [r4, #1]
strh r0, [r7]
ldrb r0, [r4, #2]
strh r0, [r7, #2]
ldrb r1, [r4]
ldr r0, _080A6494 @ =0x000001FB
bl DrawDirect
_080A6478:
adds r6, #1
adds r4, #8
ldrb r0, [r4]
cmp r0, #0
bne _080A645E
_080A6482:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A6484: .4byte gOamCmd
_080A6488: .4byte gSave
_080A648C: .4byte gMenu
_080A6490: .4byte gUnk_08128F58
_080A6494: .4byte 0x000001FB
.endif
.syntax divided
@@ -1,32 +0,0 @@
.syntax unified
push {r4, lr}
ldr r1, _080A6640 @ =gUnk_08128E78
ldr r4, _080A6644 @ =gMenu
ldrb r0, [r4, #5]
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl _call_via_r0
ldrb r1, [r4, #3]
lsls r1, r1, #3
ldr r0, _080A6648 @ =gUnk_08128E94
adds r1, r1, r0
ldr r2, _080A664C @ =gScreen
movs r0, #5
ldrsb r0, [r1, r0]
rsbs r0, r0, #0
strh r0, [r2, #0x18]
ldrb r1, [r1, #6]
lsls r1, r1, #0x18
asrs r1, r1, #0x18
ldrh r0, [r4, #0xa]
subs r0, r0, r1
strh r0, [r2, #0x24]
bl sub_080A66D0
pop {r4, pc}
.align 2, 0
_080A6640: .4byte gUnk_08128E78
_080A6644: .4byte gMenu
_080A6648: .4byte gUnk_08128E94
_080A664C: .4byte gScreen
.syntax divided
@@ -1,44 +0,0 @@
.syntax unified
push {lr}
ldr r2, _080A669C @ =gMenu
ldr r0, _080A66A0 @ =gUnk_08128E80
str r0, [r2, #0xc]
ldrb r0, [r2, #3]
lsls r0, r0, #3
ldr r1, _080A66A4 @ =gUnk_08128E94
adds r3, r0, r1
ldrh r1, [r2, #0xa]
ldr r0, _080A66A8 @ =gInput
ldrh r0, [r0]
cmp r0, #0x40
beq _080A66AC
cmp r0, #0x80
beq _080A66B4
b _080A66C2
.align 2, 0
_080A669C: .4byte gMenu
_080A66A0: .4byte gUnk_08128E80
_080A66A4: .4byte gUnk_08128E94
_080A66A8: .4byte gInput
_080A66AC:
cmp r1, #0
beq _080A66C2
subs r1, #2
b _080A66C2
_080A66B4:
ldrb r0, [r3, #2]
cmp r0, r1
bls _080A66BC
adds r1, #2
_080A66BC:
cmp r0, r1
bhs _080A66C2
adds r1, r0, #0
_080A66C2:
strh r1, [r2, #0xa]
ldrb r0, [r2, #3]
movs r1, #0
bl sub_080A6FB4
pop {pc}
.align 2, 0
.syntax divided
@@ -1,42 +0,0 @@
.syntax unified
push {r4, r5, r6, lr}
adds r6, r2, #0
adds r5, r3, #0
bl sub_080A69E0
adds r4, r0, #0
cmp r4, #0
ble _080A69D4
ldr r2, _080A69D8 @ =gMenu
adds r2, #0x2d
ldrb r0, [r2]
lsls r0, r0, #3
ldr r3, _080A69DC @ =gMapDataBottomSpecial
adds r0, r0, r3
lsrs r1, r5, #8
strb r1, [r0]
ldrb r0, [r2]
lsls r0, r0, #3
adds r0, r0, r3
strb r5, [r0, #1]
ldrb r0, [r2]
lsls r0, r0, #3
adds r0, r0, r3
strh r6, [r0, #2]
ldrb r0, [r2]
lsls r0, r0, #3
adds r0, r0, r3
strh r4, [r0, #4]
ldrb r0, [r2]
lsls r0, r0, #3
adds r0, r0, r3
asrs r1, r4, #0x10
strh r1, [r0, #6]
ldrb r0, [r2]
adds r0, #1
strb r0, [r2]
_080A69D4:
pop {r4, r5, r6, pc}
.align 2, 0
_080A69D8: .4byte gMenu
_080A69DC: .4byte gMapDataBottomSpecial
.syntax divided
@@ -1,34 +0,0 @@
.syntax unified
push {lr}
adds r3, r0, #0
lsrs r3, r3, #4
lsrs r1, r1, #4
ldr r2, _080A6A8C @ =gUnk_08127F94
b _080A6AAE
.align 2, 0
_080A6A8C: .4byte gUnk_08127F94
_080A6A90:
ldrb r0, [r2]
cmp r0, r3
bhi _080A6AAC
ldrb r0, [r2, #2]
cmp r0, r3
blo _080A6AAC
ldrb r0, [r2, #1]
cmp r0, r1
bhi _080A6AAC
ldrb r0, [r2, #3]
cmp r0, r1
blo _080A6AAC
adds r0, r2, #0
b _080A6AB6
_080A6AAC:
adds r2, #8
_080A6AAE:
ldrb r0, [r2]
cmp r0, #0xff
bne _080A6A90
movs r0, #0
_080A6AB6:
pop {pc}
.syntax divided
@@ -1,24 +0,0 @@
.syntax unified
push {r4, r5, r6, lr}
movs r5, #0
ldr r4, _080A6F4C @ =gUnk_08128F38
movs r6, #0
b _080A6F60
.align 2, 0
_080A6F4C: .4byte gUnk_08128F38
_080A6F50:
ldrb r0, [r4]
ldrb r1, [r4, #1]
bl sub_0807CB24
lsls r0, r5
orrs r6, r0
adds r5, #1
adds r4, #2
_080A6F60:
ldrb r0, [r4]
cmp r0, #0
bne _080A6F50
mvns r0, r6
pop {r4, r5, r6, pc}
.align 2, 0
.syntax divided
@@ -1,34 +0,0 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
ldr r1, _080A6FA4 @ =gMenu
ldrh r0, [r1, #0x2e]
cmp r0, r4
beq _080A6F9A
strh r4, [r1, #0x2e]
ldr r0, _080A6FA8 @ =gUnk_020350F0
movs r1, #0x80
lsls r1, r1, #1
bl MemClear
movs r0, #0xff
ands r0, r4
cmp r0, #0
beq _080A6F94
ldr r1, _080A6FAC @ =gUnk_08128FA8
adds r0, r4, #0
bl sub_0805F46C
_080A6F94:
ldr r1, _080A6FB0 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
_080A6F9A:
ldr r1, _080A6FB0 @ =gScreen
movs r0, #2
strh r0, [r1, #0xc]
pop {r4, pc}
.align 2, 0
_080A6FA4: .4byte gMenu
_080A6FA8: .4byte gUnk_020350F0
_080A6FAC: .4byte gUnk_08128FA8
_080A6FB0: .4byte gScreen
.syntax divided