mirror of
https://github.com/zeldaret/ph
synced 2026-06-05 03:07:45 -04:00
build issues fix attempt
This commit is contained in:
@@ -24,3 +24,4 @@ src/Main/Unknown/UnkStruct_0206322c.cpp:
|
||||
src/Main/Unknown/UnkStruct_02063220.cpp:
|
||||
.text start:0x0202f3f0 end:0x0202f8e8
|
||||
.rodata start:0x020562e2 end:0x02056300
|
||||
.data start:0x0205772c end:0x02057808
|
||||
|
||||
@@ -1544,7 +1544,7 @@ _ZN18UnkStruct_0206322c13func_02030408Ev kind:function(thumb,size=0x16) addr:0x2
|
||||
func_02030420 kind:function(thumb,size=0x44) addr:0x2030420
|
||||
_ZN18UnkStruct_0206322c13func_02030464Ebb kind:function(thumb,size=0x42) addr:0x2030464
|
||||
_ZN18UnkStruct_0206322c13func_020304a8Ebb kind:function(thumb,size=0x2c) addr:0x20304a8
|
||||
DisplayDebugText kind:function(thumb,size=0xd8) addr:0x20304d4
|
||||
_Z16DisplayDebugTextiiiiPci kind:function(thumb,size=0xd8) addr:0x20304d4
|
||||
func_020305ac kind:function(thumb,size=0x88) addr:0x20305ac
|
||||
_Z22DisplayDebugTextFormatiiiiiPcS_ kind:function(thumb,size=0x30) addr:0x2030634
|
||||
_Z28DisplayDebugTextFormat_thunkiiiiiPcz kind:function(thumb,size=0x26) addr:0x2030664
|
||||
|
||||
+14
-14
@@ -1474,13 +1474,13 @@ func_0202f2f8 kind:function(arm,size=0x30) addr:0x202f2f4
|
||||
func_0202f328 kind:function(arm,size=0x38) addr:0x202f324
|
||||
func_0202f360 kind:function(thumb,size=0x14) addr:0x202f35c
|
||||
func_0202f374 kind:function(thumb,size=0x7c) addr:0x202f370
|
||||
func_0202f3f0 kind:function(thumb,size=0x10) addr:0x202f3ec
|
||||
func_0202f400 kind:function(thumb,size=0x16) addr:0x202f3fc
|
||||
DisplayAssertError kind:function(thumb,size=0x9c) addr:0x202f414
|
||||
func_0202f4b4 kind:function(thumb,size=0x4c) addr:0x202f4b0
|
||||
func_0202f500 kind:function(thumb,size=0x2c) addr:0x202f4fc
|
||||
DisplayException kind:function(thumb,size=0x228) addr:0x202f528
|
||||
func_0202f754 kind:function(thumb,size=0x194) addr:0x202f750
|
||||
_ZN18UnkStruct_0206322013func_0202f3f0Ei kind:function(thumb,size=0x10) addr:0x202f3ec
|
||||
_ZN18UnkStruct_0206322013func_0202f400Ei kind:function(thumb,size=0x16) addr:0x202f3fc
|
||||
_ZN18UnkStruct_0206322018DisplayAssertErrorEPctS0_z kind:function(thumb,size=0x9c) addr:0x202f414
|
||||
_ZN18UnkStruct_0206322013func_0202f4b4Ev kind:function(thumb,size=0x4c) addr:0x202f4b0
|
||||
_ZN18UnkStruct_0206322013func_0202f500Ev kind:function(thumb,size=0x2c) addr:0x202f4fc
|
||||
_ZN18UnkStruct_0206322016DisplayExceptionEP9Registers kind:function(thumb,size=0x228) addr:0x202f528
|
||||
_ZN18UnkStruct_0206322013func_0202f754Ei kind:function(thumb,size=0x194) addr:0x202f750
|
||||
func_0202f8e8 kind:function(thumb,size=0x30) addr:0x202f8e4
|
||||
func_0202f918 kind:function(thumb,size=0x88) addr:0x202f914
|
||||
func_0202f9a0 kind:function(arm,size=0x88) addr:0x202f99c
|
||||
@@ -1539,16 +1539,16 @@ _ZN18DebugHierarchyBase8vfunc_2cEv kind:function(thumb,size=0x2) addr:0x2030340
|
||||
_ZN18DebugHierarchyBase8vfunc_30Ev kind:function(thumb,size=0x2) addr:0x2030344
|
||||
_ZN18DebugHierarchyBase8vfunc_38Ev kind:function(thumb,size=0x2) addr:0x2030348
|
||||
_ZN18DebugHierarchyBase8vfunc_3cEv kind:function(thumb,size=0x2) addr:0x203034c
|
||||
func_02030354 kind:function(thumb,size=0xb4) addr:0x2030350
|
||||
func_02030408 kind:function(thumb,size=0x16) addr:0x2030404
|
||||
_ZN18UnkStruct_0206322c13func_02030354Ebb kind:function(thumb,size=0xb4) addr:0x2030350
|
||||
_ZN18UnkStruct_0206322c13func_02030408Ev kind:function(thumb,size=0x16) addr:0x2030404
|
||||
func_02030420 kind:function(thumb,size=0x44) addr:0x203041c
|
||||
func_02030464 kind:function(thumb,size=0x42) addr:0x2030460
|
||||
func_020304a8 kind:function(thumb,size=0x2c) addr:0x20304a4
|
||||
_ZN18UnkStruct_0206322c13func_02030464Ebb kind:function(thumb,size=0x42) addr:0x2030460
|
||||
_ZN18UnkStruct_0206322c13func_020304a8Ebb kind:function(thumb,size=0x2c) addr:0x20304a4
|
||||
DisplayDebugText kind:function(thumb,size=0xd8) addr:0x20304d0
|
||||
func_020305ac kind:function(thumb,size=0x88) addr:0x20305a8
|
||||
DisplayDebugTextFormat kind:function(thumb,size=0x30) addr:0x2030630
|
||||
DisplayDebugTextFormat_thunk kind:function(thumb,size=0x26) addr:0x2030660
|
||||
DisplayDebugTextF kind:function(thumb,size=0x32) addr:0x2030688
|
||||
_Z22DisplayDebugTextFormatiiiiiPcS_ kind:function(thumb,size=0x30) addr:0x2030630
|
||||
_Z28DisplayDebugTextFormat_thunkiiiiiPcz kind:function(thumb,size=0x26) addr:0x2030660
|
||||
_Z17DisplayDebugTextFiiiiPcz kind:function(thumb,size=0x32) addr:0x2030688
|
||||
func_020306c0 kind:function(thumb,size=0x70) addr:0x20306bc
|
||||
func_02030730 kind:function(thumb,size=0x28) addr:0x203072c
|
||||
func_02030758 kind:function(thumb,size=0x84) addr:0x2030754
|
||||
|
||||
@@ -26,8 +26,9 @@ void func_0202d164();
|
||||
void func_0202e6a4(void);
|
||||
void func_0203e8a0(void);
|
||||
void func_0202f374();
|
||||
char* strncpy(char*, char const*, unsigned int);
|
||||
|
||||
// probably GX/GXS functions?
|
||||
// probably GX/GXS functions?
|
||||
void func_02003ce4(unk32);
|
||||
void func_02004730(unk32);
|
||||
void func_02003a9c(unk32, unk32, unk32);
|
||||
@@ -47,7 +48,7 @@ void SetBrightColor(u16 *, unk32);
|
||||
#define REG_B_2D_ENGINE (*(u16 *) 0x04001008)
|
||||
#define REG_B_MASTER_BRIGHT ((u16 *) 0x0400106C)
|
||||
|
||||
u16 data_020562e2[] = {
|
||||
const u16 data_020562e2[] = {
|
||||
BTN_DUP, BTN_DDOWN, BTN_DDOWN, BTN_DUP, BTN_SELECT, BTN_B, BTN_R,
|
||||
BTN_START, BTN_DLEFT, BTN_DLEFT, BTN_DRIGHT, BTN_DLEFT, BTN_START, BTN_DUP,
|
||||
};
|
||||
@@ -112,6 +113,7 @@ THUMB void UnkStruct_02063220::func_0202f4b4(void) {
|
||||
}
|
||||
|
||||
THUMB void UnkStruct_02063220::func_0202f500(void) {
|
||||
// "reigaichuu(%d,%d)"
|
||||
DisplayDebugTextF(16, 0, 0, 1, "レイガイチュウ(%d,%d)", data_02075ebc, this->mUnk_05);
|
||||
}
|
||||
|
||||
@@ -141,26 +143,26 @@ THUMB void UnkStruct_02063220::DisplayException(Registers *param1) {
|
||||
}
|
||||
|
||||
for (iVar3 = 0; iVar3 < ARRAY_LEN(param1->mUnk_04); iVar3++) {
|
||||
DisplayDebugTextF(0, iVar3 + 2, 0, 0, "R%02d__=_0x%08X", iVar3, param1->mUnk_04[iVar3]);
|
||||
DisplayDebugTextF(0, iVar3 + 2, 0, 0, "R%02d = 0x%08X", iVar3, param1->mUnk_04[iVar3]);
|
||||
this->mUnk_05++;
|
||||
}
|
||||
|
||||
DisplayDebugTextF(0, 15, 0, 0, "SP___=_0x%08X", param1->mUnk_0C);
|
||||
DisplayDebugTextF(0, 15, 0, 0, "SP = 0x%08X", param1->mUnk_0C);
|
||||
this->mUnk_05++;
|
||||
|
||||
DisplayDebugTextF(0, 16, 0, 1, "LR___=_0x%08X", param1->mUnk_10);
|
||||
DisplayDebugTextF(0, 16, 0, 1, "LR = 0x%08X", param1->mUnk_10);
|
||||
this->mUnk_05++;
|
||||
|
||||
DisplayDebugTextF(0, 17, 0, 1, "PC___=_0x%08X", param1->mUnk_14);
|
||||
DisplayDebugTextF(0, 17, 0, 1, "PC = 0x%08X", param1->mUnk_14);
|
||||
this->mUnk_05++;
|
||||
|
||||
DisplayDebugTextF(0, 18, 0, 0, "CPSR_=_0x%08X", param1->mUnk_00);
|
||||
DisplayDebugTextF(0, 18, 0, 0, "CPSR = 0x%08X", param1->mUnk_00);
|
||||
this->mUnk_05++;
|
||||
|
||||
DisplayDebugTextF(0, 19, 0, 0, "SPSR_=_0x%08X", param1->mUnk_3C);
|
||||
DisplayDebugTextF(0, 19, 0, 0, "SPSR = 0x%08X", param1->mUnk_3C);
|
||||
this->mUnk_05++;
|
||||
|
||||
DisplayDebugTextF(0, 20, 0, 0, "CP15_=_0x%08X", param1->mUnk_38);
|
||||
DisplayDebugTextF(0, 20, 0, 0, "CP15 = 0x%08X", param1->mUnk_38);
|
||||
this->mUnk_05++;
|
||||
|
||||
func_0202f374();
|
||||
|
||||
Reference in New Issue
Block a user