Merge branch 'main' into transform_dep

This commit is contained in:
Aetias
2025-02-05 21:51:31 +01:00
committed by GitHub
6 changed files with 62 additions and 63 deletions
+30 -30
View File
@@ -1876,36 +1876,36 @@ _ZN18UnkStruct_02038aa0C2Ehh kind:function(thumb,size=0x5c) addr:0x2038aa0
_ZN18UnkStruct_02038aa0D1Ev kind:function(thumb,size=0xc) addr:0x2038afc
_ZN18UnkStruct_02038aa0D0Ev kind:function(thumb,size=0x14) addr:0x2038b08
_ZN18UnkStruct_02038aa0D2Ev kind:function(thumb,size=0xc) addr:0x2038b1c
_ZN18UnkStruct_02038aa013func_02038b34Eji kind:function(thumb,size=0xc) addr:0x2038b28
_ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(arm,size=0xc) addr:0x2038b34
_ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0x34) addr:0x2038b40
_ZN18UnkStruct_02038aa013func_02038b40Ev kind:function(arm,size=0x4) addr:0x2038b74
_ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0xbc) addr:0x2038b78
_ZN18UnkStruct_02038aa013func_02038b78Ev kind:function(arm,size=0x84) addr:0x2038c34
_ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x3c) addr:0x2038cb8
_ZN18UnkStruct_02038aa013func_02038cb8Ei kind:function(arm,size=0x1c) addr:0x2038cf4
_ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x10) addr:0x2038d10
_ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x1b0) addr:0x2038d20
_ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x24) addr:0x2038ed0
_ZN18UnkStruct_02038aa08vfunc_30Ev kind:function(arm,size=0x4c) addr:0x2038ef4
_ZN18UnkStruct_02038aa013func_02038ef4Eii kind:function(arm,size=0x4) addr:0x2038f40
_ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x114) addr:0x2038f44
_ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x4) addr:0x2039058
_ZN18UnkStruct_02038aa08vfunc_5cEv kind:function(arm,size=0x48) addr:0x203905c
_ZN18UnkStruct_02038aa08vfunc_1cEiPiii kind:function(arm,size=0x164) addr:0x20390a4
_ZN18UnkStruct_02038aa08vfunc_20EiPi kind:function(arm,size=0x20) addr:0x2039208
_ZN18UnkStruct_02038aa013func_02039208Es kind:function(arm,size=0x28) addr:0x2039228
_ZN18UnkStruct_02038aa08vfunc_08EiiPsi kind:function(arm,size=0x64) addr:0x2039250
_ZN18UnkStruct_02038aa013func_02039250Ev kind:function(arm,size=0xe4) addr:0x20392b4
_ZN18UnkStruct_02038aa08vfunc_54Ev kind:function(arm,size=0xc) addr:0x2039398
_ZN18UnkStruct_02038aa08vfunc_58Ev kind:function(arm,size=0x4) addr:0x20393a4
_ZN18UnkStruct_02038aa08vfunc_60Ev kind:function(arm,size=0x28) addr:0x20393a8
_ZN18UnkStruct_02038aa08vfunc_64Ev kind:function(arm,size=0x70) addr:0x20393d0
_ZN18UnkStruct_02038aa08vfunc_68Ei kind:function(arm,size=0x3c) addr:0x2039440
_ZN18UnkStruct_02038aa013func_02039440Eii kind:function(arm,size=0x5c) addr:0x203947c
_ZN18UnkStruct_02038aa08vfunc_6cEPiS0_ kind:function(arm,size=0x44) addr:0x20394d8
_ZN18UnkStruct_02038aa08vfunc_70EPiS0_ kind:function(arm,size=0x40) addr:0x203951c
_ZN18UnkStruct_02038aa013func_0203951cEv kind:function(arm,size=0x14) addr:0x203955c
_ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(thumb,size=0xc) addr:0x2038b28
_ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0xc) addr:0x2038b34
_ZN18UnkStruct_02038aa013func_02038b40Ev kind:function(arm,size=0x34) addr:0x2038b40
_ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0x4) addr:0x2038b74
_ZN18UnkStruct_02038aa013func_02038b78Ev kind:function(arm,size=0xbc) addr:0x2038b78
_ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038c34
_ZN18UnkStruct_02038aa013func_02038cb8Ei kind:function(arm,size=0x3c) addr:0x2038cb8
_ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x1c) addr:0x2038cf4
_ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x10) addr:0x2038d10
_ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x1b0) addr:0x2038d20
_ZN18UnkStruct_02038aa08vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038ed0
_ZN18UnkStruct_02038aa013func_02038ef4Eii kind:function(arm,size=0x4c) addr:0x2038ef4
_ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x4) addr:0x2038f40
_ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x114) addr:0x2038f44
_ZN18UnkStruct_02038aa08vfunc_5cEv kind:function(arm,size=0x4) addr:0x2039058
_ZN18UnkStruct_02038aa08vfunc_1cEiPiii kind:function(arm,size=0x48) addr:0x203905c
_ZN18UnkStruct_02038aa08vfunc_20EiPi kind:function(arm,size=0x164) addr:0x20390a4
_ZN18UnkStruct_02038aa013func_02039208Es kind:function(arm,size=0x20) addr:0x2039208
_ZN18UnkStruct_02038aa08vfunc_08EiiPsi kind:function(arm,size=0x28) addr:0x2039228
_ZN18UnkStruct_02038aa013func_02039250Ev kind:function(arm,size=0x64) addr:0x2039250
_ZN18UnkStruct_02038aa08vfunc_54Ev kind:function(arm,size=0xe4) addr:0x20392b4
_ZN18UnkStruct_02038aa08vfunc_58Ev kind:function(arm,size=0xc) addr:0x2039398
_ZN18UnkStruct_02038aa08vfunc_60Ev kind:function(arm,size=0x4) addr:0x20393a4
_ZN18UnkStruct_02038aa08vfunc_64Ev kind:function(arm,size=0x28) addr:0x20393a8
_ZN18UnkStruct_02038aa08vfunc_68Ei kind:function(arm,size=0x70) addr:0x20393d0
_ZN18UnkStruct_02038aa013func_02039440Eii kind:function(arm,size=0x3c) addr:0x2039440
_ZN18UnkStruct_02038aa08vfunc_6cEPiS0_ kind:function(arm,size=0x5c) addr:0x203947c
_ZN18UnkStruct_02038aa08vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x20394d8
_ZN18UnkStruct_02038aa013func_0203951cEv kind:function(arm,size=0x40) addr:0x203951c
_ZN18UnkStruct_0203881cD0Ev kind:function(arm,size=0x14) addr:0x203955c
_ZN18UnkStruct_02038aa08vfunc_38Ev kind:function(arm,size=0x8) addr:0x2039570
func_02039578 kind:function(arm,size=0x3c) addr:0x2039578
_ZN18UnkStruct_020397f8C2Ev kind:function(thumb,size=0x244) addr:0x20395b4
+30 -30
View File
@@ -1876,36 +1876,36 @@ _ZN18UnkStruct_02038aa0C2Ehh kind:function(thumb,size=0x5c) addr:0x2038a5c
_ZN18UnkStruct_02038aa0D1Ev kind:function(thumb,size=0xc) addr:0x2038ab8
_ZN18UnkStruct_02038aa0D0Ev kind:function(thumb,size=0x14) addr:0x2038ac4
_ZN18UnkStruct_02038aa0D2Ev kind:function(thumb,size=0xc) addr:0x2038ad8
_ZN18UnkStruct_02038aa013func_02038b34Eji kind:function(thumb,size=0xc) addr:0x2038ae4
_ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(arm,size=0xc) addr:0x2038af0
_ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0x34) addr:0x2038afc
_ZN18UnkStruct_02038aa013func_02038b40Ev kind:function(arm,size=0x4) addr:0x2038b30
_ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0xbc) addr:0x2038b34
_ZN18UnkStruct_02038aa013func_02038b78Ev kind:function(arm,size=0x84) addr:0x2038bf0
_ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x3c) addr:0x2038c74
_ZN18UnkStruct_02038aa013func_02038cb8Ei kind:function(arm,size=0x1c) addr:0x2038cb0
_ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x10) addr:0x2038ccc
_ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x1b0) addr:0x2038cdc
_ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x24) addr:0x2038e8c
_ZN18UnkStruct_02038aa08vfunc_30Ev kind:function(arm,size=0x4c) addr:0x2038eb0
_ZN18UnkStruct_02038aa013func_02038ef4Eii kind:function(arm,size=0x4) addr:0x2038efc
_ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x114) addr:0x2038f00
_ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x4) addr:0x2039014
_ZN18UnkStruct_02038aa08vfunc_5cEv kind:function(arm,size=0x48) addr:0x2039018
_ZN18UnkStruct_02038aa08vfunc_1cEiPiii kind:function(arm,size=0x164) addr:0x2039060
_ZN18UnkStruct_02038aa08vfunc_20EiPi kind:function(arm,size=0x20) addr:0x20391c4
_ZN18UnkStruct_02038aa013func_02039208Es kind:function(arm,size=0x28) addr:0x20391e4
_ZN18UnkStruct_02038aa08vfunc_08EiiPsi kind:function(arm,size=0x64) addr:0x203920c
_ZN18UnkStruct_02038aa013func_02039250Ev kind:function(arm,size=0xe4) addr:0x2039270
_ZN18UnkStruct_02038aa08vfunc_54Ev kind:function(arm,size=0xc) addr:0x2039354
_ZN18UnkStruct_02038aa08vfunc_58Ev kind:function(arm,size=0x4) addr:0x2039360
_ZN18UnkStruct_02038aa08vfunc_60Ev kind:function(arm,size=0x28) addr:0x2039364
_ZN18UnkStruct_02038aa08vfunc_64Ev kind:function(arm,size=0x70) addr:0x203938c
_ZN18UnkStruct_02038aa08vfunc_68Ei kind:function(arm,size=0x3c) addr:0x20393fc
_ZN18UnkStruct_02038aa013func_02039440Eii kind:function(arm,size=0x5c) addr:0x2039438
_ZN18UnkStruct_02038aa08vfunc_6cEPiS0_ kind:function(arm,size=0x44) addr:0x2039494
_ZN18UnkStruct_02038aa08vfunc_70EPiS0_ kind:function(arm,size=0x40) addr:0x20394d8
_ZN18UnkStruct_02038aa013func_0203951cEv kind:function(arm,size=0x14) addr:0x2039518
_ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(thumb,size=0xc) addr:0x2038ae4
_ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0xc) addr:0x2038af0
_ZN18UnkStruct_02038aa013func_02038b40Ev kind:function(arm,size=0x34) addr:0x2038afc
_ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0x4) addr:0x2038b30
_ZN18UnkStruct_02038aa013func_02038b78Ev kind:function(arm,size=0xbc) addr:0x2038b34
_ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038bf0
_ZN18UnkStruct_02038aa013func_02038cb8Ei kind:function(arm,size=0x3c) addr:0x2038c74
_ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x1c) addr:0x2038cb0
_ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x10) addr:0x2038ccc
_ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x1b0) addr:0x2038cdc
_ZN18UnkStruct_02038aa08vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038e8c
_ZN18UnkStruct_02038aa013func_02038ef4Eii kind:function(arm,size=0x4c) addr:0x2038eb0
_ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x4) addr:0x2038efc
_ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x114) addr:0x2038f00
_ZN18UnkStruct_02038aa08vfunc_5cEv kind:function(arm,size=0x4) addr:0x2039014
_ZN18UnkStruct_02038aa08vfunc_1cEiPiii kind:function(arm,size=0x48) addr:0x2039018
_ZN18UnkStruct_02038aa08vfunc_20EiPi kind:function(arm,size=0x164) addr:0x2039060
_ZN18UnkStruct_02038aa013func_02039208Es kind:function(arm,size=0x20) addr:0x20391c4
_ZN18UnkStruct_02038aa08vfunc_08EiiPsi kind:function(arm,size=0x28) addr:0x20391e4
_ZN18UnkStruct_02038aa013func_02039250Ev kind:function(arm,size=0x64) addr:0x203920c
_ZN18UnkStruct_02038aa08vfunc_54Ev kind:function(arm,size=0xe4) addr:0x2039270
_ZN18UnkStruct_02038aa08vfunc_58Ev kind:function(arm,size=0xc) addr:0x2039354
_ZN18UnkStruct_02038aa08vfunc_60Ev kind:function(arm,size=0x4) addr:0x2039360
_ZN18UnkStruct_02038aa08vfunc_64Ev kind:function(arm,size=0x28) addr:0x2039364
_ZN18UnkStruct_02038aa08vfunc_68Ei kind:function(arm,size=0x70) addr:0x203938c
_ZN18UnkStruct_02038aa013func_02039440Eii kind:function(arm,size=0x3c) addr:0x20393fc
_ZN18UnkStruct_02038aa08vfunc_6cEPiS0_ kind:function(arm,size=0x5c) addr:0x2039438
_ZN18UnkStruct_02038aa08vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x2039494
_ZN18UnkStruct_02038aa013func_0203951cEv kind:function(arm,size=0x40) addr:0x20394d8
_ZN18UnkStruct_0203881cD0Ev kind:function(arm,size=0x14) addr:0x2039518
_ZN18UnkStruct_02038aa08vfunc_38Ev kind:function(arm,size=0x8) addr:0x203952c
func_02039578 kind:function(arm,size=0x3c) addr:0x2039534
_ZN18UnkStruct_020397f8C2Ev kind:function(thumb,size=0x244) addr:0x2039570
-1
View File
@@ -74,7 +74,6 @@ public:
/* 74 */
UnkStruct_02038aa0(u8 param1, u8 param2);
void func_02038b34(u32 param1, unk32 param2);
void func_02038b40();
bool func_02038b78();
s32 func_02038cb8(s32 param1);
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#include <nds/math.H>
#include <nds/math.h>
#include "Physics/AABB.hpp"
#include "global.h"
-1
View File
@@ -10,7 +10,6 @@ UnkStruct_0203881c::~UnkStruct_0203881c() {}
UnkStruct_02038aa0::UnkStruct_02038aa0(u8 param1, u8 param2) :
UnkStruct_0203dae0(param1) {}
UnkStruct_02038aa0::~UnkStruct_02038aa0() {}
void UnkStruct_02038aa0::func_02038b34(u32 param1, unk32 param2) {}
void UnkStruct_02038aa0::vfunc_4c() {}
void UnkStruct_02038aa0::vfunc_10(unk32 param1) {}
void UnkStruct_02038aa0::func_02038b40() {}
+1
View File
@@ -32,6 +32,7 @@ CC_FLAGS = " ".join([
"-Cpp_exceptions off", # Disable C++ exceptions
"-RTTI off", # Disable runtime type information
"-interworking", # Enable ARM/Thumb interworking
"-w off", # Disable warnings
"-sym on", # Debug info, including line numbers
"-gccinc", # Interpret #include "..." and #include <...> equally
"-nolink", # Do not link