Match ActorManager::Actor_vfunc_10

This commit is contained in:
Mike
2024-05-11 14:30:20 -04:00
parent 481da76f4d
commit b7a6355bc6
2 changed files with 4 additions and 36 deletions
@@ -1,25 +0,0 @@
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}
+4 -11
View File
@@ -115,18 +115,12 @@ static void NONMATCH(func_ov00_020c3484)(ActorRef *ref, Actor *actor, unk32 para
#endif
}
void NONMATCH(ActorManager::Actor_vfunc_10)(u32 param1) {
#ifndef NONMATCHING
#include "../asm/ov00/Actor/ActorManager_Actor_vfunc_10.inc"
#else
ARM void ActorManager::Actor_vfunc_10(u32 param1) {
Actor *actor;
Actor **currentActor;
u32 uVar1;
int i;
uVar1 = param1;
currentActor = this->mActorTable;
u32 uVar1 = param1;
Actor **currentActor = this->mActorTable;
for (i = 0; i < this->mMaxActorIndex; ++i) {
actor = *currentActor;
@@ -136,10 +130,9 @@ void NONMATCH(ActorManager::Actor_vfunc_10)(u32 param1) {
actor->vfunc_10(param1);
}
}
currentActor = currentActor + 1;
currentActor += 1;
}
return;
#endif
}
Actor* NONMATCH(ActorManager::FindActorById)(s32 id) {