mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-08-25 15:26:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48 from AetiasHax/actor

Browse Source 
Decomp `00_Core/Actor/Actor`
This commit is contained in:
Aetias
2024-07-02 10:35:44 +02:00
committed by GitHub
parent 925505ed5d 26bcdcc2e1
commit 32c4725191
185 changed files with 13919 additions and 13024 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CONTRIBUTING.md
+1 -1
View File
@@ -122,7 +122,7 @@ Non-matching functions must be written as follows:
```cpp
#include "global.hpp"
NONMATCH void MyFunction() {
void NONMATCH(MyFunction)() {
#ifndef NONMATCHING
#include "../asm/path/to/asm.inc"
#else
asm/dtcm.s
+21 -38
View File
@@ -3260,15 +3260,9 @@ data_027e0d09:
.global data_027e0d0a
data_027e0d0a:
.space 0x2
.global data_027e0d0c
data_027e0d0c:
.space 0x4
.global data_027e0d10
data_027e0d10:
.space 0x4
.global data_027e0d14
data_027e0d14:
.space 0x4
.global gVec3p_ZERO
gVec3p_ZERO:
.space 0xc
.global data_027e0d18
data_027e0d18:
.space 0x4
@@ -3968,38 +3962,27 @@ data_027e0f88:
.global data_027e0f8c
data_027e0f8c:
.space 0x4
.global data_027e0f90
data_027e0f90:
.space 0x4
.global data_027e0f94
data_027e0f94:
.space 0x4
.global data_027e0f98
data_027e0f98:
.space 0x4
.global data_027e0f9c
data_027e0f9c:
.space 0x4
.global data_027e0fa0
data_027e0fa0:
.space 0x4
.global data_027e0fa4
data_027e0fa4:
.space 0x4
.global data_027e0fa8
data_027e0fa8:
.space 0x4
.global data_027e0fac
data_027e0fac:
.global gPlayer
gPlayer:
.space 0x4
.global gPlayerPos
gPlayerPos:
.space 0xc
.global gPlayerVel
gPlayerVel:
.space 0xc
.global gPlayerAngle
gPlayerAngle:
.space 0x2
.space 0x2
.global data_027e0fb0
data_027e0fb0:
.space 0x4
.global gItemManager
gItemManager:
.space 0x4
.global data_027e0fb8
data_027e0fb8:
.global gPlayerControl
gPlayerControl:
.space 0x4
.global gHealthManager
gHealthManager:
@@ -4010,8 +3993,8 @@ data_027e0fc0:
.global data_027e0fc4
data_027e0fc4:
.space 0x4
.global data_027e0fc8
data_027e0fc8:
.global gPlayerLink
gPlayerLink:
.space 0x4
.global data_027e0fcc
data_027e0fcc:
@@ -4031,8 +4014,8 @@ data_027e0fdc:
.global data_027e0fe0
data_027e0fe0:
.space 0x4
.global data_027e0fe4
data_027e0fe4:
.global gActorManager
gActorManager:
.space 0x4
.global data_027e0fe8
data_027e0fe8:
asm/itcm.inc
+2 -2
View File
@@ -1,5 +1,5 @@
#pragma once
.extern data_02050f54
.extern gSinCosTable
.extern data_02054f54
.extern data_02055058
.extern data_0205ada4
@@ -57,7 +57,7 @@
.extern _ZN10MapManager18func_ov00_020839d4Ev
.extern _ZN10MapManager18func_ov00_020839f8Ev
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_
.extern _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_
asm/itcm.s
+108 -108
View File
@@ -2097,9 +2097,9 @@ _01ff9bbc: .word 0x04000280
_01ff9bc0: .word 0x040002a8
arm_func_end func_01ff9b88
.global func_01ff9bc4
arm_func_start func_01ff9bc4
func_01ff9bc4: ; 0x01ff9bc4
.global Vec3p_Add
arm_func_start Vec3p_Add
Vec3p_Add: ; 0x01ff9bc4
ldr ip, [r0]
ldr r3, [r1]
add r3, ip, r3
@@ -2113,11 +2113,11 @@ func_01ff9bc4: ; 0x01ff9bc4
add r0, r3, r0
str r0, [r2, #8]
bx lr
arm_func_end func_01ff9bc4
arm_func_end Vec3p_Add
.global func_01ff9bf8
arm_func_start func_01ff9bf8
func_01ff9bf8: ; 0x01ff9bf8
.global Vec3p_Sub
arm_func_start Vec3p_Sub
Vec3p_Sub: ; 0x01ff9bf8
ldr ip, [r0]
ldr r3, [r1]
sub r3, ip, r3
@@ -2131,11 +2131,11 @@ func_01ff9bf8: ; 0x01ff9bf8
sub r0, r3, r0
str r0, [r2, #8]
bx lr
arm_func_end func_01ff9bf8
arm_func_end Vec3p_Sub
.global func_01ff9c2c
arm_func_start func_01ff9c2c
func_01ff9c2c: ; 0x01ff9c2c
.global Vec3p_Dot
arm_func_start Vec3p_Dot
Vec3p_Dot: ; 0x01ff9c2c
stmdb sp!, {r4, lr}
ldr r3, [r0, #4]
ldr r2, [r1, #4]
@@ -2151,11 +2151,11 @@ func_01ff9c2c: ; 0x01ff9c2c
mov r0, r0, lsr #0xc
orr r0, r0, r1, lsl #20
ldmia sp!, {r4, pc}
arm_func_end func_01ff9c2c
arm_func_end Vec3p_Dot
.global func_01ff9c68
arm_func_start func_01ff9c68
func_01ff9c68: ; 0x01ff9c68
.global Vec3p_Cross
arm_func_start Vec3p_Cross
Vec3p_Cross: ; 0x01ff9c68
stmdb sp!, {r4, r5, r6, r7, r8, lr}
ldmia r0, {r5, lr}
ldr r6, [r1, #8]
@@ -2189,11 +2189,11 @@ func_01ff9c68: ; 0x01ff9c68
orr r1, r1, r0, lsl #20
str r1, [r2, #8]
ldmia sp!, {r4, r5, r6, r7, r8, pc}
arm_func_end func_01ff9c68
arm_func_end Vec3p_Cross
.global func_01ff9cec
arm_func_start func_01ff9cec
func_01ff9cec: ; 0x01ff9cec
.global Vec3p_Length
arm_func_start Vec3p_Length
Vec3p_Length: ; 0x01ff9cec
ldr r1, [r0, #4]
ldr r2, [r0]
smull ip, r3, r1, r1
@@ -2220,11 +2220,11 @@ _01ff9d24:
.align 2, 0
_01ff9d44: .word 0x040002b0
_01ff9d48: .word 0x040002b4
arm_func_end func_01ff9cec
arm_func_end Vec3p_Length
.global func_01ff9d4c
arm_func_start func_01ff9d4c
func_01ff9d4c: ; 0x01ff9d4c
.global Vec3p_Normalize
arm_func_start Vec3p_Normalize
Vec3p_Normalize: ; 0x01ff9d4c
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, lr}
ldr r2, [r0, #4]
ldr r3, [r0]
@@ -2298,11 +2298,11 @@ _01ff9dc0:
_01ff9e58: .word 0x04000280
_01ff9e5c: .word 0x040002b4
_01ff9e60: .word 0x040002a0
arm_func_end func_01ff9d4c
arm_func_end Vec3p_Normalize
.global func_01ff9e64
arm_func_start func_01ff9e64
func_01ff9e64: ; 0x01ff9e64
.global Vec3p_Axpy
arm_func_start Vec3p_Axpy
Vec3p_Axpy: ; 0x01ff9e64
stmdb sp!, {r4, lr}
ldr r4, [r1]
ldr lr, [r2]
@@ -2326,11 +2326,11 @@ func_01ff9e64: ; 0x01ff9e64
add r0, ip, r0
str r0, [r3, #8]
ldmia sp!, {r4, pc}
arm_func_end func_01ff9e64
arm_func_end Vec3p_Axpy
.global func_01ff9ec0
arm_func_start func_01ff9ec0
func_01ff9ec0: ; 0x01ff9ec0
.global Vec3p_Distance
arm_func_start Vec3p_Distance
Vec3p_Distance: ; 0x01ff9ec0
stmdb sp!, {r4, lr}
ldr r3, [r0, #4]
ldr r2, [r1, #4]
@@ -2364,7 +2364,7 @@ _01ff9f14:
.align 2, 0
_01ff9f34: .word 0x040002b0
_01ff9f38: .word 0x040002b4
arm_func_end func_01ff9ec0
arm_func_end Vec3p_Distance
.global func_01ff9f3c
arm_func_start func_01ff9f3c
@@ -2498,9 +2498,9 @@ _01ffa0ec: .word 0xffffda4d
_01ffa0f0: .word data_02054f54
arm_func_end func_01ff9f3c
.global func_01ffa0f4
arm_func_start func_01ffa0f4
func_01ffa0f4: ; 0x01ffa0f4
.global Atan2
arm_func_start Atan2
Atan2: ; 0x01ffa0f4
stmdb sp!, {r4, lr}
cmp r0, #0
ble _01ffa188
@@ -2624,7 +2624,7 @@ _01ffa274:
ldmia sp!, {r4, pc}
.align 2, 0
_01ffa298: .word data_02055058
arm_func_end func_01ffa0f4
arm_func_end Atan2
.global func_01ffa29c
arm_func_start func_01ffa29c
@@ -4364,7 +4364,7 @@ func_01ffb7ec: ; 0x01ffb7ec
sub sp, sp, #0x30
ldrh r4, [sp, #0x58]
mov r10, r0
ldr lr, _01ffbbc8 ; =data_02050f54
ldr lr, _01ffbbc8 ; =gSinCosTable
mov r0, r4, asr #0x4
mov ip, r0, lsl #0x1
add r0, ip, #1
@@ -4436,7 +4436,7 @@ _01ffb848:
_01ffb90c:
add r0, sp, #0x24
add r1, sp, #0
bl func_01ff9c2c
bl Vec3p_Dot
movs r1, r0
beq _01ffb980
ldr r0, [r7]
@@ -4447,7 +4447,7 @@ _01ffb90c:
_01ffb934:
add r0, sp, #0x18
add r1, sp, #0
bl func_01ff9c2c
bl Vec3p_Dot
movs r1, r0
beq _01ffb980
ldr r0, [r7, #4]
@@ -4458,7 +4458,7 @@ _01ffb934:
_01ffb95c:
add r0, sp, #0xc
add r1, sp, #0
bl func_01ff9c2c
bl Vec3p_Dot
movs r1, r0
beq _01ffb980
ldr r0, [r7, #8]
@@ -4478,11 +4478,11 @@ _01ffb980:
mov r6, r0
add r0, sp, #0xc
add r1, sp, #0
bl func_01ff9c2c
bl Vec3p_Dot
mov r11, r0
add r0, sp, #0x18
add r1, sp, #0
bl func_01ff9c2c
bl Vec3p_Dot
smull r3, r2, r0, r6
adds r3, r3, #0x800
smull r1, r0, r11, r6
@@ -4508,11 +4508,11 @@ _01ffb9fc:
mov r6, r0
add r0, sp, #0xc
add r1, sp, #0
bl func_01ff9c2c
bl Vec3p_Dot
mov r11, r0
add r0, sp, #0x24
add r1, sp, #0
bl func_01ff9c2c
bl Vec3p_Dot
smull r3, r2, r0, r6
adds r3, r3, #0x800
smull r1, r0, r11, r6
@@ -4539,11 +4539,11 @@ _01ffba74:
mov r6, r0
add r0, sp, #0x18
add r1, sp, #0
bl func_01ff9c2c
bl Vec3p_Dot
mov r11, r0
add r0, sp, #0x24
add r1, sp, #0
bl func_01ff9c2c
bl Vec3p_Dot
smull r3, r2, r0, r6
adds r3, r3, #0x800
smull r1, r0, r11, r6
@@ -4591,7 +4591,7 @@ _01ffbafc:
beq _01ffbb74
add r0, sp, #0x24
add r1, sp, #0
bl func_01ff9c2c
bl Vec3p_Dot
ldr r1, [r7]
add r0, r1, r0
str r0, [r5]
@@ -4601,7 +4601,7 @@ _01ffbb74:
beq _01ffbb98
add r0, sp, #0x18
add r1, sp, #0
bl func_01ff9c2c
bl Vec3p_Dot
ldr r1, [r7, #4]
add r0, r1, r0
str r0, [r5, #4]
@@ -4612,14 +4612,14 @@ _01ffbb98:
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
add r0, sp, #0xc
add r1, sp, #0
bl func_01ff9c2c
bl Vec3p_Dot
ldr r1, [r7, #8]
add r0, r1, r0
str r0, [r5, #8]
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_01ffbbc8: .word data_02050f54
_01ffbbc8: .word gSinCosTable
arm_func_end func_01ffb7ec
.global func_01ffbbcc
@@ -4841,11 +4841,11 @@ func_01ffbe78: ; 0x01ffbe78
mov r0, lr
mov r2, lr
mov r1, r4
bl func_01ff9bc4
bl Vec3p_Add
add r0, sp, #0x20
mov r1, r4
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
ldr r2, [r4, #0xc]
ldr r1, [sp, #0x4c]
str r2, [sp]
@@ -4874,7 +4874,7 @@ func_01ffbe78: ; 0x01ffbe78
ldr r3, [r5, #8]
mov r2, r0
str r3, [sp, #0x1c]
bl func_01ff9bf8
bl Vec3p_Sub
ldr r1, [sp, #0x14]
mov r0, #1
str r1, [r5]
@@ -4906,10 +4906,10 @@ func_01ffbf5c: ; 0x01ffbf5c
add r2, sp, #0x30
mov r0, r9
mov r1, r3
bl func_01ff9bf8
bl Vec3p_Sub
add r0, sp, #0x30
mov r1, r0
bl func_01ff9c2c
bl Vec3p_Dot
smull r2, r1, r8, r8
adds r2, r2, #0x800
adc r1, r1, #0
@@ -5204,7 +5204,7 @@ _01ffc398:
ldr r0, [sp, #0x18]
mov r1, r3
add r2, sp, #0x248
bl func_01ff9bf8
bl Vec3p_Sub
mov r0, r5
ldr r3, [r0]
mov r1, r7
@@ -5778,7 +5778,7 @@ _01ffcab4:
add r0, sp, #0x194
add r1, sp, #0x188
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
cmp r11, #0
mov r7, #0
beq _01ffcd18
@@ -6149,7 +6149,7 @@ func_01ffd1e0: ; 0x01ffd1e0
ldr r8, [sp, #0x348]
ldr r7, [sp, #0x34c]
ldr r11, [sp, #0x354]
bl func_01ff9bf8
bl Vec3p_Sub
ldr r0, [sp, #0x350]
tst r0, #4
mvn r0, #0
@@ -6205,7 +6205,7 @@ func_01ffd1e0: ; 0x01ffd1e0
mov r0, r4
mov r1, r3
add r2, sp, #0x2b0
bl func_01ff9bf8
bl Vec3p_Sub
ldr r0, [sp, #0x14]
bl _ZN10MapManager17Get_MapData_Unk28Ev
str r0, [sp, #0x30]
@@ -6348,7 +6348,7 @@ _01ffd4e4:
ldr r0, [sp, #0x18]
mov r1, r9
add r2, sp, #0x278
bl func_01ff9bf8
bl Vec3p_Sub
mov r0, r5
ldr r3, [r0]
mov r1, r7
@@ -6469,7 +6469,7 @@ _01ffd678:
mov r0, r4
mov r1, r3
add r2, sp, #0x2b0
bl func_01ff9bf8
bl Vec3p_Sub
ldr r0, [sp, #0x24]
mov r5, #0
cmp r0, #0
@@ -6853,7 +6853,7 @@ _01ffdac4:
add r0, sp, #0x1f4
add r1, sp, #0x1e8
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
mov r0, #0
cmp r11, #0
str r0, [sp, #0x20]
@@ -6914,11 +6914,11 @@ _01ffdd50:
add r0, sp, #0x2c8
add r1, sp, #0x1dc
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
add r0, sp, #0x2c8
add r1, sp, #0x2bc
add r2, sp, #0x2b0
bl func_01ff9bf8
bl Vec3p_Sub
_01ffde00:
add r6, r6, #1
cmp r6, r7
@@ -6937,7 +6937,7 @@ _01ffde0c:
mov r0, r4
mov r1, r3
add r2, sp, #0x2b0
bl func_01ff9bf8
bl Vec3p_Sub
cmp r7, #0
mov r5, #0
ble _01ffdfa8
@@ -7092,7 +7092,7 @@ _01ffdfa8:
mov r1, r7
mov r2, r9
str r4, [sp, #0x31c]
bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
ldr r1, [sp, #0x1d4]
add r0, r0, r8
cmp r1, r0
@@ -7113,7 +7113,7 @@ _01ffdfa8:
add r0, sp, #0x1c4
add r1, sp, #0x1b8
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
ldr r0, [sp, #0x40]
add r3, sp, #0x7c
strh r0, [sp, #0x78]
@@ -7207,7 +7207,7 @@ func_01ffe1cc: ; 0x01ffe1cc
add r2, sp, #0x60
mov r0, r4
mov r1, r10
bl func_01ff9bf8
bl Vec3p_Sub
add r4, sp, #0x48
ldmia r10, {r0, r1, r2}
stmia r4, {r0, r1, r2}
@@ -7481,13 +7481,13 @@ func_01ffe61c: ; 0x01ffe61c
mov r1, r2
mov r7, r0
mov r5, r3
bl func_01ff9c2c
bl Vec3p_Dot
movs r4, r0
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, r6, r7, pc}
mov r0, r7
mov r1, r6
bl func_01ff9c2c
bl Vec3p_Dot
ldr r2, [r7, #0xc]
mov r1, r4
sub r0, r2, r0
@@ -7506,7 +7506,7 @@ func_01ffe668: ; 0x01ffe668
add r0, r10, #8
mov r9, r1
str r2, [sp]
bl func_01ff9c2c
bl Vec3p_Dot
ldr r2, [r10, #0x14]
ldr r1, [r9, #0xc]
sub r0, r0, r2
@@ -7529,7 +7529,7 @@ _01ffe6b0:
_01ffe6c8:
mov r1, r9
add r0, r4, r8, lsl #4
bl func_01ff9c2c
bl Vec3p_Dot
add r1, r10, r8, lsl #4
ldr r2, [r1, #0x24]
ldr r1, [r9, #0xc]
@@ -7597,7 +7597,7 @@ _01ffe750:
mla r0, r3, r1, r7
mla r1, r2, r1, r7
add r2, sp, #0x14
bl func_01ff9bf8
bl Vec3p_Sub
mov r0, r6, lsl #0x1
ldr r2, [r10, #0x48]
ldrh r1, [r10, r0]
@@ -7606,16 +7606,16 @@ _01ffe750:
mla r0, r1, r0, r2
add r2, sp, #8
mov r1, r9
bl func_01ff9bf8
bl Vec3p_Sub
add r0, sp, #0x14
add r1, sp, #8
bl func_01ff9c2c
bl Vec3p_Dot
mov r6, r0
cmp r6, #0
ble _01ffe868
add r0, sp, #0x14
mov r1, r0
bl func_01ff9c2c
bl Vec3p_Dot
cmp r6, r0
bgt _01ffe868
smull r1, r0, r5, r5
@@ -7649,7 +7649,7 @@ _01ffe874:
ldr r3, [r3, #8]
mov r1, r9
mla r0, r2, r0, r3
bl func_01ff9ec0
bl Vec3p_Distance
cmp r0, r8
movge r0, #0
blt _01ffe8c8
@@ -7738,7 +7738,7 @@ _01ffe954:
_01ffe9d4:
mov r0, r6
mov r1, r4
bl func_01ff9c2c
bl Vec3p_Dot
add r1, r7, r5, lsl #4
ldr r1, [r1, #0x24]
sub r0, r0, r1
@@ -7774,7 +7774,7 @@ func_01ffea18: ; 0x01ffea18
ldmeqia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
mov r1, r6
add r0, r7, #8
bl func_01ff9c2c
bl Vec3p_Dot
ldr r1, [r7, #0x14]
subs r0, r0, r1
addmi sp, sp, #0x18
@@ -7782,7 +7782,7 @@ func_01ffea18: ; 0x01ffea18
ldmmiia sp!, {r4, r5, r6, r7, r8, r9, r10, pc}
mov r1, r5
add r0, r7, #8
bl func_01ff9c2c
bl Vec3p_Dot
mov r1, r0
ldr r0, [r6, #0xc]
rsb r1, r1, #0
@@ -7830,7 +7830,7 @@ _01ffeab4:
str r0, [sp, #0x14]
add r1, sp, #0xc
add r0, r7, #8
bl func_01ff9c2c
bl Vec3p_Dot
ldr r2, [r7, #0x14]
ldr r1, [r6, #0xc]
sub r0, r0, r2
@@ -7844,7 +7844,7 @@ _01ffeab4:
_01ffeb5c:
mov r0, r10
mov r1, r8
bl func_01ff9c2c
bl Vec3p_Dot
add r1, r7, r9, lsl #4
ldr r2, [r1, #0x24]
ldr r1, [r6, #0xc]
@@ -7863,10 +7863,10 @@ _01ffeb5c:
mov r0, r3
mov r1, r5
mov r2, r3
bl func_01ff9bc4
bl Vec3p_Add
add r1, sp, #0
add r0, r7, #8
bl func_01ff9c2c
bl Vec3p_Dot
ldr r1, [r7, #0x14]
ldr r2, [r6, #0xc]
sub r0, r0, r1
@@ -7903,9 +7903,9 @@ func_01ffebe0: ; 0x01ffebe0
ldmia sp!, {r3, r4, pc}
arm_func_end func_01ffebe0
.global func_01ffec34
arm_func_start func_01ffec34
func_01ffec34: ; 0x01ffec34
.global _ZN8Cylinder8OverlapsEPS_
arm_func_start _ZN8Cylinder8OverlapsEPS_
_ZN8Cylinder8OverlapsEPS_: ; 0x01ffec34
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
@@ -7923,7 +7923,7 @@ func_01ffec34: ; 0x01ffec34
movle ip, #1
mov r0, ip
ldmia sp!, {r3, r4, r5, pc}
arm_func_end func_01ffec34
arm_func_end _ZN8Cylinder8OverlapsEPS_
.global func_01ffec78
arm_func_start func_01ffec78
@@ -7975,14 +7975,14 @@ _01ffecac:
str r4, [sp, #0x14]
str r4, [sp, #0x18]
str r4, [sp, #0x1c]
bl func_01ff9bf8
bl Vec3p_Sub
add r0, sp, #0x20
add r1, sp, #8
mov r2, r0
str r4, [sp, #8]
str r4, [sp, #0xc]
str r4, [sp, #0x10]
bl func_01ff9bc4
bl Vec3p_Add
add r0, sp, #4
add r1, r10, #0x44
add r2, sp, #0x2c
@@ -8598,7 +8598,7 @@ func_01fff510: ; 0x01fff510
mov r0, r5
mov r1, r3
add r2, sp, #0xc4
bl func_01ff9bf8
bl Vec3p_Sub
add r0, sp, #0x160
ldrh r0, [r0, #0x14]
str r0, [sp, #8]
@@ -9007,7 +9007,7 @@ func_01fffb4c: ; 0x01fffb4c
moveq r0, #0
ldmeqia sp!, {r3, pc}
mov r1, r0
bl func_01ff9d4c
bl Vec3p_Normalize
mov r0, #1
ldmia sp!, {r3, pc}
arm_func_end func_01fffb4c
@@ -9081,15 +9081,15 @@ func_01fffc44: ; 0x01fffc44
add r2, sp, #0xc
mov r5, r1
mov r4, r3
bl func_01ff9bf8
bl Vec3p_Sub
add r2, sp, #0
mov r0, r4
mov r1, r5
bl func_01ff9bf8
bl Vec3p_Sub
add r0, sp, #0xc
add r1, sp, #0
mov r2, r6
bl func_01ff9c68
bl Vec3p_Cross
mov r0, r6
bl func_01fffb4c
add sp, sp, #0x18
@@ -9104,13 +9104,13 @@ func_01fffc94: ; 0x01fffc94
add r2, sp, #0
mov r6, r0
mov r5, r1
bl func_01ff9c68
bl Vec3p_Cross
add r0, sp, #0
bl func_01ff9cec
bl Vec3p_Length
mov r4, r0
mov r0, r6
mov r1, r5
bl func_01ff9c2c
bl Vec3p_Dot
mov r1, r0
mov r0, r4
bl func_01ff9f3c
@@ -9129,9 +9129,9 @@ func_01fffcd8: ; 0x01fffcd8
_01fffce8: .word data_027e0fdc
arm_func_end func_01fffcd8
.global func_01fffcec
arm_func_start func_01fffcec
func_01fffcec: ; 0x01fffcec
.global _ZN11ItemManager21GetEquipItemUncheckedEi
arm_func_start _ZN11ItemManager21GetEquipItemUncheckedEi
_ZN11ItemManager21GetEquipItemUncheckedEi: ; 0x01fffcec
ldr r1, _01fffd00 ; =gItemManager
ldr r1, [r1]
ldr r1, [r1, #0xac]
@@ -9139,11 +9139,11 @@ func_01fffcec: ; 0x01fffcec
bx lr
.align 2, 0
_01fffd00: .word gItemManager
arm_func_end func_01fffcec
arm_func_end _ZN11ItemManager21GetEquipItemUncheckedEi
.global func_01fffd04
arm_func_start func_01fffd04
func_01fffd04: ; 0x01fffd04
.global _ZN5Actor13func_01fffd04Ei
arm_func_start _ZN5Actor13func_01fffd04Ei
_ZN5Actor13func_01fffd04Ei: ; 0x01fffd04
stmdb sp!, {r3, r4, r5, r6, r7, lr}
sub sp, sp, #0x60
mov r6, r0
@@ -9237,13 +9237,13 @@ _01fffdf4:
add r2, sp, #0x38
add r0, r6, #0xb8
add r1, r6, #0x48
bl func_01ff9bf8
bl Vec3p_Sub
mov r0, #0
str r0, [sp, #0x3c]
add r0, r6, #0x148
add r1, sp, #0x38
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
ldr r0, [r6, #0xb8]
str r0, [r6, #0x48]
ldr r0, [r6, #0xbc]
@@ -9277,7 +9277,7 @@ _01fffef8:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_01ffff04: .word gMapManager
arm_func_end func_01fffd04
arm_func_end _ZN5Actor13func_01fffd04Ei
.global func_01ffff08
arm_func_start func_01ffff08
asm/main/main_02000000.inc
+12 -12
View File
@@ -1,5 +1,13 @@
#pragma once
.extern Atan2
.extern Divide
.extern Vec3p_Add
.extern Vec3p_Cross
.extern Vec3p_Distance
.extern Vec3p_Dot
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Sub
.extern _ZN10MapManager18func_ov00_02082614Eii
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN10MapManager18func_ov00_02084740Ev
@@ -103,7 +111,6 @@
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d0c
.extern data_027e0d18
.extern data_027e0d28
.extern data_027e0d38
@@ -120,10 +127,7 @@
.extern data_027e0f80
.extern data_027e0f84
.extern data_027e0f8c
.extern data_027e0f94
.extern data_027e0fc8
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0ffc
.extern data_027e103c
.extern data_027e1054
@@ -274,15 +278,7 @@
.extern func_01ff9b24
.extern func_01ff9b4c
.extern func_01ff9b88
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_01ff9c68
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9ec0
.extern func_01ff9f3c
.extern func_01ffa0f4
.extern func_01ffa29c
.extern func_01ffa2dc
.extern func_01ffa34c
@@ -473,11 +469,15 @@
.extern func_ov16_021200fc
.extern func_ov16_02120130
.extern func_ov18_02169634
.extern gActorManager
.extern gAdventureFlags
.extern gHeap
.extern gItemManager
.extern gMapManager
.extern gOverlayManager
.extern gPlayerLink
.extern gPlayerPos
.extern gVec3p_ZERO
.extern gpBuildDate
.extern strcat
.extern strcpy
asm/main/main_02000000.s
+143 -143
View File
File diff suppressed because it is too large Load Diff
asm/main/main_0203e8a0.s
+4 -4
View File
@@ -8710,13 +8710,13 @@ func_02042f68: ; 0x02042f68
bx lr
arm_func_end func_02042f68
.global func_02042f74
arm_func_start func_02042f74
func_02042f74: ; 0x02042f74
.global abs
arm_func_start abs
abs: ; 0x02042f74
cmp r0, #0
rsblt r0, r0, #0
bx lr
arm_func_end func_02042f74
arm_func_end abs
.global func_02042f80
arm_func_start func_02042f80
asm/ov00/Actor/Actor.inc
+43 -44
View File
@@ -1,76 +1,75 @@
#pragma once
.extern Atan2
.extern Vec3p_Add
.extern Vec3p_Distance
.extern Vec3p_Length
.extern Vec3p_Sub
.extern _ZN10EquipSword12GetEquipRopeEv
.extern _ZN10MapManager18func_ov00_02083570Eii
.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10MapManager18func_ov00_02084c5cEii
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN10PlayerBase17EquipCollidesWithEP8Cylinderi
.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c398cEv
.extern _ZN12ActorManager18func_ov00_020c399cEv
.extern _ZN12ActorManager18func_ov00_020c39acEjPjb
.extern _ZN12ActorManager18func_ov00_020c398cEj
.extern _ZN12ActorManager18func_ov00_020c399cEjP8Cylinder
.extern _ZN12ActorManager18func_ov00_020c39acEjPKjb
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12TouchControl13func_0202b864EP5Vec3pic
.extern _ZN12TouchControl13func_0202b894EP5Vec3pic
.extern _ZN13PlayerControl13StopFollowingEv
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14EquipBoomerang8GetActorEv
.extern _ZN14PlayerLinkBase14GetGrabActorIdEv
.extern _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
.extern _ZN14PlayerLinkBase20GongoronCollidesWithEP8Cylinder
.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
.extern _ZN5Actor13func_01fffd04Ei
.extern _ZN8Cylinder8OverlapsEPS_
.extern _ZN9EquipRope18func_ov14_0213d420Ev
.extern _ZN9EquipRope18func_ov14_0213d440Ei
.extern _ZN9EquipRope18func_ov14_0213d480Ei
.extern _ZN9EquipRope18func_ov14_0213d81cEiP5Vec3p
.extern _ZN9EquipRope18func_ov14_0213d91cEi
.extern _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder
.extern _ZN9EquipRope18func_ov14_0213ddd4EP5Actor
.extern _ZN9EquipRope18func_ov14_0213defcEP5Actor
.extern _ZN9SysObjectdlEPv
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern data_02050f54
.extern abs
.extern data_02056be4
.extern data_02063e4c
.extern data_027e077c
.extern data_027e0c54
.extern data_027e0d0c
.extern data_027e0d3c
.extern gMapManager
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern data_027e0fe4
.extern data_027e103c
.extern data_ov00_020e9c88
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9cec
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern func_01ffbe34
.extern func_01ffec34
.extern func_01fffcec
.extern func_01fffd04
.extern func_0202b864
.extern func_0202b894
.extern func_0202d95c
.extern func_020313c8
.extern func_02042f74
.extern func_ov00_02079470
.extern func_ov00_0207a188
.extern func_ov00_0207a1c8
.extern func_ov00_0207b89c
.extern func_ov00_02087ef0
.extern func_ov00_020bc46c
.extern func_ov00_020bc7f8
.extern func_ov00_020bc854
.extern func_ov00_020bcc2c
.extern func_ov00_020bd304
.extern func_ov00_020bff70
.extern func_ov00_020c1500
.extern _ZN14PlayerLinkBase18func_ov00_020bd304Ev
.extern func_ov00_020c5924
.extern func_ov00_020c8398
.extern func_ov05_02103f4c
.extern func_ov14_0213d15c
.extern func_ov14_0213d420
.extern func_ov14_0213d440
.extern func_ov14_0213d480
.extern func_ov14_0213d81c
.extern func_ov14_0213d91c
.extern func_ov14_0213dadc
.extern func_ov14_0213ddd4
.extern func_ov14_0213defc
.extern gActorManager
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern gPlayer
.extern gPlayerAngle
.extern gPlayerControl
.extern gPlayerLink
.extern gPlayerPos
.extern gSinCosTable
.extern gVec3p_ZERO
asm/ov00/Actor/Actor.s
+237 -429
View File
File diff suppressed because it is too large Load Diff
asm/ov00/Actor/ActorManager.inc
+1 -1
View File
@@ -8,7 +8,7 @@
.extern data_027e077c
.extern gMapManager
.extern data_027e103c
.extern func_01ff9ec0
.extern Vec3p_Distance
.extern func_ov00_0208e72c
.extern func_ov00_0208e7a4
.extern func_ov00_0208f318
asm/ov00/Actor/ActorManager.s
+17 -17
View File
@@ -312,9 +312,9 @@ _020c37e0:
ldmia sp!, {r3, r4, r5, pc}
arm_func_end _ZN11FilterActor6FilterEP5Actor
.global _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
arm_func_start _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
_ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList: ; 0x020c37ec
.global _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
arm_func_start _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
_ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList: ; 0x020c37ec
stmdb sp!, {r4, r5, r6, r7, r8, lr}
movs r7, r2
mov r4, #0
@@ -361,7 +361,7 @@ _020c3880:
_020c388c:
mov r0, r4
ldmia sp!, {r4, r5, r6, r7, r8, pc}
arm_func_end _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
arm_func_end _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.global _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
arm_func_start _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
@@ -423,7 +423,7 @@ _020c3930:
bne _020c397c
mov r1, r7
add r0, r2, #0x48
bl func_01ff9ec0
bl Vec3p_Distance
cmp r0, r4
bge _020c397c
ldr r1, [r5]
@@ -439,29 +439,29 @@ _020c397c:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
arm_func_end _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.global _ZN12ActorManager18func_ov00_020c398cEv
arm_func_start _ZN12ActorManager18func_ov00_020c398cEv
_ZN12ActorManager18func_ov00_020c398cEv: ; 0x020c398c
.global _ZN12ActorManager18func_ov00_020c398cEj
arm_func_start _ZN12ActorManager18func_ov00_020c398cEj
_ZN12ActorManager18func_ov00_020c398cEj: ; 0x020c398c
ldr ip, _020c3998 ; =func_ov00_020c3f08
ldr r0, [r0, #0x14]
bx ip
.align 2, 0
_020c3998: .word func_ov00_020c3f08
arm_func_end _ZN12ActorManager18func_ov00_020c398cEv
arm_func_end _ZN12ActorManager18func_ov00_020c398cEj
.global _ZN12ActorManager18func_ov00_020c399cEv
arm_func_start _ZN12ActorManager18func_ov00_020c399cEv
_ZN12ActorManager18func_ov00_020c399cEv: ; 0x020c399c
.global _ZN12ActorManager18func_ov00_020c399cEjP8Cylinder
arm_func_start _ZN12ActorManager18func_ov00_020c399cEjP8Cylinder
_ZN12ActorManager18func_ov00_020c399cEjP8Cylinder: ; 0x020c399c
ldr ip, _020c39a8 ; =func_ov00_020c3f3c
ldr r0, [r0, #0x14]
bx ip
.align 2, 0
_020c39a8: .word func_ov00_020c3f3c
arm_func_end _ZN12ActorManager18func_ov00_020c399cEv
arm_func_end _ZN12ActorManager18func_ov00_020c399cEjP8Cylinder
.global _ZN12ActorManager18func_ov00_020c39acEjPjb
arm_func_start _ZN12ActorManager18func_ov00_020c39acEjPjb
_ZN12ActorManager18func_ov00_020c39acEjPjb: ; 0x020c39ac
.global _ZN12ActorManager18func_ov00_020c39acEjPKjb
arm_func_start _ZN12ActorManager18func_ov00_020c39acEjPKjb
_ZN12ActorManager18func_ov00_020c39acEjPKjb: ; 0x020c39ac
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x10
movs r8, r2
@@ -563,7 +563,7 @@ _020c3b20:
mov r0, r4
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
arm_func_end _ZN12ActorManager18func_ov00_020c39acEjPjb
arm_func_end _ZN12ActorManager18func_ov00_020c39acEjPKjb
.global _ZN12ActorManager18func_ov00_020c3b2cEPi
arm_func_start _ZN12ActorManager18func_ov00_020c3b2cEPi
asm/ov00/Item/ItemManager_func_ov00_020ad790.inc
+2 -2
View File
@@ -46,12 +46,12 @@ _020ad800:
cmp r0, #1
bhi _020ad874
_020ad840:
lda r0, data_027e0fc8
lda r0, gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _020ad860
mov r1, r5
bl func_ov00_020bbd80
bl _ZN14PlayerLinkBase18func_ov00_020bbd80Ei
cmp r0, #0
beq _020ad874
_020ad860:
asm/ov00/Map/MapManager.inc
+10 -10
View File
@@ -51,20 +51,20 @@
.extern data_027e0f70
.extern data_027e0f78
.extern data_027e0f7c
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fe4
.extern gPlayer
.extern gPlayerPos
.extern gActorManager
.extern data_027e0fe8
.extern data_027e103c
.extern data_ov00_020e24a4
.extern data_ov00_020eec68
.extern data_ov15_02190458
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern func_01ffbe78
.extern func_01ffe61c
.extern func_01fffb4c
@@ -153,7 +153,7 @@
.extern func_ov00_0209d6e8
.extern func_ov00_0209d71c
.extern func_ov00_020a5e9c
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020cfcec
asm/ov00/Map/MapManager.s
+74 -74
View File
@@ -388,7 +388,7 @@ _ZN10MapManager18func_ov00_02082538Ev: ; 0x02082538
addeq sp, sp, #0xc
addeq r0, r0, #0x1a0
ldmeqia sp!, {r3, r4, pc}
ldr r1, _02082590 ; =data_027e0f94
ldr r1, _02082590 ; =gPlayerPos
add r0, sp, #0
ldr r3, [r1]
ldr r2, [r1, #4]
@@ -399,7 +399,7 @@ _ZN10MapManager18func_ov00_02082538Ev: ; 0x02082538
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_02082590: .word data_027e0f94
_02082590: .word gPlayerPos
arm_func_end _ZN10MapManager18func_ov00_02082538Ev
.global _ZN10MapManager18func_ov00_02082594Ev
@@ -956,7 +956,7 @@ _02082bac:
ldr r0, _02082ce8 ; =data_027e0f64
ldr r0, [r0]
bl func_ov00_0208b13c
ldr r1, _02082cec ; =data_027e0fe4
ldr r1, _02082cec ; =gActorManager
mov r0, r6
ldr r4, [r1]
bl _ZN10MapManager18func_ov00_02082d08Ev
@@ -999,7 +999,7 @@ _02082bac:
mov r3, #0
strb ip, [r6, #0x1d]
blx func_ov04_021024c4
ldr r0, _02082cec ; =data_027e0fe4
ldr r0, _02082cec ; =gActorManager
ldrb r1, [r5, #0x12]
ldr r0, [r0]
blx func_ov04_02105578
@@ -1012,7 +1012,7 @@ _02082c90:
ldr r0, [r0]
bl _ZN14AdventureFlags18func_ov00_020976c8Ev
ldrb r1, [r5, #0x13]
ldr r0, _02082d00 ; =data_027e0f90
ldr r0, _02082d00 ; =gPlayer
mov r2, #0
strb r1, [r6, #0xc]
ldr r0, [r0]
@@ -1033,12 +1033,12 @@ _02082cd8:
_02082ce0: .word data_027e0d38
_02082ce4: .word gAdventureFlags
_02082ce8: .word data_027e0f64
_02082cec: .word data_027e0fe4
_02082cec: .word gActorManager
_02082cf0: .word data_027e0f68
_02082cf4: .word data_027e0f6c
_02082cf8: .word data_027e0f78
_02082cfc: .word data_027e103c
_02082d00: .word data_027e0f90
_02082d00: .word gPlayer
_02082d04: .word data_027e0c68
arm_func_end _ZN10MapManager18func_ov00_02082b3cEi
@@ -1324,7 +1324,7 @@ _ZN10MapManager18func_ov00_0208306cEv: ; 0x0208306c
add r0, r3, #2
cmp ip, r0
bne _02083138
ldr r1, _02083154 ; =data_027e0f94
ldr r1, _02083154 ; =gPlayerPos
add r0, sp, #4
ldr r2, [r1, #4]
ldr r3, [r1]
@@ -1370,7 +1370,7 @@ _02083138:
add sp, sp, #0x20
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02083154: .word data_027e0f94
_02083154: .word gPlayerPos
_02083158: .word data_027e0d38
arm_func_end _ZN10MapManager18func_ov00_0208306cEv
@@ -1392,7 +1392,7 @@ _ZN10MapManager18func_ov00_0208315cEPiS0_: ; 0x0208315c
add r1, r3, #2
cmp ip, r1
bne _02083220
ldr r1, _0208323c ; =data_027e0f94
ldr r1, _0208323c ; =gPlayerPos
ldr r3, [r1]
ldr r2, [r1, #4]
str r3, [sp, #0x10]
@@ -1436,7 +1436,7 @@ _02083220:
add sp, sp, #0x1c
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0208323c: .word data_027e0f94
_0208323c: .word gPlayerPos
_02083240: .word data_027e0d38
arm_func_end _ZN10MapManager18func_ov00_0208315cEPiS0_
@@ -1962,7 +1962,7 @@ _ZN10MapManager18func_ov00_020836dcEii: ; 0x020836dc
mov r4, r1
cmpne r2, #1
bne _02083718
ldr r0, _02083768 ; =data_027e0f94
ldr r0, _02083768 ; =gPlayerPos
ldr r2, [r0]
ldr r1, [r0, #4]
str r2, [sp]
@@ -1971,7 +1971,7 @@ _ZN10MapManager18func_ov00_020836dcEii: ; 0x020836dc
str r0, [sp, #8]
b _02083750
_02083718:
ldr r0, _0208376c ; =data_027e0fe4
ldr r0, _0208376c ; =gActorManager
mov r1, r2
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
@@ -1993,8 +1993,8 @@ _02083750:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_02083768: .word data_027e0f94
_0208376c: .word data_027e0fe4
_02083768: .word gPlayerPos
_0208376c: .word gActorManager
arm_func_end _ZN10MapManager18func_ov00_020836dcEii
.global _ZN10MapManager18func_ov00_02083770Eji
@@ -2050,7 +2050,7 @@ _ZN10MapManager18func_ov00_02083790Ei: ; 0x02083790
ldr r0, [r0]
mov r2, #0x10
bl func_ov00_02079898
ldr r0, _0208383c ; =data_027e0fe4
ldr r0, _0208383c ; =gActorManager
mov r1, r4
ldr r0, [r0]
mov r2, #1
@@ -2065,7 +2065,7 @@ _0208381c:
_02083830: .word data_027e0f64
_02083834: .word data_027e0d38
_02083838: .word data_027e0d3c
_0208383c: .word data_027e0fe4
_0208383c: .word gActorManager
arm_func_end _ZN10MapManager18func_ov00_02083790Ei
.global _ZN10MapManager18func_ov00_02083840Ei
@@ -2093,7 +2093,7 @@ _ZN10MapManager18func_ov00_02083840Ei: ; 0x02083840
mov r1, #0x10
ldr r0, [r0]
bl func_ov00_020798bc
ldr r0, _020838c4 ; =data_027e0fe4
ldr r0, _020838c4 ; =gActorManager
mov r1, r4
ldr r0, [r0]
mov r2, #0
@@ -2106,7 +2106,7 @@ _020838ac:
.align 2, 0
_020838bc: .word data_027e0f64
_020838c0: .word data_027e0d3c
_020838c4: .word data_027e0fe4
_020838c4: .word gActorManager
arm_func_end _ZN10MapManager18func_ov00_02083840Ei
.global _ZN10MapManager18func_ov00_020838c8Ei
@@ -2352,7 +2352,7 @@ _02083ab4:
ldr r3, [r5, #8]
add r2, sp, #0xc
str r3, [sp, #8]
bl func_01ff9bf8
bl Vec3p_Sub
ldr r0, [r6, #4]
ldr r1, [sp, #0x14]
bl _ZN7MapBase15GetClampedTileYEi
@@ -2679,9 +2679,9 @@ _ZN10MapManager16MapData_vfunc_68Ev: ; 0x02083ee0
ldmia sp!, {r3, pc}
arm_func_end _ZN10MapManager16MapData_vfunc_68Ev
.global _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
arm_func_start _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
_ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_: ; 0x02083ef8
.global _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
arm_func_start _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
_ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i: ; 0x02083ef8
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
add ip, sp, #0
@@ -2701,7 +2701,7 @@ _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_: ; 0x02083ef8
blx ip
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
arm_func_end _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
arm_func_end _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
.global _ZN10MapManager18func_ov00_02083f44EP5Vec3p
arm_func_start _ZN10MapManager18func_ov00_02083f44EP5Vec3p
@@ -2717,7 +2717,7 @@ _ZN10MapManager18func_ov00_02083f44EP5Vec3p: ; 0x02083f44
str lr, [sp]
str ip, [sp, #4]
str r4, [sp, #8]
bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
@@ -2802,11 +2802,11 @@ _ZN10MapManager18func_ov00_02084024EiP4AABB: ; 0x02084024
mov r0, r5
mov r2, r5
str r4, [sp, #8]
bl func_01ff9bc4
bl Vec3p_Add
add r0, r5, #0xc
mov r2, r0
add r1, sp, #0
bl func_01ff9bc4
bl Vec3p_Add
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, pc}
arm_func_end _ZN10MapManager18func_ov00_02084024EiP4AABB
@@ -3075,7 +3075,7 @@ _ZN10MapManager18func_ov00_0208433cEP5Vec3pi: ; 0x0208433c
add r0, sp, #0x10
add r1, sp, #4
mov r2, r0
bl func_01ff9bf8
bl Vec3p_Sub
ldr r1, [r5, #4]
add r0, sp, #0
add r2, sp, #0x10
@@ -3103,7 +3103,7 @@ _ZN10MapManager18func_ov00_0208439cEv: ; 0x0208439c
add r1, sp, #0
mov r0, r4
mov r2, r4
bl func_01ff9bc4
bl Vec3p_Add
mov r0, r5
mov r1, r4
mov r2, #1
@@ -3349,7 +3349,7 @@ _ZN10MapManager18func_ov00_02084700Ev: ; 0x02084700
ldreq r2, [r0, #0xc4]
cmp r2, #0x1b
bne _02084734
ldr r0, _0208473c ; =data_027e0fe4
ldr r0, _0208473c ; =gActorManager
ldr r0, [r0]
ldrb r0, [r0, #0x29]
cmp r0, #0
@@ -3358,7 +3358,7 @@ _02084734:
mov r0, r2
bx lr
.align 2, 0
_0208473c: .word data_027e0fe4
_0208473c: .word gActorManager
arm_func_end _ZN10MapManager18func_ov00_02084700Ev
.global _ZN10MapManager18func_ov00_02084740Ev
@@ -3374,7 +3374,7 @@ _ZN10MapManager18func_ov00_02084740Ev: ; 0x02084740
bl func_ov00_02078b40
cmp r0, #2
beq _020847a8
ldr r0, _020847d8 ; =data_027e0f94
ldr r0, _020847d8 ; =gPlayerPos
add r1, sp, #0
ldr r3, [r0]
ldr r2, [r0, #4]
@@ -3405,7 +3405,7 @@ _020847b4:
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020847d4: .word data_027e0d38
_020847d8: .word data_027e0f94
_020847d8: .word gPlayerPos
_020847dc: .word data_ov00_020d88f0
arm_func_end _ZN10MapManager18func_ov00_02084740Ev
@@ -3654,7 +3654,7 @@ _ZN10MapManager8SpawnNPCEP5Vec3pii: ; 0x02084a5c
mov r6, r1
mov r5, r2
mov r4, r3
bl func_ov00_020c1500
bl _ZN19Actor_UnkStruct_020C1Ev
mvn r1, #0
add r0, sp, #4
str r1, [sp, #0x20]
@@ -3681,7 +3681,7 @@ _02084ac0: .word 0x45564943
arm_func_start _ZN10MapManager18func_ov00_02084ac4Ej
_ZN10MapManager18func_ov00_02084ac4Ej: ; 0x02084ac4
stmdb sp!, {r3, lr}
ldr r0, _02084b00 ; =data_027e0fe4
ldr r0, _02084b00 ; =gActorManager
ldr r0, [r0]
bl _ZN12ActorManager13FindActorByIdEj
cmp r0, #0
@@ -3696,7 +3696,7 @@ _ZN10MapManager18func_ov00_02084ac4Ej: ; 0x02084ac4
moveq r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_02084b00: .word data_027e0fe4
_02084b00: .word gActorManager
_02084b04: .word 0x45564943
arm_func_end _ZN10MapManager18func_ov00_02084ac4Ej
@@ -3988,7 +3988,7 @@ _02084de4:
add r1, sp, #0x2c
mov r0, r3
mov r2, r3
bl func_01ff9bf8
bl Vec3p_Sub
ldr r0, _02084ea8 ; =data_ov00_020e2510
add r1, sp, #0x2c
add r2, sp, #0x14
@@ -4008,7 +4008,7 @@ _02084de4:
mov r3, r4
str r0, [r4, #8]
ldr r0, [sp, #4]
bl func_01ff9e64
bl Vec3p_Axpy
ldr r0, [sp, #4]
cmp r0, #0
addge sp, sp, #0x38
@@ -4024,7 +4024,7 @@ _02084de4:
mov r2, r4
mov r3, r4
str ip, [r4, #8]
bl func_01ff9e64
bl Vec3p_Axpy
mov r0, #1
add sp, sp, #0x38
ldmia sp!, {r4, pc}
@@ -4495,7 +4495,7 @@ _020854fc:
beq _0208555c
mov r1, r10
add r0, r5, #0x18
bl func_01ff9ec0
bl Vec3p_Distance
ldr r1, [r9]
mov r4, r0
cmp r4, r1
@@ -4788,7 +4788,7 @@ _020858f8:
bl _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
ldrb r3, [sp, #0x18]
ldrb r2, [sp, #0x19]
ldr r1, _02085a30 ; =data_027e0f94
ldr r1, _02085a30 ; =gPlayerPos
add r0, r3, #1
sub r7, r3, #1
str r0, [sp, #4]
@@ -4858,7 +4858,7 @@ _02085a20:
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02085a2c: .word data_027e0f64
_02085a30: .word data_027e0f94
_02085a30: .word gPlayerPos
arm_func_end _ZN10MapManager18func_ov00_020858b0Ev
.global _ZN10MapManager18func_ov00_02085a34Eii
@@ -5063,7 +5063,7 @@ _ZN10MapManager18func_ov00_02085c60Eiiii: ; 0x02085c60
mov r1, r4
mov r0, r3
mov r2, r3
bl func_01ff9bf8
bl Vec3p_Sub
mov r1, #0xc000
mov r2, #0
umull r5, r3, r11, r1
@@ -5075,12 +5075,12 @@ _ZN10MapManager18func_ov00_02085c60Eiiii: ; 0x02085c60
mov r5, r2, lsr #0xc
add r0, sp, #0x58
orr r5, r5, r1, lsl #20
bl func_01ff9cec
bl Vec3p_Length
cmp r0, r5
ble _02085d9c
add r0, sp, #0x58
mov r1, r0
bl func_01ff9d4c
bl Vec3p_Normalize
add r0, sp, #0x58
mov r1, r5
bl func_01fffbec
@@ -5093,7 +5093,7 @@ _ZN10MapManager18func_ov00_02085c60Eiiii: ; 0x02085c60
str r1, [sp, #0x90]
add r1, sp, #0x58
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
ldr r0, [sp, #0x8c]
ldr r1, [sp, #0x88]
str r0, [sp, #0x74]
@@ -5110,7 +5110,7 @@ _02085d9c:
str ip, [sp, #0x58]
str r5, [sp, #0x5c]
str r3, [sp, #0x60]
bl func_01ff9bf8
bl Vec3p_Sub
mov r1, r4, lsl #0xb
mov r0, #0x800
adds r2, r0, r11, lsl #11
@@ -5119,12 +5119,12 @@ _02085d9c:
adc r1, r1, #0
mov r5, r2, lsr #0xc
orr r5, r5, r1, lsl #20
bl func_01ff9cec
bl Vec3p_Length
cmp r0, r11
blt _02085e30
add r0, sp, #0x58
mov r1, r0
bl func_01ff9d4c
bl Vec3p_Normalize
add r0, sp, #0x58
mov r1, r5
bl func_01fffbec
@@ -5137,7 +5137,7 @@ _02085d9c:
str r2, [sp, #0x78]
add r1, sp, #0x58
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
_02085e30:
mov r4, #0
mov r0, r11, lsl #0x1
@@ -5173,14 +5173,14 @@ _02085e48:
str r2, [sp, #0x34]
ldr r2, [r9, #0x14]
str r2, [sp, #0x38]
bl func_01ff9d4c
bl Vec3p_Normalize
add r0, sp, #0x30
mov r1, r11
bl func_01fffbec
add r0, sp, #0x3c
add r1, sp, #0x30
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
ldr r1, [sp, #0x3c]
ldr r2, _02086040 ; =0x0000ffff
str r1, [r9]
@@ -5332,7 +5332,7 @@ _ZN10MapManager18func_ov00_02086044Eiii: ; 0x02086044
mov r0, r4
mov r1, r3
add r2, sp, #0x80
bl func_01ff9bf8
bl Vec3p_Sub
ldr r1, [r9]
mov r0, r10
bl _ZN10MapManager18func_ov00_020839d4Ev
@@ -5372,7 +5372,7 @@ _02086164:
ldr r0, [sp]
mov r1, r9
add r2, sp, #0x5c
bl func_01ff9bf8
bl Vec3p_Sub
ldr r1, [r9]
add r0, sp, #0x68
str r1, [sp, #0x28]
@@ -5468,14 +5468,14 @@ _020862d0:
stmia r3, {r0, r1, r2}
mov r0, r8
mov r1, r3
bl func_01ff9ec0
bl Vec3p_Distance
ldr r2, [sp, #0x158]
add r1, sp, #0x140
add r2, r2, r6
sub r6, r2, r0
mov r0, r8
mov r2, r1
bl func_01ff9bf8
bl Vec3p_Sub
add r0, sp, #0x140
bl func_01fffb4c
cmp r0, #0
@@ -5492,7 +5492,7 @@ _02086340:
add r1, sp, #0x140
mov r0, r8
mov r2, r5
bl func_01ff9bc4
bl Vec3p_Add
add r0, sp, #0x14c
add r3, sp, #0x128
ldmia r0, {r0, r1, r2}
@@ -5500,7 +5500,7 @@ _02086340:
add r2, sp, #0x134
mov r0, r7
mov r1, r3
bl func_01ff9bf8
bl Vec3p_Sub
add r0, sp, #0x134
bl func_01fffb4c
ldr r1, [sp, #0x134]
@@ -5538,7 +5538,7 @@ _020863a8:
beq _02086464
add r0, sp, #0x108
mov r1, r8
bl func_01ff9ec0
bl Vec3p_Distance
ldr r1, [sp, #0x120]
cmp r0, r1
bgt _02086464
@@ -5563,14 +5563,14 @@ _020863a8:
_02086464:
add r1, sp, #0x108
mov r0, r8
bl func_01ff9ec0
bl Vec3p_Distance
ldr r2, [sp, #0x120]
add r1, sp, #0x108
add r2, r2, r6
sub r6, r2, r0
mov r0, r8
mov r2, r1
bl func_01ff9bf8
bl Vec3p_Sub
add r0, sp, #0x108
bl func_01fffb4c
cmp r0, #0
@@ -5587,7 +5587,7 @@ _020864b0:
add r1, sp, #0x108
mov r0, r8
mov r2, r5
bl func_01ff9bc4
bl Vec3p_Add
add r0, sp, #0x114
add r3, sp, #0xf0
ldmia r0, {r0, r1, r2}
@@ -5597,7 +5597,7 @@ _020864b0:
str r0, [sp, #0xf4]
mov r0, r7
mov r1, r3
bl func_01ff9bf8
bl Vec3p_Sub
add r0, sp, #0xfc
bl func_01fffb4c
ldr r1, [sp, #0xfc]
@@ -5627,7 +5627,7 @@ _02086520:
str r2, [sp, #0xc8]
mov r0, r8
mov r2, r1
bl func_01ff9bf8
bl Vec3p_Sub
add r0, sp, #0xc0
add r3, sp, #0xb4
ldmia r0, {r0, r1, r2}
@@ -5990,7 +5990,7 @@ _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_: ; 0x02086a84
ldr r6, [sp, #0xa4]
ldr r5, [sp, #0xac]
ldr r4, [sp, #0xb0]
bl func_01ff9bf8
bl Vec3p_Sub
mov r0, r9
ldr r1, [r0]
ldr r1, [r1, #8]
@@ -6016,7 +6016,7 @@ _02086ae0:
stmia r3, {r0, r1, r2}
mov r0, r8
mov r1, r3
bl func_01ff9ec0
bl Vec3p_Distance
ldr r3, [sp, #0x74]
ldr r2, [sp, #0xa0]
add r1, sp, #0x68
@@ -6024,7 +6024,7 @@ _02086ae0:
sub r6, r2, r0
add r2, sp, #0x5c
mov r0, r8
bl func_01ff9bf8
bl Vec3p_Sub
add r0, sp, #0x5c
bl func_01fffb4c
cmp r0, #0
@@ -6041,7 +6041,7 @@ _02086b5c:
add r1, sp, #0x5c
mov r0, r8
mov r2, r5
bl func_01ff9bc4
bl Vec3p_Add
b _02086b98
_02086b7c:
add r0, sp, #0x78
@@ -6050,7 +6050,7 @@ _02086b7c:
add r1, sp, #0x78
mov r0, r7
mov r2, r5
bl func_01ff9bc4
bl Vec3p_Add
_02086b98:
add r0, sp, #0x68
add r3, sp, #0x44
@@ -6059,7 +6059,7 @@ _02086b98:
add r2, sp, #0x50
mov r0, r7
mov r1, r3
bl func_01ff9bf8
bl Vec3p_Sub
add r0, sp, #0x50
bl func_01fffb4c
ldr r1, [sp, #0x50]
@@ -6088,7 +6088,7 @@ _02086be4:
add r1, sp, #0x78
mov r0, r7
mov r2, r5
bl func_01ff9bc4
bl Vec3p_Add
add r0, sp, #0x30
add r3, sp, #0x24
ldmia r0, {r0, r1, r2}
@@ -6098,7 +6098,7 @@ _02086be4:
str r2, [sp, #0x28]
mov r0, r7
mov r2, r4
bl func_01ff9bf8
bl Vec3p_Sub
mov r0, r4
bl func_01fffb4c
add sp, sp, #0x84
@@ -6119,11 +6119,11 @@ _02086c64:
add r1, sp, #0x78
mov r2, r5
mov r0, r7
bl func_01ff9bc4
bl Vec3p_Add
mov r0, r7
add r1, sp, #0
mov r2, r4
bl func_01ff9bf8
bl Vec3p_Sub
mov r0, r4
bl func_01fffb4c
add sp, sp, #0x84
asm/ov00/Player/LinkStateBase.inc
+11 -11
View File
@@ -6,25 +6,25 @@
.extern _ZN11ItemManager22UpdateSwordShieldInUseEv
.extern _ZN13PlayerControl18_ZN13PlayerControl18func_ov00_020aeeacEvEv
.extern _ZN13PlayerControl18func_ov00_020af4a4Ev
.extern data_02050f54
.extern gSinCosTable
.extern data_027e0618
.extern data_027e0c68
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0e58
.extern data_027e0f64
.extern gAdventureFlags
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerPos
.extern gPlayerVel
.extern gPlayerAngle
.extern data_027e0fb0
.extern data_027e0fb8
.extern gPlayerControl
.extern data_027e0fcc
.extern data_027e0fd4
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern func_01ff9bf8
.extern func_01ffa0f4
.extern Vec3p_Sub
.extern Atan2
.extern func_01ffe468
.extern func_01fffcd8
.extern func_0202b154
@@ -48,7 +48,7 @@
.extern func_ov00_020bb5f0
.extern func_ov00_020bb810
.extern func_ov00_020bbbd0
.extern func_ov00_020bc46c
.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
.extern func_ov00_020bc48c
.extern func_ov00_020bc500
.extern func_ov00_020bc71c
@@ -58,7 +58,7 @@
.extern func_ov00_020bd3b0
.extern func_ov00_020c0d68
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020c3348
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern func_ov00_020c4048
asm/ov00/Player/LinkStateBase.s
+32 -32
View File
@@ -111,7 +111,7 @@ _020a8084:
_020a80c8:
cmp r4, #0
beq _020a80e8
ldr r0, _020a8104 ; =data_027e0fb8
ldr r0, _020a8104 ; =gPlayerControl
ldr r0, [r0]
bl _ZN13PlayerControl18func_ov00_020af4a4Ev
cmp r0, #0
@@ -127,7 +127,7 @@ _020a80f0:
_020a80f8: .word gAdventureFlags
_020a80fc: .word data_027e0c68
_020a8100: .word data_027e0f64
_020a8104: .word data_027e0fb8
_020a8104: .word gPlayerControl
arm_func_end _ZN13LinkStateBase8vfunc_24Ei
.global _ZN13LinkStateBase8vfunc_28Ev
@@ -292,11 +292,11 @@ _020a8234: .word func_ov00_020bbbd0
arm_func_start _ZN13LinkStateBase6TurnToEsii
_ZN13LinkStateBase6TurnToEsii: ; 0x020a8238
stmdb sp!, {r4, lr}
ldr r0, _020a8274 ; =data_027e0fac
ldr r0, _020a8274 ; =gPlayerAngle
mov r4, r2
mov r2, r3
bl func_0202b154
ldr r0, _020a8274 ; =data_027e0fac
ldr r0, _020a8274 ; =gPlayerAngle
ldr r1, _020a8278 ; =data_027e0fcc
ldrsh r3, [r0]
ldr r0, [r1]
@@ -307,7 +307,7 @@ _ZN13LinkStateBase6TurnToEsii: ; 0x020a8238
bl func_ov00_020b4558
ldmia sp!, {r4, pc}
.align 2, 0
_020a8274: .word data_027e0fac
_020a8274: .word gPlayerAngle
_020a8278: .word data_027e0fcc
arm_func_end _ZN13LinkStateBase6TurnToEsii
@@ -354,8 +354,8 @@ _ZN13LinkStateBase12ApplyImpulseEii: ; 0x020a82c4
mov r1, r1, lsr #0x10
mov r1, r1, asr #0x4
mov r4, r1, lsl #0x1
ldr r3, _020a8358 ; =data_027e0d0c
ldr lr, _020a835c ; =data_02050f54
ldr r3, _020a8358 ; =gVec3p_ZERO
ldr lr, _020a835c ; =gSinCosTable
mov r1, r4, lsl #0x1
ldrsh ip, [lr, r1]
add r1, r4, #1
@@ -387,8 +387,8 @@ _ZN13LinkStateBase12ApplyImpulseEii: ; 0x020a82c4
str r0, [r5, #0x28]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020a8358: .word data_027e0d0c
_020a835c: .word data_02050f54
_020a8358: .word gVec3p_ZERO
_020a835c: .word gSinCosTable
arm_func_end _ZN13LinkStateBase12ApplyImpulseEii
.global _ZN13LinkStateBase18func_ov00_020a8360Ei
@@ -399,7 +399,7 @@ _ZN13LinkStateBase18func_ov00_020a8360Ei: ; 0x020a8360
mov r5, r0
add r0, sp, #0
mov r4, r1
bl func_ov00_020c1500
bl _ZN19Actor_UnkStruct_020C1Ev
add r2, sp, #0
mov r0, r5
mov r1, r4
@@ -417,7 +417,7 @@ _ZN13LinkStateBase18func_ov00_020a8390EiPv: ; 0x020a8390
add r0, sp, #0xc
mov r6, r1
mov r5, r2
bl func_ov00_020c1500
bl _ZN19Actor_UnkStruct_020C1Ev
mvn r1, #0
add r0, sp, #0xc
str r1, [sp, #0x28]
@@ -465,7 +465,7 @@ _ZN13LinkStateBase18func_ov00_020a8390EiPv: ; 0x020a8390
add r3, sp, #0xc
str r4, [sp]
bl func_ov00_020c4048
ldr r0, _020a84b8 ; =data_027e0fe4
ldr r0, _020a84b8 ; =gActorManager
mov r1, r4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -487,7 +487,7 @@ _020a84a8:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020a84b4: .word data_027e0fe8
_020a84b8: .word data_027e0fe4
_020a84b8: .word gActorManager
arm_func_end _ZN13LinkStateBase18func_ov00_020a8390EiPv
.global _ZN13LinkStateBase18func_ov00_020a84bcEi
@@ -555,7 +555,7 @@ _ZN13LinkStateBase18func_ov00_020a853cEP5Vec3p: ; 0x020a853c
_020a8578:
ldr r4, [r4, #8]
mov r0, r4
bl func_ov00_020bc46c
bl _ZN14PlayerLinkBase19GetCurrentCharacterEv
mov r2, r0
add r1, sp, #0
mov r0, r4
@@ -728,7 +728,7 @@ _ZN13LinkStateBase18func_ov00_020a8704EPs: ; 0x020a8704
beq _020a876c
ldr r0, [r5, #0x64]
ldr r1, [r5, #0x6c]
bl func_01ffa0f4
bl Atan2
mov r5, r0, lsl #0x10
mov r0, r6
bl _ZN13LinkStateBase14GetPlayerAngleEv
@@ -754,7 +754,7 @@ _ZN13LinkStateBase18func_ov00_020a8774EP5Vec3pi: ; 0x020a8774
mov r1, r0
add r2, sp, #0
mov r0, r5
bl func_01ff9bf8
bl Vec3p_Sub
mov r0, r6
bl _ZN13LinkStateBase18func_ov00_020a8d40Ev
mov r1, r4, lsl #0x10
@@ -763,7 +763,7 @@ _ZN13LinkStateBase18func_ov00_020a8774EP5Vec3pi: ; 0x020a8774
ldr r0, [r0, #0x2c]
mov r2, r1, lsl #0x1
rsb lr, r0, #0
ldr r3, _020a8840 ; =data_02050f54
ldr r3, _020a8840 ; =gSinCosTable
add r1, r2, #1
mov r0, r2, lsl #0x1
ldrsh r2, [r3, r0]
@@ -785,7 +785,7 @@ _ZN13LinkStateBase18func_ov00_020a8774EP5Vec3pi: ; 0x020a8774
add r1, r2, r1
str r0, [sp]
str r1, [sp, #8]
bl func_01ffa0f4
bl Atan2
mov r0, r0, lsl #0x10
rsb r0, r4, r0, asr #16
mov r0, r0, lsl #0x10
@@ -797,7 +797,7 @@ _ZN13LinkStateBase18func_ov00_020a8774EP5Vec3pi: ; 0x020a8774
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020a8840: .word data_02050f54
_020a8840: .word gSinCosTable
arm_func_end _ZN13LinkStateBase18func_ov00_020a8774EP5Vec3pi
.global _ZN13LinkStateBase18func_ov00_020a8844EP5Vec3pbb
@@ -805,7 +805,7 @@ _020a8840: .word data_02050f54
_ZN13LinkStateBase18func_ov00_020a8844EP5Vec3pbb: ; 0x020a8844
stmdb sp!, {r4, r5, r6, lr}
sub sp, sp, #0x18
ldr r4, _020a8948 ; =data_027e0fb8
ldr r4, _020a8948 ; =gPlayerControl
mov r6, r0
ldr r0, [r4]
mov r5, r2
@@ -870,7 +870,7 @@ _020a8904:
add sp, sp, #0x18
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020a8948: .word data_027e0fb8
_020a8948: .word gPlayerControl
_020a894c: .word data_027e0618
_020a8950: .word data_027e0f64
arm_func_end _ZN13LinkStateBase18func_ov00_020a8844EP5Vec3pbb
@@ -1123,11 +1123,11 @@ _020a8bd4: .word data_027e0fcc
.global _ZN13LinkStateBase19GetCurrentCharacterEv
arm_func_start _ZN13LinkStateBase19GetCurrentCharacterEv
_ZN13LinkStateBase19GetCurrentCharacterEv: ; 0x020a8bd8
ldr ip, _020a8be4 ; =func_ov00_020bc46c
ldr ip, _020a8be4 ; =_ZN14PlayerLinkBase19GetCurrentCharacterEv
ldr r0, [r0, #8]
bx ip
.align 2, 0
_020a8be4: .word func_ov00_020bc46c
_020a8be4: .word _ZN14PlayerLinkBase19GetCurrentCharacterEv
arm_func_end _ZN13LinkStateBase19GetCurrentCharacterEv
.global _ZN13LinkStateBase20GetPlayerControlDataEv
@@ -1164,7 +1164,7 @@ _ZN13LinkStateBase25GetCurrentCharacterHealthEv: ; 0x020a8c14
stmdb sp!, {r4, lr}
ldr r4, [r0, #8]
mov r0, r4
bl func_ov00_020bc46c
bl _ZN14PlayerLinkBase19GetCurrentCharacterEv
mov r1, r0
mov r0, r4
bl func_ov00_020bc48c
@@ -1186,19 +1186,19 @@ _020a8c48: .word func_ov00_020b5268
.global _ZN13LinkStateBase12GetPlayerPosEv
arm_func_start _ZN13LinkStateBase12GetPlayerPosEv
_ZN13LinkStateBase12GetPlayerPosEv: ; 0x020a8c4c
ldr r0, _020a8c54 ; =data_027e0f94
ldr r0, _020a8c54 ; =gPlayerPos
bx lr
.align 2, 0
_020a8c54: .word data_027e0f94
_020a8c54: .word gPlayerPos
arm_func_end _ZN13LinkStateBase12GetPlayerPosEv
.global _ZN13LinkStateBase12GetPlayerVelEv
arm_func_start _ZN13LinkStateBase12GetPlayerVelEv
_ZN13LinkStateBase12GetPlayerVelEv: ; 0x020a8c58
ldr r0, _020a8c60 ; =data_027e0fa0
ldr r0, _020a8c60 ; =gPlayerVel
bx lr
.align 2, 0
_020a8c60: .word data_027e0fa0
_020a8c60: .word gPlayerVel
arm_func_end _ZN13LinkStateBase12GetPlayerVelEv
.global _ZN13LinkStateBase18func_ov00_020a8c64Ev
@@ -1215,10 +1215,10 @@ _020a8c74: .word data_027e0fd4
.global _ZN13LinkStateBase14GetPlayerAngleEv
arm_func_start _ZN13LinkStateBase14GetPlayerAngleEv
_ZN13LinkStateBase14GetPlayerAngleEv: ; 0x020a8c78
ldr r0, _020a8c80 ; =data_027e0fac
ldr r0, _020a8c80 ; =gPlayerAngle
bx lr
.align 2, 0
_020a8c80: .word data_027e0fac
_020a8c80: .word gPlayerAngle
arm_func_end _ZN13LinkStateBase14GetPlayerAngleEv
.global _ZN13LinkStateBase15GetPlayer_Unk18Ev
@@ -1244,14 +1244,14 @@ _020a8ca0: .word data_027e0fcc
.global _ZN13LinkStateBase12GetGrabActorEv
arm_func_start _ZN13LinkStateBase12GetGrabActorEv
_ZN13LinkStateBase12GetGrabActorEv: ; 0x020a8ca4
ldr r1, _020a8cbc ; =data_027e0fe4
ldr r1, _020a8cbc ; =gActorManager
ldr r2, [r0, #8]
ldr r0, [r1]
ldr ip, _020a8cc0 ; =_ZN12ActorManager8GetActorEP8ActorRef
add r1, r2, #0x3c
bx ip
.align 2, 0
_020a8cbc: .word data_027e0fe4
_020a8cbc: .word gActorManager
_020a8cc0: .word _ZN12ActorManager8GetActorEP8ActorRef
arm_func_end _ZN13LinkStateBase12GetGrabActorEv
asm/ov00/Player/LinkStateDamage.inc
+2 -2
View File
@@ -42,8 +42,8 @@
.extern data_ov00_020e9c88
.extern data_ov00_020eec68
.extern data_ov00_020eec9c
.extern func_01ff9bc4
.extern func_01ffa0f4
.extern Vec3p_Add
.extern Atan2
.extern func_02019534
.extern func_0201e388
.extern func_0202d95c
asm/ov00/Player/LinkStateDamage.s
+6 -6
View File
@@ -428,7 +428,7 @@ _020ac400:
bl _ZN13LinkStateBase12GetPlayerPosEv
add r1, r5, #0x34
add r2, sp, #8
bl func_01ff9bc4
bl Vec3p_Add
add r1, sp, #8
str r1, [sp]
mov r0, #1
@@ -861,7 +861,7 @@ _ZN15LinkStateDamage18func_ov00_020aca50Ev: ; 0x020aca50
bl _ZN13LinkStateBase12GetPlayerPosEv
add r2, sp, #0
add r1, r4, #0x1c
bl func_01ff9bc4
bl Vec3p_Add
add r0, r5, #0x3c
ldr r2, [r0]
add r1, sp, #0
@@ -965,7 +965,7 @@ _020acbb0:
str r0, [sp]
str r2, [sp, #4]
str r1, [sp, #8]
bl func_01ffa0f4
bl Atan2
mov r7, r0, lsl #0x10
mov r0, r6
mov r4, r7, asr #0x10
@@ -1049,7 +1049,7 @@ _020acce4:
str r1, [r0, #8]
ldr r0, [sp]
ldr r1, [sp, #8]
bl func_01ffa0f4
bl Atan2
mov r4, r0
mov r0, r6
bl _ZN13LinkStateBase14GetPlayerAngleEv
@@ -1141,7 +1141,7 @@ _020ace44:
mov r2, r0
add r1, sp, #0
mov r0, r4
bl func_01ff9bc4
bl Vec3p_Add
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
@@ -1173,7 +1173,7 @@ _ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi: ; 0x020ace90
str r1, [r0, #8]
ldr r0, [r6]
ldr r1, [r6, #8]
bl func_01ffa0f4
bl Atan2
mov r1, r0, lsl #0x10
mov r0, r5
mov r6, r1, asr #0x10
asm/ov00/Player/LinkStateFollow.inc
+3 -3
View File
@@ -11,9 +11,9 @@
.extern _ZN13PlayerControl13StopFollowingEv
.extern _ZN13PlayerControl18func_ov00_020af01cEPc
.extern gMapManager
.extern data_027e0fb8
.extern func_01ff9bf8
.extern func_01ff9cec
.extern gPlayerControl
.extern Vec3p_Sub
.extern Vec3p_Length
.extern func_01fffcd8
.extern func_0202b308
.extern func_0202d95c
asm/ov00/Player/LinkStateFollow.s
+6 -6
View File
@@ -42,11 +42,11 @@ _ZN15LinkStateFollow16MoveTowardTargetEv: ; 0x020a8f80
mov r1, r0
add r2, sp, #0
add r0, r4, #0x18
bl func_01ff9bf8
bl Vec3p_Sub
mov r1, #0
add r0, sp, #0
str r1, [sp, #4]
bl func_01ff9cec
bl Vec3p_Length
ldr r1, _020a9024 ; =0x00000155
cmp r0, r1
addlt sp, sp, #0xc
@@ -71,7 +71,7 @@ _ZN15LinkStateFollow12OnStateLeaveEi: ; 0x020a9028
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
bl _ZN13LinkStateBase12OnStateLeaveEi
ldr r0, _020a90a8 ; =data_027e0fb8
ldr r0, _020a90a8 ; =gPlayerControl
ldr r0, [r0]
ldrb r1, [r0, #0x80]
cmp r1, #0
@@ -102,7 +102,7 @@ _020a904c:
bl func_ov14_0214bd08
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020a90a8: .word data_027e0fb8
_020a90a8: .word gPlayerControl
_020a90ac: .word gMapManager
arm_func_end _ZN15LinkStateFollow12OnStateLeaveEi
@@ -189,7 +189,7 @@ _ZN15LinkStateFollow8vfunc_34EP5Vec3p: ; 0x020a915c
arm_func_start _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p
_ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p: ; 0x020a9180
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _020a9208 ; =data_027e0fb8
ldr r2, _020a9208 ; =gPlayerControl
mov r4, r1
ldr r3, [r2]
ldr r5, [r3, #0xa0]
@@ -224,7 +224,7 @@ _020a91f0:
moveq r0, #0
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020a9208: .word data_027e0fb8
_020a9208: .word gPlayerControl
_020a920c: .word gMapManager
arm_func_end _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p
asm/ov00/Player/LinkStateInteract.inc
+9 -9
View File
@@ -41,17 +41,17 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEi
.extern data_02050f54
.extern data_027e0d0c
.extern gSinCosTable
.extern gVec3p_ZERO
.extern gMapManager
.extern data_027e0fb8
.extern data_027e0fe4
.extern gPlayerControl
.extern gActorManager
.extern data_ov00_020eec9c
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9cec
.extern func_01ff9e64
.extern func_01ffa0f4
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Length
.extern Vec3p_Axpy
.extern Atan2
.extern func_01ffbe78
.extern func_01fffcd8
.extern func_0202bba8
asm/ov00/Player/LinkStateInteract.s
+62 -62
View File
@@ -280,7 +280,7 @@ _020aa590:
bl _ZN13LinkStateBase15ChangeLinkStateEi
b _020aa778
_020aa5a0:
ldr r0, _020aa78c ; =data_027e0fb8
ldr r0, _020aa78c ; =gPlayerControl
ldr r0, [r0]
bl _ZN13PlayerControl9SetUnk_80Ev
ldr r1, _020aa790 ; =data_ov00_020e592c
@@ -307,7 +307,7 @@ _020aa5d4:
bl func_ov00_020d7b20
ldr r0, [r4, #0x18]
ldr r1, [r4, #0x20]
bl func_01ffa0f4
bl Atan2
mov r5, r0
mov r0, r4
bl _ZN13LinkStateBase14GetPlayerAngleEv
@@ -327,7 +327,7 @@ _020aa634:
beq _020aa674
ldr r0, [r4, #0x18]
ldr r1, [r4, #0x20]
bl func_01ffa0f4
bl Atan2
mov r5, r0
mov r0, r4
bl _ZN13LinkStateBase14GetPlayerAngleEv
@@ -343,10 +343,10 @@ _020aa674:
bl _ZN13LinkStateBase15ChangeLinkStateEi
b _020aa778
_020aa684:
ldr r0, _020aa78c ; =data_027e0fb8
ldr r0, _020aa78c ; =gPlayerControl
ldr r0, [r0]
bl _ZN13PlayerControl9SetUnk_80Ev
ldr r0, _020aa7a8 ; =data_027e0fe4
ldr r0, _020aa7a8 ; =gActorManager
add r1, r4, #0x10
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -404,7 +404,7 @@ _020aa74c:
str r0, [r4, #0xc]
b _020aa778
_020aa75c:
ldr r0, _020aa78c ; =data_027e0fb8
ldr r0, _020aa78c ; =gPlayerControl
ldr r0, [r0]
bl _ZN13PlayerControl9SetUnk_80Ev
b _020aa778
@@ -419,14 +419,14 @@ _020aa778:
add sp, sp, #8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020aa78c: .word data_027e0fb8
_020aa78c: .word gPlayerControl
_020aa790: .word data_ov00_020e592c
_020aa794: .word data_ov00_020e593c
_020aa798: .word data_ov00_020eec9c
_020aa79c: .word 0x00000125
_020aa7a0: .word data_ov00_020e595c
_020aa7a4: .word data_ov00_020e594c
_020aa7a8: .word data_027e0fe4
_020aa7a8: .word gActorManager
_020aa7ac: .word data_ov00_020e5908
arm_func_end _ZN17LinkStateInteract12OnStateEnterEv
@@ -436,7 +436,7 @@ _ZN17LinkStateInteract12OnStateLeaveEi: ; 0x020aa7b0
stmdb sp!, {r4, lr}
mov r4, r0
bl _ZN13LinkStateBase12OnStateLeaveEi
ldr r0, _020aa814 ; =data_027e0fb8
ldr r0, _020aa814 ; =gPlayerControl
ldr r0, [r0]
ldrb r1, [r0, #0x80]
cmp r1, #0
@@ -460,7 +460,7 @@ _020aa7d4:
str r1, [r0, #4]
ldmia sp!, {r4, pc}
.align 2, 0
_020aa814: .word data_027e0fb8
_020aa814: .word gPlayerControl
arm_func_end _ZN17LinkStateInteract12OnStateLeaveEi
.global _ZN17LinkStateInteract18func_ov00_020aa818Ev
@@ -491,7 +491,7 @@ _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor: ; 0x020aa844
mov r1, r0
add r2, sp, #0x20
add r0, r4, #0x48
bl func_01ff9bf8
bl Vec3p_Sub
mov r0, r5
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrh r6, [r0]
@@ -503,7 +503,7 @@ _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor: ; 0x020aa844
mov r0, r1, asr #0x4
mov r0, r0, lsl #0x1
add r0, r0, #1
ldr r3, _020aabd0 ; =data_02050f54
ldr r3, _020aabd0 ; =gSinCosTable
mov r1, r0, lsl #0x1
ldrsh r1, [r3, r1]
ldrsh r9, [r3, r2]
@@ -714,7 +714,7 @@ _020aab34:
add sp, sp, #0x2c
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_020aabd0: .word data_02050f54
_020aabd0: .word gSinCosTable
_020aabd4: .word 0x00000155
arm_func_end _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
@@ -751,7 +751,7 @@ _020aac14:
sub r0, r0, #9
cmp r0, #1
bhi _020aacf4
ldr r1, _020ab3c0 ; =data_027e0d0c
ldr r1, _020ab3c0 ; =gVec3p_ZERO
mov r0, r4
ldr r2, [r1]
str r2, [r4, #0x18]
@@ -761,7 +761,7 @@ _020aac14:
str r1, [r4, #0x20]
bl _ZN13LinkStateBase14GetPlayerAngleEv
ldrh r1, [r0]
ldr r2, _020ab3c4 ; =data_02050f54
ldr r2, _020ab3c4 ; =gSinCosTable
ldr r0, _020ab3c8 ; =0x000004cd
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
@@ -807,14 +807,14 @@ _020aacf4:
bne _020aad64
cmp r6, #0
bne _020aad3c
ldr r0, _020ab3cc ; =data_027e0fb8
ldr r0, _020ab3cc ; =gPlayerControl
add r1, r4, #0x18
ldr r0, [r0]
bl _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p
cmp r0, #0
beq _020aad64
_020aad3c:
ldr r0, _020ab3cc ; =data_027e0fb8
ldr r0, _020ab3cc ; =gPlayerControl
mov r1, #0
ldr r2, [r0]
mov r0, #5
@@ -827,7 +827,7 @@ _020aad3c:
_020aad64:
cmp r6, #0
bne _020aad88
ldr r0, _020ab3cc ; =data_027e0fb8
ldr r0, _020ab3cc ; =gPlayerControl
mov r2, r5
ldr r0, [r0]
add r1, r4, #0x18
@@ -835,7 +835,7 @@ _020aad64:
cmp r0, #0
beq _020aadb0
_020aad88:
ldr r0, _020ab3cc ; =data_027e0fb8
ldr r0, _020ab3cc ; =gPlayerControl
mov r1, #0
ldr r2, [r0]
mov r0, #3
@@ -850,8 +850,8 @@ _020aadb0:
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, pc}
_020aadbc:
ldr r1, _020ab3cc ; =data_027e0fb8
ldr r0, _020ab3d0 ; =data_027e0fe4
ldr r1, _020ab3cc ; =gPlayerControl
ldr r0, _020ab3d0 ; =gActorManager
ldr r3, [r1]
ldr r0, [r0]
ldr r2, [r3, #0x84]
@@ -864,7 +864,7 @@ _020aadbc:
bne _020aae38
mov r0, r4
bl _ZN13LinkStateBase18func_ov00_020a8d40Ev
ldr r2, _020ab3cc ; =data_027e0fb8
ldr r2, _020ab3cc ; =gPlayerControl
ldr r1, [r0, #0xe0]
ldr r0, [r2]
bl _ZN13PlayerControl18func_ov00_020b0ad0EP5Actor
@@ -883,7 +883,7 @@ _020aae2c:
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, pc}
_020aae38:
ldr r0, _020ab3cc ; =data_027e0fb8
ldr r0, _020ab3cc ; =gPlayerControl
ldr r0, [r0]
ldrb r0, [r0, #0x80]
cmp r0, #0
@@ -891,7 +891,7 @@ _020aae38:
movne r0, #0
ldmneia sp!, {r4, r5, r6, r7, r8, pc}
_020aae54:
ldr r0, _020ab3cc ; =data_027e0fb8
ldr r0, _020ab3cc ; =gPlayerControl
cmp r5, #0
movne r2, #1
ldr r1, [r6, #0x12c]
@@ -900,7 +900,7 @@ _020aae54:
bl _ZN13PlayerControl18func_ov00_020afe88Eib
cmp r0, #0
bne _020aae90
ldr r0, _020ab3cc ; =data_027e0fb8
ldr r0, _020ab3cc ; =gPlayerControl
ldr r0, [r0]
bl _ZN13PlayerControl13StopFollowingEv
add sp, sp, #0xc8
@@ -918,7 +918,7 @@ _020aae90:
add r1, r6, #0x60
add r2, r6, #0x48
mov r0, #0x6000
bl func_01ff9e64
bl Vec3p_Axpy
mov r0, #0
ldr r1, _020ab3d4 ; =0x0000ffff
strh r0, [sp, #0x94]
@@ -976,7 +976,7 @@ _020aaf88:
mov r1, r0
add r0, sp, #0x5c
add r2, sp, #0x50
bl func_01ff9bf8
bl Vec3p_Sub
add r1, sp, #0x40
mov r0, r6
bl _ZN5Actor9GetHitboxEP8Cylinder
@@ -994,10 +994,10 @@ _020aafbc: ; jump table
b _020ab398 ; case 6
_020aafd8:
add r0, sp, #0x50
bl func_01ff9cec
bl Vec3p_Length
cmp r0, #0x800
bge _020aaff4
ldr r0, _020ab3cc ; =data_027e0fb8
ldr r0, _020ab3cc ; =gPlayerControl
ldr r0, [r0]
bl _ZN13PlayerControl9SetUnk_80Ev
_020aaff4:
@@ -1031,7 +1031,7 @@ _020ab000:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
_020ab060:
add r0, sp, #0x50
bl func_01ff9cec
bl Vec3p_Length
ldr r1, [sp, #0x4c]
mov r5, r0
add r0, r1, #0x3800
@@ -1039,7 +1039,7 @@ _020ab060:
bge _020ab1d8
ldr r0, [sp, #0x50]
ldr r1, [sp, #0x58]
bl func_01ffa0f4
bl Atan2
ldr r1, _020ab3dc ; =0x00001ccd
mov r0, r0, lsl #0x10
cmp r5, r1
@@ -1105,7 +1105,7 @@ _020ab160:
b _020ab1d8
_020ab170:
add r0, sp, #0x50
bl func_01ff9cec
bl Vec3p_Length
cmp r0, #0x4000
bge _020ab1d8
mov r0, r4
@@ -1113,8 +1113,8 @@ _020ab170:
mov r1, r0
add r0, r6, #0x48
add r2, r4, #0x18
bl func_01ff9bf8
ldr r0, _020ab3cc ; =data_027e0fb8
bl Vec3p_Sub
ldr r0, _020ab3cc ; =gPlayerControl
mov r1, #0
ldr r2, [r0]
strb r1, [r2, #0x79]
@@ -1136,7 +1136,7 @@ _020ab1d8:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
_020ab1e4:
add r0, sp, #0x50
bl func_01ff9cec
bl Vec3p_Length
cmp r0, #0x400
bge _020ab2a4
mov r0, r4
@@ -1144,7 +1144,7 @@ _020ab1e4:
mov r1, r0
add r0, sp, #0x40
add r2, sp, #0x34
bl func_01ff9bf8
bl Vec3p_Sub
ldr r0, [sp, #0x34]
cmp r0, #0
ldreq r0, [sp, #0x3c]
@@ -1152,7 +1152,7 @@ _020ab1e4:
beq _020ab278
ldr r0, [sp, #0x34]
ldr r1, [sp, #0x3c]
bl func_01ffa0f4
bl Atan2
mov r6, r0, lsl #0x10
mov r0, r6, asr #0x10
bl func_0202bbbc
@@ -1190,7 +1190,7 @@ _020ab2a4:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
_020ab2b0:
add r0, sp, #0x50
bl func_01ff9cec
bl Vec3p_Length
ldr r1, [sp, #0x4c]
add r1, r1, #0xc00
cmp r0, r1
@@ -1251,7 +1251,7 @@ _020ab38c:
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, pc}
_020ab398:
ldr r0, _020ab3cc ; =data_027e0fb8
ldr r0, _020ab3cc ; =gPlayerControl
ldr r0, [r0]
bl _ZN13PlayerControl13StopFollowingEv
add sp, sp, #0xc8
@@ -1263,11 +1263,11 @@ _020ab3b0:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_020ab3bc: .word gItemManager
_020ab3c0: .word data_027e0d0c
_020ab3c4: .word data_02050f54
_020ab3c0: .word gVec3p_ZERO
_020ab3c4: .word gSinCosTable
_020ab3c8: .word 0x000004cd
_020ab3cc: .word data_027e0fb8
_020ab3d0: .word data_027e0fe4
_020ab3cc: .word gPlayerControl
_020ab3d0: .word gActorManager
_020ab3d4: .word 0x0000ffff
_020ab3d8: .word gMapManager
_020ab3dc: .word 0x00001ccd
@@ -1379,7 +1379,7 @@ _020ab4ec:
mov r1, r1, asr #0x4
mov r5, r1, lsl #0x1
add r1, r5, #1
ldr ip, _020ab60c ; =data_02050f54
ldr ip, _020ab60c ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r3, [ip, r1]
ldr r6, _020ab610 ; =0x00000b33
@@ -1439,7 +1439,7 @@ _020ab604:
mov r0, #1
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_020ab60c: .word data_02050f54
_020ab60c: .word gSinCosTable
_020ab610: .word 0x00000b33
arm_func_end _ZN17LinkStateInteract8vfunc_34EP5Vec3p
@@ -1454,7 +1454,7 @@ _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p: ; 0x020ab614
movs ip, r0
addeq sp, sp, #0xc
ldmeqia sp!, {r4, r5, pc}
ldr r0, _020ab67c ; =data_027e0d0c
ldr r0, _020ab67c ; =gVec3p_ZERO
add r3, sp, #0
ldmia r0, {r0, r1, r2}
stmia r3, {r0, r1, r2}
@@ -1473,7 +1473,7 @@ _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p: ; 0x020ab614
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020ab67c: .word data_027e0d0c
_020ab67c: .word gVec3p_ZERO
arm_func_end _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
.global _ZN17LinkStateInteract15SetBombVelocityEP5Vec3p
@@ -1557,7 +1557,7 @@ _020ab76c: .word 0x54535542
arm_func_start _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p
_ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p: ; 0x020ab770
stmdb sp!, {r4, r5, r6, lr}
ldr r2, _020ab7b8 ; =data_027e0fb8
ldr r2, _020ab7b8 ; =gPlayerControl
mov r6, r0
ldr r0, [r2]
mov r5, r1
@@ -1577,7 +1577,7 @@ _020ab7b0:
ldr r0, [r4, #0x12c]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020ab7b8: .word data_027e0fb8
_020ab7b8: .word gPlayerControl
arm_func_end _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p
.global _ZN17LinkStateInteract18func_ov00_020ab7bcEP5Vec3pP5Actor
@@ -1615,13 +1615,13 @@ _020ab818:
bl _ZN13LinkStateBase12GetPlayerPosEv
add r2, sp, #0x10
mov r1, r5
bl func_01ff9bf8
bl Vec3p_Sub
ldr r1, [sp, #0xc]
ldr r0, [sp, #0x10]
add r2, r1, #0x66
ldr r1, [sp, #0x18]
add r4, r2, #0x600
bl func_01ffa0f4
bl Atan2
mov r0, r0, lsl #0x10
mov r0, r0, asr #0x10
bl func_0202bbbc
@@ -1672,7 +1672,7 @@ _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p: ; 0x020ab8cc
mov r1, r0
mov r0, r4
add r2, r5, #0x18
bl func_01ff9bf8
bl Vec3p_Sub
add r0, r5, #0x18
mov r2, r0
mov r1, #0x1000
@@ -1692,7 +1692,7 @@ _ZN17LinkStateInteract14SetThrowOffsetEP5Vec3p: ; 0x020ab908
mov r1, r0
mov r0, r4
add r2, r5, #0x18
bl func_01ff9bf8
bl Vec3p_Sub
mov r0, #3
str r0, [r5, #4]
ldmia sp!, {r3, r4, r5, pc}
@@ -1712,7 +1712,7 @@ _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p: ; 0x020ab934
mov r1, r0
mov r0, r4
add r2, r5, #0x18
bl func_01ff9bf8
bl Vec3p_Sub
mov r2, #3
mov r0, r5
mov r1, #2
@@ -1735,7 +1735,7 @@ _ZN17LinkStateInteract18func_ov00_020ab97cEP5Vec3p: ; 0x020ab97c
mov r1, r0
mov r0, r4
add r2, r5, #0x18
bl func_01ff9bf8
bl Vec3p_Sub
mov r0, #4
str r0, [r5, #4]
ldmia sp!, {r3, r4, r5, pc}
@@ -1765,7 +1765,7 @@ _ZN17LinkStateInteract18func_ov00_020ab9b8Ejb: ; 0x020ab9b8
bl _ZN13LinkStateBase12GetPlayerPosEv
add r2, sp, #0xc
add r1, r7, #0x18
bl func_01ff9bc4
bl Vec3p_Add
ldr r1, [r4, #4]
ldr r0, _020abb64 ; =0x424b4559
cmp r1, r0
@@ -1812,7 +1812,7 @@ _020aba70:
mla r0, r3, r2, r0
adds r1, r1, #0x800
add r5, ip, #1
ldr r6, _020abb70 ; =data_02050f54
ldr r6, _020abb70 ; =gSinCosTable
mov r3, ip, lsl #0x1
mov r2, r5, lsl #0x1
ldrsh r3, [r6, r3]
@@ -1859,7 +1859,7 @@ _020abb30:
_020abb64: .word 0x424b4559
_020abb68: .word 0x464f5243
_020abb6c: .word 0x0000028f
_020abb70: .word data_02050f54
_020abb70: .word gSinCosTable
_020abb74: .word data_ov00_020eec9c
arm_func_end _ZN17LinkStateInteract18func_ov00_020ab9b8Ejb
@@ -1976,7 +1976,7 @@ _ZN17LinkStateInteract18func_ov00_020abc78EP8ActorRef: ; 0x020abc78
beq _020abce0
cmp r0, #1
bne _020abcd8
ldr r0, _020abd6c ; =data_027e0fb8
ldr r0, _020abd6c ; =gPlayerControl
mov r1, #0
ldr r0, [r0]
strb r1, [r0, #0x79]
@@ -1986,7 +1986,7 @@ _020abcd8:
mov r0, #0
ldmia sp!, {r4, r5, r6, pc}
_020abce0:
ldr r0, _020abd70 ; =data_027e0fe4
ldr r0, _020abd70 ; =gActorManager
mov r1, r4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -2022,8 +2022,8 @@ _020abce0:
mov r0, #1
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020abd6c: .word data_027e0fb8
_020abd70: .word data_027e0fe4
_020abd6c: .word gPlayerControl
_020abd70: .word gActorManager
_020abd74: .word data_ov00_020eec9c
arm_func_end _ZN17LinkStateInteract18func_ov00_020abc78EP8ActorRef
asm/ov00/Player/LinkStateItem.inc
+2 -2
View File
@@ -5,11 +5,11 @@
.extern _ZN13LinkStateBase8vfunc_34EP5Vec3p
.extern _ZN13PlayerControl13StopFollowingEv
.extern gAdventureFlags
.extern data_027e0fb8
.extern gPlayerControl
.extern data_027e103c
.extern data_027e1098
.extern func_01fffcd8
.extern func_01fffcec
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern func_ov00_020b7e6c
.extern func_ov00_020cf01c
asm/ov00/Player/LinkStateItem.s
+4 -4
View File
@@ -145,7 +145,7 @@ _020abf0c:
cmp r6, r4
bne _020abf0c
_020abf20:
ldr r0, _020abf4c ; =data_027e0fb8
ldr r0, _020abf4c ; =gPlayerControl
ldr r0, [r0]
ldrb r1, [r0, #0x80]
cmp r1, #0
@@ -158,17 +158,17 @@ _020abf38:
.align 2, 0
_020abf44: .word data_027e103c
_020abf48: .word data_027e1098
_020abf4c: .word data_027e0fb8
_020abf4c: .word gPlayerControl
arm_func_end _ZN13LinkStateItem12OnStateLeaveEi
.global _ZN13LinkStateItem15GetEquipBombchuEv
arm_func_start _ZN13LinkStateItem15GetEquipBombchuEv
_ZN13LinkStateItem15GetEquipBombchuEv: ; 0x020abf50
ldr ip, _020abf5c ; =func_01fffcec
ldr ip, _020abf5c ; =_ZN11ItemManager21GetEquipItemUncheckedEi
mov r0, #7
bx ip
.align 2, 0
_020abf5c: .word func_01fffcec
_020abf5c: .word _ZN11ItemManager21GetEquipItemUncheckedEi
arm_func_end _ZN13LinkStateItem15GetEquipBombchuEv
.global _ZN13LinkStateItem16GetLinkStateMoveEv
asm/ov00/Player/LinkStateRoll.inc
+2 -2
View File
@@ -24,10 +24,10 @@
.extern _ZN13PlayerControl18_ZN13PlayerControl18func_ov00_020aeeacEvEv
.extern _ZN13PlayerControl18func_ov00_020b034cEv
.extern _ZN13PlayerControl18func_ov00_020b12d0EPs
.extern data_02050f54
.extern gSinCosTable
.extern data_027e0618
.extern data_027e0e58
.extern data_027e0fb8
.extern gPlayerControl
.extern data_ov00_020eec9c
.extern func_ov00_0207c39c
.extern func_ov00_0207c444
asm/ov00/Player/LinkStateRoll.s
+8 -8
View File
@@ -69,7 +69,7 @@ _020ae7e8:
mov r1, r5, asr #0x4
mov r2, r1, lsl #0x1
mov r6, r2, lsl #0x1
ldr r5, _020aeb10 ; =data_02050f54
ldr r5, _020aeb10 ; =gSinCosTable
add r2, r2, #1
mov r2, r2, lsl #0x1
ldrsh lr, [r5, r2]
@@ -115,7 +115,7 @@ _020ae7e8:
ldr r1, _020aeb14 ; =0x0000019a
str r1, [r0, #4]
_020ae8f0:
ldr r0, _020aeb18 ; =data_027e0fb8
ldr r0, _020aeb18 ; =gPlayerControl
ldr r0, [r0]
bl _ZN13PlayerControl13StopFollowingEv
ldr r1, _020aeb1c ; =data_ov00_020e6078
@@ -262,9 +262,9 @@ _020aeb08:
add sp, sp, #0x14
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_020aeb10: .word data_02050f54
_020aeb10: .word gSinCosTable
_020aeb14: .word 0x0000019a
_020aeb18: .word data_027e0fb8
_020aeb18: .word gPlayerControl
_020aeb1c: .word data_ov00_020e6078
_020aeb20: .word data_ov00_020eec9c
_020aeb24: .word data_ov00_020e6088
@@ -360,7 +360,7 @@ _ZN13LinkStateRoll8vfunc_20Ei: ; 0x020aec10
bl _ZN13LinkStateBase18func_ov00_020a8b80Ev
cmp r0, #0
beq _020aecc8
ldr r1, _020aed84 ; =data_027e0fb8
ldr r1, _020aed84 ; =gPlayerControl
mov r0, r5
ldr r6, [r1]
bl _ZN13LinkStateBase14GetPlayerAngleEv
@@ -419,12 +419,12 @@ _020aed08:
ldr r0, _020aed8c ; =0x0000099a
cmp r1, r0
blt _020aed70
ldr r0, _020aed84 ; =data_027e0fb8
ldr r0, _020aed84 ; =gPlayerControl
ldr r0, [r0]
bl _ZN13PlayerControl18func_ov00_020b034cEv
cmp r0, #0
ble _020aed70
ldr r0, _020aed84 ; =data_027e0fb8
ldr r0, _020aed84 ; =gPlayerControl
ldr r0, [r0]
bl _ZN13PlayerControl18func_ov00_020b034cEv
mov r2, #0
@@ -444,7 +444,7 @@ _020aed7c:
mov r0, #0
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020aed84: .word data_027e0fb8
_020aed84: .word gPlayerControl
_020aed88: .word data_027e0618
_020aed8c: .word 0x0000099a
arm_func_end _ZN13LinkStateRoll8vfunc_20Ei
asm/ov00/Player/PlayerBase.inc
+10 -10
View File
@@ -1,6 +1,6 @@
#pragma once
.extern _ZN11ItemManager18EquipItem_vfunc_2cEi
.extern _ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pi
.extern _ZN11ItemManager17EquipCollidesWithEP8Cylinderi
.extern _ZN13PlayerControl9UpdateAimEv
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEi
@@ -9,16 +9,16 @@
.extern gMapManager
.extern data_027e0f64
.extern gAdventureFlags
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayerPos
.extern gPlayerVel
.extern gPlayerAngle
.extern data_027e0fb0
.extern data_027e0fb8
.extern data_027e0fe4
.extern func_01ff9bf8
.extern func_01ffa0f4
.extern func_01ffec34
.extern func_01fffcec
.extern gPlayerControl
.extern gActorManager
.extern Vec3p_Sub
.extern Atan2
.extern _ZN8Cylinder8OverlapsEPS_
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern func_ov00_0207c5d4
.extern _ZN10MapManager18func_ov00_02082af4Ev
.extern _ZN10MapManager14GetEntrancePosEP5Vec3pi
asm/ov00/Player/PlayerBase.s
+32 -32
View File
@@ -71,21 +71,21 @@ _020a7b88: .word data_027e0e58
.global _ZN10PlayerBase13GetEquipSwordEv
arm_func_start _ZN10PlayerBase13GetEquipSwordEv
_ZN10PlayerBase13GetEquipSwordEv: ; 0x020a7b8c
ldr ip, _020a7b98 ; =func_01fffcec
ldr ip, _020a7b98 ; =_ZN11ItemManager21GetEquipItemUncheckedEi
mov r0, #0
bx ip
.align 2, 0
_020a7b98: .word func_01fffcec
_020a7b98: .word _ZN11ItemManager21GetEquipItemUncheckedEi
arm_func_end _ZN10PlayerBase13GetEquipSwordEv
.global _ZN10PlayerBase14GetEquipShieldEv
arm_func_start _ZN10PlayerBase14GetEquipShieldEv
_ZN10PlayerBase14GetEquipShieldEv: ; 0x020a7b9c
ldr ip, _020a7ba8 ; =func_01fffcec
ldr ip, _020a7ba8 ; =_ZN11ItemManager21GetEquipItemUncheckedEi
mov r0, #1
bx ip
.align 2, 0
_020a7ba8: .word func_01fffcec
_020a7ba8: .word _ZN11ItemManager21GetEquipItemUncheckedEi
arm_func_end _ZN10PlayerBase14GetEquipShieldEv
.global _ZN10PlayerBase6LookAtEP5Vec3p
@@ -94,9 +94,9 @@ _ZN10PlayerBase6LookAtEP5Vec3p: ; 0x020a7bac
stmdb sp!, {lr}
sub sp, sp, #0xc
mov r0, r1
ldr r1, _020a7bf8 ; =data_027e0f94
ldr r1, _020a7bf8 ; =gPlayerPos
add r2, sp, #0
bl func_01ff9bf8
bl Vec3p_Sub
ldr r0, [sp]
cmp r0, #0
ldreq r0, [sp, #8]
@@ -105,14 +105,14 @@ _ZN10PlayerBase6LookAtEP5Vec3p: ; 0x020a7bac
ldmeqia sp!, {pc}
ldr r0, [sp]
ldr r1, [sp, #8]
bl func_01ffa0f4
ldr r1, _020a7bfc ; =data_027e0fac
bl Atan2
ldr r1, _020a7bfc ; =gPlayerAngle
strh r0, [r1]
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_020a7bf8: .word data_027e0f94
_020a7bfc: .word data_027e0fac
_020a7bf8: .word gPlayerPos
_020a7bfc: .word gPlayerAngle
arm_func_end _ZN10PlayerBase6LookAtEP5Vec3p
.global _ZN10PlayerBase18func_ov00_020a7c00Ei
@@ -128,9 +128,9 @@ _ZN10PlayerBase18func_ov00_020a7c00Ei: ; 0x020a7c00
_020a7c18: .word data_027e0c54
arm_func_end _ZN10PlayerBase18func_ov00_020a7c00Ei
.global _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
arm_func_start _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
_ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder: ; 0x020a7c1c
.global _ZN10PlayerBase12CollidesWithEP8Cylinder
arm_func_start _ZN10PlayerBase12CollidesWithEP8Cylinder
_ZN10PlayerBase12CollidesWithEP8Cylinder: ; 0x020a7c1c
stmdb sp!, {r4, lr}
sub sp, sp, #0x10
ldr r2, [r0]
@@ -145,10 +145,10 @@ _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder: ; 0x020a7c1c
ldmltia sp!, {r4, pc}
add r1, sp, #0
mov r0, r4
bl func_01ffec34
bl _ZN8Cylinder8OverlapsEPS_
add sp, sp, #0x10
ldmia sp!, {r4, pc}
arm_func_end _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
arm_func_end _ZN10PlayerBase12CollidesWithEP8Cylinder
.global _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
arm_func_start _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
@@ -188,17 +188,17 @@ _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i: ; 0x020a7c60
ldmia sp!, {r4, r5, r6, pc}
arm_func_end _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
.global _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
arm_func_start _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
_ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi: ; 0x020a7ce4
.global _ZN10PlayerBase17EquipCollidesWithEP8Cylinderi
arm_func_start _ZN10PlayerBase17EquipCollidesWithEP8Cylinderi
_ZN10PlayerBase17EquipCollidesWithEP8Cylinderi: ; 0x020a7ce4
ldr r0, _020a7cf4 ; =gItemManager
ldr ip, _020a7cf8 ; =_ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pi
ldr ip, _020a7cf8 ; =_ZN11ItemManager17EquipCollidesWithEP8Cylinderi
ldr r0, [r0]
bx ip
.align 2, 0
_020a7cf4: .word gItemManager
_020a7cf8: .word _ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pi
arm_func_end _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
_020a7cf8: .word _ZN11ItemManager17EquipCollidesWithEP8Cylinderi
arm_func_end _ZN10PlayerBase17EquipCollidesWithEP8Cylinderi
.global _ZN10PlayerBase18EquipItem_vfunc_2cEv
arm_func_start _ZN10PlayerBase18EquipItem_vfunc_2cEv
@@ -324,7 +324,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
sub sp, sp, #0xc
mov r5, r1
ldr r0, [r5]
ldr r3, _020a7f64 ; =data_027e0f94
ldr r3, _020a7f64 ; =gPlayerPos
mov r4, r2
str r0, [r3]
ldr r1, [r5, #4]
@@ -343,11 +343,11 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
str r3, [sp, #8]
bl _ZN10MapManager16MapData_vfunc_68Ev
ldr ip, [r5, #4]
ldr r2, _020a7f6c ; =data_027e0fac
ldr r2, _020a7f6c ; =gPlayerAngle
cmp ip, r0
movle ip, r0
ldr r3, _020a7f64 ; =data_027e0f94
ldr r1, _020a7f70 ; =data_027e0fa0
ldr r3, _020a7f64 ; =gPlayerPos
ldr r1, _020a7f70 ; =gPlayerVel
mov r5, #0
ldr r0, _020a7f74 ; =data_027e0fb0
str r5, [r1]
@@ -355,11 +355,11 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
str ip, [r3, #4]
strh r4, [r2]
str r5, [r1, #4]
ldr r0, _020a7f78 ; =data_027e0fb8
ldr r0, _020a7f78 ; =gPlayerControl
str r5, [r1, #8]
ldr r0, [r0]
blx _ZN13PlayerControl9UpdateAimEv
ldr r0, _020a7f7c ; =data_027e0fe4
ldr r0, _020a7f7c ; =gActorManager
ldrb r1, [sp, #0x18]
ldr r0, [r0]
bl _ZN12ActorManager14Actor_vfunc_10Ej
@@ -384,13 +384,13 @@ _020a7f58:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_020a7f64: .word data_027e0f94
_020a7f64: .word gPlayerPos
_020a7f68: .word gMapManager
_020a7f6c: .word data_027e0fac
_020a7f70: .word data_027e0fa0
_020a7f6c: .word gPlayerAngle
_020a7f70: .word gPlayerVel
_020a7f74: .word data_027e0fb0
_020a7f78: .word data_027e0fb8
_020a7f7c: .word data_027e0fe4
_020a7f78: .word gPlayerControl
_020a7f7c: .word gActorManager
_020a7f80: .word gAdventureFlags
_020a7f84: .word data_027e0f64
arm_func_end _ZN10PlayerBase18TeleportToEntranceEib
asm/ov00/Player/PlayerControl.inc
+14 -14
View File
@@ -18,22 +18,22 @@
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEi
.extern _ZNK11ItemManager9HasPotionEj
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_027e05f8
.extern data_027e077c
.extern data_027e0c68
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0e2c
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fc8
.extern gPlayer
.extern gPlayerPos
.extern gPlayerAngle
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0ffc
.extern data_027e103c
.extern data_ov00_020eec60
@@ -41,12 +41,12 @@
.extern func_01ff991c
.extern func_01ff992c
.extern func_01ff9958
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_01ff9cec
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern Vec3p_Sub
.extern Vec3p_Dot
.extern Vec3p_Length
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Atan2
.extern func_01ffe468
.extern func_02002c14
.extern func_0202b2e8
@@ -61,7 +61,7 @@
.extern func_ov00_020ba204
.extern func_ov00_020baca8
.extern func_ov00_020bad18
.extern func_ov00_020bc46c
.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
.extern func_ov00_020cebcc
.extern func_ov00_020ced64
.extern func_ov00_020ced7c
asm/ov00/Player/PlayerControl.s
+79 -79
View File
@@ -118,7 +118,7 @@ _ZN13PlayerControl9UpdateAimEv: ; 0x020aef68
add r1, r4, #0
add r1, #0x81
strb r0, [r1]
ldr r1, _020aeff0 ; =data_027e0d0c
ldr r1, _020aeff0 ; =gVec3p_ZERO
add r0, r4, #0
ldr r2, [r1]
add r0, #0xb0
@@ -149,7 +149,7 @@ _020aefde:
str r1, [r4]
pop {r4, pc}
nop
_020aeff0: .word data_027e0d0c
_020aeff0: .word gVec3p_ZERO
_020aeff4: .word data_027e0d38
_020aeff8: .word data_027e103c
thumb_func_end _ZN13PlayerControl9UpdateAimEv
@@ -157,14 +157,14 @@ _020aeff8: .word data_027e103c
.global _ZN13PlayerControl14GetFollowActorEv
arm_func_start _ZN13PlayerControl14GetFollowActorEv
_ZN13PlayerControl14GetFollowActorEv: ; 0x020aeffc
ldr r1, _020af014 ; =data_027e0fe4
ldr r1, _020af014 ; =gActorManager
mov r2, r0
ldr r0, [r1]
ldr ip, _020af018 ; =_ZN12ActorManager8GetActorEP8ActorRef
add r1, r2, #0x84
bx ip
.align 2, 0
_020af014: .word data_027e0fe4
_020af014: .word gActorManager
_020af018: .word _ZN12ActorManager8GetActorEP8ActorRef
arm_func_end _ZN13PlayerControl14GetFollowActorEv
@@ -332,7 +332,7 @@ _020af1f8:
bl _ZNK11ItemManager8GetFairyEi
cmp r0, #0
beq _020af268
ldr r1, _020af294 ; =data_027e0f94
ldr r1, _020af294 ; =gPlayerPos
ldr r2, [r0, #0x50]
ldr r1, [r1, #4]
ldr r0, [r0, #0x48]
@@ -353,7 +353,7 @@ _020af284: .word data_027e0d38
_020af288: .word gItemManager
_020af28c: .word data_027e05f8
_020af290: .word data_027e103c
_020af294: .word data_027e0f94
_020af294: .word gPlayerPos
arm_func_end _ZN13PlayerControl18func_ov00_020af06cEv
.global _ZN13PlayerControl20UpdateUsingEquipItemEv
@@ -634,7 +634,7 @@ _020af5c4:
ldreqb r0, [r4, #0x81]
cmpeq r0, #0
beq _020af620
ldr r1, _020af6cc ; =data_027e0fac
ldr r1, _020af6cc ; =gPlayerAngle
ldr r0, _020af6d0 ; =data_027e0ffc
ldrsh r2, [r1]
ldr r1, _020af6d4 ; =0x0000010a
@@ -691,7 +691,7 @@ _020af694:
.align 2, 0
_020af6c4: .word gAdventureFlags
_020af6c8: .word data_027e0c68
_020af6cc: .word data_027e0fac
_020af6cc: .word gPlayerAngle
_020af6d0: .word data_027e0ffc
_020af6d4: .word 0x0000010a
_020af6d8: .word gMapManager
@@ -712,8 +712,8 @@ _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii: ; 0x020af6e4
ldmeqia sp!, {r3, r4, r5, r6, pc}
cmp r5, #0
ble _020af72c
ldr r0, _020af770 ; =data_027e0f94
bl func_01ff9ec0
ldr r0, _020af770 ; =gPlayerPos
bl Vec3p_Distance
cmp r0, r5
addge sp, sp, #4
ldmgeia sp!, {r3, r4, r5, r6, pc}
@@ -739,7 +739,7 @@ _020af72c:
add sp, sp, #4
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020af770: .word data_027e0f94
_020af770: .word gPlayerPos
_020af774: .word gMapManager
arm_func_end _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii
@@ -815,7 +815,7 @@ _020af810:
movne r4, #1
cmpne r0, #0
beq _020af8b0
ldr r0, _020afac0 ; =data_027e0f90
ldr r0, _020afac0 ; =gPlayer
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #8]
@@ -829,12 +829,12 @@ _020af810:
bl _ZN11ItemManager12GetEquipItemEi
mov r5, r0
_020af8b0:
ldr r0, _020afac8 ; =data_027e0fc8
ldr r0, _020afac8 ; =gPlayerLink
mov r8, #0
ldr r1, [r0]
cmp r1, #0
beq _020af8dc
ldr r0, _020afacc ; =data_027e0fe4
ldr r0, _020afacc ; =gActorManager
add r1, r1, #0x3c
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -844,7 +844,7 @@ _020af8dc:
cmp r4, #0
mov r4, #0
beq _020afa68
ldr r0, _020afacc ; =data_027e0fe4
ldr r0, _020afacc ; =gActorManager
add r1, r9, #0x8c
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -887,7 +887,7 @@ _020af97c:
add r1, sp, #8
ldr r0, [r0]
bl _ZN10MapManager18func_ov00_02085108EPi
ldr r2, _020afad4 ; =data_027e0f94
ldr r2, _020afad4 ; =gPlayerPos
mov r1, r0
ldr r0, [r2, #4]
cmp r5, #0
@@ -945,7 +945,7 @@ _020afa18:
mov r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
_020afa68:
ldr r1, _020afacc ; =data_027e0fe4
ldr r1, _020afacc ; =gActorManager
add r0, sp, #0
ldr r1, [r1]
mov r2, r4
@@ -969,12 +969,12 @@ _020afaa8:
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_020afabc: .word gAdventureFlags
_020afac0: .word data_027e0f90
_020afac0: .word gPlayer
_020afac4: .word gItemManager
_020afac8: .word data_027e0fc8
_020afacc: .word data_027e0fe4
_020afac8: .word gPlayerLink
_020afacc: .word gActorManager
_020afad0: .word gMapManager
_020afad4: .word data_027e0f94
_020afad4: .word gPlayerPos
arm_func_end _ZN13PlayerControl18func_ov00_020af778Ev
.global _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p
@@ -982,7 +982,7 @@ _020afad4: .word data_027e0f94
_ZN13PlayerControl18func_ov00_020afad8EP5Vec3p: ; 0x020afad8
stmdb sp!, {lr}
sub sp, sp, #0xc
ldr r2, _020afb60 ; =data_027e0f94
ldr r2, _020afb60 ; =gPlayerPos
ldr r3, [r1, #4]
ldr r1, [r2, #4]
cmp r3, r1
@@ -992,7 +992,7 @@ _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p: ; 0x020afad8
ldrb r0, [r0, #0x79]
cmp r0, #0
beq _020afb54
ldr r0, _020afb64 ; =data_027e0f90
ldr r0, _020afb64 ; =gPlayer
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #8]
@@ -1017,8 +1017,8 @@ _020afb54:
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_020afb60: .word data_027e0f94
_020afb64: .word data_027e0f90
_020afb60: .word gPlayerPos
_020afb64: .word gPlayer
_020afb68: .word gMapManager
arm_func_end _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p
@@ -1029,7 +1029,7 @@ _ZN13PlayerControl18func_ov00_020afb6cEv: ; 0x020afb6c
sub sp, sp, #0x20
mov r9, r0
bl _ZN13PlayerControl18func_ov00_020af778Ev
ldr r1, _020afe70 ; =data_027e0fe4
ldr r1, _020afe70 ; =gActorManager
mov r4, r0
ldr r0, [r1]
add r1, r9, #0x84
@@ -1053,9 +1053,9 @@ _020afbcc:
cmp r5, #0
ldr r6, [r9, #0xa4]
beq _020afce8
ldr r0, _020afe78 ; =data_027e0f94
ldr r0, _020afe78 ; =gPlayerPos
add r1, r5, #0x48
bl func_01ff9ec0
bl Vec3p_Distance
mov r6, r0
add r1, sp, #0x10
mov r0, r5
@@ -1111,9 +1111,9 @@ _020afc84:
_020afc9c:
cmp r7, #0
beq _020afcf4
ldr r0, _020afe7c ; =data_027e0fc8
ldr r0, _020afe7c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
bl _ZN14PlayerLinkBase19GetCurrentCharacterEv
cmp r0, #0
bne _020afcf4
add r1, sp, #0x10
@@ -1172,7 +1172,7 @@ _020afd5c:
movne r6, r5
b _020afdc4
_020afd88:
ldr r1, _020afe78 ; =data_027e0f94
ldr r1, _020afe78 ; =gPlayerPos
ldr r0, _020afe84 ; =gMapManager
ldr r1, [r1, #4]
ldr r0, [r0]
@@ -1190,9 +1190,9 @@ _020afd88:
_020afdc4:
cmp r5, #0
beq _020afe10
ldr r0, _020afe7c ; =data_027e0fc8
ldr r0, _020afe7c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc46c
bl _ZN14PlayerLinkBase19GetCurrentCharacterEv
cmp r0, #0
bne _020afe10
add r1, sp, #4
@@ -1208,9 +1208,9 @@ _020afdc4:
add r1, sp, #4
bl func_ov00_020ced7c
_020afe10:
ldr r0, _020afe78 ; =data_027e0f94
ldr r0, _020afe78 ; =gPlayerPos
add r1, sp, #4
bl func_01ff9ec0
bl Vec3p_Distance
mov r6, r0
b _020afe2c
_020afe24:
@@ -1236,10 +1236,10 @@ _020afe64:
add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_020afe70: .word data_027e0fe4
_020afe70: .word gActorManager
_020afe74: .word gItemManager
_020afe78: .word data_027e0f94
_020afe7c: .word data_027e0fc8
_020afe78: .word gPlayerPos
_020afe7c: .word gPlayerLink
_020afe80: .word data_027e0ffc
_020afe84: .word gMapManager
arm_func_end _ZN13PlayerControl18func_ov00_020afb6cEv
@@ -1376,7 +1376,7 @@ _ZN13PlayerControl18func_ov00_020affecEP5Vec3piiS1_: ; 0x020affec
add r3, sp, #0x24
add r1, r7, #0x44
add r2, r7, #0x38
bl func_01ff9e64
bl Vec3p_Axpy
add r0, sp, #0x18
mov r1, #0
str r1, [r0]
@@ -1390,7 +1390,7 @@ _ZN13PlayerControl18func_ov00_020affecEP5Vec3piiS1_: ; 0x020affec
ldr r2, [r4, #8]
sub r1, r2, r1
str r1, [sp, #0x20]
bl func_01ff9cec
bl Vec3p_Length
cmp r0, r5
bgt _020b008c
ldr r0, [sp, #0x24]
@@ -1411,7 +1411,7 @@ _020b008c:
str r1, [sp, #0xc]
ldr r1, [r7, #0x4c]
str r1, [sp, #0x14]
bl func_01ff9cec
bl Vec3p_Length
bl func_01ff991c
mov r4, r0
ldr r1, [sp, #0xc]
@@ -1430,7 +1430,7 @@ _020b008c:
add r0, sp, #0x18
add r1, sp, #0xc
str r3, [sp, #0xc]
bl func_01ff9c2c
bl Vec3p_Dot
mov r3, r6
mov r7, r0
add r0, sp, #0xc
@@ -1441,7 +1441,7 @@ _020b008c:
mov r1, r6
add r2, sp, #0x24
str r4, [sp, #4]
bl func_01ff9e64
bl Vec3p_Axpy
add sp, sp, #0x30
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_020b0134:
@@ -1514,7 +1514,7 @@ _020b0218: .word gItemManager
.global _ZN13PlayerControl6SetAimEv
arm_func_start _ZN13PlayerControl6SetAimEv
_ZN13PlayerControl6SetAimEv: ; 0x020b021c
ldr r1, _020b023c ; =data_027e0d0c
ldr r1, _020b023c ; =gVec3p_ZERO
ldr r2, [r1]
str r2, [r0, #0xb0]
ldr r2, [r1, #4]
@@ -1523,7 +1523,7 @@ _ZN13PlayerControl6SetAimEv: ; 0x020b021c
str r1, [r0, #0xb8]
bx lr
.align 2, 0
_020b023c: .word data_027e0d0c
_020b023c: .word gVec3p_ZERO
arm_func_end _ZN13PlayerControl6SetAimEv
.global _ZN13PlayerControl14UpdateAimWorldEP5Vec3p
@@ -1532,7 +1532,7 @@ _ZN13PlayerControl14UpdateAimWorldEP5Vec3p: ; 0x020b0240
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x10
ldr r2, _020b031c ; =data_027e0d38
ldr lr, _020b0320 ; =data_027e0f94
ldr lr, _020b0320 ; =gPlayerPos
ldr r3, [r2]
add ip, sp, #4
mov r5, r0
@@ -1588,7 +1588,7 @@ _020b02f8:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020b031c: .word data_027e0d38
_020b0320: .word data_027e0f94
_020b0320: .word gPlayerPos
_020b0324: .word data_027e0f64
arm_func_end _ZN13PlayerControl14UpdateAimWorldEP5Vec3p
@@ -1726,12 +1726,12 @@ _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb: ; 0x020b049c
mov r1, r4
mov r2, #0x400
bl func_ov00_020b7d4c
ldr r1, _020b05d8 ; =data_027e0f94
ldr r1, _020b05d8 ; =gPlayerPos
mov r0, r4
mov r2, r4
bl func_01ff9bf8
bl Vec3p_Sub
mov r0, r4
bl func_01ff9cec
bl Vec3p_Length
cmp r0, #0x1400
movge r0, #1
ldmgeia sp!, {r3, r4, r5, r6, r7, pc}
@@ -1739,10 +1739,10 @@ _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb: ; 0x020b049c
beq _020b05d0
cmp r0, #0x400
bge _020b05bc
ldr r1, _020b05dc ; =data_027e0d0c
ldr r0, _020b05e0 ; =data_027e0fac
ldr r1, _020b05dc ; =gVec3p_ZERO
ldr r0, _020b05e0 ; =gPlayerAngle
ldr r2, [r1]
ldr ip, _020b05e4 ; =data_02050f54
ldr ip, _020b05e4 ; =gSinCosTable
str r2, [r4]
ldr r3, [r1, #4]
mov r2, #0
@@ -1792,10 +1792,10 @@ _020b05d0:
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020b05d8: .word data_027e0f94
_020b05dc: .word data_027e0d0c
_020b05e0: .word data_027e0fac
_020b05e4: .word data_02050f54
_020b05d8: .word gPlayerPos
_020b05dc: .word gVec3p_ZERO
_020b05e0: .word gPlayerAngle
_020b05e4: .word gSinCosTable
arm_func_end _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb
.global _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p
@@ -1816,24 +1816,24 @@ _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p: ; 0x020b05e8
bge _020b0758
mov r0, r4
ldr r2, _020b0764 ; =0x00000333
ldr r4, _020b0768 ; =data_027e0f94
ldr r4, _020b0768 ; =gPlayerPos
add r1, sp, #4
bl func_ov00_020b7d4c
mov r1, r4
ldr r2, [r1, #4]
add r0, sp, #4
str r2, [sp, #8]
bl func_01ff9ec0
bl Vec3p_Distance
cmp r0, #0x1400
addgt sp, sp, #0x10
movgt r0, #0
ldmgtia sp!, {r4, r5, r6, pc}
cmp r0, #0x400
bge _020b06e0
ldr r1, _020b076c ; =data_027e0fac
ldr r1, _020b076c ; =gPlayerAngle
ldr r0, [r4, #4]
ldrh r2, [r1]
ldr r3, _020b0770 ; =data_02050f54
ldr r3, _020b0770 ; =gSinCosTable
mov r1, #0x800
mov r2, r2, asr #0x4
mov r6, r2, lsl #0x1
@@ -1890,7 +1890,7 @@ _020b06e0:
add r0, sp, #4
mov r2, r5
str r3, [sp, #0xc]
bl func_01ff9bf8
bl Vec3p_Sub
add sp, sp, #0x10
mov r0, #1
ldmia sp!, {r4, r5, r6, pc}
@@ -1900,9 +1900,9 @@ _020b0758:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020b0764: .word 0x00000333
_020b0768: .word data_027e0f94
_020b076c: .word data_027e0fac
_020b0770: .word data_02050f54
_020b0768: .word gPlayerPos
_020b076c: .word gPlayerAngle
_020b0770: .word gSinCosTable
_020b0774: .word gMapManager
arm_func_end _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p
@@ -1943,7 +1943,7 @@ _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji: ; 0x020b0778
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r3, _020b0ab0 ; =data_02050f54
ldr r3, _020b0ab0 ; =gSinCosTable
mov r2, r1, lsl #0x1
mov r1, r0, lsl #0x1
ldrsh r2, [r3, r2]
@@ -2130,7 +2130,7 @@ _020b0aa0:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_020b0aac: .word data_027e0f64
_020b0ab0: .word data_02050f54
_020b0ab0: .word gSinCosTable
arm_func_end _ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji
.global _ZN13PlayerControl16CheckNotTouchingEv
@@ -2245,7 +2245,7 @@ _020b0bf8:
str r2, [sp, #0x18]
str r1, [sp, #0x1c]
str r3, [sp, #0x20]
bl func_01ff9cec
bl Vec3p_Length
cmp r0, #0xa000
addlt sp, sp, #0x24
movlt r0, #0
@@ -2273,7 +2273,7 @@ _020b0c5c:
ble _020b0cd8
ldr r0, [r7, #0x50]
ldr r1, [r7, #0x54]
bl func_01ffa0f4
bl Atan2
ldr r1, [sp, #0x38]
ldrsh r2, [r6]
cmp r1, #0
@@ -2292,7 +2292,7 @@ _020b0c5c:
_020b0cd8:
ldr r0, [sp, #0x18]
ldr r1, [sp, #0x20]
bl func_01ffa0f4
bl Atan2
ldrsh lr, [r6]
add r1, sp, #0xc
mov ip, #0
@@ -2320,7 +2320,7 @@ _020b0cd8:
mov r4, r3, asr #0x10
mov r3, ip, lsl #0xc
str r3, [sp, #4]
bl func_01ff9bf8
bl Vec3p_Sub
ldr r0, [r7, #0x58]
cmp r0, #0xa000
bgt _020b0d7c
@@ -2419,7 +2419,7 @@ _ZN13PlayerControl18func_ov00_020b0e54EP5Vec3pS1_: ; 0x020b0e54
mov r2, #0x800
bl func_ov00_020b7d4c
add r0, sp, #0
bl func_01ff9cec
bl Vec3p_Length
mov r5, r0
cmp r5, #0x4000
ble _020b0ed0
@@ -2468,7 +2468,7 @@ _020b0f0c:
bl func_ov00_020b7d4c
b _020b0f6c
_020b0f50:
ldr r0, _020b0f84 ; =data_027e0f94
ldr r0, _020b0f84 ; =gPlayerPos
ldr r1, [r0]
str r1, [r5]
ldr r1, [r0, #4]
@@ -2484,7 +2484,7 @@ _020b0f78:
add sp, sp, #0xc
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020b0f84: .word data_027e0f94
_020b0f84: .word gPlayerPos
arm_func_end _ZN13PlayerControl18func_ov00_020b0e54EP5Vec3pS1_
.global _ZN13PlayerControl18func_ov00_020b0f88EP5Vec3piS1_
@@ -2505,7 +2505,7 @@ _ZN13PlayerControl18func_ov00_020b0f88EP5Vec3piS1_: ; 0x020b0f88
mov r2, r6
bl func_ov00_020b7d4c
add r0, sp, #0
bl func_01ff9cec
bl Vec3p_Length
mov r6, r0
cmp r6, #0x4000
ble _020b0ffc
@@ -2566,9 +2566,9 @@ _ZN13PlayerControl18func_ov00_020b1058EP5Vec3piS1_S1_: ; 0x020b1058
ldr r0, [sp, #0x30]
cmp r0, #0
beq _020b1140
ldr r1, _020b11d8 ; =data_027e0f94
ldr r1, _020b11d8 ; =gPlayerPos
add r2, sp, #0
bl func_01ff9bf8
bl Vec3p_Sub
ldr ip, [sp]
ldr r3, [sp, #4]
mov r2, ip, asr #0x1f
@@ -2609,7 +2609,7 @@ _ZN13PlayerControl18func_ov00_020b1058EP5Vec3piS1_S1_: ; 0x020b1058
str r0, [sp, #0x14]
_020b1140:
add r0, sp, #0xc
bl func_01ff9cec
bl Vec3p_Length
mov r6, r0
cmp r6, #0x4000
ble _020b117c
@@ -2649,7 +2649,7 @@ _020b11cc:
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020b11d8: .word data_027e0f94
_020b11d8: .word gPlayerPos
arm_func_end _ZN13PlayerControl18func_ov00_020b1058EP5Vec3piS1_S1_
.global _ZN13PlayerControl14IsUntouchedNowEv
asm/ov00/ov00_020773c0.inc
+1 -1
View File
@@ -1,5 +1,6 @@
#pragma once
.extern Divide
.extern Vec3p_Add
.extern WaitByLoop
.extern _ZN10MapManager13GetCourseMaxXEv
.extern _ZN10MapManager13GetCourseMaxZEv
@@ -42,7 +43,6 @@
.extern data_ov00_020ec718
.extern data_ov00_020ec7dc
.extern func_01ff9b4c
.extern func_01ff9bc4
.extern func_02000b60
.extern func_02002bac
.extern func_02002bf4
asm/ov00/ov00_020773c0.s
+5 -5
View File
@@ -5628,9 +5628,9 @@ func_ov00_0207a13c: ; 0x0207a13c
_0207a184: .word 0x00007fff
arm_func_end func_ov00_0207a13c
.global func_ov00_0207a188
thumb_func_start func_ov00_0207a188
func_ov00_0207a188: ; 0x0207a188
.global _ZN19Actor_UnkStruct_0a4C1Eiiii
thumb_func_start _ZN19Actor_UnkStruct_0a4C1Eiiii
_ZN19Actor_UnkStruct_0a4C1Eiiii: ; 0x0207a188
push {r3, r4}
mov r4, #1
strb r4, [r0]
@@ -5645,7 +5645,7 @@ func_ov00_0207a188: ; 0x0207a188
str r1, [r0, #0x10]
pop {r3, r4}
bx lr
thumb_func_end func_ov00_0207a188
thumb_func_end _ZN19Actor_UnkStruct_0a4C1Eiiii
.global func_ov00_0207a1a4
arm_func_start func_ov00_0207a1a4
@@ -5675,7 +5675,7 @@ func_ov00_0207a1c8: ; 0x0207a1c8
add r2, sp, #0
add r0, r5, #4
str r3, [sp, #0xc]
bl func_01ff9bc4
bl Vec3p_Add
_0207a1f8:
ldr r0, _0207a28c ; =data_027e0c54
mov r2, #1
asm/ov00/ov00_0207afa0.inc
+4 -4
View File
@@ -36,15 +36,15 @@
.extern data_027e0e5c
.extern data_027e0f64
.extern data_027e0f7c
.extern data_027e0f94
.extern data_027e0fac
.extern gPlayerPos
.extern gPlayerAngle
.extern data_027e0fcc
.extern data_027e0fe4
.extern gActorManager
.extern data_027e103c
.extern data_ov09_0211f5dc
.extern func_01ff892c
.extern func_01ff9b4c
.extern func_01ff9ec0
.extern Vec3p_Distance
.extern func_01ffa8d4
.extern func_01ffe468
.extern func_02004730
asm/ov00/ov00_0207afa0.s
+11 -11
View File
@@ -777,7 +777,7 @@ func_ov00_0207b5bc: ; 0x0207b5bc
_0207b5fa:
cmp r2, #0
beq _0207b6cc
ldr r1, _0207b800 ; =data_027e0fe4
ldr r1, _0207b800 ; =gActorManager
ldr r2, _0207b804 ; =0x414e4353
ldr r1, [r1]
add r0, sp, #0
@@ -787,7 +787,7 @@ _0207b5fa:
mvn r0, r0
cmp r1, r0
beq _0207b6cc
ldr r0, _0207b800 ; =data_027e0fe4
ldr r0, _0207b800 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
blx _ZN12ActorManager8GetActorEP8ActorRef
@@ -807,13 +807,13 @@ _0207b62c:
add r1, r5, #0
add r1, #0x56
strb r0, [r1]
ldr r0, _0207b80c ; =data_027e0f94
ldr r0, _0207b80c ; =gPlayerPos
ldr r1, [r0]
str r1, [r5, #0x5c]
ldr r1, [r0, #4]
str r1, [r5, #0x60]
ldr r0, [r0, #8]
ldr r1, _0207b810 ; =data_027e0fac
ldr r1, _0207b810 ; =gPlayerAngle
str r0, [r5, #0x64]
mov r0, #0
ldrsh r1, [r1, r0]
@@ -997,7 +997,7 @@ _0207b740:
add r0, r5, #0
add r0, #0x9d
strb r1, [r0]
ldr r1, _0207b80c ; =data_027e0f94
ldr r1, _0207b80c ; =gPlayerPos
add r0, r5, #0
ldr r2, [r1]
add r0, #0xa0
@@ -1018,11 +1018,11 @@ _0207b7f0:
add sp, #0x20
pop {r4, r5, r6, pc}
nop
_0207b800: .word data_027e0fe4
_0207b800: .word gActorManager
_0207b804: .word 0x414e4353
_0207b808: .word gMapManager
_0207b80c: .word data_027e0f94
_0207b810: .word data_027e0fac
_0207b80c: .word gPlayerPos
_0207b810: .word gPlayerAngle
_0207b814: .word data_027e0f7c
_0207b818: .word gItemManager
_0207b81c: .word data_ov09_0211f5dc
@@ -1086,7 +1086,7 @@ func_ov00_0207b89c: ; 0x0207b89c
add r1, r3, r1, lsl #2
ldr r1, [r1, #4]
add r1, r1, #0x260
bl func_01ff9ec0
bl Vec3p_Distance
str r0, [r5, #8]
ldr r0, [r4, #0x180]
add r0, r0, #1
@@ -2679,7 +2679,7 @@ _0207c800: .word data_ov00_020d88cc
func_ov00_0207c804: ; 0x0207c804
push {r3, r4, r5, r6, lr}
sub sp, #0x24
ldr r3, _0207c8d0 ; =data_027e0f94
ldr r3, _0207c8d0 ; =gPlayerPos
add r6, r2, #0
add r5, r0, #0
add r4, r1, #0
@@ -2781,7 +2781,7 @@ _0207c8c8:
add sp, #0x24
pop {r3, r4, r5, r6, pc}
nop
_0207c8d0: .word data_027e0f94
_0207c8d0: .word gPlayerPos
_0207c8d4: .word data_027e0d38
_0207c8d8: .word 0x0000019a
_0207c8dc: .word data_027e0fcc
asm/ov00/ov00_02086cd0.inc
+23 -23
View File
@@ -39,7 +39,7 @@
.extern _ZN11TriggerBase8vfunc_08Ev
.extern _ZN11TriggerBase8vfunc_0cEv
.extern _ZN11TriggerBase8vfunc_10Ev
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
@@ -51,28 +51,28 @@
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1c20Eii
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -105,7 +105,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_02063e4c
.extern data_027e071c
@@ -124,13 +124,13 @@
.extern data_027e0f7c
.extern data_027e0f80
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fc8
.extern gPlayer
.extern gPlayerPos
.extern gPlayerVel
.extern gPlayerAngle
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e103c
.extern data_027e10a4
@@ -163,14 +163,14 @@
.extern func_01ff9958
.extern func_01ff99f4
.extern func_01ff9a50
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_01ff9c68
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Dot
.extern Vec3p_Cross
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Distance
.extern Atan2
.extern func_01ffa8d4
.extern func_01ffa9fc
.extern func_01ffb7ec
@@ -178,7 +178,7 @@
.extern func_01ffbf5c
.extern func_01ffe468
.extern func_01ffebe0
.extern func_01ffec34
.extern _ZN8Cylinder8OverlapsEPS_
.extern func_01fff4c8
.extern func_01fffb4c
.extern func_01fffb80
@@ -261,9 +261,9 @@
.extern func_ov00_020a6110
.extern func_ov00_020a61ac
.extern func_ov00_020b3ea8
.extern func_ov00_020bd304
.extern _ZN14PlayerLinkBase18func_ov00_020bd304Ev
.extern func_ov00_020bd618
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020d77e4
asm/ov00/ov00_02086cd0.s
+219 -219
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020980f4.inc
+17 -17
View File
@@ -29,7 +29,7 @@
.extern _ZN14AdventureFlags6ExistsEv
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
@@ -42,14 +42,14 @@
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -78,7 +78,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02052f54
.extern data_02057840
.extern data_0205785c
@@ -103,13 +103,13 @@
.extern data_027e0f84
.extern data_027e0f88
.extern data_027e0f8c
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fc8
.extern gPlayer
.extern gPlayerPos
.extern gPlayerVel
.extern gPlayerAngle
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fec
.extern data_027e10a4
.extern data_ov00_020e2fa8
@@ -139,13 +139,13 @@
.extern func_01ff8230
.extern func_01ff98f0
.extern func_01ff9b88
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Atan2
.extern func_01ffa8d4
.extern func_01ffbf5c
.extern func_01ffe1cc
asm/ov00/ov00_020980f4.s
+104 -104
View File
@@ -141,7 +141,7 @@ _0209828c:
ldrb r0, [r4, #0x12]
cmp r0, #0
beq _020982a8
ldr r0, _020985ac ; =data_027e0f90
ldr r0, _020985ac ; =gPlayer
mov r1, #0
ldr r0, [r0]
bl _ZN10PlayerBase12SetUpdatePosEb
@@ -350,7 +350,7 @@ _02098574:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_020985a8: .word data_027e0f64
_020985ac: .word data_027e0f90
_020985ac: .word gPlayer
_020985b0: .word data_027e0c54
_020985b4: .word data_027e0db0
_020985b8: .word gMapManager
@@ -704,7 +704,7 @@ func_ov00_020989a8: ; 0x020989a8
bne _02098a34
mov r0, #0
strb r0, [r4, #0x20]
ldr r0, _02098b24 ; =data_027e0fc8
ldr r0, _02098b24 ; =gPlayerLink
ldrsh r2, [r4, #0x24]
ldr r0, [r0]
add r1, r4, #0x30
@@ -718,7 +718,7 @@ _02098a04:
mov r0, #0
strb r0, [r4, #0x20]
str r0, [r4, #0x28]
ldr r0, _02098b24 ; =data_027e0fc8
ldr r0, _02098b24 ; =gPlayerLink
ldrsh r2, [r4, #0x24]
ldr r0, [r0]
add r1, r4, #0x30
@@ -742,7 +742,7 @@ _02098a34:
cmp r2, #0
beq _02098a8c
mov r1, #0
ldr r0, _02098b28 ; =data_027e0f90
ldr r0, _02098b28 ; =gPlayer
strb r1, [r4, #0x21]
ldr r0, [r0]
bl _ZN10PlayerBase10SetVisibleEb
@@ -751,7 +751,7 @@ _02098a8c:
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r2, #0
ldr r0, _02098b2c ; =data_027e0fe4
ldr r0, _02098b2c ; =gActorManager
strb r2, [r4, #0x22]
ldr r1, [r0]
ldr r0, _02098b30 ; =data_027e0f68
@@ -769,7 +769,7 @@ _02098abc:
ldrb r0, [r4, #0x21]
cmp r0, #0
beq _02098af0
ldr r0, _02098b28 ; =data_027e0f90
ldr r0, _02098b28 ; =gPlayer
strb r1, [r4, #0x21]
ldr r0, [r0]
bl _ZN10PlayerBase10SetVisibleEb
@@ -778,7 +778,7 @@ _02098af0:
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r2, #0
ldr r0, _02098b2c ; =data_027e0fe4
ldr r0, _02098b2c ; =gActorManager
strb r2, [r4, #0x22]
ldr r1, [r0]
ldr r0, _02098b30 ; =data_027e0f68
@@ -788,9 +788,9 @@ _02098af0:
ldmia sp!, {r4, pc}
.align 2, 0
_02098b20: .word data_027e071c
_02098b24: .word data_027e0fc8
_02098b28: .word data_027e0f90
_02098b2c: .word data_027e0fe4
_02098b24: .word gPlayerLink
_02098b28: .word gPlayer
_02098b2c: .word gActorManager
_02098b30: .word data_027e0f68
arm_func_end func_ov00_020989a8
@@ -1357,7 +1357,7 @@ _02099240:
_02099244:
cmp r1, #0
beq _0209925c
ldr r0, _020994b4 ; =data_027e0f90
ldr r0, _020994b4 ; =gPlayer
mov r1, #1
ldr r0, [r0]
bl _ZN10PlayerBase10SetVisibleEb
@@ -1378,7 +1378,7 @@ _02099288:
_0209928c:
cmp r1, #0
beq _020992a4
ldr r0, _020994b4 ; =data_027e0f90
ldr r0, _020994b4 ; =gPlayer
mov r1, #1
ldr r0, [r0]
bl _ZN10PlayerBase12SetUpdatePosEb
@@ -1399,7 +1399,7 @@ _020992d0:
_020992d4:
cmp r1, #0
beq _020992f8
ldr r0, _020994b8 ; =data_027e0fe4
ldr r0, _020994b8 ; =gActorManager
mov r2, #1
ldr r1, [r0]
ldr r0, _020994bc ; =data_027e0f68
@@ -1494,7 +1494,7 @@ _020993b4:
ldr r1, [sp, #0xc]
cmp r1, #1
bne _02099484
ldr r1, _020994b8 ; =data_027e0fe4
ldr r1, _020994b8 ; =gActorManager
ldr r2, _020994d4 ; =0x414e4353
ldr r1, [r1]
add r0, sp, #0
@@ -1503,7 +1503,7 @@ _020993b4:
mvn r0, #0
cmp r1, r0
beq _020994a4
ldr r0, _020994b8 ; =data_027e0fe4
ldr r0, _020994b8 ; =gActorManager
add r1, sp, #0
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -1528,8 +1528,8 @@ _020994a4:
add sp, sp, #0x20
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020994b4: .word data_027e0f90
_020994b8: .word data_027e0fe4
_020994b4: .word gPlayer
_020994b8: .word gActorManager
_020994bc: .word data_027e0f68
_020994c0: .word data_027e0f64
_020994c4: .word data_027e0c68
@@ -4795,7 +4795,7 @@ func_ov00_0209be6c: ; 0x0209be6c
mov r3, #0
mov r4, r0
bl func_ov00_020908f8
ldr r1, _0209be9c ; =data_027e0fac
ldr r1, _0209be9c ; =gPlayerAngle
mov r0, r4
ldrsh r1, [r1]
sub r1, r1, #0x8000
@@ -4804,7 +4804,7 @@ func_ov00_0209be6c: ; 0x0209be6c
bl func_ov00_02090ac8
ldmia sp!, {r4, pc}
.align 2, 0
_0209be9c: .word data_027e0fac
_0209be9c: .word gPlayerAngle
arm_func_end func_ov00_0209be6c
.global func_ov00_0209bea0
@@ -4812,8 +4812,8 @@ _0209be9c: .word data_027e0fac
func_ov00_0209bea0: ; 0x0209bea0
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x18
ldr r2, _0209bf44 ; =data_027e0f94
ldr r1, _0209bf48 ; =data_027e0fa0
ldr r2, _0209bf44 ; =gPlayerPos
ldr r1, _0209bf48 ; =gPlayerVel
ldr r4, [r2]
ldr r3, [r2, #4]
str r4, [sp, #0xc]
@@ -4829,11 +4829,11 @@ func_ov00_0209bea0: ; 0x0209bea0
mov r4, r0
str r3, [sp, #4]
bl func_ov00_02090e10
ldr r2, _0209bf4c ; =data_027e0fac
ldr r2, _0209bf4c ; =gPlayerAngle
ldr r0, [sp]
ldr r1, [sp, #8]
ldrsh r5, [r2]
bl func_01ffa0f4
bl Atan2
mov r0, r4
bl func_ov00_02090a7c
ldr r1, [r0, #0x30]
@@ -4852,9 +4852,9 @@ func_ov00_0209bea0: ; 0x0209bea0
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0209bf44: .word data_027e0f94
_0209bf48: .word data_027e0fa0
_0209bf4c: .word data_027e0fac
_0209bf44: .word gPlayerPos
_0209bf48: .word gPlayerVel
_0209bf4c: .word gPlayerAngle
arm_func_end func_ov00_0209bea0
.global func_ov00_0209bf50
@@ -5444,7 +5444,7 @@ func_ov00_0209c648: ; 0x0209c648
mov r0, ip
mov r1, r3
mov r2, ip
bl func_01ff9bc4
bl Vec3p_Add
ldr r0, _0209c780 ; =data_027e0f78
ldr r1, [sp, #0x18]
ldr r2, [r0]
@@ -5458,7 +5458,7 @@ func_ov00_0209c648: ; 0x0209c648
ldmeqia sp!, {r4, r5, pc}
add r0, sp, #0xc
mov r1, r0
bl func_01ff9d4c
bl Vec3p_Normalize
ldr r1, [sp, #0xc]
ldr r0, [sp, #0x10]
rsb lr, r1, #0
@@ -5528,7 +5528,7 @@ func_ov00_0209c788: ; 0x0209c788
add r2, r0, #1
mov r1, r1, lsl #0x1
mov r3, r2, lsl #0x1
ldr r4, _0209c8d8 ; =data_02050f54
ldr r4, _0209c8d8 ; =gSinCosTable
mov r2, r1, lsl #0x1
ldrsh r3, [r4, r3]
ldrsh r4, [r4, r2]
@@ -5548,7 +5548,7 @@ func_ov00_0209c788: ; 0x0209c788
cmp r5, ip
movlt r5, ip
_0209c828:
ldr r4, _0209c8d8 ; =data_02050f54
ldr r4, _0209c8d8 ; =gSinCosTable
mov r0, r0, lsl #0x1
ldrsh r4, [r4, r0]
ldr r0, _0209c8dc ; =0x00000fff
@@ -5563,7 +5563,7 @@ _0209c828:
movlt r4, r0
_0209c85c:
add r1, r1, #1
ldr r0, _0209c8d8 ; =data_02050f54
ldr r0, _0209c8d8 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh ip, [r0, r1]
strh r4, [sp, #2]
@@ -5595,7 +5595,7 @@ _0209c8b4:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0209c8d4: .word data_027e0d38
_0209c8d8: .word data_02050f54
_0209c8d8: .word gSinCosTable
_0209c8dc: .word 0x00000fff
_0209c8e0: .word data_027e0f88
arm_func_end func_ov00_0209c788
@@ -5621,7 +5621,7 @@ func_ov00_0209c8f4: ; 0x0209c8f4
blx r1
cmp r0, #2
bne _0209c93c
ldr r0, _0209c950 ; =data_027e0f94
ldr r0, _0209c950 ; =gPlayerPos
mov r1, #0
ldr r2, [r0]
str r2, [r4, #0xf8]
@@ -5638,7 +5638,7 @@ _0209c93c:
bl _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
ldmia sp!, {r4, pc}
.align 2, 0
_0209c950: .word data_027e0f94
_0209c950: .word gPlayerPos
_0209c954: .word gMapManager
arm_func_end func_ov00_0209c8f4
@@ -5858,10 +5858,10 @@ _0209cc2c: .word gMapManager
.global func_ov00_0209cc30
arm_func_start func_ov00_0209cc30
func_ov00_0209cc30: ; 0x0209cc30
ldr ip, _0209cc38 ; =func_01ff9cec
ldr ip, _0209cc38 ; =Vec3p_Length
bx ip
.align 2, 0
_0209cc38: .word func_01ff9cec
_0209cc38: .word Vec3p_Length
arm_func_end func_ov00_0209cc30
.global func_ov00_0209cc3c
@@ -6085,7 +6085,7 @@ func_ov00_0209ce78: ; 0x0209ce78
mov r5, r1
addne sp, sp, #0x1c
ldmneia sp!, {r4, r5, pc}
ldr r2, _0209cf5c ; =data_027e0f94
ldr r2, _0209cf5c ; =gPlayerPos
add r1, sp, #0x10
ldr ip, [r2]
ldr r3, [r2, #4]
@@ -6106,7 +6106,7 @@ func_ov00_0209ce78: ; 0x0209ce78
mov r0, r4
bl func_ov00_02090b68
_0209cee4:
ldr r1, _0209cf60 ; =data_027e0fac
ldr r1, _0209cf60 ; =gPlayerAngle
mov r0, r4
ldrsh r1, [r1]
sub r1, r1, #0x8000
@@ -6137,8 +6137,8 @@ _0209cee4:
add sp, sp, #0x1c
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0209cf5c: .word data_027e0f94
_0209cf60: .word data_027e0fac
_0209cf5c: .word gPlayerPos
_0209cf60: .word gPlayerAngle
arm_func_end func_ov00_0209ce78
.global func_ov00_0209cf64
@@ -6146,8 +6146,8 @@ _0209cf60: .word data_027e0fac
func_ov00_0209cf64: ; 0x0209cf64
stmdb sp!, {r4, r5, r6, lr}
sub sp, sp, #0x48
ldr r2, _0209d098 ; =data_027e0f94
ldr r1, _0209d09c ; =data_027e0fa0
ldr r2, _0209d098 ; =gPlayerPos
ldr r1, _0209d09c ; =gPlayerVel
ldr r4, [r2]
ldr r3, [r2, #4]
str r4, [sp, #0x3c]
@@ -6165,7 +6165,7 @@ func_ov00_0209cf64: ; 0x0209cf64
bl func_ov00_02090e10
ldr r0, [sp, #0x30]
ldr r1, [sp, #0x38]
bl func_01ffa0f4
bl Atan2
add r1, sp, #0x3c
mov r0, r4
bl func_ov00_02090c28
@@ -6222,8 +6222,8 @@ func_ov00_0209cf64: ; 0x0209cf64
add sp, sp, #0x48
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0209d098: .word data_027e0f94
_0209d09c: .word data_027e0fa0
_0209d098: .word gPlayerPos
_0209d09c: .word gPlayerVel
_0209d0a0: .word data_ov00_020e2fa8
arm_func_end func_ov00_0209cf64
@@ -6324,7 +6324,7 @@ _0209d1b8:
_0209d1cc:
cmp r5, #1
bne _0209d1ec
ldr r0, _0209d284 ; =data_027e0fac
ldr r0, _0209d284 ; =gPlayerAngle
ldrsh r0, [r0]
sub r0, r0, #0x8000
mov r0, r0, lsl #0x10
@@ -6336,7 +6336,7 @@ _0209d1ec:
mov r8, r0, asr #0x10
b _0209d210
_0209d1fc:
ldr r0, _0209d284 ; =data_027e0fac
ldr r0, _0209d284 ; =gPlayerAngle
ldrsh r0, [r0]
sub r0, r0, #0x8000
mov r0, r0, lsl #0x10
@@ -6374,7 +6374,7 @@ _0209d26c:
bl func_ov00_020908f8
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0209d284: .word data_027e0fac
_0209d284: .word gPlayerAngle
arm_func_end func_ov00_0209d134
.global func_ov00_0209d288
@@ -6407,7 +6407,7 @@ _0209d2d0: .word data_027e0d38
func_ov00_0209d2d4: ; 0x0209d2d4
stmdb sp!, {r4, lr}
sub sp, sp, #0x18
ldr r1, _0209d404 ; =data_027e0f94
ldr r1, _0209d404 ; =gPlayerPos
mov r4, r0
ldr r2, [r1]
ldr r0, [r1, #4]
@@ -6485,7 +6485,7 @@ _0209d3dc:
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
_0209d404: .word data_027e0f94
_0209d404: .word gPlayerPos
_0209d408: .word data_027e10a4
arm_func_end func_ov00_0209d2d4
@@ -7949,7 +7949,7 @@ func_ov00_0209e594: ; 0x0209e594
ldr r4, [r0, #0x5c]
cmp r4, #0
ble _0209e664
ldr r0, _0209e6f0 ; =data_027e0f94
ldr r0, _0209e6f0 ; =gPlayerPos
ldr r1, [r7, #0x18]
ldr r3, [r0]
ldr r2, [r0, #4]
@@ -8028,7 +8028,7 @@ _0209e690:
add sp, sp, #0x28
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0209e6f0: .word data_027e0f94
_0209e6f0: .word gPlayerPos
_0209e6f4: .word data_027e0d38
arm_func_end func_ov00_0209e594
@@ -8061,7 +8061,7 @@ func_ov00_0209e6f8: ; 0x0209e6f8
ldr r4, [r0, #0x5c]
cmp r4, #0
ble _0209e7fc
ldr r0, _0209e858 ; =data_027e0f94
ldr r0, _0209e858 ; =gPlayerPos
ldr r1, [r6, #0x18]
ldr r3, [r0]
ldr r2, [r0, #4]
@@ -8127,7 +8127,7 @@ _0209e7fc:
add sp, sp, #0x28
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0209e858: .word data_027e0f94
_0209e858: .word gPlayerPos
_0209e85c: .word data_027e0d38
arm_func_end func_ov00_0209e6f8
@@ -11537,7 +11537,7 @@ _020a12f8:
add r0, r4, #0x18
add r1, sp, #0
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
@@ -11551,7 +11551,7 @@ func_ov00_020a132c: ; 0x020a132c
sub sp, sp, #0x24
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r3, _020a1384 ; =data_02050f54
ldr r3, _020a1384 ; =gSinCosTable
add r0, sp, #0
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -11570,7 +11570,7 @@ func_ov00_020a132c: ; 0x020a132c
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_020a1384: .word data_02050f54
_020a1384: .word gSinCosTable
arm_func_end func_ov00_020a132c
.global func_ov00_020a1388
@@ -11697,7 +11697,7 @@ func_ov00_020a142c: ; 0x020a142c
mov r2, r2, asr #0x4
mov r2, r2, lsl #0x1
add r3, r2, #1
ldr r2, _020a1538 ; =data_02050f54
ldr r2, _020a1538 ; =gSinCosTable
mov r3, r3, lsl #0x1
ldrsh r2, [r2, r3]
orr r1, r1, r0, lsl #20
@@ -11717,7 +11717,7 @@ _020a152c:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020a1534: .word 0x02710000
_020a1538: .word data_02050f54
_020a1538: .word gSinCosTable
arm_func_end func_ov00_020a142c
.global func_ov00_020a153c
@@ -12294,7 +12294,7 @@ func_ov00_020a1b54: ; 0x020a1b54
add r3, r1, #1
mov r2, r2, lsl #0x1
mov r5, r3, lsl #0x1
ldr r4, _020a1c60 ; =data_02050f54
ldr r4, _020a1c60 ; =gSinCosTable
mov r3, r2, lsl #0x1
ldrsh ip, [r4, r5]
ldrsh r4, [r4, r3]
@@ -12314,7 +12314,7 @@ func_ov00_020a1b54: ; 0x020a1b54
cmp r5, lr
movlt r5, lr
_020a1bcc:
ldr r4, _020a1c60 ; =data_02050f54
ldr r4, _020a1c60 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r4, [r4, r1]
strh r5, [r0, #8]
@@ -12329,7 +12329,7 @@ _020a1bcc:
movlt r5, r1
_020a1c00:
add r2, r2, #1
ldr r1, _020a1c60 ; =data_02050f54
ldr r1, _020a1c60 ; =gSinCosTable
mov r2, r2, lsl #0x1
ldrsh r4, [r1, r2]
strh r5, [r0, #0xa]
@@ -12354,7 +12354,7 @@ _020a1c58:
strh r3, [r0, #0xc]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020a1c60: .word data_02050f54
_020a1c60: .word gSinCosTable
_020a1c64: .word 0x00000fff
arm_func_end func_ov00_020a1b54
@@ -12631,7 +12631,7 @@ func_ov00_020a1f24: ; 0x020a1f24
str r0, [r4, #0x2c]
ldmia sp!, {r4, pc}
_020a1f90:
ldr r0, _020a1fcc ; =data_027e0f94
ldr r0, _020a1fcc ; =gPlayerPos
ldr r1, [r0]
str r1, [r4, #0x18]
ldr r1, [r0, #4]
@@ -12647,7 +12647,7 @@ _020a1f90:
ldmia sp!, {r4, pc}
.align 2, 0
_020a1fc8: .word gMapManager
_020a1fcc: .word data_027e0f94
_020a1fcc: .word gPlayerPos
arm_func_end func_ov00_020a1f24
.global func_ov00_020a1fd0
@@ -12660,7 +12660,7 @@ func_ov00_020a1fd0: ; 0x020a1fd0
ldr r3, [r7, #0x1c]
ldr r2, [r7, #0x20]
ldr r0, [r7, #0x18]
ldr r1, _020a2220 ; =data_027e0fac
ldr r1, _020a2220 ; =gPlayerAngle
str r4, [sp, #4]
str r2, [sp, #8]
str r0, [sp]
@@ -12804,7 +12804,7 @@ _020a21d0:
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
_020a2220: .word data_027e0fac
_020a2220: .word gPlayerAngle
_020a2224: .word gMapManager
arm_func_end func_ov00_020a1fd0
@@ -12883,10 +12883,10 @@ func_ov00_020a22d0: ; 0x020a22d0
mvn r1, #0
bl func_ov00_02090efc
mvn r0, #0
ldr r1, _020a239c ; =data_027e0f94
ldr r1, _020a239c ; =gPlayerPos
str r0, [r5, #0x1c]
ldr r0, [r1]
ldr r3, _020a23a0 ; =data_027e0fac
ldr r3, _020a23a0 ; =gPlayerAngle
str r0, [r5, #0x20]
ldr r2, [r1, #4]
mov r0, r5
@@ -12930,8 +12930,8 @@ _020a238c:
bl func_ov00_02090f08
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020a239c: .word data_027e0f94
_020a23a0: .word data_027e0fac
_020a239c: .word gPlayerPos
_020a23a0: .word gPlayerAngle
arm_func_end func_ov00_020a22d0
.global func_ov00_020a23a4
@@ -12967,7 +12967,7 @@ _020a23d8:
mov r0, r3
mov r2, r3
add r1, r9, #0x20
bl func_01ff9bf8
bl Vec3p_Sub
add r0, r9, #0x20
add r3, sp, #0x10
ldmia r0, {r0, r1, r2}
@@ -12975,7 +12975,7 @@ _020a23d8:
ldr r0, [sp, #0xec]
add r1, sp, #0x1c
mov r2, r3
bl func_01ff9e64
bl Vec3p_Axpy
ldr r1, [sp, #0x10]
ldr r0, [sp, #0x14]
str r1, [sp, #0x40]
@@ -12999,7 +12999,7 @@ _020a23d8:
mov r6, r0
ldr r0, [sp, #0x1c]
ldr r1, [sp, #0x24]
bl func_01ffa0f4
bl Atan2
mov r10, r0, lsl #0x10
add r0, sp, #0x1c
add r3, sp, #4
@@ -13014,7 +13014,7 @@ _020a23d8:
rsb r1, r1, #0
str r0, [sp, #4]
str r1, [sp, #0xc]
bl func_01ffa0f4
bl Atan2
mov r0, r0, lsl #0x10
mov r1, r0, asr #0x10
ldr r0, [sp, #0x104]
@@ -17773,7 +17773,7 @@ func_ov00_020a6110: ; 0x020a6110
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
add r1, r3, #1
ldr r2, _020a61a8 ; =data_02050f54
ldr r2, _020a61a8 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r2, r1]
ldmib r0, {r6, ip}
@@ -17806,7 +17806,7 @@ func_ov00_020a6110: ; 0x020a6110
str r1, [r0, #8]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020a61a8: .word data_02050f54
_020a61a8: .word gSinCosTable
arm_func_end func_ov00_020a6110
.global func_ov00_020a61ac
@@ -17818,7 +17818,7 @@ func_ov00_020a61ac: ; 0x020a61ac
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
add r1, r3, #1
ldr r2, _020a624c ; =data_02050f54
ldr r2, _020a624c ; =gSinCosTable
mov r4, r3, lsl #0x1
mov r1, r1, lsl #0x1
ldr r3, [r0]
@@ -17853,7 +17853,7 @@ func_ov00_020a61ac: ; 0x020a61ac
str r1, [r0, #8]
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_020a624c: .word data_02050f54
_020a624c: .word gSinCosTable
arm_func_end func_ov00_020a61ac
.global func_ov00_020a6250
@@ -17865,7 +17865,7 @@ func_ov00_020a6250: ; 0x020a6250
mov r1, r1, asr #0x4
mov r3, r1, lsl #0x1
add r1, r3, #1
ldr r2, _020a62e8 ; =data_02050f54
ldr r2, _020a62e8 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r2, r1]
ldmia r0, {r6, ip}
@@ -17898,7 +17898,7 @@ func_ov00_020a6250: ; 0x020a6250
str r1, [r0, #4]
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_020a62e8: .word data_02050f54
_020a62e8: .word gSinCosTable
arm_func_end func_ov00_020a6250
.global func_ov00_020a62ec
@@ -18440,7 +18440,7 @@ func_ov00_020a6908: ; 0x020a6908
func_ov00_020a6924: ; 0x020a6924
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0xf0
ldr r2, _020a6de4 ; =data_027e0f94
ldr r2, _020a6de4 ; =gPlayerPos
mov r10, r0
ldr r3, [r2]
ldr r0, [r2, #4]
@@ -18475,7 +18475,7 @@ _020a6970:
str r2, [sp, #0x10]
str r4, [sp, #0x14]
str r3, [sp, #0x18]
bl func_01ff9ec0
bl Vec3p_Distance
mov r4, r0
cmp r4, #0x1800
bgt _020a6ad0
@@ -18493,7 +18493,7 @@ _020a6970:
str r3, [sp, #8]
ldr r3, [r5, #0x298]
str r3, [sp, #0xc]
bl func_01ff9bf8
bl Vec3p_Sub
mov r2, #0
mov r0, r6
sub r1, r2, #0x4000
@@ -18518,7 +18518,7 @@ _020a6a50:
add r0, sp, #0x7c
add r1, sp, #0x64
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
ldr r2, [r10, #0x1c]
ldr r1, [sp, #0x80]
ldr r0, _020a6dec ; =0x00001ccd
@@ -18562,10 +18562,10 @@ _020a6ae0:
add r1, sp, #0x7c
mov r0, r3
mov r2, r3
bl func_01ff9bf8
bl Vec3p_Sub
ldr r0, [sp, #0x58]
ldr r1, [sp, #0x60]
bl func_01ffa0f4
bl Atan2
mov r2, r0, lsl #0x10
add r1, sp, #0x7c
mov r0, r10
@@ -18611,11 +18611,11 @@ _020a6b9c:
add r1, sp, #0x7c
mov r0, r3
mov r2, r3
bl func_01ff9bf8
bl Vec3p_Sub
ldr r0, [sp, #0x40]
ldr r1, [sp, #0x48]
bl func_01ffa0f4
ldr r1, _020a6de4 ; =data_027e0f94
bl Atan2
ldr r1, _020a6de4 ; =gPlayerPos
mov r0, r0, lsl #0x10
ldr r2, [r1]
mov r4, r0, asr #0x10
@@ -18631,9 +18631,9 @@ _020a6b9c:
mov r0, r3
mov r2, r3
add r1, sp, #0x34
bl func_01ff9bf8
bl Vec3p_Sub
add r0, sp, #0x28
bl func_01ff9cec
bl Vec3p_Length
mov r5, r0
mov r0, r10
bl func_ov00_02090a7c
@@ -18746,7 +18746,7 @@ _020a6d70:
add r0, sp, #0x34
add r1, sp, #0x28
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
ldr r0, [sp, #0x34]
str r0, [r10, #0x18]
ldr r0, [sp, #0x38]
@@ -18756,7 +18756,7 @@ _020a6d70:
add sp, sp, #0xf0
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_020a6de4: .word data_027e0f94
_020a6de4: .word gPlayerPos
_020a6de8: .word data_027e10a4
_020a6dec: .word 0x00001ccd
_020a6df0: .word 0x00000333
@@ -24529,7 +24529,7 @@ data_ov00_020e4c68: ; 0x020e4c68
.word _ZN5Actor8vfunc_18Ej
.global data_ov00_020e4c6c
data_ov00_020e4c6c: ; 0x020e4c6c
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov00_020e4c70
data_ov00_020e4c70: ; 0x020e4c70
.word _ZN5Actor8vfunc_20Ei
@@ -24559,10 +24559,10 @@ data_ov00_020e4c90: ; 0x020e4c90
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov00_020e4c94
data_ov00_020e4c94: ; 0x020e4c94
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov00_020e4c98
data_ov00_020e4c98: ; 0x020e4c98
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e4c9c
data_ov00_020e4c9c: ; 0x020e4c9c
.word _ZN5Actor8vfunc_4cEPi
@@ -24992,7 +24992,7 @@ data_ov00_020e4f10: ; 0x020e4f10
.word _ZN5Actor8vfunc_18Ej
.global data_ov00_020e4f14
data_ov00_020e4f14: ; 0x020e4f14
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov00_020e4f18
data_ov00_020e4f18: ; 0x020e4f18
.word _ZN5Actor8vfunc_20Ei
@@ -25022,10 +25022,10 @@ data_ov00_020e4f38: ; 0x020e4f38
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov00_020e4f3c
data_ov00_020e4f3c: ; 0x020e4f3c
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov00_020e4f40
data_ov00_020e4f40: ; 0x020e4f40
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e4f44
data_ov00_020e4f44: ; 0x020e4f44
.word _ZN5Actor8vfunc_4cEPi
@@ -25686,7 +25686,7 @@ data_ov00_020e5314: ; 0x020e5314
.word _ZN5Actor8vfunc_18Ej
.global data_ov00_020e5318
data_ov00_020e5318: ; 0x020e5318
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov00_020e531c
data_ov00_020e531c: ; 0x020e531c
.word _ZN5Actor8vfunc_20Ei
@@ -25716,10 +25716,10 @@ data_ov00_020e533c: ; 0x020e533c
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov00_020e5340
data_ov00_020e5340: ; 0x020e5340
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov00_020e5344
data_ov00_020e5344: ; 0x020e5344
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov00_020e5348
data_ov00_020e5348: ; 0x020e5348
.word _ZN5Actor8vfunc_4cEPi
asm/ov00/ov00_020a8e04.inc
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
.extern _ZN9SysObjectdlEPv
.extern data_02050f54
.extern gSinCosTable
.extern data_027e016c
.extern data_027e0194
.extern data_027e037c
asm/ov00/ov00_020a8e04.s
+5 -5
View File
@@ -858,7 +858,7 @@ _020a9c94:
bne _020a9d48
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _020a9dbc ; =data_02050f54
ldr r1, _020a9dbc ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r3, [r1, r0]
@@ -873,7 +873,7 @@ _020a9c94:
mov r0, r8, asr #0x4
mov r2, r0, lsl #0x1
add r0, r2, #1
ldr r1, _020a9dbc ; =data_02050f54
ldr r1, _020a9dbc ; =gSinCosTable
mov r2, r2, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r3, [r1, r0]
@@ -890,7 +890,7 @@ _020a9c94:
_020a9d48:
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _020a9dbc ; =data_02050f54
ldr r2, _020a9dbc ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -904,7 +904,7 @@ _020a9d48:
mov r0, r8, asr #0x4
mov r1, r0, lsl #0x1
add r0, r1, #1
ldr r2, _020a9dbc ; =data_02050f54
ldr r2, _020a9dbc ; =gSinCosTable
mov r1, r1, lsl #0x1
mov r0, r0, lsl #0x1
ldrsh r1, [r2, r1]
@@ -918,7 +918,7 @@ _020a9d48:
add sp, sp, #0x94
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_020a9dbc: .word data_02050f54
_020a9dbc: .word gSinCosTable
arm_func_end func_ov00_020a9c14
.global func_ov00_020a9dc0
asm/ov00/ov00_020b1498.inc
+27 -26
View File
@@ -1,5 +1,13 @@
#pragma once
.extern Atan2
.extern Divide
.extern Vec3p_Add
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Vec3p_Dot
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Sub
.extern _ZN10MapManager16MapData_vfunc_54Ev
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_78Ev
@@ -26,10 +34,10 @@
.extern _ZN10MapManager18func_ov00_02084164Ev
.extern _ZN10MapManager18func_ov00_020853fcEv
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern _ZN10PlayerBase14GetEquipShieldEv
.extern _ZN10PlayerBase18TeleportToEntranceEib
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase8TeleportEP5Vec3psibb
.extern _ZN10PlayerBase8vfunc_04Ev
.extern _ZN10PlayerBase9AddHealthEs
@@ -37,9 +45,10 @@
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN11ItemManager13UnequipPotionEv
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern _ZN11ItemManager4SaveEP15SaveItemManager
.extern _ZN11ItemManager8GiveAmmoEit
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
@@ -93,12 +102,13 @@
.extern _ZN17LinkStateInteract20CreateDebugHierarchyEv
.extern _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
.extern _ZN17LinkStateInteract4GrabEP8ActorRef
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern _ZN4Item18func_ov00_020ad068Ei
.extern _ZN5Actor10GetLinkPosEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
@@ -107,21 +117,21 @@
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1c20Eii
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -150,6 +160,7 @@
.extern _ZN7MapBase18func_ov00_0207e96cEv
.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE
.extern _ZN9ActorTypeD1Ev
.extern _ZN9EquipRope18func_ov14_0213d420Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager16GetEquippedFairyEv
@@ -159,7 +170,6 @@
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern __register_global_object
.extern data_02050f54
.extern data_02051f54
.extern data_02052f54
.extern data_02053f54
@@ -178,7 +188,6 @@
.extern data_027e0c54
.extern data_027e0c68
.extern data_027e0ce0
.extern data_027e0d0c
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d44
@@ -188,21 +197,13 @@
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f78
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fb8
.extern gHealthManager
.extern data_027e0fc4
.extern data_027e0fc8
.extern data_027e0fcc
.extern data_027e0fd0
.extern data_027e0fd4
.extern data_027e0fd8
.extern data_027e0fdc
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
@@ -228,21 +229,12 @@
.extern func_01ff8690
.extern func_01ff9158
.extern func_01ff992c
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern func_01ffa9fc
.extern func_01ffb7ec
.extern func_01ffbf5c
.extern func_01ffe468
.extern func_01fffbec
.extern func_01fffcd8
.extern func_01fffcec
.extern func_02002c14
.extern func_020059ec
.extern func_020078d8
@@ -442,7 +434,6 @@
.extern func_ov12_02134378
.extern func_ov12_021343bc
.extern func_ov14_021238f0
.extern func_ov14_0213d420
.extern func_ov14_0213dfbc
.extern func_ov14_0213e144
.extern func_ov14_021474ac
@@ -457,8 +448,18 @@
.extern func_ov59_0219af14
.extern func_ov59_0219afc4
.extern func_ov59_0219b020
.extern gActorManager
.extern gAdventureFlags
.extern gHealthManager
.extern gItemManager
.extern gMapManager
.extern gOverlayManager
.extern gPlayer
.extern gPlayerAngle
.extern gPlayerControl
.extern gPlayerLink
.extern gPlayerPos
.extern gPlayerVel
.extern gSinCosTable
.extern gVec3p_ZERO
.extern strcat
asm/ov00/ov00_020b1498.s
+374 -402
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020c3e54.inc
+26 -26
View File
@@ -1,6 +1,15 @@
#pragma once
.extern Approach_thunk
.extern Atan2
.extern Divide
.extern Vec3p_Add
.extern Vec3p_Axpy
.extern Vec3p_Cross
.extern Vec3p_Distance
.extern Vec3p_Dot
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Sub
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager17GetMapData_Unk_48Ev
@@ -25,7 +34,7 @@
.extern _ZN10PlayerBase14GetEquipShieldEv
.extern _ZN11ItemManager15SetEquippedItemEi
.extern _ZN11ItemManager18func_ov00_020ad790Ei
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
@@ -40,17 +49,19 @@
.extern _ZN17LinkStateInteract18func_ov00_020abba0EP8ActorRef
.extern _ZN17LinkStateInteract18func_ov00_020abbdcEP8ActorRef
.extern _ZN17LinkStateInteract18func_ov00_020abc18EP8ActorRef
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10GetUnk_08cEP8Cylinder
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12KillInBoundsEv
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor13func_01fffd04Ei
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor15IsHitboxTouchedEb
@@ -60,10 +71,10 @@
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c195cEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1c20Eii
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c243cEPjPPS_
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor18func_ov00_020c3118Es
.extern _ZN5Actor18func_ov00_020c313cEj
@@ -75,14 +86,14 @@
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -115,7 +126,7 @@
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern __register_global_object
.extern data_02050f54
.extern abs
.extern data_020561f4
.extern data_02056be4
.extern data_02057840
@@ -130,7 +141,6 @@
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d0c
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d44
@@ -144,14 +154,8 @@
.extern data_027e0f70
.extern data_027e0f78
.extern data_027e0f88
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
@@ -327,23 +331,13 @@
.extern func_01ff9958
.extern func_01ff998c
.extern func_01ff9b4c
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_01ff9c68
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ff9f3c
.extern func_01ffa0f4
.extern func_01ffa8d4
.extern func_01ffbe34
.extern func_01ffbe78
.extern func_01ffe1cc
.extern func_01ffe468
.extern func_01fffb4c
.extern func_01fffd04
.extern func_020029fc
.extern func_02002bac
.extern func_02002bb8
@@ -499,7 +493,6 @@
.extern func_0203e284
.extern func_0203efd8
.extern func_0203f378
.extern func_02042f74
.extern func_0204b068
.extern func_0204b0a4
.extern func_0204f558
@@ -593,7 +586,6 @@
.extern func_ov00_020c0cc8
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c3348
.extern func_ov01_020f8658
.extern func_ov03_020f13b0
@@ -666,11 +658,19 @@
.extern func_ov26_0216ecb8
.extern func_ov26_021767ec
.extern func_ov29_0216d918
.extern gActorManager
.extern gAdventureFlags
.extern gHealthManager
.extern gItemManager
.extern gMapManager
.extern gOverlayManager
.extern gPlayer
.extern gPlayerAngle
.extern gPlayerControl
.extern gPlayerLink
.extern gPlayerPos
.extern gSinCosTable
.extern gVec3p_ZERO
.extern strcat
.extern strcpy
.extern strncpy
asm/ov00/ov00_020c3e54.s
+281 -281
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020d59f0.inc
+5 -5
View File
@@ -100,7 +100,7 @@ func_ov00_020d5a68: ; 0x020d5a68
mov r2, r4, asr #0x4
add r0, r1, #0x800
mov r0, r0, asr #0x10
ldr r1, _020d5c4c ; =data_02050f54
ldr r1, _020d5c4c ; =gSinCosTable
mov r2, r2, lsl #0x2
mov r0, r0, lsl #0x2
ldrsh r6, [r1, r2]
@@ -110,7 +110,7 @@ func_ov00_020d5a68: ; 0x020d5a68
mul r1, r7, r4
add r1, r1, #0x800
mov r1, r1, asr #0x10
ldr r2, _020d5c4c ; =data_02050f54
ldr r2, _020d5c4c ; =gSinCosTable
mov r3, r1, lsl #0x2
mov r1, r6
mov r4, r0
@@ -160,7 +160,7 @@ _020d5bac:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
arm_func_end func_ov00_020d5a68
_020d5c4c: .word data_02050f54
_020d5c4c: .word gSinCosTable
.global func_ov00_020d5c50
arm_func_start func_ov00_020d5c50
@@ -441,7 +441,7 @@ _020d5ff8:
beq _020d6108
add r0, sp, #0xc
mov r1, r4
bl func_01ff9c2c
bl Vec3p_Dot
add r0, r0, #0x1000
mov r0, r0, lsl #0x1
bl func_01ff9958
@@ -449,7 +449,7 @@ _020d5ff8:
add r0, sp, #0xc
add r1, sp, #0x18
add r2, sp, #0
bl func_01ff9c68
bl Vec3p_Cross
cmp r4, #0
rsblt r0, r4, #0
movge r0, r4
asm/ov02.inc
+3 -3
View File
@@ -17,7 +17,7 @@
.extern _ZNK11ItemManager21HasTreasurePriceShownEj
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02057200
.extern data_020691a0
.extern data_027e037c
@@ -29,7 +29,7 @@
.extern data_027e077c
.extern data_027e0c68
.extern data_027e0cbc
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d44
.extern data_027e0d78
.extern data_027e0f88
@@ -54,7 +54,7 @@
.extern func_01ff8690
.extern func_01ff9b4c
.extern func_01ff9b88
.extern func_01ff9bc4
.extern Vec3p_Add
.extern func_01ffa9fc
.extern func_01ffbe34
.extern func_02002c14
asm/ov02.s
+12 -12
View File
@@ -5249,7 +5249,7 @@ func_ov02_020f30f8: ; 0x020f30f8
strh r2, [r4, #0x16]
ldrsh r1, [r4, #0x16]
ldrsh ip, [r4, #0x14]
ldr r0, _020f31ec ; =data_02050f54
ldr r0, _020f31ec ; =gSinCosTable
add r1, r1, r1, lsr #31
mov r2, r1, lsl #0xf
add r1, ip, ip, lsr #31
@@ -5300,7 +5300,7 @@ func_ov02_020f30f8: ; 0x020f30f8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020f31e8: .word data_ov09_0211f530
_020f31ec: .word data_02050f54
_020f31ec: .word gSinCosTable
arm_func_end func_ov02_020f30f8
.global func_ov02_020f31f0
@@ -5342,7 +5342,7 @@ func_ov02_020f3228: ; 0x020f3228
add r0, r4, #4
bl func_ov00_020d5cd8
ldr r0, [r4]
ldr r2, _020f3264 ; =data_027e0d0c
ldr r2, _020f3264 ; =gVec3p_ZERO
ldr ip, [r0]
add r1, sp, #0
ldr ip, [ip, #0xc]
@@ -5351,7 +5351,7 @@ func_ov02_020f3228: ; 0x020f3228
add sp, sp, #0x24
ldmia sp!, {r3, r4, pc}
.align 2, 0
_020f3264: .word data_027e0d0c
_020f3264: .word gVec3p_ZERO
arm_func_end func_ov02_020f3228
.global func_ov02_020f3268
@@ -5538,11 +5538,11 @@ _020f34a8:
add r0, r5, #0x158
add r1, r5, #0x14c
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
add r0, r5, #0x188
add r1, r5, #0x17c
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
_020f34c8:
mov r0, r5
ldr r1, [r0]
@@ -5574,7 +5574,7 @@ func_ov02_020f34e8: ; 0x020f34e8
ldr r1, _020f35d4 ; =data_027e0384
str r2, [sp, #8]
str r1, [sp, #0xc]
ldr r2, _020f35d8 ; =data_02050f54
ldr r2, _020f35d8 ; =gSinCosTable
mov r3, r3, lsl #0x1
mov r1, r0, lsl #0x1
ldrsh r0, [r2, r3]
@@ -5619,7 +5619,7 @@ func_ov02_020f34e8: ; 0x020f34e8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020f35d4: .word data_027e0384
_020f35d8: .word data_02050f54
_020f35d8: .word gSinCosTable
_020f35dc: .word data_027e037c
_020f35e0: .word data_027e03c8
arm_func_end func_ov02_020f34e8
@@ -8950,7 +8950,7 @@ func_ov02_020f6324: ; 0x020f6324
addlt sp, sp, #0x54
ldmltia sp!, {r3, r4, pc}
ldrh r1, [r4, #0x20]
ldr r3, _020f6428 ; =data_02050f54
ldr r3, _020f6428 ; =gSinCosTable
add r0, sp, #0x30
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -8961,7 +8961,7 @@ func_ov02_020f6324: ; 0x020f6324
ldrsh r2, [r3, r2]
blx func_01ff8230
ldrh r1, [r4, #0x1c]
ldr r3, _020f6428 ; =data_02050f54
ldr r3, _020f6428 ; =gSinCosTable
add r0, sp, #0xc
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -8977,7 +8977,7 @@ func_ov02_020f6324: ; 0x020f6324
bl func_01ff8690
ldrh r2, [r4, #0x22]
ldrh r1, [r4, #0x1e]
ldr r3, _020f6428 ; =data_02050f54
ldr r3, _020f6428 ; =gSinCosTable
add r0, sp, #0xc
add r1, r2, r1
mov r1, r1, lsl #0x10
@@ -9008,7 +9008,7 @@ func_ov02_020f6324: ; 0x020f6324
add sp, sp, #0x54
ldmia sp!, {r3, r4, pc}
.align 2, 0
_020f6428: .word data_02050f54
_020f6428: .word gSinCosTable
arm_func_end func_ov02_020f6324
.global func_ov02_020f642c
asm/ov03.inc
+31 -31
View File
@@ -1,6 +1,25 @@
#pragma once
.extern Atan2
.extern Divide
.extern FastDivide
.extern _ZN10MapManager13GetCourseMaxXEv
.extern _ZN10MapManager13GetCourseMaxZEv
.extern _ZN10MapManager13GetCourseMinXEv
.extern _ZN10MapManager13GetCourseMinZEv
.extern _ZN10MapManager18func_ov00_02082614Eii
.extern _ZN10MapManager18func_ov00_02082accEv
.extern _ZN10MapManager18func_ov00_02082d08Ev
.extern _ZN10MapManager18func_ov00_02082d40Ev
.extern _ZN10MapManager18func_ov00_02082d74Ei
.extern _ZN10MapManager18func_ov00_0208306cEv
.extern _ZN10MapManager18func_ov00_0208315cEPiS0_
.extern _ZN10MapManager18func_ov00_02083588Ev
.extern _ZN10MapManager18func_ov00_020835a4Ev
.extern _ZN10MapManager18func_ov00_020835b4Ev
.extern _ZN10MapManager18func_ov00_020835c4Eii
.extern _ZN10MapManager18func_ov00_020835f4Ei
.extern _ZN10MapManager18func_ov00_020836ccEjP4AABBj
.extern _ZN10MapManager18func_ov00_020849c0Ev
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN11ItemManager18func_ov00_020ad790Ei
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
@@ -13,7 +32,7 @@
.extern _ZN14OverlayManager6UnloadEj
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
@@ -22,13 +41,13 @@
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -52,14 +71,15 @@
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager10GetNumKeysEv
.extern _ZNK11ItemManager15GetEquippedItemEv
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager10GetNumKeysEv
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern data_02056be4
.extern data_02057b18
.extern data_020683f4
@@ -93,15 +113,10 @@
.extern data_027e0e28
.extern data_027e0e2c
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f7c
.extern data_027e0f84
.extern data_027e0f88
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fb8
.extern data_027e0fc8
.extern data_027e0fe0
.extern data_027e103c
.extern data_027e1044
@@ -128,7 +143,6 @@
.extern func_01ff9b24
.extern func_01ff9b4c
.extern func_01ff9b88
.extern func_01ffa0f4
.extern func_01ffa8d4
.extern func_01ffb7ec
.extern func_01ffbe34
@@ -221,8 +235,6 @@
.extern func_0203d77c
.extern func_0203d7b8
.extern func_0203d7e0
.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE
.extern _ZN9ActorTypeD1Ev
.extern func_0203eadc
.extern func_0203eba8
.extern func_0203ebc8
@@ -266,24 +278,6 @@
.extern func_ov00_0207c0ac
.extern func_ov00_0207c0cc
.extern func_ov00_0207c5b0
.extern _ZN10MapManager18func_ov00_02082614Eii
.extern _ZN10MapManager18func_ov00_02082accEv
.extern _ZN10MapManager18func_ov00_02082d08Ev
.extern _ZN10MapManager18func_ov00_02082d40Ev
.extern _ZN10MapManager18func_ov00_02082d74Ei
.extern _ZN10MapManager18func_ov00_0208306cEv
.extern _ZN10MapManager18func_ov00_0208315cEPiS0_
.extern _ZN10MapManager13GetCourseMinXEv
.extern _ZN10MapManager13GetCourseMinZEv
.extern _ZN10MapManager13GetCourseMaxXEv
.extern _ZN10MapManager13GetCourseMaxZEv
.extern _ZN10MapManager18func_ov00_02083588Ev
.extern _ZN10MapManager18func_ov00_020835a4Ev
.extern _ZN10MapManager18func_ov00_020835b4Ev
.extern _ZN10MapManager18func_ov00_020835c4Eii
.extern _ZN10MapManager18func_ov00_020835f4Ei
.extern _ZN10MapManager18func_ov00_020836ccEjP4AABBj
.extern _ZN10MapManager18func_ov00_020849c0Ev
.extern func_ov00_0208b180
.extern func_ov00_0208b694
.extern func_ov00_0208b698
@@ -500,7 +494,13 @@
.extern func_ov52_02196198
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern gOverlayManager
.extern gPlayer
.extern gPlayerControl
.extern gPlayerLink
.extern gPlayerPos
.extern gSinCosTable
.extern strcat
.extern strcmp
.extern strcpy
asm/ov03.s
+48 -48
View File
@@ -1055,7 +1055,7 @@ _020ef474:
add r2, r7, #0
ldrsh r2, [r6, r2]
sub r1, r1, r2
blx func_01ffa0f4
blx Atan2
str r0, [sp, #0x5c]
b _020ef524
_020ef4b8:
@@ -1114,7 +1114,7 @@ _020ef50e:
ldrsh r2, [r5, r1]
ldr r1, [sp, #0xc]
sub r1, r2, r1
blx func_01ffa0f4
blx Atan2
str r0, [sp, #0x5c]
_020ef524:
ldr r0, [sp, #0x40]
@@ -1180,7 +1180,7 @@ _020ef58e:
ldrsh r2, [r5, r1]
ldr r1, [sp, #4]
sub r1, r2, r1
blx func_01ffa0f4
blx Atan2
str r0, [sp, #0x5c]
b _020ef5e4
_020ef5a6:
@@ -1209,7 +1209,7 @@ _020ef5a6:
ldrsh r2, [r5, r2]
sub r1, r3, r1
sub r0, r0, r2
blx func_01ffa0f4
blx Atan2
str r0, [sp, #0x5c]
b _020ef5e4
_020ef5e0:
@@ -2205,7 +2205,7 @@ _020efcc6:
lsl r0, r0, #0xc
sub r1, r1, r2
lsl r1, r1, #0xc
blx func_01ffa0f4
blx Atan2
str r0, [sp, #0x1c]
b _020efdee
_020efce6:
@@ -2264,7 +2264,7 @@ _020efd1a:
lsl r0, r0, #0xc
sub r1, r2, r1
lsl r1, r1, #0xc
blx func_01ffa0f4
blx Atan2
ldr r1, [sp, #0x1c]
sub r0, r1, r0
lsl r0, r0, #0x10
@@ -2285,7 +2285,7 @@ _020efd5c:
lsl r0, r0, #0xc
sub r1, r2, r1
lsl r1, r1, #0xc
blx func_01ffa0f4
blx Atan2
str r0, [sp, #0x1c]
lsl r0, r5, #1
strh r6, [r7, r0]
@@ -2297,7 +2297,7 @@ _020efd82:
_020efd88:
lsl r0, r2, #0xc
lsl r1, r1, #0xc
blx func_01ffa0f4
blx Atan2
ldr r1, [sp, #0x1c]
sub r1, r1, r0
lsl r1, r1, #0x10
@@ -3876,7 +3876,7 @@ _020f0c38:
mov r1, #1
str r1, [sp]
ldr r0, _020f0e30 ; =data_027e0d3c
ldr r1, _020f0e34 ; =data_027e0f94
ldr r1, _020f0e34 ; =gPlayerPos
ldr r0, [r0]
add r2, sp, #0x20
add r3, sp, #0x1c
@@ -4008,7 +4008,7 @@ _020f0e20:
.align 2, 0
_020f0e2c: .word data_027e0c54
_020f0e30: .word data_027e0d3c
_020f0e34: .word data_027e0f94
_020f0e34: .word gPlayerPos
_020f0e38: .word 0x00001ccd
_020f0e3c: .word gMapManager
_020f0e40: .word 0x00002ccd
@@ -4460,7 +4460,7 @@ _020f128c:
ldr r0, [r0]
cmp r0, #0x3b
beq _020f1350
ldr r0, _020f13a8 ; =data_027e0fc8
ldr r0, _020f13a8 ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _020f1330
@@ -4502,7 +4502,7 @@ _020f1398: .word data_027e103c
_020f139c: .word gAdventureFlags
_020f13a0: .word data_027e0c68
_020f13a4: .word data_027e0e28
_020f13a8: .word data_027e0fc8
_020f13a8: .word gPlayerLink
_020f13ac: .word data_ov09_0211f5b4
arm_func_end func_ov03_020f125c
@@ -5688,7 +5688,7 @@ func_ov03_020f2294: ; 0x020f2294
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _020f22d0
ldr r0, _020f2318 ; =data_027e0f90
ldr r0, _020f2318 ; =gPlayer
ldr r0, [r0]
ldrb r0, [r0, #0x11]
cmp r0, #0
@@ -5713,7 +5713,7 @@ _020f22d0:
ldmia sp!, {r4, pc}
.align 2, 0
_020f2314: .word gAdventureFlags
_020f2318: .word data_027e0f90
_020f2318: .word gPlayer
_020f231c: .word data_027e103c
_020f2320: .word 0x0000019f
arm_func_end func_ov03_020f2294
@@ -5731,7 +5731,7 @@ func_ov03_020f2324: ; 0x020f2324
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _020f2360
ldr r0, _020f23a8 ; =data_027e0f90
ldr r0, _020f23a8 ; =gPlayer
ldr r0, [r0]
ldrb r0, [r0, #0x11]
cmp r0, #0
@@ -5756,7 +5756,7 @@ _020f2360:
ldmia sp!, {r4, pc}
.align 2, 0
_020f23a4: .word gAdventureFlags
_020f23a8: .word data_027e0f90
_020f23a8: .word gPlayer
_020f23ac: .word data_027e103c
_020f23b0: .word 0x0000019f
arm_func_end func_ov03_020f2324
@@ -6078,7 +6078,7 @@ func_ov03_020f2774: ; 0x020f2774
bl func_ov00_02078b40
cmp r0, #2
beq _020f27d0
ldr r0, _020f27e4 ; =data_027e0fb8
ldr r0, _020f27e4 ; =gPlayerControl
ldr r0, [r0]
ldrb r0, [r0, #0x79]
cmp r0, #0
@@ -6091,7 +6091,7 @@ _020f27d0:
.align 2, 0
_020f27dc: .word data_027e103c
_020f27e0: .word data_027e0d38
_020f27e4: .word data_027e0fb8
_020f27e4: .word gPlayerControl
arm_func_end func_ov03_020f2774
.global func_ov03_020f27e8
@@ -6149,7 +6149,7 @@ func_ov03_020f2848: ; 0x020f2848
bl func_ov03_020f3f94
cmp r0, #0
bne _020f28b8
ldr r0, _020f28fc ; =data_027e0fc8
ldr r0, _020f28fc ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _020f28d4
@@ -6177,7 +6177,7 @@ _020f28d4:
_020f28f0: .word data_027e077c
_020f28f4: .word data_027e103c
_020f28f8: .word data_ov09_0211f5b4
_020f28fc: .word data_027e0fc8
_020f28fc: .word gPlayerLink
_020f2900: .word data_ov00_020eec9c
arm_func_end func_ov03_020f2848
@@ -9127,7 +9127,7 @@ _020f42b2:
ldr r0, _020f4304 ; =0x00000005
cmp r1, r0
bne _020f42c8
ldr r0, _020f4308 ; =data_027e0fc8
ldr r0, _020f4308 ; =gPlayerLink
ldr r0, [r0]
cmp r0, #0
beq _020f42c8
@@ -9159,7 +9159,7 @@ _020f42f8: .word data_027e103c
_020f42fc: .word data_027e0cbc
_020f4300: .word gOverlayManager
_020f4304: .word 0x00000005
_020f4308: .word data_027e0fc8
_020f4308: .word gPlayerLink
thumb_func_end func_ov03_020f4268
.global func_ov03_020f430c
@@ -9739,7 +9739,7 @@ func_ov03_020f4718: ; 0x020f4718
add r4, r1, #0
cmp r0, #0
bne _020f474c
ldr r0, _020f4758 ; =data_027e0f90
ldr r0, _020f4758 ; =gPlayer
mov r1, #5
ldr r0, [r0]
ldr r2, [r0]
@@ -9764,7 +9764,7 @@ _020f474c:
mov r0, #0
pop {r3, r4, r5, pc}
.align 2, 0
_020f4758: .word data_027e0f90
_020f4758: .word gPlayer
_020f475c: .word data_ov00_020eec9c
thumb_func_end func_ov03_020f4718
@@ -11816,7 +11816,7 @@ _020f5990: .word data_027e0d38
.global func_ov03_020f5994
arm_func_start func_ov03_020f5994
func_ov03_020f5994: ; 0x020f5994
ldr r1, _020f59cc ; =data_027e0f90
ldr r1, _020f59cc ; =gPlayer
ldr ip, _020f59d0 ; =func_ov03_020f59d4
ldr r2, [r1]
ldrb r1, [r2, #0x12]
@@ -11831,7 +11831,7 @@ func_ov03_020f5994: ; 0x020f5994
str r1, [r0, #8]
bx ip
.align 2, 0
_020f59cc: .word data_027e0f90
_020f59cc: .word gPlayer
_020f59d0: .word func_ov03_020f59d4 - 1
arm_func_end func_ov03_020f5994
@@ -12678,7 +12678,7 @@ _020f63b0:
thumb_func_start func_ov03_020f63d4
func_ov03_020f63d4: ; 0x020f63d4
push {r4, lr}
ldr r1, _020f6410 ; =data_027e0f90
ldr r1, _020f6410 ; =gPlayer
add r4, r0, #0
ldr r2, [r1]
mov r1, #0xa
@@ -12705,7 +12705,7 @@ func_ov03_020f63d4: ; 0x020f63d4
strb r2, [r4, r1]
pop {r4, pc}
.align 2, 0
_020f6410: .word data_027e0f90
_020f6410: .word gPlayer
_020f6414: .word gItemManager
thumb_func_end func_ov03_020f63d4
@@ -12922,7 +12922,7 @@ func_ov03_020f6714: ; 0x020f6714
stmdb sp!, {r4, lr}
mov r4, r0
bl func_ov03_020f7020
ldr r0, _020f676c ; =data_027e0f90
ldr r0, _020f676c ; =gPlayer
ldr r1, [r0]
ldrb r0, [r1, #0x12]
cmp r0, #0
@@ -12944,7 +12944,7 @@ _020f6750:
bl func_ov03_020f6a88
ldmia sp!, {r4, pc}
.align 2, 0
_020f676c: .word data_027e0f90
_020f676c: .word gPlayer
arm_func_end func_ov03_020f6714
.global func_ov03_020f6770
@@ -13287,7 +13287,7 @@ _020f6bc8:
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
mov r3, r0, lsl #0x2
ldr r1, _020f6d2c ; =data_02050f54
ldr r1, _020f6d2c ; =gSinCosTable
mov r2, #0x800
ldrsh r1, [r1, r3]
mov r0, #0x1000
@@ -13360,21 +13360,21 @@ _020f6cfc:
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, pc}
.align 2, 0
_020f6d28: .word data_027e0d38
_020f6d2c: .word data_02050f54
_020f6d2c: .word gSinCosTable
_020f6d30: .word gAdventureFlags
arm_func_end func_ov03_020f6b18
.global func_ov03_020f6d34
arm_func_start func_ov03_020f6d34
func_ov03_020f6d34: ; 0x020f6d34
ldr r1, _020f6d4c ; =data_027e0f90
ldr r1, _020f6d4c ; =gPlayer
ldr ip, _020f6d50 ; =func_ov03_020f57b8
ldr r1, [r1]
add r0, r0, #0x2c
ldrsh r1, [r1, #0xa]
bx ip
.align 2, 0
_020f6d4c: .word data_027e0f90
_020f6d4c: .word gPlayer
_020f6d50: .word func_ov03_020f57b8
arm_func_end func_ov03_020f6d34
@@ -13467,7 +13467,7 @@ func_ov03_020f6e10: ; 0x020f6e10
ldr r0, _020f6ef0 ; =data_027e0c38
ldr r0, [r0, #0x10]
cmp r0, #0
ldr r0, _020f6ef4 ; =data_027e0f90
ldr r0, _020f6ef4 ; =gPlayer
moveq r5, #0
ldr r0, [r0]
movne r5, #0xab
@@ -13496,7 +13496,7 @@ _020f6ee4: .word data_027e0db0
_020f6ee8: .word data_027e0d38
_020f6eec: .word data_027e0cbc
_020f6ef0: .word data_027e0c38
_020f6ef4: .word data_027e0f90
_020f6ef4: .word gPlayer
arm_func_end func_ov03_020f6e10
.global func_ov03_020f6ef8
@@ -13520,7 +13520,7 @@ func_ov03_020f6ef8: ; 0x020f6ef8
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
beq _020f6f58
ldr r0, _020f7000 ; =data_027e0f90
ldr r0, _020f7000 ; =gPlayer
ldr r0, [r0]
ldrb r0, [r0, #0x11]
cmp r0, #0
@@ -13538,7 +13538,7 @@ _020f6f58:
ldr r0, [r0, #0x10]
ldr r5, [r1]
cmp r0, #0
ldr r0, _020f7000 ; =data_027e0f90
ldr r0, _020f7000 ; =gPlayer
moveq r6, #0
ldr r0, [r0]
movne r6, #0xab
@@ -13570,7 +13570,7 @@ _020f6f58:
_020f6ff4: .word data_027e077c
_020f6ff8: .word data_027e0db0
_020f6ffc: .word gAdventureFlags
_020f7000: .word data_027e0f90
_020f7000: .word gPlayer
_020f7004: .word data_027e0cbc
_020f7008: .word data_027e0c38
_020f700c: .word gItemManager
@@ -13615,7 +13615,7 @@ _020f7068:
bl _ZN11ItemManager18func_ov00_020ad790Ei
cmp r0, #0
beq _020f70ac
ldr r0, _020f70c0 ; =data_027e0fb8
ldr r0, _020f70c0 ; =gPlayerControl
ldr r0, [r0]
ldrb r0, [r0, #0x79]
cmp r0, #0
@@ -13633,7 +13633,7 @@ _020f70ac:
.align 2, 0
_020f70b8: .word data_027e103c
_020f70bc: .word gItemManager
_020f70c0: .word data_027e0fb8
_020f70c0: .word gPlayerControl
_020f70c4: .word data_027e05f8
arm_func_end func_ov03_020f7020
@@ -17348,7 +17348,7 @@ func_ov03_020f9e50: ; 0x020f9e50
ldr r0, _020f9ec8 ; =data_027e0d3c
str r2, [sp, #0xc]
ldr r0, [r0]
ldr r1, _020f9ecc ; =data_027e0f94
ldr r1, _020f9ecc ; =gPlayerPos
add r3, r2, #0
blx func_ov00_02079470
mov r3, #0
@@ -17399,7 +17399,7 @@ _020f9ebc:
pop {r3, r4, r5, r6, r7, pc}
nop
_020f9ec8: .word data_027e0d3c
_020f9ecc: .word data_027e0f94
_020f9ecc: .word gPlayerPos
_020f9ed0: .word data_ov03_021007cc
_020f9ed4: .word 0x0000024d
thumb_func_end func_ov03_020f9e50
@@ -20577,7 +20577,7 @@ func_ov03_020fbd7c: ; 0x020fbd7c
bl func_ov00_0208b9e4
cmp r0, #0
beq _020fbdec
ldr r0, _020fbdfc ; =data_027e0fc8
ldr r0, _020fbdfc ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bc500
cmp r0, #6
@@ -20592,7 +20592,7 @@ _020fbdec:
bl func_ov14_0212559c
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020fbdfc: .word data_027e0fc8
_020fbdfc: .word gPlayerLink
arm_func_end func_ov03_020fbd7c
.global func_ov03_020fbe00
@@ -44952,7 +44952,7 @@ data_ov03_02100894: ; 0x02100894
.word func_ov03_020fbb34 - 1
.global data_ov03_02100898
data_ov03_02100898: ; 0x02100898
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov03_0210089c
data_ov03_0210089c: ; 0x0210089c
.word func_ov03_020fbca8 - 1
@@ -44982,10 +44982,10 @@ data_ov03_021008bc: ; 0x021008bc
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov03_021008c0
data_ov03_021008c0: ; 0x021008c0
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov03_021008c4
data_ov03_021008c4: ; 0x021008c4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov03_021008c8
data_ov03_021008c8: ; 0x021008c8
.word _ZN5Actor8vfunc_4cEPi
asm/ov04.inc
+16 -16
View File
@@ -1,4 +1,8 @@
#pragma once
.extern Atan2
.extern Vec3p_Add
.extern Vec3p_Distance
.extern Vec3p_Sub
.extern _ZN10MapManager10DestroyMapEv
.extern _ZN10MapManager14GetEntrancePosEP5Vec3pi
.extern _ZN10MapManager16MapData_vfunc_44Ev
@@ -29,7 +33,7 @@
.extern _ZN11ItemManager6CreateEv
.extern _ZN11ItemManager7DestroyEv
.extern _ZN12ActorManager11DeleteActorEjb
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
@@ -55,6 +59,8 @@
.extern _ZN14AdventureFlags4LoadEv
.extern _ZN14OverlayManager4LoadEjj
.extern _ZN14OverlayManager6UnloadEj
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN6Course11FindMapDataEj
@@ -89,6 +95,7 @@
.extern _ZTV15LinkStateDamage
.extern _ZTV15LinkStateFollow
.extern _ZTV17LinkStateInteract
.extern _ZTV7MapBase
.extern data_02056924
.extern data_02057200
.extern data_0205750c
@@ -116,7 +123,6 @@
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d0c
.extern data_027e0d28
.extern data_027e0d38
.extern data_027e0d3c
@@ -133,20 +139,13 @@
.extern data_027e0f70
.extern data_027e0f78
.extern data_027e0f7c
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern gHealthManager
.extern data_027e0fc0
.extern data_027e0fc4
.extern data_027e0fc8
.extern data_027e0fcc
.extern data_027e0fd0
.extern data_027e0fd4
.extern data_027e0fd8
.extern data_027e0fdc
.extern data_027e0fe4
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
@@ -177,7 +176,6 @@
.extern data_ov00_020dc7cc
.extern data_ov00_020dc7d0
.extern data_ov00_020e233c
.extern _ZTV7MapBase
.extern data_ov00_020e2508
.extern data_ov00_020e250c
.extern data_ov00_020e2544
@@ -272,10 +270,6 @@
.extern data_ov40_0218827c
.extern data_ov40_0218a0e0
.extern func_01ff892c
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern func_01ffa8d4
.extern func_01ffec78
.extern func_02002bf4
@@ -433,7 +427,6 @@
.extern func_ov00_02079e68
.extern func_ov00_02079efc
.extern func_ov00_02079f3c
.extern func_ov00_0207a188
.extern func_ov00_0207afa0
.extern func_ov00_0207afc4
.extern func_ov00_0207aff8
@@ -576,7 +569,6 @@
.extern func_ov00_020c0c70
.extern func_ov00_020c0c9c
.extern func_ov00_020c0e5c
.extern func_ov00_020c1500
.extern func_ov00_020c3348
.extern func_ov00_020c3388
.extern func_ov00_020c33b0
@@ -710,11 +702,19 @@
.extern func_ov40_02186948
.extern func_ov40_02186c8c
.extern func_ov40_02187ba0
.extern gActorManager
.extern gAdventureFlags
.extern gHealthManager
.extern gItemManager
.extern gMapManager
.extern gOverlayManager
.extern gPlayer
.extern gPlayerAngle
.extern gPlayerAnimHandler
.extern gPlayerControl
.extern gPlayerLink
.extern gPlayerPos
.extern gVec3p_ZERO
.extern strcat
.extern strcpy
.extern strlen
asm/ov04.s
+92 -92
View File
@@ -874,11 +874,11 @@ func_ov04_02101188: ; 0x02101188
add r0, r5, #0
add r0, #0x31
strb r1, [r0]
ldr r1, _0210137c ; =data_027e0fac
ldr r1, _0210137c ; =gPlayerAngle
mov r0, #0
ldrsh r0, [r1, r0]
strh r0, [r5, #0x36]
ldr r0, _02101380 ; =data_027e0f94
ldr r0, _02101380 ; =gPlayerPos
ldr r1, [r0]
str r1, [r5, #0x38]
ldr r1, [r0, #4]
@@ -1084,8 +1084,8 @@ _02101370:
.align 2, 0
_02101374: .word 0x027ffc3c
_02101378: .word data_027e0d38
_0210137c: .word data_027e0fac
_02101380: .word data_027e0f94
_0210137c: .word gPlayerAngle
_02101380: .word gPlayerPos
_02101384: .word data_027e0618
_02101388: .word gMapManager
_0210138c: .word data_027e077c
@@ -2211,7 +2211,7 @@ _02101bda:
add r0, r5, #0
add r1, r7, #0
add r2, r5, #0
blx func_01ff9bc4
blx Vec3p_Add
add r4, r4, #1
add r5, #0xc
cmp r4, r6
@@ -3252,7 +3252,7 @@ _02102382:
ldr r0, _021024ac ; =data_0205785c
str r2, [sp, #0x7c]
str r0, [sp, #0x70]
ldr r0, _021024b4 ; =data_027e0fe4
ldr r0, _021024b4 ; =gActorManager
add r1, sp, #0x70
strb r2, [r1, #0x10]
ldr r0, [r0]
@@ -3295,7 +3295,7 @@ _02102382:
blx r2
ldr r0, [sp, #0xc]
bl func_0202d5dc
ldr r0, _021024b4 ; =data_027e0fe4
ldr r0, _021024b4 ; =gActorManager
ldr r0, [r0]
bl func_ov04_021056b8
mov r2, #1
@@ -3324,7 +3324,7 @@ _02102382:
add r3, r2, #0
blx func_ov00_020872e8
_02102478:
ldr r0, _021024b4 ; =data_027e0fe4
ldr r0, _021024b4 ; =gActorManager
add r1, sp, #0x118
ldrb r1, [r1, #0x12]
ldr r0, [r0]
@@ -3346,7 +3346,7 @@ _021024a4: .word data_ov00_020e250c
_021024a8: .word data_02057878
_021024ac: .word data_0205785c
_021024b0: .word data_027e0f68
_021024b4: .word data_027e0fe4
_021024b4: .word gActorManager
_021024b8: .word data_027e0fec
_021024bc: .word data_027e0f64
_021024c0: .word data_027e0f7c
@@ -3391,14 +3391,14 @@ func_ov04_021024c4: ; 0x021024c4
add r0, r5, #0
add r1, sp, #0x10
blx _ZN10MapManager14GetEntrancePosEP5Vec3pi
ldr r0, _021025bc ; =data_027e0f90
ldr r0, _021025bc ; =gPlayer
ldrb r1, [r4, #0x13]
ldr r0, [r0]
mov r2, #0
ldr r3, [r0]
ldr r3, [r3, #0x38]
blx r3
ldr r0, _021025c0 ; =data_027e0fe4
ldr r0, _021025c0 ; =gActorManager
ldr r0, [r0]
bl func_ov04_0210554c
ldr r0, _021025c4 ; =data_027e0d38
@@ -3438,7 +3438,7 @@ _02102578:
ldr r0, [sp, #0x20]
cmp r0, #1
bne _021025a8
ldr r1, _021025c0 ; =data_027e0fe4
ldr r1, _021025c0 ; =gActorManager
ldr r2, _021025d4 ; =0x414e4353
ldr r1, [r1]
add r0, sp, #8
@@ -3448,7 +3448,7 @@ _02102578:
mvn r0, r0
cmp r1, r0
beq _021025ac
ldr r0, _021025c0 ; =data_027e0fe4
ldr r0, _021025c0 ; =gActorManager
add r1, sp, #8
ldr r0, [r0]
blx _ZN12ActorManager8GetActorEP8ActorRef
@@ -3467,8 +3467,8 @@ _021025ae:
nop
_021025b4: .word data_027e0ff0
_021025b8: .word data_027e0f6c
_021025bc: .word data_027e0f90
_021025c0: .word data_027e0fe4
_021025bc: .word gPlayer
_021025c0: .word gActorManager
_021025c4: .word data_027e0d38
_021025c8: .word data_027e0f70
_021025cc: .word data_027e0f68
@@ -7833,7 +7833,7 @@ _021048c6:
_021048cc:
ldr r0, _021049e4 ; =data_027e0c68
bl func_ov04_021069c4
ldr r0, _021049e8 ; =data_027e0fe4
ldr r0, _021049e8 ; =gActorManager
ldr r0, [r0]
bl func_ov04_0210532c
bl func_ov04_021026a0
@@ -7877,7 +7877,7 @@ _02104920:
ldr r0, _02104a04 ; =data_027e0f68
ldr r0, [r0]
bl func_ov04_02102aa0
ldr r0, _02104a08 ; =data_027e0f90
ldr r0, _02104a08 ; =gPlayer
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x1c]
@@ -7931,7 +7931,7 @@ _021049d8: .word data_027e103c
_021049dc: .word data_027e1094
_021049e0: .word data_027e1060
_021049e4: .word data_027e0c68
_021049e8: .word data_027e0fe4
_021049e8: .word gActorManager
_021049ec: .word data_027e0db0
_021049f0: .word data_027e0f64
_021049f4: .word data_ov09_0211f5b4
@@ -7939,7 +7939,7 @@ _021049f8: .word data_027e1048
_021049fc: .word data_027e0f78
_02104a00: .word gMapManager
_02104a04: .word data_027e0f68
_02104a08: .word data_027e0f90
_02104a08: .word gPlayer
_02104a0c: .word data_027e0fc0
_02104a10: .word data_ov00_020ee734
thumb_func_end func_ov04_021046dc
@@ -7982,7 +7982,7 @@ _02104a3c:
bl func_ov04_0210453c
bl func_ov04_0210bd28
bl func_ov04_0210b1f0
ldr r0, _02104aec ; =data_027e0fe4
ldr r0, _02104aec ; =gActorManager
ldr r0, [r0]
bl func_ov04_021053dc
bl func_ov04_02101fe8
@@ -8023,7 +8023,7 @@ _02104adc: .word data_027e0f68
_02104ae0: .word gMapManager
_02104ae4: .word data_027e0f64
_02104ae8: .word gAdventureFlags
_02104aec: .word data_027e0fe4
_02104aec: .word gActorManager
_02104af0: .word data_027e0c68
_02104af4: .word data_027e103c
_02104af8: .word data_02068e64
@@ -8916,7 +8916,7 @@ _021051dc: .word data_ov04_0210f836
thumb_func_start func_ov04_021051e0
func_ov04_021051e0: ; 0x021051e0
push {r3, lr}
ldr r0, _02105204 ; =data_027e0fe4
ldr r0, _02105204 ; =gActorManager
ldr r0, [r0]
cmp r0, #0
bne _02105202
@@ -8929,12 +8929,12 @@ func_ov04_021051e0: ; 0x021051e0
beq _021051fe
bl func_ov04_02105230
_021051fe:
ldr r1, _02105204 ; =data_027e0fe4
ldr r1, _02105204 ; =gActorManager
str r0, [r1]
_02105202:
pop {r3, pc}
.align 2, 0
_02105204: .word data_027e0fe4
_02105204: .word gActorManager
_02105208: .word data_027e0ce0
thumb_func_end func_ov04_021051e0
@@ -8942,7 +8942,7 @@ _02105208: .word data_027e0ce0
thumb_func_start func_ov04_0210520c
func_ov04_0210520c: ; 0x0210520c
push {r4, lr}
ldr r0, _0210522c ; =data_027e0fe4
ldr r0, _0210522c ; =gActorManager
ldr r4, [r0]
cmp r4, #0
beq _0210522a
@@ -8952,13 +8952,13 @@ func_ov04_0210520c: ; 0x0210520c
add r0, r4, #0
blx _ZN9SysObjectdlEPv
_02105224:
ldr r0, _0210522c ; =data_027e0fe4
ldr r0, _0210522c ; =gActorManager
mov r1, #0
str r1, [r0]
_0210522a:
pop {r4, pc}
.align 2, 0
_0210522c: .word data_027e0fe4
_0210522c: .word gActorManager
thumb_func_end func_ov04_0210520c
.global func_ov04_02105230
@@ -10630,7 +10630,7 @@ func_ov04_02105e50: ; 0x02105e50
str r2, [r0, #0x10]
str r2, [r0, #0x14]
str r2, [r0, #0x18]
ldr r1, _02105ebc ; =data_027e0d0c
ldr r1, _02105ebc ; =gVec3p_ZERO
str r2, [r0, #0x1c]
ldr r2, [r1]
str r2, [r0, #0x20]
@@ -10642,7 +10642,7 @@ func_ov04_02105e50: ; 0x02105e50
str r3, [r0, #0x30]
bx lr
.align 2, 0
_02105ebc: .word data_027e0d0c
_02105ebc: .word gVec3p_ZERO
arm_func_end func_ov04_02105e50
.global func_ov04_02105ec0
@@ -11352,10 +11352,10 @@ _021063a4:
add r0, r0, #4
add r1, r1, #4
add r2, sp, #0x1c
blx func_01ff9bf8
blx Vec3p_Sub
ldr r0, [sp, #0x1c]
ldr r1, [sp, #0x24]
blx func_01ffa0f4
blx Atan2
strh r0, [r4]
add r7, r7, #1
add r5, r5, #4
@@ -11864,7 +11864,7 @@ _02106742:
add r1, sp, #0x38
str r0, [sp, #0x40]
add r0, sp, #0x44
blx func_01ff9ec0
blx Vec3p_Distance
mov r1, #1
lsl r1, r1, #0xc
cmp r0, r1
@@ -13986,7 +13986,7 @@ _0210775c:
cmp r0, #2
beq _021077ee
add r0, sp, #4
blx func_ov00_020c1500
blx _ZN19Actor_UnkStruct_020C1Ev
mov r0, #0
mvn r0, r0
str r0, [sp, #0x20]
@@ -13998,11 +13998,11 @@ _0210775c:
ldr r0, _021077f8 ; =data_027e0fe8
ldr r1, _021077fc ; =0x4e415649
ldr r0, [r0]
ldr r2, _02107800 ; =data_027e0d0c
ldr r2, _02107800 ; =gVec3p_ZERO
add r3, sp, #4
blx func_ov00_020c4048
add r1, r0, #0
ldr r0, _02107804 ; =data_027e0fe4
ldr r0, _02107804 ; =gActorManager
ldr r0, [r0]
blx _ZN12ActorManager13FindActorByIdEj
str r0, [r4, #0x14]
@@ -14011,11 +14011,11 @@ _0210775c:
ldr r0, _021077f8 ; =data_027e0fe8
ldr r1, _02107808 ; =0x46434e56
ldr r0, [r0]
ldr r2, _02107800 ; =data_027e0d0c
ldr r2, _02107800 ; =gVec3p_ZERO
add r3, sp, #4
blx func_ov00_020c4048
add r1, r0, #0
ldr r0, _02107804 ; =data_027e0fe4
ldr r0, _02107804 ; =gActorManager
ldr r0, [r0]
blx _ZN12ActorManager13FindActorByIdEj
str r0, [r4, #0x18]
@@ -14024,11 +14024,11 @@ _0210775c:
ldr r0, _021077f8 ; =data_027e0fe8
ldr r1, _0210780c ; =0x57534e56
ldr r0, [r0]
ldr r2, _02107800 ; =data_027e0d0c
ldr r2, _02107800 ; =gVec3p_ZERO
add r3, sp, #4
blx func_ov00_020c4048
add r1, r0, #0
ldr r0, _02107804 ; =data_027e0fe4
ldr r0, _02107804 ; =gActorManager
ldr r0, [r0]
blx _ZN12ActorManager13FindActorByIdEj
str r0, [r4, #0x1c]
@@ -14039,8 +14039,8 @@ _021077ee:
_021077f4: .word data_027e0d38
_021077f8: .word data_027e0fe8
_021077fc: .word 0x4e415649
_02107800: .word data_027e0d0c
_02107804: .word data_027e0fe4
_02107800: .word gVec3p_ZERO
_02107804: .word gActorManager
_02107808: .word 0x46434e56
_0210780c: .word 0x57534e56
thumb_func_end func_ov04_02107750
@@ -14275,7 +14275,7 @@ func_ov04_021079dc: ; 0x021079dc
push {r4, lr}
add r4, r0, #0
mov r2, #0
ldr r0, _02107a74 ; =data_027e0d0c
ldr r0, _02107a74 ; =gVec3p_ZERO
str r2, [r4, #0x6c]
ldr r1, [r0]
str r1, [r4, #0x7c]
@@ -14348,7 +14348,7 @@ _02107a4a:
mov r0, #1
pop {r4, pc}
.align 2, 0
_02107a74: .word data_027e0d0c
_02107a74: .word gVec3p_ZERO
_02107a78: .word 0x00000666
_02107a7c: .word data_027e0d38
thumb_func_end func_ov04_021079dc
@@ -14960,7 +14960,7 @@ func_ov04_02107e9c: ; 0x02107e9c
ldr r0, [r0]
bl _ZN11ItemManager4LoadEPK15SaveItemManager
_02107ef6:
ldr r0, _02107f34 ; =data_027e0fb8
ldr r0, _02107f34 ; =gPlayerControl
ldr r0, [r0]
bl _ZN13PlayerControl18func_ov00_020aef30Ev
ldr r0, _02107f2c ; =gItemManager
@@ -14981,7 +14981,7 @@ _02107f24: .word data_ov00_020e9e98
_02107f28: .word data_ov00_020e9e94
_02107f2c: .word gItemManager
_02107f30: .word data_ov00_020e9e18
_02107f34: .word data_027e0fb8
_02107f34: .word gPlayerControl
thumb_func_end func_ov04_02107e9c
.global func_ov04_02107f38
@@ -15071,7 +15071,7 @@ _02107fda:
ldr r0, _02108000 ; =gItemManager
ldr r0, [r0]
bl func_ov04_02107314
ldr r0, _02108004 ; =data_027e0fb8
ldr r0, _02108004 ; =gPlayerControl
ldr r0, [r0]
bl func_ov04_0210b184
pop {r3, r4, r5, pc}
@@ -15082,7 +15082,7 @@ _02107ff4: .word data_ov09_0211f530
_02107ff8: .word data_027e0d38
_02107ffc: .word data_027e0f7c
_02108000: .word gItemManager
_02108004: .word data_027e0fb8
_02108004: .word gPlayerControl
thumb_func_end func_ov04_02107f48
.global func_ov04_02108008
@@ -15090,7 +15090,7 @@ _02108004: .word data_027e0fb8
func_ov04_02108008: ; 0x02108008
push {r3, lr}
bl func_ov04_0210b1f0
ldr r0, _0210804c ; =data_027e0fb8
ldr r0, _0210804c ; =gPlayerControl
ldr r0, [r0]
bl func_ov04_0210b1d0
ldr r0, _02108050 ; =gItemManager
@@ -15115,7 +15115,7 @@ _02108034:
_02108048:
pop {r3, pc}
nop
_0210804c: .word data_027e0fb8
_0210804c: .word gPlayerControl
_02108050: .word gItemManager
_02108054: .word data_027e0618
_02108058: .word data_ov09_0211f530
@@ -15448,7 +15448,7 @@ func_ov04_021082bc: ; 0x021082bc
bl func_ov04_0210add4
ldr r0, _021083d0 ; =_ZTV15LinkStateDamage
add r2, r5, #0
ldr r3, _021083d4 ; =data_027e0d0c
ldr r3, _021083d4 ; =gVec3p_ZERO
str r0, [r5]
ldmia r3!, {r0, r1}
add r2, #0xc
@@ -15575,7 +15575,7 @@ _021083c8:
pop {r3, r4, r5, r6, pc}
nop
_021083d0: .word _ZTV15LinkStateDamage
_021083d4: .word data_027e0d0c
_021083d4: .word gVec3p_ZERO
_021083d8: .word func_ov00_020b7d74
_021083dc: .word func_ov04_021079d4
_021083e0: .word data_027e0d38
@@ -17339,7 +17339,7 @@ _021091ca:
add r0, r2, r0
str r0, [sp, #0x80]
add r0, sp, #0x48
blx func_ov00_020c1500
blx _ZN19Actor_UnkStruct_020C1Ev
mov r1, #0
add r2, sp, #0x5c
add r3, sp, #0x48
@@ -17381,7 +17381,7 @@ _02109222:
_02109224:
strb r1, [r0, #0xe]
add r0, sp, #0x1c
blx func_ov00_020c1500
blx _ZN19Actor_UnkStruct_020C1Ev
mov r0, #0
mvn r0, r0
str r0, [sp, #0x38]
@@ -18197,9 +18197,9 @@ _02109820:
lsl r1, r1, #4
add r1, r6, r1
add r2, r0, #0
blx func_01ff9bc4
blx Vec3p_Add
add r0, sp, #0x3c
blx func_ov00_020c1500
blx _ZN19Actor_UnkStruct_020C1Ev
mov r1, #0
add r2, sp, #0x50
add r3, sp, #0x3c
@@ -18241,7 +18241,7 @@ _021098b4:
_021098b6:
strb r1, [r0, #0xe]
add r0, sp, #0x10
blx func_ov00_020c1500
blx _ZN19Actor_UnkStruct_020C1Ev
mov r0, #0
mvn r0, r0
str r0, [sp, #0x2c]
@@ -19432,7 +19432,7 @@ _0210a16c:
ldr r0, _0210a474 ; =data_ov04_021104a0
str r0, [r5]
_0210a186:
ldr r0, _0210a478 ; =data_027e0fc8
ldr r0, _0210a478 ; =gPlayerLink
str r5, [r4, #0x6c]
str r4, [r0]
ldr r0, _0210a47c ; =data_027e0fcc
@@ -19804,7 +19804,7 @@ _0210a468: .word data_02057878
_0210a46c: .word data_ov04_02110934
_0210a470: .word data_0205785c
_0210a474: .word data_ov04_021104a0
_0210a478: .word data_027e0fc8
_0210a478: .word gPlayerLink
_0210a47c: .word data_027e0fcc
_0210a480: .word data_027e0fd0
_0210a484: .word data_027e0fd4
@@ -20144,7 +20144,7 @@ _0210a7c4:
str r0, [r1]
ldr r1, _0210a7ec ; =data_027e0fdc
str r0, [r1]
ldr r1, _0210a800 ; =data_027e0fc8
ldr r1, _0210a800 ; =gPlayerLink
str r0, [r1]
add r0, r6, #0
bl func_ov04_0210b2b0
@@ -20157,7 +20157,7 @@ _0210a7f0: .word data_027e0fd8
_0210a7f4: .word data_027e0fd4
_0210a7f8: .word data_027e0fcc
_0210a7fc: .word data_027e0fd0
_0210a800: .word data_027e0fc8
_0210a800: .word gPlayerLink
thumb_func_end func_ov04_0210a734
.global func_ov04_0210a804
@@ -20253,7 +20253,7 @@ _0210a894:
str r0, [r1]
ldr r1, _0210a8c4 ; =data_027e0fdc
str r0, [r1]
ldr r1, _0210a8d8 ; =data_027e0fc8
ldr r1, _0210a8d8 ; =gPlayerLink
str r0, [r1]
add r0, r6, #0
bl func_ov04_0210b2b0
@@ -20268,7 +20268,7 @@ _0210a8c8: .word data_027e0fd8
_0210a8cc: .word data_027e0fd4
_0210a8d0: .word data_027e0fcc
_0210a8d4: .word data_027e0fd0
_0210a8d8: .word data_027e0fc8
_0210a8d8: .word gPlayerLink
thumb_func_end func_ov04_0210a804
.global func_ov04_0210a8dc
@@ -20364,7 +20364,7 @@ _0210a96c:
str r0, [r1]
ldr r1, _0210a994 ; =data_027e0fdc
str r0, [r1]
ldr r1, _0210a9a8 ; =data_027e0fc8
ldr r1, _0210a9a8 ; =gPlayerLink
str r0, [r1]
add r0, r6, #0
bl func_ov04_0210b2b0
@@ -20377,7 +20377,7 @@ _0210a998: .word data_027e0fd8
_0210a99c: .word data_027e0fd4
_0210a9a0: .word data_027e0fcc
_0210a9a4: .word data_027e0fd0
_0210a9a8: .word data_027e0fc8
_0210a9a8: .word gPlayerLink
thumb_func_end func_ov04_0210a8dc
.global func_ov04_0210a9ac
@@ -20545,7 +20545,7 @@ _0210aad6:
mov r1, #0
add r0, #0x5d
strb r1, [r0]
ldr r0, _0210ab1c ; =data_027e0f94
ldr r0, _0210ab1c ; =gPlayerPos
ldr r1, [r0]
str r1, [r5, #0x14]
ldr r1, [r0, #4]
@@ -20559,7 +20559,7 @@ _0210ab0c: .word data_027e0fdc
_0210ab10: .word data_027e0fd4
_0210ab14: .word data_027e0fd8
_0210ab18: .word data_027e0fcc
_0210ab1c: .word data_027e0f94
_0210ab1c: .word gPlayerPos
thumb_func_end func_ov04_0210a9ac
.global func_ov04_0210ab20
@@ -21305,13 +21305,13 @@ func_ov04_0210afdc: ; 0x0210afdc
add r0, r4, #0
add r0, #0xac
add r5, r4, #0
ldr r6, _0210b0f0 ; =data_027e0d0c
ldr r6, _0210b0f0 ; =gVec3p_ZERO
strh r3, [r0]
ldmia r6!, {r0, r1}
add r5, #0xb0
stmia r5!, {r0, r1}
ldr r0, [r6]
ldr r6, _0210b0f0 ; =data_027e0d0c
ldr r6, _0210b0f0 ; =gVec3p_ZERO
str r0, [r5]
add r5, r4, #0
ldmia r6!, {r0, r1}
@@ -21357,7 +21357,7 @@ _0210b0da:
add r0, r4, #0
pop {r4, r5, r6, pc}
.align 2, 0
_0210b0f0: .word data_027e0d0c
_0210b0f0: .word gVec3p_ZERO
_0210b0f4: .word data_027e0ce0
thumb_func_end func_ov04_0210afdc
@@ -21415,19 +21415,19 @@ func_ov04_0210b13c: ; 0x0210b13c
beq _0210b152
bl func_ov04_0210afdc
_0210b152:
ldr r1, _0210b15c ; =data_027e0fb8
ldr r1, _0210b15c ; =gPlayerControl
str r0, [r1]
pop {r3, pc}
.align 2, 0
_0210b158: .word data_027e0ce0
_0210b15c: .word data_027e0fb8
_0210b15c: .word gPlayerControl
thumb_func_end func_ov04_0210b13c
.global func_ov04_0210b160
thumb_func_start func_ov04_0210b160
func_ov04_0210b160: ; 0x0210b160
push {r4, lr}
ldr r0, _0210b180 ; =data_027e0fb8
ldr r0, _0210b180 ; =gPlayerControl
ldr r4, [r0]
cmp r4, #0
beq _0210b176
@@ -21436,12 +21436,12 @@ func_ov04_0210b160: ; 0x0210b160
add r0, r4, #0
blx _ZN9SysObjectdlEPv
_0210b176:
ldr r0, _0210b180 ; =data_027e0fb8
ldr r0, _0210b180 ; =gPlayerControl
mov r1, #0
str r1, [r0]
pop {r4, pc}
nop
_0210b180: .word data_027e0fb8
_0210b180: .word gPlayerControl
thumb_func_end func_ov04_0210b160
.global func_ov04_0210b184
@@ -21452,7 +21452,7 @@ func_ov04_0210b184: ; 0x0210b184
mov r1, #0
add r0, #0x79
strb r1, [r0]
ldr r0, _0210b1c0 ; =data_027e0fb8
ldr r0, _0210b1c0 ; =gPlayerControl
mov r1, #1
ldr r0, [r0]
add r0, #0x78
@@ -21477,7 +21477,7 @@ _0210b1b6:
_0210b1bc:
pop {r4, pc}
nop
_0210b1c0: .word data_027e0fb8
_0210b1c0: .word gPlayerControl
_0210b1c4: .word gOverlayManager
_0210b1c8: .word 0x0000001d
_0210b1cc: .word data_027e0ce0
@@ -21510,7 +21510,7 @@ _0210b1ee:
thumb_func_start func_ov04_0210b1f0
func_ov04_0210b1f0: ; 0x0210b1f0
push {r3, lr}
ldr r0, _0210b20c ; =data_027e0f90
ldr r0, _0210b20c ; =gPlayer
ldr r0, [r0]
cmp r0, #0
beq _0210b208
@@ -21519,13 +21519,13 @@ func_ov04_0210b1f0: ; 0x0210b1f0
ldr r1, [r1, #0x54]
blx r1
_0210b202:
ldr r0, _0210b20c ; =data_027e0f90
ldr r0, _0210b20c ; =gPlayer
mov r1, #0
str r1, [r0]
_0210b208:
pop {r3, pc}
nop
_0210b20c: .word data_027e0f90
_0210b20c: .word gPlayer
thumb_func_end func_ov04_0210b1f0
.global func_ov04_0210b210
@@ -21846,7 +21846,7 @@ func_ov04_0210b3f0: ; 0x0210b3f0
add r0, r5, r0
add r3, r1, #0
str r2, [sp]
bl func_ov00_0207a188
bl _ZN19Actor_UnkStruct_0a4C1Eiiii
ldr r0, _0210b520 ; =func_ov04_0210b3d4
ldr r3, _0210b524 ; =func_ov04_0210b634
str r0, [sp]
@@ -23392,7 +23392,7 @@ _0210bffc:
mov r0, #0
strb r0, [r4, #4]
_0210c000:
ldr r1, _0210c0f4 ; =data_027e0fe4
ldr r1, _0210c0f4 ; =gActorManager
ldr r2, _0210c0f8 ; =0x524d5447
ldr r1, [r1]
add r0, sp, #0x10
@@ -23407,7 +23407,7 @@ _0210c000:
strb r0, [r4, #7]
mov r0, #0
strb r0, [r4, #4]
ldr r0, _0210c0f4 ; =data_027e0fe4
ldr r0, _0210c0f4 ; =gActorManager
add r1, sp, #0x10
ldr r0, [r0]
blx _ZN12ActorManager8GetActorEP8ActorRef
@@ -23443,7 +23443,7 @@ _0210c054:
mov r0, #4
str r0, [r4, #0x34]
_0210c062:
ldr r1, _0210c0f4 ; =data_027e0fe4
ldr r1, _0210c0f4 ; =gActorManager
ldr r2, _0210c104 ; =0x524d4654
ldr r1, [r1]
add r0, sp, #8
@@ -23484,15 +23484,15 @@ _0210c092:
str r0, [sp, #0x1c]
mov r0, #9
str r0, [sp, #0x20]
ldr r0, _0210c0f4 ; =data_027e0fe4
ldr r0, _0210c0f4 ; =gActorManager
ldr r0, [r0]
blx _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
blx _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
cmp r0, #0
ble _0210c0c2
mov r0, #0
strb r0, [r4, #4]
_0210c0c2:
ldr r1, _0210c0f4 ; =data_027e0fe4
ldr r1, _0210c0f4 ; =gActorManager
ldr r2, _0210c114 ; =0x574c4354
ldr r1, [r1]
add r0, sp, #0
@@ -23515,7 +23515,7 @@ _0210c0dc:
pop {r3, r4, r5, pc}
.align 2, 0
_0210c0f0: .word data_027e0d38
_0210c0f4: .word data_027e0fe4
_0210c0f4: .word gActorManager
_0210c0f8: .word 0x524d5447
_0210c0fc: .word 0x000001b6
_0210c100: .word 0x000001b7
@@ -23955,7 +23955,7 @@ func_ov04_0210c3fc: ; 0x0210c3fc
ldr r0, [r0]
add r2, sp, #0x18
bl func_ov04_02104ffc
ldr r0, _0210c514 ; =data_027e0f90
ldr r0, _0210c514 ; =gPlayer
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x20]
@@ -23996,7 +23996,7 @@ _0210c504: .word data_027e0fec
_0210c508: .word data_027e0c68
_0210c50c: .word data_027e0cbc
_0210c510: .word data_027e103c
_0210c514: .word data_027e0f90
_0210c514: .word gPlayer
_0210c518: .word data_027e0618
_0210c51c: .word data_ov09_0211f5b4
_0210c520: .word data_ov09_0211f530
@@ -24818,7 +24818,7 @@ func_ov04_0210cb38: ; 0x0210cb38
cmp r0, #4
bne _0210cb7a
add r0, sp, #0x80
blx func_ov00_020c1500
blx _ZN19Actor_UnkStruct_020C1Ev
mov r0, #0
mvn r0, r0
str r0, [sp, #0x9c]
@@ -24850,7 +24850,7 @@ _0210cb7a:
cmp r0, #4
bne _0210cbc2
add r0, sp, #0x48
blx func_ov00_020c1500
blx _ZN19Actor_UnkStruct_020C1Ev
mov r0, #0
mvn r0, r0
str r0, [sp, #0x64]
@@ -24879,7 +24879,7 @@ _0210cbc2:
cmp r0, #2
bne _0210cc04
add r0, sp, #0x10
blx func_ov00_020c1500
blx _ZN19Actor_UnkStruct_020C1Ev
mov r0, #0
mvn r0, r0
str r0, [sp, #0x2c]
asm/ov05.inc
+20 -20
View File
@@ -30,7 +30,7 @@
.extern _ZN11ItemManager18PlayItemFanfareSfxEi
.extern _ZN11ItemManager8GiveItemEi
.extern _ZN12ActorManager11DeleteActorEjb
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase10GetStateIdEv
@@ -160,7 +160,7 @@
.extern _ZNK11ItemManager19GetFanfareItemScaleEP5Vec3p
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_02057200
.extern data_020691a0
@@ -179,7 +179,7 @@
.extern data_027e0c68
.extern data_027e0cbc
.extern data_027e0d04
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d44
@@ -198,18 +198,18 @@
.extern data_027e0f78
.extern data_027e0f7c
.extern data_027e0f88
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayer
.extern gPlayerPos
.extern gPlayerVel
.extern gPlayerAngle
.extern data_027e0fb0
.extern data_027e0fb8
.extern gPlayerControl
.extern data_027e0fc0
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fd0
.extern data_027e0fd4
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0ff4
.extern data_027e0ff8
.extern data_027e0ffc
@@ -262,12 +262,12 @@
.extern func_01ff9a80
.extern func_01ff9b24
.extern func_01ff9b4c
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9cec
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Length
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Atan2
.extern func_01ffa8d4
.extern func_01ffa9fc
.extern func_01ffbe34
@@ -275,7 +275,7 @@
.extern func_01ffe468
.extern func_01ffec78
.extern func_01fffcd8
.extern func_01fffcec
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern func_02002c14
.extern func_02005934
.extern func_02005bfc
@@ -428,7 +428,7 @@
.extern func_ov00_020b804c
.extern func_ov00_020b8600
.extern func_ov00_020bbb64
.extern func_ov00_020bc46c
.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
.extern func_ov00_020bc500
.extern func_ov00_020bc71c
.extern func_ov00_020bc8b8
@@ -442,7 +442,7 @@
.extern func_ov00_020c06b0
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020c3eb0
.extern func_ov00_020ce2f0
.extern func_ov00_020ce8e4
@@ -512,7 +512,7 @@
.extern func_ov09_0211cac0
.extern func_ov12_02134208
.extern func_ov14_02127df4
.extern func_ov14_0213d420
.extern _ZN9EquipRope18func_ov14_0213d420Ev
.extern func_ov14_0213d63c
.extern func_ov14_0213ec64
.extern func_ov14_0214a3dc
asm/ov05.s
+296 -296
View File
File diff suppressed because it is too large Load Diff
asm/ov08.inc
+1 -1
View File
@@ -77,7 +77,7 @@
.extern func_ov00_0207c170
.extern func_ov00_020a1a3c
.extern func_ov00_020a1b54
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020d69d4
.extern func_ov00_020d69e4
.extern func_ov01_020efdac
asm/ov08.s
+1 -1
View File
@@ -1055,7 +1055,7 @@ func_ov08_0211396c: ; 0x0211396c
stmdb sp!, {r4, lr}
mov r4, r0
add r0, r4, #0x1c
bl func_ov00_020c1500
bl _ZN19Actor_UnkStruct_020C1Ev
mov r0, r4
ldmia sp!, {r4, pc}
arm_func_end func_ov08_0211396c
asm/ov09.inc
+7 -7
View File
@@ -19,7 +19,7 @@
.extern _ZNK11ItemManager16GetTreasureCountEj
.extern _ZNK11ItemManager19GetEquippedShipPartEj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02057200
.extern data_0205785c
.extern data_02057878
@@ -39,7 +39,7 @@
.extern data_027e0c68
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d54
@@ -51,8 +51,8 @@
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f90
.extern data_027e0fe4
.extern gPlayer
.extern gActorManager
.extern data_027e0ffc
.extern data_027e103c
.extern data_027e1040
@@ -101,8 +101,8 @@
.extern func_01ff9a18
.extern func_01ff9a50
.extern func_01ff9b4c
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern Vec3p_Add
.extern Vec3p_Sub
.extern func_01ffa8d4
.extern func_01ffa9fc
.extern func_01ffbe34
@@ -272,7 +272,7 @@
.extern func_ov00_020c0d68
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020cef40
.extern func_ov00_020cf270
.extern func_ov00_020cf330
asm/ov09.s
+33 -33
View File
@@ -3200,7 +3200,7 @@ func_ov09_02114554: ; 0x02114554
push {r4, r5, r6, r7, lr}
sub sp, #0x1ec
add r5, r0, #0
ldr r0, _021146a8 ; =data_027e0fe4
ldr r0, _021146a8 ; =gActorManager
str r1, [sp, #4]
ldr r0, [r0]
blx _ZN12ActorManager14Actor_vfunc_28Ev
@@ -3351,7 +3351,7 @@ _02114688:
add sp, #0x1ec
pop {r4, r5, r6, r7, pc}
.align 2, 0
_021146a8: .word data_027e0fe4
_021146a8: .word gActorManager
_021146ac: .word gMapManager
_021146b0: .word data_027e0d38
_021146b4: .word data_ov00_020e9f10
@@ -3374,7 +3374,7 @@ func_ov09_021146d0: ; 0x021146d0
stmdb sp!, {r4, lr}
mov r4, r0
add r0, r4, #0x1c
bl func_ov00_020c1500
bl _ZN19Actor_UnkStruct_020C1Ev
mov r0, r4
ldmia sp!, {r4, pc}
arm_func_end func_ov09_021146d0
@@ -4550,7 +4550,7 @@ _0211505c:
ldr r0, _021150a0 ; =data_027e0e58
str r1, [sp]
ldr r0, [r0]
ldr r3, _021150a4 ; =data_027e0d0c
ldr r3, _021150a4 ; =gVec3p_ZERO
add r1, r4, #0x10
bl func_ov00_0207c1f8
ldr r1, [r4, #0x10]
@@ -4566,7 +4566,7 @@ _0211505c:
_02115098: .word data_027e0d38
_0211509c: .word 0x00000219
_021150a0: .word data_027e0e58
_021150a4: .word data_027e0d0c
_021150a4: .word gVec3p_ZERO
arm_func_end func_ov09_0211500c
.global func_ov09_021150a8
@@ -4777,7 +4777,7 @@ func_ov09_0211530c: ; 0x0211530c
bl func_ov00_020a9624
ldrh r1, [r9, #0x94]
mov r4, r0
ldr r3, _02115404 ; =data_02050f54
ldr r3, _02115404 ; =gSinCosTable
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
mov r1, r2, lsl #0x1
@@ -4810,7 +4810,7 @@ func_ov09_0211530c: ; 0x0211530c
ldr r3, [r5, #0x54]
mov r2, r0
str r3, [sp, #8]
bl func_01ff9bc4
bl Vec3p_Add
ldr r1, [r9, #0xc]
add r0, sp, #0xc
bl func_01fffbec
@@ -4821,11 +4821,11 @@ func_ov09_0211530c: ; 0x0211530c
mov r1, r6
mov r2, r8
add r0, sp, #0xc
bl func_01ff9bc4
bl Vec3p_Add
add sp, sp, #0x3c
ldmia sp!, {r4, r5, r6, r7, r8, r9, pc}
.align 2, 0
_02115404: .word data_02050f54
_02115404: .word gSinCosTable
arm_func_end func_ov09_0211530c
.global func_ov09_02115408
@@ -4856,7 +4856,7 @@ func_ov09_02115408: ; 0x02115408
mov r1, r4
mov r2, r6
add r0, sp, #0
bl func_01ff9bc4
bl Vec3p_Add
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, pc}
arm_func_end func_ov09_02115408
@@ -4889,7 +4889,7 @@ func_ov09_02115478: ; 0x02115478
mov r1, r4
mov r2, r6
add r0, sp, #0
bl func_01ff9bc4
bl Vec3p_Add
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, pc}
arm_func_end func_ov09_02115478
@@ -5068,7 +5068,7 @@ _021156e8:
bl func_ov09_02115e38
add r0, r6, #0x5c
add r11, r6, #0x1ac
ldr r7, _02115a9c ; =data_02050f54
ldr r7, _02115a9c ; =gSinCosTable
str r0, [sp, #0xc]
mov r4, #0
add r8, sp, #0xac
@@ -5291,7 +5291,7 @@ _02115a44:
add sp, sp, #0xdc
ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}
.align 2, 0
_02115a9c: .word data_02050f54
_02115a9c: .word gSinCosTable
_02115aa0: .word data_ov09_0211e870
arm_func_end func_ov09_021156a4
@@ -5353,7 +5353,7 @@ func_ov09_02115b10: ; 0x02115b10
add r0, r2, #0x400
mov r1, r4
add r2, r2, #0x400
bl func_01ff9bc4
bl Vec3p_Add
ldmia sp!, {r3, r4, r5, pc}
arm_func_end func_ov09_02115b10
@@ -5598,7 +5598,7 @@ func_ov09_02115e38: ; 0x02115e38
add r0, r5, #0x68
mov r1, r4
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
ldmia sp!, {r3, r4, r5, pc}
arm_func_end func_ov09_02115e38
@@ -14694,7 +14694,7 @@ _0211b164:
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _0211b34c
ldr r0, _0211b378 ; =data_027e0f90
ldr r0, _0211b378 ; =gPlayer
ldr r0, [r0]
ldrsh r0, [r0, #0xa]
cmp r0, #0
@@ -14837,7 +14837,7 @@ _0211b368: .word gAdventureFlags
_0211b36c: .word data_027e0db0
_0211b370: .word data_027e0d38
_0211b374: .word data_ov00_020eec9c
_0211b378: .word data_027e0f90
_0211b378: .word gPlayer
_0211b37c: .word data_027e077c
_0211b380: .word 0x00000c71
_0211b384: .word data_027e103c
@@ -15706,7 +15706,7 @@ func_ov09_0211bd14: ; 0x0211bd14
bl _ZN14AdventureFlags18func_ov00_02097738Ev
cmp r0, #0
bne _0211bd40
ldr r0, _0211bd54 ; =data_027e0f90
ldr r0, _0211bd54 ; =gPlayer
ldr r0, [r0]
ldrsh r0, [r0, #0xa]
cmp r0, #0
@@ -15719,7 +15719,7 @@ _0211bd48:
ldmia sp!, {r3, pc}
.align 2, 0
_0211bd50: .word gAdventureFlags
_0211bd54: .word data_027e0f90
_0211bd54: .word gPlayer
arm_func_end func_ov09_0211bd14
.global func_ov09_0211bd58
@@ -17932,7 +17932,7 @@ func_ov09_0211cd40: ; 0x0211cd40
bl func_01ffa8d4
ldrh r0, [r4, #0x58]
mov r5, #0x190000
ldr r2, _0211ce60 ; =data_02050f54
ldr r2, _0211ce60 ; =gSinCosTable
mov r0, r0, asr #0x4
mov r1, r0, lsl #0x1
str r5, [sp]
@@ -17999,7 +17999,7 @@ func_ov09_0211cd40: ; 0x0211cd40
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0211ce60: .word data_02050f54
_0211ce60: .word gSinCosTable
_0211ce64: .word 0x00001555
_0211ce68: .word data_027e037c
_0211ce6c: .word data_027e03c8
@@ -18213,7 +18213,7 @@ func_ov09_0211d00c: ; 0x0211d00c
add r4, r1, #0
add r5, r0, #0
ldrh r0, [r4, #0x14]
ldr r3, _0211d08c ; =data_02050f54
ldr r3, _0211d08c ; =gSinCosTable
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -18224,7 +18224,7 @@ func_ov09_0211d00c: ; 0x0211d00c
add r0, sp, #0x24
bl func_01ff8230
ldrh r0, [r4, #0x10]
ldr r3, _0211d08c ; =data_02050f54
ldr r3, _0211d08c ; =gSinCosTable
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -18240,7 +18240,7 @@ func_ov09_0211d00c: ; 0x0211d00c
blx func_01ff8690
ldrh r1, [r4, #0x16]
ldrh r0, [r4, #0x12]
ldr r3, _0211d08c ; =data_02050f54
ldr r3, _0211d08c ; =gSinCosTable
add r0, r1, r0
lsl r0, r0, #0x10
lsr r0, r0, #0x10
@@ -18269,7 +18269,7 @@ _0211d07c:
add sp, #0x48
pop {r3, r4, r5, pc}
.align 2, 0
_0211d08c: .word data_02050f54
_0211d08c: .word gSinCosTable
thumb_func_end func_ov09_0211d00c
.global func_ov09_0211d090
@@ -18415,7 +18415,7 @@ func_ov09_0211d180: ; 0x0211d180
add r0, sp, #0x78
add r2, sp, #0x84
mov r1, r4
bl func_01ff9bc4
bl Vec3p_Add
mov r3, r5
movs r0, #0x10
beq _0211d27c
@@ -18476,7 +18476,7 @@ _0211d2ec:
str r3, [sp, #0x10]
ldr r3, [r5, #0x4c]
str r3, [sp, #0x14]
bl func_01ff9bf8
bl Vec3p_Sub
add r0, sp, #0x6c
mov r1, r8
bl func_01fffbec
@@ -18489,7 +18489,7 @@ _0211d2ec:
ldr r3, [r5, #0x4c]
mov r2, r0
str r3, [sp, #8]
bl func_01ff9bc4
bl Vec3p_Add
ldr r1, [sp, #0x6c]
ldr r0, [sp, #0x70]
rsb r1, r1, #0
@@ -18582,7 +18582,7 @@ _0211d420:
add r0, sp, #0x30
add r1, sp, #0x54
add r2, sp, #0x3c
bl func_01ff9bc4
bl Vec3p_Add
mvn r0, #0x384
str r0, [sp, #0x30]
mov r0, #0
@@ -18597,7 +18597,7 @@ _0211d420:
add r0, sp, #0x30
add r1, sp, #0x54
add r2, sp, #0x48
bl func_01ff9bc4
bl Vec3p_Add
mov r0, #0
ldr r1, _0211d660 ; =0xfffff4a4
str r0, [sp, #0x18]
@@ -18744,7 +18744,7 @@ _0211d69c:
moveq r5, #1
str r0, [sp]
ldr r2, [r4, #0xc]
ldr r1, _0211d78c ; =data_027e0d0c
ldr r1, _0211d78c ; =gVec3p_ZERO
str r2, [sp, #4]
str r1, [sp, #8]
movne r5, #2
@@ -18755,7 +18755,7 @@ _0211d69c:
ldmia r4, {r2, r3}
bl func_ov00_0207c358
ldr r0, [r4, #0x18]
ldr r1, _0211d78c ; =data_027e0d0c
ldr r1, _0211d78c ; =gVec3p_ZERO
str r0, [sp]
ldr r2, [r4, #0x1c]
ldr r0, _0211d790 ; =data_027e0e58
@@ -18773,7 +18773,7 @@ _0211d69c:
_0211d780: .word data_027e0d38
_0211d784: .word data_ov09_0211e3d8
_0211d788: .word data_ov09_0211e444
_0211d78c: .word data_027e0d0c
_0211d78c: .word gVec3p_ZERO
_0211d790: .word data_027e0e58
arm_func_end func_ov09_0211d668
asm/ov10.inc
+1 -1
View File
@@ -185,7 +185,7 @@
.extern func_ov00_0207c118
.extern func_ov00_0207c170
.extern func_ov00_0207c190
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020cfed0
.extern func_ov00_020d00c4
.extern func_ov00_020d03c4
asm/ov10.s
+1 -1
View File
@@ -7742,7 +7742,7 @@ func_ov10_021179f8: ; 0x021179f8
stmdb sp!, {r4, lr}
mov r4, r0
add r0, r4, #0x1c
bl func_ov00_020c1500
bl _ZN19Actor_UnkStruct_020C1Ev
mov r0, r4
ldmia sp!, {r4, pc}
arm_func_end func_ov10_021179f8
asm/ov12.inc
+28 -28
View File
@@ -1,7 +1,15 @@
#pragma once
.extern Approach_thunk
.extern Atan2
.extern Divide
.extern PlaySoundEffect
.extern Vec3p_Add
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Vec3p_Dot
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Sub
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager17GetMapData_Unk_48Ev
.extern _ZN10MapManager17Get_MapData_Unk28Ev
@@ -17,18 +25,19 @@
.extern _ZN10MapManager18func_ov00_02083c24Ei
.extern _ZN10MapManager18func_ov00_02083c50Ei
.extern _ZN10MapManager18func_ov00_02083e34Ecci
.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager18func_ov00_020840a0Ecci
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN10PlayerBase18func_ov00_020a7c00Ei
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase9AddHealthEs
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN11ItemManager15Shield_vfunc_38Ei
.extern _ZN11ItemManager18EquipItem_vfunc_38Ei
.extern _ZN11ItemManager19GetDungeonItemModelEj
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern _ZN11ItemManager22UpdateSwordShieldInUseEv
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase19PlayerBase_vfunc_38EP5Vec3p
@@ -39,22 +48,25 @@
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14OverlayManager15LoadIfNotLoadedEjj
.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
.extern _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor13func_01fffd04Ei
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_hi
.extern _ZN5Actor18func_ov00_020c2988EP5Vec3piS1_
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
@@ -62,14 +74,14 @@
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -114,6 +126,7 @@
.extern _ZN7MapBase8vfunc_b4Ev
.extern _ZN7MapBase8vfunc_b8Ev
.extern _ZN7MapBaseD1Ev
.extern _ZN8Cylinder8OverlapsEPS_
.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
@@ -121,7 +134,6 @@
.extern _ZNK11ItemManager18func_ov00_020ad594Ei
.extern _ZNK11ItemManager8GetFairyEi
.extern __register_global_object
.extern data_02050f54
.extern data_02056be4
.extern data_02057200
.extern data_02068e9c
@@ -139,7 +151,6 @@
.extern data_027e0c68
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d0c
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d44
@@ -152,18 +163,12 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fc0
.extern data_027e0fc4
.extern data_027e0fc8
.extern data_027e0fcc
.extern data_027e0fd4
.extern data_027e0fd8
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff8
@@ -196,24 +201,13 @@
.extern func_01ff9958
.extern func_01ff9b4c
.extern func_01ff9b88
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern func_01ffa9fc
.extern func_01ffbe34
.extern func_01ffbe78
.extern func_01ffbf5c
.extern func_01ffec34
.extern func_01fffb4c
.extern func_01fffbec
.extern func_01fffcd8
.extern func_01fffcec
.extern func_01fffd04
.extern func_02002bac
.extern func_02003a9c
.extern func_02003b04
@@ -505,7 +499,6 @@
.extern func_ov00_020bbed4
.extern func_ov00_020bc0a8
.extern func_ov00_020bc27c
.extern func_ov00_020bc46c
.extern func_ov00_020bc48c
.extern func_ov00_020bc500
.extern func_ov00_020bc6d4
@@ -535,7 +528,6 @@
.extern func_ov00_020c0ecc
.extern func_ov00_020c1424
.extern func_ov00_020c1450
.extern func_ov00_020c1500
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
@@ -756,9 +748,17 @@
.extern func_ov61_02179ce4
.extern func_ov61_02179ee4
.extern func_ov61_02179f88
.extern gActorManager
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern gOverlayManager
.extern gPlayer
.extern gPlayerAngle
.extern gPlayerAnimHandler
.extern gPlayerLink
.extern gPlayerPos
.extern gPlayerVel
.extern gSinCosTable
.extern gVec3p_ZERO
.extern strncpy
asm/ov12.s
+220 -220
View File
File diff suppressed because it is too large Load Diff
asm/ov14/Actor/ActorRupee.inc
+7 -7
View File
@@ -1,13 +1,15 @@
#pragma once
.extern Vec3p_Add
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN11ItemManager10GiveRupeesEsb
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12KillInBoundsEv
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor13func_01fffd04Ei
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
@@ -22,13 +24,13 @@
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_68Ev
@@ -56,13 +58,9 @@
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_027e0764
.extern gMapManager
.extern data_027e0fc8
.extern data_027e0fe0
.extern data_ov00_020e9370
.extern data_ov00_020eec9c
.extern func_01ff9bc4
.extern func_01fffd04
.extern func_0202bc38
.extern func_ov00_0207a13c
.extern func_ov00_0207a1c8
@@ -71,3 +69,5 @@
.extern func_ov00_020d7ad4
.extern func_ov05_02102c2c
.extern gItemManager
.extern gMapManager
.extern gPlayerLink
asm/ov14/Actor/ActorRupee.s
+8 -8
View File
@@ -221,7 +221,7 @@ _ZN10ActorRupee4MoveEv: ; 0x0213b120
add r0, r4, #0x48
add r1, r4, #0x60
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
mov r0, #1
strb r0, [r4, #0x9f]
ldr r0, [r4, #0x98]
@@ -236,7 +236,7 @@ _ZN10ActorRupee4MoveEv: ; 0x0213b120
strh r0, [r4, #0x9c]
mov r0, r4
mov r1, #0
bl func_01fffd04
bl _ZN5Actor13func_01fffd04Ei
cmp r0, #0
movne r0, #0
strne r0, [r4, #0x60]
@@ -351,7 +351,7 @@ _ZN10ActorRupee6UpdateEb: ; 0x0213b254
bl _ZN10ActorRupee22GetRupeeCutsceneItemIdEv
movs r1, r0
bmi _0213b2f8
ldr r0, _0213b50c ; =data_027e0fc8
ldr r0, _0213b50c ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bce48
cmp r0, #0
@@ -454,7 +454,7 @@ _0213b42c:
bl _ZN10ActorRupee18func_ov14_0213b204Ei
b _0213b4fc
_0213b438:
ldr r1, _0213b50c ; =data_027e0fc8
ldr r1, _0213b50c ; =gPlayerLink
mov r0, r5
ldr r4, [r1]
bl _ZN10ActorRupee22GetRupeeCutsceneItemIdEv
@@ -513,7 +513,7 @@ _0213b4fc:
add sp, sp, #0x10
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0213b50c: .word data_027e0fc8
_0213b50c: .word gPlayerLink
_0213b510: .word gItemManager
_0213b514: .word data_ov00_020eec9c
_0213b518: .word gMapManager
@@ -854,7 +854,7 @@ data_ov14_021589fc: ; 0x021589fc
.word _ZN10ActorRupee8vfunc_18Ej
.global data_ov14_02158a00
data_ov14_02158a00: ; 0x02158a00
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov14_02158a04
data_ov14_02158a04: ; 0x02158a04
.word _ZN10ActorRupee8vfunc_20Ei
@@ -884,10 +884,10 @@ data_ov14_02158a24: ; 0x02158a24
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov14_02158a28
data_ov14_02158a28: ; 0x02158a28
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov14_02158a2c
data_ov14_02158a2c: ; 0x02158a2c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov14_02158a30
data_ov14_02158a30: ; 0x02158a30
.word _ZN5Actor8vfunc_4cEPi
asm/ov14/ov14_0211f640.inc
+28 -28
View File
@@ -1,6 +1,14 @@
#pragma once
.extern Approach_thunk
.extern Atan2
.extern Divide
.extern Vec3p_Add
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Vec3p_Dot
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Sub
.extern _ZN10MapManager16MapData_vfunc_54Ev
.extern _ZN10MapManager16MapData_vfunc_58Ev
.extern _ZN10MapManager16MapData_vfunc_60Ev
@@ -42,6 +50,7 @@
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern _ZN11ItemManager8GiveAmmoEit
.extern _ZN11ItemManager8GiveKeysEj
.extern _ZN12ActorManager13FindActorByIdEj
@@ -61,15 +70,20 @@
.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
.extern _ZN14AdventureFlags18func_ov00_0209809cEv
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14PlayerLinkBase18func_ov00_020bc854EP5Vec3p
.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
.extern _ZN5Actor10GetUnk_08cEP8Cylinder
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_129Eb
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12KillInBoundsEv
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor13func_01fffd04Ei
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
@@ -78,13 +92,13 @@
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1788Ev
.extern _ZN5Actor18func_ov00_020c195cEv
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1c20Eii
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_hi
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c243cEPjPPS_
.extern _ZN5Actor18func_ov00_020c2c0cEv
.extern _ZN5Actor18func_ov00_020c2c70Ev
.extern _ZN5Actor18func_ov00_020c2d54Ev
@@ -100,14 +114,14 @@
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -142,7 +156,6 @@
.extern _ZNK11ItemManager18func_ov00_020ad560Ei
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern data_02052f54
.extern data_02056be4
.extern data_02063e4c
@@ -152,7 +165,6 @@
.extern data_027e080c
.extern data_027e0c68
.extern data_027e0ce0
.extern data_027e0d0c
.extern data_027e0d18
.extern data_027e0d38
.extern data_027e0d3c
@@ -165,15 +177,9 @@
.extern data_027e0f70
.extern data_027e0f78
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern data_027e0fcc
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
@@ -206,22 +212,12 @@
.extern func_01ff8aa0
.extern func_01ff9158
.extern func_01ff9958
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern func_01ffa9fc
.extern func_01ffbe34
.extern func_01ffbe78
.extern func_01ffbf5c
.extern func_01fffb4c
.extern func_01fffbec
.extern func_01fffcec
.extern func_01fffd04
.extern func_020020d0
.extern func_0200250c
.extern func_02002540
@@ -283,7 +279,6 @@
.extern func_ov00_02079b78
.extern func_ov00_02079e68
.extern func_ov00_0207a13c
.extern func_ov00_0207a188
.extern func_ov00_0207a1a4
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
@@ -407,9 +402,7 @@
.extern func_ov00_020bba48
.extern func_ov00_020bbbb8
.extern func_ov00_020bbe94
.extern func_ov00_020bc46c
.extern func_ov00_020bc494
.extern func_ov00_020bc854
.extern func_ov00_020bcdec
.extern func_ov00_020bce48
.extern func_ov00_020bd618
@@ -426,7 +419,6 @@
.extern func_ov00_020c0cc8
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
@@ -514,8 +506,16 @@
.extern func_ov57_0219a6b8
.extern func_ov57_0219a850
.extern func_ov58_0219ab28
.extern gActorManager
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern gOverlayManager
.extern gPlayer
.extern gPlayerAngle
.extern gPlayerControl
.extern gPlayerLink
.extern gPlayerPos
.extern gSinCosTable
.extern gVec3p_ZERO
.extern strcmp
asm/ov14/ov14_0211f640.s
+509 -509
View File
File diff suppressed because it is too large Load Diff
asm/ov14/ov14_0213b778.inc
+28 -28
View File
@@ -50,7 +50,7 @@
.extern _ZN11ItemManager18PlayItemFanfareSfxEi
.extern _ZN11ItemManager8GiveItemEi
.extern _ZN11ItemManager9SetPotionEjh
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -76,7 +76,7 @@
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
@@ -84,7 +84,7 @@
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1c20Eii
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c3094Ev
@@ -95,14 +95,14 @@
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -138,7 +138,7 @@
.extern _ZNK11ItemManager9HasPotionEj
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_02057200
.extern data_02063e4c
@@ -155,7 +155,7 @@
.extern data_027e0c68
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d28
.extern data_027e0d38
.extern data_027e0d3c
@@ -166,19 +166,19 @@
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fb8
.extern gPlayer
.extern gPlayerPos
.extern gPlayerVel
.extern gPlayerControl
.extern data_027e0fc0
.extern data_027e0fc4
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fcc
.extern data_027e0fd0
.extern data_027e0fd4
.extern data_027e0fd8
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff8
@@ -228,13 +228,13 @@
.extern func_01ff991c
.extern func_01ff9958
.extern func_01ff9b4c
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_01ff9cec
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Dot
.extern Vec3p_Length
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Atan2
.extern func_01ffa9fc
.extern func_01ffbe34
.extern func_01ffbe78
@@ -243,8 +243,8 @@
.extern func_01fffb4c
.extern func_01fffbec
.extern func_01fffcd8
.extern func_01fffcec
.extern func_01fffd04
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern _ZN5Actor13func_01fffd04Ei
.extern func_020029fc
.extern func_02002c14
.extern func_0200388c
@@ -281,8 +281,8 @@
.extern func_0202aff0
.extern func_0202b154
.extern func_0202b2e8
.extern func_0202b864
.extern func_0202b894
.extern _ZN12TouchControl13func_0202b864EP5Vec3pic
.extern _ZN12TouchControl13func_0202b894EP5Vec3pic
.extern func_0202bbbc
.extern func_0202d5b4
.extern func_0202d77c
@@ -337,7 +337,7 @@
.extern func_ov00_0207977c
.extern func_ov00_02079b34
.extern func_ov00_02079e68
.extern func_ov00_0207a188
.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
.extern func_ov00_0207a1a4
.extern func_ov00_0207a1c8
.extern func_ov00_0207b89c
@@ -499,7 +499,7 @@
.extern func_ov00_020bbe94
.extern func_ov00_020bbed4
.extern func_ov00_020bc0a8
.extern func_ov00_020bc46c
.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
.extern func_ov00_020bc4ac
.extern func_ov00_020bc500
.extern func_ov00_020bc6d4
@@ -510,7 +510,7 @@
.extern func_ov00_020bcdb8
.extern func_ov00_020bcf50
.extern func_ov00_020bcfb8
.extern func_ov00_020bd304
.extern _ZN14PlayerLinkBase18func_ov00_020bd304Ev
.extern func_ov00_020bd318
.extern func_ov00_020bd5f4
.extern func_ov00_020bd5fc
@@ -546,7 +546,7 @@
.extern func_ov00_020c0d4c
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
asm/ov14/ov14_0213b778.s
+375 -375
View File
File diff suppressed because it is too large Load Diff
asm/ov15.inc
+30 -30
View File
@@ -41,7 +41,7 @@
.extern _ZN10PlayerBase10GetEquipIdEv
.extern _ZN10PlayerBase18TeleportToEntranceEib
.extern _ZN10PlayerBase18func_ov00_020a7c00Ei
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN10PlayerBase7CanMoveEv
.extern _ZN10PlayerBase8TeleportEP5Vec3psibb
.extern _ZN10PlayerBase8vfunc_04Ev
@@ -53,7 +53,7 @@
.extern _ZN11ItemManager18func_ov00_020ad528Ev
.extern _ZN11ItemManager19SetTreasureSalvagedEj
.extern _ZN11ItemManager8GiveItemEi
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
@@ -82,7 +82,7 @@
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
@@ -95,13 +95,13 @@
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1c20Eii
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1d58Ev
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c23d4EP8ActorRefPS_P8Cylinder
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c243cEPjPPS_
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor4KillEv
@@ -111,14 +111,14 @@
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -176,7 +176,7 @@
.extern _ZNK11ItemManager7HasItemEi
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02051f54
.extern data_02053f54
.extern data_02056be4
@@ -200,7 +200,7 @@
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d44
@@ -217,15 +217,15 @@
.extern data_027e0f78
.extern data_027e0f7c
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern gPlayer
.extern gPlayerPos
.extern gPlayerVel
.extern gPlayerAngle
.extern data_027e0fb0
.extern data_027e0fb8
.extern gPlayerControl
.extern data_027e0fc4
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
@@ -292,16 +292,16 @@
.extern func_01ff9958
.extern func_01ff9b4c
.extern func_01ff9b88
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_01ff9c68
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Dot
.extern Vec3p_Cross
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern func_01ff9f3c
.extern func_01ffa0f4
.extern Atan2
.extern func_01ffa8d4
.extern func_01ffa9fc
.extern func_01ffbe34
@@ -312,7 +312,7 @@
.extern func_01fffb4c
.extern func_01fffb80
.extern func_01fffbec
.extern func_01fffd04
.extern _ZN5Actor13func_01fffd04Ei
.extern func_02001a9c
.extern func_0200250c
.extern func_02002540
@@ -365,8 +365,8 @@
.extern func_0202b418
.extern func_0202b4e4
.extern func_0202b734
.extern func_0202b864
.extern func_0202b894
.extern _ZN12TouchControl13func_0202b864EP5Vec3pic
.extern _ZN12TouchControl13func_0202b894EP5Vec3pic
.extern func_0202bac0
.extern func_0202bbbc
.extern func_0202bc38
@@ -440,7 +440,7 @@
.extern func_0203eba8
.extern func_0203ebc8
.extern func_02042f68
.extern func_02042f74
.extern abs
.extern func_02043594
.extern func_020435b4
.extern func_02043600
@@ -460,7 +460,7 @@
.extern func_ov00_02079b54
.extern func_ov00_02079e68
.extern func_ov00_0207a13c
.extern func_ov00_0207a188
.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
.extern func_ov00_0207a1c8
.extern func_ov00_0207a730
.extern func_ov00_0207b89c
@@ -641,7 +641,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c0e5c
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
asm/ov15.s
+2363 -2363
View File
File diff suppressed because it is too large Load Diff
asm/ov17.inc
+21 -21
View File
@@ -3,7 +3,7 @@
.extern Divide
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN11ItemManager19GetDungeonItemModelEj
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
@@ -20,7 +20,7 @@
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
@@ -29,7 +29,7 @@
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1c20Eii
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c2c0cEv
.extern _ZN5Actor18func_ov00_020c2c70Ev
@@ -44,13 +44,13 @@
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -78,7 +78,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager18func_ov00_020ad594Ei
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02063e4c
.extern data_027e0618
.extern data_027e071c
@@ -86,7 +86,7 @@
.extern data_027e077c
.extern data_027e0c54
.extern data_027e0ce0
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0e58
@@ -97,14 +97,14 @@
.extern data_027e0f70
.extern data_027e0f78
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern gPlayer
.extern gPlayerPos
.extern gPlayerAngle
.extern gPlayerControl
.extern data_027e0fc4
.extern data_027e0fc8
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
@@ -137,15 +137,15 @@
.extern func_01ff991c
.extern func_01ff9b4c
.extern func_01ff9b88
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Atan2
.extern func_01ffa9fc
.extern func_01ffbe34
.extern func_01ffbf5c
.extern func_01fffd04
.extern _ZN5Actor13func_01fffd04Ei
.extern func_02002c14
.extern func_020038a4
.extern func_020078f4
@@ -197,7 +197,7 @@
.extern func_ov00_02079008
.extern func_ov00_02079470
.extern func_ov00_02079e68
.extern func_ov00_0207a188
.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
.extern func_ov00_0207a1c8
.extern func_ov00_0207b89c
.extern func_ov00_0207c1b0
@@ -365,7 +365,7 @@
.extern func_ov00_020c0cc8
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
asm/ov17.s
+229 -229
View File
File diff suppressed because it is too large Load Diff
asm/ov18.inc
+18 -18
View File
@@ -1,7 +1,7 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
@@ -18,7 +18,7 @@
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor14GetAngleToLinkEv
@@ -29,20 +29,20 @@
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c243cEPjPPS_
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -69,7 +69,7 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02051054
.extern data_02057840
.extern data_0205785c
@@ -95,11 +95,11 @@
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f84
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fd0
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
@@ -136,17 +136,17 @@
.extern func_01ff9a18
.extern func_01ff9a80
.extern func_01ff9b24
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9cec
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Length
.extern Vec3p_Distance
.extern Atan2
.extern func_01ffa8d4
.extern func_01ffa9fc
.extern func_01ffbe34
.extern func_01fffb4c
.extern func_01fffcd8
.extern func_01fffcec
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern func_02000c60
.extern func_0200107c
.extern func_02001154
@@ -217,7 +217,7 @@
.extern func_ov00_02079680
.extern func_ov00_02079e68
.extern func_ov00_0207a13c
.extern func_ov00_0207a188
.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
.extern func_ov00_0207a1c8
.extern func_ov00_0207a300
.extern func_ov00_0207a730
@@ -358,7 +358,7 @@
.extern func_ov00_020bce48
.extern func_ov00_020bcec8
.extern func_ov00_020bcf50
.extern func_ov00_020bd304
.extern _ZN14PlayerLinkBase18func_ov00_020bd304Ev
.extern func_ov00_020bd318
.extern func_ov00_020bd618
.extern func_ov00_020bd728
@@ -371,7 +371,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c0e5c
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
asm/ov18.s
+201 -201
View File
File diff suppressed because it is too large Load Diff
asm/ov19.inc
+25 -25
View File
@@ -1,6 +1,11 @@
#pragma once
.extern Approach_thunk
.extern Atan2
.extern Divide
.extern Vec3p_Add
.extern Vec3p_Axpy
.extern Vec3p_Normalize
.extern Vec3p_Sub
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_02082680Eii
.extern _ZN10MapManager18func_ov00_020836dcEii
@@ -10,9 +15,10 @@
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern _ZN11ItemManager7AddItemEi
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
@@ -34,13 +40,15 @@
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor13func_01fffd04Ei
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor15IsHitboxTouchedEb
@@ -48,12 +56,12 @@
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1c20Eii
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c23d4EP8ActorRefPS_P8Cylinder
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c243cEPjPPS_
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c31c0Ei
@@ -65,14 +73,14 @@
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -103,28 +111,20 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern abs
.extern data_02051254
.extern data_027e0764
.extern data_027e0c54
.extern data_027e0c68
.extern data_027e0d0c
.extern data_027e0d44
.extern data_027e0db0
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f78
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fb8
.extern data_027e0fc8
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
@@ -147,16 +147,9 @@
.extern func_01ff8690
.extern func_01ff9158
.extern func_01ff9958
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ffa0f4
.extern func_01ffa9fc
.extern func_01fffbec
.extern func_01fffcd8
.extern func_01fffcec
.extern func_01fffd04
.extern func_02016fe8
.extern func_02018450
.extern func_02019534
@@ -177,7 +170,6 @@
.extern func_020370d0
.extern func_0203eba8
.extern func_0203ebc8
.extern func_02042f74
.extern func_0204f614
.extern func_0204f754
.extern func_ov00_02079e68
@@ -283,7 +275,6 @@
.extern func_ov00_020c0cc8
.extern func_ov00_020c0d4c
.extern func_ov00_020c0e04
.extern func_ov00_020c1500
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
@@ -368,6 +359,15 @@
.extern func_ov05_02102c2c
.extern func_ov17_02168660
.extern func_ov17_021687f0
.extern gActorManager
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern gPlayer
.extern gPlayerControl
.extern gPlayerLink
.extern gPlayerPos
.extern gPlayerVel
.extern gSinCosTable
.extern gVec3p_ZERO
.extern strncpy
asm/ov19.s
+144 -144
View File
File diff suppressed because it is too large Load Diff
asm/ov20.inc
+22 -22
View File
@@ -11,7 +11,7 @@
.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN11ItemManager7AddItemEi
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase12GetPlayerPosEv
@@ -30,7 +30,7 @@
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12KillInBoundsEv
.extern _ZN5Actor12SetTransformEP9Transform
@@ -43,7 +43,7 @@
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18CollidesWithShieldEP8Cylinder
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1c20Eii
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
@@ -60,14 +60,14 @@
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -98,7 +98,7 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_027e0764
.extern data_027e077c
@@ -110,12 +110,12 @@
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fc8
.extern gPlayer
.extern gPlayerPos
.extern gPlayerAngle
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
@@ -134,17 +134,17 @@
.extern func_01ff8248
.extern func_01ff8aa0
.extern func_01ff9158
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Atan2
.extern func_01ffbe78
.extern func_01fffbec
.extern func_01fffcec
.extern func_01fffd04
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern _ZN5Actor13func_01fffd04Ei
.extern func_02016fe8
.extern func_02018450
.extern func_02018cb8
@@ -263,7 +263,7 @@
.extern func_ov00_020c0cc8
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
@@ -365,7 +365,7 @@
.extern func_ov14_02127984
.extern func_ov14_02127a14
.extern func_ov14_02127ac4
.extern func_ov14_0213d15c
.extern _ZN14EquipBoomerang8GetActorEv
.extern func_ov14_0213d184
.extern func_ov14_021448d4
.extern func_ov14_021448dc
asm/ov20.s
+160 -160
View File
File diff suppressed because it is too large Load Diff
asm/ov21.inc
+16 -16
View File
@@ -1,4 +1,8 @@
#pragma once
.extern Atan2
.extern Vec3p_Add
.extern Vec3p_Dot
.extern Vec3p_Sub
.extern _ZN10MapManager16MapData_vfunc_54Ev
.extern _ZN10MapManager16MapData_vfunc_60Ev
.extern _ZN10MapManager16MapData_vfunc_68Ev
@@ -10,14 +14,18 @@
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
.extern _ZN13LinkStateBase28Get_PlayerControlData_Unk120Ev
.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor13func_01fffd04Ei
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
@@ -32,13 +40,13 @@
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -68,20 +76,15 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern data_027e0764
.extern data_027e077c
.extern data_027e0d3c
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f84
.extern data_027e0f94
.extern data_027e0fc8
.extern data_027e0fd0
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
@@ -95,13 +98,8 @@
.extern data_ov00_020eed2c
.extern func_01ff8aa0
.extern func_01ff9158
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_01ffa0f4
.extern func_01ffbe78
.extern func_01ffbf5c
.extern func_01fffd04
.extern func_020020d0
.extern func_0200250c
.extern func_02002540
@@ -124,7 +122,6 @@
.extern func_ov00_020792a0
.extern func_ov00_020793b8
.extern func_ov00_02079ab4
.extern func_ov00_0207a188
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1f8
.extern func_ov00_02081f4c
@@ -176,14 +173,12 @@
.extern func_ov00_020b7d74
.extern func_ov00_020b7e6c
.extern func_ov00_020bba28
.extern func_ov00_020bc46c
.extern func_ov00_020bc500
.extern func_ov00_020bd618
.extern func_ov00_020c0c08
.extern func_ov00_020c0cc8
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
@@ -309,4 +304,9 @@
.extern func_ov17_0216a3e8
.extern func_ov17_0216a4ac
.extern func_ov17_0216a634
.extern gActorManager
.extern gItemManager
.extern gMapManager
.extern gPlayerLink
.extern gPlayerPos
.extern gSinCosTable
asm/ov21.s
+59 -59
View File
@@ -289,7 +289,7 @@ func_ov21_0216d950: ; 0x0216d950
mov r1, r0, lsl #0x1
add r0, r1, #1
mov r2, r0, lsl #0x1
ldr r3, _0216dad8 ; =data_02050f54
ldr r3, _0216dad8 ; =gSinCosTable
mov r1, r1, lsl #0x1
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
@@ -315,11 +315,11 @@ func_ov21_0216d950: ; 0x0216d950
add r0, sp, #0x6c
add r1, sp, #0
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
add r0, sp, #0x6c
add r1, sp, #0xc
add r2, sp, #0x54
bl func_01ff9bc4
bl Vec3p_Add
ldr r0, [sp]
ldr r1, [sp, #0xc]
rsb r0, r0, #0
@@ -329,11 +329,11 @@ func_ov21_0216d950: ; 0x0216d950
add r1, sp, #0
mov r2, r0
str r3, [sp, #0xc]
bl func_01ff9bc4
bl Vec3p_Add
add r0, sp, #0x60
add r1, sp, #0xc
add r2, sp, #0x48
bl func_01ff9bc4
bl Vec3p_Add
ldr r0, [r4, #0x9c]
cmp r0, #0
beq _0216daa8
@@ -354,7 +354,7 @@ _0216daa8:
_0216dacc: .word 0xfffff004
_0216dad0: .word 0x45800000
_0216dad4: .word 0x46800000
_0216dad8: .word data_02050f54
_0216dad8: .word gSinCosTable
_0216dadc: .word 0x00000547
arm_func_end func_ov21_0216d950
@@ -487,7 +487,7 @@ _0216dc54: .word func_ov00_020b7d74
func_ov21_0216dc58: ; 0x0216dc58
stmdb sp!, {lr}
sub sp, sp, #0xc
ldr r1, _0216dcb0 ; =data_027e0f94
ldr r1, _0216dcb0 ; =gPlayerPos
mov ip, r0
ldr r2, [r1, #4]
ldr r3, [r1]
@@ -498,17 +498,17 @@ func_ov21_0216dc58: ; 0x0216dc58
mov r2, r0
add r1, ip, #0x14
str r3, [sp, #8]
bl func_01ff9bf8
bl Vec3p_Sub
add r0, sp, #0
mov r1, r0
bl func_01ff9c2c
bl Vec3p_Dot
cmp r0, #0x24000
movlt r0, #1
movge r0, #0
add sp, sp, #0xc
ldmia sp!, {pc}
.align 2, 0
_0216dcb0: .word data_027e0f94
_0216dcb0: .word gPlayerPos
arm_func_end func_ov21_0216dc58
.global func_ov21_0216dcb4
@@ -653,7 +653,7 @@ func_ov21_0216de7c: ; 0x0216de7c
bl func_ov21_0216df08
mov r0, r4
mov r1, #0
bl func_01fffd04
bl _ZN5Actor13func_01fffd04Ei
ldmia sp!, {r4, pc}
arm_func_end func_ov21_0216de7c
@@ -679,7 +679,7 @@ func_ov21_0216deac: ; 0x0216deac
bl func_ov21_0216df08
mov r0, r4
mov r1, #0
bl func_01fffd04
bl _ZN5Actor13func_01fffd04Ei
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
@@ -694,7 +694,7 @@ func_ov21_0216df08: ; 0x0216df08
add r0, r4, #0x48
add r1, r4, #0x60
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
mov r0, r4
bl func_ov00_020cc3fc
ldmia sp!, {r4, pc}
@@ -856,7 +856,7 @@ func_ov21_0216e128: ; 0x0216e128
sub sp, sp, #0x44
mov r4, r0
add r0, sp, #0x18
bl func_ov00_020c1500
bl _ZN19Actor_UnkStruct_020C1Ev
mvn r1, #0
add r0, sp, #0x18
str r1, [sp, #0x34]
@@ -885,7 +885,7 @@ func_ov21_0216e128: ; 0x0216e128
ldr r1, _0216e1d4 ; =0x4e4b4559
mov r2, r5
bl func_ov00_020c4048
ldr r0, _0216e1d8 ; =data_027e0fe4
ldr r0, _0216e1d8 ; =gActorManager
add r1, sp, #4
ldr r0, [r0]
bl _ZN12ActorManager8GetActorEP8ActorRef
@@ -897,7 +897,7 @@ func_ov21_0216e128: ; 0x0216e128
.align 2, 0
_0216e1d0: .word data_027e0fe8
_0216e1d4: .word 0x4e4b4559
_0216e1d8: .word data_027e0fe4
_0216e1d8: .word gActorManager
arm_func_end func_ov21_0216e128
.global func_ov21_0216e1dc
@@ -1077,7 +1077,7 @@ _0216e3d8: .word data_ov21_021710a0
func_ov21_0216e3dc: ; 0x0216e3dc
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
ldr r1, _0216e460 ; =data_027e0f94
ldr r1, _0216e460 ; =gPlayerPos
mov r4, r0
add r3, sp, #0
ldmia r1, {r0, r1, r2}
@@ -1112,7 +1112,7 @@ _0216e44c:
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0216e460: .word data_027e0f94
_0216e460: .word gPlayerPos
arm_func_end func_ov21_0216e3dc
.global func_ov21_0216e464
@@ -1378,7 +1378,7 @@ _0216e78c:
cmp r0, #0
beq _0216e830
ldrh r0, [r4, #0x78]
ldr ip, _0216e8c4 ; =data_02050f54
ldr ip, _0216e8c4 ; =gSinCosTable
ldr lr, _0216e8c8 ; =0x000009be
mov r0, r0, asr #0x4
mov r0, r0, lsl #0x2
@@ -1417,7 +1417,7 @@ _0216e830:
ldr r0, [r0, #0x14]
cmp r0, #0x15000
bge _0216e868
ldr r1, _0216e8d4 ; =data_027e0f94
ldr r1, _0216e8d4 ; =gPlayerPos
mov r0, r4
bl _ZN5Actor10GetAngleToEP5Vec3p
mov r1, r0
@@ -1449,14 +1449,14 @@ _0216e868:
bl func_ov21_0216df08
mov r0, r4
mov r1, #0
bl func_01fffd04
bl _ZN5Actor13func_01fffd04Ei
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0216e8c4: .word data_02050f54
_0216e8c4: .word gSinCosTable
_0216e8c8: .word 0x000009be
_0216e8cc: .word data_027e0ffc
_0216e8d0: .word 0x0000024f
_0216e8d4: .word data_027e0f94
_0216e8d4: .word gPlayerPos
_0216e8d8: .word 0x00000aab
_0216e8dc: .word 0x00000c51
arm_func_end func_ov21_0216e74c
@@ -2659,13 +2659,13 @@ func_ov21_0216f6a8: ; 0x0216f6a8
add r1, r4, #0x54
bne _0216f708
add r2, r4, #0x60
bl func_01ff9bf8
bl Vec3p_Sub
add sp, sp, #0x18
mov r0, #1
ldmia sp!, {r4, pc}
_0216f708:
add r2, r4, #0x60
bl func_01ff9bf8
bl Vec3p_Sub
mvn r1, #0
add r3, sp, #4
mov r0, r4
@@ -2736,7 +2736,7 @@ func_ov21_0216f7c8: ; 0x0216f7c8
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
mov r0, r10
mov r1, #0
bl func_01fffd04
bl _ZN5Actor13func_01fffd04Ei
cmp r0, #0
addeq sp, sp, #0x118
moveq r0, #0
@@ -2744,7 +2744,7 @@ func_ov21_0216f7c8: ; 0x0216f7c8
add r0, r10, #0x48
add r1, r10, #0x54
add r2, r10, #0x60
bl func_01ff9bf8
bl Vec3p_Sub
ldr r0, [r10, #0x138]
cmp r0, #0x1e
addlt sp, sp, #0x118
@@ -2892,7 +2892,7 @@ _0216fa3c:
mov r0, r7
mov r1, r9
mov r2, r7
bl func_01ff9bc4
bl Vec3p_Add
ldr r1, [r4]
add r0, sp, #0x14
mov r2, r7
@@ -2927,7 +2927,7 @@ _0216fac4:
rsb r0, r0, #0
str r0, [r10, #0x224]
rsb r1, r1, #0
ldr r0, _0216fbb8 ; =data_027e0fc8
ldr r0, _0216fbb8 ; =gPlayerLink
str r1, [r10, #0x228]
ldr r0, [r0]
mov r4, #0
@@ -2945,7 +2945,7 @@ _0216fb20:
ldrb r0, [r10, #0x158]
cmp r0, #0
bne _0216fb60
ldr r0, _0216fbb8 ; =data_027e0fc8
ldr r0, _0216fbb8 ; =gPlayerLink
ldr r0, [r0]
bl func_ov00_020bba28
cmp r0, #0
@@ -2983,7 +2983,7 @@ _0216fba8: .word data_ov21_02171bf0
_0216fbac: .word data_ov21_02171774
_0216fbb0: .word data_ov21_02171bfc
_0216fbb4: .word func_ov00_020b1940
_0216fbb8: .word data_027e0fc8
_0216fbb8: .word gPlayerLink
_0216fbbc: .word data_027e0fd0
arm_func_end func_ov21_0216f7c8
@@ -2992,11 +2992,11 @@ _0216fbbc: .word data_027e0fd0
func_ov21_0216fbc0: ; 0x0216fbc0
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0xc
ldr r1, _0216fc58 ; =data_027e0fc8
ldr r1, _0216fc58 ; =gPlayerLink
mov r4, r0
ldr r5, [r1]
mov r0, r5
bl func_ov00_020bc46c
bl _ZN14PlayerLinkBase19GetCurrentCharacterEv
add r1, r5, #0x2c
ldrb r0, [r1, r0, lsl #1]
cmp r0, #0x1e
@@ -3031,7 +3031,7 @@ _0216fc38:
add sp, sp, #0xc
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0216fc58: .word data_027e0fc8
_0216fc58: .word gPlayerLink
arm_func_end func_ov21_0216fbc0
.global func_ov21_0216fc5c
@@ -3143,7 +3143,7 @@ _0216fddc:
str r0, [sp, #0x2c]
str r2, [sp, #0x30]
str r1, [sp, #0x34]
bl func_01ffa0f4
bl Atan2
mov r0, r0, lsl #0x10
mov r0, r0, asr #0x10
bl func_0202bc10
@@ -3651,7 +3651,7 @@ func_ov21_02170438: ; 0x02170438
str r2, [sp]
add r0, r4, #0x6c
mov r3, r1
blx func_ov00_0207a188
blx _ZN19Actor_UnkStruct_0a4C1Eiiii
mov r0, r4
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
@@ -4973,7 +4973,7 @@ data_ov21_02171120: ; 0x02171120
.word func_ov00_020cad30
.global data_ov21_02171124
data_ov21_02171124: ; 0x02171124
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov21_02171128
data_ov21_02171128: ; 0x02171128
.word func_ov00_020cb1c0
@@ -5003,7 +5003,7 @@ data_ov21_02171148: ; 0x02171148
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov21_0217114c
data_ov21_0217114c: ; 0x0217114c
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov21_02171150
data_ov21_02171150: ; 0x02171150
.word func_ov21_0216df2c
@@ -5192,7 +5192,7 @@ data_ov21_02171244: ; 0x02171244
.word func_ov14_02144b64
.global data_ov21_02171248
data_ov21_02171248: ; 0x02171248
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov21_0217124c
data_ov21_0217124c: ; 0x0217124c
.word func_ov14_02145100
@@ -5222,10 +5222,10 @@ data_ov21_0217126c: ; 0x0217126c
.word func_ov14_02145974
.global data_ov21_02171270
data_ov21_02171270: ; 0x02171270
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov21_02171274
data_ov21_02171274: ; 0x02171274
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov21_02171278
data_ov21_02171278: ; 0x02171278
.word _ZN5Actor8vfunc_4cEPi
@@ -5387,7 +5387,7 @@ data_ov21_02171348: ; 0x02171348
.word func_ov14_02144b64
.global data_ov21_0217134c
data_ov21_0217134c: ; 0x0217134c
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov21_02171350
data_ov21_02171350: ; 0x02171350
.word func_ov14_02145100
@@ -5417,10 +5417,10 @@ data_ov21_02171370: ; 0x02171370
.word func_ov14_02145974
.global data_ov21_02171374
data_ov21_02171374: ; 0x02171374
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov21_02171378
data_ov21_02171378: ; 0x02171378
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov21_0217137c
data_ov21_0217137c: ; 0x0217137c
.word _ZN5Actor8vfunc_4cEPi
@@ -5582,7 +5582,7 @@ data_ov21_0217144c: ; 0x0217144c
.word func_ov14_02144b64
.global data_ov21_02171450
data_ov21_02171450: ; 0x02171450
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov21_02171454
data_ov21_02171454: ; 0x02171454
.word func_ov14_02145100
@@ -5612,10 +5612,10 @@ data_ov21_02171474: ; 0x02171474
.word func_ov14_02145974
.global data_ov21_02171478
data_ov21_02171478: ; 0x02171478
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov21_0217147c
data_ov21_0217147c: ; 0x0217147c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov21_02171480
data_ov21_02171480: ; 0x02171480
.word _ZN5Actor8vfunc_4cEPi
@@ -5777,7 +5777,7 @@ data_ov21_02171550: ; 0x02171550
.word func_ov14_02144b64
.global data_ov21_02171554
data_ov21_02171554: ; 0x02171554
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov21_02171558
data_ov21_02171558: ; 0x02171558
.word func_ov14_02145100
@@ -5807,10 +5807,10 @@ data_ov21_02171578: ; 0x02171578
.word func_ov14_02145974
.global data_ov21_0217157c
data_ov21_0217157c: ; 0x0217157c
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov21_02171580
data_ov21_02171580: ; 0x02171580
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov21_02171584
data_ov21_02171584: ; 0x02171584
.word _ZN5Actor8vfunc_4cEPi
@@ -5972,7 +5972,7 @@ data_ov21_02171654: ; 0x02171654
.word func_ov14_02144b64
.global data_ov21_02171658
data_ov21_02171658: ; 0x02171658
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov21_0217165c
data_ov21_0217165c: ; 0x0217165c
.word func_ov14_02145100
@@ -6002,10 +6002,10 @@ data_ov21_0217167c: ; 0x0217167c
.word func_ov14_02145974
.global data_ov21_02171680
data_ov21_02171680: ; 0x02171680
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov21_02171684
data_ov21_02171684: ; 0x02171684
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov21_02171688
data_ov21_02171688: ; 0x02171688
.word _ZN5Actor8vfunc_4cEPi
@@ -6255,7 +6255,7 @@ data_ov21_021717e0: ; 0x021717e0
.word func_ov21_0216f618 ; func_ov22_0216f618, func_ov24_0216f618, func_ov28_0216f618
.global data_ov21_021717e4
data_ov21_021717e4: ; 0x021717e4
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov21_021717e8
data_ov21_021717e8: ; 0x021717e8
.word func_ov14_02138128
@@ -6285,10 +6285,10 @@ data_ov21_02171808: ; 0x02171808
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov21_0217180c
data_ov21_0217180c: ; 0x0217180c
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov21_02171810
data_ov21_02171810: ; 0x02171810
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov21_02171814
data_ov21_02171814: ; 0x02171814
.word _ZN5Actor8vfunc_4cEPi
@@ -6573,7 +6573,7 @@ data_ov21_02171988: ; 0x02171988
.word _ZN5Actor8vfunc_18Ej
.global data_ov21_0217198c
data_ov21_0217198c: ; 0x0217198c
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov21_02171990
data_ov21_02171990: ; 0x02171990
.word func_ov21_02170954
@@ -6603,10 +6603,10 @@ data_ov21_021719b0: ; 0x021719b0
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov21_021719b4
data_ov21_021719b4: ; 0x021719b4
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov21_021719b8
data_ov21_021719b8: ; 0x021719b8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov21_021719bc
data_ov21_021719bc: ; 0x021719bc
.word _ZN5Actor8vfunc_4cEPi
asm/ov22.inc
+26 -26
View File
@@ -20,7 +20,7 @@
.extern _ZN10MapManager18func_ov00_02084ac4Ej
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN10MapManager8SpawnNPCEP5Vec3pii
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
@@ -40,7 +40,7 @@
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor14DistanceToLinkEv
@@ -50,10 +50,10 @@
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1c20Eii
.extern _ZN5Actor18func_ov00_020c1da0EiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_hi
.extern _ZN5Actor18func_ov00_020c2e7cEv
.extern _ZN5Actor18func_ov00_020c2ed4Ev
.extern _ZN5Actor18func_ov00_020c313cEj
@@ -65,14 +65,14 @@
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -101,10 +101,10 @@
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02057200
.extern data_027e0764
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0e58
.extern gMapManager
@@ -113,14 +113,14 @@
.extern data_027e0f6c
.extern data_027e0f78
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern gPlayer
.extern gPlayerPos
.extern gPlayerAngle
.extern gPlayerControl
.extern gPlayerLink
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
@@ -141,20 +141,20 @@
.extern func_01ff8aa0
.extern func_01ff8e84
.extern func_01ff9158
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Dot
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Atan2
.extern func_01ffbe78
.extern func_01fffb4c
.extern func_01fffbec
.extern func_01fffcd8
.extern func_01fffcec
.extern func_01fffd04
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern _ZN5Actor13func_01fffd04Ei
.extern func_020020d0
.extern func_0200250c
.extern func_02002540
@@ -184,7 +184,7 @@
.extern func_0204f614
.extern func_0204f754
.extern func_ov00_02079e68
.extern func_ov00_0207a188
.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
@@ -289,7 +289,7 @@
.extern func_ov00_020c0ecc
.extern func_ov00_020c1424
.extern func_ov00_020c1450
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
asm/ov22.s
+186 -186
View File
File diff suppressed because it is too large Load Diff
asm/ov23.inc
+32 -32
View File
@@ -1,6 +1,15 @@
#pragma once
.extern Approach_thunk
.extern Atan2
.extern Divide
.extern PlaySoundEffect
.extern Vec3p_Add
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Vec3p_Dot
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Sub
.extern _ZN10MapManager14GetEntrancePosEP5Vec3pi
.extern _ZN10MapManager16MapData_vfunc_60Ev
.extern _ZN10MapManager16MapData_vfunc_68Ev
@@ -23,9 +32,10 @@
.extern _ZN10MapManager18func_ov00_02084740Ev
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
@@ -59,19 +69,23 @@
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14PlayerLinkBase19GetCurrentCharacterEv
.extern _ZN15LinkStateDamage18func_ov00_020acb6cEP5Vec3pi
.extern _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
.extern _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10GetUnk_08cEP8Cylinder
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor13func_01fffd04Ei
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
@@ -80,22 +94,22 @@
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1c20Eii
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c243cEPjPPS_
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -120,13 +134,13 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN8Cylinder8OverlapsEPS_
.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern data_02056be4
.extern data_02057200
.extern data_02063e4c
@@ -136,30 +150,21 @@
.extern data_027e0c68
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d0c
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0db0
.extern data_027e0e2c
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f70
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern data_027e0fcc
.extern data_027e0fd0
.extern data_027e0fd4
.extern data_027e0fd8
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff4
@@ -187,22 +192,11 @@
.extern func_01ff9158
.extern func_01ff991c
.extern func_01ff9b88
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern func_01ffbe34
.extern func_01ffbe78
.extern func_01ffec34
.extern func_01fffb4c
.extern func_01fffbec
.extern func_01fffcd8
.extern func_01fffcec
.extern func_01fffd04
.extern func_02016fe8
.extern func_02018450
.extern func_02019570
@@ -235,7 +229,6 @@
.extern func_ov00_02079470
.extern func_ov00_0207977c
.extern func_ov00_02079eb4
.extern func_ov00_0207a188
.extern func_ov00_0207a1a4
.extern func_ov00_0207a1c8
.extern func_ov00_0207c1b0
@@ -347,7 +340,6 @@
.extern func_ov00_020bb544
.extern func_ov00_020bb5f0
.extern func_ov00_020bba28
.extern func_ov00_020bc46c
.extern func_ov00_020bc48c
.extern func_ov00_020bc494
.extern func_ov00_020bc4ac
@@ -367,7 +359,6 @@
.extern func_ov00_020c0ffc
.extern func_ov00_020c10a0
.extern func_ov00_020c10d4
.extern func_ov00_020c1500
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
@@ -457,7 +448,6 @@
.extern func_ov00_020d1980
.extern func_ov00_020d70a4
.extern func_ov00_020d716c
.extern PlaySoundEffect
.extern func_ov00_020d77e4
.extern func_ov00_020d7a84
.extern func_ov00_020d7b20
@@ -573,6 +563,16 @@
.extern func_ov17_0216a734
.extern func_ov52_02195754
.extern func_ov52_02195b5c
.extern gActorManager
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern gPlayer
.extern gPlayerAngle
.extern gPlayerControl
.extern gPlayerLink
.extern gPlayerPos
.extern gPlayerVel
.extern gSinCosTable
.extern gVec3p_ZERO
.extern strncpy
asm/ov23.s
+282 -282
View File
File diff suppressed because it is too large Load Diff
asm/ov24.inc
+24 -24
View File
@@ -13,7 +13,7 @@
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern _ZN10PlayerBase17EquipCollidesWithEP8Cylinderi
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
@@ -29,7 +29,7 @@
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
@@ -60,13 +60,13 @@
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -97,22 +97,22 @@
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02051f54
.extern data_02057200
.extern data_027e0764
.extern data_027e0c68
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0e58
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayer
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
@@ -133,18 +133,18 @@
.extern func_01ff8aa0
.extern func_01ff8e84
.extern func_01ff9158
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_01ff9cec
.extern func_01ff9e64
.extern func_01ffa0f4
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Dot
.extern Vec3p_Length
.extern Vec3p_Axpy
.extern Atan2
.extern func_01ffb7ec
.extern func_01ffbf5c
.extern func_01ffec34
.extern _ZN8Cylinder8OverlapsEPS_
.extern func_01fffcd8
.extern func_01fffcec
.extern func_01fffd04
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern _ZN5Actor13func_01fffd04Ei
.extern func_02005dcc
.extern func_02007908
.extern func_020079d8
@@ -163,8 +163,8 @@
.extern func_0202b308
.extern func_0202b3bc
.extern func_0202b66c
.extern func_0202b864
.extern func_0202b894
.extern _ZN12TouchControl13func_0202b864EP5Vec3pic
.extern _ZN12TouchControl13func_0202b894EP5Vec3pic
.extern func_0202bbbc
.extern func_0202e310
.extern func_0202e58c
@@ -173,7 +173,7 @@
.extern func_0204f614
.extern func_0204f754
.extern func_ov00_02079e68
.extern func_ov00_0207a188
.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
.extern func_ov00_0207a1c8
.extern func_ov00_0207b89c
.extern func_ov00_0207c1b0
@@ -261,7 +261,7 @@
.extern func_ov00_020b7d74
.extern func_ov00_020b7e6c
.extern func_ov00_020bba28
.extern func_ov00_020bd304
.extern _ZN14PlayerLinkBase18func_ov00_020bd304Ev
.extern func_ov00_020bd618
.extern func_ov00_020bf008
.extern func_ov00_020c070c
@@ -274,7 +274,7 @@
.extern func_ov00_020c0ffc
.extern func_ov00_020c10a0
.extern func_ov00_020c10d4
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
asm/ov24.s
+238 -238
View File
File diff suppressed because it is too large Load Diff
asm/ov25.inc
+26 -26
View File
@@ -1,5 +1,13 @@
#pragma once
.extern Atan2
.extern Divide
.extern Vec3p_Add
.extern Vec3p_Axpy
.extern Vec3p_Cross
.extern Vec3p_Distance
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Sub
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
@@ -11,8 +19,9 @@
.extern _ZN10MapManager18func_ov00_02084164Ev
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
@@ -25,15 +34,17 @@
.extern _ZN14AdventureFlags18func_ov00_020980acEv
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor13func_01fffd04Ei
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor15IsHitboxTouchedEb
@@ -41,10 +52,10 @@
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1c20Eii
.extern _ZN5Actor18func_ov00_020c1d58Ev
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_hi
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c29ecEi
@@ -61,14 +72,14 @@
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -99,7 +110,6 @@
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern data_027e0178
.extern data_027e0764
.extern data_027e0c54
@@ -108,18 +118,11 @@
.extern data_027e0d38
.extern data_027e0db0
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
@@ -140,18 +143,8 @@
.extern func_01ff9158
.extern func_01ff992c
.extern func_01ff9958
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9c68
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern func_01ffe1cc
.extern func_01fffcd8
.extern func_01fffcec
.extern func_01fffd04
.extern func_02002c14
.extern func_02016fe8
.extern func_02018450
@@ -255,7 +248,6 @@
.extern func_ov00_020c0cc8
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
@@ -409,6 +401,14 @@
.extern func_ov30_021872c4
.extern func_ov30_02187304
.extern func_ov30_02187340
.extern gActorManager
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern gPlayer
.extern gPlayerAngle
.extern gPlayerControl
.extern gPlayerLink
.extern gPlayerPos
.extern gSinCosTable
.extern strncpy
asm/ov25.s
+226 -226
View File
File diff suppressed because it is too large Load Diff
asm/ov26.inc
+21 -21
View File
@@ -37,7 +37,7 @@
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
@@ -47,21 +47,21 @@
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1c20Eii
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -94,7 +94,7 @@
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02056be4
.extern data_02063e4c
.extern data_027e0194
@@ -107,7 +107,7 @@
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d18
.extern data_027e0d38
.extern data_027e0d3c
@@ -118,14 +118,14 @@
.extern data_027e0f6c
.extern data_027e0f7c
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fc8
.extern gPlayer
.extern gPlayerPos
.extern gPlayerVel
.extern gPlayerAngle
.extern gPlayerLink
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
@@ -156,17 +156,17 @@
.extern func_01ff9158
.extern func_01ff9b4c
.extern func_01ff9b88
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern func_01ffbe34
.extern func_01ffe468
.extern func_01fffbec
.extern func_01fffcd8
.extern func_01fffd04
.extern _ZN5Actor13func_01fffd04Ei
.extern func_020020d0
.extern func_0200250c
.extern func_02002540
@@ -222,7 +222,7 @@
.extern func_ov00_02079680
.extern func_ov00_02079ab4
.extern func_ov00_02079e68
.extern func_ov00_0207a188
.extern _ZN19Actor_UnkStruct_0a4C1Eiiii
.extern func_ov00_0207a1c8
.extern func_ov00_0207b55c
.extern func_ov00_0207b820
@@ -316,7 +316,7 @@
.extern func_ov00_020c0cc8
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
asm/ov26.s
+148 -148
View File
File diff suppressed because it is too large Load Diff
asm/ov27.inc
+26 -26
View File
@@ -1,13 +1,22 @@
#pragma once
.extern Atan2
.extern Divide
.extern Vec3p_Add
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Vec3p_Normalize
.extern Vec3p_Sub
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager18func_ov00_020836bcEjPi
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12TouchControl13func_0202b864EP5Vec3pic
.extern _ZN12TouchControl13func_0202b894EP5Vec3pic
.extern _ZN13PlayerControl14IsTouchingFastEv
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
@@ -15,15 +24,17 @@
.extern _ZN14AdventureFlags18func_ov00_02097bccEv
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags3SetEjb
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor13func_01fffd04Ei
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
@@ -35,21 +46,21 @@
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_hi
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c243cEPjPPS_
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -81,7 +92,6 @@
.extern _ZNK11ItemManager16GetTreasureCountEj
.extern _ZNK11ItemManager19GetMaxTreasureCountEv
.extern __register_global_object
.extern data_02050f54
.extern data_02057200
.extern data_027e0618
.extern data_027e0764
@@ -89,23 +99,14 @@
.extern data_027e0c38
.extern data_027e0c68
.extern data_027e0cbc
.extern data_027e0d0c
.extern data_027e0d38
.extern data_027e0dbc
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
@@ -128,19 +129,11 @@
.extern func_01ff8e84
.extern func_01ff9158
.extern func_01ff9958
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern func_01ffbe34
.extern func_01ffbe78
.extern func_01fffb4c
.extern func_01fffbec
.extern func_01fffcd8
.extern func_01fffcec
.extern func_01fffd04
.extern func_02018450
.extern func_0201b1bc
.extern func_0201e388
@@ -148,8 +141,6 @@
.extern func_0202b2e8
.extern func_0202b2f8
.extern func_0202b4e4
.extern func_0202b864
.extern func_0202b894
.extern func_0202bbbc
.extern func_0202da8c
.extern func_0202e030
@@ -234,7 +225,6 @@
.extern func_ov00_020c0ecc
.extern func_ov00_020c1424
.extern func_ov00_020c1450
.extern func_ov00_020c1500
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
@@ -345,5 +335,15 @@
.extern func_ov14_0214f668
.extern func_ov14_0214f7f0
.extern func_ov14_0214fa48
.extern gActorManager
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern gPlayer
.extern gPlayerAngle
.extern gPlayerControl
.extern gPlayerLink
.extern gPlayerPos
.extern gPlayerVel
.extern gSinCosTable
.extern gVec3p_ZERO
asm/ov27.s
+231 -231
View File
File diff suppressed because it is too large Load Diff
asm/ov28.inc
+19 -19
View File
@@ -26,7 +26,7 @@
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
@@ -38,9 +38,9 @@
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1c20Eii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c243cEPjPPS_
.extern _ZN5Actor18func_ov00_020c3094Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor20IncreaseActiveFramesEv
@@ -48,14 +48,14 @@
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -89,7 +89,7 @@
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02051054
.extern data_02051154
.extern data_02051354
@@ -107,10 +107,10 @@
.extern data_027e0f6c
.extern data_027e0f78
.extern data_027e0f84
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fec
.extern data_027e0ff0
.extern data_027e0ff8
@@ -136,15 +136,15 @@
.extern func_01ff8aa0
.extern func_01ff8abc
.extern func_01ff8e84
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Atan2
.extern func_01fffbec
.extern func_01fffd04
.extern _ZN5Actor13func_01fffd04Ei
.extern func_020078f4
.extern func_02007908
.extern func_02016fe8
@@ -158,7 +158,7 @@
.extern func_0202b154
.extern func_0202b2e8
.extern func_0202b3bc
.extern func_0202b864
.extern _ZN12TouchControl13func_0202b864EP5Vec3pic
.extern func_0202e030
.extern func_0202e310
.extern func_0202e544
@@ -266,7 +266,7 @@
.extern func_ov00_020bc500
.extern func_ov00_020bce48
.extern func_ov00_020bcec8
.extern func_ov00_020bd304
.extern _ZN14PlayerLinkBase18func_ov00_020bd304Ev
.extern func_ov00_020bd318
.extern func_ov00_020bd618
.extern func_ov00_020c0c08
asm/ov28.s
+143 -143
View File
File diff suppressed because it is too large Load Diff
asm/ov29.inc
+29 -29
View File
@@ -1,6 +1,14 @@
#pragma once
.extern Approach_thunk
.extern Atan2
.extern Divide
.extern Vec3p_Add
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Vec3p_Dot
.extern Vec3p_Length
.extern Vec3p_Normalize
.extern Vec3p_Sub
.extern _ZN10MapManager16MapData_vfunc_6cEv
.extern _ZN10MapManager18Set_MapData_Unk_16Eci
.extern _ZN10MapManager18func_ov00_02082680Eii
@@ -11,16 +19,18 @@
.extern _ZN10MapManager18func_ov00_020846a4Ev
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN11ItemManager18func_ov00_020ae4dcEi
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor14GetAngleToLinkEv
@@ -28,22 +38,22 @@
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_hi
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c243cEPjPPS_
.extern _ZN5Actor18func_ov00_020c2ebcEv
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -70,10 +80,14 @@
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE
.extern _ZN9ActorTypeD1Ev
.extern _ZN9EquipRope18func_ov14_0213d420Ev
.extern _ZN9EquipRope18func_ov14_0213d440Ei
.extern _ZN9EquipRope18func_ov14_0213d480Ei
.extern _ZN9EquipRope18func_ov14_0213dadcEiP8Cylinder
.extern _ZN9EquipRope18func_ov14_0213ddd4EP5Actor
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern data_02051354
.extern data_02052f54
.extern data_02054b54
@@ -86,7 +100,6 @@
.extern data_027e0c54
.extern data_027e0c68
.extern data_027e0ce0
.extern data_027e0d0c
.extern data_027e0d38
.extern data_027e0db0
.extern data_027e0e58
@@ -94,13 +107,7 @@
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fc8
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff8
@@ -122,17 +129,8 @@
.extern func_01ff992c
.extern func_01ff9958
.extern func_01ff9b4c
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9c2c
.extern func_01ff9cec
.extern func_01ff9d4c
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern func_01fffb4c
.extern func_01fffbec
.extern func_01fffcec
.extern func_02006b14
.extern func_02006b2c
.extern func_02006b90
@@ -269,7 +267,6 @@
.extern func_ov00_020c0d4c
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
@@ -337,12 +334,7 @@
.extern func_ov09_0211a988
.extern func_ov14_02120998
.extern func_ov14_02122e98
.extern func_ov14_0213d420
.extern func_ov14_0213d440
.extern func_ov14_0213d480
.extern func_ov14_0213d5d0
.extern func_ov14_0213dadc
.extern func_ov14_0213ddd4
.extern func_ov14_021448d4
.extern func_ov14_021448dc
.extern func_ov14_021448e4
@@ -388,7 +380,15 @@
.extern func_ov38_02182e3c
.extern func_ov38_021854e4
.extern func_ov38_02185720
.extern gActorManager
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern gPlayer
.extern gPlayerAngle
.extern gPlayerControl
.extern gPlayerLink
.extern gPlayerPos
.extern gSinCosTable
.extern gVec3p_ZERO
.extern strcpy
asm/ov29.s
+235 -235
View File
File diff suppressed because it is too large Load Diff
asm/ov30.inc
+20 -20
View File
@@ -1,7 +1,7 @@
#pragma once
.extern Divide
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
@@ -11,7 +11,7 @@
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
@@ -22,7 +22,7 @@
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1c20Eii
.extern _ZN5Actor18func_ov00_020c1d58Ev
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c23d4EP8ActorRefPS_P8Cylinder
@@ -36,14 +36,14 @@
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -74,24 +74,24 @@
.extern _ZNK11ItemManager7HasItemEi
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_02063e4c
.extern data_027e0764
.extern data_027e0c38
.extern data_027e0c68
.extern data_027e0ce0
.extern data_027e0d0c
.extern gVec3p_ZERO
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayer
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
@@ -105,16 +105,16 @@
.extern func_01ff8e84
.extern func_01ff9158
.extern func_01ff9958
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Atan2
.extern func_01ffbe34
.extern func_01ffbf5c
.extern func_01ffe1cc
.extern func_01ffec34
.extern func_01fffcec
.extern _ZN8Cylinder8OverlapsEPS_
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern func_02002c14
.extern func_0200e8f8
.extern func_02018450
@@ -183,7 +183,7 @@
.extern func_ov00_020c0ffc
.extern func_ov00_020c10a0
.extern func_ov00_020c10d4
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
asm/ov30.s
+195 -195
View File
File diff suppressed because it is too large Load Diff
asm/ov31.inc
+13 -13
View File
@@ -10,7 +10,7 @@
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
@@ -21,14 +21,14 @@
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_48EP9Knockback
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
@@ -63,7 +63,7 @@
.extern _ZNK11ItemManager7GetAmmoEi
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02050f54
.extern gSinCosTable
.extern data_0205785c
.extern data_02057878
.extern data_027e071c
@@ -75,10 +75,10 @@
.extern data_027e0e28
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f94
.extern data_027e0fc8
.extern gPlayerPos
.extern gPlayerLink
.extern data_027e0fe0
.extern data_027e0fe4
.extern gActorManager
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
@@ -99,9 +99,9 @@
.extern func_01ff83a0
.extern func_01ff8690
.extern func_01ff88b0
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9d4c
.extern Vec3p_Add
.extern Vec3p_Sub
.extern Vec3p_Normalize
.extern func_01fffbec
.extern func_020079d8
.extern func_0200e2a4
@@ -114,8 +114,8 @@
.extern func_0202ab64
.extern func_0202ab78
.extern func_0202ac0c
.extern func_0202b864
.extern func_0202b894
.extern _ZN12TouchControl13func_0202b864EP5Vec3pic
.extern _ZN12TouchControl13func_0202b894EP5Vec3pic
.extern func_0202b8f8
.extern func_0202d77c
.extern func_0202e310
@@ -165,7 +165,7 @@
.extern func_ov00_020bc500
.extern func_ov00_020bcdec
.extern func_ov00_020bd728
.extern func_ov00_020c1500
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
asm/ov31.s
+104 -104
View File
@@ -341,7 +341,7 @@ _0217c184:
str r1, [r4, #0x44]
mov r0, #0
str r0, [r4, #0x4c]
ldr r0, _0217c220 ; =data_027e0fc8
ldr r0, _0217c220 ; =gPlayerLink
strb r1, [r4, #0x64]
ldr r5, [r0]
bl func_ov31_0217cf1c
@@ -363,7 +363,7 @@ _0217c184:
_0217c214: .word data_027e0f64
_0217c218: .word gMapManager
_0217c21c: .word 0x0000ffff
_0217c220: .word data_027e0fc8
_0217c220: .word gPlayerLink
arm_func_end func_ov31_0217bfb4
.global func_ov31_0217c224
@@ -670,7 +670,7 @@ _0217c574:
add r1, sp, #0x24
add r0, r0, #0x48
mov r2, r1
bl func_01ff9bc4
bl Vec3p_Add
ldr r1, [sp, #0x24]
ldr r0, [sp, #0x28]
str r1, [sp, #0xc]
@@ -1263,28 +1263,28 @@ _0217cdc8:
.global func_ov31_0217cdd8
arm_func_start func_ov31_0217cdd8
func_ov31_0217cdd8: ; 0x0217cdd8
ldr r2, _0217cdf0 ; =data_027e0fe4
ldr r2, _0217cdf0 ; =gActorManager
add r3, r0, #0x70
ldr ip, _0217cdf4 ; =_ZN12ActorManager8GetActorEP8ActorRef
ldr r0, [r2]
add r1, r3, r1, lsl #3
bx ip
.align 2, 0
_0217cdf0: .word data_027e0fe4
_0217cdf0: .word gActorManager
_0217cdf4: .word _ZN12ActorManager8GetActorEP8ActorRef
arm_func_end func_ov31_0217cdd8
.global func_ov31_0217cdf8
arm_func_start func_ov31_0217cdf8
func_ov31_0217cdf8: ; 0x0217cdf8
ldr r2, _0217ce10 ; =data_027e0fe4
ldr r2, _0217ce10 ; =gActorManager
add r3, r0, #0x70
ldr ip, _0217ce14 ; =_ZN12ActorManager8GetActorEP8ActorRef
ldr r0, [r2]
add r1, r3, r1, lsl #3
bx ip
.align 2, 0
_0217ce10: .word data_027e0fe4
_0217ce10: .word gActorManager
_0217ce14: .word _ZN12ActorManager8GetActorEP8ActorRef
arm_func_end func_ov31_0217cdf8
@@ -1485,7 +1485,7 @@ func_ov31_0217cfd4: ; 0x0217cfd4
str r2, [r1, #0x10]
bl func_ov31_0217d588
add r0, sp, #0x30
bl func_ov00_020c1500
bl _ZN19Actor_UnkStruct_020C1Ev
mvn r1, #0
add r0, sp, #0x30
str r1, [sp, #0x4c]
@@ -2152,7 +2152,7 @@ _0217d88c: .word data_027e0e28
arm_func_start func_ov31_0217d890
func_ov31_0217d890: ; 0x0217d890
stmdb sp!, {r3, r4, r5, lr}
ldr r1, _0217d8cc ; =data_027e0fc8
ldr r1, _0217d8cc ; =gPlayerLink
mov r5, r0
ldr r4, [r1]
bl func_ov31_0217bdb8
@@ -2168,7 +2168,7 @@ _0217d8c0:
bl func_ov31_0217d8d0
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0217d8cc: .word data_027e0fc8
_0217d8cc: .word gPlayerLink
arm_func_end func_ov31_0217d890
.global func_ov31_0217d8d0
@@ -2183,7 +2183,7 @@ func_ov31_0217d8d0: ; 0x0217d8d0
arm_func_start func_ov31_0217d8dc
func_ov31_0217d8dc: ; 0x0217d8dc
stmdb sp!, {r3, r4, r5, lr}
ldr r1, _0217d938 ; =data_027e0fc8
ldr r1, _0217d938 ; =gPlayerLink
mov r5, r0
ldr r4, [r1]
bl func_ov31_0217bdb8
@@ -2208,7 +2208,7 @@ _0217d930:
bl func_ov31_0217d62c
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0217d938: .word data_027e0fc8
_0217d938: .word gPlayerLink
arm_func_end func_ov31_0217d8dc
.global func_ov31_0217d93c
@@ -2353,7 +2353,7 @@ func_ov31_0217dab8: ; 0x0217dab8
ldmia r0, {r0, r1, r2}
add r3, sp, #0xc
stmia r3, {r0, r1, r2}
ldr lr, _0217db44 ; =data_027e0f94
ldr lr, _0217db44 ; =gPlayerPos
ldr r3, [sp, #0x14]
add ip, sp, #0
ldmia lr, {r0, r1, r2}
@@ -2383,7 +2383,7 @@ func_ov31_0217dab8: ; 0x0217dab8
add sp, sp, #0x18
ldmia sp!, {r3, pc}
.align 2, 0
_0217db44: .word data_027e0f94
_0217db44: .word gPlayerPos
arm_func_end func_ov31_0217dab8
.global func_ov31_0217db48
@@ -2415,7 +2415,7 @@ _0217db78:
beq _0217dbac
mov r2, r5
add r0, r0, #0x48
bl func_0202b864
bl _ZN12TouchControl13func_0202b864EP5Vec3pic
cmp r0, #0
beq _0217dbc4
mov r0, #1
@@ -2423,7 +2423,7 @@ _0217db78:
_0217dbac:
mov r2, r4
add r0, r0, #0x48
bl func_0202b894
bl _ZN12TouchControl13func_0202b894EP5Vec3pic
cmp r0, #0
movne r0, #1
ldmneia sp!, {r4, r5, r6, r7, r8, pc}
@@ -4098,10 +4098,10 @@ func_ov31_0217ee74: ; 0x0217ee74
str lr, [sp, #0xc]
str ip, [sp, #0x10]
str r3, [sp, #0x14]
bl func_01ff9bf8
bl Vec3p_Sub
mov r0, r9
mov r1, r0
bl func_01ff9d4c
bl Vec3p_Normalize
ldrb r0, [r5, #0x174]
mov r1, #0x400
cmp r0, #1
@@ -4111,7 +4111,7 @@ func_ov31_0217ee74: ; 0x0217ee74
add r0, r5, #0x48
mov r1, r9
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
ldr r2, [sp, #0x28]
ldr r0, [r5, #0x4c]
cmp r0, r2
@@ -4128,7 +4128,7 @@ _0217ef70:
add r0, r5, #0x48
mov r1, r9
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
ldr r2, [r5, #0x18]
ldr r0, [r5, #0x4c]
cmp r0, r2
@@ -4340,7 +4340,7 @@ _0217f1c8:
bl func_01ff80d4
add r0, r6, #0x100
ldrh r1, [r0, #0x68]
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
add r0, sp, #0x78
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4356,7 +4356,7 @@ _0217f1c8:
bl func_01ff8690
add r0, r6, #0x100
ldrh r1, [r0, #0x6a]
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
add r0, sp, #0x54
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4372,7 +4372,7 @@ _0217f1c8:
bl func_01ff8690
add r0, r6, #0x100
ldrh r1, [r0, #0x6c]
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
add r0, sp, #0x30
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4400,7 +4400,7 @@ _0217f1c8:
add r1, r1, #1
mov r0, r0, asr #0x4
mov r2, r1, lsl #0x1
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
mov r1, r0, lsl #0x2
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
@@ -4424,7 +4424,7 @@ _0217f1c8:
add r1, r1, #1
mov r0, r0, asr #0x4
mov r2, r1, lsl #0x1
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
mov r1, r0, lsl #0x2
ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
@@ -4436,7 +4436,7 @@ _0217f1c8:
bl func_01ff8690
add r0, r6, #0x100
ldrh r1, [r0, #0x6e]
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
add r0, sp, #0x78
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4452,7 +4452,7 @@ _0217f1c8:
bl func_01ff8690
add r0, r6, #0x100
ldrh r1, [r0, #0x70]
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
add r0, sp, #0x54
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4468,7 +4468,7 @@ _0217f1c8:
bl func_01ff8690
add r0, r6, #0x100
ldrh r1, [r0, #0x72]
ldr r3, _0217f450 ; =data_02050f54
ldr r3, _0217f450 ; =gSinCosTable
add r0, sp, #0x30
mov r1, r1, asr #0x4
mov r2, r1, lsl #0x1
@@ -4498,7 +4498,7 @@ _0217f1c8:
_0217f444: .word data_ov31_02183e88
_0217f448: .word data_ov00_020e9360
_0217f44c: .word 0x0000199a
_0217f450: .word data_02050f54
_0217f450: .word gSinCosTable
arm_func_end func_ov31_0217f120
.global func_ov31_0217f454
@@ -4584,7 +4584,7 @@ _0217f4cc:
add r0, sp, #0x48
add r1, r4, #0x260
mov r2, r0
bl func_01ff9bc4
bl Vec3p_Add
ldr r0, _0217f634 ; =data_ov31_02183e88
str r5, [sp, #0x3c]
ldr r0, [r0, #0x2c8]
@@ -4610,7 +4610,7 @@ _0217f4cc:
add r1, sp, #0x48
add r0, r6, #0x48
mov r2, r1
bl func_01ff9bc4
bl Vec3p_Add
add r0, sp, #0x24
mov r1, r4
blx func_ov09_0211d090
@@ -6650,7 +6650,7 @@ func_ov31_02180ac8: ; 0x02180ac8
add r0, r4, #0x1d8
bl func_ov14_02145a74
ldr r1, _02180bb4 ; =data_ov31_02181ad4
ldr r0, _02180bb8 ; =data_027e0fe4
ldr r0, _02180bb8 ; =gActorManager
str r1, [r4, #0x408]
ldr r0, [r0]
ldrb r0, [r0, #0x29]
@@ -6707,7 +6707,7 @@ _02180b90:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02180bb4: .word data_ov31_02181ad4
_02180bb8: .word data_027e0fe4
_02180bb8: .word gActorManager
_02180bbc: .word data_ov31_02181ac8
_02180bc0: .word data_027e0dbc
_02180bc4: .word data_ov31_02181abc
@@ -6806,7 +6806,7 @@ _02180cf8: ; jump table
b _02180d70 ; case 3
b _02180d78 ; case 4
_02180d0c:
ldr r0, _02180dd4 ; =data_027e0fe4
ldr r0, _02180dd4 ; =gActorManager
ldr r0, [r0]
ldrb r0, [r0, #0x29]
cmp r0, #0
@@ -6838,7 +6838,7 @@ _02180d70:
mov r0, #0xa
ldmia sp!, {r3, pc}
_02180d78:
ldr r0, _02180dd4 ; =data_027e0fe4
ldr r0, _02180dd4 ; =gActorManager
ldr r0, [r0]
ldrb r0, [r0, #0x29]
cmp r0, #0
@@ -6864,7 +6864,7 @@ _02180dcc:
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_02180dd4: .word data_027e0fe4
_02180dd4: .word gActorManager
_02180dd8: .word gAdventureFlags
arm_func_end func_ov31_02180ce8
@@ -8771,7 +8771,7 @@ data_ov31_02182188: ; 0x02182188
.word func_ov14_02144b64
.global data_ov31_0218218c
data_ov31_0218218c: ; 0x0218218c
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_02182190
data_ov31_02182190: ; 0x02182190
.word func_ov31_0217d414 ; data_ov61_0217d414
@@ -8801,10 +8801,10 @@ data_ov31_021821b0: ; 0x021821b0
.word func_ov31_0217db50 ; func_ov35_0217db50
.global data_ov31_021821b4
data_ov31_021821b4: ; 0x021821b4
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_021821b8
data_ov31_021821b8: ; 0x021821b8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_021821bc
data_ov31_021821bc: ; 0x021821bc
.word _ZN5Actor8vfunc_4cEPi
@@ -9259,10 +9259,10 @@ data_ov31_02182408: ; 0x02182408
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_0218240c
data_ov31_0218240c: ; 0x0218240c
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02182410
data_ov31_02182410: ; 0x02182410
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182414
data_ov31_02182414: ; 0x02182414
.word _ZN5Actor8vfunc_4cEPi
@@ -9406,10 +9406,10 @@ data_ov31_021824cc: ; 0x021824cc
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_021824d0
data_ov31_021824d0: ; 0x021824d0
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_021824d4
data_ov31_021824d4: ; 0x021824d4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_021824d8
data_ov31_021824d8: ; 0x021824d8
.word _ZN5Actor8vfunc_4cEPi
@@ -9553,10 +9553,10 @@ data_ov31_02182590: ; 0x02182590
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_02182594
data_ov31_02182594: ; 0x02182594
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02182598
data_ov31_02182598: ; 0x02182598
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_0218259c
data_ov31_0218259c: ; 0x0218259c
.word _ZN5Actor8vfunc_4cEPi
@@ -9700,10 +9700,10 @@ data_ov31_02182654: ; 0x02182654
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_02182658
data_ov31_02182658: ; 0x02182658
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_0218265c
data_ov31_0218265c: ; 0x0218265c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182660
data_ov31_02182660: ; 0x02182660
.word _ZN5Actor8vfunc_4cEPi
@@ -9817,7 +9817,7 @@ data_ov31_021826f0: ; 0x021826f0
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_021826f4
data_ov31_021826f4: ; 0x021826f4
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_021826f8
data_ov31_021826f8: ; 0x021826f8
.word func_ov31_0217f454 ; data_ov61_0217f454
@@ -9847,10 +9847,10 @@ data_ov31_02182718: ; 0x02182718
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_0218271c
data_ov31_0218271c: ; 0x0218271c
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02182720
data_ov31_02182720: ; 0x02182720
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182724
data_ov31_02182724: ; 0x02182724
.word _ZN5Actor8vfunc_4cEPi
@@ -9994,7 +9994,7 @@ data_ov31_021827dc: ; 0x021827dc
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_021827e0
data_ov31_021827e0: ; 0x021827e0
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_021827e4
data_ov31_021827e4: ; 0x021827e4
.word func_ov31_0217f454 ; data_ov61_0217f454
@@ -10024,10 +10024,10 @@ data_ov31_02182804: ; 0x02182804
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_02182808
data_ov31_02182808: ; 0x02182808
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_0218280c
data_ov31_0218280c: ; 0x0218280c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182810
data_ov31_02182810: ; 0x02182810
.word _ZN5Actor8vfunc_4cEPi
@@ -10171,7 +10171,7 @@ data_ov31_021828c8: ; 0x021828c8
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_021828cc
data_ov31_021828cc: ; 0x021828cc
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_021828d0
data_ov31_021828d0: ; 0x021828d0
.word func_ov31_0217f454 ; data_ov61_0217f454
@@ -10201,10 +10201,10 @@ data_ov31_021828f0: ; 0x021828f0
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_021828f4
data_ov31_021828f4: ; 0x021828f4
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_021828f8
data_ov31_021828f8: ; 0x021828f8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_021828fc
data_ov31_021828fc: ; 0x021828fc
.word _ZN5Actor8vfunc_4cEPi
@@ -10348,7 +10348,7 @@ data_ov31_021829b4: ; 0x021829b4
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_021829b8
data_ov31_021829b8: ; 0x021829b8
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_021829bc
data_ov31_021829bc: ; 0x021829bc
.word func_ov31_0217f454 ; data_ov61_0217f454
@@ -10378,10 +10378,10 @@ data_ov31_021829dc: ; 0x021829dc
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_021829e0
data_ov31_021829e0: ; 0x021829e0
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_021829e4
data_ov31_021829e4: ; 0x021829e4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_021829e8
data_ov31_021829e8: ; 0x021829e8
.word _ZN5Actor8vfunc_4cEPi
@@ -10525,7 +10525,7 @@ data_ov31_02182aa0: ; 0x02182aa0
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_02182aa4
data_ov31_02182aa4: ; 0x02182aa4
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_02182aa8
data_ov31_02182aa8: ; 0x02182aa8
.word func_ov31_0217f4a4 ; data_ov61_0217f4a4
@@ -10555,10 +10555,10 @@ data_ov31_02182ac8: ; 0x02182ac8
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_02182acc
data_ov31_02182acc: ; 0x02182acc
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02182ad0
data_ov31_02182ad0: ; 0x02182ad0
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182ad4
data_ov31_02182ad4: ; 0x02182ad4
.word _ZN5Actor8vfunc_4cEPi
@@ -10702,7 +10702,7 @@ data_ov31_02182b8c: ; 0x02182b8c
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_02182b90
data_ov31_02182b90: ; 0x02182b90
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_02182b94
data_ov31_02182b94: ; 0x02182b94
.word func_ov31_0217f454 ; data_ov61_0217f454
@@ -10732,10 +10732,10 @@ data_ov31_02182bb4: ; 0x02182bb4
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_02182bb8
data_ov31_02182bb8: ; 0x02182bb8
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02182bbc
data_ov31_02182bbc: ; 0x02182bbc
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182bc0
data_ov31_02182bc0: ; 0x02182bc0
.word _ZN5Actor8vfunc_4cEPi
@@ -10879,7 +10879,7 @@ data_ov31_02182c78: ; 0x02182c78
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_02182c7c
data_ov31_02182c7c: ; 0x02182c7c
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_02182c80
data_ov31_02182c80: ; 0x02182c80
.word func_ov31_0217f454 ; data_ov61_0217f454
@@ -10909,10 +10909,10 @@ data_ov31_02182ca0: ; 0x02182ca0
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_02182ca4
data_ov31_02182ca4: ; 0x02182ca4
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02182ca8
data_ov31_02182ca8: ; 0x02182ca8
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182cac
data_ov31_02182cac: ; 0x02182cac
.word _ZN5Actor8vfunc_4cEPi
@@ -11056,7 +11056,7 @@ data_ov31_02182d64: ; 0x02182d64
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_02182d68
data_ov31_02182d68: ; 0x02182d68
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_02182d6c
data_ov31_02182d6c: ; 0x02182d6c
.word func_ov31_0217f454 ; data_ov61_0217f454
@@ -11086,10 +11086,10 @@ data_ov31_02182d8c: ; 0x02182d8c
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_02182d90
data_ov31_02182d90: ; 0x02182d90
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02182d94
data_ov31_02182d94: ; 0x02182d94
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182d98
data_ov31_02182d98: ; 0x02182d98
.word _ZN5Actor8vfunc_4cEPi
@@ -11233,7 +11233,7 @@ data_ov31_02182e50: ; 0x02182e50
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_02182e54
data_ov31_02182e54: ; 0x02182e54
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_02182e58
data_ov31_02182e58: ; 0x02182e58
.word func_ov31_0217f454 ; data_ov61_0217f454
@@ -11263,10 +11263,10 @@ data_ov31_02182e78: ; 0x02182e78
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_02182e7c
data_ov31_02182e7c: ; 0x02182e7c
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02182e80
data_ov31_02182e80: ; 0x02182e80
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182e84
data_ov31_02182e84: ; 0x02182e84
.word _ZN5Actor8vfunc_4cEPi
@@ -11410,7 +11410,7 @@ data_ov31_02182f3c: ; 0x02182f3c
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_02182f40
data_ov31_02182f40: ; 0x02182f40
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_02182f44
data_ov31_02182f44: ; 0x02182f44
.word func_ov31_0217f454 ; data_ov61_0217f454
@@ -11440,10 +11440,10 @@ data_ov31_02182f64: ; 0x02182f64
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_02182f68
data_ov31_02182f68: ; 0x02182f68
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02182f6c
data_ov31_02182f6c: ; 0x02182f6c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02182f70
data_ov31_02182f70: ; 0x02182f70
.word _ZN5Actor8vfunc_4cEPi
@@ -11587,7 +11587,7 @@ data_ov31_02183028: ; 0x02183028
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_0218302c
data_ov31_0218302c: ; 0x0218302c
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_02183030
data_ov31_02183030: ; 0x02183030
.word func_ov31_0217f454 ; data_ov61_0217f454
@@ -11617,10 +11617,10 @@ data_ov31_02183050: ; 0x02183050
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_02183054
data_ov31_02183054: ; 0x02183054
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02183058
data_ov31_02183058: ; 0x02183058
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_0218305c
data_ov31_0218305c: ; 0x0218305c
.word _ZN5Actor8vfunc_4cEPi
@@ -11764,7 +11764,7 @@ data_ov31_02183114: ; 0x02183114
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_02183118
data_ov31_02183118: ; 0x02183118
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_0218311c
data_ov31_0218311c: ; 0x0218311c
.word func_ov31_0217f454 ; data_ov61_0217f454
@@ -11794,10 +11794,10 @@ data_ov31_0218313c: ; 0x0218313c
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_02183140
data_ov31_02183140: ; 0x02183140
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02183144
data_ov31_02183144: ; 0x02183144
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02183148
data_ov31_02183148: ; 0x02183148
.word _ZN5Actor8vfunc_4cEPi
@@ -11941,7 +11941,7 @@ data_ov31_02183200: ; 0x02183200
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_02183204
data_ov31_02183204: ; 0x02183204
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_02183208
data_ov31_02183208: ; 0x02183208
.word func_ov31_0217f454 ; data_ov61_0217f454
@@ -11971,10 +11971,10 @@ data_ov31_02183228: ; 0x02183228
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_0218322c
data_ov31_0218322c: ; 0x0218322c
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02183230
data_ov31_02183230: ; 0x02183230
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02183234
data_ov31_02183234: ; 0x02183234
.word _ZN5Actor8vfunc_4cEPi
@@ -12118,7 +12118,7 @@ data_ov31_021832ec: ; 0x021832ec
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_021832f0
data_ov31_021832f0: ; 0x021832f0
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_021832f4
data_ov31_021832f4: ; 0x021832f4
.word func_ov31_0217f638 ; data_ov61_0217f638
@@ -12148,10 +12148,10 @@ data_ov31_02183314: ; 0x02183314
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_02183318
data_ov31_02183318: ; 0x02183318
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_0218331c
data_ov31_0218331c: ; 0x0218331c
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02183320
data_ov31_02183320: ; 0x02183320
.word _ZN5Actor8vfunc_4cEPi
@@ -12295,7 +12295,7 @@ data_ov31_021833d8: ; 0x021833d8
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_021833dc
data_ov31_021833dc: ; 0x021833dc
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_021833e0
data_ov31_021833e0: ; 0x021833e0
.word func_ov31_0217f454 ; data_ov61_0217f454
@@ -12325,10 +12325,10 @@ data_ov31_02183400: ; 0x02183400
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_02183404
data_ov31_02183404: ; 0x02183404
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02183408
data_ov31_02183408: ; 0x02183408
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_0218340c
data_ov31_0218340c: ; 0x0218340c
.word _ZN5Actor8vfunc_4cEPi
@@ -12472,7 +12472,7 @@ data_ov31_021834c4: ; 0x021834c4
.word func_ov31_0217f090 ; data_ov61_0217f090
.global data_ov31_021834c8
data_ov31_021834c8: ; 0x021834c8
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_021834cc
data_ov31_021834cc: ; 0x021834cc
.word _ZN5Actor8vfunc_20Ei
@@ -12502,10 +12502,10 @@ data_ov31_021834ec: ; 0x021834ec
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov31_021834f0
data_ov31_021834f0: ; 0x021834f0
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_021834f4
data_ov31_021834f4: ; 0x021834f4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_021834f8
data_ov31_021834f8: ; 0x021834f8
.word _ZN5Actor8vfunc_4cEPi
@@ -12859,7 +12859,7 @@ data_ov31_02183af8: ; 0x02183af8
.word func_ov14_02144b64
.global data_ov31_02183afc
data_ov31_02183afc: ; 0x02183afc
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_02183b00
data_ov31_02183b00: ; 0x02183b00
.word func_ov31_0217d414 ; data_ov61_0217d414
@@ -12889,10 +12889,10 @@ data_ov31_02183b20: ; 0x02183b20
.word func_ov31_0217db50 ; func_ov35_0217db50
.global data_ov31_02183b24
data_ov31_02183b24: ; 0x02183b24
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02183b28
data_ov31_02183b28: ; 0x02183b28
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02183b2c
data_ov31_02183b2c: ; 0x02183b2c
.word _ZN5Actor8vfunc_4cEPi
@@ -13137,7 +13137,7 @@ data_ov31_02183c60: ; 0x02183c60
.word func_ov14_02144b64
.global data_ov31_02183c64
data_ov31_02183c64: ; 0x02183c64
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_02183c68
data_ov31_02183c68: ; 0x02183c68
.word func_ov31_0217d414 ; data_ov61_0217d414
@@ -13167,10 +13167,10 @@ data_ov31_02183c88: ; 0x02183c88
.word func_ov31_0217db50 ; func_ov35_0217db50
.global data_ov31_02183c8c
data_ov31_02183c8c: ; 0x02183c8c
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02183c90
data_ov31_02183c90: ; 0x02183c90
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02183c94
data_ov31_02183c94: ; 0x02183c94
.word _ZN5Actor8vfunc_4cEPi
@@ -13367,7 +13367,7 @@ data_ov31_02183d94: ; 0x02183d94
.word func_ov14_02144b64
.global data_ov31_02183d98
data_ov31_02183d98: ; 0x02183d98
.word _ZN5Actor8vfunc_1cEt
.word _ZN5Actor8vfunc_1cEPt
.global data_ov31_02183d9c
data_ov31_02183d9c: ; 0x02183d9c
.word func_ov31_021815e0 ; data_ov61_021815e0
@@ -13397,10 +13397,10 @@ data_ov31_02183dbc: ; 0x02183dbc
.word func_ov14_02145974
.global data_ov31_02183dc0
data_ov31_02183dc0: ; 0x02183dc0
.word _ZN5Actor12CollidesWithEPKS_
.word _ZN5Actor12CollidesWithEPS_
.global data_ov31_02183dc4
data_ov31_02183dc4: ; 0x02183dc4
.word _ZN5Actor8vfunc_48Ei
.word _ZN5Actor8vfunc_48EP9Knockback
.global data_ov31_02183dc8
data_ov31_02183dc8: ; 0x02183dc8
.word _ZN5Actor8vfunc_4cEPi
asm/ov32.inc
+22 -22
View File
@@ -1,14 +1,21 @@
#pragma once
.extern Approach_thunk
.extern Atan2
.extern Divide
.extern Vec3p_Add
.extern Vec3p_Axpy
.extern Vec3p_Distance
.extern Vec3p_Length
.extern Vec3p_Sub
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_020836dcEii
.extern _ZN10MapManager18func_ov00_02083780Ei
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10MapManager18func_ov00_02084cc8Ei
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
.extern _ZN11ItemManager21GetEquipItemUncheckedEi
.extern _ZN12ActorManager12FilterActorsEP15FilterActorBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
@@ -19,13 +26,15 @@
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN14AdventureFlags18func_ov00_02098074Eisiib
.extern _ZN14AdventureFlags18func_ov00_0209809cEv
.extern _ZN19Actor_UnkStruct_020C1Ev
.extern _ZN5Actor10GetUnk_08cEP8Cylinder
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12CollidesWithEPS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor13func_01fffd04Ei
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14StopLinkFollowEv
@@ -44,7 +53,7 @@
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_1cEPt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
@@ -74,11 +83,11 @@
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPFivE
.extern _ZN9ActorTypeD1Ev
.extern _ZN9EquipRope18func_ov14_0213d480Ei
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZTV11FilterActor
.extern __register_global_object
.extern data_02050f54
.extern data_02051f54
.extern data_02056be4
.extern data_027e0618
@@ -86,7 +95,6 @@
.extern data_027e077c
.extern data_027e080c
.extern data_027e0c68
.extern data_027e0d0c
.extern data_027e0d78
.extern data_027e0e58
.extern data_027e0e5c
@@ -94,13 +102,7 @@
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f84
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0fac
.extern data_027e0fc8
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
@@ -117,17 +119,9 @@
.extern func_01ff9158
.extern func_01ff991c
.extern func_01ff9b88
.extern func_01ff9bc4
.extern func_01ff9bf8
.extern func_01ff9cec
.extern func_01ff9e64
.extern func_01ff9ec0
.extern func_01ffa0f4
.extern func_01ffa9fc
.extern func_01ffbf5c
.extern func_01fffcd8
.extern func_01fffcec
.extern func_01fffd04
.extern func_020020d0
.extern func_0200250c
.extern func_02002540
@@ -256,7 +250,6 @@
.extern func_ov00_020c0cc8
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
@@ -344,7 +337,14 @@
.extern func_ov14_02127ac4
.extern func_ov14_0213b904
.extern func_ov14_0213b984
.extern func_ov14_0213d480
.extern gActorManager
.extern gAdventureFlags
.extern gMapManager
.extern gPlayer
.extern gPlayerAngle
.extern gPlayerLink
.extern gPlayerPos
.extern gPlayerVel
.extern gSinCosTable
.extern gVec3p_ZERO
.extern strncpy

Some files were not shown because too many files have changed in this diff Show More