mirror of https://github.com/zeldaret/tmc.git
decomp vaati arm
This commit is contained in:
Henny022p
parent
89c44805b2
commit
0d98d00c01
|
|
@ -0,0 +1,89 @@
|
|||
|
||||
.syntax unified
|
||||
push {r4, r5, r6, r7, lr}
|
||||
adds r4, r0, #0
|
||||
movs r3, #3
|
||||
movs r2, #0
|
||||
ldr r0, [r4, #0x64]
|
||||
adds r1, r0, #0
|
||||
adds r1, #0x48
|
||||
ldrb r0, [r1, #0xc]
|
||||
cmp r0, #2
|
||||
bls _080432C2
|
||||
subs r0, #1
|
||||
strb r0, [r1, #0xc]
|
||||
movs r2, #1
|
||||
_080432C2:
|
||||
subs r3, #1
|
||||
cmp r3, #0
|
||||
blt _080432E0
|
||||
lsls r0, r3, #4
|
||||
adds r0, #0x18
|
||||
ldr r1, [r4, #0x64]
|
||||
adds r1, r1, r0
|
||||
ldrb r0, [r1, #0xc]
|
||||
cmp r0, #2
|
||||
bls _080432C2
|
||||
subs r0, #1
|
||||
strb r0, [r1, #0xc]
|
||||
adds r2, #1
|
||||
cmp r2, #1
|
||||
ble _080432C2
|
||||
_080432E0:
|
||||
ldr r0, [r4, #0x64]
|
||||
adds r1, r0, #0
|
||||
adds r1, #0x18
|
||||
ldrb r0, [r1, #5]
|
||||
subs r0, #2
|
||||
strb r0, [r1, #5]
|
||||
movs r3, #0
|
||||
movs r6, #0x80
|
||||
movs r7, #4
|
||||
rsbs r7, r7, #0
|
||||
movs r5, #1
|
||||
_080432F6:
|
||||
ldr r0, [r4, #0x64]
|
||||
lsls r1, r3, #2
|
||||
adds r0, r0, r1
|
||||
ldr r2, [r0]
|
||||
movs r1, #0x36
|
||||
ldrsh r0, [r2, r1]
|
||||
cmp r0, #3
|
||||
bgt _08043316
|
||||
ldrb r0, [r2, #0x10]
|
||||
orrs r0, r6
|
||||
strb r0, [r2, #0x10]
|
||||
ldrb r1, [r2, #0x18]
|
||||
adds r0, r7, #0
|
||||
ands r0, r1
|
||||
orrs r0, r5
|
||||
strb r0, [r2, #0x18]
|
||||
_08043316:
|
||||
adds r3, #1
|
||||
cmp r3, #3
|
||||
ble _080432F6
|
||||
ldr r1, [r4, #0x64]
|
||||
ldr r0, [r1]
|
||||
ldrb r0, [r0, #0x18]
|
||||
lsls r0, r0, #0x1e
|
||||
lsrs r2, r0, #0x1e
|
||||
cmp r2, #1
|
||||
bne _08043348
|
||||
adds r0, r1, #0
|
||||
adds r0, #0x34
|
||||
ldrb r0, [r0]
|
||||
cmp r0, #2
|
||||
bhi _08043348
|
||||
strb r2, [r4, #0xd]
|
||||
movs r0, #0x1e
|
||||
strb r0, [r4, #0xe]
|
||||
movs r0, #0x80
|
||||
lsls r0, r0, #7
|
||||
strh r0, [r1, #0x1c]
|
||||
ldr r0, [r4, #0x64]
|
||||
ldr r0, [r0, #0x10]
|
||||
bl sub_0804AA1C
|
||||
_08043348:
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
.syntax divided
|
||||
|
|
@ -0,0 +1,111 @@
|
|||
.syntax unified
|
||||
push {r4, r5, r6, r7, lr}
|
||||
adds r4, r0, #0
|
||||
ldrb r0, [r4, #0xe]
|
||||
cmp r0, #0
|
||||
beq _08043388
|
||||
subs r0, #1
|
||||
strb r0, [r4, #0xe]
|
||||
lsls r0, r0, #0x18
|
||||
cmp r0, #0
|
||||
bne _0804341C
|
||||
movs r5, #0
|
||||
movs r7, #0x80
|
||||
movs r6, #4
|
||||
rsbs r6, r6, #0
|
||||
movs r3, #1
|
||||
_0804336A:
|
||||
ldr r0, [r4, #0x64]
|
||||
lsls r1, r5, #2
|
||||
adds r0, r0, r1
|
||||
ldr r2, [r0]
|
||||
ldrb r0, [r2, #0x10]
|
||||
orrs r0, r7
|
||||
strb r0, [r2, #0x10]
|
||||
ldrb r1, [r2, #0x18]
|
||||
adds r0, r6, #0
|
||||
ands r0, r1
|
||||
orrs r0, r3
|
||||
strb r0, [r2, #0x18]
|
||||
adds r5, #1
|
||||
cmp r5, #4
|
||||
bls _0804336A
|
||||
_08043388:
|
||||
ldr r3, [r4, #0x64]
|
||||
adds r2, r3, #0
|
||||
adds r2, #0x18
|
||||
ldr r1, _080433AC @ =gUnk_080D131C
|
||||
ldrb r0, [r4, #0xb]
|
||||
adds r0, r0, r1
|
||||
ldrb r0, [r0]
|
||||
ldrb r1, [r2, #1]
|
||||
subs r0, r0, r1
|
||||
adds r0, #1
|
||||
cmp r0, #2
|
||||
bls _080433B0
|
||||
ldrh r0, [r2, #8]
|
||||
ldrh r1, [r3, #0x18]
|
||||
adds r0, r0, r1
|
||||
strh r0, [r3, #0x18]
|
||||
movs r7, #0
|
||||
b _080433B2
|
||||
.align 2, 0
|
||||
_080433AC: .4byte gUnk_080D131C
|
||||
_080433B0:
|
||||
movs r7, #1
|
||||
_080433B2:
|
||||
adds r0, r4, #0
|
||||
bl sub_08043B9C
|
||||
movs r5, #0
|
||||
movs r6, #0x18
|
||||
_080433BC:
|
||||
ldr r0, [r4, #0x64]
|
||||
adds r2, r0, r6
|
||||
ldr r0, _080433E4 @ =gUnk_080D1414
|
||||
adds r0, r5, r0
|
||||
ldrb r1, [r2, #0xc]
|
||||
ldrb r3, [r0]
|
||||
cmp r3, r1
|
||||
bls _080433E8
|
||||
adds r0, r1, #1
|
||||
strb r0, [r2, #0xc]
|
||||
lsls r0, r0, #0x18
|
||||
lsrs r0, r0, #0x18
|
||||
cmp r3, r0
|
||||
bne _0804341C
|
||||
movs r0, #0xaf
|
||||
lsls r0, r0, #1
|
||||
bl SoundReq
|
||||
b _0804341C
|
||||
.align 2, 0
|
||||
_080433E4: .4byte gUnk_080D1414
|
||||
_080433E8:
|
||||
cmp r7, #0
|
||||
beq _08043414
|
||||
cmp r5, #4
|
||||
bne _08043414
|
||||
adds r0, r4, #0
|
||||
bl sub_08043BC8
|
||||
adds r0, r4, #0
|
||||
movs r1, #7
|
||||
bl InitAnimationForceUpdate
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x7e
|
||||
ldrb r0, [r1]
|
||||
cmp r0, #0
|
||||
beq _08043414
|
||||
movs r0, #0
|
||||
strb r0, [r1]
|
||||
ldr r0, [r4, #0x64]
|
||||
ldr r1, [r0, #0x14]
|
||||
movs r0, #2
|
||||
strb r0, [r1, #0xd]
|
||||
_08043414:
|
||||
adds r6, #0x10
|
||||
adds r5, #1
|
||||
cmp r5, #4
|
||||
bls _080433BC
|
||||
_0804341C:
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
.syntax divided
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
.syntax unified
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldr r0, [r4, #0x64]
|
||||
ldr r0, [r0, #0x10]
|
||||
mov ip, r0
|
||||
ldrh r1, [r0, #0x36]
|
||||
movs r2, #0x36
|
||||
ldrsh r0, [r0, r2]
|
||||
movs r2, #4
|
||||
rsbs r2, r2, #0
|
||||
cmp r0, r2
|
||||
bge _080434C4
|
||||
movs r0, #0xc0
|
||||
lsls r0, r0, #9
|
||||
mov r3, ip
|
||||
str r0, [r3, #0x20]
|
||||
movs r0, #0
|
||||
movs r1, #2
|
||||
strb r1, [r4, #0xd]
|
||||
adds r2, r4, #0
|
||||
adds r2, #0x7e
|
||||
strb r0, [r2]
|
||||
ldr r0, [r4, #0x64]
|
||||
ldr r0, [r0, #0x14]
|
||||
strb r1, [r0, #0xd]
|
||||
b _08043514
|
||||
_080434C4:
|
||||
subs r0, r1, #2
|
||||
mov r1, ip
|
||||
strh r0, [r1, #0x36]
|
||||
lsls r0, r0, #0x10
|
||||
cmp r0, #0
|
||||
bge _08043514
|
||||
ldrb r0, [r1, #0x10]
|
||||
movs r3, #0x80
|
||||
orrs r0, r3
|
||||
strb r0, [r1, #0x10]
|
||||
ldrb r1, [r1, #0x18]
|
||||
adds r0, r2, #0
|
||||
ands r0, r1
|
||||
movs r1, #1
|
||||
orrs r0, r1
|
||||
mov r2, ip
|
||||
strb r0, [r2, #0x18]
|
||||
adds r2, #0x3c
|
||||
ldrb r1, [r2]
|
||||
movs r0, #0xef
|
||||
ands r0, r1
|
||||
strb r0, [r2]
|
||||
mov r1, ip
|
||||
adds r1, #0x3f
|
||||
movs r0, #0x3a
|
||||
strb r0, [r1]
|
||||
ldr r0, _0804351C @ =gUnk_080FD450
|
||||
mov r1, ip
|
||||
str r0, [r1, #0x48]
|
||||
ldr r0, [r4, #0x64]
|
||||
ldr r1, [r0, #8]
|
||||
ldrb r0, [r1, #0x10]
|
||||
orrs r3, r0
|
||||
strb r3, [r1, #0x10]
|
||||
ldr r0, [r4, #0x64]
|
||||
ldr r2, [r0, #0xc]
|
||||
ldrb r1, [r2, #0x10]
|
||||
movs r0, #0x7f
|
||||
ands r0, r1
|
||||
strb r0, [r2, #0x10]
|
||||
_08043514:
|
||||
adds r0, r4, #0
|
||||
bl UpdateAnimationSingleFrame
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_0804351C: .4byte gUnk_080FD450
|
||||
.syntax divided
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
.syntax unified
|
||||
push {r4, r5, lr}
|
||||
adds r2, r0, #0
|
||||
ldrb r0, [r2, #0xe]
|
||||
subs r0, #1
|
||||
strb r0, [r2, #0xe]
|
||||
lsls r0, r0, #0x18
|
||||
lsrs r4, r0, #0x18
|
||||
cmp r4, #0
|
||||
bne _080437D8
|
||||
ldr r0, [r2, #0x64]
|
||||
ldr r3, [r0, #0x14]
|
||||
ldr r0, _080437AC @ =gScreenTransition
|
||||
adds r5, r0, #0
|
||||
adds r5, #0x39
|
||||
ldrb r1, [r5]
|
||||
movs r0, #0xc
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
bne _0804379A
|
||||
movs r0, #2
|
||||
strb r0, [r3, #0xd]
|
||||
_0804379A:
|
||||
ldrb r0, [r2, #0xb]
|
||||
cmp r0, #0
|
||||
bne _080437B0
|
||||
ldr r0, [r3, #0x64]
|
||||
str r4, [r0, #0x14]
|
||||
ldrb r1, [r5]
|
||||
movs r0, #0xfe
|
||||
b _080437B8
|
||||
.align 2, 0
|
||||
_080437AC: .4byte gScreenTransition
|
||||
_080437B0:
|
||||
ldr r0, [r3, #0x64]
|
||||
str r4, [r0, #0x18]
|
||||
ldrb r1, [r5]
|
||||
movs r0, #0xfd
|
||||
_080437B8:
|
||||
ands r0, r1
|
||||
strb r0, [r5]
|
||||
ldr r0, [r2, #0x64]
|
||||
ldr r0, [r0, #0x10]
|
||||
movs r1, #0
|
||||
str r1, [r0, #0x64]
|
||||
ldr r0, [r2, #0x64]
|
||||
ldr r0, [r0, #0x10]
|
||||
adds r0, #0x45
|
||||
strb r1, [r0]
|
||||
ldr r1, [r2, #0x68]
|
||||
ldr r0, [r2, #0x64]
|
||||
ldr r0, [r0, #0x10]
|
||||
str r0, [r1, #0x50]
|
||||
bl DeleteThisEntity
|
||||
_080437D8:
|
||||
pop {r4, r5, pc}
|
||||
.align 2, 0
|
||||
.syntax divided
|
||||
|
|
@ -0,0 +1,109 @@
|
|||
.syntax unified
|
||||
push {r4, r5, r6, r7, lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
adds r5, r0, #0
|
||||
ldr r0, [r5, #0x64]
|
||||
ldr r1, [r0]
|
||||
adds r0, r1, #0
|
||||
adds r0, #0x7c
|
||||
ldrb r0, [r0]
|
||||
lsls r2, r0, #0x18
|
||||
cmp r2, #0
|
||||
beq _0804397C
|
||||
adds r0, r1, #0
|
||||
adds r0, #0x7d
|
||||
ldrb r0, [r0]
|
||||
ldrb r1, [r5, #0xa]
|
||||
cmp r0, r1
|
||||
bhi _0804397C
|
||||
ldr r4, _08043978 @ =gUnk_080D1362
|
||||
ldrb r3, [r5, #0xa]
|
||||
lsls r1, r3, #4
|
||||
lsrs r0, r2, #0x1b
|
||||
movs r2, #0xf
|
||||
ands r0, r2
|
||||
adds r1, r1, r0
|
||||
adds r1, r1, r4
|
||||
ldrb r4, [r1]
|
||||
adds r6, r3, #0
|
||||
b _08043980
|
||||
.align 2, 0
|
||||
_08043978: .4byte gUnk_080D1362
|
||||
_0804397C:
|
||||
movs r4, #0
|
||||
ldrb r6, [r5, #0xa]
|
||||
_08043980:
|
||||
lsls r0, r6, #4
|
||||
adds r0, #0x18
|
||||
ldr r2, [r5, #0x64]
|
||||
mov ip, r2
|
||||
adds r2, r2, r0
|
||||
ldrb r0, [r2, #0xc]
|
||||
adds r0, r4, r0
|
||||
lsls r4, r0, #8
|
||||
ldr r3, _08043A0C @ =gSineTable
|
||||
ldrb r1, [r2, #5]
|
||||
adds r0, r1, #0
|
||||
adds r0, #0x40
|
||||
lsls r0, r0, #1
|
||||
adds r0, r0, r3
|
||||
movs r7, #0
|
||||
ldrsh r0, [r0, r7]
|
||||
rsbs r0, r0, #0
|
||||
adds r7, r0, #0
|
||||
muls r7, r4, r7
|
||||
mov r8, r7
|
||||
movs r0, #0x7f
|
||||
ands r1, r0
|
||||
lsls r1, r1, #1
|
||||
adds r1, r1, r3
|
||||
movs r7, #0
|
||||
ldrsh r0, [r1, r7]
|
||||
muls r0, r4, r0
|
||||
cmp r0, #0
|
||||
bge _080439BC
|
||||
adds r0, #0xff
|
||||
_080439BC:
|
||||
asrs r4, r0, #8
|
||||
ldrb r1, [r2, #1]
|
||||
lsls r0, r1, #1
|
||||
adds r0, r0, r3
|
||||
movs r2, #0
|
||||
ldrsh r0, [r0, r2]
|
||||
adds r2, r0, #0
|
||||
muls r2, r4, r2
|
||||
adds r1, #0x40
|
||||
lsls r1, r1, #1
|
||||
adds r1, r1, r3
|
||||
movs r3, #0
|
||||
ldrsh r0, [r1, r3]
|
||||
rsbs r0, r0, #0
|
||||
adds r3, r0, #0
|
||||
muls r3, r4, r3
|
||||
adds r0, r6, #1
|
||||
lsls r0, r0, #2
|
||||
add r0, ip
|
||||
ldr r0, [r0]
|
||||
adds r1, r5, #0
|
||||
bl PositionRelative
|
||||
ldr r0, [r5, #0x34]
|
||||
add r0, r8
|
||||
str r0, [r5, #0x34]
|
||||
ldr r1, [r5, #0x64]
|
||||
ldrb r0, [r5, #0xa]
|
||||
adds r0, #1
|
||||
lsls r0, r0, #2
|
||||
adds r1, r1, r0
|
||||
ldr r0, [r1]
|
||||
adds r0, #0x63
|
||||
ldrb r1, [r0]
|
||||
adds r0, r5, #0
|
||||
adds r0, #0x63
|
||||
strb r1, [r0]
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
_08043A0C: .4byte gSineTable
|
||||
.syntax divided
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
.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
|
||||
|
|
@ -0,0 +1,129 @@
|
|||
.syntax unified
|
||||
push {r4, r5, r6, lr}
|
||||
adds r5, r0, #0
|
||||
ldr r0, _08043E48 @ =gPlayerState
|
||||
ldr r0, [r0, #0x30]
|
||||
movs r1, #0x80
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _08043EAC
|
||||
ldr r0, [r5, #0x64]
|
||||
ldr r2, [r0, #0xc]
|
||||
movs r1, #0x2e
|
||||
ldrsh r0, [r2, r1]
|
||||
ldr r6, _08043E4C @ =gRoomControls
|
||||
ldrh r1, [r6, #6]
|
||||
subs r0, r0, r1
|
||||
movs r3, #0x32
|
||||
ldrsh r1, [r2, r3]
|
||||
ldrh r2, [r6, #8]
|
||||
subs r1, r1, r2
|
||||
adds r1, #2
|
||||
movs r2, #3
|
||||
movs r3, #3
|
||||
bl CheckPlayerInRegion
|
||||
cmp r0, #0
|
||||
beq _08043EAC
|
||||
ldr r0, _08043E50 @ =gUnk_080D13EC
|
||||
bl DoExitTransition
|
||||
ldr r4, _08043E54 @ =gScreenTransition
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x39
|
||||
ldrb r1, [r0]
|
||||
movs r0, #3
|
||||
ands r0, r1
|
||||
cmp r0, #3
|
||||
beq _08043DFE
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xd]
|
||||
_08043DFE:
|
||||
adds r0, r5, #0
|
||||
adds r0, #0x7a
|
||||
ldrh r0, [r0]
|
||||
movs r1, #0x3c
|
||||
bl __divsi3
|
||||
movs r1, #0x1e
|
||||
subs r1, r1, r0
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x3d
|
||||
strb r1, [r0]
|
||||
ldrb r1, [r5, #0xb]
|
||||
subs r0, #1
|
||||
strb r1, [r0]
|
||||
ldr r0, [r5, #0x64]
|
||||
ldr r2, [r0, #0x14]
|
||||
ldrh r1, [r2, #0x2e]
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x40
|
||||
strh r1, [r0]
|
||||
ldrh r0, [r2, #0x32]
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x42
|
||||
strh r0, [r1]
|
||||
ldr r0, [r2, #0x64]
|
||||
ldr r3, [r0, #0x14]
|
||||
cmp r3, #0
|
||||
beq _08043E58
|
||||
ldrh r1, [r3, #0x2e]
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x44
|
||||
strh r1, [r0]
|
||||
ldrh r1, [r3, #0x32]
|
||||
adds r0, #2
|
||||
strh r1, [r0]
|
||||
b _08043E70
|
||||
.align 2, 0
|
||||
_08043E48: .4byte gPlayerState
|
||||
_08043E4C: .4byte gRoomControls
|
||||
_08043E50: .4byte gUnk_080D13EC
|
||||
_08043E54: .4byte gScreenTransition
|
||||
_08043E58:
|
||||
movs r1, #0x88
|
||||
lsls r1, r1, #1
|
||||
adds r0, r1, #0
|
||||
ldrh r3, [r6, #6]
|
||||
adds r0, r0, r3
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x44
|
||||
strh r0, [r1]
|
||||
ldrh r0, [r6, #8]
|
||||
adds r0, #0x60
|
||||
adds r1, #2
|
||||
strh r0, [r1]
|
||||
_08043E70:
|
||||
ldr r0, [r2, #0x64]
|
||||
ldr r3, [r0, #0x18]
|
||||
cmp r3, #0
|
||||
beq _08043E90
|
||||
ldr r1, _08043E8C @ =gScreenTransition
|
||||
ldrh r2, [r3, #0x2e]
|
||||
adds r0, r1, #0
|
||||
adds r0, #0x48
|
||||
strh r2, [r0]
|
||||
ldrh r0, [r3, #0x32]
|
||||
adds r1, #0x4a
|
||||
strh r0, [r1]
|
||||
b _08043EAC
|
||||
.align 2, 0
|
||||
_08043E8C: .4byte gScreenTransition
|
||||
_08043E90:
|
||||
ldr r2, _08043EB0 @ =gScreenTransition
|
||||
ldr r3, _08043EB4 @ =gRoomControls
|
||||
movs r1, #0x88
|
||||
lsls r1, r1, #1
|
||||
adds r0, r1, #0
|
||||
ldrh r1, [r3, #6]
|
||||
adds r0, r0, r1
|
||||
adds r1, r2, #0
|
||||
adds r1, #0x48
|
||||
strh r0, [r1]
|
||||
ldrh r0, [r3, #8]
|
||||
adds r0, #0x60
|
||||
adds r2, #0x4a
|
||||
strh r0, [r2]
|
||||
_08043EAC:
|
||||
pop {r4, r5, r6, pc}
|
||||
.align 2, 0
|
||||
_08043EB0: .4byte gScreenTransition
|
||||
_08043EB4: .4byte gRoomControls
|
||||
.syntax divided
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
.syntax unified
|
||||
push {r4, r5, r6, r7, lr}
|
||||
adds r4, r0, #0
|
||||
ldrb r0, [r4, #0xb]
|
||||
lsls r1, r0, #2
|
||||
adds r1, r1, r0
|
||||
lsls r1, r1, #1
|
||||
ldr r0, _08044070 @ =gUnk_080D1400
|
||||
movs r3, #0
|
||||
ldr r2, _08044074 @ =gUnk_080D1414
|
||||
mov ip, r2
|
||||
movs r7, #8
|
||||
rsbs r7, r7, #0
|
||||
adds r5, r1, r0
|
||||
movs r6, #0x18
|
||||
_0804401C:
|
||||
ldr r0, [r4, #0x64]
|
||||
lsls r1, r3, #2
|
||||
adds r0, r0, r1
|
||||
ldr r2, [r0]
|
||||
ldrb r1, [r2, #0x10]
|
||||
movs r0, #0x80
|
||||
orrs r0, r1
|
||||
strb r0, [r2, #0x10]
|
||||
adds r2, #0x29
|
||||
ldrb r1, [r2]
|
||||
adds r0, r7, #0
|
||||
ands r0, r1
|
||||
movs r1, #4
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
ldr r1, [r4, #0x64]
|
||||
adds r1, r1, r6
|
||||
ldrh r0, [r5]
|
||||
strh r0, [r1]
|
||||
movs r0, #0x80
|
||||
lsls r0, r0, #7
|
||||
strh r0, [r1, #4]
|
||||
mov r2, ip
|
||||
adds r0, r3, r2
|
||||
ldrb r0, [r0]
|
||||
strb r0, [r1, #0xc]
|
||||
adds r5, #2
|
||||
adds r6, #0x10
|
||||
adds r3, #1
|
||||
cmp r3, #4
|
||||
bls _0804401C
|
||||
adds r0, r4, #0
|
||||
movs r1, #7
|
||||
bl InitAnimationForceUpdate
|
||||
ldr r1, [r4, #0x64]
|
||||
ldr r0, [r1, #0x14]
|
||||
ldr r1, [r1, #0x10]
|
||||
bl CopyPosition
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
_08044070: .4byte gUnk_080D1400
|
||||
_08044074: .4byte gUnk_080D1414
|
||||
.syntax divided
|
||||
3745
asm/vaatiArm.s
3745
asm/vaatiArm.s
File diff suppressed because it is too large
Load Diff
|
|
@ -1,193 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_080D1230:: @ 080D1230
|
||||
.4byte sub_08042570
|
||||
.4byte sub_08042588
|
||||
.4byte sub_08001324
|
||||
.4byte sub_0804A7D4
|
||||
.4byte sub_08001242
|
||||
.4byte nullsub_170
|
||||
|
||||
gUnk_080D1248:: @ 080D1248
|
||||
.4byte sub_0804259C
|
||||
.4byte sub_08044078
|
||||
.4byte sub_08044078
|
||||
.4byte sub_08044078
|
||||
.4byte sub_080440CC
|
||||
|
||||
gUnk_080D125C:: @ 080D125C
|
||||
.4byte sub_080425B4
|
||||
.4byte sub_08042654
|
||||
.4byte sub_08042818
|
||||
.4byte sub_08042870
|
||||
.4byte sub_08042A3C
|
||||
.4byte sub_08042C14
|
||||
.4byte sub_0804325C
|
||||
.4byte sub_08043420
|
||||
.4byte sub_08043680
|
||||
|
||||
gUnk_080D1280:: @ 080D1280
|
||||
.incbin "baserom.gba", 0x0D1280, 0x0000004
|
||||
|
||||
gUnk_080D1284:: @ 080D1284
|
||||
.incbin "baserom.gba", 0x0D1284, 0x0000002
|
||||
|
||||
gUnk_080D1286:: @ 080D1286
|
||||
.incbin "baserom.gba", 0x0D1286, 0x000000A
|
||||
|
||||
gUnk_080D1290:: @ 080D1290
|
||||
.4byte sub_08042894
|
||||
.4byte sub_080428AC
|
||||
.4byte sub_080428FC
|
||||
.4byte sub_08042944
|
||||
.4byte sub_08042970
|
||||
.4byte sub_080429D4
|
||||
.4byte sub_080429FC
|
||||
|
||||
gUnk_080D12AC:: @ 080D12AC
|
||||
.incbin "baserom.gba", 0x0D12AC, 0x0000004
|
||||
|
||||
gUnk_080D12B0:: @ 080D12B0
|
||||
.incbin "baserom.gba", 0x0D12B0, 0x0000002
|
||||
|
||||
gUnk_080D12B2:: @ 080D12B2
|
||||
.incbin "baserom.gba", 0x0D12B2, 0x0000002
|
||||
|
||||
gUnk_080D12B4:: @ 080D12B4
|
||||
.incbin "baserom.gba", 0x0D12B4, 0x0000002
|
||||
|
||||
gUnk_080D12B6:: @ 080D12B6
|
||||
.incbin "baserom.gba", 0x0D12B6, 0x0000002
|
||||
|
||||
gUnk_080D12B8:: @ 080D12B8
|
||||
.4byte sub_08042A6C
|
||||
.4byte sub_08042A88
|
||||
.4byte sub_08042AEC
|
||||
.4byte sub_08042B20
|
||||
|
||||
gUnk_080D12C8:: @ 080D12C8
|
||||
.incbin "baserom.gba", 0x0D12C8, 0x0000002
|
||||
|
||||
gUnk_080D12CA:: @ 080D12CA
|
||||
.incbin "baserom.gba", 0x0D12CA, 0x0000006
|
||||
|
||||
gUnk_080D12D0:: @ 080D12D0
|
||||
.4byte sub_08042C34
|
||||
.4byte sub_08042D24
|
||||
.4byte sub_08042D6C
|
||||
.4byte sub_08042E30
|
||||
.4byte sub_08042EF4
|
||||
.4byte sub_08042FD8
|
||||
.4byte sub_08043048
|
||||
.4byte sub_080430D0
|
||||
.4byte sub_08043130
|
||||
.4byte sub_080431E8
|
||||
|
||||
gUnk_080D12F8:: @ 080D12F8
|
||||
.incbin "baserom.gba", 0x0D12F8, 0x0000006
|
||||
|
||||
gUnk_080D12FE:: @ 080D12FE
|
||||
.incbin "baserom.gba", 0x0D12FE, 0x0000002
|
||||
|
||||
gUnk_080D1300:: @ 080D1300
|
||||
.incbin "baserom.gba", 0x0D1300, 0x0000004
|
||||
|
||||
gUnk_080D1304:: @ 080D1304
|
||||
.incbin "baserom.gba", 0x0D1304, 0x0000008
|
||||
|
||||
gUnk_080D130C:: @ 080D130C
|
||||
.incbin "baserom.gba", 0x0D130C, 0x0000001
|
||||
|
||||
gUnk_080D130D:: @ 080D130D
|
||||
.incbin "baserom.gba", 0x0D130D, 0x0000003
|
||||
|
||||
gUnk_080D1310:: @ 080D1310
|
||||
.incbin "baserom.gba", 0x0D1310, 0x0000004
|
||||
|
||||
gUnk_080D1314:: @ 080D1314
|
||||
.4byte sub_080432A8
|
||||
|
||||
gUnk_080D1318:: @ 080D1318
|
||||
.4byte sub_0804334C
|
||||
|
||||
gUnk_080D131C:: @ 080D131C
|
||||
.incbin "baserom.gba", 0x0D131C, 0x0000004
|
||||
|
||||
gUnk_080D1320:: @ 080D1320
|
||||
.4byte sub_08043440
|
||||
.4byte sub_08043490
|
||||
.4byte sub_08043520
|
||||
.4byte sub_0804355C
|
||||
.4byte sub_08043580
|
||||
.4byte sub_080435F4
|
||||
|
||||
gUnk_080D1338:: @ 080D1338
|
||||
.incbin "baserom.gba", 0x0D1338, 0x0000004
|
||||
|
||||
gUnk_080D133C:: @ 080D133C
|
||||
.incbin "baserom.gba", 0x0D133C, 0x0000004
|
||||
|
||||
gUnk_080D1340:: @ 080D1340
|
||||
.incbin "baserom.gba", 0x0D1340, 0x0000008
|
||||
|
||||
gUnk_080D1348:: @ 080D1348
|
||||
.4byte sub_08043698
|
||||
.4byte sub_080436C0
|
||||
.4byte sub_08043700
|
||||
.4byte sub_08043738
|
||||
.4byte sub_08043770
|
||||
|
||||
gUnk_080D135C:: @ 080D135C
|
||||
.incbin "baserom.gba", 0x0D135C, 0x0000006
|
||||
|
||||
gUnk_080D1362:: @ 080D1362
|
||||
.incbin "baserom.gba", 0x0D1362, 0x0000050
|
||||
|
||||
gUnk_080D13B2:: @ 080D13B2
|
||||
.incbin "baserom.gba", 0x0D13B2, 0x0000005
|
||||
|
||||
gUnk_080D13B7:: @ 080D13B7
|
||||
.incbin "baserom.gba", 0x0D13B7, 0x0000021
|
||||
|
||||
gUnk_080D13D8:: @ 080D13D8
|
||||
.incbin "baserom.gba", 0x0D13D8, 0x0000008
|
||||
|
||||
gUnk_080D13E0:: @ 080D13E0
|
||||
.incbin "baserom.gba", 0x0D13E0, 0x0000003
|
||||
|
||||
gUnk_080D13E3:: @ 080D13E3
|
||||
.incbin "baserom.gba", 0x0D13E3, 0x0000006
|
||||
|
||||
gUnk_080D13E9:: @ 080D13E9
|
||||
.incbin "baserom.gba", 0x0D13E9, 0x0000003
|
||||
|
||||
gUnk_080D13EC:: @ 080D13EC
|
||||
.incbin "baserom.gba", 0x0D13EC, 0x0000014
|
||||
|
||||
gUnk_080D1400:: @ 080D1400
|
||||
.incbin "baserom.gba", 0x0D1400, 0x000000D
|
||||
|
||||
gUnk_080D140D:: @ 080D140D
|
||||
.incbin "baserom.gba", 0x0D140D, 0x0000005
|
||||
|
||||
gUnk_080D1412:: @ 080D1412
|
||||
.incbin "baserom.gba", 0x0D1412, 0x0000002
|
||||
|
||||
gUnk_080D1414:: @ 080D1414
|
||||
.incbin "baserom.gba", 0x0D1414, 0x0000003
|
||||
|
||||
gUnk_080D1417:: @ 080D1417
|
||||
.incbin "baserom.gba", 0x0D1417, 0x0000001
|
||||
|
||||
gUnk_080D1418:: @ 080D1418
|
||||
.incbin "baserom.gba", 0x0D1418, 0x0000001
|
||||
|
||||
gUnk_080D1419:: @ 080D1419
|
||||
.incbin "baserom.gba", 0x0D1419, 0x0000003
|
||||
|
||||
gUnk_080D141C:: @ 080D141C
|
||||
.incbin "baserom.gba", 0x0D141C, 0x0000002
|
||||
|
|
@ -55,7 +55,10 @@ typedef struct {
|
|||
u8 field_0x39;
|
||||
u16 field_0x3a;
|
||||
u8 field_0x3c;
|
||||
u8 filler[6];
|
||||
u8 field_0x3d;
|
||||
u16 field_0x3e;
|
||||
u16 field_0x40;
|
||||
u16 field_0x42;
|
||||
u16 field_0x44;
|
||||
u16 field_0x46;
|
||||
u16 field_0x48;
|
||||
|
|
|
|||
|
|
@ -425,7 +425,7 @@ SECTIONS {
|
|||
asm/vaatiTransfigured.o(.text);
|
||||
asm/enemy50.o(.text);
|
||||
asm/vaatiWrath.o(.text);
|
||||
asm/vaatiArm.o(.text);
|
||||
src/enemy/vaatiArm.o(.text);
|
||||
asm/dust.o(.text);
|
||||
src/enemy/vaatiBall.o(.text);
|
||||
src/enemy/slime.o(.text);
|
||||
|
|
@ -1133,7 +1133,7 @@ SECTIONS {
|
|||
data/const/enemy/enemy50.o(.rodata);
|
||||
data/const/enemy/vaatiWrath.o(.rodata);
|
||||
data/animations/enemy/vaatiWrath.o(.rodata);
|
||||
data/const/enemy/vaatiArm.o(.rodata);
|
||||
src/enemy/vaatiArm.o(.rodata);
|
||||
data/animations/enemy/vaatiArm.o(.rodata);
|
||||
data/const/enemy/dust.o(.rodata);
|
||||
data/const/enemy/vaatiBall.o(.rodata);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue