mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-06 03:28:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 from AetiasHax/actor

Browse Source 
Delink `Actor` and `ActorManager`, update docs
This commit is contained in:
AetiasHax
2024-04-14 13:59:57 +02:00
committed by GitHub
parent d4493f49bc 35c6652f33
commit 9ac440e5ec
145 changed files with 60309 additions and 59405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CONTRIBUTING.md
+5 -1
View File
@@ -9,7 +9,7 @@
- `asm/`: Non-decompiled assembly code
- `ovXX/`: Code for overlay `XX`
- `*.s`: Source file in assembly
- `include/*.inc`: External symbols imported by respective source file
- `*.inc`: External symbols imported by respective source file
- `build/`: Build output
- `arm9_linker_script.lcf`: Linker command file for ARM9 program, specifies the order to put code and data into the ROM
- `arm9_objects.txt`: List of object files to pass to the linker
@@ -30,10 +30,14 @@
- `src/`: Source C/C++ files
- `tools/`: Tools for this project
- `compress/`: Compresses code before it is put in the ROM
- `include/`: Common C code for multiple tools
- `mwccarm/`: Compiler toolchain
- `rom/`: Extracts and builds ROMs
- `gen_externs.py`: Generates `.inc` files, use `make gen_externs` to run it
- `lcf.py`: Generates `arm9_linker_script.lcf`
- `m2ctx.py`: Generates context for decomp.me
- `patch_mwcc.py`: Patches bugs in the toolchain
- `progress.py`: Computes decompilation progress
- `requirements.txt`: Python libraries
- `setup.py`: Sets up the project
- `assets.txt`: The order of asset directories to put in the ROM
Makefile
+1 -1
View File
@@ -47,7 +47,7 @@ LCF_FILE := $(ROOT)/$(BUILD_DIR)/arm9_linker_script.lcf
OBJS_FILE := $(ROOT)/$(BUILD_DIR)/arm9_objects.txt
ASM_FLAGS := -proc arm5te -d $(REGION) -i asm -msgstyle gcc
CC_FLAGS := -proc arm946e -interworking -O4,p -enum int -i include -nolink -d $(REGION) -char signed -lang=c++ -sym on -msgstyle gcc
CC_FLAGS := -proc arm946e -interworking -O4,p -enum int -i include -i- -i libs/c/include -nolink -d $(REGION) -char signed -lang=c++ -sym on -msgstyle gcc
LD_FLAGS := -proc arm946e -nostdlib -interworking -nodead -m Entry -map closure,unused -o main.bin -msgstyle gcc
ifeq ($(NONMATCHING),1)
asm/main.inc
+3 -3
View File
@@ -3,6 +3,9 @@
.extern _ZN11ItemManager10GiveRupeesEjj
.extern _ZN11ItemManager7AddItemEi
.extern _ZN11ItemManager8GiveKeysEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12TouchControl18func_ov00_0207af38Etb
.extern _ZN12TouchControlC2Ev
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
@@ -325,9 +328,6 @@
.extern func_ov00_020a5e9c
.extern func_ov00_020bce48
.extern func_ov00_020bcec8
.extern func_ov00_020c3674
.extern func_ov00_020c3894
.extern func_ov00_020c3b2c
.extern func_ov00_020ce704
.extern func_ov00_020cec60
.extern func_ov00_020cef9c
asm/main.s
+3 -3
View File
@@ -74905,11 +74905,11 @@ _02036b24:
ldr r1, [r0]
ldr r2, [r2, r3, lsl #2]
add r0, sp, #4
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _02036bac ; =data_027e0fe4
add r1, sp, #4
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r2, r0
addeq sp, sp, #0xc
ldmeqia sp!, {r3, r4, r5, r6, pc}
@@ -76464,7 +76464,7 @@ _02037d90:
ldr r0, _02037f54 ; =data_027e0fe4
mov r1, #0
ldr r0, [r0]
bl func_ov00_020c3b2c
bl _ZN12ActorManager18func_ov00_020c3b2cEPi
cmp r0, #0
movle r0, #0
movgt r0, #1
asm/ov00/Actor/Actor.inc
+76
View File
@@ -0,0 +1,76 @@
#pragma once
.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c398cEv
.extern _ZN12ActorManager18func_ov00_020c399cEv
.extern _ZN12ActorManager18func_ov00_020c39acEjPjb
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl13StopFollowingEv
.extern _ZN9SysObjectdlEPv
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern data_02050f54
.extern data_02056be4
.extern data_02063e4c
.extern data_027e077c
.extern data_027e0c54
.extern data_027e0d0c
.extern data_027e0d3c
.extern data_027e0e60
.extern data_027e0f74
.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_02083570
.extern func_ov00_02083ef8
.extern func_ov00_02084b38
.extern func_ov00_02084be0
.extern func_ov00_02084c5c
.extern func_ov00_02087ef0
.extern func_ov00_02097738
.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 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 gItemManager
asm/ov00/Actor/Actor.s
+2956
View File
File diff suppressed because it is too large Load Diff
asm/ov00/Actor/ActorManager.inc
+18
View File
@@ -0,0 +1,18 @@
#pragma once
.extern _ZN5Actor10SetUnk_129Eb
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor14StopLinkFollowEv
.extern _ZN5Actor18func_ov00_020c27a8Ei
.extern data_02056be4
.extern data_027e077c
.extern data_027e0e60
.extern data_027e103c
.extern func_01ff9ec0
.extern func_ov00_020836cc
.extern func_ov00_0208e72c
.extern func_ov00_0208e7a4
.extern func_ov00_0208f318
.extern func_ov00_020c3ef0
.extern func_ov00_020c3f08
.extern func_ov00_020c3f3c
.extern func_ov00_020c3f54
asm/ov00/Actor/ActorManager.s
+881
View File
@@ -0,0 +1,881 @@
.include "ov00/Actor/ActorManager.inc"
.include "macros/function.inc"
.text
.global _ZN12ActorManager11DeleteActorEjb
arm_func_start _ZN12ActorManager11DeleteActorEjb
_ZN12ActorManager11DeleteActorEjb: ; 0x020c33d4
stmdb sp!, {r4, r5, r6, lr}
movs r4, r2
mov r6, r0
mov r5, r1
bne _020c3404
mov r1, r5, lsl #0x10
ldr r0, [r6, #0x14]
mov r1, r1, lsr #0x10
bl func_ov00_020c3f54
ldr r0, [r6, #0x10]
ldr r0, [r0, r5, lsl #2]
bl _ZN5Actor14StopLinkFollowEv
_020c3404:
ldr r0, [r6, #0x10]
ldr r0, [r0, r5, lsl #2]
cmp r0, #0
beq _020c3420
ldr r1, [r0]
ldr r1, [r1, #4]
blx r1
_020c3420:
ldr r0, [r6, #0x10]
mov r1, #0
str r1, [r0, r5, lsl #2]
cmp r4, #0
ldmneia sp!, {r4, r5, r6, pc}
ldrh r0, [r6, #2]
add r1, r5, #1
sub r0, r0, #1
strh r0, [r6, #2]
ldr r0, [r6, #4]
cmp r1, r0
ldmneia sp!, {r4, r5, r6, pc}
subs r1, r5, #1
bmi _020c3470
ldr r2, [r6, #0x10]
_020c345c:
ldr r0, [r2, r1, lsl #2]
cmp r0, #0
bne _020c3470
subs r1, r1, #1
bpl _020c345c
_020c3470:
add r0, r1, #1
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
str r0, [r6, #4]
ldmia sp!, {r4, r5, r6, pc}
arm_func_end _ZN12ActorManager11DeleteActorEjb
.global _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
arm_func_start _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
_ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori: ; 0x020c3484
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
mov sl, r0
mvn r3, #0
str r3, [sl]
ldr r0, _020c3570 ; =data_027e103c
str r3, [sl, #4]
ldr r0, [r0]
mov sb, r2
ldrb r0, [r0, #0x24]
cmp r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
ldr r0, _020c3574 ; =data_027e077c
ldr r2, _020c3578 ; =data_02056be4
ldr r0, [r0]
ldr r6, [r1, #0x10]
ldrb r0, [r2, r0]
sub r5, r3, #0x80000000
tst r0, #1
ldr r0, [r1, #4]
movne r8, #1
moveq r8, #0
add r7, r6, r0, lsl #2
cmp r6, r7
ldmhsia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
mov r4, #0
_020c34e8:
ldr r0, [r6]
cmp r0, #0
ldrneb r1, [r0, #0x118]
cmpne r1, #0
beq _020c3560
mov r1, sb
bl _ZN5Actor18func_ov00_020c27a8Ei
cmp r0, #0
beq _020c3560
ldr r0, [r6]
ldrb r1, [r0, #0xa4]
cmp r1, #0
cmpeq r8, #0
beq _020c3560
ldr r2, [r0]
mov r1, r4
ldr r2, [r2, #0x40]
blx r2
cmp r0, #0
beq _020c3560
ldr r0, [r6]
bl _ZN5Actor14DistanceToLinkEv
cmp r0, r5
bge _020c3560
ldr r1, [r6]
mov r5, r0
ldr r0, [r1, #8]
str r0, [sl]
ldr r0, [r1, #0xc]
str r0, [sl, #4]
_020c3560:
add r6, r6, #4
cmp r6, r7
blo _020c34e8
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
.align 2, 0
arm_func_end _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
_020c3570: .word data_027e103c
_020c3574: .word data_027e077c
_020c3578: .word data_02056be4
.global _ZN12ActorManager14Actor_vfunc_10Ej
arm_func_start _ZN12ActorManager14Actor_vfunc_10Ej
_ZN12ActorManager14Actor_vfunc_10Ej: ; 0x020c357c
stmdb sp!, {r3, r4, r5, r6, r7, lr}
mov r5, r0
ldr r0, [r5, #4]
ldr r7, [r5, #0x10]
mov r4, r1
mov r6, #0
cmp r0, #0
ldmleia sp!, {r3, r4, r5, r6, r7, pc}
_020c359c:
ldr r0, [r7]
cmp r0, #0
ldrneb r1, [r0, #0x118]
cmpne r1, #0
beq _020c35c0
ldr r2, [r0]
mov r1, r4
ldr r2, [r2, #0x10]
blx r2
_020c35c0:
ldr r0, [r5, #4]
add r6, r6, #1
cmp r6, r0
add r7, r7, #4
blt _020c359c
ldmia sp!, {r3, r4, r5, r6, r7, pc}
arm_func_end _ZN12ActorManager14Actor_vfunc_10Ej
.global _ZN12ActorManager13FindActorByIdEj
arm_func_start _ZN12ActorManager13FindActorByIdEj
_ZN12ActorManager13FindActorByIdEj: ; 0x020c35d8
stmdb sp!, {r3, lr}
cmp r1, #0
mov ip, #0
blt _020c366c
ldr r3, [r0, #8]
cmp r3, #0
blt _020c3628
ldr r2, [r0, #4]
cmp r3, r2
bge _020c3628
ldr r2, [r0, #0x10]
ldr r3, [r2, r3, lsl #2]
cmp r3, #0
ldrneb r2, [r3, #0x118]
cmpne r2, #0
beq _020c3628
ldr r2, [r3, #8]
cmp r1, r2
moveq ip, r3
beq _020c366c
_020c3628:
ldr r3, [r0, #0x10]
ldr r0, [r0, #4]
add lr, r3, r0, lsl #2
cmp r3, lr
bhs _020c366c
_020c363c:
ldr r2, [r3]
cmp r2, #0
ldrneb r0, [r2, #0x118]
cmpne r0, #0
beq _020c3660
ldr r0, [r2, #8]
cmp r1, r0
moveq ip, r2
beq _020c366c
_020c3660:
add r3, r3, #4
cmp r3, lr
blo _020c363c
_020c366c:
mov r0, ip
ldmia sp!, {r3, pc}
arm_func_end _ZN12ActorManager13FindActorByIdEj
.global _ZN12ActorManager8GetActorEP8ActorRef
arm_func_start _ZN12ActorManager8GetActorEP8ActorRef
_ZN12ActorManager8GetActorEP8ActorRef: ; 0x020c3674
ldr r2, [r1, #4]
cmp r2, #0
movlt r0, #0
bxlt lr
ldr r0, [r0, #0x10]
ldr r0, [r0, r2, lsl #2]
cmp r0, #0
ldrneb r2, [r0, #0x118]
cmpne r2, #0
beq _020c36ac
ldr r2, [r1]
ldr r1, [r0, #8]
cmp r2, r1
bxeq lr
_020c36ac:
mov r0, #0
bx lr
arm_func_end _ZN12ActorManager8GetActorEP8ActorRef
.global _ZN11FilterActor6FilterEP5Actor
arm_func_start _ZN11FilterActor6FilterEP5Actor
_ZN11FilterActor6FilterEP5Actor: ; 0x020c36b4
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x18
mov r5, r0
mov r4, r1
ldr r1, [r5, #4]
ldr r0, [r4, #4]
cmp r1, r0
addne sp, sp, #0x18
movne r0, #0
ldmneia sp!, {r3, r4, r5, pc}
ldr r1, [r5, #8]
mvn r0, #0
cmp r1, r0
ldrne r0, [r4, #0x34]
cmpne r1, r0
addne sp, sp, #0x18
movne r0, #0
ldmneia sp!, {r3, r4, r5, pc}
ldr ip, [r5, #0x10]
cmp ip, #0
beq _020c3748
mov r3, #0
ldr r1, [ip]
sub r0, r3, #1
cmp r1, r0
beq _020c3748
mvn r0, #0
_020c3720:
ldr r2, [ip, r3, lsl #3]
ldr r1, [r4, #8]
cmp r2, r1
addeq sp, sp, #0x18
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
add r3, r3, #1
ldr r1, [ip, r3, lsl #3]
cmp r1, r0
bne _020c3720
_020c3748:
ldrb r0, [r5, #0x14]
cmp r0, #0
beq _020c3794
ldr r0, [r4, #0x48]
add r1, sp, #0xc
str r0, [sp, #0xc]
ldr r2, [r4, #0x4c]
add r0, r5, #0x18
str r2, [sp, #0x10]
ldr r2, [r4, #0x50]
str r2, [sp, #0x14]
bl func_ov00_0208e7a4
cmp r0, #0
moveq r0, #1
movne r0, #0
cmp r0, #0
addne sp, sp, #0x18
movne r0, #0
ldmneia sp!, {r3, r4, r5, pc}
_020c3794:
ldrb r0, [r5, #0x30]
cmp r0, #0
beq _020c37e0
ldr r0, [r4, #0x48]
add r1, sp, #0
str r0, [sp]
ldr r2, [r4, #0x4c]
add r0, r5, #0x34
str r2, [sp, #4]
ldr r2, [r4, #0x50]
str r2, [sp, #8]
bl func_ov00_0208f318
cmp r0, #0
moveq r0, #1
movne r0, #0
cmp r0, #0
addne sp, sp, #0x18
movne r0, #0
ldmneia sp!, {r3, r4, r5, pc}
_020c37e0:
mov r0, #1
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, pc}
arm_func_end _ZN11FilterActor6FilterEP5Actor
.global _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
arm_func_start _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
_ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList: ; 0x020c37ec
stmdb sp!, {r4, r5, r6, r7, r8, lr}
movs r7, r2
mov r4, #0
strne r4, [r7, #8]
ldr r5, [r0, #0x10]
ldr r0, [r0, #4]
mov r8, r1
add r6, r5, r0, lsl #2
cmp r5, r6
bhs _020c388c
_020c3814:
ldr r1, [r5]
cmp r1, #0
ldrneb r0, [r1, #0x118]
cmpne r0, #0
beq _020c3880
mov r0, r8
ldr r2, [r0]
ldr r2, [r2]
blx r2
cmp r0, #0
beq _020c3880
cmp r7, #0
beq _020c387c
ldmib r7, {r0, ip}
cmp ip, r0
bge _020c387c
ldr r1, [r5]
ldr r2, [r7]
ldr r0, [r1, #8]
add r3, r2, ip, lsl #3
str r0, [r2, ip, lsl #3]
ldr r0, [r1, #0xc]
str r0, [r3, #4]
ldr r0, [r7, #8]
add r0, r0, #1
str r0, [r7, #8]
_020c387c:
add r4, r4, #1
_020c3880:
add r5, r5, #4
cmp r5, r6
blo _020c3814
_020c388c:
mov r0, r4
ldmia sp!, {r4, r5, r6, r7, r8, pc}
arm_func_end _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.global _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
arm_func_start _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
_ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j: ; 0x020c3894
stmdb sp!, {r3, lr}
mvn r3, #0
str r3, [r0]
str r3, [r0, #4]
ldr ip, [r1, #0x10]
ldr r1, [r1, #4]
add lr, ip, r1, lsl #2
cmp ip, lr
ldmhsia sp!, {r3, pc}
_020c38b8:
ldr r3, [ip]
cmp r3, #0
ldrneb r1, [r3, #0x118]
cmpne r1, #0
beq _020c38ec
ldr r1, [r3, #4]
cmp r2, r1
bne _020c38ec
ldr r1, [r3, #8]
str r1, [r0]
ldr r1, [r3, #0xc]
str r1, [r0, #4]
ldmia sp!, {r3, pc}
_020c38ec:
add ip, ip, #4
cmp ip, lr
blo _020c38b8
ldmia sp!, {r3, pc}
arm_func_end _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.global _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
arm_func_start _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
_ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p: ; 0x020c38fc
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
mvn r4, #0
mov sb, r0
str r4, [sb]
str r4, [sb, #4]
ldr r5, [r1, #0x10]
ldr r0, [r1, #4]
mov r8, r2
add r6, r5, r0, lsl #2
mov r7, r3
sub r4, r4, #0x80000000
cmp r5, r6
ldmhsia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
_020c3930:
ldr r2, [r5]
cmp r2, #0
ldrneb r0, [r2, #0x118]
cmpne r0, #0
beq _020c397c
ldr r0, [r2, #4]
cmp r8, r0
bne _020c397c
mov r1, r7
add r0, r2, #0x48
bl func_01ff9ec0
cmp r0, r4
bge _020c397c
ldr r1, [r5]
mov r4, r0
ldr r0, [r1, #8]
str r0, [sb]
ldr r0, [r1, #0xc]
str r0, [sb, #4]
_020c397c:
add r5, r5, #4
cmp r5, r6
blo _020c3930
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
arm_func_end _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.global _ZN12ActorManager18func_ov00_020c398cEv
arm_func_start _ZN12ActorManager18func_ov00_020c398cEv
_ZN12ActorManager18func_ov00_020c398cEv: ; 0x020c398c
ldr ip, _020c3998 ; =func_ov00_020c3f08
ldr r0, [r0, #0x14]
bx ip
.align 2, 0
arm_func_end _ZN12ActorManager18func_ov00_020c398cEv
_020c3998: .word func_ov00_020c3f08
.global _ZN12ActorManager18func_ov00_020c399cEv
arm_func_start _ZN12ActorManager18func_ov00_020c399cEv
_ZN12ActorManager18func_ov00_020c399cEv: ; 0x020c399c
ldr ip, _020c39a8 ; =func_ov00_020c3f3c
ldr r0, [r0, #0x14]
bx ip
.align 2, 0
arm_func_end _ZN12ActorManager18func_ov00_020c399cEv
_020c39a8: .word func_ov00_020c3f3c
.global _ZN12ActorManager18func_ov00_020c39acEjPjb
arm_func_start _ZN12ActorManager18func_ov00_020c39acEjPjb
_ZN12ActorManager18func_ov00_020c39acEjPjb: ; 0x020c39ac
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
sub sp, sp, #0x10
movs r8, r2
mov sl, r0
mov sb, r1
mov r7, r3
bne _020c39d8
cmp r7, #0
addne sp, sp, #0x10
movne r0, #0
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
_020c39d8:
ldr r0, [sl, #0x10]
mov r4, #0
ldr fp, [r0, sb, lsl #2]
cmp fp, #0
ldrneb r0, [fp, #0x118]
cmpne r0, #0
beq _020c3b20
ldr r0, [sl, #4]
cmp r8, #0
cmpeq r7, #0
moveq r6, #1
movne r6, #0
mov r5, #0
cmp r0, #0
ble _020c3b20
_020c3a14:
cmp r5, sb
ldrne r0, [sl, #0x10]
ldrne r0, [r0, r5, lsl #2]
cmpne r0, #0
beq _020c3b08
ldr r0, [sl, #0x14]
mov r1, r5
bl func_ov00_020c3f08
cmp r0, #0
beq _020c3b08
cmp r6, #0
bne _020c3a60
ldr r0, [sl, #0x10]
mov r1, r8
ldr r0, [r0, r5, lsl #2]
ldr r0, [r0, #4]
bl _ZN12ActorManager16ActorTypeIsOneOfEjPj
cmp r7, r0
beq _020c3b08
_020c3a60:
ldr r0, [sl, #0x10]
add r3, sp, #0
ldr r0, [r0, r5, lsl #2]
add ip, r0, #0x7c
ldmia ip, {r0, r1, r2}
stmia r3, {r0, r1, r2}
ldr r0, [ip, #0xc]
mov r1, r5
str r0, [sp, #0xc]
ldr r0, [sl, #0x14]
bl func_ov00_020c3ef0
ldr r1, [sl, #0x10]
ldr r3, [r0]
ldr r2, [r1, r5, lsl #2]
mov r1, fp
str r3, [r2, #0x7c]
ldr r3, [r0, #4]
str r3, [r2, #0x80]
ldr r3, [r0, #8]
str r3, [r2, #0x84]
ldr r0, [r0, #0xc]
str r0, [r2, #0x88]
ldr r0, [sl, #0x10]
ldr r0, [r0, r5, lsl #2]
ldr r2, [r0]
ldr r2, [r2, #0x44]
blx r2
cmp r0, #0
ldrne r0, [sl, #0x10]
ldr r1, [sl, #0x10]
ldrne r4, [r0, r5, lsl #2]
ldr r0, [sp]
ldr r1, [r1, r5, lsl #2]
cmp r4, #0
str r0, [r1, #0x7c]
ldr r0, [sp, #4]
str r0, [r1, #0x80]
ldr r0, [sp, #8]
str r0, [r1, #0x84]
ldr r0, [sp, #0xc]
str r0, [r1, #0x88]
bne _020c3b20
_020c3b08:
add r0, r5, #1
mov r0, r0, lsl #0x10
ldr r1, [sl, #4]
mov r5, r0, lsr #0x10
cmp r1, r0, lsr #16
bgt _020c3a14
_020c3b20:
mov r0, r4
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
arm_func_end _ZN12ActorManager18func_ov00_020c39acEjPjb
.global _ZN12ActorManager18func_ov00_020c3b2cEPi
arm_func_start _ZN12ActorManager18func_ov00_020c3b2cEPi
_ZN12ActorManager18func_ov00_020c3b2cEPi: ; 0x020c3b2c
stmdb sp!, {r4, lr}
cmp r1, #0
movne r2, #0
strne r2, [r1]
ldr r2, [r0, #4]
mov lr, #0
mov ip, lr
cmp r2, #0
ldr r4, [r0, #0x10]
ble _020c3ba8
_020c3b54:
ldr r3, [r4]
cmp r3, #0
ldrneb r2, [r3, #0x118]
cmpne r2, #0
ldrneb r2, [r3, #0x128]
cmpne r2, #0
beq _020c3b94
cmp r1, #0
beq _020c3b90
add r2, r3, #0x100
ldrsh r2, [r2, #0x20]
cmp r2, #0
ldrgt r2, [r1]
addgt r2, r2, #1
strgt r2, [r1]
_020c3b90:
add lr, lr, #1
_020c3b94:
ldr r2, [r0, #4]
add ip, ip, #1
cmp ip, r2
add r4, r4, #4
blt _020c3b54
_020c3ba8:
mov r0, lr
ldmia sp!, {r4, pc}
arm_func_end _ZN12ActorManager18func_ov00_020c3b2cEPi
.global _ZN12ActorManager18func_ov00_020c3bb0EiPi
arm_func_start _ZN12ActorManager18func_ov00_020c3bb0EiPi
_ZN12ActorManager18func_ov00_020c3bb0EiPi: ; 0x020c3bb0
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
sub sp, sp, #0xd4
movs sl, r2
str r0, [sp]
movne r0, #0
strne r0, [sl]
ldr r0, _020c3ce4 ; =data_027e0e60
add r2, sp, #0x14
ldr r0, [r0]
mov r3, #8
bl func_ov00_020836cc
mov r5, r0
cmp r5, #0
addle sp, sp, #0xd4
movle r0, #0
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldr r0, [sp]
mov fp, #0
ldr r0, [r0, #4]
str fp, [sp, #4]
cmp r0, #0
ldr r0, [sp]
ldr r7, [r0, #0x10]
ble _020c3cd8
_020c3c10:
ldr r1, [r7]
cmp r1, #0
ldrneb r0, [r1, #0x118]
cmpne r0, #0
ldrneb r0, [r1, #0x128]
cmpne r0, #0
beq _020c3cb8
mov r6, #0
mov r8, r6
cmp r5, #0
ble _020c3c88
add sb, sp, #0x14
add r4, sp, #8
_020c3c44:
ldr r3, [r7]
mov r0, sb
ldr r2, [r3, #0x48]
mov r1, r4
str r2, [sp, #8]
ldr r2, [r3, #0x4c]
str r2, [sp, #0xc]
ldr r2, [r3, #0x50]
str r2, [sp, #0x10]
bl func_ov00_0208e7a4
cmp r0, #0
movne r6, #1
bne _020c3c88
add r8, r8, #1
cmp r8, r5
add sb, sb, #0x18
blt _020c3c44
_020c3c88:
cmp r6, #0
beq _020c3cb8
cmp sl, #0
beq _020c3cb4
ldr r0, [r7]
add r0, r0, #0x100
ldrsh r0, [r0, #0x20]
cmp r0, #0
ldrgt r0, [sl]
addgt r0, r0, #1
strgt r0, [sl]
_020c3cb4:
add fp, fp, #1
_020c3cb8:
ldr r0, [sp]
add r7, r7, #4
ldr r1, [r0, #4]
ldr r0, [sp, #4]
add r0, r0, #1
str r0, [sp, #4]
cmp r0, r1
blt _020c3c10
_020c3cd8:
mov r0, fp
add sp, sp, #0xd4
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
arm_func_end _ZN12ActorManager18func_ov00_020c3bb0EiPi
_020c3ce4: .word data_027e0e60
.global _ZN12ActorManager18func_ov00_020c3ce8Eii
arm_func_start _ZN12ActorManager18func_ov00_020c3ce8Eii
_ZN12ActorManager18func_ov00_020c3ce8Eii: ; 0x020c3ce8
stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
sub sp, sp, #0xcc
ldr r3, _020c3dcc ; =data_027e0e60
mov fp, r0
ldr r0, [r3]
mov sl, r2
add r2, sp, #0xc
mov r3, #8
bl func_ov00_020836cc
mov r5, r0
cmp r5, #0
addle sp, sp, #0xcc
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
ldr r0, [fp, #4]
ldr r7, [fp, #0x10]
cmp r0, #0
mov r6, #0
addle sp, sp, #0xcc
ldmleia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
add r4, sp, #0
_020c3d38:
ldr r1, [r7]
cmp r1, #0
ldrneb r0, [r1, #0x118]
cmpne r0, #0
ldrneb r0, [r1, #0x128]
cmpne r0, #0
beq _020c3db0
mov r8, #0
cmp r5, #0
ble _020c3db0
add sb, sp, #0xc
_020c3d64:
ldr r3, [r7]
mov r0, sb
ldr r2, [r3, #0x48]
mov r1, r4
str r2, [sp]
ldr r2, [r3, #0x4c]
str r2, [sp, #4]
ldr r2, [r3, #0x50]
str r2, [sp, #8]
bl func_ov00_0208e72c
cmp r0, #0
beq _020c3da0
ldr r0, [r7]
mov r1, sl
bl _ZN5Actor10SetUnk_129Eb
_020c3da0:
add r8, r8, #1
cmp r8, r5
add sb, sb, #0x18
blt _020c3d64
_020c3db0:
ldr r0, [fp, #4]
add r6, r6, #1
cmp r6, r0
add r7, r7, #4
blt _020c3d38
add sp, sp, #0xcc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
arm_func_end _ZN12ActorManager18func_ov00_020c3ce8Eii
_020c3dcc: .word data_027e0e60
.global _ZN12ActorManager14Actor_vfunc_28Ev
arm_func_start _ZN12ActorManager14Actor_vfunc_28Ev
_ZN12ActorManager14Actor_vfunc_28Ev: ; 0x020c3dd0
stmdb sp!, {r4, r5, r6, lr}
mov r6, r0
ldrh r0, [r6]
ldr r5, [r6, #0x10]
mov r4, #0
cmp r0, #0
ldmleia sp!, {r4, r5, r6, pc}
_020c3dec:
ldr r0, [r5]
cmp r0, #0
beq _020c3e04
ldr r1, [r0]
ldr r1, [r1, #0x28]
blx r1
_020c3e04:
ldrh r0, [r6]
add r4, r4, #1
add r5, r5, #4
cmp r4, r0
blt _020c3dec
ldmia sp!, {r4, r5, r6, pc}
arm_func_end _ZN12ActorManager14Actor_vfunc_28Ev
.global _ZN12ActorManager16ActorTypeIsOneOfEjPj
arm_func_start _ZN12ActorManager16ActorTypeIsOneOfEjPj
_ZN12ActorManager16ActorTypeIsOneOfEjPj: ; 0x020c3e1c
ldr ip, [r1]
ldr r2, _020c3e50 ; =0x4e554c4c
mov r3, #0
cmp ip, r2
beq _020c3e48
_020c3e30:
cmp r0, ip
moveq r3, #1
beq _020c3e48
ldr ip, [r1, #4]!
cmp ip, r2
bne _020c3e30
_020c3e48:
mov r0, r3
bx lr
.align 2, 0
arm_func_end _ZN12ActorManager16ActorTypeIsOneOfEjPj
_020c3e50: .word 0x4e554c4c
.data
.global data_ov00_020e72a8
data_ov00_020e72a8: ; 0x020e72a8
.ascii "brg"
.byte 0x00
.global data_ov00_020e72ac
data_ov00_020e72ac: ; 0x020e72ac
.ascii "fnl"
.byte 0x00
.global data_ov00_020e72b0
data_ov00_020e72b0: ; 0x020e72b0
.ascii "pdl"
.byte 0x00
.global data_ov00_020e72b4
data_ov00_020e72b4: ; 0x020e72b4
.ascii "dco"
.byte 0x00
.global data_ov00_020e72b8
data_ov00_020e72b8: ; 0x020e72b8
.ascii "can"
.byte 0x00
.global data_ov00_020e72bc
data_ov00_020e72bc: ; 0x020e72bc
.ascii "hul"
.byte 0x00
.global data_ov00_020e72c0
data_ov00_020e72c0: ; 0x020e72c0
.ascii "bow"
.byte 0x00
.global data_ov00_020e72c4
data_ov00_020e72c4: ; 0x020e72c4
.ascii "anc"
.byte 0x00
.global data_ov00_020e72c8
data_ov00_020e72c8: ; 0x020e72c8
.word data_ov00_020e72c4
.global data_ov00_020e72cc
data_ov00_020e72cc: ; 0x020e72cc
.word data_ov00_020e72c0
.global data_ov00_020e72d0
data_ov00_020e72d0: ; 0x020e72d0
.word data_ov00_020e72bc
.global data_ov00_020e72d4
data_ov00_020e72d4: ; 0x020e72d4
.word data_ov00_020e72b8
.global data_ov00_020e72d8
data_ov00_020e72d8: ; 0x020e72d8
.word data_ov00_020e72b4
.global data_ov00_020e72dc
data_ov00_020e72dc: ; 0x020e72dc
.word data_ov00_020e72b0
.global data_ov00_020e72e0
data_ov00_020e72e0: ; 0x020e72e0
.word data_ov00_020e72ac
.global data_ov00_020e72e4
data_ov00_020e72e4: ; 0x020e72e4
.word data_ov00_020e72a8
.global data_ov00_020e72e8
data_ov00_020e72e8: ; 0x020e72e8
.byte 0x00, 0x00, 0x00, 0x00
.global data_ov00_020e72ec
data_ov00_020e72ec: ; 0x020e72ec
.byte 0x00, 0x00, 0x00, 0x00
.global _ZTV11FilterActor
_ZTV11FilterActor: ; 0x020e72f0
.word _ZN11FilterActor6FilterEP5Actor
asm/ov00/Player/LinkStateBase.inc
+1 -1
View File
@@ -60,7 +60,7 @@
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern func_ov00_020c4048
.extern func_ov04_0210ade4
.extern func_ov04_0210ade8
asm/ov00/Player/LinkStateBase.s
+3 -3
View File
@@ -468,7 +468,7 @@ _ZN13LinkStateBase18func_ov00_020a8390EiPv: ; 0x020a8390
ldr r0, _020a84b8 ; =data_027e0fe4
mov r1, r4
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r4, r0
beq _020a84a8
mov r0, r7
@@ -1247,13 +1247,13 @@ _ZN13LinkStateBase12GetGrabActorEv: ; 0x020a8ca4
ldr r1, _020a8cbc ; =data_027e0fe4
ldr r2, [r0, #8]
ldr r0, [r1]
ldr ip, _020a8cc0 ; =func_ov00_020c3674
ldr ip, _020a8cc0 ; =_ZN12ActorManager8GetActorEP8ActorRef
add r1, r2, #0x3c
bx ip
.align 2, 0
arm_func_end _ZN13LinkStateBase12GetGrabActorEv
_020a8cbc: .word data_027e0fe4
_020a8cc0: .word func_ov00_020c3674
_020a8cc0: .word _ZN12ActorManager8GetActorEP8ActorRef
.global _ZN13LinkStateBase15GetGrabActorRefEv
arm_func_start _ZN13LinkStateBase15GetGrabActorRefEv
asm/ov00/Player/LinkStateInteract.inc
+4 -4
View File
@@ -56,10 +56,10 @@
.extern func_020350b4
.extern func_020351b8
.extern func_ov00_020ba458
.extern func_ov00_020c1908
.extern func_ov00_020c2a0c
.extern func_ov00_020c3180
.extern func_ov00_020c3674
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor4KillEv
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern func_ov00_020d7a84
.extern func_ov00_020d7b20
.extern func_ov04_0210ab88
asm/ov00/Player/LinkStateInteract.s
+8 -8
View File
@@ -349,7 +349,7 @@ _020aa684:
ldr r0, _020aa7a8 ; =data_027e0fe4
add r1, r4, #0x10
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
mov r0, r4
beq _020aa6bc
@@ -532,7 +532,7 @@ _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor: ; 0x020aa844
add r1, sp, #0x10
mov r8, sb, asr #0x1f
add r4, r2, r4
bl func_ov00_020c2a0c
bl _ZN5Actor9GetHitboxEP8Cylinder
smull r1, r0, r6, sb
adds r1, r1, #0x800
adc r0, r0, #0
@@ -859,7 +859,7 @@ _020aadbc:
str r2, [sp, #0x14]
ldr r2, [r3, #0x88]
str r2, [sp, #0x18]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r6, r0
bne _020aae38
mov r0, r4
@@ -979,7 +979,7 @@ _020aaf88:
bl func_01ff9bf8
add r1, sp, #0x40
mov r0, r6
bl func_ov00_020c2a0c
bl _ZN5Actor9GetHitboxEP8Cylinder
ldr r0, [r6, #0x12c]
cmp r0, #6
addls pc, pc, r0, lsl #2
@@ -1234,7 +1234,7 @@ _020ab32c:
beq _020ab38c
mov r0, r6
mov r1, #1
bl func_ov00_020c1908
bl _ZN5Actor10SetUnk_11cEc
mov r0, #6
str r0, [r4, #4]
ldr r1, [sp, #0x14]
@@ -1537,7 +1537,7 @@ _020ab734:
cmp r2, r1
bne _020ab748
_020ab740:
bl func_ov00_020c3180
bl _ZN5Actor4KillEv
ldmia sp!, {r4, pc}
_020ab748:
mov r0, r4
@@ -1610,7 +1610,7 @@ _020ab7fc:
_020ab818:
add r1, sp, #0
mov r0, r2
bl func_ov00_020c2a0c
bl _ZN5Actor9GetHitboxEP8Cylinder
mov r0, r4
bl _ZN13LinkStateBase12GetPlayerPosEv
add r2, sp, #0x10
@@ -1989,7 +1989,7 @@ _020abce0:
ldr r0, _020abd70 ; =data_027e0fe4
mov r1, r4
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r6, r0
mov r0, r5
bl _ZN13LinkStateBase15GetGrabActorRefEv
asm/ov00/Player/PlayerBase.inc
+1 -1
View File
@@ -26,7 +26,7 @@
.extern func_ov00_0208ae94
.extern func_ov00_0208f030
.extern func_ov00_02097700
.extern func_ov00_020c357c
.extern _ZN12ActorManager14Actor_vfunc_10Ej
.extern func_ov04_0210b258
.extern func_ov04_0210b280
.extern gItemManager
asm/ov00/Player/PlayerBase.s
+1 -1
View File
@@ -362,7 +362,7 @@ _ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70
ldr r0, _020a7f7c ; =data_027e0fe4
ldrb r1, [sp, #0x18]
ldr r0, [r0]
bl func_ov00_020c357c
bl _ZN12ActorManager14Actor_vfunc_10Ej
ldrb r0, [sp, #0x18]
cmp r0, #0
beq _020a7f40
asm/ov00/Player/PlayerControl.inc
+4 -4
View File
@@ -1,6 +1,10 @@
#pragma once
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN11ItemManager18func_ov00_020ad790Ei
.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZNK11ItemManager15GetEquippedItemEv
.extern _ZNK11ItemManager16GetEquippedFairyEv
.extern _ZNK11ItemManager8GetFairyEi
@@ -59,10 +63,6 @@
.extern func_ov00_020baca8
.extern func_ov00_020bad18
.extern func_ov00_020bc46c
.extern func_ov00_020c28ec
.extern func_ov00_020c2a0c
.extern func_ov00_020c3484
.extern func_ov00_020c3674
.extern func_ov00_020cebcc
.extern func_ov00_020ced64
.extern func_ov00_020ced7c
asm/ov00/Player/PlayerControl.s
+8 -8
View File
@@ -160,13 +160,13 @@ _ZN13PlayerControl14GetFollowActorEv: ; 0x020aeffc
ldr r1, _020af014 ; =data_027e0fe4
mov r2, r0
ldr r0, [r1]
ldr ip, _020af018 ; =func_ov00_020c3674
ldr ip, _020af018 ; =_ZN12ActorManager8GetActorEP8ActorRef
add r1, r2, #0x84
bx ip
.align 2, 0
arm_func_end _ZN13PlayerControl14GetFollowActorEv
_020af014: .word data_027e0fe4
_020af018: .word func_ov00_020c3674
_020af018: .word _ZN12ActorManager8GetActorEP8ActorRef
.global _ZN13PlayerControl18func_ov00_020af01cEPc
arm_func_start _ZN13PlayerControl18func_ov00_020af01cEPc
@@ -837,7 +837,7 @@ _020af8b0:
ldr r0, _020afacc ; =data_027e0fe4
add r1, r1, #0x3c
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
movne r8, #1
_020af8dc:
@@ -847,7 +847,7 @@ _020af8dc:
ldr r0, _020afacc ; =data_027e0fe4
add r1, sb, #0x8c
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r6, r0
mov r7, r4
beq _020af97c
@@ -880,7 +880,7 @@ _020af944:
strb r1, [sb, #0x80]
mov r1, #0xf
strh r1, [sb, #0xa8]
bl func_ov00_020c28ec
bl _ZN5Actor16XzDistanceToLinkEv
mov r4, r0
_020af97c:
ldr r0, _020afad0 ; =data_027e0e60
@@ -949,7 +949,7 @@ _020afa68:
add r0, sp, #0
ldr r1, [r1]
mov r2, r4
bl func_ov00_020c3484
bl _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
ldr r0, [sp]
str r0, [sb, #0x8c]
ldr r0, [sp, #4]
@@ -1033,7 +1033,7 @@ _ZN13PlayerControl18func_ov00_020afb6cEv: ; 0x020afb6c
mov r4, r0
ldr r0, [r1]
add r1, sb, #0x84
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
ldr r1, _020afe74 ; =gItemManager
mov r5, r0
ldr r6, [r1]
@@ -1059,7 +1059,7 @@ _020afbcc:
mov r6, r0
add r1, sp, #0x10
mov r0, r5
bl func_ov00_020c2a0c
bl _ZN5Actor9GetHitboxEP8Cylinder
ldr r0, [sp, #0x14]
mov r1, #0
add r0, r0, #0x66
asm/ov00/ov00_020773c0.inc
+1 -1
View File
@@ -127,7 +127,6 @@
.extern func_020426d4
.extern func_02042bb8
.extern func_0204366c
.extern strncmp
.extern func_0204f8d4
.extern func_ov00_0207bc48
.extern func_ov00_0207c170
@@ -162,3 +161,4 @@
.extern func_ov09_0211d8a0
.extern func_ov29_02178f1c
.extern gOverlayManager
.extern strncmp
asm/ov00/ov00_0207af9c.inc
+59 -59
View File
@@ -5,7 +5,63 @@
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase12SetUpdatePosEb
.extern _ZN11ItemManager21LoadDungeonItemModelsEv
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
.extern _ZN12ActorManager18func_ov00_020c3ce8Eii
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14OverlayManager15LoadIfNotLoadedEjj
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
@@ -231,9 +287,6 @@
.extern func_020435b4
.extern func_02043600
.extern func_02045810
.extern strcpy
.extern strcat
.extern strcmp
.extern func_0204dd9c
.extern func_0204f558
.extern func_0204f614
@@ -288,63 +341,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e5c
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c1734
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c20
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c22b8
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c3004
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c3894
.extern func_ov00_020c38fc
.extern func_ov00_020c3b2c
.extern func_ov00_020c3bb0
.extern func_ov00_020c3ce8
.extern func_ov00_020c4048
.extern func_ov00_020c45c4
.extern func_ov00_020c4648
@@ -442,3 +439,6 @@
.extern func_ov40_02183dac
.extern gItemManager
.extern gOverlayManager
.extern strcat
.extern strcmp
.extern strcpy
asm/ov00/ov00_0207af9c.s
+295 -295
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020b1498.inc
+82 -305
View File
@@ -1,14 +1,10 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern _ZN10PlayerBase14GetEquipShieldEv
.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern _ZN10PlayerBase18TeleportToEntranceEib
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
.extern _ZN10PlayerBase8TeleportEP5Vec3psibb
.extern _ZN10PlayerBase8vfunc_04Ev
.extern _ZN10PlayerBase9AddHealthEs
@@ -16,10 +12,12 @@
.extern _ZN11ItemManager12GetEquipItemEi
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN11ItemManager13UnequipPotionEv
.extern _ZN11ItemManager15SetEquippedItemEi
.extern _ZN11ItemManager18func_ov00_020ad790Ei
.extern _ZN11ItemManager4SaveEP15SaveItemManager
.extern _ZN11ItemManager8GiveAmmoEit
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12TouchControl19UpdateConditionallyEP10TouchStatet
.extern _ZN13LinkStateBase10GetStateIdEv
.extern _ZN13LinkStateBase12GetGrabActorEv
@@ -58,14 +56,63 @@
.extern _ZN17LinkStateInteract15SetBombVelocityEP5Vec3p
.extern _ZN17LinkStateInteract16GetLinkStateRollEv
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
.extern _ZN17LinkStateInteract18func_ov00_020abba0EP8ActorRef
.extern _ZN17LinkStateInteract18func_ov00_020abbdcEP8ActorRef
.extern _ZN17LinkStateInteract18func_ov00_020abc18EP8ActorRef
.extern _ZN17LinkStateInteract18func_ov00_020abc78EP8ActorRef
.extern _ZN17LinkStateInteract20CreateDebugHierarchyEv
.extern _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
.extern _ZN17LinkStateInteract4GrabEP8ActorRef
.extern _ZN4Item18func_ov00_020ad068Ei
.extern _ZN5Actor10GetLinkPosEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager16GetEquippedFairyEv
@@ -78,12 +125,9 @@
.extern data_02051f54
.extern data_02052f54
.extern data_02053f54
.extern data_020561f4
.extern data_02056be4
.extern data_02057840
.extern data_0205785c
.extern data_02057878
.extern data_02063e4c
.extern data_020691a0
.extern data_027e0194
.extern data_027e03c8
@@ -95,26 +139,19 @@
.extern data_027e077c
.extern data_027e0c54
.extern data_027e0c68
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d0c
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d44
.extern data_027e0d78
.extern data_027e0d84
.extern data_027e0db0
.extern data_027e0e28
.extern data_027e0e58
.extern data_027e0e5c
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f70
.extern data_027e0f74
.extern data_027e0f78
.extern data_027e0f88
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fa0
@@ -133,19 +170,20 @@
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
.extern data_027e0ff4
.extern data_027e0ff8
.extern data_027e0ffc
.extern data_027e1038
.extern data_027e103c
.extern data_027e1054
.extern data_027e109c
.extern data_027e10a4
.extern data_ov00_020e8398
.extern data_ov00_020e8b08
.extern data_ov00_020e9360
.extern data_ov00_020e9370
.extern data_ov00_020e9c88
.extern data_ov00_020ee178
.extern data_ov00_020ee184
.extern data_ov00_020ee698
.extern data_ov00_020eec68
.extern data_ov00_020eec9c
.extern data_ov09_0211f5b4
.extern func_01ff80f8
.extern func_01ff81f8
@@ -153,60 +191,28 @@
.extern func_01ff8230
.extern func_01ff8690
.extern func_01ff9158
.extern func_01ff991c
.extern func_01ff992c
.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_01ffa9fc
.extern func_01ffb7ec
.extern func_01ffbe34
.extern func_01ffbe78
.extern func_01ffbf5c
.extern func_01ffe1cc
.extern func_01ffe468
.extern func_01ffec34
.extern func_01fffb4c
.extern func_01fffbec
.extern func_01fffcd8
.extern func_01fffcec
.extern func_01fffd04
.extern func_020029fc
.extern func_02002bac
.extern func_02002bb8
.extern func_02002c14
.extern func_020037b8
.extern func_020059ec
.extern func_020078d8
.extern func_020078f4
.extern func_02007938
.extern func_02007984
.extern func_02009558
.extern func_0200ab90
.extern func_0200ac24
.extern func_0200ac5c
.extern func_0200b4f4
.extern func_0200dd94
.extern func_0200e2a4
.extern func_0200eec8
.extern func_020156f4
.extern func_02015708
.extern func_02015718
.extern func_02015740
.extern func_02016fe8
.extern func_0201739c
.extern func_020174a4
.extern func_02018450
.extern func_02018884
.extern func_020188d4
@@ -216,10 +222,6 @@
.extern func_02019380
.extern func_020193f0
.extern func_02019534
.extern func_02019654
.extern func_02019688
.extern func_020196bc
.extern func_020196fc
.extern func_020197bc
.extern func_020197fc
.extern func_0201b1bc
@@ -228,49 +230,9 @@
.extern func_0201e4bc
.extern func_0201e4cc
.extern func_0201e544
.extern func_0201e760
.extern func_0201e78c
.extern func_0201f1ac
.extern func_0201f1f8
.extern func_0201f2cc
.extern func_0201f40c
.extern func_0201f43c
.extern func_0201f468
.extern func_0201f500
.extern func_0201f518
.extern func_0201f5e4
.extern func_0201f5f4
.extern func_0201f650
.extern func_0201f6b4
.extern func_0201f6f4
.extern func_0201f710
.extern func_0201f730
.extern func_0201f748
.extern func_0201f7a8
.extern func_0201f7d0
.extern func_0201f86c
.extern func_0201f88c
.extern func_0201f91c
.extern func_0201f944
.extern func_020204d8
.extern func_020204f0
.extern func_02020534
.extern func_0202093c
.extern func_020209a4
.extern func_020209bc
.extern func_020209e8
.extern func_0202148c
.extern func_020214d4
.extern func_02021960
.extern func_02021988
.extern func_020219e8
.extern func_02021a40
.extern func_02023548
.extern func_0202a56c
.extern func_0202a5c0
.extern func_0202ab78
.extern func_0202af4c
.extern func_0202aff0
.extern func_0202b154
.extern func_0202b2e8
.extern func_0202b2f8
@@ -278,14 +240,7 @@
.extern func_0202b418
.extern func_0202b4e4
.extern func_0202b7e4
.extern func_0202b864
.extern func_0202b894
.extern func_0202bae0
.extern func_0202bbbc
.extern func_0202bc04
.extern func_0202bc10
.extern func_0202cec8
.extern func_0202d0cc
.extern func_0202d550
.extern func_0202d56c
.extern func_0202d590
@@ -293,144 +248,58 @@
.extern func_0202d5dc
.extern func_0202d5ec
.extern func_0202d95c
.extern func_0202da8c
.extern func_0202dc38
.extern func_0202e1a0
.extern func_0202e1c4
.extern func_0202e1e8
.extern func_0202e58c
.extern func_0202e9f4
.extern func_0202ea18
.extern func_0202ea24
.extern func_0202ea34
.extern func_0202ea50
.extern func_0203005c
.extern func_020300cc
.extern func_0203010c
.extern func_020313c8
.extern func_02033780
.extern func_020337d8
.extern func_02033af4
.extern func_02034698
.extern func_020347b0
.extern func_0203493c
.extern func_02034984
.extern func_02034b58
.extern func_02034b90
.extern func_020366c4
.extern func_0203673c
.extern func_02036798
.extern func_020367ec
.extern func_02036808
.extern func_020368f4
.extern func_02036ce4
.extern func_02036d30
.extern func_02036d4c
.extern func_02036da8
.extern func_02036f68
.extern func_02037258
.extern func_02037628
.extern func_020376c0
.extern func_02037750
.extern func_0203780c
.extern func_02037844
.extern func_02037854
.extern func_02037918
.extern func_02037b88
.extern func_02037f58
.extern func_020385b8
.extern func_020385c8
.extern func_020385d0
.extern func_020386b4
.extern func_020386b8
.extern func_020386c4
.extern func_020386cc
.extern func_02038758
.extern func_02038770
.extern func_0203878c
.extern func_020387a4
.extern func_02038950
.extern func_02038aa0
.extern func_02038b1c
.extern func_02038b28
.extern func_02038b34
.extern func_02038b40
.extern func_02038b74
.extern func_02038c34
.extern func_02038d20
.extern func_02038ed0
.extern func_02038f40
.extern func_02038f44
.extern func_02039058
.extern func_0203905c
.extern func_020390a4
.extern func_02039228
.extern func_020392b4
.extern func_02039398
.extern func_020393a8
.extern func_02039440
.extern func_0203947c
.extern func_020394d8
.extern func_0203951c
.extern func_02039570
.extern func_02039578
.extern func_0203d77c
.extern func_0203d7e0
.extern func_0203dcb4
.extern func_0203e0c8
.extern func_0203e1b0
.extern func_0203e284
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203e868
.extern func_0203efd8
.extern func_0203f378
.extern func_02042f74
.extern strcpy
.extern strncpy
.extern strcat
.extern func_0204b068
.extern func_0204b0a4
.extern func_0204f558
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02078b40
.extern func_ov00_02078e00
.extern func_ov00_02079470
.extern func_ov00_02079878
.extern func_ov00_02079e04
.extern func_ov00_02079e3c
.extern func_ov00_02079e68
.extern func_ov00_02079eb4
.extern func_ov00_0207a038
.extern func_ov00_0207a188
.extern func_ov00_0207a1a4
.extern func_ov00_0207a1c8
.extern func_ov00_0207b89c
.extern func_ov00_0207bc48
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
.extern func_ov00_0207c2e8
.extern func_ov00_0207c444
.extern func_ov00_0207c474
.extern func_ov00_0207c7e8
.extern func_ov00_0207e968
.extern func_ov00_0207e96c
.extern func_ov00_02081ef4
.extern func_ov00_02081f4c
.extern func_ov00_02081f50
.extern func_ov00_02082d28
.extern func_ov00_02082d34
.extern func_ov00_0208335c
.extern func_ov00_02083368
.extern func_ov00_020833c4
.extern func_ov00_020833d0
.extern func_ov00_020833dc
.extern func_ov00_020833e8
.extern func_ov00_02083570
.extern func_ov00_02083588
.extern func_ov00_020836cc
.extern func_ov00_020836dc
.extern func_ov00_02083770
.extern func_ov00_020838e8
@@ -442,66 +311,34 @@
.extern func_ov00_02083c7c
.extern func_ov00_02083e34
.extern func_ov00_02083ee0
.extern func_ov00_02083ef8
.extern func_ov00_02083f44
.extern func_ov00_02083fb0
.extern func_ov00_02084088
.extern func_ov00_020840a0
.extern func_ov00_020840c4
.extern func_ov00_020840dc
.extern func_ov00_02084114
.extern func_ov00_02084120
.extern func_ov00_0208412c
.extern func_ov00_02084164
.extern func_ov00_02084838
.extern func_ov00_020849c0
.extern func_ov00_02084b38
.extern func_ov00_02084be0
.extern func_ov00_02084c5c
.extern func_ov00_020853fc
.extern func_ov00_020872e8
.extern func_ov00_02087338
.extern func_ov00_0208766c
.extern func_ov00_020876bc
.extern func_ov00_02087ab0
.extern func_ov00_02087d34
.extern func_ov00_02087e8c
.extern func_ov00_02087ef0
.extern func_ov00_02088010
.extern func_ov00_02089068
.extern func_ov00_02089a2c
.extern func_ov00_02089b00
.extern func_ov00_0208b180
.extern func_ov00_0208b73c
.extern func_ov00_0208b988
.extern func_ov00_0208e72c
.extern func_ov00_0208e7a4
.extern func_ov00_0208f318
.extern func_ov00_0208f70c
.extern func_ov00_02093a1c
.extern func_ov00_020965c0
.extern func_ov00_02097738
.extern func_ov00_02097750
.extern func_ov00_02097760
.extern func_ov00_0209779c
.extern func_ov00_02097810
.extern func_ov00_02097968
.extern func_ov00_02097b9c
.extern func_ov00_02097bac
.extern func_ov00_02097bbc
.extern func_ov00_02097bcc
.extern func_ov00_02097bdc
.extern func_ov00_020985c0
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_0209cbd4
.extern func_ov00_020a19fc
.extern func_ov00_020a41e4
.extern func_ov00_020a5e9c
.extern func_ov00_020a5ef8
.extern func_ov00_020a6110
.extern func_ov00_020a956c
.extern func_ov00_020a9588
.extern func_ov00_020a95a4
.extern func_ov00_020a95ec
.extern func_ov00_020a960c
@@ -517,25 +354,29 @@
.extern func_ov00_020a9890
.extern func_ov00_020a98bc
.extern func_ov00_020a9968
.extern func_ov00_020a9998
.extern func_ov00_020a9a8c
.extern func_ov00_020a9a98
.extern func_ov00_020a9aac
.extern func_ov00_020a9ab8
.extern func_ov00_020a9b6c
.extern func_ov00_020a9b78
.extern func_ov01_020f8658
.extern func_ov03_020f13b0
.extern func_ov00_020c3348
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
.extern func_ov00_020c4ae8
.extern func_ov00_020c5924
.extern func_ov00_020c5a24
.extern func_ov00_020ceacc
.extern func_ov00_020ceb24
.extern func_ov00_020cebcc
.extern func_ov00_020cef10
.extern func_ov00_020cf9dc
.extern func_ov00_020cfb84
.extern func_ov00_020d0a30
.extern func_ov00_020d0b7c
.extern func_ov00_020d70a4
.extern func_ov00_020d77e4
.extern func_ov00_020d7a84
.extern func_ov00_020d7b20
.extern func_ov00_020d7cd4
.extern func_ov03_020f3f94
.extern func_ov03_020f3ff8
.extern func_ov03_020f7010
.extern func_ov03_020f7e0c
.extern func_ov03_020f7e18
.extern func_ov03_020f9f30
.extern func_ov03_020fa528
.extern func_ov03_020fa5d8
.extern func_ov03_020fa644
.extern func_ov03_020fa660
.extern func_ov04_02107810
.extern func_ov04_0210790c
.extern func_ov04_0210794c
@@ -560,25 +401,11 @@
.extern func_ov04_0210ba88
.extern func_ov04_0210bc28
.extern func_ov04_0210bc94
.extern func_ov04_0210f4d4
.extern func_ov04_0210f4d8
.extern func_ov04_0210f4e8
.extern func_ov04_0210f4ec
.extern func_ov04_0210f4f0
.extern func_ov04_0210f4f4
.extern func_ov04_0210f528
.extern func_ov04_0210f570
.extern func_ov05_02100ae0
.extern func_ov05_02102c2c
.extern func_ov05_02103f4c
.extern func_ov05_02103f70
.extern func_ov05_02104070
.extern func_ov05_021041fc
.extern func_ov05_0210432c
.extern func_ov05_0210437c
.extern func_ov05_021043c0
.extern func_ov05_0210442c
.extern func_ov05_02104ca4
.extern func_ov05_02107b74
.extern func_ov05_02107e80
.extern func_ov05_0210826c
@@ -604,13 +431,6 @@
.extern func_ov05_0210a06c
.extern func_ov05_0210a0c0
.extern func_ov05_0210a110
.extern func_ov05_0210d3d8
.extern func_ov05_0210d6dc
.extern func_ov05_0210d728
.extern func_ov05_0210d748
.extern func_ov05_0210e288
.extern func_ov05_0210e2a4
.extern func_ov05_0210e344
.extern func_ov05_0210e4e4
.extern func_ov05_0210e8b4
.extern func_ov05_0210eaa0
@@ -621,61 +441,17 @@
.extern func_ov05_02110228
.extern func_ov05_0211058c
.extern func_ov05_021113d0
.extern func_ov08_021130d0
.extern func_ov08_02113150
.extern func_ov08_02113284
.extern func_ov08_02113314
.extern func_ov08_021133bc
.extern func_ov08_02113460
.extern func_ov08_021134b8
.extern func_ov08_021136ec
.extern func_ov09_0211b6e8
.extern func_ov09_0211b6f8
.extern func_ov09_0211b708
.extern func_ov09_0211cc8c
.extern func_ov10_0211e584
.extern func_ov10_0211e5a8
.extern func_ov12_02134378
.extern func_ov12_021343bc
.extern func_ov14_02120ac4
.extern func_ov14_02122e98
.extern func_ov14_021231d4
.extern func_ov14_021238f0
.extern func_ov14_02123904
.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 func_ov14_0213dfbc
.extern func_ov14_0213e144
.extern func_ov14_02144750
.extern func_ov14_02146634
.extern func_ov14_021474ac
.extern func_ov14_02151e04
.extern func_ov14_0215207c
.extern func_ov14_021521e4
.extern func_ov14_02152220
.extern func_ov14_02153144
.extern func_ov14_021532a4
.extern func_ov15_0213a524
.extern func_ov15_0214d21c
.extern func_ov15_0214d238
.extern func_ov15_0214d248
.extern func_ov17_02165e48
.extern func_ov22_02175910
.extern func_ov22_02175958
.extern func_ov23_02176034
.extern func_ov23_021763c0
.extern func_ov23_02177e7c
.extern func_ov26_0216ebc0
.extern func_ov26_0216ecb8
.extern func_ov26_021767ec
.extern func_ov29_0216d918
.extern func_ov29_02179238
.extern func_ov59_0219a0ac
.extern func_ov59_0219aa08
@@ -685,3 +461,4 @@
.extern func_ov59_0219b020
.extern gItemManager
.extern gOverlayManager
.extern strcat
asm/ov00/ov00_020b1498.s
+185 -40809
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020c3348.inc
+8
View File
@@ -0,0 +1,8 @@
#pragma once
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_027e0ce0
.extern data_027e0fe0
.extern func_0202ea24
.extern func_0202ea34
.extern func_0202ea50
asm/ov00/ov00_020c3348.s
+1404
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020c3e54.inc
+676
View File
@@ -0,0 +1,676 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN10PlayerBase13GetEquipSwordEv
.extern _ZN10PlayerBase14GetEquipShieldEv
.extern _ZN11ItemManager15SetEquippedItemEi
.extern _ZN11ItemManager18func_ov00_020ad790Ei
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN17LinkStateInteract18func_ov00_020abba0EP8ActorRef
.extern _ZN17LinkStateInteract18func_ov00_020abbdcEP8ActorRef
.extern _ZN17LinkStateInteract18func_ov00_020abc18EP8ActorRef
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10GetUnk_08cEP8Cylinder
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12KillInBoundsEv
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16IsFollowedByLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c195cEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor18func_ov00_020c3118Es
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c31c0Ei
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
.extern _ZNK11ItemManager8GetFairyEi
.extern data_02050f54
.extern data_020561f4
.extern data_02056be4
.extern data_02057840
.extern data_0205785c
.extern data_02057878
.extern data_02063e4c
.extern data_027e0618
.extern data_027e0764
.extern data_027e077c
.extern data_027e0c54
.extern data_027e0c68
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d04
.extern data_027e0d0c
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d44
.extern data_027e0d78
.extern data_027e0db0
.extern data_027e0e28
.extern data_027e0e58
.extern data_027e0e5c
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f70
.extern data_027e0f74
.extern data_027e0f78
.extern data_027e0f88
.extern data_027e0f90
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fb8
.extern data_027e0fbc
.extern data_027e0fc8
.extern data_027e0fd4
.extern data_027e0fe0
.extern data_027e0fe4
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ff0
.extern data_027e0ff4
.extern data_027e0ff8
.extern data_027e0ffc
.extern data_027e103c
.extern data_027e1054
.extern data_027e109c
.extern data_027e10a4
.extern data_ov00_020dd408
.extern data_ov00_020dd410
.extern data_ov00_020dd418
.extern data_ov00_020dd420
.extern data_ov00_020dd428
.extern data_ov00_020dd430
.extern data_ov00_020dd438
.extern data_ov00_020dd440
.extern data_ov00_020dd448
.extern data_ov00_020dd450
.extern data_ov00_020dd458
.extern data_ov00_020dd468
.extern data_ov00_020dd470
.extern data_ov00_020dd478
.extern data_ov00_020dd480
.extern data_ov00_020dd488
.extern data_ov00_020dd490
.extern data_ov00_020dd498
.extern data_ov00_020dd4a0
.extern data_ov00_020dd4a8
.extern data_ov00_020dd4b0
.extern data_ov00_020dd4b8
.extern data_ov00_020dd4c0
.extern data_ov00_020dd4c8
.extern data_ov00_020dd4d0
.extern data_ov00_020dd4d8
.extern data_ov00_020dd4e0
.extern data_ov00_020dd4e8
.extern data_ov00_020dd4f0
.extern data_ov00_020dd4f8
.extern data_ov00_020dd500
.extern data_ov00_020dd508
.extern data_ov00_020dd510
.extern data_ov00_020dd518
.extern data_ov00_020dd520
.extern data_ov00_020dd528
.extern data_ov00_020dd530
.extern data_ov00_020dd538
.extern data_ov00_020dd540
.extern data_ov00_020dd548
.extern data_ov00_020dd550
.extern data_ov00_020dd560
.extern data_ov00_020dd568
.extern data_ov00_020dd570
.extern data_ov00_020dd578
.extern data_ov00_020dd580
.extern data_ov00_020dd588
.extern data_ov00_020dd598
.extern data_ov00_020dd5a0
.extern data_ov00_020dd5a8
.extern data_ov00_020dd5b0
.extern data_ov00_020dd5b8
.extern data_ov00_020dd5c0
.extern data_ov00_020dd5c8
.extern data_ov00_020dd5d0
.extern data_ov00_020dd5d8
.extern data_ov00_020dd5e0
.extern data_ov00_020dd5e8
.extern data_ov00_020dd5f0
.extern data_ov00_020dd5f8
.extern data_ov00_020dd600
.extern data_ov00_020dd608
.extern data_ov00_020dd610
.extern data_ov00_020dd618
.extern data_ov00_020dd620
.extern data_ov00_020dd628
.extern data_ov00_020dd630
.extern data_ov00_020dd638
.extern data_ov00_020dd640
.extern data_ov00_020dd648
.extern data_ov00_020dd650
.extern data_ov00_020dd658
.extern data_ov00_020dd660
.extern data_ov00_020dd668
.extern data_ov00_020dd670
.extern data_ov00_020dd678
.extern data_ov00_020dd680
.extern data_ov00_020dd688
.extern data_ov00_020dd690
.extern data_ov00_020dd698
.extern data_ov00_020dd6a4
.extern data_ov00_020dd6b0
.extern data_ov00_020dd6bc
.extern data_ov00_020dd6c8
.extern data_ov00_020dd6d4
.extern data_ov00_020dd6e0
.extern data_ov00_020dd6ec
.extern data_ov00_020dd6f8
.extern data_ov00_020dd704
.extern data_ov00_020dd710
.extern data_ov00_020dd71c
.extern data_ov00_020dd728
.extern data_ov00_020dd734
.extern data_ov00_020dd740
.extern data_ov00_020dd74c
.extern data_ov00_020dd758
.extern data_ov00_020dd764
.extern data_ov00_020dd770
.extern data_ov00_020dd7a0
.extern data_ov00_020dd7ac
.extern data_ov00_020dd7b8
.extern data_ov00_020dd7c4
.extern data_ov00_020dd7d0
.extern data_ov00_020dd7dc
.extern data_ov00_020dd7e8
.extern data_ov00_020dd7f4
.extern data_ov00_020dd800
.extern data_ov00_020dd80c
.extern data_ov00_020dd818
.extern data_ov00_020dd824
.extern data_ov00_020dd830
.extern data_ov00_020dd83c
.extern data_ov00_020dd848
.extern data_ov00_020dd854
.extern data_ov00_020dd860
.extern data_ov00_020dd86c
.extern data_ov00_020dd878
.extern data_ov00_020dd884
.extern data_ov00_020dd890
.extern data_ov00_020dd89c
.extern data_ov00_020dd8a8
.extern data_ov00_020dd8b4
.extern data_ov00_020dd8c4
.extern data_ov00_020dd8d4
.extern data_ov00_020dd8e4
.extern data_ov00_020dd8f4
.extern data_ov00_020dd904
.extern data_ov00_020dd914
.extern data_ov00_020dd924
.extern data_ov00_020dd934
.extern data_ov00_020dd944
.extern data_ov00_020dd954
.extern data_ov00_020dd968
.extern data_ov00_020dd97c
.extern data_ov00_020dd990
.extern data_ov00_020dd9a8
.extern data_ov00_020dd9c0
.extern data_ov00_020dd9d8
.extern data_ov00_020dd9f0
.extern data_ov00_020dda0c
.extern data_ov00_020dda2c
.extern data_ov00_020dda4c
.extern data_ov00_020dda6c
.extern data_ov00_020dda8c
.extern data_ov00_020ddab0
.extern data_ov00_020e9360
.extern data_ov00_020e9370
.extern data_ov00_020ee5b0
.extern data_ov00_020ee5bc
.extern data_ov00_020ee5d0
.extern data_ov00_020ee5dc
.extern data_ov00_020ee5f0
.extern data_ov00_020ee5fc
.extern data_ov00_020ee610
.extern data_ov00_020ee61c
.extern data_ov00_020ee630
.extern data_ov00_020ee63c
.extern data_ov00_020ee650
.extern data_ov00_020ee65c
.extern data_ov09_0211f5b4
.extern func_01ff8214
.extern func_01ff991c
.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
.extern func_02002c14
.extern func_020037b8
.extern func_020078d8
.extern func_020078f4
.extern func_02007938
.extern func_02007984
.extern func_02009558
.extern func_0200ab90
.extern func_0200ac24
.extern func_0200ac5c
.extern func_0200b4f4
.extern func_0200dd94
.extern func_020156f4
.extern func_02015708
.extern func_02015718
.extern func_02015740
.extern func_02016fe8
.extern func_0201739c
.extern func_020174a4
.extern func_02019654
.extern func_02019688
.extern func_020196bc
.extern func_020196fc
.extern func_0201e4cc
.extern func_0201e544
.extern func_0201e760
.extern func_0201e78c
.extern func_0201f1ac
.extern func_0201f1f8
.extern func_0201f2cc
.extern func_0201f40c
.extern func_0201f43c
.extern func_0201f468
.extern func_0201f500
.extern func_0201f518
.extern func_0201f5e4
.extern func_0201f5f4
.extern func_0201f650
.extern func_0201f6b4
.extern func_0201f6f4
.extern func_0201f710
.extern func_0201f730
.extern func_0201f748
.extern func_0201f7a8
.extern func_0201f7d0
.extern func_0201f86c
.extern func_0201f88c
.extern func_0201f91c
.extern func_0201f944
.extern func_020204d8
.extern func_020204f0
.extern func_02020534
.extern func_0202093c
.extern func_020209a4
.extern func_020209bc
.extern func_020209e8
.extern func_0202148c
.extern func_020214d4
.extern func_02021960
.extern func_02021988
.extern func_020219e8
.extern func_02021a40
.extern func_0202a56c
.extern func_0202a5c0
.extern func_0202aff0
.extern func_0202b154
.extern func_0202bae0
.extern func_0202bbbc
.extern func_0202bc04
.extern func_0202bc10
.extern func_0202cec8
.extern func_0202d0cc
.extern func_0202d598
.extern func_0202d5dc
.extern func_0202d95c
.extern func_0202da8c
.extern func_0202e58c
.extern func_0202e9f4
.extern func_0202ea18
.extern func_020313c8
.extern func_02033780
.extern func_020337d8
.extern func_02033af4
.extern func_02034698
.extern func_020347b0
.extern func_0203493c
.extern func_02034984
.extern func_02034b58
.extern func_02034b90
.extern func_020366c4
.extern func_0203673c
.extern func_02036798
.extern func_02036808
.extern func_020368f4
.extern func_02036ce4
.extern func_02036d30
.extern func_02036d4c
.extern func_02036da8
.extern func_02036f68
.extern func_02037258
.extern func_02037628
.extern func_020376c0
.extern func_02037750
.extern func_0203780c
.extern func_02037844
.extern func_02037854
.extern func_02037918
.extern func_02037b88
.extern func_02037f58
.extern func_020385b8
.extern func_020385d0
.extern func_020386b4
.extern func_020386b8
.extern func_020386c4
.extern func_020386cc
.extern func_02038758
.extern func_02038770
.extern func_0203878c
.extern func_020387a4
.extern func_02038950
.extern func_02038aa0
.extern func_02038b1c
.extern func_02038b28
.extern func_02038b34
.extern func_02038b40
.extern func_02038b74
.extern func_02038c34
.extern func_02038d20
.extern func_02038ed0
.extern func_02038f40
.extern func_02038f44
.extern func_02039058
.extern func_0203905c
.extern func_020390a4
.extern func_02039228
.extern func_020392b4
.extern func_02039398
.extern func_020393a8
.extern func_02039440
.extern func_0203947c
.extern func_020394d8
.extern func_0203951c
.extern func_02039570
.extern func_02039578
.extern func_0203d77c
.extern func_0203d7e0
.extern func_0203dcb4
.extern func_0203e0c8
.extern func_0203e1b0
.extern func_0203e284
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203e868
.extern func_0203efd8
.extern func_0203f378
.extern func_02042f74
.extern func_0204b068
.extern func_0204b0a4
.extern func_0204f558
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
.extern func_ov00_02078b40
.extern func_ov00_02078e00
.extern func_ov00_02079470
.extern func_ov00_02079e04
.extern func_ov00_02079e68
.extern func_ov00_0207a1c8
.extern func_ov00_0207bc48
.extern func_ov00_0207c1b0
.extern func_ov00_0207c2e8
.extern func_ov00_0207c7e8
.extern func_ov00_02081ef4
.extern func_ov00_02081f4c
.extern func_ov00_02081f50
.extern func_ov00_02082d28
.extern func_ov00_02082d34
.extern func_ov00_0208335c
.extern func_ov00_02083588
.extern func_ov00_020836dc
.extern func_ov00_020839d4
.extern func_ov00_020839f8
.extern func_ov00_02083a1c
.extern func_ov00_02083c24
.extern func_ov00_02083c50
.extern func_ov00_02083ee0
.extern func_ov00_02083f44
.extern func_ov00_02083fb0
.extern func_ov00_020840c4
.extern func_ov00_020840dc
.extern func_ov00_02084114
.extern func_ov00_02084120
.extern func_ov00_02084164
.extern func_ov00_02084838
.extern func_ov00_020849c0
.extern func_ov00_02087338
.extern func_ov00_0208766c
.extern func_ov00_020876bc
.extern func_ov00_02087ab0
.extern func_ov00_02087d34
.extern func_ov00_02087ef0
.extern func_ov00_02088010
.extern func_ov00_02089068
.extern func_ov00_02089a2c
.extern func_ov00_02089b00
.extern func_ov00_02093a1c
.extern func_ov00_020965c0
.extern func_ov00_02097738
.extern func_ov00_02097760
.extern func_ov00_02097810
.extern func_ov00_02097968
.extern func_ov00_02097b9c
.extern func_ov00_02097bac
.extern func_ov00_02097bbc
.extern func_ov00_02097bcc
.extern func_ov00_02097bdc
.extern func_ov00_020985c0
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a19fc
.extern func_ov00_020a41e4
.extern func_ov00_020a5e9c
.extern func_ov00_020a6110
.extern func_ov00_020a956c
.extern func_ov00_020a9588
.extern func_ov00_020a95ec
.extern func_ov00_020a960c
.extern func_ov00_020a9614
.extern func_ov00_020a9650
.extern func_ov00_020a96d4
.extern func_ov00_020a9740
.extern func_ov00_020a9764
.extern func_ov00_020a97d0
.extern func_ov00_020a97e0
.extern func_ov00_020a97f8
.extern func_ov00_020a9864
.extern func_ov00_020a9890
.extern func_ov00_020a98bc
.extern func_ov00_020a9968
.extern func_ov00_020a9998
.extern func_ov00_020a9a8c
.extern func_ov00_020a9a98
.extern func_ov00_020a9aac
.extern func_ov00_020a9ab8
.extern func_ov00_020a9b6c
.extern func_ov00_020a9b78
.extern func_ov00_020b18d8
.extern func_ov00_020b1940
.extern func_ov00_020b199c
.extern func_ov00_020b1a4c
.extern func_ov00_020b3ee8
.extern func_ov00_020b3f24
.extern func_ov00_020b41ec
.extern func_ov00_020b421c
.extern func_ov00_020b7d74
.extern func_ov00_020b7e6c
.extern func_ov00_020ba4e4
.extern func_ov00_020ba53c
.extern func_ov00_020bb68c
.extern func_ov00_020bba28
.extern func_ov00_020bc2d4
.extern func_ov00_020bc320
.extern func_ov00_020bc398
.extern func_ov00_020bc500
.extern func_ov00_020bcf50
.extern func_ov00_020bd318
.extern func_ov00_020bd728
.extern func_ov00_020beba8
.extern func_ov00_020bebd8
.extern func_ov00_020bec5c
.extern func_ov00_020bece0
.extern func_ov00_020bed7c
.extern func_ov00_020bedcc
.extern func_ov00_020bf008
.extern func_ov00_020c070c
.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_ov01_020f8658
.extern func_ov03_020f13b0
.extern func_ov03_020f3f94
.extern func_ov03_020f3ff8
.extern func_ov03_020f7010
.extern func_ov03_020f7e0c
.extern func_ov03_020f7e18
.extern func_ov03_020fa528
.extern func_ov03_020fa5d8
.extern func_ov03_020fa644
.extern func_ov03_020fa660
.extern func_ov04_0210f4d4
.extern func_ov04_0210f4d8
.extern func_ov04_0210f4e8
.extern func_ov04_0210f4ec
.extern func_ov04_0210f4f0
.extern func_ov04_0210f4f4
.extern func_ov04_0210f528
.extern func_ov04_0210f570
.extern func_ov05_02102c2c
.extern func_ov05_021041fc
.extern func_ov05_0210432c
.extern func_ov05_0210437c
.extern func_ov05_021043c0
.extern func_ov05_0210442c
.extern func_ov05_02104ca4
.extern func_ov05_0210826c
.extern func_ov05_021082e4
.extern func_ov05_0210d3d8
.extern func_ov05_0210d6dc
.extern func_ov05_0210d728
.extern func_ov05_0210d748
.extern func_ov05_0210e288
.extern func_ov05_0210e2a4
.extern func_ov05_0210e344
.extern func_ov08_021130d0
.extern func_ov08_02113150
.extern func_ov08_02113284
.extern func_ov08_02113314
.extern func_ov08_021133bc
.extern func_ov08_02113460
.extern func_ov08_021134b8
.extern func_ov08_021136ec
.extern func_ov09_0211b6e8
.extern func_ov09_0211b6f8
.extern func_ov09_0211b708
.extern func_ov09_0211cc8c
.extern func_ov10_0211e584
.extern func_ov10_0211e5a8
.extern func_ov14_02120ac4
.extern func_ov14_02122e98
.extern func_ov14_021231d4
.extern func_ov14_02123904
.extern func_ov14_02144750
.extern func_ov14_02146634
.extern func_ov14_02151e04
.extern func_ov14_0215207c
.extern func_ov14_021521e4
.extern func_ov14_02152220
.extern func_ov14_02153144
.extern func_ov14_021532a4
.extern func_ov15_0213a524
.extern func_ov15_0214d21c
.extern func_ov15_0214d238
.extern func_ov15_0214d248
.extern func_ov23_02176034
.extern func_ov23_021763c0
.extern func_ov26_0216ebc0
.extern func_ov26_0216ecb8
.extern func_ov26_021767ec
.extern func_ov29_0216d918
.extern gItemManager
.extern gOverlayManager
.extern strcat
.extern strcpy
.extern strncpy
asm/ov00/ov00_020c3e54.s
+35406
View File
File diff suppressed because it is too large Load Diff
asm/ov03.inc
+44 -44
View File
@@ -187,9 +187,6 @@
.extern func_02042b40
.extern func_02042f68
.extern func_0204366c
.extern strcpy
.extern strcat
.extern strcmp
.extern func_0204f558
.extern func_0204f614
.extern func_0204f754
@@ -294,47 +291,47 @@
.extern func_ov00_020a95a4
.extern func_ov00_020bb50c
.extern func_ov00_020bc500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c3004
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020cef40
.extern func_ov00_020cef50
.extern func_ov00_020cefbc
@@ -504,3 +501,6 @@
.extern func_ov52_02196198
.extern gItemManager
.extern gOverlayManager
.extern strcat
.extern strcmp
.extern strcpy
asm/ov03.s
+42 -42
View File
@@ -19788,7 +19788,7 @@ _020fb458: .word data_ov03_02100a8c
func_ov03_020fb45c: ; 0x020fb45c
push {r4, lr}
add r4, r0, #0
blx func_ov00_020c1554
blx _ZN5ActorC2Ev
ldr r0, _020fb494 ; =data_ov03_0210087c
mov r1, #0
str r0, [r4]
@@ -19828,7 +19828,7 @@ func_ov03_020fb49c: ; 0x020fb49c
add r0, r4, r0
bl func_ov00_020a95a4
add r0, r4, #0
blx func_ov00_020c1730
blx _ZN5ActorD2Ev
add r0, r4, #0
pop {r4, pc}
nop
@@ -19848,7 +19848,7 @@ func_ov03_020fb4c0: ; 0x020fb4c0
add r0, r4, r0
bl func_ov00_020a95a4
add r0, r4, #0
blx func_ov00_020c1730
blx _ZN5ActorD2Ev
add r0, r4, #0
blx _ZN9SysObjectdlEPv
add r0, r4, #0
@@ -44865,10 +44865,10 @@ data_ov03_02100884: ; 0x02100884
.word func_ov03_020fb4e8
.global data_ov03_02100888
data_ov03_02100888: ; 0x02100888
.word func_ov00_020c173c
.word _ZN5Actor8vfunc_0cEv
.global data_ov03_0210088c
data_ov03_0210088c: ; 0x0210088c
.word func_ov00_020c1740
.word _ZN5Actor8vfunc_10Ej
.global data_ov03_02100890
data_ov03_02100890: ; 0x02100890
.word func_ov03_020fbb14 - 1
@@ -44877,118 +44877,118 @@ data_ov03_02100894: ; 0x02100894
.word func_ov03_020fbb34 - 1
.global data_ov03_02100898
data_ov03_02100898: ; 0x02100898
.word func_ov00_020c17d4
.word _ZN5Actor8vfunc_1cEt
.global data_ov03_0210089c
data_ov03_0210089c: ; 0x0210089c
.word func_ov03_020fbca8 - 1
.global data_ov03_021008a0
data_ov03_021008a0: ; 0x021008a0
.word func_ov00_020c1744
.word _ZN5Actor8vfunc_24Ev
.global data_ov03_021008a4
data_ov03_021008a4: ; 0x021008a4
.word func_ov00_020c1748
.word _ZN5Actor8vfunc_28Ev
.global data_ov03_021008a8
data_ov03_021008a8: ; 0x021008a8
.word func_ov00_020c17a8
.word _ZN5Actor8vfunc_2cEv
.global data_ov03_021008ac
data_ov03_021008ac: ; 0x021008ac
.word func_ov00_020c17b0
.word _ZN5Actor8vfunc_30Ev
.global data_ov03_021008b0
data_ov03_021008b0: ; 0x021008b0
.word func_ov00_020c174c
.word _ZN5Actor12GetOffsetPosEP5Vec3p
.global data_ov03_021008b4
data_ov03_021008b4: ; 0x021008b4
.word func_ov00_020c177c
.word _ZN5Actor8vfunc_38Ev
.global data_ov03_021008b8
data_ov03_021008b8: ; 0x021008b8
.word func_ov00_020c27e4
.word _ZN5Actor16CollidesWithLinkEv
.global data_ov03_021008bc
data_ov03_021008bc: ; 0x021008bc
.word func_ov00_020c3004
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov03_021008c0
data_ov03_021008c0: ; 0x021008c0
.word func_ov00_020c2744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov03_021008c4
data_ov03_021008c4: ; 0x021008c4
.word func_ov00_020c1c48
.word _ZN5Actor8vfunc_48Ei
.global data_ov03_021008c8
data_ov03_021008c8: ; 0x021008c8
.word func_ov00_020c1c50
.word _ZN5Actor8vfunc_4cEPi
.global data_ov03_021008cc
data_ov03_021008cc: ; 0x021008cc
.word func_ov00_020c310c
.word _ZN5Actor6GetPosEv
.global data_ov03_021008d0
data_ov03_021008d0: ; 0x021008d0
.word func_ov00_020c3114
.word _ZN5Actor8vfunc_54Ev
.global data_ov03_021008d4
data_ov03_021008d4: ; 0x021008d4
.word func_ov00_020c18a8
.word _ZN5Actor10SetUnk_11bEv
.global data_ov03_021008d8
data_ov03_021008d8: ; 0x021008d8
.word func_ov00_020c18c4
.word _ZN5Actor11SetVelocityEP5Vec3p
.global data_ov03_021008dc
data_ov03_021008dc: ; 0x021008dc
.word func_ov00_020c18fc
.word _ZN5Actor8vfunc_60Ev
.global data_ov03_021008e0
data_ov03_021008e0: ; 0x021008e0
.word func_ov00_020c1904
.word _ZN5Actor8vfunc_64Ev
.global data_ov03_021008e4
data_ov03_021008e4: ; 0x021008e4
.word func_ov00_020c1910
.word _ZN5Actor8vfunc_68Ev
.global data_ov03_021008e8
data_ov03_021008e8: ; 0x021008e8
.word func_ov00_020c1914
.word _ZN5Actor8vfunc_6cEv
.global data_ov03_021008ec
data_ov03_021008ec: ; 0x021008ec
.word func_ov00_020c191c
.word _ZN5Actor8vfunc_70Ev
.global data_ov03_021008f0
data_ov03_021008f0: ; 0x021008f0
.word func_ov00_020c1924
.word _ZN5Actor8vfunc_74Ev
.global data_ov03_021008f4
data_ov03_021008f4: ; 0x021008f4
.word func_ov00_020c192c
.word _ZN5Actor8vfunc_78Ev
.global data_ov03_021008f8
data_ov03_021008f8: ; 0x021008f8
.word func_ov00_020c1928
.word _ZN5Actor8vfunc_7cEv
.global data_ov03_021008fc
data_ov03_021008fc: ; 0x021008fc
.word func_ov00_020c1934
.word _ZN5Actor8vfunc_80Ev
.global data_ov03_02100900
data_ov03_02100900: ; 0x02100900
.word func_ov00_020c1938
.word _ZN5Actor8vfunc_84Ev
.global data_ov03_02100904
data_ov03_02100904: ; 0x02100904
.word func_ov00_020c193c
.word _ZN5Actor8vfunc_88Ev
.global data_ov03_02100908
data_ov03_02100908: ; 0x02100908
.word func_ov00_020c1940
.word _ZN5Actor8vfunc_8cEv
.global data_ov03_0210090c
data_ov03_0210090c: ; 0x0210090c
.word func_ov00_020c1948
.word _ZN5Actor8vfunc_90Ev
.global data_ov03_02100910
data_ov03_02100910: ; 0x02100910
.word func_ov00_020c1950
.word _ZN5Actor8vfunc_94Ev
.global data_ov03_02100914
data_ov03_02100914: ; 0x02100914
.word func_ov00_020c1954
.word _ZN5Actor8vfunc_98Ev
.global data_ov03_02100918
data_ov03_02100918: ; 0x02100918
.word func_ov00_020c1958
.word _ZN5Actor8vfunc_9cEv
.global data_ov03_0210091c
data_ov03_0210091c: ; 0x0210091c
.word func_ov00_020c1b6c
.word _ZN5Actor15TrySetTransformEP9Transform
.global data_ov03_02100920
data_ov03_02100920: ; 0x02100920
.word func_ov00_020c1bb4
.word _ZN5Actor12SetTransformEP9Transform
.global data_ov03_02100924
data_ov03_02100924: ; 0x02100924
.word func_ov00_020c1bf8
.word _ZN5Actor8vfunc_a8Ev
.global data_ov03_02100928
data_ov03_02100928: ; 0x02100928
.word func_ov00_020c31fc
.word _ZN5Actor8vfunc_acEv
.global data_ov03_0210092c
data_ov03_0210092c: ; 0x0210092c
.word func_ov00_020c322c
.word _ZN5Actor8vfunc_b0Ev
.global data_ov03_02100930
data_ov03_02100930: ; 0x02100930
.ascii "/Menu/Tex2D/minigame.bin"
asm/ov04.inc
+10 -10
View File
@@ -5,11 +5,18 @@
.extern _ZN11ItemManager4LoadEPK15SaveItemManager
.extern _ZN11ItemManager6CreateEv
.extern _ZN11ItemManager7DestroyEv
.extern _ZN12ActorManager11DeleteActorEjb
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12TouchControlC2Ev
.extern _ZN12TouchGestureC2Ev
.extern _ZN13PlayerControl18func_ov00_020aef30Ev
.extern _ZN14OverlayManager4LoadEjj
.extern _ZN14OverlayManager6UnloadEj
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager18func_ov00_020ad538Ei
@@ -351,9 +358,6 @@
.extern func_02043594
.extern func_020435b4
.extern func_02043600
.extern strlen
.extern strcpy
.extern strcat
.extern func_0204dd9c
.extern func_0204f558
.extern func_0204f614
@@ -575,16 +579,9 @@
.extern func_ov00_020c0c9c
.extern func_ov00_020c0e5c
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c3348
.extern func_ov00_020c3388
.extern func_ov00_020c33b0
.extern func_ov00_020c33d4
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c3894
.extern func_ov00_020c3f9c
.extern func_ov00_020c3fd4
.extern func_ov00_020c4014
@@ -718,3 +715,6 @@
.extern gItemManager
.extern gOverlayManager
.extern gPlayerAnimHandler
.extern strcat
.extern strcpy
.extern strlen
asm/ov04.s
+16 -16
View File
@@ -3442,7 +3442,7 @@ _02102578:
ldr r2, _021025d4 ; =0x414e4353
ldr r1, [r1]
add r0, sp, #8
blx func_ov00_020c3894
blx _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
mov r0, #0
ldr r1, [sp, #8]
mvn r0, r0
@@ -3451,7 +3451,7 @@ _02102578:
ldr r0, _021025c0 ; =data_027e0fe4
add r1, sp, #8
ldr r0, [r0]
blx func_ov00_020c3674
blx _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
beq _021025ac
blx func_ov18_0215dec0
@@ -9198,7 +9198,7 @@ _021053ec:
add r0, r5, #0
add r1, r4, #0
add r2, r7, #0
blx func_ov00_020c33d4
blx _ZN12ActorManager11DeleteActorEjb
_021053fc:
ldrh r0, [r5]
add r4, r4, #1
@@ -9534,7 +9534,7 @@ _02105668:
add r0, r6, #0
add r1, r4, #0
mov r2, #0
blx func_ov00_020c33d4
blx _ZN12ActorManager11DeleteActorEjb
_02105692:
ldrh r0, [r6]
add r4, r4, #1
@@ -14004,7 +14004,7 @@ _0210775c:
add r1, r0, #0
ldr r0, _02107804 ; =data_027e0fe4
ldr r0, [r0]
blx func_ov00_020c35d8
blx _ZN12ActorManager13FindActorByIdEj
str r0, [r4, #0x14]
mov r0, #0
str r0, [sp]
@@ -14017,7 +14017,7 @@ _0210775c:
add r1, r0, #0
ldr r0, _02107804 ; =data_027e0fe4
ldr r0, [r0]
blx func_ov00_020c35d8
blx _ZN12ActorManager13FindActorByIdEj
str r0, [r4, #0x18]
mov r0, #0
str r0, [sp]
@@ -14030,7 +14030,7 @@ _0210775c:
add r1, r0, #0
ldr r0, _02107804 ; =data_027e0fe4
ldr r0, [r0]
blx func_ov00_020c35d8
blx _ZN12ActorManager13FindActorByIdEj
str r0, [r4, #0x1c]
_021077ee:
add sp, #0x30
@@ -14050,7 +14050,7 @@ _0210780c: .word 0x57534e56
func_ov04_02107810: ; 0x02107810
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
blx func_ov00_020c1554
blx _ZN5ActorC2Ev
ldr r0, _021078f4 ; =data_ov00_020e67e4
mov r1, #0
str r0, [r5]
@@ -14187,7 +14187,7 @@ func_ov04_0210790c: ; 0x0210790c
add r0, r4, r0
bl func_ov00_020a95ec
add r0, r4, #0
blx func_ov00_020c1730
blx _ZN5ActorD2Ev
add r0, r4, #0
pop {r4, pc}
.align 2, 0
@@ -14219,7 +14219,7 @@ func_ov04_0210794c: ; 0x0210794c
add r0, r4, r0
bl func_ov00_020a95ec
add r0, r4, #0
blx func_ov00_020c1730
blx _ZN5ActorD2Ev
add r0, r4, #0
blx _ZN9SysObjectdlEPv
add r0, r4, #0
@@ -14253,7 +14253,7 @@ func_ov04_02107994: ; 0x02107994
add r0, r4, r0
bl func_ov00_020a95ec
add r0, r4, #0
blx func_ov00_020c1730
blx _ZN5ActorD2Ev
add r0, r4, #0
pop {r4, pc}
.align 2, 0
@@ -23396,7 +23396,7 @@ _0210c000:
ldr r2, _0210c0f8 ; =0x524d5447
ldr r1, [r1]
add r0, sp, #0x10
blx func_ov00_020c3894
blx _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
mov r0, #0
ldr r1, [sp, #0x10]
mvn r0, r0
@@ -23410,7 +23410,7 @@ _0210c000:
ldr r0, _0210c0f4 ; =data_027e0fe4
add r1, sp, #0x10
ldr r0, [r0]
blx func_ov00_020c3674
blx _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
beq _0210c054
ldr r1, _0210c0fc ; =0x000001b6
@@ -23447,7 +23447,7 @@ _0210c062:
ldr r2, _0210c104 ; =0x524d4654
ldr r1, [r1]
add r0, sp, #8
blx func_ov00_020c3894
blx _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
mov r0, #0
ldr r1, [sp, #8]
mvn r0, r0
@@ -23486,7 +23486,7 @@ _0210c092:
str r0, [sp, #0x20]
ldr r0, _0210c0f4 ; =data_027e0fe4
ldr r0, [r0]
blx func_ov00_020c37ec
blx _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
cmp r0, #0
ble _0210c0c2
mov r0, #0
@@ -23496,7 +23496,7 @@ _0210c0c2:
ldr r2, _0210c114 ; =0x574c4354
ldr r1, [r1]
add r0, sp, #0
blx func_ov00_020c3894
blx _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
mov r0, #0
ldr r1, [sp]
mvn r0, r0
asm/ov05.inc
+10 -10
View File
@@ -102,6 +102,9 @@
.extern _ZN15LinkStateDamage18func_ov00_020ac9e4Ei
.extern _ZN15LinkStateDamage18func_ov00_020acb6cEP5Vec3pi
.extern _ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi
.extern _ZN15LinkStateFollow16MoveTowardTargetEv
.extern _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p
.extern _ZN15LinkStateFollow18func_ov00_020a9210EP5Vec3pP5Actor
.extern _ZN17LinkStateInteract18func_ov00_020aa818Ev
.extern _ZN17LinkStateInteract18func_ov00_020aa844EP5Actor
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
@@ -295,8 +298,6 @@
.extern func_020385d0
.extern func_0203fab0
.extern func_020435b4
.extern strcpy
.extern strcmp
.extern func_0204f614
.extern func_0204f754
.extern func_ov00_02078b40
@@ -393,9 +394,6 @@
.extern func_ov00_020a4e30
.extern func_ov00_020a4f38
.extern func_ov00_020a5e9c
.extern _ZN15LinkStateFollow16MoveTowardTargetEv
.extern _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p
.extern _ZN15LinkStateFollow18func_ov00_020a9210EP5Vec3pP5Actor
.extern func_ov00_020a9588
.extern func_ov00_020a95a4
.extern func_ov00_020a990c
@@ -442,11 +440,11 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c2a0c
.extern func_ov00_020c33d4
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN12ActorManager11DeleteActorEjb
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern func_ov00_020c3eb0
.extern func_ov00_020ce2f0
.extern func_ov00_020ce8e4
@@ -580,3 +578,5 @@
.extern func_ov59_021990a4
.extern gItemManager
.extern gOverlayManager
.extern strcmp
.extern strcpy
asm/ov05.s
+11 -11
View File
@@ -5512,7 +5512,7 @@ _021052a4:
mov r0, r6
mov r1, r4
mov r2, r7
bl func_ov00_020c33d4
bl _ZN12ActorManager11DeleteActorEjb
_021052cc:
ldrh r0, [r6]
add r4, r4, #1
@@ -8189,7 +8189,7 @@ _02107664:
mov r2, #0
ldr r0, [r0]
add r1, sp, #8
bl func_ov00_020c37ec
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
cmp r0, #0
ble _021077e8
bl func_ov05_02107870
@@ -8503,7 +8503,7 @@ _02107bf4:
beq _02107c68
ldr r0, [r6]
mov r1, sb
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r7, r0
beq _02107c68
ldr r1, [r7, #4]
@@ -8798,7 +8798,7 @@ _02107ff0:
beq _02108060
ldr r0, [r4]
mov r1, r8
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r7, r0
beq _02108054
ldr r1, [r7, #4]
@@ -12020,7 +12020,7 @@ func_ov05_0210ab1c: ; 0x0210ab1c
strb r2, [r0, #0xba]
ldr r0, [r1]
add r1, r6, #0x10
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r5, r0
mov r0, r6
mov r1, #0
@@ -12188,7 +12188,7 @@ func_ov05_0210ad88: ; 0x0210ad88
strb r2, [r0, #0xbc]
ldr r0, [r1]
add r1, r5, #0x10
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r4, r0
beq _0210ade0
ldr r0, _0210b284 ; =data_027e0f74
@@ -12535,7 +12535,7 @@ func_ov05_0210b2a4: ; 0x0210b2a4
strb r2, [r0, #0xbc]
ldr r0, [r1]
add r1, r5, #0x10
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r4, r0
bne _0210b2fc
mov r0, r5
@@ -12668,7 +12668,7 @@ _0210b484:
ldr r0, _0210b4f0 ; =data_027e0fe4
add r1, r6, #0x10
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r2, r0
addeq sp, sp, #0xc
ldmeqia sp!, {r3, r4, r5, r6, pc}
@@ -12705,7 +12705,7 @@ func_ov05_0210b4f4: ; 0x0210b4f4
mov r5, r0
add r1, sp, #0
mov r0, r2
bl func_ov00_020c2a0c
bl _ZN5Actor9GetHitboxEP8Cylinder
ldr r1, [sp, #4]
mov r0, r5
str r1, [r4, #4]
@@ -13075,7 +13075,7 @@ func_ov05_0210b9c4: ; 0x0210b9c4
bl func_ov00_0208583c
mov r1, r0
mov r0, r5
bl func_ov00_020c35d8
bl _ZN12ActorManager13FindActorByIdEj
movs r5, r0
mov r0, r4
beq _0210ba7c
@@ -19893,7 +19893,7 @@ _02111744:
strh r2, [sp, #0x3c]
ldr r0, [r0]
mov r2, #0
bl func_ov00_020c37ec
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
cmp r0, #0
ble _02111868
ldr r0, [sp, #0x2c]
asm/ov09.inc
+3 -3
View File
@@ -183,8 +183,6 @@
.extern func_02043594
.extern func_020435b4
.extern func_02043600
.extern strcat
.extern strcmp
.extern func_0204dd9c
.extern func_0204f614
.extern func_0204f754
@@ -276,7 +274,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c3dd0
.extern _ZN12ActorManager14Actor_vfunc_28Ev
.extern func_ov00_020cef40
.extern func_ov00_020cf270
.extern func_ov00_020cf330
@@ -455,3 +453,5 @@
.extern func_ov29_0216dcf4
.extern gItemManager
.extern gOverlayManager
.extern strcat
.extern strcmp
asm/ov09.s
+1 -1
View File
@@ -3203,7 +3203,7 @@ func_ov09_02114554: ; 0x02114554
ldr r0, _021146a8 ; =data_027e0fe4
str r1, [sp, #4]
ldr r0, [r0]
blx func_ov00_020c3dd0
blx _ZN12ActorManager14Actor_vfunc_28Ev
mov r0, #0
str r0, [sp, #8]
ldr r0, _021146ac ; =data_027e0e60
asm/ov11.inc
+3 -3
View File
@@ -188,9 +188,6 @@
.extern func_02043594
.extern func_02043600
.extern func_0204366c
.extern strlen
.extern strcpy
.extern strncpy
.extern func_0204902c
.extern func_0204afd0
.extern func_ov00_02077af8
@@ -268,3 +265,6 @@
.extern func_ov61_02160b50
.extern func_ov61_02160ba8
.extern func_ov61_02160c24
.extern strcpy
.extern strlen
.extern strncpy
asm/ov12.inc
+58 -58
View File
@@ -9,10 +9,67 @@
.extern _ZN11ItemManager18EquipItem_vfunc_38Ei
.extern _ZN11ItemManager19GetDungeonItemModelEj
.extern _ZN11ItemManager22UpdateSwordShieldInUseEv
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase19PlayerBase_vfunc_38EP5Vec3p
.extern _ZN13LinkStateBase23PlayerLinkBase_vfunc_74Ev
.extern _ZN14OverlayManager15LoadIfNotLoadedEjj
.extern _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c2988EP5Vec3piS1_
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager18func_ov00_020ad594Ei
@@ -240,7 +297,6 @@
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0203f904
.extern strncpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -481,64 +537,7 @@
.extern func_ov00_020c1424
.extern func_ov00_020c1450
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1f5c
.extern func_ov00_020c22b8
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c288c
.extern func_ov00_020c2938
.extern func_ov00_020c2988
.extern func_ov00_020c2a0c
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c5288
@@ -762,3 +761,4 @@
.extern gItemManager
.extern gOverlayManager
.extern gPlayerAnimHandler
.extern strncpy
asm/ov12.s
+275 -275
View File
File diff suppressed because it is too large Load Diff
asm/ov14/Actor/ActorRupee.inc
+49 -49
View File
@@ -1,5 +1,54 @@
#pragma once
.extern _ZN11ItemManager10GiveRupeesEjj
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12KillInBoundsEv
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_ov00_020c2c0cEv
.extern _ZN5Actor18func_ov00_020c2c70Ev
.extern _ZN5Actor18func_ov00_020c2d54Ev
.extern _ZN5Actor18func_ov00_020c2de4Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_027e0764
@@ -18,55 +67,6 @@
.extern func_ov00_0207a1c8
.extern func_ov00_02083fb0
.extern func_ov00_020bce48
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c22b8
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c2bf4
.extern func_ov00_020c2c0c
.extern func_ov00_020c2c70
.extern func_ov00_020c2d54
.extern func_ov00_020c2de4
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31a0
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern func_ov00_020c5a24
.extern func_ov00_020d7ad4
.extern func_ov05_02102c2c
asm/ov14/Actor/ActorRupee.s
+55 -55
View File
@@ -25,7 +25,7 @@ _0213ae94: .word data_027e0fe0
_ZN10ActorRupeeC2Ev: ; 0x0213ae98
stmdb sp!, {r4, lr}
mov r4, r0
bl func_ov00_020c1554
bl _ZN5ActorC2Ev
ldr r1, _0213aec8 ; =_ZTV10ActorRupee
mov r0, #8
str r1, [r4]
@@ -217,7 +217,7 @@ _ZN10ActorRupee8vfunc_64Ev: ; 0x0213b11c
_ZN10ActorRupee4MoveEv: ; 0x0213b120
stmdb sp!, {r4, lr}
mov r4, r0
bl func_ov00_020c3070
bl _ZN5Actor12ApplyGravityEv
add r0, r4, #0x48
add r1, r4, #0x60
mov r2, r0
@@ -331,7 +331,7 @@ _ZN10ActorRupee6UpdateEb: ; 0x0213b254
str r1, [r5, #0x58]
ldr r1, [r5, #0x50]
str r1, [r5, #0x5c]
bl func_ov00_020c2bf4
bl _ZN5Actor20IncreaseActiveFramesEv
ldr r0, [r5, #0x130]
cmp r0, #3
beq _0213b358
@@ -344,7 +344,7 @@ _ZN10ActorRupee6UpdateEb: ; 0x0213b254
blo _0213b358
mov r0, r5
mov r1, #0x1b
bl func_ov00_020c22b8
bl _ZN5Actor18CollidesWithPlayerEj
cmp r0, #0
beq _0213b358
mov r0, r5
@@ -357,7 +357,7 @@ _ZN10ActorRupee6UpdateEb: ; 0x0213b254
cmp r0, #0
mov r0, r5
beq _0213b2ec
bl func_ov00_020c3180
bl _ZN5Actor4KillEv
b _0213b358
_0213b2ec:
mov r1, #3
@@ -390,7 +390,7 @@ _0213b348:
ldr r0, _0213b514 ; =data_ov00_020eec9c
bl func_ov00_020d7ad4
mov r0, r5
bl func_ov00_020c3180
bl _ZN5Actor4KillEv
_0213b358:
ldr r0, [r5, #0x130]
cmp r0, #0
@@ -398,7 +398,7 @@ _0213b358:
cmpne r0, #2
bne _0213b3a4
mov r0, r5
bl func_ov00_020c2c0c
bl _ZN5Actor18func_ov00_020c2c0cEv
cmp r0, #0
mov r0, r5
beq _0213b38c
@@ -406,7 +406,7 @@ _0213b358:
bl _ZN10ActorRupee18func_ov14_0213b204Ei
b _0213b3a4
_0213b38c:
bl func_ov00_020c2d54
bl _ZN5Actor18func_ov00_020c2d54Ev
cmp r0, #0
beq _0213b3a4
mov r0, r5
@@ -447,7 +447,7 @@ _0213b3cc:
cmp r0, #2
mov r0, r5
bne _0213b42c
bl func_ov00_020c3180
bl _ZN5Actor4KillEv
b _0213b4fc
_0213b42c:
mov r1, #1
@@ -464,7 +464,7 @@ _0213b438:
cmp r0, #0
beq _0213b4fc
mov r0, r5
bl func_ov00_020c3180
bl _ZN5Actor4KillEv
b _0213b4fc
_0213b468:
cmp r4, #0
@@ -488,11 +488,11 @@ _0213b49c:
cmp r0, #0x3c
blt _0213b4fc
mov r0, r5
bl func_ov00_020c3180
bl _ZN5Actor4KillEv
b _0213b4fc
_0213b4c0:
mov r0, r5
bl func_ov00_020c2c70
bl _ZN5Actor18func_ov00_020c2c70Ev
cmp r0, #0
bne _0213b4fc
mov r0, r5
@@ -501,7 +501,7 @@ _0213b4c0:
b _0213b4fc
_0213b4e0:
mov r0, r5
bl func_ov00_020c2de4
bl _ZN5Actor18func_ov00_020c2de4Ev
cmp r0, #0
bne _0213b4fc
mov r0, r5
@@ -509,7 +509,7 @@ _0213b4e0:
bl _ZN10ActorRupee18func_ov14_0213b204Ei
_0213b4fc:
mov r0, r5
bl func_ov00_020c31a0
bl _ZN5Actor12KillInBoundsEv
add sp, sp, #0x10
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
@@ -525,7 +525,7 @@ _ZN10ActorRupee8vfunc_14Ej: ; 0x0213b51c
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _0213b540
mov r0, r5
@@ -545,7 +545,7 @@ _ZN10ActorRupee8vfunc_18Ej: ; 0x0213b554
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _0213b578
mov r0, r5
@@ -702,7 +702,7 @@ _0213b740:
_ZN10ActorRupeeD0Ev: ; 0x0213b748
stmdb sp!, {r4, lr}
mov r4, r0
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
bl _ZN9SysObjectdlEPv
mov r0, r4
@@ -714,7 +714,7 @@ _ZN10ActorRupeeD0Ev: ; 0x0213b748
_ZN10ActorRupeeD2Ev: ; 0x0213b764
stmdb sp!, {r4, lr}
mov r4, r0
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
ldmia sp!, {r4, pc}
arm_func_end _ZN10ActorRupeeD2Ev
@@ -842,10 +842,10 @@ data_ov14_021589ec: ; 0x021589ec
.word _ZN10ActorRupee8vfunc_08Ev
.global data_ov14_021589f0
data_ov14_021589f0: ; 0x021589f0
.word func_ov00_020c173c
.word _ZN5Actor8vfunc_0cEv
.global data_ov14_021589f4
data_ov14_021589f4: ; 0x021589f4
.word func_ov00_020c1740
.word _ZN5Actor8vfunc_10Ej
.global data_ov14_021589f8
data_ov14_021589f8: ; 0x021589f8
.word _ZN10ActorRupee8vfunc_14Ej
@@ -854,55 +854,55 @@ data_ov14_021589fc: ; 0x021589fc
.word _ZN10ActorRupee8vfunc_18Ej
.global data_ov14_02158a00
data_ov14_02158a00: ; 0x02158a00
.word func_ov00_020c17d4
.word _ZN5Actor8vfunc_1cEt
.global data_ov14_02158a04
data_ov14_02158a04: ; 0x02158a04
.word _ZN10ActorRupee8vfunc_20Ei
.global data_ov14_02158a08
data_ov14_02158a08: ; 0x02158a08
.word func_ov00_020c1744
.word _ZN5Actor8vfunc_24Ev
.global data_ov14_02158a0c
data_ov14_02158a0c: ; 0x02158a0c
.word func_ov00_020c1748
.word _ZN5Actor8vfunc_28Ev
.global data_ov14_02158a10
data_ov14_02158a10: ; 0x02158a10
.word func_ov00_020c17a8
.word _ZN5Actor8vfunc_2cEv
.global data_ov14_02158a14
data_ov14_02158a14: ; 0x02158a14
.word func_ov00_020c17b0
.word _ZN5Actor8vfunc_30Ev
.global data_ov14_02158a18
data_ov14_02158a18: ; 0x02158a18
.word func_ov00_020c174c
.word _ZN5Actor12GetOffsetPosEP5Vec3p
.global data_ov14_02158a1c
data_ov14_02158a1c: ; 0x02158a1c
.word func_ov00_020c177c
.word _ZN5Actor8vfunc_38Ev
.global data_ov14_02158a20
data_ov14_02158a20: ; 0x02158a20
.word func_ov00_020c27e4
.word _ZN5Actor16CollidesWithLinkEv
.global data_ov14_02158a24
data_ov14_02158a24: ; 0x02158a24
.word func_ov00_020c3004
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov14_02158a28
data_ov14_02158a28: ; 0x02158a28
.word func_ov00_020c2744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov14_02158a2c
data_ov14_02158a2c: ; 0x02158a2c
.word func_ov00_020c1c48
.word _ZN5Actor8vfunc_48Ei
.global data_ov14_02158a30
data_ov14_02158a30: ; 0x02158a30
.word func_ov00_020c1c50
.word _ZN5Actor8vfunc_4cEPi
.global data_ov14_02158a34
data_ov14_02158a34: ; 0x02158a34
.word func_ov00_020c310c
.word _ZN5Actor6GetPosEv
.global data_ov14_02158a38
data_ov14_02158a38: ; 0x02158a38
.word func_ov00_020c3114
.word _ZN5Actor8vfunc_54Ev
.global data_ov14_02158a3c
data_ov14_02158a3c: ; 0x02158a3c
.word func_ov00_020c18a8
.word _ZN5Actor10SetUnk_11bEv
.global data_ov14_02158a40
data_ov14_02158a40: ; 0x02158a40
.word func_ov00_020c18c4
.word _ZN5Actor11SetVelocityEP5Vec3p
.global data_ov14_02158a44
data_ov14_02158a44: ; 0x02158a44
.word _ZN10ActorRupee8vfunc_60Ev
@@ -911,61 +911,61 @@ data_ov14_02158a48: ; 0x02158a48
.word _ZN10ActorRupee8vfunc_64Ev
.global data_ov14_02158a4c
data_ov14_02158a4c: ; 0x02158a4c
.word func_ov00_020c1910
.word _ZN5Actor8vfunc_68Ev
.global data_ov14_02158a50
data_ov14_02158a50: ; 0x02158a50
.word func_ov00_020c1914
.word _ZN5Actor8vfunc_6cEv
.global data_ov14_02158a54
data_ov14_02158a54: ; 0x02158a54
.word func_ov00_020c191c
.word _ZN5Actor8vfunc_70Ev
.global data_ov14_02158a58
data_ov14_02158a58: ; 0x02158a58
.word func_ov00_020c1924
.word _ZN5Actor8vfunc_74Ev
.global data_ov14_02158a5c
data_ov14_02158a5c: ; 0x02158a5c
.word func_ov00_020c192c
.word _ZN5Actor8vfunc_78Ev
.global data_ov14_02158a60
data_ov14_02158a60: ; 0x02158a60
.word func_ov00_020c1928
.word _ZN5Actor8vfunc_7cEv
.global data_ov14_02158a64
data_ov14_02158a64: ; 0x02158a64
.word func_ov00_020c1934
.word _ZN5Actor8vfunc_80Ev
.global data_ov14_02158a68
data_ov14_02158a68: ; 0x02158a68
.word func_ov00_020c1938
.word _ZN5Actor8vfunc_84Ev
.global data_ov14_02158a6c
data_ov14_02158a6c: ; 0x02158a6c
.word func_ov00_020c193c
.word _ZN5Actor8vfunc_88Ev
.global data_ov14_02158a70
data_ov14_02158a70: ; 0x02158a70
.word func_ov00_020c1940
.word _ZN5Actor8vfunc_8cEv
.global data_ov14_02158a74
data_ov14_02158a74: ; 0x02158a74
.word func_ov00_020c1948
.word _ZN5Actor8vfunc_90Ev
.global data_ov14_02158a78
data_ov14_02158a78: ; 0x02158a78
.word func_ov00_020c1950
.word _ZN5Actor8vfunc_94Ev
.global data_ov14_02158a7c
data_ov14_02158a7c: ; 0x02158a7c
.word func_ov00_020c1954
.word _ZN5Actor8vfunc_98Ev
.global data_ov14_02158a80
data_ov14_02158a80: ; 0x02158a80
.word func_ov00_020c1958
.word _ZN5Actor8vfunc_9cEv
.global data_ov14_02158a84
data_ov14_02158a84: ; 0x02158a84
.word func_ov00_020c1b6c
.word _ZN5Actor15TrySetTransformEP9Transform
.global data_ov14_02158a88
data_ov14_02158a88: ; 0x02158a88
.word func_ov00_020c1bb4
.word _ZN5Actor12SetTransformEP9Transform
.global data_ov14_02158a8c
data_ov14_02158a8c: ; 0x02158a8c
.word func_ov00_020c1bf8
.word _ZN5Actor8vfunc_a8Ev
.global data_ov14_02158a90
data_ov14_02158a90: ; 0x02158a90
.word func_ov00_020c31fc
.word _ZN5Actor8vfunc_acEv
.global data_ov14_02158a94
data_ov14_02158a94: ; 0x02158a94
.word func_ov00_020c322c
.word _ZN5Actor8vfunc_b0Ev
.bss
.global _ZN10ActorRupee9gResourceE
asm/ov14/ov14_0211f640.inc
+78 -78
View File
@@ -6,7 +6,84 @@
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN11ItemManager8GiveAmmoEit
.extern _ZN11ItemManager8GiveKeysEj
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl13IsNotTouchingEv
.extern _ZN5Actor10GetUnk_08cEP8Cylinder
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_129Eb
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12KillInBoundsEv
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1788Ev
.extern _ZN5Actor18func_ov00_020c195cEv
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c2c0cEv
.extern _ZN5Actor18func_ov00_020c2c70Ev
.extern _ZN5Actor18func_ov00_020c2d54Ev
.extern _ZN5Actor18func_ov00_020c2de4Ev
.extern _ZN5Actor18func_ov00_020c2ed4Ev
.extern _ZN5Actor18func_ov00_020c3118Es
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor9IsGrabbedEv
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager15GetEquippedItemEv
@@ -141,7 +218,6 @@
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0204366c
.extern strcmp
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -353,84 +429,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c1734
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c1788
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17b8
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c1898
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c195c
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c20
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1cf8
.extern func_ov00_020c1e2c
.extern func_ov00_020c1f5c
.extern func_ov00_020c1fc8
.extern func_ov00_020c22b8
.extern func_ov00_020c23c4
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c2864
.extern func_ov00_020c28ec
.extern func_ov00_020c2a0c
.extern func_ov00_020c2b00
.extern func_ov00_020c2bf4
.extern func_ov00_020c2c0c
.extern func_ov00_020c2c70
.extern func_ov00_020c2d54
.extern func_ov00_020c2de4
.extern func_ov00_020c2ed4
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c3118
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31a0
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c38fc
.extern func_ov00_020c3b2c
.extern func_ov00_020c3bb0
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c7764
@@ -519,3 +518,4 @@
.extern func_ov58_0219ab28
.extern gItemManager
.extern gOverlayManager
.extern strcmp
asm/ov14/ov14_0211f640.s
+1189 -1189
View File
File diff suppressed because it is too large Load Diff
asm/ov14/ov14_0213b778.inc
+65 -65
View File
@@ -88,7 +88,7 @@
.extern data_ov00_020e2e3c
.extern data_ov00_020e2f04
.extern data_ov00_020e5684
.extern data_ov00_020e72f0
.extern _ZTV11FilterActor
.extern data_ov00_020e899c
.extern data_ov00_020e8b08
.extern data_ov00_020e9360
@@ -220,8 +220,6 @@
.extern func_0203eb0c
.extern func_0203eba8
.extern func_0203ebc8
.extern strncpy
.extern strcat
.extern func_0204f558
.extern func_0204f614
.extern func_0204f754
@@ -490,69 +488,69 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17b8
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c20
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1cf8
.extern func_ov00_020c23c4
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c28ec
.extern func_ov00_020c2a0c
.extern func_ov00_020c2b00
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c3094
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor10GetUnk_08cEP8Cylinder
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor18func_ov00_020c3094Ev
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c3894
.extern func_ov00_020c3b2c
.extern func_ov00_020c3bb0
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -856,3 +854,5 @@
.extern gItemManager
.extern gOverlayManager
.extern gPlayerAnimHandler
.extern strcat
.extern strncpy
asm/ov14/ov14_0213b778.s
+556 -556
View File
File diff suppressed because it is too large Load Diff
asm/ov15.inc
+74 -74
View File
@@ -111,7 +111,7 @@
.extern data_ov00_020e2f04
.extern data_ov00_020e2f68
.extern data_ov00_020e5868
.extern data_ov00_020e72f0
.extern _ZTV11FilterActor
.extern data_ov00_020e83cc
.extern data_ov00_020e899c
.extern data_ov00_020e9360
@@ -304,8 +304,6 @@
.extern func_02043594
.extern func_020435b4
.extern func_02043600
.extern strncpy
.extern strcat
.extern func_0204dd9c
.extern func_0204f614
.extern func_0204f754
@@ -574,78 +572,78 @@
.extern func_ov00_020c0e24
.extern func_ov00_020c0e5c
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c1734
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17b8
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c198c
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c20
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1cf8
.extern func_ov00_020c1d58
.extern func_ov00_020c1e2c
.extern func_ov00_020c22b8
.extern func_ov00_020c23c4
.extern func_ov00_020c23d4
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c288c
.extern func_ov00_020c28d4
.extern func_ov00_020c28ec
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c2a0c
.extern func_ov00_020c2bf4
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1d58Ev
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c23d4EP8ActorRefPS_P8Cylinder
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c3484
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c3894
.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -911,3 +909,5 @@
.extern func_ov09_0211d668
.extern func_ov09_0211d794
.extern gItemManager
.extern strcat
.extern strncpy
asm/ov15.s
+2754 -2754
View File
File diff suppressed because it is too large Load Diff
asm/ov17.inc
+63 -63
View File
@@ -304,70 +304,70 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c1734
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c198c
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c20
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c22b8
.extern func_ov00_020c23c4
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c2bf4
.extern func_ov00_020c2c0c
.extern func_ov00_020c2c70
.extern func_ov00_020c2d54
.extern func_ov00_020c2de4
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3158
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor18func_ov00_020c2c0cEv
.extern _ZN5Actor18func_ov00_020c2c70Ev
.extern _ZN5Actor18func_ov00_020c2d54Ev
.extern _ZN5Actor18func_ov00_020c2de4Ev
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c3158Ev
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c38fc
.extern func_ov00_020c3b2c
.extern func_ov00_020c3bb0
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager18func_ov00_020c3bb0EiPi
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c4ae8
asm/ov17.s
+274 -274
View File
File diff suppressed because it is too large Load Diff
asm/ov18.inc
+56 -56
View File
@@ -317,63 +317,63 @@
.extern func_ov00_020c0e24
.extern func_ov00_020c0e5c
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1cf8
.extern func_ov00_020c1fc8
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c28ec
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c3004
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c38fc
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
asm/ov18.s
+212 -212
View File
File diff suppressed because it is too large Load Diff
asm/ov19.inc
+69 -69
View File
@@ -4,6 +4,10 @@
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN11ItemManager7AddItemEi
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase15ChangeLinkStateEi
@@ -15,8 +19,72 @@
.extern _ZN13PlayerControl14IsTouchingFastEv
.extern _ZN13PlayerControl18func_ov00_020aeef8Ev
.extern _ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c23d4EP8ActorRefPS_P8Cylinder
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c31c0Ei
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor20KillPickupItemActorsEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZTV11FilterActor
.extern data_02050f54
.extern data_02051254
.extern data_027e0764
@@ -49,7 +117,6 @@
.extern data_ov00_020e2dd8
.extern data_ov00_020e2e3c
.extern data_ov00_020e2f04
.extern data_ov00_020e72f0
.extern data_ov00_020e9360
.extern data_ov00_020e9370
.extern data_ov00_020ec9d4
@@ -96,7 +163,6 @@
.extern func_0203eba8
.extern func_0203ebc8
.extern func_02042f74
.extern strncpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -219,74 +285,7 @@
.extern func_ov00_020c0d4c
.extern func_ov00_020c0e04
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c1734
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b18
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c20
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1cf8
.extern func_ov00_020c1e2c
.extern func_ov00_020c23c4
.extern func_ov00_020c23d4
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c288c
.extern func_ov00_020c28ec
.extern func_ov00_020c2974
.extern func_ov00_020c29d8
.extern func_ov00_020c29ec
.extern func_ov00_020c2a0c
.extern func_ov00_020c2bf4
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31c0
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c38fc
.extern func_ov00_020c3b2c
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c50d4
@@ -371,3 +370,4 @@
.extern func_ov17_02168660
.extern func_ov17_021687f0
.extern gItemManager
.extern strncpy
asm/ov19.s
+307 -307
View File
File diff suppressed because it is too large Load Diff
asm/ov20.inc
+70 -70
View File
@@ -83,7 +83,6 @@
.extern func_0203eba8
.extern func_0203ebc8
.extern func_02042f68
.extern strncpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -198,76 +197,76 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17b8
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b18
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c20
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1e2c
.extern func_ov00_020c1ef8
.extern func_ov00_020c2238
.extern func_ov00_020c23c4
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c288c
.extern func_ov00_020c28d4
.extern func_ov00_020c28ec
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c2a0c
.extern func_ov00_020c2bf4
.extern func_ov00_020c2c0c
.extern func_ov00_020c2c70
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31a0
.extern func_ov00_020c31c0
.extern func_ov00_020c31fc
.extern func_ov00_020c3200
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor20KillPickupItemActorsEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18CollidesWithShieldEP8Cylinder
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor18func_ov00_020c2c0cEv
.extern _ZN5Actor18func_ov00_020c2c70Ev
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor12KillInBoundsEv
.extern _ZN5Actor18func_ov00_020c31c0Ei
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c3894
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c50fc
@@ -427,3 +426,4 @@
.extern func_ov17_02168660
.extern func_ov17_021687f0
.extern gItemManager
.extern strncpy
asm/ov20.s
+629 -629
View File
File diff suppressed because it is too large Load Diff
asm/ov21.inc
+53 -53
View File
@@ -1,9 +1,62 @@
#pragma once
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase18func_ov00_020a8a4cEii
.extern _ZN13LinkStateBase24Get_PlayerLinkBase_Unk48Ev
.extern _ZN13LinkStateBase28Get_PlayerControlData_Unk120Ev
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c2e7cEv
.extern _ZN5Actor18func_ov00_020c2ed4Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
@@ -131,60 +184,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17b8
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1e2c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c288c
.extern func_ov00_020c2938
.extern func_ov00_020c2e7c
.extern func_ov00_020c2ed4
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c5c98
asm/ov21.s
+273 -273
View File
File diff suppressed because it is too large Load Diff
asm/ov22.inc
+65 -65
View File
@@ -1,12 +1,76 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase10GetStateIdEv
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
.extern _ZN13LinkStateBase14GetPlayerAngleEv
.extern _ZN13LinkStateBase15ChangeLinkStateEi
.extern _ZN13LinkStateBase18func_ov00_020a8954EbPi
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1da0EiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c2e7cEv
.extern _ZN5Actor18func_ov00_020c2ed4Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_02050f54
@@ -92,7 +156,6 @@
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern strncpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -228,71 +291,7 @@
.extern func_ov00_020c1424
.extern func_ov00_020c1450
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c1734
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17b8
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c20
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1da0
.extern func_ov00_020c1e2c
.extern func_ov00_020c1f5c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c28d4
.extern func_ov00_020c28ec
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c2e7c
.extern func_ov00_020c2ed4
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c3200
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c3894
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -475,3 +474,4 @@
.extern func_ov34_0217bf0c
.extern func_ov34_0217bf34
.extern func_ov46_02193fac
.extern strncpy
asm/ov22.s
+495 -495
View File
File diff suppressed because it is too large Load Diff
asm/ov23.inc
+63 -63
View File
@@ -3,6 +3,10 @@
.extern Divide
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13LinkStateBase12ApplyImpulseEii
.extern _ZN13LinkStateBase12GetPlayerPosEv
.extern _ZN13LinkStateBase12GetPlayerVelEv
@@ -29,8 +33,66 @@
.extern _ZN15LinkStateFollow18func_ov00_020a9180EP5Vec3p
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
.extern _ZN17LinkStateInteract18func_ov00_020ab770EP5Vec3p
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10GetUnk_08cEP8Cylinder
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZTV11FilterActor
.extern data_02050f54
.extern data_02056be4
.extern data_02057200
@@ -76,7 +138,6 @@
.extern data_ov00_020e26b4
.extern data_ov00_020e2dd8
.extern data_ov00_020e2f04
.extern data_ov00_020e72f0
.extern data_ov00_020e899c
.extern data_ov00_020e8b08
.extern data_ov00_020e9360
@@ -139,7 +200,6 @@
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern strncpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -309,68 +369,7 @@
.extern func_ov00_020c10a0
.extern func_ov00_020c10d4
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c198c
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c20
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1e2c
.extern func_ov00_020c1ef8
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c28d4
.extern func_ov00_020c28ec
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c2a0c
.extern func_ov00_020c2b00
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c3894
.extern func_ov00_020c38fc
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -576,3 +575,4 @@
.extern func_ov52_02195754
.extern func_ov52_02195b5c
.extern gItemManager
.extern strncpy
asm/ov23.s
+316 -316
View File
File diff suppressed because it is too large Load Diff
asm/ov24.inc
+72 -72
View File
@@ -83,7 +83,6 @@
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern strncpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -207,78 +206,78 @@
.extern func_ov00_020c10a0
.extern func_ov00_020c10d4
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17b8
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c198c
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1e2c
.extern func_ov00_020c1ef8
.extern func_ov00_020c1fc8
.extern func_ov00_020c2238
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c281c
.extern func_ov00_020c288c
.extern func_ov00_020c28d4
.extern func_ov00_020c28ec
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c29d8
.extern func_ov00_020c29ec
.extern func_ov00_020c2a0c
.extern func_ov00_020c2bf4
.extern func_ov00_020c2e7c
.extern func_ov00_020c2ebc
.extern func_ov00_020c2ed4
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c3200
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18CollidesWithShieldEP8Cylinder
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16IsFollowedByLinkEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor18func_ov00_020c2e7cEv
.extern _ZN5Actor18func_ov00_020c2ebcEv
.extern _ZN5Actor18func_ov00_020c2ed4Ev
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c3484
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c3894
.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c56d8
@@ -426,3 +425,4 @@
.extern func_ov17_0216a634
.extern func_ov17_0216a734
.extern gItemManager
.extern strncpy
asm/ov24.s
+475 -475
View File
File diff suppressed because it is too large Load Diff
asm/ov25.inc
+73 -73
View File
@@ -1,9 +1,81 @@
#pragma once
.extern Divide
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1d58Ev
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor18func_ov00_020c3094Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c3158Ev
.extern _ZN5Actor18func_ov00_020c31c0Ei
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor20KillPickupItemActorsEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern _ZTV11FilterActor
.extern data_02050f54
.extern data_027e0178
.extern data_027e0764
@@ -36,7 +108,6 @@
.extern data_027e10b8
.extern data_ov00_020e2dd8
.extern data_ov00_020e2f04
.extern data_ov00_020e72f0
.extern data_ov00_020e8398
.extern data_ov00_020e892c
.extern data_ov00_020e8b08
@@ -82,7 +153,6 @@
.extern func_0203eba8
.extern func_0203ebc8
.extern func_02042f68
.extern strncpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -187,78 +257,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17b8
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c198c
.extern func_ov00_020c1b18
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1c20
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1d58
.extern func_ov00_020c1e2c
.extern func_ov00_020c1f5c
.extern func_ov00_020c1fc8
.extern func_ov00_020c23c4
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c288c
.extern func_ov00_020c28ec
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c29d8
.extern func_ov00_020c29ec
.extern func_ov00_020c2bf4
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c3094
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3158
.extern func_ov00_020c3180
.extern func_ov00_020c31c0
.extern func_ov00_020c31fc
.extern func_ov00_020c3200
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c3894
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -412,3 +411,4 @@
.extern func_ov30_02187304
.extern func_ov30_02187340
.extern gItemManager
.extern strncpy
asm/ov25.s
+513 -513
View File
File diff suppressed because it is too large Load Diff
asm/ov26.inc
+56 -56
View File
@@ -136,8 +136,6 @@
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0203fe60
.extern strncpy
.extern strcmp
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -267,61 +265,61 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c20
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c288c
.extern func_ov00_020c28ec
.extern func_ov00_020c2974
.extern func_ov00_020c2a0c
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c35d8
.extern func_ov00_020c3894
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c47cc
@@ -539,3 +537,5 @@
.extern func_ov30_02183f84
.extern func_ov30_02183fd4
.extern gItemManager
.extern strcmp
.extern strncpy
asm/ov26.s
+296 -296
View File
File diff suppressed because it is too large Load Diff
asm/ov27.inc
+61 -61
View File
@@ -1,6 +1,67 @@
#pragma once
.extern Divide
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl14IsTouchingFastEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager10GetUnk_098Ej
@@ -175,68 +236,7 @@
.extern func_ov00_020c1424
.extern func_ov00_020c1450
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c198c
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1e2c
.extern func_ov00_020c1ef8
.extern func_ov00_020c1f5c
.extern func_ov00_020c1fc8
.extern func_ov00_020c22b8
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c288c
.extern func_ov00_020c28d4
.extern func_ov00_020c28ec
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c2bf4
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c3894
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c5d34
asm/ov27.s
+299 -299
View File
File diff suppressed because it is too large Load Diff
asm/ov28.inc
+64 -64
View File
@@ -1,6 +1,67 @@
#pragma once
.extern Approach_thunk
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14OverlayManager15LoadIfNotLoadedEjj
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c3094Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager10GetUnk_098Ej
@@ -93,9 +154,6 @@
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern strcpy
.extern strncpy
.extern strcat
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -217,67 +275,6 @@
.extern func_ov00_020c0cc8
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c198c
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c20
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1fc8
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c288c
.extern func_ov00_020c28d4
.extern func_ov00_020c28ec
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c2a0c
.extern func_ov00_020c2bf4
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c3094
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern func_ov00_020c3674
.extern func_ov00_020c3894
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
.extern func_ov00_020c47cc
@@ -405,3 +402,6 @@
.extern func_ov14_0214aa2c
.extern gItemManager
.extern gOverlayManager
.extern strcat
.extern strcpy
.extern strncpy
asm/ov28.s
+468 -468
View File
File diff suppressed because it is too large Load Diff
asm/ov29.inc
+57 -57
View File
@@ -2,6 +2,62 @@
.extern Approach_thunk
.extern Divide
.extern _ZN11ItemManager18func_ov00_020ae4dcEj
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c2ebcEv
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_02050f54
@@ -117,7 +173,6 @@
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern strcpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -217,63 +272,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1e2c
.extern func_ov00_020c1f5c
.extern func_ov00_020c1fc8
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c2a0c
.extern func_ov00_020c2ebc
.extern func_ov00_020c3004
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c3894
.extern func_ov00_020c3b2c
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -392,3 +391,4 @@
.extern func_ov38_021854e4
.extern func_ov38_02185720
.extern gItemManager
.extern strcpy
asm/ov29.s
+400 -400
View File
File diff suppressed because it is too large Load Diff
asm/ov30.inc
+65 -65
View File
@@ -30,7 +30,7 @@
.extern data_027e0ffc
.extern data_027e1038
.extern data_027e10b4
.extern data_ov00_020e72f0
.extern _ZTV11FilterActor
.extern data_ov00_020e8398
.extern data_ov00_020eec68
.extern data_ov00_020eec9c
@@ -121,71 +121,71 @@
.extern func_ov00_020c10a0
.extern func_ov00_020c10d4
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c20
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1d58
.extern func_ov00_020c1ef8
.extern func_ov00_020c23d4
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c288c
.extern func_ov00_020c28ec
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c29d8
.extern func_ov00_020c29ec
.extern func_ov00_020c2a0c
.extern func_ov00_020c2bf4
.extern func_ov00_020c3004
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3158
.extern func_ov00_020c3180
.extern func_ov00_020c31c0
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1d58Ev
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c23d4EP8ActorRefPS_P8Cylinder
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c3158Ev
.extern _ZN5Actor4KillEv
.extern _ZN5Actor18func_ov00_020c31c0Ei
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c38fc
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
asm/ov30.s
+335 -335
View File
File diff suppressed because it is too large Load Diff
asm/ov31.inc
+46 -46
View File
@@ -120,53 +120,53 @@
.extern func_ov00_020bcdec
.extern func_ov00_020bd728
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c1734
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c3004
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020ceacc
asm/ov31.s
+896 -896
View File
File diff suppressed because it is too large Load Diff
asm/ov32.inc
+58 -58
View File
@@ -3,8 +3,65 @@
.extern Divide
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10GetUnk_08cEP8Cylinder
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14StopLinkFollowEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16IsFollowedByLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18CollidesWithPlayerEj
.extern _ZN5Actor18func_ov00_020c1da0EiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c2e7cEv
.extern _ZN5Actor18func_ov00_020c2ed4Ev
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZTV11FilterActor
.extern data_02050f54
.extern data_02051f54
.extern data_02056be4
@@ -39,7 +96,6 @@
.extern data_ov00_020e2e3c
.extern data_ov00_020e2f04
.extern data_ov00_020e2f98
.extern data_ov00_020e72f0
.extern data_ov00_020e9370
.extern func_01ff81f8
.extern func_01ff8214
@@ -85,7 +141,6 @@
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern strncpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -204,63 +259,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1da0
.extern func_ov00_020c1e2c
.extern func_ov00_020c1ef8
.extern func_ov00_020c22b8
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c281c
.extern func_ov00_020c2840
.extern func_ov00_020c28d4
.extern func_ov00_020c28ec
.extern func_ov00_020c2974
.extern func_ov00_020c2a0c
.extern func_ov00_020c2b00
.extern func_ov00_020c2e7c
.extern func_ov00_020c2ed4
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c3200
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -348,3 +347,4 @@
.extern func_ov14_0213b904
.extern func_ov14_0213b984
.extern func_ov14_0213d480
.extern strncpy
asm/ov32.s
+293 -293
View File
File diff suppressed because it is too large Load Diff
asm/ov33.inc
+59 -59
View File
@@ -51,7 +51,6 @@
.extern func_02038b40
.extern func_0203e784
.extern func_0203e7b4
.extern strncpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -80,65 +79,65 @@
.extern func_ov00_020c0cc8
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c195c
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1cf8
.extern func_ov00_020c1e2c
.extern func_ov00_020c23c4
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c288c
.extern func_ov00_020c28ec
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c2bf4
.extern func_ov00_020c2e7c
.extern func_ov00_020c2ed4
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor18func_ov00_020c195cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1cf8Ev
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor18func_ov00_020c2e7cEv
.extern _ZN5Actor18func_ov00_020c2ed4Ev
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c3894
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c566c
.extern func_ov00_020c5c98
@@ -250,3 +249,4 @@
.extern func_ov14_02145f0c
.extern func_ov18_02160a54
.extern func_ov18_02160a64
.extern strncpy
asm/ov33.s
+219 -219
View File
File diff suppressed because it is too large Load Diff
asm/ov34.inc
+60 -60
View File
@@ -60,8 +60,6 @@
.extern func_0202e58c
.extern func_0203e784
.extern func_0203e7b4
.extern strcpy
.extern strncpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -117,65 +115,65 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c20
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1da0
.extern func_ov00_020c1e2c
.extern func_ov00_020c1f5c
.extern func_ov00_020c1fc8
.extern func_ov00_020c23c4
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c2938
.extern func_ov00_020c2a0c
.extern func_ov00_020c2e7c
.extern func_ov00_020c3004
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1da0EiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor18func_ov00_020c2e7cEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c3894
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -252,3 +250,5 @@
.extern func_ov22_0217740c
.extern func_ov22_02177450
.extern func_ov22_0217746c
.extern strcpy
.extern strncpy
asm/ov34.s
+151 -151
View File
@@ -719,7 +719,7 @@ func_ov34_0217c5a4: ; 0x0217c5a4
mov r2, #4
bl func_0204f754
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
ldmia sp!, {r4, pc}
.align 2, 0
@@ -814,7 +814,7 @@ func_ov34_0217c708: ; 0x0217c708
mov r2, #4
bl func_0204f754
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
bl _ZN9SysObjectdlEPv
mov r0, r4
@@ -894,7 +894,7 @@ func_ov34_0217c920: ; 0x0217c920
cmp r1, #0
beq _0217c950
mov r1, #1
bl func_ov00_020c1bfc
bl _ZN5Actor18func_Ov00_020c1bfcEi
cmp r0, #0
addne sp, sp, #0x48
movne r0, #0
@@ -912,10 +912,10 @@ _0217c950:
mov r1, #1
mov r0, r5
mov r2, r1
bl func_ov00_020c1c20
bl _ZN5Actor18func_ov00_020c1c20Eiii
_0217c984:
mov r0, r5
bl func_ov00_020c3180
bl _ZN5Actor4KillEv
add sp, sp, #0x48
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -1237,11 +1237,11 @@ func_ov34_0217ce2c: ; 0x0217ce2c
ldr r2, _0217ceac ; =0x54534e4d
ldr r1, [r1]
add r0, sp, #0
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217cea8 ; =data_027e0fe4
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
add r1, r4, #0x1000
str r0, [r1, #0xd70]
ldr r2, [r4, #0x4c]
@@ -2667,7 +2667,7 @@ func_ov34_0217e2c4: ; 0x0217e2c4
stmdb sp!, {r4, lr}
mov r1, #0
mov r4, r0
bl func_ov00_020c1bfc
bl _ZN5Actor18func_Ov00_020c1bfcEi
cmp r0, #0
ldmeqia sp!, {r4, pc}
add r0, r4, #0x21c
@@ -3857,7 +3857,7 @@ _0217f364:
add r2, sp, #0x10
mov r0, r4
mov r1, #2
bl func_ov00_020c1e2c
bl _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
_0217f3b8:
add r0, r4, #0x1000
ldr r0, [r0, #0xaa0]
@@ -4347,7 +4347,7 @@ _0217fa70:
add r2, sp, #0x68
mov r0, r5
mov r1, #2
bl func_ov00_020c1e2c
bl _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
_0217fac4:
add r0, r5, #0x1000
ldr r0, [r0, #0xaa0]
@@ -4381,7 +4381,7 @@ _0217fac4:
str r2, [sp, #0x54]
ldr r2, [r4, #0x3c]
str r2, [sp, #0x58]
bl func_ov00_020c2a0c
bl _ZN5Actor9GetHitboxEP8Cylinder
add r0, sp, #0x40
add r1, sp, #0x5c
add r2, sp, #0x50
@@ -4659,7 +4659,7 @@ _0217ff30:
str r4, [sp, #4]
str r4, [sp, #8]
str r3, [sp, #0xc]
bl func_ov00_020c1da0
bl _ZN5Actor18func_ov00_020c1da0EiP5Vec3p
ldr r3, _02180090 ; =0x0000019a
mov r0, r5
mov r1, #9
@@ -4675,7 +4675,7 @@ _0217ff30:
bl func_ov00_020b7e6c
b _0217ffc8
_0217ffb4:
bl func_ov00_020c2e7c
bl _ZN5Actor18func_ov00_020c2e7cEv
cmp r0, #0
addne r0, r5, #0x1000
movne r1, #1
@@ -5165,7 +5165,7 @@ _0218064c:
mov r4, #0
mov r1, #2
strb r4, [r3, #0xd8e]
bl func_ov00_020c1e2c
bl _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
_0218068c:
add r0, r5, #0x1000
ldr r0, [r0, #0xaa0]
@@ -5202,7 +5202,7 @@ _0218068c:
ldmleia sp!, {r4, r5, r6, r7, r8, pc}
add r1, sp, #0x10
mov r0, r5
bl func_ov00_020c2a0c
bl _ZN5Actor9GetHitboxEP8Cylinder
add r1, sp, #0x10
mov r0, r4
bl func_ov14_0213dba4
@@ -5690,7 +5690,7 @@ _02180d84:
add r1, r1, #0x1c00
add r2, r4, #0x1d40
str r5, [sp, #8]
bl func_ov00_020c1f5c
bl _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
mov r0, r4
add r1, r4, #0x1000
mov r2, #0
@@ -7553,7 +7553,7 @@ _02182848:
add r0, r0, #0x1c00
bl func_ov00_020b7e6c
mov r0, r4
bl func_ov00_020c3180
bl _ZN5Actor4KillEv
b _02182a1c
_02182860:
cmp r1, #0x28
@@ -8338,7 +8338,7 @@ func_ov34_021832c0: ; 0x021832c0
bhi _02183330
_021832fc:
add r1, sp, #0
bl func_ov00_020c2a0c
bl _ZN5Actor9GetHitboxEP8Cylinder
cmp r4, #0
add r0, sp, #0
mov r2, #8
@@ -9439,12 +9439,12 @@ _02184310:
mov r1, #0
mov r0, r5
mov r2, r1
bl func_ov00_020c243c
bl _ZN5Actor18func_ov00_020c243cEiPi
cmp r0, #0
bne _0218434c
mov r0, r5
mov r1, #0x1a
bl func_ov00_020c1fc8
bl _ZN5Actor18func_ov00_020c1fc8Ej
cmp r0, #0
beq _02184364
_0218434c:
@@ -9495,7 +9495,7 @@ func_ov34_021843d4: ; 0x021843d4
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _021843f4
mov r0, r5
@@ -9514,7 +9514,7 @@ func_ov34_02184408: ; 0x02184408
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _02184440
mov r0, r5
@@ -9766,7 +9766,7 @@ func_ov34_02184728: ; 0x02184728
bl _ZN9SysObjectnwEmPjj
movs r4, r0
beq _02184768
bl func_ov00_020c1554
bl _ZN5ActorC2Ev
ldr r1, _02184774 ; =data_ov34_02185fbc
mov r0, #0
str r1, [r4]
@@ -9926,7 +9926,7 @@ func_ov34_02184950: ; 0x02184950
sub sp, sp, #0x34
add r1, sp, #0x18
mov r4, r0
bl func_ov00_020c2a0c
bl _ZN5Actor9GetHitboxEP8Cylinder
ldr r0, [sp, #0x24]
add r0, r0, #0x33
add r0, r0, #0x300
@@ -10088,7 +10088,7 @@ func_ov34_02184b70: ; 0x02184b70
moveq r1, #6
movne r1, #4
mov r0, r4
bl func_ov00_020c1e2c
bl _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
ldr r1, _02184ca4 ; =data_027e0f94
add r0, r4, #0x4c
ldr r1, [r1, #4]
@@ -10202,7 +10202,7 @@ func_ov34_02184cec: ; 0x02184cec
stmia r3, {r0, r1, r2}
mov r0, r4
mov r1, r3
bl func_ov00_020c2938
bl _ZN5Actor10GetAngleToEP5Vec3p
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0x10
mov r0, r0, asr #0x4
@@ -10231,7 +10231,7 @@ _02184d84:
bl func_0202b308
add r1, sp, #8
mov r0, r4
bl func_ov00_020c2a0c
bl _ZN5Actor9GetHitboxEP8Cylinder
ldr r0, [sp, #0x14]
add r0, r0, #0x33
add r0, r0, #0x300
@@ -10267,7 +10267,7 @@ _02184df8:
bl Approach_thunk
add r0, sp, #0
mov r1, r4
bl func_ov00_020c23c4
bl _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
ldr r1, [sp]
mvn r0, #0
cmp r1, r0
@@ -10346,7 +10346,7 @@ func_ov34_02184f34: ; 0x02184f34
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _02184f88
ldr r0, [r5, #0x48]
@@ -10392,7 +10392,7 @@ func_ov34_02184fb8: ; 0x02184fb8
add r0, r4, #0x160
bl func_ov00_020b7d74
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
ldmia sp!, {r4, pc}
arm_func_end func_ov34_02184fb8
@@ -10409,7 +10409,7 @@ func_ov34_02184fe8: ; 0x02184fe8
add r0, r4, #0x160
bl func_ov00_020b7d74
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
bl _ZN9SysObjectdlEPv
mov r0, r4
@@ -10555,7 +10555,7 @@ func_ov34_021851bc: ; 0x021851bc
stmdb sp!, {r3, r4, lr}
sub sp, sp, #4
mov r4, r0
bl func_ov00_020c1554
bl _ZN5ActorC2Ev
ldr r1, _0218527c ; =data_ov34_021860d8
ldr r0, _02185280 ; =data_ov34_02186070
str r1, [r4]
@@ -10648,7 +10648,7 @@ _021852d4:
add r0, r6, #0x170
blx func_ov00_020a95a4
mov r0, r6
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r6
bl _ZN9SysObjectdlEPv
mov r0, r6
@@ -10698,7 +10698,7 @@ _0218537c:
add r0, r6, #0x170
blx func_ov00_020a95a4
mov r0, r6
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r6
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
@@ -10831,7 +10831,7 @@ _0218558c: .word data_027e0e58
func_ov34_02185590: ; 0x02185590
stmdb sp!, {r4, lr}
mov r4, r0
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, [r4, #0x208]
@@ -10842,7 +10842,7 @@ func_ov34_02185590: ; 0x02185590
mov r0, r4
add r2, r4, #0x60
mov r1, #4
bl func_ov00_020c1e2c
bl _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
_021855c8:
add r0, r4, #0x158
bl func_ov34_02185064
@@ -11901,37 +11901,37 @@ data_ov34_02185d68: ; 0x02185d68
.word func_ov34_02184408
.global data_ov34_02185d6c
data_ov34_02185d6c: ; 0x02185d6c
.word func_ov00_020c17d4
.word _ZN5Actor8vfunc_1cEt
.global data_ov34_02185d70
data_ov34_02185d70: ; 0x02185d70
.word func_ov34_02184698
.global data_ov34_02185d74
data_ov34_02185d74: ; 0x02185d74
.word func_ov00_020c1744
.word _ZN5Actor8vfunc_24Ev
.global data_ov34_02185d78
data_ov34_02185d78: ; 0x02185d78
.word func_ov00_020c1748
.word _ZN5Actor8vfunc_28Ev
.global data_ov34_02185d7c
data_ov34_02185d7c: ; 0x02185d7c
.word func_ov00_020c17a8
.word _ZN5Actor8vfunc_2cEv
.global data_ov34_02185d80
data_ov34_02185d80: ; 0x02185d80
.word func_ov00_020c17b0
.word _ZN5Actor8vfunc_30Ev
.global data_ov34_02185d84
data_ov34_02185d84: ; 0x02185d84
.word func_ov00_020c174c
.word _ZN5Actor12GetOffsetPosEP5Vec3p
.global data_ov34_02185d88
data_ov34_02185d88: ; 0x02185d88
.word func_ov00_020c177c
.word _ZN5Actor8vfunc_38Ev
.global data_ov34_02185d8c
data_ov34_02185d8c: ; 0x02185d8c
.word func_ov00_020c27e4
.word _ZN5Actor16CollidesWithLinkEv
.global data_ov34_02185d90
data_ov34_02185d90: ; 0x02185d90
.word func_ov34_021832c0
.global data_ov34_02185d94
data_ov34_02185d94: ; 0x02185d94
.word func_ov00_020c2744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov34_02185d98
data_ov34_02185d98: ; 0x02185d98
.word func_ov34_02183024
@@ -11940,79 +11940,79 @@ data_ov34_02185d9c: ; 0x02185d9c
.word func_ov00_020ca840
.global data_ov34_02185da0
data_ov34_02185da0: ; 0x02185da0
.word func_ov00_020c310c
.word _ZN5Actor6GetPosEv
.global data_ov34_02185da4
data_ov34_02185da4: ; 0x02185da4
.word func_ov00_020c3114
.word _ZN5Actor8vfunc_54Ev
.global data_ov34_02185da8
data_ov34_02185da8: ; 0x02185da8
.word func_ov00_020c18a8
.word _ZN5Actor10SetUnk_11bEv
.global data_ov34_02185dac
data_ov34_02185dac: ; 0x02185dac
.word func_ov00_020c18c4
.word _ZN5Actor11SetVelocityEP5Vec3p
.global data_ov34_02185db0
data_ov34_02185db0: ; 0x02185db0
.word func_ov00_020c18fc
.word _ZN5Actor8vfunc_60Ev
.global data_ov34_02185db4
data_ov34_02185db4: ; 0x02185db4
.word func_ov00_020c1904
.word _ZN5Actor8vfunc_64Ev
.global data_ov34_02185db8
data_ov34_02185db8: ; 0x02185db8
.word func_ov00_020c1910
.word _ZN5Actor8vfunc_68Ev
.global data_ov34_02185dbc
data_ov34_02185dbc: ; 0x02185dbc
.word func_ov00_020c1914
.word _ZN5Actor8vfunc_6cEv
.global data_ov34_02185dc0
data_ov34_02185dc0: ; 0x02185dc0
.word func_ov00_020c191c
.word _ZN5Actor8vfunc_70Ev
.global data_ov34_02185dc4
data_ov34_02185dc4: ; 0x02185dc4
.word func_ov00_020c1924
.word _ZN5Actor8vfunc_74Ev
.global data_ov34_02185dc8
data_ov34_02185dc8: ; 0x02185dc8
.word func_ov00_020c192c
.word _ZN5Actor8vfunc_78Ev
.global data_ov34_02185dcc
data_ov34_02185dcc: ; 0x02185dcc
.word func_ov00_020c1928
.word _ZN5Actor8vfunc_7cEv
.global data_ov34_02185dd0
data_ov34_02185dd0: ; 0x02185dd0
.word func_ov00_020c1934
.word _ZN5Actor8vfunc_80Ev
.global data_ov34_02185dd4
data_ov34_02185dd4: ; 0x02185dd4
.word func_ov00_020c1938
.word _ZN5Actor8vfunc_84Ev
.global data_ov34_02185dd8
data_ov34_02185dd8: ; 0x02185dd8
.word func_ov00_020c193c
.word _ZN5Actor8vfunc_88Ev
.global data_ov34_02185ddc
data_ov34_02185ddc: ; 0x02185ddc
.word func_ov00_020c1940
.word _ZN5Actor8vfunc_8cEv
.global data_ov34_02185de0
data_ov34_02185de0: ; 0x02185de0
.word func_ov00_020c1948
.word _ZN5Actor8vfunc_90Ev
.global data_ov34_02185de4
data_ov34_02185de4: ; 0x02185de4
.word func_ov00_020c1950
.word _ZN5Actor8vfunc_94Ev
.global data_ov34_02185de8
data_ov34_02185de8: ; 0x02185de8
.word func_ov00_020c1954
.word _ZN5Actor8vfunc_98Ev
.global data_ov34_02185dec
data_ov34_02185dec: ; 0x02185dec
.word func_ov00_020c1958
.word _ZN5Actor8vfunc_9cEv
.global data_ov34_02185df0
data_ov34_02185df0: ; 0x02185df0
.word func_ov00_020c1b6c
.word _ZN5Actor15TrySetTransformEP9Transform
.global data_ov34_02185df4
data_ov34_02185df4: ; 0x02185df4
.word func_ov00_020c1bb4
.word _ZN5Actor12SetTransformEP9Transform
.global data_ov34_02185df8
data_ov34_02185df8: ; 0x02185df8
.word func_ov00_020c1bf8
.word _ZN5Actor8vfunc_a8Ev
.global data_ov34_02185dfc
data_ov34_02185dfc: ; 0x02185dfc
.word func_ov00_020c31fc
.word _ZN5Actor8vfunc_acEv
.global data_ov34_02185e00
data_ov34_02185e00: ; 0x02185e00
.word func_ov00_020c322c
.word _ZN5Actor8vfunc_b0Ev
.global data_ov34_02185e04
data_ov34_02185e04: ; 0x02185e04
.word func_ov34_0217c880
@@ -12241,130 +12241,130 @@ data_ov34_02185fc4: ; 0x02185fc4
.word func_ov34_02184778
.global data_ov34_02185fc8
data_ov34_02185fc8: ; 0x02185fc8
.word func_ov00_020c173c
.word _ZN5Actor8vfunc_0cEv
.global data_ov34_02185fcc
data_ov34_02185fcc: ; 0x02185fcc
.word func_ov00_020c1740
.word _ZN5Actor8vfunc_10Ej
.global data_ov34_02185fd0
data_ov34_02185fd0: ; 0x02185fd0
.word func_ov34_02184f34
.global data_ov34_02185fd4
data_ov34_02185fd4: ; 0x02185fd4
.word func_ov00_020c17bc
.word _ZN5Actor8vfunc_18Ej
.global data_ov34_02185fd8
data_ov34_02185fd8: ; 0x02185fd8
.word func_ov00_020c17d4
.word _ZN5Actor8vfunc_1cEt
.global data_ov34_02185fdc
data_ov34_02185fdc: ; 0x02185fdc
.word func_ov00_020c1894
.word _ZN5Actor8vfunc_20Ei
.global data_ov34_02185fe0
data_ov34_02185fe0: ; 0x02185fe0
.word func_ov00_020c1744
.word _ZN5Actor8vfunc_24Ev
.global data_ov34_02185fe4
data_ov34_02185fe4: ; 0x02185fe4
.word func_ov00_020c1748
.word _ZN5Actor8vfunc_28Ev
.global data_ov34_02185fe8
data_ov34_02185fe8: ; 0x02185fe8
.word func_ov00_020c17a8
.word _ZN5Actor8vfunc_2cEv
.global data_ov34_02185fec
data_ov34_02185fec: ; 0x02185fec
.word func_ov00_020c17b0
.word _ZN5Actor8vfunc_30Ev
.global data_ov34_02185ff0
data_ov34_02185ff0: ; 0x02185ff0
.word func_ov00_020c174c
.word _ZN5Actor12GetOffsetPosEP5Vec3p
.global data_ov34_02185ff4
data_ov34_02185ff4: ; 0x02185ff4
.word func_ov00_020c177c
.word _ZN5Actor8vfunc_38Ev
.global data_ov34_02185ff8
data_ov34_02185ff8: ; 0x02185ff8
.word func_ov00_020c27e4
.word _ZN5Actor16CollidesWithLinkEv
.global data_ov34_02185ffc
data_ov34_02185ffc: ; 0x02185ffc
.word func_ov00_020c3004
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov34_02186000
data_ov34_02186000: ; 0x02186000
.word func_ov00_020c2744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov34_02186004
data_ov34_02186004: ; 0x02186004
.word func_ov00_020c1c48
.word _ZN5Actor8vfunc_48Ei
.global data_ov34_02186008
data_ov34_02186008: ; 0x02186008
.word func_ov00_020c1c50
.word _ZN5Actor8vfunc_4cEPi
.global data_ov34_0218600c
data_ov34_0218600c: ; 0x0218600c
.word func_ov00_020c310c
.word _ZN5Actor6GetPosEv
.global data_ov34_02186010
data_ov34_02186010: ; 0x02186010
.word func_ov00_020c3114
.word _ZN5Actor8vfunc_54Ev
.global data_ov34_02186014
data_ov34_02186014: ; 0x02186014
.word func_ov00_020c18a8
.word _ZN5Actor10SetUnk_11bEv
.global data_ov34_02186018
data_ov34_02186018: ; 0x02186018
.word func_ov00_020c18c4
.word _ZN5Actor11SetVelocityEP5Vec3p
.global data_ov34_0218601c
data_ov34_0218601c: ; 0x0218601c
.word func_ov00_020c18fc
.word _ZN5Actor8vfunc_60Ev
.global data_ov34_02186020
data_ov34_02186020: ; 0x02186020
.word func_ov00_020c1904
.word _ZN5Actor8vfunc_64Ev
.global data_ov34_02186024
data_ov34_02186024: ; 0x02186024
.word func_ov00_020c1910
.word _ZN5Actor8vfunc_68Ev
.global data_ov34_02186028
data_ov34_02186028: ; 0x02186028
.word func_ov00_020c1914
.word _ZN5Actor8vfunc_6cEv
.global data_ov34_0218602c
data_ov34_0218602c: ; 0x0218602c
.word func_ov00_020c191c
.word _ZN5Actor8vfunc_70Ev
.global data_ov34_02186030
data_ov34_02186030: ; 0x02186030
.word func_ov00_020c1924
.word _ZN5Actor8vfunc_74Ev
.global data_ov34_02186034
data_ov34_02186034: ; 0x02186034
.word func_ov00_020c192c
.word _ZN5Actor8vfunc_78Ev
.global data_ov34_02186038
data_ov34_02186038: ; 0x02186038
.word func_ov00_020c1928
.word _ZN5Actor8vfunc_7cEv
.global data_ov34_0218603c
data_ov34_0218603c: ; 0x0218603c
.word func_ov00_020c1934
.word _ZN5Actor8vfunc_80Ev
.global data_ov34_02186040
data_ov34_02186040: ; 0x02186040
.word func_ov00_020c1938
.word _ZN5Actor8vfunc_84Ev
.global data_ov34_02186044
data_ov34_02186044: ; 0x02186044
.word func_ov00_020c193c
.word _ZN5Actor8vfunc_88Ev
.global data_ov34_02186048
data_ov34_02186048: ; 0x02186048
.word func_ov00_020c1940
.word _ZN5Actor8vfunc_8cEv
.global data_ov34_0218604c
data_ov34_0218604c: ; 0x0218604c
.word func_ov00_020c1948
.word _ZN5Actor8vfunc_90Ev
.global data_ov34_02186050
data_ov34_02186050: ; 0x02186050
.word func_ov00_020c1950
.word _ZN5Actor8vfunc_94Ev
.global data_ov34_02186054
data_ov34_02186054: ; 0x02186054
.word func_ov00_020c1954
.word _ZN5Actor8vfunc_98Ev
.global data_ov34_02186058
data_ov34_02186058: ; 0x02186058
.word func_ov00_020c1958
.word _ZN5Actor8vfunc_9cEv
.global data_ov34_0218605c
data_ov34_0218605c: ; 0x0218605c
.word func_ov00_020c1b6c
.word _ZN5Actor15TrySetTransformEP9Transform
.global data_ov34_02186060
data_ov34_02186060: ; 0x02186060
.word func_ov00_020c1bb4
.word _ZN5Actor12SetTransformEP9Transform
.global data_ov34_02186064
data_ov34_02186064: ; 0x02186064
.word func_ov00_020c1bf8
.word _ZN5Actor8vfunc_a8Ev
.global data_ov34_02186068
data_ov34_02186068: ; 0x02186068
.word func_ov00_020c31fc
.word _ZN5Actor8vfunc_acEv
.global data_ov34_0218606c
data_ov34_0218606c: ; 0x0218606c
.word func_ov00_020c322c
.word _ZN5Actor8vfunc_b0Ev
.global data_ov34_02186070
data_ov34_02186070: ; 0x02186070
.word func_ov34_02185650
@@ -12454,130 +12454,130 @@ data_ov34_021860e0: ; 0x021860e0
.word func_ov34_021853dc
.global data_ov34_021860e4
data_ov34_021860e4: ; 0x021860e4
.word func_ov00_020c173c
.word _ZN5Actor8vfunc_0cEv
.global data_ov34_021860e8
data_ov34_021860e8: ; 0x021860e8
.word func_ov00_020c1740
.word _ZN5Actor8vfunc_10Ej
.global data_ov34_021860ec
data_ov34_021860ec: ; 0x021860ec
.word func_ov34_02185590
.global data_ov34_021860f0
data_ov34_021860f0: ; 0x021860f0
.word func_ov00_020c17bc
.word _ZN5Actor8vfunc_18Ej
.global data_ov34_021860f4
data_ov34_021860f4: ; 0x021860f4
.word func_ov00_020c17d4
.word _ZN5Actor8vfunc_1cEt
.global data_ov34_021860f8
data_ov34_021860f8: ; 0x021860f8
.word func_ov34_021855d4
.global data_ov34_021860fc
data_ov34_021860fc: ; 0x021860fc
.word func_ov00_020c1744
.word _ZN5Actor8vfunc_24Ev
.global data_ov34_02186100
data_ov34_02186100: ; 0x02186100
.word func_ov00_020c1748
.word _ZN5Actor8vfunc_28Ev
.global data_ov34_02186104
data_ov34_02186104: ; 0x02186104
.word func_ov00_020c17a8
.word _ZN5Actor8vfunc_2cEv
.global data_ov34_02186108
data_ov34_02186108: ; 0x02186108
.word func_ov00_020c17b0
.word _ZN5Actor8vfunc_30Ev
.global data_ov34_0218610c
data_ov34_0218610c: ; 0x0218610c
.word func_ov00_020c174c
.word _ZN5Actor12GetOffsetPosEP5Vec3p
.global data_ov34_02186110
data_ov34_02186110: ; 0x02186110
.word func_ov00_020c177c
.word _ZN5Actor8vfunc_38Ev
.global data_ov34_02186114
data_ov34_02186114: ; 0x02186114
.word func_ov00_020c27e4
.word _ZN5Actor16CollidesWithLinkEv
.global data_ov34_02186118
data_ov34_02186118: ; 0x02186118
.word func_ov00_020c3004
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov34_0218611c
data_ov34_0218611c: ; 0x0218611c
.word func_ov00_020c2744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov34_02186120
data_ov34_02186120: ; 0x02186120
.word func_ov00_020c1c48
.word _ZN5Actor8vfunc_48Ei
.global data_ov34_02186124
data_ov34_02186124: ; 0x02186124
.word func_ov00_020c1c50
.word _ZN5Actor8vfunc_4cEPi
.global data_ov34_02186128
data_ov34_02186128: ; 0x02186128
.word func_ov00_020c310c
.word _ZN5Actor6GetPosEv
.global data_ov34_0218612c
data_ov34_0218612c: ; 0x0218612c
.word func_ov00_020c3114
.word _ZN5Actor8vfunc_54Ev
.global data_ov34_02186130
data_ov34_02186130: ; 0x02186130
.word func_ov00_020c18a8
.word _ZN5Actor10SetUnk_11bEv
.global data_ov34_02186134
data_ov34_02186134: ; 0x02186134
.word func_ov00_020c18c4
.word _ZN5Actor11SetVelocityEP5Vec3p
.global data_ov34_02186138
data_ov34_02186138: ; 0x02186138
.word func_ov00_020c18fc
.word _ZN5Actor8vfunc_60Ev
.global data_ov34_0218613c
data_ov34_0218613c: ; 0x0218613c
.word func_ov00_020c1904
.word _ZN5Actor8vfunc_64Ev
.global data_ov34_02186140
data_ov34_02186140: ; 0x02186140
.word func_ov00_020c1910
.word _ZN5Actor8vfunc_68Ev
.global data_ov34_02186144
data_ov34_02186144: ; 0x02186144
.word func_ov00_020c1914
.word _ZN5Actor8vfunc_6cEv
.global data_ov34_02186148
data_ov34_02186148: ; 0x02186148
.word func_ov00_020c191c
.word _ZN5Actor8vfunc_70Ev
.global data_ov34_0218614c
data_ov34_0218614c: ; 0x0218614c
.word func_ov00_020c1924
.word _ZN5Actor8vfunc_74Ev
.global data_ov34_02186150
data_ov34_02186150: ; 0x02186150
.word func_ov00_020c192c
.word _ZN5Actor8vfunc_78Ev
.global data_ov34_02186154
data_ov34_02186154: ; 0x02186154
.word func_ov00_020c1928
.word _ZN5Actor8vfunc_7cEv
.global data_ov34_02186158
data_ov34_02186158: ; 0x02186158
.word func_ov00_020c1934
.word _ZN5Actor8vfunc_80Ev
.global data_ov34_0218615c
data_ov34_0218615c: ; 0x0218615c
.word func_ov00_020c1938
.word _ZN5Actor8vfunc_84Ev
.global data_ov34_02186160
data_ov34_02186160: ; 0x02186160
.word func_ov00_020c193c
.word _ZN5Actor8vfunc_88Ev
.global data_ov34_02186164
data_ov34_02186164: ; 0x02186164
.word func_ov00_020c1940
.word _ZN5Actor8vfunc_8cEv
.global data_ov34_02186168
data_ov34_02186168: ; 0x02186168
.word func_ov00_020c1948
.word _ZN5Actor8vfunc_90Ev
.global data_ov34_0218616c
data_ov34_0218616c: ; 0x0218616c
.word func_ov00_020c1950
.word _ZN5Actor8vfunc_94Ev
.global data_ov34_02186170
data_ov34_02186170: ; 0x02186170
.word func_ov00_020c1954
.word _ZN5Actor8vfunc_98Ev
.global data_ov34_02186174
data_ov34_02186174: ; 0x02186174
.word func_ov00_020c1958
.word _ZN5Actor8vfunc_9cEv
.global data_ov34_02186178
data_ov34_02186178: ; 0x02186178
.word func_ov00_020c1b6c
.word _ZN5Actor15TrySetTransformEP9Transform
.global data_ov34_0218617c
data_ov34_0218617c: ; 0x0218617c
.word func_ov00_020c1bb4
.word _ZN5Actor12SetTransformEP9Transform
.global data_ov34_02186180
data_ov34_02186180: ; 0x02186180
.word func_ov00_020c1bf8
.word _ZN5Actor8vfunc_a8Ev
.global data_ov34_02186184
data_ov34_02186184: ; 0x02186184
.word func_ov00_020c31fc
.word _ZN5Actor8vfunc_acEv
.global data_ov34_02186188
data_ov34_02186188: ; 0x02186188
.word func_ov00_020c322c
.word _ZN5Actor8vfunc_b0Ev
.global data_ov34_0218618c
data_ov34_0218618c: ; 0x0218618c
.byte 0x00, 0x00, 0x00, 0x00
asm/ov35.inc
+58 -58
View File
@@ -4,8 +4,65 @@
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN11ItemManager7AddItemEi
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl14CheckTouchFastEj
.extern _ZN13PlayerControl14IsTouchingFastEv
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor20KillPickupItemActorsEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_02050f54
@@ -91,7 +148,6 @@
.extern func_02036ce4
.extern func_0203e784
.extern func_0203e7b4
.extern strncpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -174,64 +230,7 @@
.extern func_ov00_020c0d70
.extern func_ov00_020c0e04
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c198c
.extern func_ov00_020c1b18
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c20
.extern func_ov00_020c1c50
.extern func_ov00_020c1e2c
.extern func_ov00_020c1fc8
.extern func_ov00_020c23c4
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c28d4
.extern func_ov00_020c28ec
.extern func_ov00_020c2974
.extern func_ov00_020c2a0c
.extern func_ov00_020c2bf4
.extern func_ov00_020c3004
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c3200
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c53b0
@@ -298,3 +297,4 @@
.extern func_ov17_02168660
.extern func_ov17_021687f0
.extern gItemManager
.extern strncpy
asm/ov35.s
+217 -217
View File
File diff suppressed because it is too large Load Diff
asm/ov36.inc
+62 -62
View File
@@ -84,7 +84,6 @@
.extern func_02036ce4
.extern func_0203e784
.extern func_0203e7b4
.extern strncpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -166,68 +165,68 @@
.extern func_ov00_020c0d4c
.extern func_ov00_020c0e04
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c198c
.extern func_ov00_020c1b18
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c50
.extern func_ov00_020c1e2c
.extern func_ov00_020c1fc8
.extern func_ov00_020c23c4
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c2840
.extern func_ov00_020c288c
.extern func_ov00_020c28ec
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c2bf4
.extern func_ov00_020c3004
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor20KillPickupItemActorsEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor14StopLinkFollowEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c3894
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c54a0
.extern func_ov00_020c5c2c
@@ -270,3 +269,4 @@
.extern func_ov17_021687f0
.extern func_ov19_0216e7b0
.extern gItemManager
.extern strncpy
asm/ov36.s
+141 -141
View File
@@ -1190,7 +1190,7 @@ func_ov36_0217cc98: ; 0x0217cc98
func_ov36_0217ccd8: ; 0x0217ccd8
stmdb sp!, {r3, r4, r5, lr}
mov r4, r0
bl func_ov00_020c1554
bl _ZN5ActorC2Ev
ldr r5, _0217cf94 ; =data_ov36_02186d18
mov r1, r4
add r0, r4, #0x158
@@ -1504,7 +1504,7 @@ func_ov36_0217d044: ; 0x0217d044
add r0, r4, #0x178
blx func_ov00_020a95ec
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
ldmia sp!, {r4, pc}
.align 2, 0
@@ -1583,7 +1583,7 @@ func_ov36_0217d168: ; 0x0217d168
add r0, r4, #0x178
blx func_ov00_020a95ec
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
bl _ZN9SysObjectdlEPv
mov r0, r4
@@ -1655,7 +1655,7 @@ func_ov36_0217d2a0: ; 0x0217d2a0
ldr r0, _0217d68c ; =data_027e0fe4
add r1, sp, #0xc
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
str r0, [r5, #0x6b8]
_0217d368:
ldr r7, [r5, #0x6b8]
@@ -1959,7 +1959,7 @@ func_ov36_0217d7d4: ; 0x0217d7d4
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _0217d7f4
mov r0, r5
@@ -1981,7 +1981,7 @@ func_ov36_0217d810: ; 0x0217d810
sub sp, sp, #0x18
mov r5, r0
mov r4, r1
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _0217d9d8
mov r0, r5
@@ -2150,7 +2150,7 @@ func_ov36_0217da6c: ; 0x0217da6c
mov r4, r0
bl func_ov36_02184e10
mov r0, r4
bl func_ov00_020c2bf4
bl _ZN5Actor20IncreaseActiveFramesEv
mov r0, r4
bl func_ov36_021852fc
ldr r0, [r4, #0x130]
@@ -2366,7 +2366,7 @@ func_ov36_0217dd98: ; 0x0217dd98
stmdb sp!, {r4, lr}
mov r1, #0
mov r4, r0
bl func_ov00_020c1bfc
bl _ZN5Actor18func_Ov00_020c1bfcEi
cmp r0, #0
moveq r0, #0
streq r0, [r4, #0x138]
@@ -2398,7 +2398,7 @@ _0217ddfc: .word data_027e0e60
func_ov36_0217de00: ; 0x0217de00
stmdb sp!, {r4, lr}
mov r4, r0
bl func_ov00_020c198c
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
@@ -2420,7 +2420,7 @@ func_ov36_0217de00: ; 0x0217de00
mvn r2, #0
mov r1, #1
str r2, [r4, #0x98]
bl func_ov00_020c1908
bl _ZN5Actor10SetUnk_11cEc
mov r1, #1
add r0, r4, #0x158
strb r1, [r4, #0x11a]
@@ -2589,7 +2589,7 @@ _0217e0c0:
str r0, [r5, #0x6fc]
mov r0, r5
add r1, r5, #0x820
bl func_ov00_020c288c
bl _ZN5Actor12XzDistanceToEP5Vec3p
cmp r0, #0x800
ldrlt r6, [r5, #0x68]
mov r3, #0x1000
@@ -2731,7 +2731,7 @@ _0217e2dc:
ldr r2, _0217e3d8 ; =0x504c444d
ldr r1, [r1]
add r0, sp, #0x18
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r1, [sp, #0x18]
mvn r0, #0
cmp r1, r0
@@ -2739,7 +2739,7 @@ _0217e2dc:
ldr r0, _0217e3d4 ; =data_027e0fe4
add r1, sp, #0x18
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
str r0, [r5, #0x6b4]
_0217e314:
mvn r3, #0
@@ -2758,13 +2758,13 @@ _0217e314:
add r1, sp, #8
ldr r0, [r0]
add r2, sp, #0x2c
bl func_ov00_020c37ec
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
cmp r0, #0
beq _0217e37c
ldr r0, _0217e3d4 ; =data_027e0fe4
ldr r1, [sp, #0x2c]
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
movne r1, #0
strneb r1, [r0, #0x11a]
@@ -2983,7 +2983,7 @@ _0217e678:
bne _0217e694
mov r0, r4
add r1, r4, #0x14
bl func_ov00_020c2938
bl _ZN5Actor10GetAngleToEP5Vec3p
add r1, r4, #0x800
strh r0, [r1, #0x8e]
_0217e694:
@@ -3162,7 +3162,7 @@ _0217e868:
add r2, sp, #0x30
mov r0, r6
mov r1, #9
bl func_ov00_020c1e2c
bl _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
cmp r0, #0
beq _0217e934
ldr r1, [r6, #0x878]
@@ -3185,7 +3185,7 @@ _0217e868:
_0217e934:
add r0, sp, #4
mov r1, r6
bl func_ov00_020c23c4
bl _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
ldr r1, [sp, #4]
mvn r0, #0
cmp r1, r0
@@ -3193,7 +3193,7 @@ _0217e934:
ldr r0, _0217eb40 ; =data_027e0fe4
add r1, sp, #4
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
ldr r1, [r0, #4]
ldr r0, _0217eb44 ; =0x504c444d
cmp r1, r0
@@ -3661,7 +3661,7 @@ func_ov36_0217efc0: ; 0x0217efc0
cmp r0, #1
mov r0, r6
bne _0217f0a0
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
ldrsh r2, [r6, #0x78]
mov r4, r0
ldr r1, _0217f0b8 ; =0x00001555
@@ -3685,7 +3685,7 @@ _0217f02c:
cmp r0, #0x78
blt _0217f078
mov r0, r6
bl func_ov00_020c28ec
bl _ZN5Actor16XzDistanceToLinkEv
cmp r0, #0x5000
bge _0217f05c
ldr r0, _0217f0bc ; =0x00002aab
@@ -3844,7 +3844,7 @@ func_ov36_0217f21c: ; 0x0217f21c
ldr r1, [r4, #0x878]
tst r1, #0x100000
beq _0217f258
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
mov r1, r0
add r0, r4, #0x78
mov r2, #0x4b0
@@ -4054,7 +4054,7 @@ func_ov36_0217f4f4: ; 0x0217f4f4
stmdb sp!, {r4, r5, r6, r7, lr}
sub sp, sp, #0x7c
mov r5, r0
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
mov r1, r0
add r0, r5, #0x78
mov r2, #0x3e8
@@ -4078,7 +4078,7 @@ func_ov36_0217f4f4: ; 0x0217f4f4
add r1, sp, #4
ldr r0, [r0]
add r2, sp, #0x70
bl func_ov00_020c37ec
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
ldr r1, [sp, #0xc]
mov r0, r6
cmp r1, r0
@@ -4086,7 +4086,7 @@ func_ov36_0217f4f4: ; 0x0217f4f4
ldr r0, _0217f96c ; =data_027e0fe4
mov r1, r4
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
str r0, [r5, #0x6bc]
ldrb r0, [r5, #0xa4]
cmp r0, #0
@@ -4251,12 +4251,12 @@ _0217f7d4:
add r1, r5, #0x800
mov r2, #0
strh r2, [r1, #0x90]
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
add r1, r5, #0x800
strh r0, [r1, #0x8e]
_0217f7fc:
mov r0, r5
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
mov r1, r0
add r0, r5, #0x78
mov r2, #0x190
@@ -4694,7 +4694,7 @@ func_ov36_0217fe3c: ; 0x0217fe3c
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #0x48
mov r5, r0
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
mov r1, r0
add r0, r5, #0x78
mov r2, #0x190
@@ -5448,7 +5448,7 @@ _02180860:
tst r0, #8
bne _0218091c
mov r0, r7
bl func_ov00_020c198c
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
beq _0218091c
add r0, sp, #0x24
@@ -5493,7 +5493,7 @@ _0218091c:
bl func_02036ce4
mov r0, r7
mov r1, #1
bl func_ov00_020c1908
bl _ZN5Actor10SetUnk_11cEc
add r1, r7, #0x3b4
ldr r0, _021809a0 ; =data_027e0c68
add r1, r1, #0x400
@@ -5920,7 +5920,7 @@ _02180f44:
add r1, r5, #0x18
ldr r0, [r0]
add r1, r1, #0x800
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r4, r0
beq _02181000
ldrh r1, [r4, #0x78]
@@ -6060,7 +6060,7 @@ _02181138:
cmp r1, #0x1e
addlt sp, sp, #0x118
ldmltia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
bl func_ov00_020c198c
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
beq _0218116c
ldr r0, _02181544 ; =gItemManager
@@ -6343,7 +6343,7 @@ func_ov36_0218156c: ; 0x0218156c
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
sub sp, sp, #0x118
mov r4, r0
bl func_ov00_020c198c
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x118
mov r0, #0
@@ -6928,7 +6928,7 @@ _02181dc8:
mov r2, r1
bl func_ov00_0207c5d4
mov r0, r4
bl func_ov00_020c198c
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x14
ldmeqia sp!, {r3, r4, pc}
@@ -7879,7 +7879,7 @@ _02182a7c:
bl func_ov00_02097810
str r0, [r4, #0x66c]
mov r0, r4
bl func_ov00_020c1b18
bl _ZN5Actor20KillPickupItemActorsEv
mvn r1, #0
str r1, [r4, #0x88]
add r0, sp, #0x74
@@ -8167,7 +8167,7 @@ _02183030:
mov r2, #0
mov r0, r4
strb r2, [r1, #0x118]
bl func_ov00_020c3180
bl _ZN5Actor4KillEv
add sp, sp, #0x18
ldmia sp!, {r4, pc}
.align 2, 0
@@ -8228,7 +8228,7 @@ func_ov36_021830e8: ; 0x021830e8
cmp r4, r0
bne _021831f4
mov r0, r5
bl func_ov00_020c28ec
bl _ZN5Actor16XzDistanceToLinkEv
mov r4, r0
cmp r4, #0x14000
bge _021831f4
@@ -8243,7 +8243,7 @@ func_ov36_021830e8: ; 0x021830e8
strh r1, [r0, #0xa0]
_0218314c:
mov r0, r5
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
ldrsh r2, [r5, #0x78]
ldr r1, _02183200 ; =0x00001555
sub r0, r0, r2
@@ -8310,11 +8310,11 @@ func_ov36_02183204: ; 0x02183204
movne r0, #0
ldmneia sp!, {r3, r4, r5, pc}
mov r1, #8
bl func_ov00_020c1fc8
bl _ZN5Actor18func_ov00_020c1fc8Ej
cmp r0, #0
beq _021834e8
mov r0, r5
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
mov r4, r0
add r1, r4, #0x8000
add r0, r5, #0x800
@@ -8520,7 +8520,7 @@ func_ov36_02183504: ; 0x02183504
ldr r2, _02183a0c ; =0x424d5459
ldr r1, [r1]
add r0, sp, #8
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, [sp, #8]
str r0, [r5, #0x810]
ldr r0, [sp, #0xc]
@@ -8531,7 +8531,7 @@ _0218354c:
ldr r0, _02183a08 ; =data_027e0fe4
add r1, r5, #0x810
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
movs r4, r0
beq _021839f4
add r0, r5, #0x48
@@ -8591,7 +8591,7 @@ _02183614:
addge sp, sp, #0x14c
ldmgeia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
mov r0, r5
bl func_ov00_020c198c
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x14c
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
@@ -9930,7 +9930,7 @@ func_ov36_02184938: ; 0x02184938
ldr r2, _021849e0 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #8
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, [sp, #8]
add r3, sp, #8
str r0, [r4, #0x7dc]
@@ -9947,7 +9947,7 @@ func_ov36_02184938: ; 0x02184938
add r1, sp, #0
ldr r0, [r0]
add r2, sp, #0x10
bl func_ov00_020c37ec
bl _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
cmp r0, #0
beq _021849d0
ldr r1, [sp, #0x10]
@@ -10417,7 +10417,7 @@ _02185008:
mov r0, #2
ldmia sp!, {r3, r4, r5, r6, pc}
_02185028:
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
add r1, r6, #0x800
strh r0, [r1, #0x8e]
add sp, sp, #0xc
@@ -10461,7 +10461,7 @@ _02185090:
_021850ac:
add r1, sp, #0
mov r0, r4
bl func_ov00_020c2938
bl _ZN5Actor10GetAngleToEP5Vec3p
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
@@ -10820,7 +10820,7 @@ func_ov36_021854e8: ; 0x021854e8
bl func_02036ce4
mov r0, r4
mov r1, #1
bl func_ov00_020c1908
bl _ZN5Actor10SetUnk_11cEc
ldr r0, [r4, #0x878]
orr r0, r0, #0xc00
str r0, [r4, #0x878]
@@ -10987,7 +10987,7 @@ _0218577c:
str r0, [r7, #0x878]
b _0218581c
_021857a8:
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
ldr r1, _02185854 ; =data_027e0fa0
mov r4, r0, lsl #0x10
ldr r0, [r1]
@@ -11025,7 +11025,7 @@ _0218581c:
ldr r3, [r3, #0x6c]
blx r3
mov r0, r7
bl func_ov00_020c2840
bl _ZN5Actor14StopLinkFollowEv
add r0, r7, #0x800
mov r1, #0xa
strh r1, [r0, #0x88]
@@ -11139,7 +11139,7 @@ func_ov36_021858f0: ; 0x021858f0
str r1, [r4, #0x84]
mov r1, #2
str r2, [r4, #0x88]
bl func_ov00_020c1fc8
bl _ZN5Actor18func_ov00_020c1fc8Ej
cmp r0, #0
beq _02185a24
_021859d0:
@@ -11184,13 +11184,13 @@ _02185a24:
str r1, [r4, #0x84]
mov r1, #0x18
str r2, [r4, #0x88]
bl func_ov00_020c1fc8
bl _ZN5Actor18func_ov00_020c1fc8Ej
cmp r0, #0
bne _021859d0
mov r1, #0
mov r0, r4
mov r2, r1
bl func_ov00_020c243c
bl _ZN5Actor18func_ov00_020c243cEiPi
cmp r0, #0
bne _021859d0
ldr r1, [sp, #0x28]
@@ -11211,20 +11211,20 @@ _02185a24:
ldr r3, [sp, #0x24]
str r3, [r4, #0x88]
strb r2, [r4, #0x8ad]
bl func_ov00_020c1fc8
bl _ZN5Actor18func_ov00_020c1fc8Ej
mov r1, #0
mov r0, r4
mov r2, r1
bl func_ov00_020c243c
bl _ZN5Actor18func_ov00_020c243cEiPi
add sp, sp, #0x34
ldmia sp!, {r3, r4, pc}
_02185af4:
mov r1, #0x10
bl func_ov00_020c1fc8
bl _ZN5Actor18func_ov00_020c1fc8Ej
mov r1, #0
mov r0, r4
mov r2, r1
bl func_ov00_020c243c
bl _ZN5Actor18func_ov00_020c243cEiPi
add sp, sp, #0x34
ldmia sp!, {r3, r4, pc}
.align 2, 0
@@ -11610,7 +11610,7 @@ _02186028: .word data_027e0fe0
func_ov36_0218602c: ; 0x0218602c
stmdb sp!, {r4, lr}
mov r4, r0
bl func_ov00_020c1554
bl _ZN5ActorC2Ev
ldr r0, _02186074 ; =data_ov36_02186eec
mov r1, #0
str r0, [r4]
@@ -11648,7 +11648,7 @@ func_ov36_02186078: ; 0x02186078
add r0, r4, #0x158
bl func_ov00_020b7df0
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
ldmia sp!, {r4, pc}
arm_func_end func_ov36_02186078
@@ -11671,7 +11671,7 @@ func_ov36_021860c0: ; 0x021860c0
add r0, r4, #0x158
bl func_ov00_020b7df0
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
bl _ZN9SysObjectdlEPv
mov r0, r4
@@ -11799,11 +11799,11 @@ func_ov36_021862b8: ; 0x021862b8
sub sp, sp, #0x14
mov r5, r0
mov r4, r1
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _02186620
mov r0, r5
bl func_ov00_020c2bf4
bl _ZN5Actor20IncreaseActiveFramesEv
ldr r0, [r5, #0x130]
cmp r0, #0
bne _021864cc
@@ -12003,7 +12003,7 @@ _021865a4:
ldr r0, _02186640 ; =data_027e0fe4
add r1, r5, #0x34
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
beq _021865e4
bl func_ov36_02185410
@@ -12016,14 +12016,14 @@ _021865f4:
mov r0, r5
mov r1, #1
mov r2, #0
bl func_ov00_020c1e2c
bl _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
add r0, sp, #0
mov r1, r5
bl func_ov00_020c23c4
bl _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
ldr r1, _02186644 ; =data_ov36_02186ba8
mov r0, r5
mov r2, #0
bl func_ov00_020c243c
bl _ZN5Actor18func_ov00_020c243cEiPi
_02186620:
mov r1, r4
add r0, r5, #0xa4
@@ -13142,10 +13142,10 @@ data_ov36_02186d20: ; 0x02186d20
.word func_ov36_0217d2a0 ; func_ov40_0217d2a0
.global data_ov36_02186d24
data_ov36_02186d24: ; 0x02186d24
.word func_ov00_020c173c
.word _ZN5Actor8vfunc_0cEv
.global data_ov36_02186d28
data_ov36_02186d28: ; 0x02186d28
.word func_ov00_020c1740
.word _ZN5Actor8vfunc_10Ej
.global data_ov36_02186d2c
data_ov36_02186d2c: ; 0x02186d2c
.word func_ov36_0217d7d4
@@ -13160,112 +13160,112 @@ data_ov36_02186d38: ; 0x02186d38
.word func_ov36_02184624
.global data_ov36_02186d3c
data_ov36_02186d3c: ; 0x02186d3c
.word func_ov00_020c1744
.word _ZN5Actor8vfunc_24Ev
.global data_ov36_02186d40
data_ov36_02186d40: ; 0x02186d40
.word func_ov00_020c1748
.word _ZN5Actor8vfunc_28Ev
.global data_ov36_02186d44
data_ov36_02186d44: ; 0x02186d44
.word func_ov00_020c17a8
.word _ZN5Actor8vfunc_2cEv
.global data_ov36_02186d48
data_ov36_02186d48: ; 0x02186d48
.word func_ov00_020c17b0
.word _ZN5Actor8vfunc_30Ev
.global data_ov36_02186d4c
data_ov36_02186d4c: ; 0x02186d4c
.word func_ov00_020c174c
.word _ZN5Actor12GetOffsetPosEP5Vec3p
.global data_ov36_02186d50
data_ov36_02186d50: ; 0x02186d50
.word func_ov00_020c177c
.word _ZN5Actor8vfunc_38Ev
.global data_ov36_02186d54
data_ov36_02186d54: ; 0x02186d54
.word func_ov00_020c27e4
.word _ZN5Actor16CollidesWithLinkEv
.global data_ov36_02186d58
data_ov36_02186d58: ; 0x02186d58
.word func_ov00_020c3004
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov36_02186d5c
data_ov36_02186d5c: ; 0x02186d5c
.word func_ov00_020c2744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov36_02186d60
data_ov36_02186d60: ; 0x02186d60
.word func_ov36_02183b7c
.global data_ov36_02186d64
data_ov36_02186d64: ; 0x02186d64
.word func_ov00_020c1c50
.word _ZN5Actor8vfunc_4cEPi
.global data_ov36_02186d68
data_ov36_02186d68: ; 0x02186d68
.word func_ov00_020c310c
.word _ZN5Actor6GetPosEv
.global data_ov36_02186d6c
data_ov36_02186d6c: ; 0x02186d6c
.word func_ov00_020c3114
.word _ZN5Actor8vfunc_54Ev
.global data_ov36_02186d70
data_ov36_02186d70: ; 0x02186d70
.word func_ov00_020c18a8
.word _ZN5Actor10SetUnk_11bEv
.global data_ov36_02186d74
data_ov36_02186d74: ; 0x02186d74
.word func_ov00_020c18c4
.word _ZN5Actor11SetVelocityEP5Vec3p
.global data_ov36_02186d78
data_ov36_02186d78: ; 0x02186d78
.word func_ov00_020c18fc
.word _ZN5Actor8vfunc_60Ev
.global data_ov36_02186d7c
data_ov36_02186d7c: ; 0x02186d7c
.word func_ov00_020c1904
.word _ZN5Actor8vfunc_64Ev
.global data_ov36_02186d80
data_ov36_02186d80: ; 0x02186d80
.word func_ov00_020c1910
.word _ZN5Actor8vfunc_68Ev
.global data_ov36_02186d84
data_ov36_02186d84: ; 0x02186d84
.word func_ov36_021849e4
.global data_ov36_02186d88
data_ov36_02186d88: ; 0x02186d88
.word func_ov00_020c191c
.word _ZN5Actor8vfunc_70Ev
.global data_ov36_02186d8c
data_ov36_02186d8c: ; 0x02186d8c
.word func_ov00_020c1924
.word _ZN5Actor8vfunc_74Ev
.global data_ov36_02186d90
data_ov36_02186d90: ; 0x02186d90
.word func_ov36_02184938
.global data_ov36_02186d94
data_ov36_02186d94: ; 0x02186d94
.word func_ov00_020c1928
.word _ZN5Actor8vfunc_7cEv
.global data_ov36_02186d98
data_ov36_02186d98: ; 0x02186d98
.word func_ov00_020c1934
.word _ZN5Actor8vfunc_80Ev
.global data_ov36_02186d9c
data_ov36_02186d9c: ; 0x02186d9c
.word func_ov00_020c1938
.word _ZN5Actor8vfunc_84Ev
.global data_ov36_02186da0
data_ov36_02186da0: ; 0x02186da0
.word func_ov00_020c193c
.word _ZN5Actor8vfunc_88Ev
.global data_ov36_02186da4
data_ov36_02186da4: ; 0x02186da4
.word func_ov00_020c1940
.word _ZN5Actor8vfunc_8cEv
.global data_ov36_02186da8
data_ov36_02186da8: ; 0x02186da8
.word func_ov00_020c1948
.word _ZN5Actor8vfunc_90Ev
.global data_ov36_02186dac
data_ov36_02186dac: ; 0x02186dac
.word func_ov00_020c1950
.word _ZN5Actor8vfunc_94Ev
.global data_ov36_02186db0
data_ov36_02186db0: ; 0x02186db0
.word func_ov00_020c1954
.word _ZN5Actor8vfunc_98Ev
.global data_ov36_02186db4
data_ov36_02186db4: ; 0x02186db4
.word func_ov00_020c1958
.word _ZN5Actor8vfunc_9cEv
.global data_ov36_02186db8
data_ov36_02186db8: ; 0x02186db8
.word func_ov00_020c1b6c
.word _ZN5Actor15TrySetTransformEP9Transform
.global data_ov36_02186dbc
data_ov36_02186dbc: ; 0x02186dbc
.word func_ov00_020c1bb4
.word _ZN5Actor12SetTransformEP9Transform
.global data_ov36_02186dc0
data_ov36_02186dc0: ; 0x02186dc0
.word func_ov00_020c1bf8
.word _ZN5Actor8vfunc_a8Ev
.global data_ov36_02186dc4
data_ov36_02186dc4: ; 0x02186dc4
.word func_ov00_020c31fc
.word _ZN5Actor8vfunc_acEv
.global data_ov36_02186dc8
data_ov36_02186dc8: ; 0x02186dc8
.word func_ov00_020c322c
.word _ZN5Actor8vfunc_b0Ev
.global data_ov36_02186dcc
data_ov36_02186dcc: ; 0x02186dcc
.byte 0x00, 0x00, 0x00, 0x00
@@ -13458,130 +13458,130 @@ data_ov36_02186ef4: ; 0x02186ef4
.word func_ov36_02186110
.global data_ov36_02186ef8
data_ov36_02186ef8: ; 0x02186ef8
.word func_ov00_020c173c
.word _ZN5Actor8vfunc_0cEv
.global data_ov36_02186efc
data_ov36_02186efc: ; 0x02186efc
.word func_ov00_020c1740
.word _ZN5Actor8vfunc_10Ej
.global data_ov36_02186f00
data_ov36_02186f00: ; 0x02186f00
.word func_ov36_021862b8
.global data_ov36_02186f04
data_ov36_02186f04: ; 0x02186f04
.word func_ov00_020c17bc
.word _ZN5Actor8vfunc_18Ej
.global data_ov36_02186f08
data_ov36_02186f08: ; 0x02186f08
.word func_ov00_020c17d4
.word _ZN5Actor8vfunc_1cEt
.global data_ov36_02186f0c
data_ov36_02186f0c: ; 0x02186f0c
.word func_ov00_020c1894
.word _ZN5Actor8vfunc_20Ei
.global data_ov36_02186f10
data_ov36_02186f10: ; 0x02186f10
.word func_ov00_020c1744
.word _ZN5Actor8vfunc_24Ev
.global data_ov36_02186f14
data_ov36_02186f14: ; 0x02186f14
.word func_ov00_020c1748
.word _ZN5Actor8vfunc_28Ev
.global data_ov36_02186f18
data_ov36_02186f18: ; 0x02186f18
.word func_ov00_020c17a8
.word _ZN5Actor8vfunc_2cEv
.global data_ov36_02186f1c
data_ov36_02186f1c: ; 0x02186f1c
.word func_ov00_020c17b0
.word _ZN5Actor8vfunc_30Ev
.global data_ov36_02186f20
data_ov36_02186f20: ; 0x02186f20
.word func_ov00_020c174c
.word _ZN5Actor12GetOffsetPosEP5Vec3p
.global data_ov36_02186f24
data_ov36_02186f24: ; 0x02186f24
.word func_ov00_020c177c
.word _ZN5Actor8vfunc_38Ev
.global data_ov36_02186f28
data_ov36_02186f28: ; 0x02186f28
.word func_ov00_020c27e4
.word _ZN5Actor16CollidesWithLinkEv
.global data_ov36_02186f2c
data_ov36_02186f2c: ; 0x02186f2c
.word func_ov00_020c3004
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov36_02186f30
data_ov36_02186f30: ; 0x02186f30
.word func_ov00_020c2744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov36_02186f34
data_ov36_02186f34: ; 0x02186f34
.word func_ov36_02186648
.global data_ov36_02186f38
data_ov36_02186f38: ; 0x02186f38
.word func_ov00_020c1c50
.word _ZN5Actor8vfunc_4cEPi
.global data_ov36_02186f3c
data_ov36_02186f3c: ; 0x02186f3c
.word func_ov00_020c310c
.word _ZN5Actor6GetPosEv
.global data_ov36_02186f40
data_ov36_02186f40: ; 0x02186f40
.word func_ov00_020c3114
.word _ZN5Actor8vfunc_54Ev
.global data_ov36_02186f44
data_ov36_02186f44: ; 0x02186f44
.word func_ov00_020c18a8
.word _ZN5Actor10SetUnk_11bEv
.global data_ov36_02186f48
data_ov36_02186f48: ; 0x02186f48
.word func_ov00_020c18c4
.word _ZN5Actor11SetVelocityEP5Vec3p
.global data_ov36_02186f4c
data_ov36_02186f4c: ; 0x02186f4c
.word func_ov00_020c18fc
.word _ZN5Actor8vfunc_60Ev
.global data_ov36_02186f50
data_ov36_02186f50: ; 0x02186f50
.word func_ov00_020c1904
.word _ZN5Actor8vfunc_64Ev
.global data_ov36_02186f54
data_ov36_02186f54: ; 0x02186f54
.word func_ov00_020c1910
.word _ZN5Actor8vfunc_68Ev
.global data_ov36_02186f58
data_ov36_02186f58: ; 0x02186f58
.word func_ov00_020c1914
.word _ZN5Actor8vfunc_6cEv
.global data_ov36_02186f5c
data_ov36_02186f5c: ; 0x02186f5c
.word func_ov00_020c191c
.word _ZN5Actor8vfunc_70Ev
.global data_ov36_02186f60
data_ov36_02186f60: ; 0x02186f60
.word func_ov00_020c1924
.word _ZN5Actor8vfunc_74Ev
.global data_ov36_02186f64
data_ov36_02186f64: ; 0x02186f64
.word func_ov00_020c192c
.word _ZN5Actor8vfunc_78Ev
.global data_ov36_02186f68
data_ov36_02186f68: ; 0x02186f68
.word func_ov00_020c1928
.word _ZN5Actor8vfunc_7cEv
.global data_ov36_02186f6c
data_ov36_02186f6c: ; 0x02186f6c
.word func_ov00_020c1934
.word _ZN5Actor8vfunc_80Ev
.global data_ov36_02186f70
data_ov36_02186f70: ; 0x02186f70
.word func_ov00_020c1938
.word _ZN5Actor8vfunc_84Ev
.global data_ov36_02186f74
data_ov36_02186f74: ; 0x02186f74
.word func_ov00_020c193c
.word _ZN5Actor8vfunc_88Ev
.global data_ov36_02186f78
data_ov36_02186f78: ; 0x02186f78
.word func_ov00_020c1940
.word _ZN5Actor8vfunc_8cEv
.global data_ov36_02186f7c
data_ov36_02186f7c: ; 0x02186f7c
.word func_ov00_020c1948
.word _ZN5Actor8vfunc_90Ev
.global data_ov36_02186f80
data_ov36_02186f80: ; 0x02186f80
.word func_ov00_020c1950
.word _ZN5Actor8vfunc_94Ev
.global data_ov36_02186f84
data_ov36_02186f84: ; 0x02186f84
.word func_ov00_020c1954
.word _ZN5Actor8vfunc_98Ev
.global data_ov36_02186f88
data_ov36_02186f88: ; 0x02186f88
.word func_ov00_020c1958
.word _ZN5Actor8vfunc_9cEv
.global data_ov36_02186f8c
data_ov36_02186f8c: ; 0x02186f8c
.word func_ov00_020c1b6c
.word _ZN5Actor15TrySetTransformEP9Transform
.global data_ov36_02186f90
data_ov36_02186f90: ; 0x02186f90
.word func_ov00_020c1bb4
.word _ZN5Actor12SetTransformEP9Transform
.global data_ov36_02186f94
data_ov36_02186f94: ; 0x02186f94
.word func_ov00_020c1bf8
.word _ZN5Actor8vfunc_a8Ev
.global data_ov36_02186f98
data_ov36_02186f98: ; 0x02186f98
.word func_ov00_020c31fc
.word _ZN5Actor8vfunc_acEv
.global data_ov36_02186f9c
data_ov36_02186f9c: ; 0x02186f9c
.word func_ov00_020c322c
.word _ZN5Actor8vfunc_b0Ev
; 0x02186fa0
.bss
asm/ov37.inc
+62 -62
View File
@@ -4,6 +4,67 @@
.extern _ZN10PlayerBase10SetVisibleEb
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1c20Eiii
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor20KillPickupItemActorsEv
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_02050f54
@@ -72,7 +133,6 @@
.extern func_02036140
.extern func_0203e784
.extern func_0203e7b4
.extern strncpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -136,68 +196,7 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b18
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c20
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1ef8
.extern func_ov00_020c1f5c
.extern func_ov00_020c1fc8
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c288c
.extern func_ov00_020c28ec
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c2a0c
.extern func_ov00_020c2bf4
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c35d8
.extern func_ov00_020c3674
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -277,3 +276,4 @@
.extern func_ov17_02168660
.extern func_ov17_021687f0
.extern gItemManager
.extern strncpy
asm/ov37.s
+264 -264
View File
File diff suppressed because it is too large Load Diff
asm/ov38.inc
+53 -53
View File
@@ -95,7 +95,6 @@
.extern func_02036ce4
.extern func_0203e784
.extern func_0203e7b4
.extern strcpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -150,59 +149,59 @@
.extern func_ov00_020c0e04
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c198c
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1e2c
.extern func_ov00_020c1fc8
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c2974
.extern func_ov00_020c2a0c
.extern func_ov00_020c2e7c
.extern func_ov00_020c3004
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5Actor18func_ov00_020c2e7cEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c3894
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
@@ -274,3 +273,4 @@
.extern func_ov29_02178670
.extern func_ov57_02199e24
.extern gItemManager
.extern strcpy
asm/ov38.s
+132 -132
View File
@@ -162,11 +162,11 @@ func_ov38_0217bf48: ; 0x0217bf48
ldr r2, _0217c034 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0x10
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217c030 ; =data_027e0fe4
add r1, sp, #0x10
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #1
strb r1, [r0, #0x28d]
strb r1, [r0, #0x3c1]
@@ -178,7 +178,7 @@ func_ov38_0217bf48: ; 0x0217bf48
ldr r2, _0217c03c ; =0x57534e56
ldr r1, [r1]
add r0, sp, #8
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217c030 ; =data_027e0fe4
ldr r3, [sp, #8]
ldr r2, [sp, #0xc]
@@ -186,14 +186,14 @@ func_ov38_0217bf48: ; 0x0217bf48
add r1, sp, #0x10
str r3, [sp, #0x10]
str r2, [sp, #0x14]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #1
strb r1, [r0, #0x28d]
ldr r1, _0217c030 ; =data_027e0fe4
ldr r2, _0217c040 ; =0x46434e56
ldr r1, [r1]
add r0, sp, #0
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, [sp, #4]
ldr r1, [sp]
str r0, [sp, #0x14]
@@ -201,7 +201,7 @@ func_ov38_0217bf48: ; 0x0217bf48
str r1, [sp, #0x10]
ldr r0, [r0]
add r1, sp, #0x10
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #1
strb r1, [r0, #0x28d]
ldr r0, _0217c044 ; =data_ov00_020eec9c
@@ -234,11 +234,11 @@ func_ov38_0217c050: ; 0x0217c050
ldr r2, _0217c12c ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0x10
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217c128 ; =data_027e0fe4
add r1, sp, #0x10
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #0
strb r1, [r0, #0x28d]
strb r1, [r0, #0x3c1]
@@ -246,7 +246,7 @@ func_ov38_0217c050: ; 0x0217c050
ldr r2, _0217c130 ; =0x57534e56
ldr r1, [r1]
add r0, sp, #8
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217c128 ; =data_027e0fe4
ldr r3, [sp, #8]
ldr r2, [sp, #0xc]
@@ -254,14 +254,14 @@ func_ov38_0217c050: ; 0x0217c050
add r1, sp, #0x10
str r3, [sp, #0x10]
str r2, [sp, #0x14]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #0
strb r1, [r0, #0x28d]
ldr r1, _0217c128 ; =data_027e0fe4
ldr r2, _0217c134 ; =0x46434e56
ldr r1, [r1]
add r0, sp, #0
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, [sp, #4]
ldr r1, [sp]
str r0, [sp, #0x14]
@@ -269,7 +269,7 @@ func_ov38_0217c050: ; 0x0217c050
str r1, [sp, #0x10]
ldr r0, [r0]
add r1, sp, #0x10
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #0
strb r1, [r0, #0x28d]
ldr r0, _0217c138 ; =data_ov00_020eec9c
@@ -617,7 +617,7 @@ func_ov38_0217c5d4: ; 0x0217c5d4
stmdb sp!, {r3, r4, lr}
sub sp, sp, #4
mov r4, r0
bl func_ov00_020c1554
bl _ZN5ActorC2Ev
ldr r1, _0217c75c ; =data_ov38_02188f38
ldr r0, _0217c760 ; =data_027e0fec
str r1, [r4]
@@ -795,7 +795,7 @@ _0217c7fc:
add r0, r4, #0x158
blx func_ov00_020a95a4
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
ldmia sp!, {r4, pc}
.align 2, 0
@@ -858,7 +858,7 @@ _0217c8dc:
add r0, r4, #0x158
blx func_ov00_020a95a4
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
bl _ZN9SysObjectdlEPv
mov r0, r4
@@ -1584,7 +1584,7 @@ _0217d30c:
bl func_ov00_020c4048
ldr r0, [fp]
mov r1, r6
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
str r0, [r5, sb, lsl #2]
str sl, [r0, #0x204]
add sb, sb, #1
@@ -1642,17 +1642,17 @@ _0217d360:
ldr r2, _0217d55c ; =0x42524d31
ldr r1, [r1]
add r0, sp, #0xc
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217d550 ; =data_027e0fe4
add r1, sp, #0xc
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
str r0, [sl, #0xff4]
ldr r1, _0217d550 ; =data_027e0fe4
ldr r2, _0217d560 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #4
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217d550 ; =data_027e0fe4
ldr r3, [sp, #4]
ldr r2, [sp, #8]
@@ -1660,7 +1660,7 @@ _0217d360:
add r1, sp, #0xc
str r3, [sp, #0xc]
str r2, [sp, #0x10]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
str r0, [sl, #0xff8]
mov r0, sl
mov r1, #0
@@ -2025,7 +2025,7 @@ func_ov38_0217d918: ; 0x0217d918
bge _0217d9f0
add r1, sp, #0xc
mov r0, r7
bl func_ov00_020c2a0c
bl _ZN5Actor9GetHitboxEP8Cylinder
add r2, sp, #0xc
mov r0, r5
mov r1, r6
@@ -2883,7 +2883,7 @@ _0217e5b8:
cmp r4, r0
bge _0217e618
mov r0, r7
bl func_ov00_020c198c
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
beq _0217e618
add r0, r7, #0x1000
@@ -2958,7 +2958,7 @@ func_ov38_0217e688: ; 0x0217e688
beq _0217e768
add r1, sp, #0
mov r0, r4
bl func_ov00_020c2a0c
bl _ZN5Actor9GetHitboxEP8Cylinder
add r2, sp, #0
mov r0, r5
mov r1, r6
@@ -2976,7 +2976,7 @@ _0217e71c:
mov r0, r7
ldmia sp!, {r3, r4, r5, r6, r7, pc}
_0217e73c:
bl func_ov00_020c2e7c
bl _ZN5Actor18func_ov00_020c2e7cEv
cmp r0, #0
beq _0217e768
add r0, r4, #0x1000
@@ -3948,7 +3948,7 @@ _0217f4e4:
str r1, [r0, #0x54]
_0217f4ec:
mov r0, r4
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
add r1, r4, #0x1000
strh r0, [r1, #0x7c]
_0217f4fc:
@@ -4026,10 +4026,10 @@ _0217f608:
mov r1, #0
mov r0, r4
mov r2, r1
bl func_ov00_020c243c
bl _ZN5Actor18func_ov00_020c243cEiPi
mov r0, r4
mov r1, #0x1a
bl func_ov00_020c1fc8
bl _ZN5Actor18func_ov00_020c1fc8Ej
mov r0, r4
bl func_ov38_0217d6d8
ldr r3, [r4, #0xf60]
@@ -4394,10 +4394,10 @@ _0217fb24:
mov r1, #0
mov r0, r4
mov r2, r1
bl func_ov00_020c243c
bl _ZN5Actor18func_ov00_020c243cEiPi
mov r0, r4
mov r1, #0x1a
bl func_ov00_020c1fc8
bl _ZN5Actor18func_ov00_020c1fc8Ej
ldmia sp!, {r3, r4, r5, pc}
arm_func_end func_ov38_0217fa40
@@ -4506,10 +4506,10 @@ _0217fc7c:
mov r0, r4
mov r2, r1
strb r1, [r3, #0xa7]
bl func_ov00_020c243c
bl _ZN5Actor18func_ov00_020c243cEiPi
mov r0, r4
mov r1, #0x1a
bl func_ov00_020c1fc8
bl _ZN5Actor18func_ov00_020c1fc8Ej
_0217fcb4:
mov r0, r4
bl func_ov38_0217dad0
@@ -5375,7 +5375,7 @@ _021808cc:
str r2, [sp, #0x28]
str r2, [sp, #0x2c]
str r1, [sp, #0x30]
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
mov r1, r0
add r0, sp, #0x28
bl func_ov00_020a61ac
@@ -5906,7 +5906,7 @@ _02181020:
addne sp, sp, #0x50
ldmneia sp!, {r4, r5, r6, pc}
mov r0, r4
bl func_ov00_020c198c
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
addeq sp, sp, #0x50
ldmeqia sp!, {r4, r5, r6, pc}
@@ -6863,7 +6863,7 @@ _02181dbc:
mov r1, #0
mov r0, r5
mov r2, r1
bl func_ov00_020c243c
bl _ZN5Actor18func_ov00_020c243cEiPi
add r1, r5, #0x1000
add r0, r5, #0x38
ldr r1, [r1, #0x3c]
@@ -7352,7 +7352,7 @@ _02182498:
mov r1, #2
mov r2, #0
str r4, [r3, #0x54]
bl func_ov00_020c1e2c
bl _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
cmp r0, #0
beq _021824e0
ldr r0, _02182558 ; =data_027e0ffc
@@ -7382,11 +7382,11 @@ _021824e0:
_02182528:
mov r0, r6
mov r1, #0x1a
bl func_ov00_020c1fc8
bl _ZN5Actor18func_ov00_020c1fc8Ej
mov r1, #0
mov r0, r6
mov r2, r1
bl func_ov00_020c243c
bl _ZN5Actor18func_ov00_020c243cEiPi
add sp, sp, #0x10
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
@@ -8607,7 +8607,7 @@ _021835f4:
mov r1, #0x1a
str r3, [r5, #0x84]
str r2, [r5, #0x88]
bl func_ov00_020c1fc8
bl _ZN5Actor18func_ov00_020c1fc8Ej
cmp r0, #0
moveq r0, #1
movne r0, #0
@@ -8651,11 +8651,11 @@ _021836c8:
mov r1, #0x1a
str r3, [r5, #0x84]
str r2, [r5, #0x88]
bl func_ov00_020c1fc8
bl _ZN5Actor18func_ov00_020c1fc8Ej
mov r1, #0
mov r0, r5
mov r2, r1
bl func_ov00_020c243c
bl _ZN5Actor18func_ov00_020c243cEiPi
_0218376c:
mov r0, r5
bl func_ov38_02182db8
@@ -8712,7 +8712,7 @@ func_ov38_0218381c: ; 0x0218381c
sub sp, sp, #0x24
mov r5, r0
mov r4, r1
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _02183a7c
mov r0, r5
@@ -8886,7 +8886,7 @@ func_ov38_02183aa4: ; 0x02183aa4
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _02183b48
ldr r1, [r5, #0x2e8]
@@ -8981,7 +8981,7 @@ _02183be0:
_02183bf4:
add r1, sp, #0
mov r0, r5
bl func_ov00_020c2a0c
bl _ZN5Actor9GetHitboxEP8Cylinder
ldr r0, [r4]
ldr r1, [r4, #8]
bl func_01ffa0f4
@@ -9405,7 +9405,7 @@ func_ov38_02184120: ; 0x02184120
ldr r0, _021841dc ; =data_027e0fe4
add r1, sp, #8
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
add sp, sp, #0x48
ldmia sp!, {r4, pc}
.align 2, 0
@@ -9443,7 +9443,7 @@ func_ov38_021841e0: ; 0x021841e0
ldr r0, _02184258 ; =data_027e0fe4
add r1, sp, #4
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
str r4, [r0, #0x244]
add sp, sp, #0x38
ldmia sp!, {r4, pc}
@@ -9641,7 +9641,7 @@ _0218446c:
ldr r0, _02184570 ; =data_027e0fe4
add r1, sp, #0x20
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, r7
bl func_ov29_02170e98
ldr r0, [sp, #8]
@@ -10035,7 +10035,7 @@ func_ov38_02184a18: ; 0x02184a18
ldr r0, _02184ba0 ; =data_027e0fe4
add r1, sp, #4
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
str r0, [r4, #0xff0]
ldr r2, _02184ba4 ; =data_027e0d0c
ldr lr, _02184ba8 ; =0x0000119a
@@ -13777,11 +13777,11 @@ func_ov38_021880d8: ; 0x021880d8
ldr r2, _02188190 ; =0x4e564d4d
ldr r1, [r0]
add r0, sp, #0
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0218818c ; =data_027e0fe4
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
ldr r3, _02188188 ; =data_ov38_02189438
ldr r1, _02188194 ; =0xfffff99a
str r0, [r3]
@@ -14065,7 +14065,7 @@ func_ov38_0218850c: ; 0x0218850c
stmdb sp!, {r3, r4, lr}
sub sp, sp, #4
mov r4, r0
bl func_ov00_020c1554
bl _ZN5ActorC2Ev
ldr r0, _02188554 ; =data_ov38_02189128
mov r1, #4
ldr ip, _02188558 ; =func_ov00_020b7d74
@@ -14101,7 +14101,7 @@ func_ov38_02188564: ; 0x02188564
str lr, [ip, #0x20]
bl func_0204f754
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
ldmia sp!, {r4, pc}
.align 2, 0
@@ -14123,7 +14123,7 @@ func_ov38_021885a4: ; 0x021885a4
str lr, [ip, #0x20]
bl func_0204f754
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
bl _ZN9SysObjectdlEPv
mov r0, r4
@@ -14336,7 +14336,7 @@ func_ov38_021888a0: ; 0x021888a0
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _021888c0
mov r0, r5
@@ -14355,7 +14355,7 @@ func_ov38_021888d4: ; 0x021888d4
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _021888f4
mov r0, r5
@@ -15412,10 +15412,10 @@ data_ov38_02188f40: ; 0x02188f40
.word func_ov38_0217cf90
.global data_ov38_02188f44
data_ov38_02188f44: ; 0x02188f44
.word func_ov00_020c173c
.word _ZN5Actor8vfunc_0cEv
.global data_ov38_02188f48
data_ov38_02188f48: ; 0x02188f48
.word func_ov00_020c1740
.word _ZN5Actor8vfunc_10Ej
.global data_ov38_02188f4c
data_ov38_02188f4c: ; 0x02188f4c
.word func_ov38_0218381c
@@ -15424,118 +15424,118 @@ data_ov38_02188f50: ; 0x02188f50
.word func_ov38_02183aa4
.global data_ov38_02188f54
data_ov38_02188f54: ; 0x02188f54
.word func_ov00_020c17d4
.word _ZN5Actor8vfunc_1cEt
.global data_ov38_02188f58
data_ov38_02188f58: ; 0x02188f58
.word func_ov38_02184c94
.global data_ov38_02188f5c
data_ov38_02188f5c: ; 0x02188f5c
.word func_ov00_020c1744
.word _ZN5Actor8vfunc_24Ev
.global data_ov38_02188f60
data_ov38_02188f60: ; 0x02188f60
.word func_ov00_020c1748
.word _ZN5Actor8vfunc_28Ev
.global data_ov38_02188f64
data_ov38_02188f64: ; 0x02188f64
.word func_ov00_020c17a8
.word _ZN5Actor8vfunc_2cEv
.global data_ov38_02188f68
data_ov38_02188f68: ; 0x02188f68
.word func_ov00_020c17b0
.word _ZN5Actor8vfunc_30Ev
.global data_ov38_02188f6c
data_ov38_02188f6c: ; 0x02188f6c
.word func_ov00_020c174c
.word _ZN5Actor12GetOffsetPosEP5Vec3p
.global data_ov38_02188f70
data_ov38_02188f70: ; 0x02188f70
.word func_ov00_020c177c
.word _ZN5Actor8vfunc_38Ev
.global data_ov38_02188f74
data_ov38_02188f74: ; 0x02188f74
.word func_ov00_020c27e4
.word _ZN5Actor16CollidesWithLinkEv
.global data_ov38_02188f78
data_ov38_02188f78: ; 0x02188f78
.word func_ov00_020c3004
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov38_02188f7c
data_ov38_02188f7c: ; 0x02188f7c
.word func_ov00_020c2744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov38_02188f80
data_ov38_02188f80: ; 0x02188f80
.word func_ov38_02183d68
.global data_ov38_02188f84
data_ov38_02188f84: ; 0x02188f84
.word func_ov00_020c1c50
.word _ZN5Actor8vfunc_4cEPi
.global data_ov38_02188f88
data_ov38_02188f88: ; 0x02188f88
.word func_ov00_020c310c
.word _ZN5Actor6GetPosEv
.global data_ov38_02188f8c
data_ov38_02188f8c: ; 0x02188f8c
.word func_ov00_020c3114
.word _ZN5Actor8vfunc_54Ev
.global data_ov38_02188f90
data_ov38_02188f90: ; 0x02188f90
.word func_ov00_020c18a8
.word _ZN5Actor10SetUnk_11bEv
.global data_ov38_02188f94
data_ov38_02188f94: ; 0x02188f94
.word func_ov00_020c18c4
.word _ZN5Actor11SetVelocityEP5Vec3p
.global data_ov38_02188f98
data_ov38_02188f98: ; 0x02188f98
.word func_ov00_020c18fc
.word _ZN5Actor8vfunc_60Ev
.global data_ov38_02188f9c
data_ov38_02188f9c: ; 0x02188f9c
.word func_ov00_020c1904
.word _ZN5Actor8vfunc_64Ev
.global data_ov38_02188fa0
data_ov38_02188fa0: ; 0x02188fa0
.word func_ov00_020c1910
.word _ZN5Actor8vfunc_68Ev
.global data_ov38_02188fa4
data_ov38_02188fa4: ; 0x02188fa4
.word func_ov00_020c1914
.word _ZN5Actor8vfunc_6cEv
.global data_ov38_02188fa8
data_ov38_02188fa8: ; 0x02188fa8
.word func_ov00_020c191c
.word _ZN5Actor8vfunc_70Ev
.global data_ov38_02188fac
data_ov38_02188fac: ; 0x02188fac
.word func_ov00_020c1924
.word _ZN5Actor8vfunc_74Ev
.global data_ov38_02188fb0
data_ov38_02188fb0: ; 0x02188fb0
.word func_ov00_020c192c
.word _ZN5Actor8vfunc_78Ev
.global data_ov38_02188fb4
data_ov38_02188fb4: ; 0x02188fb4
.word func_ov00_020c1928
.word _ZN5Actor8vfunc_7cEv
.global data_ov38_02188fb8
data_ov38_02188fb8: ; 0x02188fb8
.word func_ov00_020c1934
.word _ZN5Actor8vfunc_80Ev
.global data_ov38_02188fbc
data_ov38_02188fbc: ; 0x02188fbc
.word func_ov00_020c1938
.word _ZN5Actor8vfunc_84Ev
.global data_ov38_02188fc0
data_ov38_02188fc0: ; 0x02188fc0
.word func_ov00_020c193c
.word _ZN5Actor8vfunc_88Ev
.global data_ov38_02188fc4
data_ov38_02188fc4: ; 0x02188fc4
.word func_ov00_020c1940
.word _ZN5Actor8vfunc_8cEv
.global data_ov38_02188fc8
data_ov38_02188fc8: ; 0x02188fc8
.word func_ov00_020c1948
.word _ZN5Actor8vfunc_90Ev
.global data_ov38_02188fcc
data_ov38_02188fcc: ; 0x02188fcc
.word func_ov00_020c1950
.word _ZN5Actor8vfunc_94Ev
.global data_ov38_02188fd0
data_ov38_02188fd0: ; 0x02188fd0
.word func_ov00_020c1954
.word _ZN5Actor8vfunc_98Ev
.global data_ov38_02188fd4
data_ov38_02188fd4: ; 0x02188fd4
.word func_ov00_020c1958
.word _ZN5Actor8vfunc_9cEv
.global data_ov38_02188fd8
data_ov38_02188fd8: ; 0x02188fd8
.word func_ov00_020c1b6c
.word _ZN5Actor15TrySetTransformEP9Transform
.global data_ov38_02188fdc
data_ov38_02188fdc: ; 0x02188fdc
.word func_ov00_020c1bb4
.word _ZN5Actor12SetTransformEP9Transform
.global data_ov38_02188fe0
data_ov38_02188fe0: ; 0x02188fe0
.word func_ov00_020c1bf8
.word _ZN5Actor8vfunc_a8Ev
.global data_ov38_02188fe4
data_ov38_02188fe4: ; 0x02188fe4
.word func_ov00_020c31fc
.word _ZN5Actor8vfunc_acEv
.global data_ov38_02188fe8
data_ov38_02188fe8: ; 0x02188fe8
.word func_ov00_020c322c
.word _ZN5Actor8vfunc_b0Ev
.global data_ov38_02188fec
data_ov38_02188fec: ; 0x02188fec
.byte 0x00, 0x00, 0x00, 0x00
@@ -15739,10 +15739,10 @@ data_ov38_02189130: ; 0x02189130
.word func_ov38_021885ec
.global data_ov38_02189134
data_ov38_02189134: ; 0x02189134
.word func_ov00_020c173c
.word _ZN5Actor8vfunc_0cEv
.global data_ov38_02189138
data_ov38_02189138: ; 0x02189138
.word func_ov00_020c1740
.word _ZN5Actor8vfunc_10Ej
.global data_ov38_0218913c
data_ov38_0218913c: ; 0x0218913c
.word func_ov38_021888d4 ; data_ov40_021888d4
@@ -15751,118 +15751,118 @@ data_ov38_02189140: ; 0x02189140
.word func_ov38_021888a0 ; data_ov40_021888a0
.global data_ov38_02189144
data_ov38_02189144: ; 0x02189144
.word func_ov00_020c17d4
.word _ZN5Actor8vfunc_1cEt
.global data_ov38_02189148
data_ov38_02189148: ; 0x02189148
.word func_ov00_020c1894
.word _ZN5Actor8vfunc_20Ei
.global data_ov38_0218914c
data_ov38_0218914c: ; 0x0218914c
.word func_ov00_020c1744
.word _ZN5Actor8vfunc_24Ev
.global data_ov38_02189150
data_ov38_02189150: ; 0x02189150
.word func_ov00_020c1748
.word _ZN5Actor8vfunc_28Ev
.global data_ov38_02189154
data_ov38_02189154: ; 0x02189154
.word func_ov00_020c17a8
.word _ZN5Actor8vfunc_2cEv
.global data_ov38_02189158
data_ov38_02189158: ; 0x02189158
.word func_ov00_020c17b0
.word _ZN5Actor8vfunc_30Ev
.global data_ov38_0218915c
data_ov38_0218915c: ; 0x0218915c
.word func_ov00_020c174c
.word _ZN5Actor12GetOffsetPosEP5Vec3p
.global data_ov38_02189160
data_ov38_02189160: ; 0x02189160
.word func_ov00_020c177c
.word _ZN5Actor8vfunc_38Ev
.global data_ov38_02189164
data_ov38_02189164: ; 0x02189164
.word func_ov00_020c27e4
.word _ZN5Actor16CollidesWithLinkEv
.global data_ov38_02189168
data_ov38_02189168: ; 0x02189168
.word func_ov00_020c3004
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov38_0218916c
data_ov38_0218916c: ; 0x0218916c
.word func_ov00_020c2744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov38_02189170
data_ov38_02189170: ; 0x02189170
.word func_ov00_020c1c48
.word _ZN5Actor8vfunc_48Ei
.global data_ov38_02189174
data_ov38_02189174: ; 0x02189174
.word func_ov00_020c1c50
.word _ZN5Actor8vfunc_4cEPi
.global data_ov38_02189178
data_ov38_02189178: ; 0x02189178
.word func_ov00_020c310c
.word _ZN5Actor6GetPosEv
.global data_ov38_0218917c
data_ov38_0218917c: ; 0x0218917c
.word func_ov00_020c3114
.word _ZN5Actor8vfunc_54Ev
.global data_ov38_02189180
data_ov38_02189180: ; 0x02189180
.word func_ov00_020c18a8
.word _ZN5Actor10SetUnk_11bEv
.global data_ov38_02189184
data_ov38_02189184: ; 0x02189184
.word func_ov00_020c18c4
.word _ZN5Actor11SetVelocityEP5Vec3p
.global data_ov38_02189188
data_ov38_02189188: ; 0x02189188
.word func_ov00_020c18fc
.word _ZN5Actor8vfunc_60Ev
.global data_ov38_0218918c
data_ov38_0218918c: ; 0x0218918c
.word func_ov00_020c1904
.word _ZN5Actor8vfunc_64Ev
.global data_ov38_02189190
data_ov38_02189190: ; 0x02189190
.word func_ov00_020c1910
.word _ZN5Actor8vfunc_68Ev
.global data_ov38_02189194
data_ov38_02189194: ; 0x02189194
.word func_ov00_020c1914
.word _ZN5Actor8vfunc_6cEv
.global data_ov38_02189198
data_ov38_02189198: ; 0x02189198
.word func_ov00_020c191c
.word _ZN5Actor8vfunc_70Ev
.global data_ov38_0218919c
data_ov38_0218919c: ; 0x0218919c
.word func_ov00_020c1924
.word _ZN5Actor8vfunc_74Ev
.global data_ov38_021891a0
data_ov38_021891a0: ; 0x021891a0
.word func_ov00_020c192c
.word _ZN5Actor8vfunc_78Ev
.global data_ov38_021891a4
data_ov38_021891a4: ; 0x021891a4
.word func_ov00_020c1928
.word _ZN5Actor8vfunc_7cEv
.global data_ov38_021891a8
data_ov38_021891a8: ; 0x021891a8
.word func_ov00_020c1934
.word _ZN5Actor8vfunc_80Ev
.global data_ov38_021891ac
data_ov38_021891ac: ; 0x021891ac
.word func_ov00_020c1938
.word _ZN5Actor8vfunc_84Ev
.global data_ov38_021891b0
data_ov38_021891b0: ; 0x021891b0
.word func_ov00_020c193c
.word _ZN5Actor8vfunc_88Ev
.global data_ov38_021891b4
data_ov38_021891b4: ; 0x021891b4
.word func_ov00_020c1940
.word _ZN5Actor8vfunc_8cEv
.global data_ov38_021891b8
data_ov38_021891b8: ; 0x021891b8
.word func_ov00_020c1948
.word _ZN5Actor8vfunc_90Ev
.global data_ov38_021891bc
data_ov38_021891bc: ; 0x021891bc
.word func_ov00_020c1950
.word _ZN5Actor8vfunc_94Ev
.global data_ov38_021891c0
data_ov38_021891c0: ; 0x021891c0
.word func_ov00_020c1954
.word _ZN5Actor8vfunc_98Ev
.global data_ov38_021891c4
data_ov38_021891c4: ; 0x021891c4
.word func_ov00_020c1958
.word _ZN5Actor8vfunc_9cEv
.global data_ov38_021891c8
data_ov38_021891c8: ; 0x021891c8
.word func_ov00_020c1b6c
.word _ZN5Actor15TrySetTransformEP9Transform
.global data_ov38_021891cc
data_ov38_021891cc: ; 0x021891cc
.word func_ov00_020c1bb4
.word _ZN5Actor12SetTransformEP9Transform
.global data_ov38_021891d0
data_ov38_021891d0: ; 0x021891d0
.word func_ov00_020c1bf8
.word _ZN5Actor8vfunc_a8Ev
.global data_ov38_021891d4
data_ov38_021891d4: ; 0x021891d4
.word func_ov00_020c31fc
.word _ZN5Actor8vfunc_acEv
.global data_ov38_021891d8
data_ov38_021891d8: ; 0x021891d8
.word func_ov00_020c322c
.word _ZN5Actor8vfunc_b0Ev
.global data_ov38_021891dc
data_ov38_021891dc: ; 0x021891dc
.byte 0x00, 0x00, 0x00, 0x00
asm/ov39.inc
+55 -55
View File
@@ -4,7 +4,61 @@
.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl14IsTouchingFastEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16IsFollowedByLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_ov00_020c198cEv
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_02050f54
@@ -84,7 +138,6 @@
.extern func_02038718
.extern func_0203e784
.extern func_0203e7b4
.extern strncpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -157,61 +210,7 @@
.extern func_ov00_020c1424
.extern func_ov00_020c1450
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c198c
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1c50
.extern func_ov00_020c1e2c
.extern func_ov00_020c1ef8
.extern func_ov00_020c1fc8
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c281c
.extern func_ov00_020c288c
.extern func_ov00_020c28ec
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c2bf4
.extern func_ov00_020c3004
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c3894
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c5c2c
@@ -262,3 +261,4 @@
.extern func_ov29_02177ff0
.extern func_ov29_02178060
.extern gItemManager
.extern strncpy
asm/ov39.s
+89 -89
View File
@@ -44,11 +44,11 @@ func_ov39_0217bdc8: ; 0x0217bdc8
ldr r2, _0217bf10 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0x10
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217bf0c ; =data_027e0fe4
add r1, sp, #0x10
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #1
strb r1, [r0, #0x28d]
strb r1, [r0, #0x3c1]
@@ -60,7 +60,7 @@ func_ov39_0217bdc8: ; 0x0217bdc8
ldr r2, _0217bf18 ; =0x57534e56
ldr r1, [r1]
add r0, sp, #8
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, [sp, #0xc]
ldr r1, [sp, #8]
str r0, [sp, #0x14]
@@ -68,14 +68,14 @@ func_ov39_0217bdc8: ; 0x0217bdc8
str r1, [sp, #0x10]
ldr r0, [r0]
add r1, sp, #0x10
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #1
strb r1, [r0, #0x28d]
ldr r1, _0217bf0c ; =data_027e0fe4
ldr r2, _0217bf1c ; =0x46434e56
ldr r1, [r1]
add r0, sp, #0
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, [sp, #4]
ldr r1, [sp]
str r0, [sp, #0x14]
@@ -83,7 +83,7 @@ func_ov39_0217bdc8: ; 0x0217bdc8
str r1, [sp, #0x10]
ldr r0, [r0]
add r1, sp, #0x10
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #1
strb r1, [r0, #0x28d]
ldr r0, _0217bf20 ; =data_ov00_020eec9c
@@ -141,11 +141,11 @@ func_ov39_0217bf30: ; 0x0217bf30
ldr r1, [r1]
ldr r2, _0217c020 ; =0x4e415649
add r0, sp, #0x10
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217c01c ; =data_027e0fe4
add r1, sp, #0x10
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #0
strb r1, [r0, #0x28d]
strb r1, [r0, #0x3c1]
@@ -153,7 +153,7 @@ func_ov39_0217bf30: ; 0x0217bf30
ldr r2, _0217c024 ; =0x57534e56
ldr r1, [r1]
add r0, sp, #8
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217c01c ; =data_027e0fe4
ldr r1, [sp, #8]
ldr r2, [sp, #0xc]
@@ -161,14 +161,14 @@ func_ov39_0217bf30: ; 0x0217bf30
ldr r0, [r0]
add r1, sp, #0x10
str r2, [sp, #0x14]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #0
strb r1, [r0, #0x28d]
ldr r1, _0217c01c ; =data_027e0fe4
ldr r2, _0217c028 ; =0x46434e56
ldr r1, [r1]
add r0, sp, #0
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, [sp, #4]
ldr r1, [sp]
str r0, [sp, #0x14]
@@ -176,7 +176,7 @@ func_ov39_0217bf30: ; 0x0217bf30
str r1, [sp, #0x10]
ldr r0, [r0]
add r1, sp, #0x10
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r1, #0
strb r1, [r0, #0x28d]
ldr r0, _0217c02c ; =data_ov00_020eec9c
@@ -1194,7 +1194,7 @@ func_ov39_0217cd00: ; 0x0217cd00
func_ov39_0217cd14: ; 0x0217cd14
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
bl func_ov00_020c1554
bl _ZN5ActorC2Ev
ldr r3, _0217cf68 ; =data_ov39_02186a38
add r1, r5, #0x158
mov r0, #0
@@ -1473,7 +1473,7 @@ func_ov39_0217d018: ; 0x0217d018
ldr r3, _0217d10c ; =func_ov39_0217cfe8
bl func_0204f754
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
ldmia sp!, {r4, pc}
.align 2, 0
@@ -1541,7 +1541,7 @@ func_ov39_0217d110: ; 0x0217d110
ldr r3, _0217d20c ; =func_ov39_0217cfe8
bl func_0204f754
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
bl _ZN9SysObjectdlEPv
mov r0, r4
@@ -1704,7 +1704,7 @@ func_ov39_0217d210: ; 0x0217d210
ldr r0, _0217d530 ; =data_027e0fe4
add r1, sp, #4
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
str r0, [r4, #0x284]
_0217d46c:
add r0, r4, #0x7c
@@ -1791,11 +1791,11 @@ func_ov39_0217d534: ; 0x0217d534
ldr r2, _0217d5d0 ; =0x4e415649
ldr r1, [r1]
add r0, sp, #0
bl func_ov00_020c3894
bl _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
ldr r0, _0217d5cc ; =data_027e0fe4
add r1, sp, #0
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
str r0, [r4, #0x280]
add sp, sp, #0x14
ldmia sp!, {r3, r4, pc}
@@ -1875,7 +1875,7 @@ func_ov39_0217d684: ; 0x0217d684
_0217d6b4:
mov r0, r4
mov r1, r5
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _0217d6dc
ldr r1, [r4, #0x158]
@@ -1915,7 +1915,7 @@ func_ov39_0217d704: ; 0x0217d704
_0217d734:
mov r0, r4
mov r1, r5
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _0217d768
ldr r0, [r4, #0x158]
@@ -1995,11 +1995,11 @@ _0217d83c:
bne _0217d86c
mov r0, r5
mov r1, #0x12
bl func_ov00_020c1fc8
bl _ZN5Actor18func_ov00_020c1fc8Ej
mov r1, #0
mov r0, r5
mov r2, r1
bl func_ov00_020c243c
bl _ZN5Actor18func_ov00_020c243cEiPi
_0217d86c:
ldr r0, [r5, #0x158]
tst r0, #0x40
@@ -2034,7 +2034,7 @@ _0217d8cc:
mov r0, r5
bl func_ov39_02185aa4
mov r0, r5
bl func_ov00_020c2bf4
bl _ZN5Actor20IncreaseActiveFramesEv
ldr r0, [r5, #0x130]
ldr r1, _0217dcfc ; =data_ov39_0218646c
add r1, r1, r0, lsl #3
@@ -2089,7 +2089,7 @@ _0217d9a4:
cmp r0, #0x10
bne _0217da40
mov r0, r5
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
ldr r2, [r5, #0x48]
ldr r1, _0217dd0c ; =data_027e0f64
str r2, [sp, #0x54]
@@ -2594,7 +2594,7 @@ _0217e05c:
b _0217e274
_0217e120:
mov r0, r4
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
strh r0, [r4, #0x78]
mov r0, r4
mov r1, #9
@@ -2711,7 +2711,7 @@ func_ov39_0217e298: ; 0x0217e298
ldrb r1, [r4, #0xc9c]
cmp r1, #0
ldmneia sp!, {r4, pc}
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
mov r1, r0
ldr r2, _0217e2c4 ; =0x000005dc
add r0, r4, #0x78
@@ -2827,7 +2827,7 @@ func_ov39_0217e404: ; 0x0217e404
ldr r1, [r4, #0x158]
orr r1, r1, #0x100000
str r1, [r4, #0x158]
bl func_ov00_020c28ec
bl _ZN5Actor16XzDistanceToLinkEv
str r0, [r4, #0x1e0]
_0217e42c:
ldr r0, [r4, #0x1e0]
@@ -3124,11 +3124,11 @@ func_ov39_0217e82c: ; 0x0217e82c
cmp r1, #7
ldmeqia sp!, {r4, pc}
mov r1, #0x12
bl func_ov00_020c1fc8
bl _ZN5Actor18func_ov00_020c1fc8Ej
mov r1, #0
mov r0, r4
mov r2, r1
bl func_ov00_020c243c
bl _ZN5Actor18func_ov00_020c243cEiPi
ldr r0, [r4, #0x130]
cmp r0, #0x10
ldmneia sp!, {r4, pc}
@@ -3139,11 +3139,11 @@ func_ov39_0217e82c: ; 0x0217e82c
mov r0, r4
mov r1, #2
mov r2, #0
bl func_ov00_020c1e2c
bl _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r0, r4
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
sub r2, r0, #0x8000
add r1, r4, #0x100
mov r0, r4
@@ -3495,7 +3495,7 @@ func_ov39_0217ec98: ; 0x0217ec98
_0217ecdc:
ldrsh r5, [r4, #0x78]
mov r0, r4
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
subs r1, r0, r5
ldr r0, _0217ede4 ; =0x0000471c
rsbmi r1, r1, #0
@@ -3858,7 +3858,7 @@ func_ov39_0217f10c: ; 0x0217f10c
str r3, [sp, #0xc]
bl func_0202b308
mov r0, r5
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
add r0, r0, #0x8000
mov r0, r0, lsl #0x10
mov r2, r0, asr #0x10
@@ -4343,7 +4343,7 @@ func_ov39_0217f810: ; 0x0217f810
str r1, [r0, #0x5c]
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
_0217f868:
bl func_ov00_020c281c
bl _ZN5Actor16IsFollowedByLinkEv
cmp r0, #0
beq _0217f97c
ldr r0, [r4, #0x158]
@@ -4885,7 +4885,7 @@ _0217ff8c: ; jump table
b _02180e94 ; case 12
_0217ffc0:
mov r0, r5
bl func_ov00_020c198c
bl _ZN5Actor18func_ov00_020c198cEv
cmp r0, #0
beq _021802bc
ldr r0, _02180f1c ; =data_027e071c
@@ -5180,7 +5180,7 @@ _021803e0:
bl func_02036ce4
mov r0, r5
mov r1, #1
bl func_ov00_020c1908
bl _ZN5Actor10SetUnk_11cEc
_02180450:
mov r0, #0x10000
ldr r1, [r5, #0xc1c]
@@ -5230,7 +5230,7 @@ _02180450:
bl func_02036ce4
mov r0, r5
mov r1, #1
bl func_ov00_020c1908
bl _ZN5Actor10SetUnk_11cEc
ldr r0, _02180f20 ; =data_027e0fc8
ldr r0, [r0]
bl func_ov00_020bb9b0
@@ -5262,13 +5262,13 @@ _02180528:
ldr r1, [r5, #0x280]
mov r0, r5
add r1, r1, #0x48
bl func_ov00_020c2938
bl _ZN5Actor10GetAngleToEP5Vec3p
add r1, r5, #0x100
strh r0, [r1, #0x62]
ldr r1, [r5, #0x280]
mov r0, r5
add r1, r1, #0x48
bl func_ov00_020c288c
bl _ZN5Actor12XzDistanceToEP5Vec3p
str r0, [r5, #0x1b8]
ldr r1, [r5, #0x280]
ldr r0, _02180f50 ; =0x0000199a
@@ -5427,7 +5427,7 @@ _021807c4:
bl func_02036ce4
mov r0, r5
mov r1, #1
bl func_ov00_020c1908
bl _ZN5Actor10SetUnk_11cEc
add sp, sp, #0x130
ldmia sp!, {r4, r5, r6, pc}
_02180814:
@@ -6481,7 +6481,7 @@ _02181640:
mov r0, r4
bic r1, r1, #0x10000
str r1, [r4, #0x158]
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
strh r0, [r4, #0x78]
ldr r1, [r4, #0x158]
tst r1, #0x40
@@ -6687,7 +6687,7 @@ func_ov39_0218199c: ; 0x0218199c
mov r4, #1
mov sl, r0
mov r5, r4
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
mov r6, #0
add r0, r0, #0x8000
mov r0, r0, lsl #0x10
@@ -7036,7 +7036,7 @@ func_ov39_02181e98: ; 0x02181e98
stmdb sp!, {r4, lr}
sub sp, sp, #0x20
mov r4, r0
bl func_ov00_020c281c
bl _ZN5Actor16IsFollowedByLinkEv
cmp r0, #0
ldrne r0, [r4, #0x158]
bicne r0, r0, #0x4000000
@@ -7791,7 +7791,7 @@ func_ov39_02182888: ; 0x02182888
add r1, r4, #0x100
mov r2, #0
strh r2, [r1, #0x5e]
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
add r1, r4, #0x100
strh r0, [r1, #0x60]
mov r1, #0
@@ -8023,7 +8023,7 @@ _02182bc0:
cmp r0, #0
mov r0, r5
beq _02182cb8
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
ldr r1, [r5, #0x16c]
mov r4, r0
mov r1, r1, lsl #0xc
@@ -8056,7 +8056,7 @@ _02182c84:
str r0, [r5, #0x16c]
b _02182ccc
_02182cb8:
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
mov r1, r0
add r0, r5, #0x160
mov r2, #0x12c
@@ -8239,7 +8239,7 @@ _02182f54: .word 0x0000103e
func_ov39_02182f58: ; 0x02182f58
stmdb sp!, {r3, r4, r5, lr}
mov r4, r0
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
strh r0, [r4, #0x78]
ldrsh r2, [r4, #0x78]
add r1, r4, #0x100
@@ -9036,7 +9036,7 @@ func_ov39_021838c4: ; 0x021838c4
str r3, [sp, #0x24]
str r2, [sp, #0x18]
str r1, [sp, #0x1c]
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
mov fp, #0
ldr r6, [sp, #0xc]
ldr r5, [sp, #0x10]
@@ -9218,7 +9218,7 @@ func_ov39_02183ccc: ; 0x02183ccc
str r1, [r7, #0x2c4]
sub r1, r1, #0x3e8
str r1, [r7, #0x2c8]
bl func_ov00_020c2974
bl _ZN5Actor14GetAngleToLinkEv
ldr r1, _0218430c ; =data_027e0f64
str r0, [r7, #0x2cc]
ldr r0, [r1]
@@ -10658,7 +10658,7 @@ func_ov39_02185194: ; 0x02185194
b _021851d4
_021851b4:
ldr r1, _02185204 ; =data_ov39_02186cf0
bl func_ov00_020c288c
bl _ZN5Actor12XzDistanceToEP5Vec3p
cmp r0, #0x20
movle r2, #0xcd
ldr r1, _02185204 ; =data_ov39_02186cf0
@@ -10804,7 +10804,7 @@ _02185374:
mov r2, r0
bl func_01ff9bc4
mov r0, r4
bl func_ov00_020c2bf4
bl _ZN5Actor20IncreaseActiveFramesEv
mov r0, r4
ldr r1, [r0]
ldr r1, [r1, #0xe0]
@@ -11582,7 +11582,7 @@ _02185d1c:
str r4, [sp, #0x20]
mov r3, #2
str r3, [sp]
bl func_ov00_020c1ef8
bl _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
cmp r0, #0
beq _02185d8c
ldr r0, _02185e9c ; =data_027e0ffc
@@ -13379,7 +13379,7 @@ data_ov39_02186a44: ; 0x02186a44
.word func_ov39_0217d534
.global data_ov39_02186a48
data_ov39_02186a48: ; 0x02186a48
.word func_ov00_020c1740
.word _ZN5Actor8vfunc_10Ej
.global data_ov39_02186a4c
data_ov39_02186a4c: ; 0x02186a4c
.word func_ov39_0217d684
@@ -13388,118 +13388,118 @@ data_ov39_02186a50: ; 0x02186a50
.word func_ov39_0217d704
.global data_ov39_02186a54
data_ov39_02186a54: ; 0x02186a54
.word func_ov00_020c17d4
.word _ZN5Actor8vfunc_1cEt
.global data_ov39_02186a58
data_ov39_02186a58: ; 0x02186a58
.word func_ov39_0217dd1c
.global data_ov39_02186a5c
data_ov39_02186a5c: ; 0x02186a5c
.word func_ov00_020c1744
.word _ZN5Actor8vfunc_24Ev
.global data_ov39_02186a60
data_ov39_02186a60: ; 0x02186a60
.word func_ov00_020c1748
.word _ZN5Actor8vfunc_28Ev
.global data_ov39_02186a64
data_ov39_02186a64: ; 0x02186a64
.word func_ov00_020c17a8
.word _ZN5Actor8vfunc_2cEv
.global data_ov39_02186a68
data_ov39_02186a68: ; 0x02186a68
.word func_ov00_020c17b0
.word _ZN5Actor8vfunc_30Ev
.global data_ov39_02186a6c
data_ov39_02186a6c: ; 0x02186a6c
.word func_ov00_020c174c
.word _ZN5Actor12GetOffsetPosEP5Vec3p
.global data_ov39_02186a70
data_ov39_02186a70: ; 0x02186a70
.word func_ov00_020c177c
.word _ZN5Actor8vfunc_38Ev
.global data_ov39_02186a74
data_ov39_02186a74: ; 0x02186a74
.word func_ov00_020c27e4
.word _ZN5Actor16CollidesWithLinkEv
.global data_ov39_02186a78
data_ov39_02186a78: ; 0x02186a78
.word func_ov00_020c3004
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov39_02186a7c
data_ov39_02186a7c: ; 0x02186a7c
.word func_ov00_020c2744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov39_02186a80
data_ov39_02186a80: ; 0x02186a80
.word func_ov39_0217dfc0
.global data_ov39_02186a84
data_ov39_02186a84: ; 0x02186a84
.word func_ov00_020c1c50
.word _ZN5Actor8vfunc_4cEPi
.global data_ov39_02186a88
data_ov39_02186a88: ; 0x02186a88
.word func_ov00_020c310c
.word _ZN5Actor6GetPosEv
.global data_ov39_02186a8c
data_ov39_02186a8c: ; 0x02186a8c
.word func_ov00_020c3114
.word _ZN5Actor8vfunc_54Ev
.global data_ov39_02186a90
data_ov39_02186a90: ; 0x02186a90
.word func_ov00_020c18a8
.word _ZN5Actor10SetUnk_11bEv
.global data_ov39_02186a94
data_ov39_02186a94: ; 0x02186a94
.word func_ov00_020c18c4
.word _ZN5Actor11SetVelocityEP5Vec3p
.global data_ov39_02186a98
data_ov39_02186a98: ; 0x02186a98
.word func_ov00_020c18fc
.word _ZN5Actor8vfunc_60Ev
.global data_ov39_02186a9c
data_ov39_02186a9c: ; 0x02186a9c
.word func_ov00_020c1904
.word _ZN5Actor8vfunc_64Ev
.global data_ov39_02186aa0
data_ov39_02186aa0: ; 0x02186aa0
.word func_ov00_020c1910
.word _ZN5Actor8vfunc_68Ev
.global data_ov39_02186aa4
data_ov39_02186aa4: ; 0x02186aa4
.word func_ov00_020c1914
.word _ZN5Actor8vfunc_6cEv
.global data_ov39_02186aa8
data_ov39_02186aa8: ; 0x02186aa8
.word func_ov00_020c191c
.word _ZN5Actor8vfunc_70Ev
.global data_ov39_02186aac
data_ov39_02186aac: ; 0x02186aac
.word func_ov00_020c1924
.word _ZN5Actor8vfunc_74Ev
.global data_ov39_02186ab0
data_ov39_02186ab0: ; 0x02186ab0
.word func_ov00_020c192c
.word _ZN5Actor8vfunc_78Ev
.global data_ov39_02186ab4
data_ov39_02186ab4: ; 0x02186ab4
.word func_ov00_020c1928
.word _ZN5Actor8vfunc_7cEv
.global data_ov39_02186ab8
data_ov39_02186ab8: ; 0x02186ab8
.word func_ov00_020c1934
.word _ZN5Actor8vfunc_80Ev
.global data_ov39_02186abc
data_ov39_02186abc: ; 0x02186abc
.word func_ov00_020c1938
.word _ZN5Actor8vfunc_84Ev
.global data_ov39_02186ac0
data_ov39_02186ac0: ; 0x02186ac0
.word func_ov00_020c193c
.word _ZN5Actor8vfunc_88Ev
.global data_ov39_02186ac4
data_ov39_02186ac4: ; 0x02186ac4
.word func_ov00_020c1940
.word _ZN5Actor8vfunc_8cEv
.global data_ov39_02186ac8
data_ov39_02186ac8: ; 0x02186ac8
.word func_ov00_020c1948
.word _ZN5Actor8vfunc_90Ev
.global data_ov39_02186acc
data_ov39_02186acc: ; 0x02186acc
.word func_ov00_020c1950
.word _ZN5Actor8vfunc_94Ev
.global data_ov39_02186ad0
data_ov39_02186ad0: ; 0x02186ad0
.word func_ov00_020c1954
.word _ZN5Actor8vfunc_98Ev
.global data_ov39_02186ad4
data_ov39_02186ad4: ; 0x02186ad4
.word func_ov00_020c1958
.word _ZN5Actor8vfunc_9cEv
.global data_ov39_02186ad8
data_ov39_02186ad8: ; 0x02186ad8
.word func_ov00_020c1b6c
.word _ZN5Actor15TrySetTransformEP9Transform
.global data_ov39_02186adc
data_ov39_02186adc: ; 0x02186adc
.word func_ov00_020c1bb4
.word _ZN5Actor12SetTransformEP9Transform
.global data_ov39_02186ae0
data_ov39_02186ae0: ; 0x02186ae0
.word func_ov00_020c1bf8
.word _ZN5Actor8vfunc_a8Ev
.global data_ov39_02186ae4
data_ov39_02186ae4: ; 0x02186ae4
.word func_ov00_020c31fc
.word _ZN5Actor8vfunc_acEv
.global data_ov39_02186ae8
data_ov39_02186ae8: ; 0x02186ae8
.word func_ov00_020c322c
.word _ZN5Actor8vfunc_b0Ev
.global data_ov39_02186aec
data_ov39_02186aec: ; 0x02186aec
.byte 0x00, 0x00, 0x00, 0x00
asm/ov40.inc
+52 -52
View File
@@ -190,10 +190,6 @@
.extern func_020435b4
.extern func_02043600
.extern func_0204366c
.extern strcpy
.extern strcat
.extern strcmp
.extern strncmp
.extern func_0204dd9c
.extern func_0204f614
.extern func_0204f754
@@ -269,55 +265,55 @@
.extern func_ov00_020c0d4c
.extern func_ov00_020c0e04
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c1734
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17b8
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c1894
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c3004
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_14Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_20Ei
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c3894
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c42d8
.extern func_ov00_020c4588
@@ -375,3 +371,7 @@
.extern func_ov09_0211cc74
.extern func_ov09_0211cc98
.extern gItemManager
.extern strcat
.extern strcmp
.extern strcpy
.extern strncmp
asm/ov40.s
+294 -294
View File
File diff suppressed because it is too large Load Diff
asm/ov41.inc
+58 -58
View File
@@ -1,6 +1,64 @@
#pragma once
.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN17LinkStateInteract18func_ov00_020ab934EP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor14DistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor16IsFollowedByLinkEv
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor18func_ov00_020c31c0Ei
.extern _ZN5Actor4KillEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
@@ -119,65 +177,7 @@
.extern func_ov00_020c10a0
.extern func_ov00_020c10d4
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c1734
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1e2c
.extern func_ov00_020c1fc8
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c281c
.extern func_ov00_020c28d4
.extern func_ov00_020c28ec
.extern func_ov00_020c2974
.extern func_ov00_020c2a0c
.extern func_ov00_020c3004
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31c0
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c3894
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c47cc
asm/ov41.s
+238 -238
View File
File diff suppressed because it is too large Load Diff
asm/ov42.inc
+47 -47
View File
@@ -1,7 +1,52 @@
#pragma once
.extern _ZN11ItemManager13ForceEquipItemEi
.extern _ZN11ItemManager20ClearForcedEquipItemEv
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor18func_ov00_020c243cEiPi
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_08Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_02050f54
@@ -63,8 +108,6 @@
.extern func_020385b8
.extern func_0203e784
.extern func_0203e7b4
.extern strcpy
.extern strcat
.extern func_0204f8d4
.extern func_ov00_0207a1c8
.extern func_ov00_0207bb1c
@@ -80,52 +123,7 @@
.extern func_ov00_020bcdec
.extern func_ov00_020bcf50
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c1734
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1c50
.extern func_ov00_020c243c
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c3004
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c31fc
.extern func_ov00_020c322c
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c5f1c
@@ -189,3 +187,5 @@
.extern func_ov14_0214a92c
.extern func_ov14_0214aa0c
.extern gItemManager
.extern strcat
.extern strcpy
asm/ov42.s
+157 -157
View File
@@ -503,7 +503,7 @@ func_ov42_02189b84: ; 0x02189b84
_02189ba0:
ldr r0, [r5]
mov r1, sb
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
strneb r7, [r0, #0x118]
add r0, r4, r8, lsl #3
@@ -521,7 +521,7 @@ _02189ba0:
_02189be4:
ldr r0, [r5]
mov r1, sb
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
strneb r7, [r0, #0x118]
add r0, r4, r8, lsl #3
@@ -812,7 +812,7 @@ _02189f54:
_02189fc0:
ldr r0, [r4]
mov r1, sb
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r8, r0
ldr r1, [r8, #0x204]
cmp r1, #0
@@ -833,7 +833,7 @@ _02189fe4:
ldr r0, _0218a058 ; =data_027e0fe4
add r1, sl, #0x10
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
mov r4, r0
ldr r1, [r4, #0x204]
cmp r1, #0
@@ -1329,7 +1329,7 @@ func_ov42_0218a63c: ; 0x0218a63c
_0218a678:
ldr r0, [sl]
mov r1, r5
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
ldr r1, [r0, #0x204]
cmp r1, #0
bne _0218a6b8
@@ -1359,7 +1359,7 @@ _0218a6c8:
_0218a6dc:
ldr r0, [r4]
mov r1, r7
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
ldr r1, [r0, #0x204]
cmp r1, #0
bne _0218a71c
@@ -1689,13 +1689,13 @@ func_ov42_0218aab0: ; 0x0218aab0
.global func_ov42_0218aad4
arm_func_start func_ov42_0218aad4
func_ov42_0218aad4: ; 0x0218aad4
ldr ip, _0218aae4 ; =func_ov00_020c243c
ldr ip, _0218aae4 ; =_ZN5Actor18func_ov00_020c243cEiPi
mov r1, #0
mov r2, r1
bx ip
.align 2, 0
arm_func_end func_ov42_0218aad4
_0218aae4: .word func_ov00_020c243c
_0218aae4: .word _ZN5Actor18func_ov00_020c243cEiPi
.global func_ov42_0218aae8
arm_func_start func_ov42_0218aae8
@@ -2096,7 +2096,7 @@ func_ov42_0218afbc: ; 0x0218afbc
blx r1
mov r0, r4
mov r1, #1
bl func_ov00_020c1908
bl _ZN5Actor10SetUnk_11cEc
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end func_ov42_0218afbc
@@ -2827,7 +2827,7 @@ _0218b970: .word data_027e0fe0
func_ov42_0218b974: ; 0x0218b974
stmdb sp!, {r4, lr}
mov r4, r0
bl func_ov00_020c1554
bl _ZN5ActorC2Ev
ldr r0, _0218b9b4 ; =data_ov42_0218cc58
mvn r2, #0
str r0, [r4]
@@ -2884,7 +2884,7 @@ func_ov42_0218b9f8: ; 0x0218b9f8
add r0, r4, #0x164
blx func_ov00_020a95a4
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
ldmia sp!, {r4, pc}
.align 2, 0
@@ -2902,7 +2902,7 @@ func_ov42_0218ba28: ; 0x0218ba28
add r0, r4, #0x164
blx func_ov00_020a95a4
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
bl _ZN9SysObjectdlEPv
mov r0, r4
@@ -2922,7 +2922,7 @@ func_ov42_0218ba60: ; 0x0218ba60
add r0, r4, #0x164
blx func_ov00_020a95a4
mov r0, r4
bl func_ov00_020c1730
bl _ZN5ActorD2Ev
mov r0, r4
ldmia sp!, {r4, pc}
.align 2, 0
@@ -3013,7 +3013,7 @@ func_ov42_0218baf0: ; 0x0218baf0
strb r1, [r4, #0x215]
bl func_ov42_0218c0ec
mov r0, r4
bl func_ov00_020c1734
bl _ZN5Actor8vfunc_08Ev
ldmia sp!, {r4, pc}
arm_func_end func_ov42_0218baf0
@@ -3066,7 +3066,7 @@ func_ov42_0218bc08: ; 0x0218bc08
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl func_ov00_020c313c
bl _ZN5Actor18func_ov00_020c313cEj
cmp r0, #0
beq _0218bf5c
ldr r0, [r5, #0x204]
@@ -3813,7 +3813,7 @@ func_ov42_0218c620: ; 0x0218c620
ldmneia sp!, {r3, pc}
ldr r1, _0218c640 ; =data_ov42_0218c73c
mov r2, #0
bl func_ov00_020c243c
bl _ZN5Actor18func_ov00_020c243cEiPi
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov42_0218c620
@@ -3831,7 +3831,7 @@ func_ov42_0218c644: ; 0x0218c644
ldr r0, _0218c68c ; =data_027e0fe4
add r1, r4, #0x15c
ldr r0, [r0]
bl func_ov00_020c3674
bl _ZN12ActorManager8GetActorEP8ActorRef
cmp r0, #0
ldmeqia sp!, {r4, pc}
mov r1, #0
@@ -4216,10 +4216,10 @@ data_ov42_0218c924: ; 0x0218c924
.word func_ov42_0218a92c
.global data_ov42_0218c928
data_ov42_0218c928: ; 0x0218c928
.word func_ov00_020c173c
.word _ZN5Actor8vfunc_0cEv
.global data_ov42_0218c92c
data_ov42_0218c92c: ; 0x0218c92c
.word func_ov00_020c1740
.word _ZN5Actor8vfunc_10Ej
.global data_ov42_0218c930
data_ov42_0218c930: ; 0x0218c930
.word func_ov14_02144a90
@@ -4228,61 +4228,61 @@ data_ov42_0218c934: ; 0x0218c934
.word func_ov14_02144b64
.global data_ov42_0218c938
data_ov42_0218c938: ; 0x0218c938
.word func_ov00_020c17d4
.word _ZN5Actor8vfunc_1cEt
.global data_ov42_0218c93c
data_ov42_0218c93c: ; 0x0218c93c
.word func_ov42_0218b7fc
.global data_ov42_0218c940
data_ov42_0218c940: ; 0x0218c940
.word func_ov00_020c1744
.word _ZN5Actor8vfunc_24Ev
.global data_ov42_0218c944
data_ov42_0218c944: ; 0x0218c944
.word func_ov00_020c1748
.word _ZN5Actor8vfunc_28Ev
.global data_ov42_0218c948
data_ov42_0218c948: ; 0x0218c948
.word func_ov00_020c17a8
.word _ZN5Actor8vfunc_2cEv
.global data_ov42_0218c94c
data_ov42_0218c94c: ; 0x0218c94c
.word func_ov00_020c17b0
.word _ZN5Actor8vfunc_30Ev
.global data_ov42_0218c950
data_ov42_0218c950: ; 0x0218c950
.word func_ov00_020c174c
.word _ZN5Actor12GetOffsetPosEP5Vec3p
.global data_ov42_0218c954
data_ov42_0218c954: ; 0x0218c954
.word func_ov00_020c177c
.word _ZN5Actor8vfunc_38Ev
.global data_ov42_0218c958
data_ov42_0218c958: ; 0x0218c958
.word func_ov00_020c27e4
.word _ZN5Actor16CollidesWithLinkEv
.global data_ov42_0218c95c
data_ov42_0218c95c: ; 0x0218c95c
.word func_ov14_02145974
.global data_ov42_0218c960
data_ov42_0218c960: ; 0x0218c960
.word func_ov00_020c2744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov42_0218c964
data_ov42_0218c964: ; 0x0218c964
.word func_ov42_0218aae8
.global data_ov42_0218c968
data_ov42_0218c968: ; 0x0218c968
.word func_ov00_020c1c50
.word _ZN5Actor8vfunc_4cEPi
.global data_ov42_0218c96c
data_ov42_0218c96c: ; 0x0218c96c
.word func_ov00_020c310c
.word _ZN5Actor6GetPosEv
.global data_ov42_0218c970
data_ov42_0218c970: ; 0x0218c970
.word func_ov00_020c3114
.word _ZN5Actor8vfunc_54Ev
.global data_ov42_0218c974
data_ov42_0218c974: ; 0x0218c974
.word func_ov00_020c18a8
.word _ZN5Actor10SetUnk_11bEv
.global data_ov42_0218c978
data_ov42_0218c978: ; 0x0218c978
.word func_ov00_020c18c4
.word _ZN5Actor11SetVelocityEP5Vec3p
.global data_ov42_0218c97c
data_ov42_0218c97c: ; 0x0218c97c
.word func_ov00_020c18fc
.word _ZN5Actor8vfunc_60Ev
.global data_ov42_0218c980
data_ov42_0218c980: ; 0x0218c980
.word func_ov00_020c1904
.word _ZN5Actor8vfunc_64Ev
.global data_ov42_0218c984
data_ov42_0218c984: ; 0x0218c984
.word func_ov42_0218b888
@@ -4291,7 +4291,7 @@ data_ov42_0218c988: ; 0x0218c988
.word func_ov42_0218b0e4
.global data_ov42_0218c98c
data_ov42_0218c98c: ; 0x0218c98c
.word func_ov00_020c191c
.word _ZN5Actor8vfunc_70Ev
.global data_ov42_0218c990
data_ov42_0218c990: ; 0x0218c990
.word func_ov14_02145698
@@ -4309,10 +4309,10 @@ data_ov42_0218c9a0: ; 0x0218c9a0
.word func_ov14_021455b0
.global data_ov42_0218c9a4
data_ov42_0218c9a4: ; 0x0218c9a4
.word func_ov00_020c193c
.word _ZN5Actor8vfunc_88Ev
.global data_ov42_0218c9a8
data_ov42_0218c9a8: ; 0x0218c9a8
.word func_ov00_020c1940
.word _ZN5Actor8vfunc_8cEv
.global data_ov42_0218c9ac
data_ov42_0218c9ac: ; 0x0218c9ac
.word func_ov14_02145760
@@ -4327,19 +4327,19 @@ data_ov42_0218c9b8: ; 0x0218c9b8
.word func_ov14_021458b0
.global data_ov42_0218c9bc
data_ov42_0218c9bc: ; 0x0218c9bc
.word func_ov00_020c1b6c
.word _ZN5Actor15TrySetTransformEP9Transform
.global data_ov42_0218c9c0
data_ov42_0218c9c0: ; 0x0218c9c0
.word func_ov00_020c1bb4
.word _ZN5Actor12SetTransformEP9Transform
.global data_ov42_0218c9c4
data_ov42_0218c9c4: ; 0x0218c9c4
.word func_ov00_020c1bf8
.word _ZN5Actor8vfunc_a8Ev
.global data_ov42_0218c9c8
data_ov42_0218c9c8: ; 0x0218c9c8
.word func_ov00_020c31fc
.word _ZN5Actor8vfunc_acEv
.global data_ov42_0218c9cc
data_ov42_0218c9cc: ; 0x0218c9cc
.word func_ov00_020c322c
.word _ZN5Actor8vfunc_b0Ev
.global data_ov42_0218c9d0
data_ov42_0218c9d0: ; 0x0218c9d0
.word func_ov14_02144d08
@@ -4445,10 +4445,10 @@ data_ov42_0218cae0: ; 0x0218cae0
.word func_ov42_0218bbc8
.global data_ov42_0218cae4
data_ov42_0218cae4: ; 0x0218cae4
.word func_ov00_020c173c
.word _ZN5Actor8vfunc_0cEv
.global data_ov42_0218cae8
data_ov42_0218cae8: ; 0x0218cae8
.word func_ov00_020c1740
.word _ZN5Actor8vfunc_10Ej
.global data_ov42_0218caec
data_ov42_0218caec: ; 0x0218caec
.word func_ov42_0218bc08
@@ -4457,118 +4457,118 @@ data_ov42_0218caf0: ; 0x0218caf0
.word func_ov42_0218bf70
.global data_ov42_0218caf4
data_ov42_0218caf4: ; 0x0218caf4
.word func_ov00_020c17d4
.word _ZN5Actor8vfunc_1cEt
.global data_ov42_0218caf8
data_ov42_0218caf8: ; 0x0218caf8
.word func_ov42_0218c034
.global data_ov42_0218cafc
data_ov42_0218cafc: ; 0x0218cafc
.word func_ov00_020c1744
.word _ZN5Actor8vfunc_24Ev
.global data_ov42_0218cb00
data_ov42_0218cb00: ; 0x0218cb00
.word func_ov00_020c1748
.word _ZN5Actor8vfunc_28Ev
.global data_ov42_0218cb04
data_ov42_0218cb04: ; 0x0218cb04
.word func_ov00_020c17a8
.word _ZN5Actor8vfunc_2cEv
.global data_ov42_0218cb08
data_ov42_0218cb08: ; 0x0218cb08
.word func_ov00_020c17b0
.word _ZN5Actor8vfunc_30Ev
.global data_ov42_0218cb0c
data_ov42_0218cb0c: ; 0x0218cb0c
.word func_ov00_020c174c
.word _ZN5Actor12GetOffsetPosEP5Vec3p
.global data_ov42_0218cb10
data_ov42_0218cb10: ; 0x0218cb10
.word func_ov00_020c177c
.word _ZN5Actor8vfunc_38Ev
.global data_ov42_0218cb14
data_ov42_0218cb14: ; 0x0218cb14
.word func_ov00_020c27e4
.word _ZN5Actor16CollidesWithLinkEv
.global data_ov42_0218cb18
data_ov42_0218cb18: ; 0x0218cb18
.word func_ov00_020c3004
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov42_0218cb1c
data_ov42_0218cb1c: ; 0x0218cb1c
.word func_ov00_020c2744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov42_0218cb20
data_ov42_0218cb20: ; 0x0218cb20
.word func_ov42_0218bf84
.global data_ov42_0218cb24
data_ov42_0218cb24: ; 0x0218cb24
.word func_ov00_020c1c50
.word _ZN5Actor8vfunc_4cEPi
.global data_ov42_0218cb28
data_ov42_0218cb28: ; 0x0218cb28
.word func_ov00_020c310c
.word _ZN5Actor6GetPosEv
.global data_ov42_0218cb2c
data_ov42_0218cb2c: ; 0x0218cb2c
.word func_ov00_020c3114
.word _ZN5Actor8vfunc_54Ev
.global data_ov42_0218cb30
data_ov42_0218cb30: ; 0x0218cb30
.word func_ov00_020c18a8
.word _ZN5Actor10SetUnk_11bEv
.global data_ov42_0218cb34
data_ov42_0218cb34: ; 0x0218cb34
.word func_ov00_020c18c4
.word _ZN5Actor11SetVelocityEP5Vec3p
.global data_ov42_0218cb38
data_ov42_0218cb38: ; 0x0218cb38
.word func_ov00_020c18fc
.word _ZN5Actor8vfunc_60Ev
.global data_ov42_0218cb3c
data_ov42_0218cb3c: ; 0x0218cb3c
.word func_ov00_020c1904
.word _ZN5Actor8vfunc_64Ev
.global data_ov42_0218cb40
data_ov42_0218cb40: ; 0x0218cb40
.word func_ov00_020c1910
.word _ZN5Actor8vfunc_68Ev
.global data_ov42_0218cb44
data_ov42_0218cb44: ; 0x0218cb44
.word func_ov00_020c1914
.word _ZN5Actor8vfunc_6cEv
.global data_ov42_0218cb48
data_ov42_0218cb48: ; 0x0218cb48
.word func_ov00_020c191c
.word _ZN5Actor8vfunc_70Ev
.global data_ov42_0218cb4c
data_ov42_0218cb4c: ; 0x0218cb4c
.word func_ov00_020c1924
.word _ZN5Actor8vfunc_74Ev
.global data_ov42_0218cb50
data_ov42_0218cb50: ; 0x0218cb50
.word func_ov00_020c192c
.word _ZN5Actor8vfunc_78Ev
.global data_ov42_0218cb54
data_ov42_0218cb54: ; 0x0218cb54
.word func_ov00_020c1928
.word _ZN5Actor8vfunc_7cEv
.global data_ov42_0218cb58
data_ov42_0218cb58: ; 0x0218cb58
.word func_ov00_020c1934
.word _ZN5Actor8vfunc_80Ev
.global data_ov42_0218cb5c
data_ov42_0218cb5c: ; 0x0218cb5c
.word func_ov00_020c1938
.word _ZN5Actor8vfunc_84Ev
.global data_ov42_0218cb60
data_ov42_0218cb60: ; 0x0218cb60
.word func_ov00_020c193c
.word _ZN5Actor8vfunc_88Ev
.global data_ov42_0218cb64
data_ov42_0218cb64: ; 0x0218cb64
.word func_ov00_020c1940
.word _ZN5Actor8vfunc_8cEv
.global data_ov42_0218cb68
data_ov42_0218cb68: ; 0x0218cb68
.word func_ov00_020c1948
.word _ZN5Actor8vfunc_90Ev
.global data_ov42_0218cb6c
data_ov42_0218cb6c: ; 0x0218cb6c
.word func_ov00_020c1950
.word _ZN5Actor8vfunc_94Ev
.global data_ov42_0218cb70
data_ov42_0218cb70: ; 0x0218cb70
.word func_ov00_020c1954
.word _ZN5Actor8vfunc_98Ev
.global data_ov42_0218cb74
data_ov42_0218cb74: ; 0x0218cb74
.word func_ov00_020c1958
.word _ZN5Actor8vfunc_9cEv
.global data_ov42_0218cb78
data_ov42_0218cb78: ; 0x0218cb78
.word func_ov00_020c1b6c
.word _ZN5Actor15TrySetTransformEP9Transform
.global data_ov42_0218cb7c
data_ov42_0218cb7c: ; 0x0218cb7c
.word func_ov00_020c1bb4
.word _ZN5Actor12SetTransformEP9Transform
.global data_ov42_0218cb80
data_ov42_0218cb80: ; 0x0218cb80
.word func_ov00_020c1bf8
.word _ZN5Actor8vfunc_a8Ev
.global data_ov42_0218cb84
data_ov42_0218cb84: ; 0x0218cb84
.word func_ov00_020c31fc
.word _ZN5Actor8vfunc_acEv
.global data_ov42_0218cb88
data_ov42_0218cb88: ; 0x0218cb88
.word func_ov00_020c322c
.word _ZN5Actor8vfunc_b0Ev
.global data_ov42_0218cb8c
data_ov42_0218cb8c: ; 0x0218cb8c
.word func_ov42_0218c018
@@ -4589,10 +4589,10 @@ data_ov42_0218cba0: ; 0x0218cba0
.word func_ov42_0218bb8c
.global data_ov42_0218cba4
data_ov42_0218cba4: ; 0x0218cba4
.word func_ov00_020c173c
.word _ZN5Actor8vfunc_0cEv
.global data_ov42_0218cba8
data_ov42_0218cba8: ; 0x0218cba8
.word func_ov00_020c1740
.word _ZN5Actor8vfunc_10Ej
.global data_ov42_0218cbac
data_ov42_0218cbac: ; 0x0218cbac
.word func_ov42_0218bc08
@@ -4601,118 +4601,118 @@ data_ov42_0218cbb0: ; 0x0218cbb0
.word func_ov42_0218bf70
.global data_ov42_0218cbb4
data_ov42_0218cbb4: ; 0x0218cbb4
.word func_ov00_020c17d4
.word _ZN5Actor8vfunc_1cEt
.global data_ov42_0218cbb8
data_ov42_0218cbb8: ; 0x0218cbb8
.word func_ov42_0218c034
.global data_ov42_0218cbbc
data_ov42_0218cbbc: ; 0x0218cbbc
.word func_ov00_020c1744
.word _ZN5Actor8vfunc_24Ev
.global data_ov42_0218cbc0
data_ov42_0218cbc0: ; 0x0218cbc0
.word func_ov00_020c1748
.word _ZN5Actor8vfunc_28Ev
.global data_ov42_0218cbc4
data_ov42_0218cbc4: ; 0x0218cbc4
.word func_ov00_020c17a8
.word _ZN5Actor8vfunc_2cEv
.global data_ov42_0218cbc8
data_ov42_0218cbc8: ; 0x0218cbc8
.word func_ov00_020c17b0
.word _ZN5Actor8vfunc_30Ev
.global data_ov42_0218cbcc
data_ov42_0218cbcc: ; 0x0218cbcc
.word func_ov00_020c174c
.word _ZN5Actor12GetOffsetPosEP5Vec3p
.global data_ov42_0218cbd0
data_ov42_0218cbd0: ; 0x0218cbd0
.word func_ov00_020c177c
.word _ZN5Actor8vfunc_38Ev
.global data_ov42_0218cbd4
data_ov42_0218cbd4: ; 0x0218cbd4
.word func_ov00_020c27e4
.word _ZN5Actor16CollidesWithLinkEv
.global data_ov42_0218cbd8
data_ov42_0218cbd8: ; 0x0218cbd8
.word func_ov00_020c3004
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov42_0218cbdc
data_ov42_0218cbdc: ; 0x0218cbdc
.word func_ov00_020c2744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov42_0218cbe0
data_ov42_0218cbe0: ; 0x0218cbe0
.word func_ov42_0218bf84
.global data_ov42_0218cbe4
data_ov42_0218cbe4: ; 0x0218cbe4
.word func_ov00_020c1c50
.word _ZN5Actor8vfunc_4cEPi
.global data_ov42_0218cbe8
data_ov42_0218cbe8: ; 0x0218cbe8
.word func_ov00_020c310c
.word _ZN5Actor6GetPosEv
.global data_ov42_0218cbec
data_ov42_0218cbec: ; 0x0218cbec
.word func_ov00_020c3114
.word _ZN5Actor8vfunc_54Ev
.global data_ov42_0218cbf0
data_ov42_0218cbf0: ; 0x0218cbf0
.word func_ov00_020c18a8
.word _ZN5Actor10SetUnk_11bEv
.global data_ov42_0218cbf4
data_ov42_0218cbf4: ; 0x0218cbf4
.word func_ov00_020c18c4
.word _ZN5Actor11SetVelocityEP5Vec3p
.global data_ov42_0218cbf8
data_ov42_0218cbf8: ; 0x0218cbf8
.word func_ov00_020c18fc
.word _ZN5Actor8vfunc_60Ev
.global data_ov42_0218cbfc
data_ov42_0218cbfc: ; 0x0218cbfc
.word func_ov00_020c1904
.word _ZN5Actor8vfunc_64Ev
.global data_ov42_0218cc00
data_ov42_0218cc00: ; 0x0218cc00
.word func_ov00_020c1910
.word _ZN5Actor8vfunc_68Ev
.global data_ov42_0218cc04
data_ov42_0218cc04: ; 0x0218cc04
.word func_ov00_020c1914
.word _ZN5Actor8vfunc_6cEv
.global data_ov42_0218cc08
data_ov42_0218cc08: ; 0x0218cc08
.word func_ov00_020c191c
.word _ZN5Actor8vfunc_70Ev
.global data_ov42_0218cc0c
data_ov42_0218cc0c: ; 0x0218cc0c
.word func_ov00_020c1924
.word _ZN5Actor8vfunc_74Ev
.global data_ov42_0218cc10
data_ov42_0218cc10: ; 0x0218cc10
.word func_ov00_020c192c
.word _ZN5Actor8vfunc_78Ev
.global data_ov42_0218cc14
data_ov42_0218cc14: ; 0x0218cc14
.word func_ov00_020c1928
.word _ZN5Actor8vfunc_7cEv
.global data_ov42_0218cc18
data_ov42_0218cc18: ; 0x0218cc18
.word func_ov00_020c1934
.word _ZN5Actor8vfunc_80Ev
.global data_ov42_0218cc1c
data_ov42_0218cc1c: ; 0x0218cc1c
.word func_ov00_020c1938
.word _ZN5Actor8vfunc_84Ev
.global data_ov42_0218cc20
data_ov42_0218cc20: ; 0x0218cc20
.word func_ov00_020c193c
.word _ZN5Actor8vfunc_88Ev
.global data_ov42_0218cc24
data_ov42_0218cc24: ; 0x0218cc24
.word func_ov00_020c1940
.word _ZN5Actor8vfunc_8cEv
.global data_ov42_0218cc28
data_ov42_0218cc28: ; 0x0218cc28
.word func_ov00_020c1948
.word _ZN5Actor8vfunc_90Ev
.global data_ov42_0218cc2c
data_ov42_0218cc2c: ; 0x0218cc2c
.word func_ov00_020c1950
.word _ZN5Actor8vfunc_94Ev
.global data_ov42_0218cc30
data_ov42_0218cc30: ; 0x0218cc30
.word func_ov00_020c1954
.word _ZN5Actor8vfunc_98Ev
.global data_ov42_0218cc34
data_ov42_0218cc34: ; 0x0218cc34
.word func_ov00_020c1958
.word _ZN5Actor8vfunc_9cEv
.global data_ov42_0218cc38
data_ov42_0218cc38: ; 0x0218cc38
.word func_ov00_020c1b6c
.word _ZN5Actor15TrySetTransformEP9Transform
.global data_ov42_0218cc3c
data_ov42_0218cc3c: ; 0x0218cc3c
.word func_ov00_020c1bb4
.word _ZN5Actor12SetTransformEP9Transform
.global data_ov42_0218cc40
data_ov42_0218cc40: ; 0x0218cc40
.word func_ov00_020c1bf8
.word _ZN5Actor8vfunc_a8Ev
.global data_ov42_0218cc44
data_ov42_0218cc44: ; 0x0218cc44
.word func_ov00_020c31fc
.word _ZN5Actor8vfunc_acEv
.global data_ov42_0218cc48
data_ov42_0218cc48: ; 0x0218cc48
.word func_ov00_020c322c
.word _ZN5Actor8vfunc_b0Ev
.global data_ov42_0218cc4c
data_ov42_0218cc4c: ; 0x0218cc4c
.word func_ov42_0218bffc
@@ -4733,10 +4733,10 @@ data_ov42_0218cc60: ; 0x0218cc60
.word func_ov42_0218baf0
.global data_ov42_0218cc64
data_ov42_0218cc64: ; 0x0218cc64
.word func_ov00_020c173c
.word _ZN5Actor8vfunc_0cEv
.global data_ov42_0218cc68
data_ov42_0218cc68: ; 0x0218cc68
.word func_ov00_020c1740
.word _ZN5Actor8vfunc_10Ej
.global data_ov42_0218cc6c
data_ov42_0218cc6c: ; 0x0218cc6c
.word func_ov42_0218bc08
@@ -4745,118 +4745,118 @@ data_ov42_0218cc70: ; 0x0218cc70
.word func_ov42_0218bf70
.global data_ov42_0218cc74
data_ov42_0218cc74: ; 0x0218cc74
.word func_ov00_020c17d4
.word _ZN5Actor8vfunc_1cEt
.global data_ov42_0218cc78
data_ov42_0218cc78: ; 0x0218cc78
.word func_ov42_0218c034
.global data_ov42_0218cc7c
data_ov42_0218cc7c: ; 0x0218cc7c
.word func_ov00_020c1744
.word _ZN5Actor8vfunc_24Ev
.global data_ov42_0218cc80
data_ov42_0218cc80: ; 0x0218cc80
.word func_ov00_020c1748
.word _ZN5Actor8vfunc_28Ev
.global data_ov42_0218cc84
data_ov42_0218cc84: ; 0x0218cc84
.word func_ov00_020c17a8
.word _ZN5Actor8vfunc_2cEv
.global data_ov42_0218cc88
data_ov42_0218cc88: ; 0x0218cc88
.word func_ov00_020c17b0
.word _ZN5Actor8vfunc_30Ev
.global data_ov42_0218cc8c
data_ov42_0218cc8c: ; 0x0218cc8c
.word func_ov00_020c174c
.word _ZN5Actor12GetOffsetPosEP5Vec3p
.global data_ov42_0218cc90
data_ov42_0218cc90: ; 0x0218cc90
.word func_ov00_020c177c
.word _ZN5Actor8vfunc_38Ev
.global data_ov42_0218cc94
data_ov42_0218cc94: ; 0x0218cc94
.word func_ov00_020c27e4
.word _ZN5Actor16CollidesWithLinkEv
.global data_ov42_0218cc98
data_ov42_0218cc98: ; 0x0218cc98
.word func_ov00_020c3004
.word _ZN5Actor15IsHitboxTouchedEb
.global data_ov42_0218cc9c
data_ov42_0218cc9c: ; 0x0218cc9c
.word func_ov00_020c2744
.word _ZN5Actor12CollidesWithEPKS_
.global data_ov42_0218cca0
data_ov42_0218cca0: ; 0x0218cca0
.word func_ov42_0218bf84
.global data_ov42_0218cca4
data_ov42_0218cca4: ; 0x0218cca4
.word func_ov00_020c1c50
.word _ZN5Actor8vfunc_4cEPi
.global data_ov42_0218cca8
data_ov42_0218cca8: ; 0x0218cca8
.word func_ov00_020c310c
.word _ZN5Actor6GetPosEv
.global data_ov42_0218ccac
data_ov42_0218ccac: ; 0x0218ccac
.word func_ov00_020c3114
.word _ZN5Actor8vfunc_54Ev
.global data_ov42_0218ccb0
data_ov42_0218ccb0: ; 0x0218ccb0
.word func_ov00_020c18a8
.word _ZN5Actor10SetUnk_11bEv
.global data_ov42_0218ccb4
data_ov42_0218ccb4: ; 0x0218ccb4
.word func_ov00_020c18c4
.word _ZN5Actor11SetVelocityEP5Vec3p
.global data_ov42_0218ccb8
data_ov42_0218ccb8: ; 0x0218ccb8
.word func_ov00_020c18fc
.word _ZN5Actor8vfunc_60Ev
.global data_ov42_0218ccbc
data_ov42_0218ccbc: ; 0x0218ccbc
.word func_ov00_020c1904
.word _ZN5Actor8vfunc_64Ev
.global data_ov42_0218ccc0
data_ov42_0218ccc0: ; 0x0218ccc0
.word func_ov00_020c1910
.word _ZN5Actor8vfunc_68Ev
.global data_ov42_0218ccc4
data_ov42_0218ccc4: ; 0x0218ccc4
.word func_ov00_020c1914
.word _ZN5Actor8vfunc_6cEv
.global data_ov42_0218ccc8
data_ov42_0218ccc8: ; 0x0218ccc8
.word func_ov00_020c191c
.word _ZN5Actor8vfunc_70Ev
.global data_ov42_0218cccc
data_ov42_0218cccc: ; 0x0218cccc
.word func_ov00_020c1924
.word _ZN5Actor8vfunc_74Ev
.global data_ov42_0218ccd0
data_ov42_0218ccd0: ; 0x0218ccd0
.word func_ov00_020c192c
.word _ZN5Actor8vfunc_78Ev
.global data_ov42_0218ccd4
data_ov42_0218ccd4: ; 0x0218ccd4
.word func_ov00_020c1928
.word _ZN5Actor8vfunc_7cEv
.global data_ov42_0218ccd8
data_ov42_0218ccd8: ; 0x0218ccd8
.word func_ov00_020c1934
.word _ZN5Actor8vfunc_80Ev
.global data_ov42_0218ccdc
data_ov42_0218ccdc: ; 0x0218ccdc
.word func_ov00_020c1938
.word _ZN5Actor8vfunc_84Ev
.global data_ov42_0218cce0
data_ov42_0218cce0: ; 0x0218cce0
.word func_ov00_020c193c
.word _ZN5Actor8vfunc_88Ev
.global data_ov42_0218cce4
data_ov42_0218cce4: ; 0x0218cce4
.word func_ov00_020c1940
.word _ZN5Actor8vfunc_8cEv
.global data_ov42_0218cce8
data_ov42_0218cce8: ; 0x0218cce8
.word func_ov00_020c1948
.word _ZN5Actor8vfunc_90Ev
.global data_ov42_0218ccec
data_ov42_0218ccec: ; 0x0218ccec
.word func_ov00_020c1950
.word _ZN5Actor8vfunc_94Ev
.global data_ov42_0218ccf0
data_ov42_0218ccf0: ; 0x0218ccf0
.word func_ov00_020c1954
.word _ZN5Actor8vfunc_98Ev
.global data_ov42_0218ccf4
data_ov42_0218ccf4: ; 0x0218ccf4
.word func_ov00_020c1958
.word _ZN5Actor8vfunc_9cEv
.global data_ov42_0218ccf8
data_ov42_0218ccf8: ; 0x0218ccf8
.word func_ov00_020c1b6c
.word _ZN5Actor15TrySetTransformEP9Transform
.global data_ov42_0218ccfc
data_ov42_0218ccfc: ; 0x0218ccfc
.word func_ov00_020c1bb4
.word _ZN5Actor12SetTransformEP9Transform
.global data_ov42_0218cd00
data_ov42_0218cd00: ; 0x0218cd00
.word func_ov00_020c1bf8
.word _ZN5Actor8vfunc_a8Ev
.global data_ov42_0218cd04
data_ov42_0218cd04: ; 0x0218cd04
.word func_ov00_020c31fc
.word _ZN5Actor8vfunc_acEv
.global data_ov42_0218cd08
data_ov42_0218cd08: ; 0x0218cd08
.word func_ov00_020c322c
.word _ZN5Actor8vfunc_b0Ev
.global data_ov42_0218cd0c
data_ov42_0218cd0c: ; 0x0218cd0c
.byte 0x00, 0x00, 0x00, 0x00
asm/ov43.inc
+54 -54
View File
@@ -21,7 +21,7 @@
.extern data_027e0fe8
.extern data_027e0fec
.extern data_027e0ffc
.extern data_ov00_020e72f0
.extern _ZTV11FilterActor
.extern data_ov00_020e9370
.extern data_ov00_020eec9c
.extern func_01ff9958
@@ -69,60 +69,60 @@
.extern func_ov00_020c0d4c
.extern func_ov00_020c0e04
.extern func_ov00_020c1500
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1908
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1e2c
.extern func_ov00_020c1ef8
.extern func_ov00_020c23c4
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c288c
.extern func_ov00_020c28ec
.extern func_ov00_020c2938
.extern func_ov00_020c2974
.extern func_ov00_020c29d8
.extern func_ov00_020c29ec
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c31fc
.extern func_ov00_020c3200
.extern func_ov00_020c322c
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor10SetUnk_11cEc
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii
.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c3894
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c45b0
asm/ov43.s
+191 -191
View File
File diff suppressed because it is too large Load Diff
asm/ov44.inc
+60 -60
View File
@@ -16,7 +16,7 @@
.extern data_027e0fec
.extern data_027e0ff0
.extern data_027e0ffc
.extern data_ov00_020e72f0
.extern _ZTV11FilterActor
.extern data_ov00_020e8398
.extern data_ov00_020e892c
.extern data_ov00_020e9370
@@ -44,7 +44,6 @@
.extern func_0203e784
.extern func_0203e7b4
.extern func_02042f74
.extern strncpy
.extern func_0204f614
.extern func_0204f754
.extern func_0204f8d4
@@ -68,65 +67,65 @@
.extern func_ov00_020c0cc8
.extern func_ov00_020c0e24
.extern func_ov00_020c1500
.extern func_ov00_020c1554
.extern func_ov00_020c1730
.extern func_ov00_020c173c
.extern func_ov00_020c1740
.extern func_ov00_020c1744
.extern func_ov00_020c1748
.extern func_ov00_020c174c
.extern func_ov00_020c177c
.extern func_ov00_020c17a8
.extern func_ov00_020c17b0
.extern func_ov00_020c17bc
.extern func_ov00_020c17d4
.extern func_ov00_020c18a8
.extern func_ov00_020c18c4
.extern func_ov00_020c18fc
.extern func_ov00_020c1904
.extern func_ov00_020c1910
.extern func_ov00_020c1914
.extern func_ov00_020c191c
.extern func_ov00_020c1924
.extern func_ov00_020c1928
.extern func_ov00_020c192c
.extern func_ov00_020c1934
.extern func_ov00_020c1938
.extern func_ov00_020c193c
.extern func_ov00_020c1940
.extern func_ov00_020c1948
.extern func_ov00_020c1950
.extern func_ov00_020c1954
.extern func_ov00_020c1958
.extern func_ov00_020c1b6c
.extern func_ov00_020c1bb4
.extern func_ov00_020c1bf8
.extern func_ov00_020c1bfc
.extern func_ov00_020c1c48
.extern func_ov00_020c1c50
.extern func_ov00_020c1e2c
.extern func_ov00_020c1fc8
.extern func_ov00_020c2744
.extern func_ov00_020c27e4
.extern func_ov00_020c288c
.extern func_ov00_020c28ec
.extern func_ov00_020c2974
.extern func_ov00_020c29d8
.extern func_ov00_020c29ec
.extern func_ov00_020c2bf4
.extern func_ov00_020c3004
.extern func_ov00_020c3070
.extern func_ov00_020c310c
.extern func_ov00_020c3114
.extern func_ov00_020c313c
.extern func_ov00_020c3180
.extern func_ov00_020c31fc
.extern func_ov00_020c3200
.extern func_ov00_020c322c
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN5Actor8vfunc_0cEv
.extern _ZN5Actor8vfunc_10Ej
.extern _ZN5Actor8vfunc_24Ev
.extern _ZN5Actor8vfunc_28Ev
.extern _ZN5Actor12GetOffsetPosEP5Vec3p
.extern _ZN5Actor8vfunc_38Ev
.extern _ZN5Actor8vfunc_2cEv
.extern _ZN5Actor8vfunc_30Ev
.extern _ZN5Actor8vfunc_18Ej
.extern _ZN5Actor8vfunc_1cEt
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
.extern _ZN5Actor8vfunc_60Ev
.extern _ZN5Actor8vfunc_64Ev
.extern _ZN5Actor8vfunc_68Ev
.extern _ZN5Actor8vfunc_6cEv
.extern _ZN5Actor8vfunc_70Ev
.extern _ZN5Actor8vfunc_74Ev
.extern _ZN5Actor8vfunc_7cEv
.extern _ZN5Actor8vfunc_78Ev
.extern _ZN5Actor8vfunc_80Ev
.extern _ZN5Actor8vfunc_84Ev
.extern _ZN5Actor8vfunc_88Ev
.extern _ZN5Actor8vfunc_8cEv
.extern _ZN5Actor8vfunc_90Ev
.extern _ZN5Actor8vfunc_94Ev
.extern _ZN5Actor8vfunc_98Ev
.extern _ZN5Actor8vfunc_9cEv
.extern _ZN5Actor15TrySetTransformEP9Transform
.extern _ZN5Actor12SetTransformEP9Transform
.extern _ZN5Actor8vfunc_a8Ev
.extern _ZN5Actor18func_Ov00_020c1bfcEi
.extern _ZN5Actor8vfunc_48Ei
.extern _ZN5Actor8vfunc_4cEPi
.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p
.extern _ZN5Actor18func_ov00_020c1fc8Ej
.extern _ZN5Actor12CollidesWithEPKS_
.extern _ZN5Actor16CollidesWithLinkEv
.extern _ZN5Actor12XzDistanceToEP5Vec3p
.extern _ZN5Actor16XzDistanceToLinkEv
.extern _ZN5Actor14GetAngleToLinkEv
.extern _ZN5Actor14ResetWallTouchEv
.extern _ZN5Actor18func_ov00_020c29ecEi
.extern _ZN5Actor20IncreaseActiveFramesEv
.extern _ZN5Actor15IsHitboxTouchedEb
.extern _ZN5Actor12ApplyGravityEv
.extern _ZN5Actor6GetPosEv
.extern _ZN5Actor8vfunc_54Ev
.extern _ZN5Actor18func_ov00_020c313cEj
.extern _ZN5Actor4KillEv
.extern _ZN5Actor8vfunc_acEv
.extern _ZN5Actor18func_ov00_020c3200Ei
.extern _ZN5Actor8vfunc_b0Ev
.extern func_ov00_020c3348
.extern func_ov00_020c3674
.extern func_ov00_020c37ec
.extern func_ov00_020c38fc
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p
.extern func_ov00_020c4048
.extern func_ov00_020c4588
.extern func_ov00_020c4ae8
@@ -201,3 +200,4 @@
.extern func_ov00_020cec60
.extern func_ov05_02102c2c
.extern gItemManager
.extern strncpy
asm/ov44.s
+398 -398
View File
File diff suppressed because it is too large Load Diff

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