mirror of
https://github.com/zeldaret/tmc
synced 2026-07-08 14:36:41 -04:00
Merge pull request #568 from hatal175/sub_08022E40
Match some functions
This commit is contained in:
notyourav
@@ -1,172 +0,0 @@
|
||||
.syntax unified
|
||||
push {r4, r5, lr}
|
||||
ldr r0, _080A3C9C @ =gFadeControl
|
||||
ldrb r0, [r0]
|
||||
cmp r0, #0
|
||||
beq _080A3C78
|
||||
b _080A3DA8
|
||||
_080A3C78:
|
||||
ldr r5, _080A3CA0 @ =gMenu
|
||||
movs r0, #2
|
||||
strb r0, [r5, #1]
|
||||
adds r0, r5, #0
|
||||
adds r0, #0x28
|
||||
ldrb r0, [r0]
|
||||
lsls r2, r0, #0x10
|
||||
ldr r0, [r5, #0x10]
|
||||
subs r4, r2, r0
|
||||
adds r1, r4, #0
|
||||
cmp r4, #0
|
||||
bge _080A3C92
|
||||
rsbs r1, r4, #0
|
||||
_080A3C92:
|
||||
ldr r0, _080A3CA4 @ =0x00001FFD
|
||||
cmp r1, r0
|
||||
bhi _080A3CA8
|
||||
str r2, [r5, #0x10]
|
||||
b _080A3CDE
|
||||
.align 2, 0
|
||||
_080A3C9C: .4byte gFadeControl
|
||||
_080A3CA0: .4byte gMenu
|
||||
_080A3CA4: .4byte 0x00001FFD
|
||||
_080A3CA8:
|
||||
movs r0, #1
|
||||
strb r0, [r5, #1]
|
||||
adds r0, r4, #0
|
||||
bl sub_08000E44
|
||||
adds r2, r0, #0
|
||||
adds r0, r4, #0
|
||||
cmp r0, #0
|
||||
bge _080A3CBE
|
||||
ldr r1, _080A3D18 @ =0x0001FFFF
|
||||
adds r0, r0, r1
|
||||
_080A3CBE:
|
||||
asrs r4, r0, #0x11
|
||||
cmp r4, #0
|
||||
bge _080A3CC6
|
||||
rsbs r4, r4, #0
|
||||
_080A3CC6:
|
||||
cmp r4, #5
|
||||
ble _080A3CCC
|
||||
movs r4, #5
|
||||
_080A3CCC:
|
||||
ldr r0, _080A3D1C @ =gUnk_081280EE
|
||||
adds r0, r4, r0
|
||||
ldrb r1, [r0]
|
||||
ldr r0, _080A3D20 @ =0x00000666
|
||||
muls r0, r2, r0
|
||||
muls r1, r0, r1
|
||||
ldr r0, [r5, #0x10]
|
||||
adds r0, r0, r1
|
||||
str r0, [r5, #0x10]
|
||||
_080A3CDE:
|
||||
adds r3, r5, #0
|
||||
adds r3, #0x29
|
||||
ldrb r2, [r3]
|
||||
ldr r0, [r5, #0x10]
|
||||
adds r1, r0, #0
|
||||
cmp r0, #0
|
||||
bge _080A3CF0
|
||||
ldr r4, _080A3D24 @ =0x0000FFFF
|
||||
adds r1, r0, r4
|
||||
_080A3CF0:
|
||||
asrs r1, r1, #0x10
|
||||
cmp r2, r1
|
||||
beq _080A3CFE
|
||||
strb r1, [r3]
|
||||
movs r0, #0x69
|
||||
bl SoundReq
|
||||
_080A3CFE:
|
||||
ldr r2, _080A3D28 @ =gInput
|
||||
ldrh r1, [r2, #2]
|
||||
ldr r0, _080A3D2C @ =0x0000020A
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _080A3D30
|
||||
movs r0, #2
|
||||
bl SetMenuType
|
||||
movs r0, #0x6c
|
||||
bl SoundReq
|
||||
b _080A3DA8
|
||||
.align 2, 0
|
||||
_080A3D18: .4byte 0x0001FFFF
|
||||
_080A3D1C: .4byte gUnk_081280EE
|
||||
_080A3D20: .4byte 0x00000666
|
||||
_080A3D24: .4byte 0x0000FFFF
|
||||
_080A3D28: .4byte gInput
|
||||
_080A3D2C: .4byte 0x0000020A
|
||||
_080A3D30:
|
||||
adds r0, r5, #0
|
||||
adds r0, #0x28
|
||||
ldrb r4, [r0]
|
||||
ldrh r1, [r2, #4]
|
||||
adds r5, r0, #0
|
||||
cmp r1, #0x20
|
||||
beq _080A3D56
|
||||
cmp r1, #0x20
|
||||
bgt _080A3D4C
|
||||
cmp r1, #1
|
||||
beq _080A3D5E
|
||||
cmp r1, #0x10
|
||||
beq _080A3D5A
|
||||
b _080A3D8A
|
||||
_080A3D4C:
|
||||
cmp r1, #0x40
|
||||
beq _080A3D56
|
||||
cmp r1, #0x80
|
||||
beq _080A3D5A
|
||||
b _080A3D8A
|
||||
_080A3D56:
|
||||
subs r4, #1
|
||||
b _080A3D8A
|
||||
_080A3D5A:
|
||||
adds r4, #1
|
||||
b _080A3D8A
|
||||
_080A3D5E:
|
||||
ldr r2, _080A3DAC @ =gMenu
|
||||
ldrb r0, [r2, #1]
|
||||
cmp r0, #2
|
||||
bne _080A3D8A
|
||||
ldr r0, [r2, #0x10]
|
||||
cmp r0, #0
|
||||
bge _080A3D70
|
||||
ldr r1, _080A3DB0 @ =0x0000FFFF
|
||||
adds r0, r0, r1
|
||||
_080A3D70:
|
||||
asrs r4, r0, #0x10
|
||||
ldr r0, _080A3DB4 @ =gSave
|
||||
movs r1, #0x8c
|
||||
lsls r1, r1, #1
|
||||
adds r0, r0, r1
|
||||
adds r0, r4, r0
|
||||
ldrb r1, [r0]
|
||||
adds r0, r2, #0
|
||||
adds r0, #0x2a
|
||||
strb r1, [r0]
|
||||
movs r0, #3
|
||||
bl SetMenuType
|
||||
_080A3D8A:
|
||||
bl sub_080A3B48
|
||||
cmp r0, r4
|
||||
bgt _080A3D94
|
||||
subs r4, r0, #1
|
||||
_080A3D94:
|
||||
cmp r0, #1
|
||||
bgt _080A3D9A
|
||||
movs r4, #0
|
||||
_080A3D9A:
|
||||
cmp r4, #0
|
||||
bge _080A3DA0
|
||||
movs r4, #0
|
||||
_080A3DA0:
|
||||
ldrb r0, [r5]
|
||||
cmp r0, r4
|
||||
beq _080A3DA8
|
||||
strb r4, [r5]
|
||||
_080A3DA8:
|
||||
pop {r4, r5, pc}
|
||||
.align 2, 0
|
||||
_080A3DAC: .4byte gMenu
|
||||
_080A3DB0: .4byte 0x0000FFFF
|
||||
_080A3DB4: .4byte gSave
|
||||
.syntax divided
|
||||
@@ -1,62 +0,0 @@
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
push {r4, r5, lr}
|
||||
adds r4, r0, #0
|
||||
ldrh r1, [r4, #0x2e]
|
||||
adds r0, #0x74
|
||||
strh r1, [r0]
|
||||
ldrh r0, [r4, #0x32]
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x76
|
||||
strh r0, [r1]
|
||||
ldr r2, [r4, #0x50]
|
||||
adds r2, #0x79
|
||||
ldrb r0, [r2]
|
||||
adds r0, #1
|
||||
movs r3, #7
|
||||
ands r0, r3
|
||||
adds r0, #0x7c
|
||||
adds r0, r4, r0
|
||||
ldrb r1, [r0]
|
||||
movs r0, #0xf
|
||||
ands r0, r1
|
||||
subs r0, #8
|
||||
lsrs r1, r1, #4
|
||||
lsls r0, r0, #0x18
|
||||
asrs r0, r0, #0x18
|
||||
ldrh r5, [r4, #0x2e]
|
||||
adds r0, r0, r5
|
||||
strh r0, [r4, #0x2e]
|
||||
subs r1, #8
|
||||
ldrh r0, [r4, #0x32]
|
||||
adds r1, r1, r0
|
||||
strh r1, [r4, #0x32]
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x84
|
||||
ldrb r0, [r2]
|
||||
adds r0, #1
|
||||
ands r0, r3
|
||||
lsls r0, r0, #2
|
||||
ldr r1, [r1]
|
||||
lsrs r1, r0
|
||||
movs r0, #7
|
||||
ands r1, r0
|
||||
strb r1, [r4, #0x14]
|
||||
ldrb r0, [r4, #0xa]
|
||||
cmp r0, #3
|
||||
bne _08022EA2
|
||||
adds r0, r1, #0
|
||||
adds r0, #0xa
|
||||
strb r0, [r4, #0x1e]
|
||||
b _08022EA8
|
||||
_08022EA2:
|
||||
adds r0, r4, #0
|
||||
bl sub_08022EAC
|
||||
_08022EA8:
|
||||
pop {r4, r5, pc}
|
||||
.align 2, 0
|
||||
|
||||
.syntax divided
|
||||
@@ -1,315 +0,0 @@
|
||||
.syntax unified
|
||||
push {r4, r5, r6, r7, lr}
|
||||
adds r4, r0, #0
|
||||
ldr r0, _080A2E90 @ =gPlayerEntity
|
||||
mov ip, r0
|
||||
mov r1, ip
|
||||
adds r1, #0x3d
|
||||
ldrb r0, [r1]
|
||||
lsls r0, r0, #0x18
|
||||
cmp r0, #0
|
||||
beq _080A2E1A
|
||||
lsrs r0, r0, #0x18
|
||||
cmp r0, #0x81
|
||||
bne _080A2E40
|
||||
_080A2E1A:
|
||||
adds r5, r4, #0
|
||||
adds r5, #0x3d
|
||||
ldrb r0, [r5]
|
||||
movs r2, #0
|
||||
strb r0, [r1]
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x3e
|
||||
ldrb r0, [r0]
|
||||
mov r1, ip
|
||||
adds r1, #0x3e
|
||||
strb r0, [r1]
|
||||
adds r3, r4, #0
|
||||
adds r3, #0x42
|
||||
ldrb r1, [r3]
|
||||
mov r0, ip
|
||||
adds r0, #0x42
|
||||
strb r1, [r0]
|
||||
strb r2, [r3]
|
||||
strb r2, [r5]
|
||||
_080A2E40:
|
||||
ldr r0, _080A2E94 @ =gPlayerState
|
||||
ldrb r3, [r0, #3]
|
||||
adds r7, r0, #0
|
||||
cmp r3, #0
|
||||
beq _080A2F20
|
||||
ldr r0, [r7, #0x2c]
|
||||
cmp r4, r0
|
||||
bne _080A2F20
|
||||
movs r2, #0x80
|
||||
adds r0, r2, #0
|
||||
ands r0, r3
|
||||
cmp r0, #0
|
||||
beq _080A2E9C
|
||||
ldr r1, _080A2E98 @ =gUnk_08127240
|
||||
ldrb r0, [r4, #0x14]
|
||||
lsrs r0, r0, #1
|
||||
lsls r0, r0, #2
|
||||
adds r0, r0, r1
|
||||
ldr r0, [r0]
|
||||
str r0, [r4, #0x48]
|
||||
ldr r0, _080A2E90 @ =gPlayerEntity
|
||||
adds r0, #0x3c
|
||||
ldrb r0, [r0]
|
||||
adds r0, #1
|
||||
movs r1, #0x20
|
||||
adds r2, r4, #0
|
||||
adds r2, #0x3c
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
ldrb r1, [r4, #0x10]
|
||||
movs r0, #0x80
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x10]
|
||||
movs r0, #0x7f
|
||||
ands r0, r3
|
||||
strb r0, [r7, #3]
|
||||
adds r0, r4, #0
|
||||
bl sub_080176E4
|
||||
b _080A2F30
|
||||
.align 2, 0
|
||||
_080A2E90: .4byte gPlayerEntity
|
||||
_080A2E94: .4byte gPlayerState
|
||||
_080A2E98: .4byte gUnk_08127240
|
||||
_080A2E9C:
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x41
|
||||
ldrb r1, [r0]
|
||||
adds r0, r2, #0
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _080A2F30
|
||||
movs r0, #0x7f
|
||||
ands r0, r1
|
||||
cmp r0, #0x42
|
||||
bne _080A2F06
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x68
|
||||
ldrb r1, [r0]
|
||||
adds r5, r0, #0
|
||||
cmp r1, #0xe
|
||||
bne _080A2F06
|
||||
movs r0, #0x40
|
||||
ands r0, r3
|
||||
lsls r0, r0, #0x18
|
||||
lsrs r6, r0, #0x18
|
||||
cmp r6, #0
|
||||
bne _080A2F06
|
||||
ldrb r3, [r5]
|
||||
movs r0, #0x15
|
||||
movs r1, #0
|
||||
movs r2, #0
|
||||
bl CreatePlayerItem
|
||||
adds r1, r0, #0
|
||||
str r1, [r4, #0x54]
|
||||
cmp r1, #0
|
||||
beq _080A2EF4
|
||||
movs r0, #1
|
||||
strb r0, [r1, #0xf]
|
||||
ldr r2, [r4, #0x54]
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x3e
|
||||
ldrb r0, [r0]
|
||||
movs r1, #0x10
|
||||
eors r0, r1
|
||||
strb r0, [r2, #0x15]
|
||||
ldr r0, [r4, #0x54]
|
||||
str r4, [r0, #0x50]
|
||||
_080A2EF4:
|
||||
ldr r1, _080A2F1C @ =gUnk_08127220
|
||||
ldrb r0, [r1, #1]
|
||||
str r0, [r4, #0x78]
|
||||
str r6, [r4, #0x74]
|
||||
str r1, [r4, #0x7c]
|
||||
ldrb r0, [r7, #3]
|
||||
movs r1, #0x40
|
||||
orrs r0, r1
|
||||
strb r0, [r7, #3]
|
||||
_080A2F06:
|
||||
ldr r0, [r4, #0x6c]
|
||||
cmp r0, #0
|
||||
bne _080A2F30
|
||||
movs r0, #0x8c
|
||||
lsls r0, r0, #1
|
||||
bl SoundReq
|
||||
movs r0, #8
|
||||
str r0, [r4, #0x6c]
|
||||
b _080A2F30
|
||||
.align 2, 0
|
||||
_080A2F1C: .4byte gUnk_08127220
|
||||
_080A2F20:
|
||||
movs r1, #0
|
||||
strb r1, [r7, #3]
|
||||
ldr r0, [r7, #0x2c]
|
||||
cmp r0, r4
|
||||
bne _080A2F2C
|
||||
str r1, [r7, #0x2c]
|
||||
_080A2F2C:
|
||||
bl DeleteThisEntity
|
||||
_080A2F30:
|
||||
ldr r6, _080A301C @ =gPlayerEntity
|
||||
ldrh r0, [r6, #0x12]
|
||||
cmp r0, #1
|
||||
beq _080A2F3E
|
||||
cmp r0, #4
|
||||
beq _080A2F3E
|
||||
b _080A3064
|
||||
_080A2F3E:
|
||||
ldrb r0, [r6, #0x1e]
|
||||
subs r0, #0x25
|
||||
lsls r0, r0, #0x18
|
||||
lsrs r0, r0, #0x18
|
||||
cmp r0, #0x3e
|
||||
bls _080A2F4C
|
||||
b _080A3064
|
||||
_080A2F4C:
|
||||
ldrb r2, [r6, #0x18]
|
||||
movs r1, #0x40
|
||||
ands r1, r2
|
||||
ldrb r3, [r4, #0x18]
|
||||
movs r0, #0x41
|
||||
rsbs r0, r0, #0
|
||||
ands r0, r3
|
||||
orrs r0, r1
|
||||
lsrs r2, r2, #7
|
||||
lsls r2, r2, #7
|
||||
movs r3, #0x7f
|
||||
ands r0, r3
|
||||
orrs r0, r2
|
||||
strb r0, [r4, #0x18]
|
||||
ldrb r2, [r6, #0x1e]
|
||||
ldr r1, [r4, #0x70]
|
||||
adds r0, r1, #0
|
||||
subs r0, #0x25
|
||||
adds r0, r2, r0
|
||||
adds r5, r4, #0
|
||||
adds r5, #0x68
|
||||
ldrb r7, [r4, #0x1e]
|
||||
cmp r0, r7
|
||||
beq _080A2FA2
|
||||
adds r0, r1, #0
|
||||
adds r0, #0xdb
|
||||
adds r0, r2, r0
|
||||
strb r0, [r4, #0x1e]
|
||||
ldrb r0, [r5]
|
||||
cmp r0, #0xe
|
||||
bne _080A2F98
|
||||
adds r0, r6, #0
|
||||
adds r0, #0x5a
|
||||
ldrb r1, [r0]
|
||||
adds r0, r3, #0
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
bne _080A2FA2
|
||||
_080A2F98:
|
||||
ldrb r1, [r4, #0x1e]
|
||||
ldrh r2, [r4, #0x12]
|
||||
adds r0, r4, #0
|
||||
bl sub_080042D0
|
||||
_080A2FA2:
|
||||
ldrb r0, [r5]
|
||||
cmp r0, #0xe
|
||||
bne _080A303E
|
||||
ldr r0, _080A301C @ =gPlayerEntity
|
||||
adds r0, #0x5a
|
||||
ldrb r1, [r0]
|
||||
movs r0, #0x7f
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _080A303E
|
||||
ldr r0, [r4, #0x78]
|
||||
subs r3, r0, #1
|
||||
str r3, [r4, #0x78]
|
||||
cmp r3, #0
|
||||
bne _080A303E
|
||||
ldr r0, [r4, #0x74]
|
||||
adds r0, #1
|
||||
str r0, [r4, #0x74]
|
||||
lsls r0, r0, #2
|
||||
ldr r1, [r4, #0x7c]
|
||||
adds r2, r1, r0
|
||||
ldrb r0, [r2]
|
||||
ldr r7, _080A3020 @ =gPlayerState
|
||||
cmp r0, #0xff
|
||||
bne _080A2FEC
|
||||
ldrb r1, [r7, #3]
|
||||
movs r0, #0x40
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _080A2FE8
|
||||
ldr r0, _080A3024 @ =gUnk_081271DC
|
||||
str r0, [r4, #0x7c]
|
||||
movs r0, #0xbf
|
||||
ands r0, r1
|
||||
strb r0, [r7, #3]
|
||||
_080A2FE8:
|
||||
str r3, [r4, #0x74]
|
||||
ldr r1, [r4, #0x7c]
|
||||
_080A2FEC:
|
||||
ldr r0, [r4, #0x74]
|
||||
lsls r0, r0, #2
|
||||
adds r2, r1, r0
|
||||
ldrb r0, [r2, #1]
|
||||
str r0, [r4, #0x78]
|
||||
ldrb r1, [r7, #3]
|
||||
movs r0, #0x40
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _080A3028
|
||||
ldr r0, _080A301C @ =gPlayerEntity
|
||||
adds r0, #0x5a
|
||||
ldrb r0, [r0]
|
||||
movs r1, #0x7f
|
||||
ands r1, r0
|
||||
adds r1, #8
|
||||
ldrb r2, [r2]
|
||||
adds r1, r1, r2
|
||||
ldrh r2, [r4, #0x12]
|
||||
adds r0, r4, #0
|
||||
bl sub_080042D0
|
||||
b _080A303E
|
||||
.align 2, 0
|
||||
_080A301C: .4byte gPlayerEntity
|
||||
_080A3020: .4byte gPlayerState
|
||||
_080A3024: .4byte gUnk_081271DC
|
||||
_080A3028:
|
||||
ldr r0, _080A3060 @ =gPlayerEntity
|
||||
adds r0, #0x5a
|
||||
ldrb r0, [r0]
|
||||
movs r1, #0x7f
|
||||
ands r1, r0
|
||||
ldrb r2, [r2]
|
||||
adds r1, r1, r2
|
||||
ldrh r2, [r4, #0x12]
|
||||
adds r0, r4, #0
|
||||
bl sub_080042D0
|
||||
_080A303E:
|
||||
ldr r1, _080A3060 @ =gPlayerEntity
|
||||
adds r0, r1, #0
|
||||
adds r0, #0x5a
|
||||
ldrb r0, [r0]
|
||||
adds r2, r4, #0
|
||||
adds r2, #0x5a
|
||||
strb r0, [r2]
|
||||
adds r0, r1, #0
|
||||
adds r0, #0x5b
|
||||
ldrb r0, [r0]
|
||||
adds r2, #1
|
||||
strb r0, [r2]
|
||||
adds r0, r4, #0
|
||||
bl sub_08078E84
|
||||
b _080A3068
|
||||
.align 2, 0
|
||||
_080A3060: .4byte gPlayerEntity
|
||||
_080A3064:
|
||||
movs r0, #0xff
|
||||
strb r0, [r4, #0x1e]
|
||||
_080A3068:
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
.syntax divided
|
||||
@@ -1,67 +0,0 @@
|
||||
.syntax unified
|
||||
push {r4, r5, r6, lr}
|
||||
ldrb r3, [r0, #0xa]
|
||||
lsls r1, r3, #4
|
||||
adds r4, r1, #0
|
||||
adds r4, #8
|
||||
ldr r2, [r0, #0x64]
|
||||
adds r6, r2, r4
|
||||
adds r1, #0x18
|
||||
adds r4, r2, r1
|
||||
ldr r0, _08043B40 @ =gUnk_080D13B2
|
||||
adds r3, r3, r0
|
||||
ldrb r5, [r3]
|
||||
ldr r0, [r2]
|
||||
ldrb r0, [r0, #0xb]
|
||||
cmp r0, #0
|
||||
bne _08043B44
|
||||
ldrb r1, [r6, #1]
|
||||
ldrb r0, [r4, #1]
|
||||
subs r0, r1, r0
|
||||
lsls r0, r0, #0x18
|
||||
asrs r3, r0, #0x18
|
||||
cmp r5, r3
|
||||
bhs _08043B5E
|
||||
cmp r3, #0
|
||||
ble _08043B56
|
||||
subs r0, r1, r5
|
||||
b _08043B5C
|
||||
.align 2, 0
|
||||
_08043B40: .4byte gUnk_080D13B2
|
||||
_08043B44:
|
||||
ldrb r0, [r4, #1]
|
||||
ldrb r1, [r6, #1]
|
||||
subs r0, r0, r1
|
||||
lsls r0, r0, #0x18
|
||||
asrs r3, r0, #0x18
|
||||
cmp r5, r3
|
||||
bhs _08043B5E
|
||||
cmp r3, #0
|
||||
bge _08043B5A
|
||||
_08043B56:
|
||||
strb r1, [r4, #1]
|
||||
b _08043B5E
|
||||
_08043B5A:
|
||||
adds r0, r1, r5
|
||||
_08043B5C:
|
||||
strb r0, [r4, #1]
|
||||
_08043B5E:
|
||||
ldrb r2, [r6, #5]
|
||||
ldrb r0, [r4, #5]
|
||||
subs r3, r2, r0
|
||||
lsls r1, r5, #1
|
||||
adds r0, r3, r5
|
||||
cmp r1, r0
|
||||
bhs _08043B78
|
||||
cmp r3, #0
|
||||
ble _08043B74
|
||||
subs r0, r2, r5
|
||||
b _08043B76
|
||||
_08043B74:
|
||||
adds r0, r2, r5
|
||||
_08043B76:
|
||||
strb r0, [r4, #5]
|
||||
_08043B78:
|
||||
pop {r4, r5, r6, pc}
|
||||
.align 2, 0
|
||||
.syntax divided
|
||||
+7
-10
@@ -146,12 +146,9 @@ void sub_08022DE8(Entity* this) {
|
||||
}
|
||||
}
|
||||
|
||||
// this definition is only here, so clang-tidy does not mess gUnk_080CBBBC up.
|
||||
extern void sub_08022E40(Entity* this);
|
||||
|
||||
NONMATCH("asm/non_matching/moldorm/sub_08022E40.inc", void sub_08022E40(Entity* this)) {
|
||||
void sub_08022E40(Entity* this) {
|
||||
u32 bVar1;
|
||||
u32 bVar2;
|
||||
u32 animationState;
|
||||
u32 tmp;
|
||||
u32 tmp2;
|
||||
u8* ptr;
|
||||
@@ -159,21 +156,21 @@ NONMATCH("asm/non_matching/moldorm/sub_08022E40.inc", void sub_08022E40(Entity*
|
||||
this->field_0x74.HWORD = this->x.HALF.HI;
|
||||
this->field_0x76.HWORD = this->y.HALF.HI;
|
||||
tmp2 = (this->parent->field_0x78.HALF.HI + 1) & 7;
|
||||
bVar1 = ((u8*)&this->field_0x7c)[tmp2];
|
||||
ptr = (u8*)&this->field_0x7c + tmp2;
|
||||
bVar1 = *ptr;
|
||||
tmp = (bVar1 & 0xf) - 8;
|
||||
bVar1 >>= 4;
|
||||
this->x.HALF.HI = ((short)((tmp * 0x100)) >> 8) + this->x.HALF.HI;
|
||||
bVar1 -= 8;
|
||||
this->y.HALF.HI = bVar1 + this->y.HALF.HI;
|
||||
bVar2 = (u8)(*(u32*)&this->cutsceneBeh >> (((this->parent->field_0x78.HALF.HI + 1) & 7) << 2)) & 7;
|
||||
this->animationState = bVar2;
|
||||
animationState = (u8)(*(u32*)&this->cutsceneBeh >> (((this->parent->field_0x78.HALF.HI + 1) & 7) << 2)) & 7;
|
||||
this->animationState = animationState;
|
||||
if (this->type == 3) {
|
||||
this->frameIndex = bVar2 + 10;
|
||||
this->frameIndex = animationState + 10;
|
||||
} else {
|
||||
sub_08022EAC(this);
|
||||
}
|
||||
}
|
||||
END_NONMATCH
|
||||
|
||||
void sub_08022EAC(Entity* this) {
|
||||
int iVar1;
|
||||
|
||||
+39
-2
@@ -1201,9 +1201,46 @@ static void sub_08043ABC(Entity* this) {
|
||||
((VaatiArm_HeapStruct*)this->myHeap)->entities[0]->spriteOffsetY--;
|
||||
}
|
||||
|
||||
static ASM_FUNC("asm/non_matching/vaati/sub_08043B08.inc", void sub_08043B08(Entity* this))
|
||||
void sub_08043B08(Entity* this) {
|
||||
VaatiArm_HeapStruct1* hs1;
|
||||
VaatiArm_HeapStruct1* hs2;
|
||||
u32 bVar1;
|
||||
s32 uVar6;
|
||||
|
||||
static void sub_08043B7C(Entity* this) {
|
||||
hs1 = &((VaatiArm_HeapStruct*)this->myHeap)->s1[this->type - 1];
|
||||
hs2 = &((VaatiArm_HeapStruct*)this->myHeap)->s1[this->type];
|
||||
bVar1 = gUnk_080D13B2[this->type];
|
||||
if (((VaatiArm_HeapStruct*)this->myHeap)->entities[0]->type2 == 0) {
|
||||
uVar6 = (s8)((hs1->unk00.HALF.HI - hs2->unk00.HALF.HI));
|
||||
if (bVar1 < uVar6) {
|
||||
if (uVar6 <= 0) {
|
||||
hs2->unk00.HALF.HI = hs1->unk00.HALF.HI;
|
||||
} else {
|
||||
hs2->unk00.HALF.HI = hs1->unk00.HALF.HI - bVar1;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
uVar6 = (s8)(hs2->unk00.HALF.HI - hs1->unk00.HALF.HI);
|
||||
if (bVar1 < uVar6) {
|
||||
if (uVar6 < 0) {
|
||||
hs2->unk00.HALF.HI = hs1->unk00.HALF.HI;
|
||||
} else {
|
||||
hs2->unk00.HALF.HI = hs1->unk00.HALF.HI + bVar1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
uVar6 = hs1->unk04.HALF.HI - hs2->unk04.HALF.HI;
|
||||
if ((bVar1 << 1) < uVar6 + bVar1) {
|
||||
if (uVar6 > 0) {
|
||||
hs2->unk04.HALF.HI = hs1->unk04.HALF.HI - bVar1;
|
||||
} else {
|
||||
hs2->unk04.HALF.HI = hs1->unk04.HALF.HI + bVar1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void sub_08043B7C(Entity* this) {
|
||||
sub_08043B08(((VaatiArm_HeapStruct*)this->myHeap)->entities[1]);
|
||||
sub_08043B08(((VaatiArm_HeapStruct*)this->myHeap)->entities[2]);
|
||||
sub_08043B08(((VaatiArm_HeapStruct*)this->myHeap)->entities[3]);
|
||||
|
||||
+15
-17
@@ -142,50 +142,49 @@ const u8 gUnk_081280EE[] = {
|
||||
0x5u, 0x7u, 0xau, 0xeu, 0x13u, 0x1au,
|
||||
};
|
||||
|
||||
NONMATCH("asm/non_matching/menu/kinstone_menu/KinstoneMenu_Type1.inc", void KinstoneMenu_Type1(void)) {
|
||||
s32 tmp1, tmp2, tmp3, tmp4, tmp5;
|
||||
u8* ptr;
|
||||
void KinstoneMenu_Type1(void) {
|
||||
s32 tmp1, tmp2, tmp3, tmp4;
|
||||
GenericMenu* menu;
|
||||
if (gFadeControl.active) {
|
||||
return;
|
||||
}
|
||||
menu = &gGenericMenu;
|
||||
menu->base.column_idx = 2;
|
||||
tmp2 = menu->unk28 * 0x10000;
|
||||
tmp2 = menu->unk28 << 0x10;
|
||||
tmp1 = tmp2 - menu->unk10.i;
|
||||
if ((tmp1 < 0 ? -tmp1 : tmp1) <= 0x1ffdu) {
|
||||
menu->unk10.i = tmp2;
|
||||
} else {
|
||||
menu->base.column_idx = 1;
|
||||
tmp2 = sub_08000E44(tmp1);
|
||||
tmp1 = tmp1 / 0x20000;
|
||||
if (tmp1 < 0)
|
||||
tmp1 = -tmp1;
|
||||
if (tmp1 > 5) {
|
||||
tmp1 = 5;
|
||||
tmp3 = tmp1 / 0x20000;
|
||||
if (tmp3 < 0)
|
||||
tmp3 = -tmp3;
|
||||
if (tmp3 > 5) {
|
||||
tmp3 = 5;
|
||||
}
|
||||
menu->unk10.i += gUnk_081280EE[tmp1] * 0x666 * tmp2;
|
||||
menu->unk10.i += gUnk_081280EE[tmp3] * 0x666 * tmp2;
|
||||
}
|
||||
if (menu->unk29 != menu->unk10.i / 0x10000) {
|
||||
menu->unk29 = menu->unk10.i / 0x10000;
|
||||
SoundReq(SFX_TEXTBOX_CHOICE);
|
||||
}
|
||||
if ((gInput.newKeys & 0x20a) != 0) {
|
||||
if ((gInput.newKeys & (L_BUTTON | START_BUTTON | B_BUTTON)) != 0) {
|
||||
SetMenuType(2);
|
||||
SoundReq(SFX_MENU_CANCEL);
|
||||
return;
|
||||
}
|
||||
tmp3 = menu->unk28;
|
||||
switch (gInput.unk4) {
|
||||
case 0x20:
|
||||
case 0x40:
|
||||
case DPAD_LEFT:
|
||||
case DPAD_UP:
|
||||
tmp3--;
|
||||
break;
|
||||
case 0x10:
|
||||
case 0x80:
|
||||
case DPAD_RIGHT:
|
||||
case DPAD_DOWN:
|
||||
tmp3++;
|
||||
break;
|
||||
case 1:
|
||||
case A_BUTTON:
|
||||
if (gMenu.column_idx == 2) {
|
||||
tmp3 = gGenericMenu.unk10.i / 0x10000;
|
||||
gGenericMenu.unk2a = gSave.unk118[tmp3];
|
||||
@@ -207,7 +206,6 @@ NONMATCH("asm/non_matching/menu/kinstone_menu/KinstoneMenu_Type1.inc", void Kins
|
||||
menu->unk28 = tmp3;
|
||||
}
|
||||
}
|
||||
END_NONMATCH
|
||||
|
||||
void KinstoneMenu_Type2(void) {
|
||||
const struct_080C9CBC* ptr;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#define NENT_DEPRECATED
|
||||
|
||||
#include "entity.h"
|
||||
#include "player.h"
|
||||
@@ -6,131 +7,135 @@
|
||||
#include "collision.h"
|
||||
#include "playeritem.h"
|
||||
|
||||
extern void (*const gUnk_081271D4[])(Entity*);
|
||||
extern u8 gUnk_081271DC[];
|
||||
void sub_080A2E00(Entity* this);
|
||||
typedef struct {
|
||||
Entity base;
|
||||
u8 unk_68;
|
||||
u8 unk_69[3];
|
||||
u32 bounceTimer;
|
||||
u32 unk_70;
|
||||
u32 unk_74;
|
||||
u32 unk_78;
|
||||
u8* unk_7c;
|
||||
} PlayerItemShieldEntity;
|
||||
|
||||
void PlayerItemShield(Entity* this) {
|
||||
if (*(int*)&this->field_0x6c != 0) {
|
||||
*(int*)&this->field_0x6c += -1;
|
||||
extern void (*const gUnk_081271D4[])(PlayerItemShieldEntity*);
|
||||
extern u8 gUnk_081271DC[];
|
||||
void sub_080A2E00(PlayerItemShieldEntity* this);
|
||||
|
||||
void PlayerItemShield(PlayerItemShieldEntity* this) {
|
||||
if (this->bounceTimer != 0) {
|
||||
this->bounceTimer--;
|
||||
}
|
||||
gUnk_081271D4[this->action](this);
|
||||
gUnk_081271D4[super->action](this);
|
||||
}
|
||||
|
||||
void sub_080A2D98(Entity* this) {
|
||||
gPlayerState.item = this;
|
||||
this->action = 1;
|
||||
this->updatePriority = 6;
|
||||
this->frameIndex = 0xff;
|
||||
if (this->field_0x68.HALF.LO == 14) {
|
||||
this->field_0x70.WORD = 0x27;
|
||||
*(u32*)&this->field_0x78 = gUnk_081271DC[1];
|
||||
*(u32*)&this->field_0x74 = 0;
|
||||
*(u8**)&this->field_0x7c = gUnk_081271DC;
|
||||
void sub_080A2D98(PlayerItemShieldEntity* this) {
|
||||
gPlayerState.item = super;
|
||||
super->action = 1;
|
||||
super->updatePriority = 6;
|
||||
super->frameIndex = 0xff;
|
||||
if (this->unk_68 == 14) {
|
||||
this->unk_70 = 0x27;
|
||||
this->unk_78 = gUnk_081271DC[1];
|
||||
this->unk_74 = 0;
|
||||
this->unk_7c = gUnk_081271DC;
|
||||
} else {
|
||||
this->field_0x70.WORD = 0;
|
||||
this->unk_70 = 0;
|
||||
}
|
||||
this->animationState = gPlayerEntity.animationState & 0xe;
|
||||
sub_08079BD8(this);
|
||||
LoadSwapGFX(this, 1, 3);
|
||||
super->animationState = gPlayerEntity.animationState & 0xe;
|
||||
sub_08079BD8(super);
|
||||
LoadSwapGFX(super, 1, 3);
|
||||
sub_080A2E00(this);
|
||||
}
|
||||
|
||||
extern Hitbox* gUnk_08127240[];
|
||||
extern u8 gUnk_08127220[];
|
||||
|
||||
NONMATCH("asm/non_matching/playerItemShield/sub_080A2E00.inc", void sub_080A2E00(Entity* this)) {
|
||||
Entity* pEVar1;
|
||||
u8* iVar2;
|
||||
void sub_080A2E00(PlayerItemShieldEntity* this) {
|
||||
Entity* playerItem;
|
||||
u8* pbVar3;
|
||||
u8 uVar4;
|
||||
int iVar5;
|
||||
u32 tmp;
|
||||
u32 tmp2;
|
||||
|
||||
if ((gPlayerEntity.iframes == 0) || ((u8)gPlayerEntity.iframes == 0x81)) {
|
||||
gPlayerEntity.iframes = this->iframes;
|
||||
gPlayerEntity.knockbackDirection = this->knockbackDirection;
|
||||
gPlayerEntity.knockbackDuration = this->knockbackDuration;
|
||||
this->knockbackDuration = 0;
|
||||
this->iframes = 0;
|
||||
gPlayerEntity.iframes = super->iframes;
|
||||
gPlayerEntity.knockbackDirection = super->knockbackDirection;
|
||||
gPlayerEntity.knockbackDuration = super->knockbackDuration;
|
||||
super->knockbackDuration = 0;
|
||||
super->iframes = 0;
|
||||
}
|
||||
|
||||
uVar4 = gPlayerState.shield_status;
|
||||
if ((uVar4 != 0) && (this == gPlayerState.item)) {
|
||||
if ((uVar4 & 0x80) != 0) {
|
||||
this->hitbox = gUnk_08127240[this->animationState >> 1];
|
||||
this->collisionFlags = (gPlayerEntity.collisionFlags + 1) | 0x20;
|
||||
this->flags = this->flags | 0x80;
|
||||
gPlayerState.shield_status = uVar4 & 0x7f;
|
||||
sub_080176E4(this);
|
||||
if ((gPlayerState.shield_status != 0) && (super == gPlayerState.item)) {
|
||||
if ((gPlayerState.shield_status & 0x80) != 0) {
|
||||
super->hitbox = gUnk_08127240[super->animationState >> 1];
|
||||
super->collisionFlags = (gPlayerEntity.collisionFlags + 1) | 0x20;
|
||||
COLLISION_ON(super);
|
||||
gPlayerState.shield_status &= ~0x80;
|
||||
sub_080176E4(super);
|
||||
} else {
|
||||
if ((this->contactFlags & 0x80) != 0) {
|
||||
if ((((this->contactFlags & 0x7f) == 0x42) && (*(char*)&this->field_0x68 == 0xe)) &&
|
||||
((uVar4 & 0x40) == 0)) {
|
||||
pEVar1 = CreatePlayerItem(PLAYER_ITEM_FIRE_ROD_PROJECTILE, 0, 0, *(char*)&this->field_0x68);
|
||||
this->child = pEVar1;
|
||||
if (pEVar1 != NULL) {
|
||||
pEVar1->subtimer = 1;
|
||||
this->child->direction = this->knockbackDirection ^ 0x10;
|
||||
this->child->parent = this;
|
||||
if ((super->contactFlags & 0x80) != 0) {
|
||||
if ((((super->contactFlags & 0x7f) == 0x42) && this->unk_68 == 0xe) &&
|
||||
((gPlayerState.shield_status & 0x40) == 0)) {
|
||||
playerItem = CreatePlayerItem(PLAYER_ITEM_FIRE_ROD_PROJECTILE, 0, 0, this->unk_68);
|
||||
super->child = playerItem;
|
||||
if (playerItem != NULL) {
|
||||
playerItem->subtimer = 1;
|
||||
super->child->direction = DirectionTurnAround(super->knockbackDirection);
|
||||
super->child->parent = super;
|
||||
}
|
||||
*(u32*)&this->field_0x78 = gUnk_08127220[1];
|
||||
*(u32*)&this->field_0x74 = uVar4 & 0x40;
|
||||
*(u8**)&this->field_0x7c = gUnk_08127220;
|
||||
this->unk_78 = gUnk_08127220[1];
|
||||
this->unk_74 = 0;
|
||||
this->unk_7c = gUnk_08127220;
|
||||
gPlayerState.shield_status |= 0x40;
|
||||
}
|
||||
if (*(int*)&this->field_0x6c == 0) {
|
||||
SoundReq(0x118);
|
||||
*(u32*)&this->field_0x6c = 8;
|
||||
if (this->bounceTimer == 0) {
|
||||
SoundReq(SFX_ITEM_SHIELD_BOUNCE);
|
||||
this->bounceTimer = 8;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
gPlayerState.shield_status = 0;
|
||||
if (gPlayerState.item == this) {
|
||||
if (gPlayerState.item == super) {
|
||||
gPlayerState.item = NULL;
|
||||
}
|
||||
DeleteThisEntity();
|
||||
}
|
||||
|
||||
if (((gPlayerEntity.spriteIndex == 1U) || (gPlayerEntity.spriteIndex == 4U)) &&
|
||||
if (((gPlayerEntity.spriteIndex == 1u) || (gPlayerEntity.spriteIndex == 4u)) &&
|
||||
((u8)(gPlayerEntity.frameIndex - 0x25) < 0x3f)) {
|
||||
this->spriteSettings.flipX = gPlayerEntity.spriteSettings.flipX;
|
||||
this->spriteSettings.flipY = gPlayerEntity.spriteSettings.flipY;
|
||||
if ((gPlayerEntity.frameIndex - 0x25 + this->field_0x70.WORD != (u32)this->frameIndex) &&
|
||||
((this->frameIndex = gPlayerEntity.frameIndex - 0x25 + this->field_0x70.WORD,
|
||||
*(char*)&this->field_0x68 != 0xe || ((gPlayerEntity.frame & 0x7f) == 0)))) {
|
||||
sub_080042D0(this, this->frameIndex, (u16)this->spriteIndex);
|
||||
super->spriteSettings.flipX = gPlayerEntity.spriteSettings.flipX;
|
||||
super->spriteSettings.flipY = gPlayerEntity.spriteSettings.flipY;
|
||||
if ((gPlayerEntity.frameIndex - 0x25 + this->unk_70 != super->frameIndex) &&
|
||||
((super->frameIndex = gPlayerEntity.frameIndex - 0x25 + this->unk_70,
|
||||
this->unk_68 != 0xe || ((gPlayerEntity.frame & 0x7f) == 0)))) {
|
||||
sub_080042D0(super, super->frameIndex, super->spriteIndex);
|
||||
}
|
||||
if (((*(char*)&this->field_0x68 == 0xe) && ((gPlayerEntity.frame & 0x7f) != 0))) {
|
||||
(*(int*)&this->field_0x78)--;
|
||||
if ((*(int*)&this->field_0x78) == 0) {
|
||||
(*(int*)&this->field_0x74)++;
|
||||
iVar5 = (*(int*)&this->field_0x74) * 4;
|
||||
iVar2 = *(u8**)&this->field_0x7c;
|
||||
if (iVar2[iVar5] == 0xff) {
|
||||
if (((this->unk_68 == 0xe) && ((gPlayerEntity.frame & 0x7f) != 0))) {
|
||||
if (--this->unk_78 == 0) {
|
||||
this->unk_74++;
|
||||
tmp2 = this->unk_74 * 4;
|
||||
pbVar3 = &this->unk_7c[tmp2];
|
||||
if (pbVar3[0] == 0xff) {
|
||||
if ((gPlayerState.shield_status & 0x40) != 0) {
|
||||
*(u8**)&this->field_0x7c = gUnk_081271DC;
|
||||
gPlayerState.shield_status = gPlayerState.shield_status & 0xbf;
|
||||
this->unk_7c = gUnk_081271DC;
|
||||
gPlayerState.shield_status &= ~0x40;
|
||||
}
|
||||
*(u32*)&this->field_0x74 = 0;
|
||||
iVar2 = *(u8**)&this->field_0x7c;
|
||||
this->unk_74 = 0;
|
||||
}
|
||||
pbVar3 = &iVar2[*(int*)&this->field_0x74 * 4];
|
||||
*(u32*)&this->field_0x78 = pbVar3[1];
|
||||
pbVar3 = &this->unk_7c[this->unk_74 * 4];
|
||||
this->unk_78 = pbVar3[1];
|
||||
if ((gPlayerState.shield_status & 0x40) != 0) {
|
||||
u32 temp = (gPlayerEntity.frame & 0x7f) + 8;
|
||||
sub_080042D0(this, temp + *pbVar3, (u16)this->spriteIndex);
|
||||
sub_080042D0(super, temp + pbVar3[0], super->spriteIndex);
|
||||
} else {
|
||||
sub_080042D0(this, (gPlayerEntity.frame & 0x7f) + *pbVar3, (u16)this->spriteIndex);
|
||||
sub_080042D0(super, (gPlayerEntity.frame & 0x7f) + pbVar3[0], super->spriteIndex);
|
||||
}
|
||||
}
|
||||
}
|
||||
this->frame = gPlayerEntity.frame;
|
||||
this->frameSpriteSettings = gPlayerEntity.frameSpriteSettings;
|
||||
sub_08078E84(this, &gPlayerEntity);
|
||||
super->frame = gPlayerEntity.frame;
|
||||
super->frameSpriteSettings = gPlayerEntity.frameSpriteSettings;
|
||||
sub_08078E84(super, &gPlayerEntity);
|
||||
} else {
|
||||
this->frameIndex = 0xff;
|
||||
super->frameIndex = 0xff;
|
||||
}
|
||||
}
|
||||
END_NONMATCH
|
||||
|
||||
Reference in New Issue
Block a user