mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-07-08 13:46:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into bmg

Browse Source
This commit is contained in:
Yanis002
2025-02-05 23:25:30 +01:00
parent 514887962c 9a1c258bf5
commit e3d37212b6
6 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/eur/arm9/symbols.txt
+1 -1
View File
@@ -1877,7 +1877,7 @@ _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_02038b28Ev kind:function(thumb,size=0xc) addr:0x2038b28
_ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(arm,size=0xc) addr:0x2038b34
_ZN18UnkStruct_02038aa08vfunc_4cEji kind:function(arm,size=0xc) addr:0x2038b34
_ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0x34) addr:0x2038b40
_ZN18UnkStruct_02038aa013func_02038b74Ev kind:function(arm,size=0x4) addr:0x2038b74
_ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0xbc) addr:0x2038b78
config/usa/arm9/symbols.txt
+1 -1
View File
@@ -1877,7 +1877,7 @@ _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_02038b28Ev kind:function(thumb,size=0xc) addr:0x2038ae4
_ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(arm,size=0xc) addr:0x2038af0
_ZN18UnkStruct_02038aa08vfunc_4cEji kind:function(arm,size=0xc) addr:0x2038af0
_ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0x34) addr:0x2038afc
_ZN18UnkStruct_02038aa013func_02038b74Ev kind:function(arm,size=0x4) addr:0x2038b30
_ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0xbc) addr:0x2038b34
include/Unknown/UnkStruct_02038aa0.hpp
+1 -2
View File
@@ -85,7 +85,7 @@ public:
/* 40 */ virtual void vfunc_40();
/* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY);
/* 48 */ virtual void vfunc_48();
/* 4c */ virtual void vfunc_4c();
/* 4c */ virtual void vfunc_4c(u32 param1, unk32 param2);
/* 50 */ virtual void vfunc_50(EntryINF1* param1, u32 param2, s16* param3, UnkSubClass1_02256FF8* param4);
/* 54 */ virtual void vfunc_54();
/* 58 */ virtual void vfunc_58();
@@ -112,7 +112,6 @@ public:
// /* 0x38 */ /* func_02039570 */ virtual bool vfunc_38(void) override;
UnkStruct_02038aa0(u8 param1, u8 param2);
void func_02038b34(u32 param1, unk32 param2);
void func_02038b40();
bool func_02038b78();
s32 func_02038cb8(s32 param1);
include/Unknown/UnkStruct_020397f8.hpp
-1
View File
@@ -125,7 +125,6 @@ public:
/* 74 */
//! TODO: check if this is really here
static void func_0203e060(UnkStruct_02038aa0* param_1, u8 param_2, u8 param_3);
void func_02039a3c(void);
unk32 func_02039250(void);
};
src/Main/Unknown/UnkStruct_02038aa0.cpp
+2 -3
View File
@@ -35,11 +35,10 @@ THUMB void UnkStruct_02038aa0::func_02038b28(void) {
this->mUnk_114->mUnk_04 = NULL;
}
ARM void UnkStruct_02038aa0::func_02038b34(u32 param1, unk32 param2) {
UnkStruct_020397f8::func_0203e060(this, param1, param2);
ARM void UnkStruct_02038aa0::vfunc_4c(u32 param1, unk32 param2) {
this->UnkStruct_0203dae0::vfunc_10(param1, param2);
}
ARM void UnkStruct_02038aa0::vfunc_4c() {}
ARM void UnkStruct_02038aa0::vfunc_10(unk32 param1) {}
ARM void UnkStruct_02038aa0::func_02038b40() {
tools/configure.py
+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