mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-07-07 21:31:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove nonmatching functions

Browse Source
This commit is contained in:
Aetias
2024-10-19 13:38:06 +02:00
parent 4826a6e764
commit 8181d30b87
5 changed files with 3 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov14/Actor/ActorRupee_ActorRupee.inc
-13
View File
@@ -1,13 +0,0 @@
stmdb sp!, {r4, lr}
mov r4, r0
bl _ZN5ActorC2Ev
lda r1, _ZTV10ActorRupee
mov r0, #8
str r1, [r4]
str r0, [r4, #0x158]
add r1, r4, #0x100
mov r2, #0
mov r0, r4
strh r2, [r1, #0x5c]
ldmia sp!, {r4, pc}
asm/ov14/Actor/ActorRupee__ZN10ActorRupeeD0Ev.inc
-8
View File
@@ -1,8 +0,0 @@
stmdb sp!, {r4, lr}
mov r4, r0
bl _ZN5ActorD2Ev
mov r0, r4
bl _ZN9SysObjectdlEPv
mov r0, r4
ldmia sp!, {r4, pc}
asm/ov14/Actor/ActorRupee__ZN10ActorRupeeD2Ev.inc
-6
View File
@@ -1,6 +0,0 @@
stmdb sp!, {r4, lr}
mov r4, r0
bl _ZN5ActorD2Ev
mov r0, r4
ldmia sp!, {r4, pc}
asm/ov14/Actor/ActorRupee_vfunc_08.inc
-149
View File
@@ -1,149 +0,0 @@
stmdb sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, lr}
sub sp, sp, #0x18
mov r4, r0
ldrh r0, [r4, #0x20]
str r0, [r4, #0x158]
bl _ZN10ActorRupee18func_ov14_0213b70cEj
cmp r0, #0
lda r0, data_ov14_021589b4
mov r2, #0
ldrne r0, [r0, #0x24]
str r2, [r4, #0x7c]
ldconst r0, #0x00000aa8
mov r5, r0, asr #0x1
str r5, [r4, #0x80]
str r2, [r4, #0x84]
str r5, [r4, #0x88]
ldr r1, [r4, #0x7c]
add r0, r5, #0x1000
str r1, [r4, #0x8c]
ldr r3, [r4, #0x80]
mov r1, #1
str r3, [r4, #0x90]
ldr r3, [r4, #0x84]
str r3, [r4, #0x94]
ldr r3, [r4, #0x88]
str r3, [r4, #0x98]
str r2, [r4, #0xa8]
str r5, [r4, #0xac]
str r2, [r4, #0xb0]
str r0, [r4, #0xb4]
ldrh r0, [r4, #0x9c]
bic r0, r0, #0xb0
strh r0, [r4, #0x9c]
strb r1, [r4, #0x9f]
ldr r0, [r4, #0x98]
sub r0, r0, #1
str r0, [r4, #0x70]
ldr r0, [r4, #0x3c]
cmp r0, #0
blt _0213af78
mov r0, r4
bl _ZN10ActorRupee18func_ov14_0213b204Ei
b _0213b0f4
_0213af78:
ldr r0, [r4, #0x144]
cmp r0, #3
addls pc, pc, r0, lsl #2
b _0213b0f4
_0213af88:
b _0213af98 // case 0
b _0213afb4 // case 1
b _0213b0c8 // case 2
b _0213b0e8 // case 3
_0213af98:
str r2, [r4, #0x60]
str r2, [r4, #0x64]
mov r0, r4
mov r1, r2
str r2, [r4, #0x68]
bl _ZN10ActorRupee18func_ov14_0213b204Ei
b _0213b0f4
_0213afb4:
lda r0, data_027e0764
mvn ip, #0x110
ldr r5, [r0]
ldmib r0, {r3, r7}
umull r9, r0, r7, r5
mla r0, r7, r3, r0
lda r3, data_027e0764
ldr r8, [r3, #0x10]
ldr r6, [r3, #0xc]
adds r10, r8, r9
ldr r11, [r3, #0x14]
mla r0, r6, r5, r0
umull r3, lr, r7, r10
adc r9, r11, r0
adds r0, r8, r3
str r0, [sp, #0x14]
lda r0, data_027e0764
mla lr, r7, r9, lr
str r10, [r0]
ldr r3, [sp, #0x14]
str r9, [r0, #4]
str r3, [r0]
rsb r0, r1, #0x224
str r0, [sp, #0x10]
umull r0, r5, r9, r0
str r0, [sp, #4]
mla r5, r9, r2, r5
mla lr, r6, r10, lr
ldr r0, [sp, #0x10]
mov r3, r2
mla r5, r3, r0, r5
add r0, r5, ip
str r0, [sp]
ldr r5, [sp, #0x14]
lda r0, data_027e0764
adc r9, r11, lr
umull r10, r5, r7, r5
mla r5, r7, r9, r5
ldr r7, [sp, #0x14]
rsb r1, r1, #0x334
str r9, [r0, #4]
umull r0, r3, r9, r1
mla r5, r6, r7, r5
mov r6, r10
adds r6, r8, r6
adc r7, r11, r5
lda r5, data_027e0764
mla r3, r9, r2, r3
mov r0, r2
mla r3, r0, r1, r3
add r0, r3, #0x55
add r0, r0, #0x500
str r0, [sp, #8]
add r3, ip, #0x334
stmia r5, {r6, r7}
umull r5, r6, r7, r3
mla r6, r7, r2, r6
mla r6, r2, r3, r6
mov r1, r2
add r2, r6, ip
str r2, [r4, #0x60]
ldr r2, [sp, #8]
mov r0, r4
str r2, [r4, #0x64]
ldr r2, [sp]
str r10, [sp, #0xc]
str r2, [r4, #0x68]
bl _ZN10ActorRupee18func_ov14_0213b204Ei
b _0213b0f4
_0213b0c8:
str r2, [r4, #0x60]
mov r0, #0x800
str r0, [r4, #0x64]
mov r0, r4
mov r1, r2
str r2, [r4, #0x68]
bl _ZN10ActorRupee18func_ov14_0213b204Ei
b _0213b0f4
_0213b0e8:
mov r0, r4
mov r1, #5
bl _ZN10ActorRupee18func_ov14_0213b204Ei
_0213b0f4:
mov r0, #1
add sp, sp, #0x18
ldmia sp!, {r3, r4, r5, r6, r7, r8, r9, r10, r11, pc}
src/14_Land/Actor/ActorRupee.cpp
+3 -19
View File
@@ -47,15 +47,11 @@ ActorRupee *ActorRupee::Create() {
}
extern "C" asm ActorRupee *_ZN10ActorRupeeC1Ev(ActorRupee *thisx) {
#ifndef NONMATCHING
#include "../../../asm/ov14/Actor/ActorRupee_ActorRupee.inc"
#else
_ZN5ActorC2Ev(thisx);
_ZTV10ActorRupee = thisx;
thisx->mRupeeId = 8;
thisx->mUnk_15c = 0;
return thisx;
#endif
}
// ActorRupee::ActorRupee() {
@@ -72,10 +68,7 @@ extern "C" void _ZN10ActorRupee8vfunc_20Ei();
extern "C" void _ZN10ActorRupee8vfunc_60Ev();
extern "C" void _ZN10ActorRupee8vfunc_64Ev();
extern "C" u32 data_027e0764[];
bool NONMATCH(ActorRupee::vfunc_08)() {
#ifndef NONMATCHING
#include "../../../asm/ov14/Actor/ActorRupee_vfunc_08.inc"
#else
bool ActorRupee::vfunc_08() {
u32 *puVar2; // undefined
u32 uVar4;
u32 dVar5;
@@ -168,7 +161,6 @@ bool NONMATCH(ActorRupee::vfunc_08)() {
}
return true;
#endif
}
bool ActorRupee::vfunc_60() {
@@ -411,16 +403,8 @@ bool ActorRupee::func_ov14_0213b70c(RupeeId id) {
return false;
}
extern "C" asm void _ZN10ActorRupeeD0Ev() {
#ifndef NONMATCHING
#include "../../../asm/ov14/Actor/ActorRupee__ZN10ActorRupeeD0Ev.inc"
#endif
}
extern "C" asm void _ZN10ActorRupeeD0Ev() {}
extern "C" asm void _ZN10ActorRupeeD2Ev() {
#ifndef NONMATCHING
#include "../../../asm/ov14/Actor/ActorRupee__ZN10ActorRupeeD2Ev.inc"
#endif
}
extern "C" asm void _ZN10ActorRupeeD2Ev() {}
// ActorRupee::~ActorRupee() {}