mirror of https://github.com/zeldaret/tmc.git
Match some subtask2 functions
This commit is contained in:
Tal Hayon
parent
02cec8ca8d
commit
157990d545
|
|
@ -1,248 +0,0 @@
|
|||
.syntax unified
|
||||
.ifdef EU
|
||||
push {r4, r5, r6, r7, lr}
|
||||
mov r7, sl
|
||||
mov r6, sb
|
||||
mov r5, r8
|
||||
push {r5, r6, r7}
|
||||
ldr r6, _080A5F74 @ =gOamCmd
|
||||
movs r0, #0
|
||||
strh r0, [r6, #4]
|
||||
strh r0, [r6, #6]
|
||||
movs r0, #0x78
|
||||
strh r0, [r6]
|
||||
ldr r4, _080A5F78 @ =gMenu
|
||||
ldrb r0, [r4, #3]
|
||||
lsls r0, r0, #3
|
||||
ldr r1, _080A5F7C @ =gUnk_08128E94
|
||||
adds r5, r0, r1
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x2c
|
||||
ldrb r0, [r1]
|
||||
adds r2, r0, #1
|
||||
strb r2, [r1]
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x2b
|
||||
ldrb r0, [r0]
|
||||
cmp r0, #1
|
||||
beq _080A5F30
|
||||
movs r0, #0x10
|
||||
ands r2, r0
|
||||
cmp r2, #0
|
||||
beq _080A5F30
|
||||
movs r0, #0x80
|
||||
lsls r0, r0, #4
|
||||
strh r0, [r6, #8]
|
||||
ldrh r0, [r4, #0xa]
|
||||
cmp r0, #0
|
||||
beq _080A5F1A
|
||||
movs r0, #0xc
|
||||
strh r0, [r6, #2]
|
||||
movs r0, #0xfd
|
||||
lsls r0, r0, #1
|
||||
movs r1, #0x71
|
||||
bl DrawDirect
|
||||
_080A5F1A:
|
||||
ldrb r0, [r5, #2]
|
||||
ldrh r4, [r4, #0xa]
|
||||
cmp r0, r4
|
||||
bls _080A5F30
|
||||
movs r0, #0x84
|
||||
strh r0, [r6, #2]
|
||||
movs r0, #0xfd
|
||||
lsls r0, r0, #1
|
||||
movs r1, #0x72
|
||||
bl DrawDirect
|
||||
_080A5F30:
|
||||
ldrb r0, [r5, #7]
|
||||
mov sl, r0
|
||||
ldrb r5, [r5, #3]
|
||||
mov sb, r5
|
||||
ldr r1, _080A5F78 @ =gMenu
|
||||
ldrh r0, [r1, #0xa]
|
||||
mov r8, r0
|
||||
ldr r2, _080A5F74 @ =gOamCmd
|
||||
movs r0, #0
|
||||
strh r0, [r2, #4]
|
||||
strh r0, [r2, #6]
|
||||
movs r0, #0xc0
|
||||
lsls r0, r0, #4
|
||||
strh r0, [r2, #8]
|
||||
adds r1, #0x2c
|
||||
ldrb r1, [r1]
|
||||
movs r0, #0x20
|
||||
ands r0, r1
|
||||
lsls r0, r0, #0x18
|
||||
lsrs r6, r0, #0x18
|
||||
ldr r4, _080A5F80 @ =gMapDataBottomSpecial
|
||||
ldrh r0, [r4, #2]
|
||||
cmp r0, #0
|
||||
beq _080A5FAE
|
||||
rsbs r5, r6, #0
|
||||
orrs r5, r6
|
||||
adds r7, r2, #0
|
||||
_080A5F66:
|
||||
movs r1, #0
|
||||
ldrb r0, [r4]
|
||||
cmp r0, #1
|
||||
bne _080A5F84
|
||||
lsrs r1, r5, #0x1f
|
||||
b _080A5F8A
|
||||
.align 2, 0
|
||||
_080A5F74: .4byte gOamCmd
|
||||
_080A5F78: .4byte gMenu
|
||||
_080A5F7C: .4byte gUnk_08128E94
|
||||
_080A5F80: .4byte gMapDataBottomSpecial
|
||||
_080A5F84:
|
||||
cmp r6, #0
|
||||
bne _080A5F8A
|
||||
movs r1, #1
|
||||
_080A5F8A:
|
||||
cmp r1, #0
|
||||
beq _080A5FA6
|
||||
ldrh r0, [r4, #4]
|
||||
add r0, sl
|
||||
strh r0, [r7]
|
||||
ldrh r0, [r4, #6]
|
||||
add r0, sb
|
||||
mov r1, r8
|
||||
subs r0, r0, r1
|
||||
strh r0, [r7, #2]
|
||||
ldrh r0, [r4, #2]
|
||||
ldrb r1, [r4, #1]
|
||||
bl DrawDirect
|
||||
_080A5FA6:
|
||||
adds r4, #8
|
||||
ldrh r0, [r4, #2]
|
||||
cmp r0, #0
|
||||
bne _080A5F66
|
||||
_080A5FAE:
|
||||
pop {r3, r4, r5}
|
||||
mov r8, r3
|
||||
mov sb, r4
|
||||
mov sl, r5
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.else
|
||||
push {r4, r5, r6, r7, lr}
|
||||
mov r7, sl
|
||||
mov r6, sb
|
||||
mov r5, r8
|
||||
push {r5, r6, r7}
|
||||
ldr r6, _080A677C @ =gOamCmd
|
||||
movs r0, #0
|
||||
strh r0, [r6, #4]
|
||||
strh r0, [r6, #6]
|
||||
movs r0, #0x78
|
||||
strh r0, [r6]
|
||||
ldr r4, _080A6780 @ =gMenu
|
||||
ldrb r0, [r4, #3]
|
||||
lsls r0, r0, #3
|
||||
ldr r1, _080A6784 @ =gUnk_08128E94
|
||||
adds r5, r0, r1
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x2c
|
||||
ldrb r0, [r1]
|
||||
adds r2, r0, #1
|
||||
strb r2, [r1]
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x2b
|
||||
ldrb r0, [r0]
|
||||
cmp r0, #1
|
||||
beq _080A6738
|
||||
movs r0, #0x10
|
||||
ands r2, r0
|
||||
cmp r2, #0
|
||||
beq _080A6738
|
||||
movs r0, #0x80
|
||||
lsls r0, r0, #4
|
||||
strh r0, [r6, #8]
|
||||
ldrh r0, [r4, #0xa]
|
||||
cmp r0, #0
|
||||
beq _080A6724
|
||||
movs r0, #0xc
|
||||
strh r0, [r6, #2]
|
||||
ldr r0, _080A6788 @ =0x000001FB
|
||||
movs r1, #0x71
|
||||
bl DrawDirect
|
||||
_080A6724:
|
||||
ldrb r0, [r5, #2]
|
||||
ldrh r4, [r4, #0xa]
|
||||
cmp r0, r4
|
||||
bls _080A6738
|
||||
movs r0, #0x84
|
||||
strh r0, [r6, #2]
|
||||
ldr r0, _080A6788 @ =0x000001FB
|
||||
movs r1, #0x72
|
||||
bl DrawDirect
|
||||
_080A6738:
|
||||
ldrb r0, [r5, #7]
|
||||
mov sl, r0
|
||||
ldrb r5, [r5, #3]
|
||||
mov sb, r5
|
||||
ldr r1, _080A6780 @ =gMenu
|
||||
ldrh r0, [r1, #0xa]
|
||||
mov r8, r0
|
||||
ldr r2, _080A677C @ =gOamCmd
|
||||
movs r0, #0
|
||||
strh r0, [r2, #4]
|
||||
strh r0, [r2, #6]
|
||||
movs r0, #0xc0
|
||||
lsls r0, r0, #4
|
||||
strh r0, [r2, #8]
|
||||
adds r1, #0x2c
|
||||
ldrb r1, [r1]
|
||||
movs r0, #0x20
|
||||
ands r0, r1
|
||||
lsls r0, r0, #0x18
|
||||
lsrs r6, r0, #0x18
|
||||
ldr r4, _080A678C @ =gMapDataBottomSpecial
|
||||
ldrh r0, [r4, #2]
|
||||
cmp r0, #0
|
||||
beq _080A67BA
|
||||
rsbs r5, r6, #0
|
||||
orrs r5, r6
|
||||
adds r7, r2, #0
|
||||
_080A676E:
|
||||
movs r1, #0
|
||||
ldrb r0, [r4]
|
||||
cmp r0, #1
|
||||
bne _080A6790
|
||||
lsrs r1, r5, #0x1f
|
||||
b _080A6796
|
||||
.align 2, 0
|
||||
_080A677C: .4byte gOamCmd
|
||||
_080A6780: .4byte gMenu
|
||||
_080A6784: .4byte gUnk_08128E94
|
||||
_080A6788: .4byte 0x000001FB
|
||||
_080A678C: .4byte gMapDataBottomSpecial
|
||||
_080A6790:
|
||||
cmp r6, #0
|
||||
bne _080A6796
|
||||
movs r1, #1
|
||||
_080A6796:
|
||||
cmp r1, #0
|
||||
beq _080A67B2
|
||||
ldrh r0, [r4, #4]
|
||||
add r0, sl
|
||||
strh r0, [r7]
|
||||
ldrh r0, [r4, #6]
|
||||
add r0, sb
|
||||
mov r1, r8
|
||||
subs r0, r0, r1
|
||||
strh r0, [r7, #2]
|
||||
ldrh r0, [r4, #2]
|
||||
ldrb r1, [r4, #1]
|
||||
bl DrawDirect
|
||||
_080A67B2:
|
||||
adds r4, #8
|
||||
ldrh r0, [r4, #2]
|
||||
cmp r0, #0
|
||||
bne _080A676E
|
||||
_080A67BA:
|
||||
pop {r3, r4, r5}
|
||||
mov r8, r3
|
||||
mov sb, r4
|
||||
mov sl, r5
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.endif
|
||||
.syntax divided
|
||||
|
|
@ -1,132 +0,0 @@
|
|||
.syntax unified
|
||||
push {r4, r5, r6, r7, lr}
|
||||
adds r4, r0, #0
|
||||
adds r0, #0xba
|
||||
bl LoadPaletteGroup
|
||||
adds r5, r4, #0
|
||||
adds r5, #0x5f
|
||||
cmp r4, #0xb
|
||||
beq _080A67F4
|
||||
cmp r4, #0xb
|
||||
bhi _080A67E0
|
||||
cmp r4, #9
|
||||
beq _080A67E6
|
||||
b _080A6822
|
||||
_080A67E0:
|
||||
cmp r4, #0xe
|
||||
beq _080A6802
|
||||
b _080A6822
|
||||
_080A67E6:
|
||||
movs r0, #0x18
|
||||
bl CheckGlobalFlag
|
||||
cmp r0, #0
|
||||
beq _080A6822
|
||||
movs r5, #0x70
|
||||
b _080A6822
|
||||
_080A67F4:
|
||||
movs r0, #0xe
|
||||
bl CheckKinstoneFused
|
||||
cmp r0, #0
|
||||
beq _080A6822
|
||||
movs r5, #0x71
|
||||
b _080A6822
|
||||
_080A6802:
|
||||
ldr r1, _080A68AC @ =gUI
|
||||
adds r0, r1, #0
|
||||
adds r0, #0x20
|
||||
ldrb r0, [r0]
|
||||
cmp r0, #8
|
||||
bne _080A6822
|
||||
adds r0, r1, #0
|
||||
adds r0, #0x21
|
||||
ldrb r0, [r0]
|
||||
movs r1, #3
|
||||
bl __modsi3
|
||||
lsls r0, r0, #0x18
|
||||
lsrs r0, r0, #0x18
|
||||
adds r5, r0, #0
|
||||
adds r5, #0x72
|
||||
_080A6822:
|
||||
adds r0, r5, #0
|
||||
bl LoadGfxGroup
|
||||
lsls r1, r4, #3
|
||||
ldr r0, _080A68B0 @ =gUnk_08128E94
|
||||
adds r4, r1, r0
|
||||
ldr r0, _080A68B4 @ =gUnk_03003DE4
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, #2
|
||||
adds r0, r0, r1
|
||||
lsls r0, r0, #9
|
||||
ldr r1, _080A68B8 @ =gUnk_02017AA0
|
||||
adds r1, r0, r1
|
||||
ldr r2, _080A68BC @ =0x00001E0A
|
||||
adds r0, r2, #0
|
||||
movs r2, #7
|
||||
_080A6842:
|
||||
strh r0, [r1]
|
||||
adds r1, #2
|
||||
subs r2, #1
|
||||
cmp r2, #0
|
||||
bge _080A6842
|
||||
movs r2, #8
|
||||
movs r0, #5
|
||||
ldrsb r0, [r4, r0]
|
||||
ldrb r3, [r4, #4]
|
||||
adds r0, r0, r3
|
||||
ldr r5, _080A68B4 @ =gUnk_03003DE4
|
||||
ldr r6, _080A68B8 @ =gUnk_02017AA0
|
||||
cmp r2, r0
|
||||
bge _080A6874
|
||||
ldr r7, _080A68C0 @ =0x00001E0B
|
||||
adds r3, r7, #0
|
||||
_080A6862:
|
||||
strh r3, [r1]
|
||||
adds r1, #2
|
||||
adds r2, #1
|
||||
movs r0, #5
|
||||
ldrsb r0, [r4, r0]
|
||||
ldrb r7, [r4, #4]
|
||||
adds r0, r0, r7
|
||||
cmp r2, r0
|
||||
blt _080A6862
|
||||
_080A6874:
|
||||
cmp r2, #0x9f
|
||||
bgt _080A6886
|
||||
ldr r3, _080A68BC @ =0x00001E0A
|
||||
adds r0, r3, #0
|
||||
_080A687C:
|
||||
strh r0, [r1]
|
||||
adds r1, #2
|
||||
adds r2, #1
|
||||
cmp r2, #0x9f
|
||||
ble _080A687C
|
||||
_080A6886:
|
||||
ldrb r1, [r5]
|
||||
lsls r0, r1, #2
|
||||
adds r0, r0, r1
|
||||
lsls r0, r0, #9
|
||||
adds r0, r0, r6
|
||||
ldr r1, _080A68C4 @ =0x0400000E
|
||||
ldr r2, _080A68C8 @ =0xA2600001
|
||||
bl sub_0805622C
|
||||
ldr r1, _080A68CC @ =gMenu
|
||||
ldrb r0, [r4, #2]
|
||||
lsrs r0, r0, #1
|
||||
strh r0, [r1, #0xa]
|
||||
ldr r0, _080A68D0 @ =gMapDataBottomSpecial
|
||||
movs r1, #0x80
|
||||
lsls r1, r1, #3
|
||||
bl MemClear
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
_080A68AC: .4byte gUI
|
||||
_080A68B0: .4byte gUnk_08128E94
|
||||
_080A68B4: .4byte gUnk_03003DE4
|
||||
_080A68B8: .4byte gUnk_02017AA0
|
||||
_080A68BC: .4byte 0x00001E0A
|
||||
_080A68C0: .4byte 0x00001E0B
|
||||
_080A68C4: .4byte 0x0400000E
|
||||
_080A68C8: .4byte 0xA2600001
|
||||
_080A68CC: .4byte gMenu
|
||||
_080A68D0: .4byte gMapDataBottomSpecial
|
||||
.syntax divided
|
||||
|
|
@ -1,128 +0,0 @@
|
|||
.syntax unified
|
||||
push {r4, r5, r6, r7, lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
bl sub_080A4D34
|
||||
movs r0, #6
|
||||
bl sub_080A4DB8
|
||||
ldr r0, _080A6BF0 @ =gFuseInfo
|
||||
ldrb r2, [r0, #3]
|
||||
lsls r2, r2, #3
|
||||
ldr r0, _080A6BF4 @ =gUnk_080C9CBC
|
||||
adds r2, r2, r0
|
||||
ldrb r1, [r2, #4]
|
||||
lsls r0, r1, #2
|
||||
adds r0, r0, r1
|
||||
lsls r0, r0, #2
|
||||
ldr r1, _080A6BF8 @ =gUnk_080FE320
|
||||
adds r0, r0, r1
|
||||
ldrb r2, [r2, #7]
|
||||
mov r8, r2
|
||||
ldrh r6, [r0, #0xc]
|
||||
ldrh r5, [r0, #0xe]
|
||||
adds r0, r6, #0
|
||||
adds r1, r5, #0
|
||||
bl sub_080A6A80
|
||||
ldrb r4, [r0, #4]
|
||||
ldr r7, _080A6BFC @ =gMenu
|
||||
strb r4, [r7, #3]
|
||||
adds r1, r7, #0
|
||||
adds r1, #0x2b
|
||||
movs r0, #1
|
||||
strb r0, [r1]
|
||||
adds r0, r4, #0
|
||||
bl sub_080A67C4
|
||||
adds r0, r4, #0
|
||||
movs r1, #2
|
||||
bl sub_080A6FB4
|
||||
ldr r4, _080A6C00 @ =0x0000475F
|
||||
movs r0, #0
|
||||
adds r1, r4, #0
|
||||
bl SetColor
|
||||
movs r0, #0x5f
|
||||
adds r1, r4, #0
|
||||
bl SetColor
|
||||
ldr r0, _080A6C04 @ =0x00005001
|
||||
ldr r1, _080A6C08 @ =gBG3Buffer
|
||||
movs r2, #0x80
|
||||
lsls r2, r2, #5
|
||||
bl MemFill16
|
||||
ldr r0, _080A6C0C @ =gPlayerState
|
||||
ldr r0, [r0, #0x30]
|
||||
movs r1, #8
|
||||
ands r0, r1
|
||||
movs r2, #0x64
|
||||
cmp r0, #0
|
||||
beq _080A6B84
|
||||
movs r2, #0x65
|
||||
_080A6B84:
|
||||
ldr r1, _080A6C10 @ =gRoomTransition
|
||||
ldrh r0, [r1, #0x20]
|
||||
ldrh r1, [r1, #0x22]
|
||||
.ifdef EU
|
||||
movs r4, #0xfd
|
||||
lsls r4, r4, #0x1
|
||||
.else
|
||||
ldr r4, _080A6C14 @ =0x000001FB
|
||||
.endif
|
||||
movs r3, #0x80
|
||||
lsls r3, r3, #1
|
||||
adds r3, r2, r3
|
||||
adds r2, r4, #0
|
||||
bl sub_080A698C
|
||||
mov r3, r8
|
||||
adds r3, #0x64
|
||||
adds r0, r6, #0
|
||||
adds r1, r5, #0
|
||||
adds r2, r4, #0
|
||||
bl sub_080A698C
|
||||
adds r0, r6, #0
|
||||
adds r1, r5, #0
|
||||
bl sub_080A69E0
|
||||
asrs r5, r0, #0x10
|
||||
ldrb r0, [r7, #3]
|
||||
lsls r0, r0, #3
|
||||
ldr r1, _080A6C18 @ =gUnk_08128E94
|
||||
adds r1, r0, r1
|
||||
movs r0, #0
|
||||
strh r0, [r7, #0xa]
|
||||
ldrb r0, [r1, #2]
|
||||
cmp r0, #0
|
||||
beq _080A6BD4
|
||||
adds r0, r5, #0
|
||||
subs r0, #0x3c
|
||||
cmp r0, #0
|
||||
ble _080A6BD4
|
||||
ldrb r1, [r1, #2]
|
||||
cmp r1, r0
|
||||
bge _080A6BD2
|
||||
adds r0, r1, #0
|
||||
_080A6BD2:
|
||||
strh r0, [r7, #0xa]
|
||||
_080A6BD4:
|
||||
ldr r1, _080A6BFC @ =gMenu
|
||||
movs r0, #0x1e
|
||||
strh r0, [r1, #8]
|
||||
movs r0, #1
|
||||
bl SetMenuType
|
||||
movs r0, #4
|
||||
movs r1, #8
|
||||
bl SetFade
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
_080A6BF0: .4byte gFuseInfo
|
||||
_080A6BF4: .4byte gUnk_080C9CBC
|
||||
_080A6BF8: .4byte gUnk_080FE320
|
||||
_080A6BFC: .4byte gMenu
|
||||
_080A6C00: .4byte 0x0000475F
|
||||
_080A6C04: .4byte 0x00005001
|
||||
_080A6C08: .4byte gBG3Buffer
|
||||
_080A6C0C: .4byte gPlayerState
|
||||
_080A6C10: .4byte gRoomTransition
|
||||
.ifndef EU
|
||||
_080A6C14: .4byte 0x000001FB
|
||||
.endif
|
||||
_080A6C18: .4byte gUnk_08128E94
|
||||
.syntax divided
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
.syntax unified
|
||||
push {r4, r5, r6, lr}
|
||||
lsls r1, r0, #2
|
||||
adds r1, r1, r0
|
||||
lsls r1, r1, #2
|
||||
ldr r0, _080A6F34 @ =gUnk_08128024
|
||||
adds r1, r1, r0
|
||||
ldrh r3, [r1, #6]
|
||||
ldrh r4, [r1, #8]
|
||||
ldr r0, _080A6F38 @ =gAreaRoomHeaders
|
||||
ldrb r2, [r1, #0xb]
|
||||
lsls r2, r2, #2
|
||||
adds r2, r2, r0
|
||||
ldrb r1, [r1, #0xc]
|
||||
lsls r0, r1, #2
|
||||
adds r0, r0, r1
|
||||
lsls r0, r0, #1
|
||||
ldr r1, [r2]
|
||||
adds r1, r1, r0
|
||||
ldrh r0, [r1]
|
||||
adds r3, r3, r0
|
||||
ldrh r0, [r1, #2]
|
||||
adds r4, r4, r0
|
||||
ldr r6, _080A6F3C @ =gOamCmd
|
||||
lsls r0, r3, #2
|
||||
adds r0, r0, r3
|
||||
lsls r0, r0, #5
|
||||
movs r5, #0xf9
|
||||
lsls r5, r5, #4
|
||||
adds r1, r5, #0
|
||||
bl __divsi3
|
||||
adds r0, #0x28
|
||||
strh r0, [r6]
|
||||
lsls r0, r4, #2
|
||||
adds r0, r0, r4
|
||||
lsls r0, r0, #5
|
||||
adds r1, r5, #0
|
||||
bl __divsi3
|
||||
adds r0, #0xc
|
||||
strh r0, [r6, #2]
|
||||
pop {r4, r5, r6, pc}
|
||||
.align 2, 0
|
||||
_080A6F34: .4byte gUnk_08128024
|
||||
_080A6F38: .4byte gAreaRoomHeaders
|
||||
_080A6F3C: .4byte gOamCmd
|
||||
.syntax divided
|
||||
189
src/subtask2.c
189
src/subtask2.c
|
|
@ -33,6 +33,7 @@ extern u16* gMoreSpritePtrs[];
|
|||
extern Screen gUnk_03001020;
|
||||
extern u8 gUnk_02024090[];
|
||||
extern u8 gUnk_03000420[];
|
||||
extern u16 gUnk_02017AA0[];
|
||||
|
||||
void sub_080A5CFC(u32, void*, u32);
|
||||
void sub_080A6FB4(u32, u32);
|
||||
|
|
@ -42,7 +43,7 @@ void sub_080A70AC(const KeyButtonLayout* layout);
|
|||
u32 sub_080A6F40();
|
||||
void sub_080A67C4(u32);
|
||||
void sub_080A68D4();
|
||||
u32 sub_080A69E0();
|
||||
s32 sub_080A69E0();
|
||||
void sub_080A6EE0(u32 param_1);
|
||||
struct_08127F94* sub_080A6A80(u32 param_1, u32 param_2);
|
||||
void sub_080A698C(u32 param_1, u32 param_2, u32 param_3, u32 param_4);
|
||||
|
|
@ -77,6 +78,14 @@ typedef struct {
|
|||
|
||||
extern sturct_gUnk_08128F58 gUnk_08128F58[];
|
||||
|
||||
typedef struct {
|
||||
u8 unk0;
|
||||
u8 unk1;
|
||||
u16 unk2;
|
||||
u16 unk4;
|
||||
u16 unk6;
|
||||
} struct_sub_080A698C;
|
||||
|
||||
extern void (*const gUnk_08128DCC[])(void);
|
||||
void sub_080A6378(void);
|
||||
|
||||
|
|
@ -850,9 +859,105 @@ void sub_080A667C(void) {
|
|||
sub_080A6FB4(gMenu.field_0x3, 0);
|
||||
}
|
||||
|
||||
ASM_FUNC("asm/non_matching/subtask2/sub_080A66D0.inc", void sub_080A66D0())
|
||||
void sub_080A66D0(void) {
|
||||
u32 bVar2;
|
||||
u32 bVar3;
|
||||
u8 bVar4;
|
||||
u32 uVar5;
|
||||
u32 uVar8;
|
||||
struct_sub_080A698C* ptr;
|
||||
const struct_gUnk_08128E94* ptr2;
|
||||
|
||||
ASM_FUNC("asm/non_matching/subtask2/sub_080A67C4.inc", void sub_080A67C4(u32 param_1))
|
||||
gOamCmd._4 = 0;
|
||||
gOamCmd._6 = 0;
|
||||
gOamCmd.x = 0x78;
|
||||
ptr2 = &gUnk_08128E94[gMenu.field_0x3];
|
||||
gGenericMenu.unk2c++;
|
||||
if (gGenericMenu.unk2b != 1 && ((gGenericMenu.unk2c & 0x10) != 0)) {
|
||||
gOamCmd._8 = 0x800;
|
||||
if (gMenu.field_0xa != 0) {
|
||||
gOamCmd.y = 0xc;
|
||||
DrawDirect(DRAW_DIRECT_SPRITE_INDEX, 0x71);
|
||||
}
|
||||
if (ptr2->unk2 > gMenu.field_0xa) {
|
||||
gOamCmd.y = 0x84;
|
||||
DrawDirect(DRAW_DIRECT_SPRITE_INDEX, 0x72);
|
||||
}
|
||||
}
|
||||
bVar2 = ptr2->unk7;
|
||||
bVar3 = ptr2->unk3;
|
||||
uVar5 = gMenu.field_0xa;
|
||||
gOamCmd._4 = 0;
|
||||
gOamCmd._6 = 0;
|
||||
gOamCmd._8 = 0xc00;
|
||||
bVar4 = gGenericMenu.unk2c & 0x20;
|
||||
|
||||
for (ptr = (struct_sub_080A698C*)&gMapDataBottomSpecial; ptr->unk2 != 0; ptr++) {
|
||||
uVar8 = 0;
|
||||
if (ptr->unk0 == 1) {
|
||||
if (bVar4 != 0) {
|
||||
uVar8 = 1;
|
||||
}
|
||||
} else if (bVar4 == 0) {
|
||||
uVar8 = 1;
|
||||
}
|
||||
|
||||
if (uVar8 != 0) {
|
||||
gOamCmd.x = ptr->unk4 + bVar2;
|
||||
gOamCmd.y = ptr->unk6 + bVar3 - uVar5;
|
||||
DrawDirect(ptr->unk2, ptr->unk1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void sub_080A67C4(u32 param_1) {
|
||||
u16* puVar2;
|
||||
int i;
|
||||
int iVar4;
|
||||
s32 room;
|
||||
const struct_gUnk_08128E94* ptr;
|
||||
|
||||
LoadPaletteGroup(param_1 + 0xba);
|
||||
iVar4 = param_1 + 0x5f;
|
||||
switch (param_1) {
|
||||
case 0x9:
|
||||
if (CheckGlobalFlag(TATEKAKE_HOUSE)) {
|
||||
iVar4 = 0x70;
|
||||
}
|
||||
break;
|
||||
case 0xb:
|
||||
if (CheckKinstoneFused(0xe)) {
|
||||
iVar4 = 0x71;
|
||||
}
|
||||
break;
|
||||
case 0xe:
|
||||
if (gUI.roomControls.area == 8) {
|
||||
room = gUI.roomControls.room;
|
||||
iVar4 = (u8)(room % 3) + 0x72;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
LoadGfxGroup(iVar4);
|
||||
ptr = &gUnk_08128E94[param_1];
|
||||
puVar2 = &gUnk_02017AA0[gUnk_03003DE4 * 0x500];
|
||||
|
||||
for (i = 0; i <= 7; puVar2++, i++) {
|
||||
*puVar2 = 0x1e0a;
|
||||
}
|
||||
|
||||
for (i = 8; i < (int)(ptr->unk5 + ptr->unk4); puVar2++, i++) {
|
||||
*puVar2 = 0x1e0b;
|
||||
}
|
||||
|
||||
for (; i < 0xa0; puVar2++, i++) {
|
||||
*puVar2 = 0x1e0a;
|
||||
}
|
||||
|
||||
sub_0805622C(&gUnk_02017AA0[gUnk_03003DE4 * 0x500], REG_ADDR_BG3CNT, 0xa2600001);
|
||||
gMenu.field_0xa = ptr->unk2 >> 1;
|
||||
MemClear(&gMapDataBottomSpecial, 0x400);
|
||||
}
|
||||
|
||||
void sub_080A68D4(void) {
|
||||
u32 uVar1;
|
||||
|
|
@ -887,18 +992,10 @@ void sub_080A68D4(void) {
|
|||
}
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
u8 unk0;
|
||||
u8 unk1;
|
||||
u16 unk2;
|
||||
u16 unk4;
|
||||
u16 unk6;
|
||||
} struct_sub_080A698C;
|
||||
|
||||
void sub_080A698C(u32 param_1, u32 param_2, u32 param_3, u32 param_4) {
|
||||
int iVar1;
|
||||
|
||||
iVar1 = sub_080A69E0();
|
||||
iVar1 = sub_080A69E0(param_1, param_2);
|
||||
if (0 < iVar1) {
|
||||
((struct_sub_080A698C*)&gMapDataBottomSpecial)[gGenericMenu.unk2d].unk0 = param_4 >> 8;
|
||||
((struct_sub_080A698C*)&gMapDataBottomSpecial)[gGenericMenu.unk2d].unk1 = param_4;
|
||||
|
|
@ -909,7 +1006,7 @@ void sub_080A698C(u32 param_1, u32 param_2, u32 param_3, u32 param_4) {
|
|||
}
|
||||
}
|
||||
|
||||
u32 sub_080A69E0(u32 param_1, u32 param_2) {
|
||||
s32 sub_080A69E0(u32 param_1, u32 param_2) {
|
||||
const struct_08127F94* pbVar1;
|
||||
int iVar3;
|
||||
|
||||
|
|
@ -968,7 +1065,56 @@ void Subtask_LocalMapHint() {
|
|||
CopyOAM();
|
||||
}
|
||||
|
||||
ASM_FUNC("asm/non_matching/subtask2/sub_080A6B04.inc", void sub_080A6B04())
|
||||
void sub_080A6B04(void) {
|
||||
u32 bVar1;
|
||||
u32 uVar2;
|
||||
u32 uVar3;
|
||||
u32 uVar4;
|
||||
int uVar6;
|
||||
u32 uVar7;
|
||||
struct_080C9CBC* ptr;
|
||||
struct_080FE320* ptr2;
|
||||
const struct_gUnk_08128E94* ptr3;
|
||||
|
||||
sub_080A4D34();
|
||||
sub_080A4DB8(6);
|
||||
ptr = &gUnk_080C9CBC[gFuseInfo._3];
|
||||
ptr2 = &gUnk_080FE320[ptr->evt_type];
|
||||
bVar1 = ptr->_5[1];
|
||||
uVar3 = ptr2->_c;
|
||||
uVar4 = ptr2->_e;
|
||||
uVar2 = sub_080A6A80(uVar3, uVar4)->_4;
|
||||
gMenu.field_0x3 = uVar2;
|
||||
gGenericMenu.unk2b = 1;
|
||||
sub_080A67C4(uVar2);
|
||||
sub_080A6FB4(uVar2, 2);
|
||||
SetColor(0, 0x475f);
|
||||
SetColor(0x5f, 0x475f);
|
||||
MemFill16(0x5001, &gBG3Buffer, sizeof(gBG3Buffer));
|
||||
if ((gPlayerState.flags & PL_NO_CAP) != 0) {
|
||||
uVar7 = 101;
|
||||
} else {
|
||||
uVar7 = 100;
|
||||
}
|
||||
sub_080A698C(gRoomTransition.player_status.overworld_map_x, gRoomTransition.player_status.overworld_map_y,
|
||||
DRAW_DIRECT_SPRITE_INDEX, uVar7 + 0x100);
|
||||
sub_080A698C(uVar3, uVar4, DRAW_DIRECT_SPRITE_INDEX, bVar1 + 100);
|
||||
uVar4 = sub_080A69E0(uVar3, uVar4) >> 0x10;
|
||||
ptr3 = &gUnk_08128E94[gMenu.field_0x3];
|
||||
gMenu.field_0xa = 0;
|
||||
if (ptr3->unk2 != 0) {
|
||||
uVar6 = uVar4 - 0x3c;
|
||||
if (uVar6 > 0) {
|
||||
if (ptr3->unk2 < uVar6) {
|
||||
uVar6 = ptr3->unk2;
|
||||
}
|
||||
gMenu.field_0xa = uVar6;
|
||||
}
|
||||
}
|
||||
gMenu.transitionTimer = 0x1e;
|
||||
SetMenuType(1);
|
||||
SetFade(FADE_INSTANT, 8);
|
||||
}
|
||||
|
||||
void sub_080A6C1C(void) {
|
||||
if (!gFadeControl.active) {
|
||||
|
|
@ -1147,7 +1293,20 @@ void sub_080A6E70(void) {
|
|||
}
|
||||
}
|
||||
|
||||
ASM_FUNC("asm/non_matching/subtask2/sub_080A6EE0.inc", void sub_080A6EE0(u32 param_1))
|
||||
void sub_080A6EE0(u32 param_1) {
|
||||
u32 x;
|
||||
u32 y;
|
||||
RoomHeader* roomHeader;
|
||||
const ScreenTransitionData* ptr = &gUnk_08128024[param_1];
|
||||
|
||||
x = (u16)ptr->playerXPos;
|
||||
y = (u16)ptr->playerYPos;
|
||||
roomHeader = &gAreaRoomHeaders[ptr->area][ptr->room];
|
||||
x += roomHeader->map_x;
|
||||
y += roomHeader->map_y;
|
||||
gOamCmd.x = (s32)(x * 0xa0) / 0xf90 + 0x28;
|
||||
gOamCmd.y = (s32)(y * 0xa0) / 0xf90 + 0xc;
|
||||
}
|
||||
|
||||
u32 sub_080A6F40(void) {
|
||||
extern u8 gUnk_08128F38[];
|
||||
|
|
|
|||
Loading…
Reference in New Issue