encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

m_Do_main / f_ap_game / f_op_actor debug work and misc (#2744)

Browse Source 
* m_Do_main / f_ap_game debug stuff

* revolution sdk compatibility

* f_op_actor debug work

* rename fopAcM_SetupActor to fopAcM_ct

* fix build

* fix jp/pal splits
This commit is contained in:
TakaRikka
2025-10-19 20:30:49 +03:00
committed by GitHub
parent 31c0f94a10
commit 850fae1aa3
870 changed files with 10837 additions and 964 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GZ2E01/splits.txt
+3 -1
View File
@@ -88,7 +88,7 @@ m_Do/m_Do_Reset.cpp:
.text start:0x800155D8 end:0x800157F4
.text start:0x800157F4 end:0x800157FC
.rodata start:0x80374198 end:0x803741A8
.sbss start:0x80450C78 end:0x80450C90
.sbss start:0x80450C78 end:0x80450C80
m_Do/m_Do_dvd_thread.cpp:
.text start:0x800157FC end:0x8001659C
@@ -96,10 +96,12 @@ m_Do/m_Do_dvd_thread.cpp:
.rodata start:0x803741A8 end:0x803743F8
.data start:0x803A34A8 end:0x803A34F8
.bss start:0x803DD940 end:0x803DECC0
.sbss start:0x80450C80 end:0x80450C88
m_Do/m_Do_DVDError.cpp:
.text start:0x8001659C end:0x8001672C
.bss start:0x803DECC0 end:0x803DFC20
.sbss start:0x80450C88 end:0x80450C90
m_Do/m_Do_MemCard.cpp:
.text start:0x8001672C end:0x80017498
config/GZ2E01/symbols.txt
+2 -2
View File
@@ -21670,7 +21670,7 @@ mBlureRate__13mDoGph_gInf_c = .sbss:0x80450BE5; // type:object size:0x1 scope:gl
mFade__13mDoGph_gInf_c = .sbss:0x80450BE6; // type:object size:0x1 scope:global align:1 data:byte
mAutoForcus__13mDoGph_gInf_c = .sbss:0x80450BE7; // type:object size:0x1 scope:global align:1 data:byte
data_80450BE8 = .sbss:0x80450BE8; // type:object size:0x1 scope:local align:1 data:byte
mDebugFill = .sbss:0x80450BF0; // type:object size:0x1 scope:local align:1 data:byte
mDebugFill__6mDoMch = .sbss:0x80450BF0; // type:object size:0x1 scope:local align:1 data:byte
solidHeapErrors = .sbss:0x80450BF4; // type:object size:0x4 scope:global align:4 data:4byte
gameHeapErrors = .sbss:0x80450BF8; // type:object size:0x4 scope:global align:4 data:4byte
zeldaHeapErrors = .sbss:0x80450BFC; // type:object size:0x4 scope:global align:4 data:4byte
@@ -21709,7 +21709,7 @@ struct_80450C7C = .sbss:0x80450C7C; // type:object size:0x1 scope:global align:1
struct_80450C7D = .sbss:0x80450C7D; // type:object size:0x1 scope:global align:1
struct_80450C7E = .sbss:0x80450C7E; // type:object size:0x1 scope:global align:1
struct_80450C7F = .sbss:0x80450C7F; // type:object size:0x1 scope:global align:1
SyncWidthSound = .sbss:0x80450C80; // type:object size:0x1 scope:global align:1 data:byte
SyncWidthSound__9mDoDvdThd = .sbss:0x80450C80; // type:object size:0x1 scope:global align:1 data:byte
sDefaultDirection = .sbss:0x80450C81; // type:object size:0x1 scope:global align:1 data:byte
struct_80450C82 = .sbss:0x80450C82; // type:object size:0x1 scope:global align:1
struct_80450C83 = .sbss:0x80450C83; // type:object size:0x1 scope:global align:1
config/GZ2J01/splits.txt
+3 -1
View File
@@ -87,7 +87,7 @@ m_Do/m_Do_lib.cpp:
m_Do/m_Do_Reset.cpp:
.text start:0x800155D8 end:0x800157FC
.rodata start:0x80376638 end:0x80376648
.sbss start:0x8044ADB8 end:0x8044ADD0
.sbss start:0x8044ADB8 end:0x8044ADC0
m_Do/m_Do_dvd_thread.cpp:
.text start:0x800157FC end:0x8001659C
@@ -95,10 +95,12 @@ m_Do/m_Do_dvd_thread.cpp:
.rodata start:0x80376648 end:0x80376898
.data start:0x8039D608 end:0x8039D658
.bss start:0x803D7A80 end:0x803D8E00
.sbss start:0x8044ADC0 end:0x8044ADC8
m_Do/m_Do_DVDError.cpp:
.text start:0x8001659C end:0x8001672C
.bss start:0x803D8E00 end:0x803D9D60
.sbss start:0x8044ADC8 end:0x8044ADD0
m_Do/m_Do_MemCard.cpp:
.text start:0x8001672C end:0x80017498
config/GZ2J01/symbols.txt
+2 -2
View File
@@ -21690,7 +21690,7 @@ mBlureRate__13mDoGph_gInf_c = .sbss:0x8044AD25; // type:object size:0x1 data:byt
mFade__13mDoGph_gInf_c = .sbss:0x8044AD26; // type:object size:0x1 data:byte
mAutoForcus__13mDoGph_gInf_c = .sbss:0x8044AD27; // type:object size:0x1 data:byte
lbl_8044AD28 = .sbss:0x8044AD28; // type:object size:0x8 data:byte
mDebugFill = .sbss:0x8044AD30; // type:object size:0x1 data:byte
mDebugFill__6mDoMch = .sbss:0x8044AD30; // type:object size:0x1 data:byte
solidHeapErrors = .sbss:0x8044AD34; // type:object size:0x4 scope:global align:4 data:4byte
gameHeapErrors = .sbss:0x8044AD38; // type:object size:0x4 scope:global align:4 data:4byte
zeldaHeapErrors = .sbss:0x8044AD3C; // type:object size:0x4 scope:global align:4 data:4byte
@@ -21725,7 +21725,7 @@ aram_cache_size = .sbss:0x8044ADA8; // type:object size:0x4 scope:global align:4
mSystemFar__14mDoLib_clipper = .sbss:0x8044ADB0; // type:object size:0x4 scope:global align:4 data:float
mFovyRate__14mDoLib_clipper = .sbss:0x8044ADB4; // type:object size:0x4 scope:global align:4 data:float
mResetData__6mDoRst = .sbss:0x8044ADB8; // type:object size:0x4 scope:global align:4 data:4byte
SyncWidthSound = .sbss:0x8044ADC0; // type:object size:0x1 data:byte
SyncWidthSound__9mDoDvdThd = .sbss:0x8044ADC0; // type:object size:0x1 data:byte
sDefaultDirection = .sbss:0x8044ADC1; // type:object size:0x7 data:byte
mDoDvdErr_initialized = .sbss:0x8044ADC8; // type:object size:0x1 data:byte
sConsole = .sbss:0x8044ADD0; // type:object size:0x4 scope:global align:4 data:4byte
config/GZ2P01/splits.txt
+3 -1
View File
@@ -87,7 +87,7 @@ m_Do/m_Do_lib.cpp:
m_Do/m_Do_Reset.cpp:
.text start:0x8001558C end:0x800157B0
.rodata start:0x80374FD8 end:0x80374FE8
.sbss start:0x80452C38 end:0x80452C50
.sbss start:0x80452C38 end:0x80452C40
m_Do/m_Do_dvd_thread.cpp:
.text start:0x800157B0 end:0x80016550
@@ -95,10 +95,12 @@ m_Do/m_Do_dvd_thread.cpp:
.rodata start:0x80374FE8 end:0x80375238
.data start:0x803A5188 end:0x803A51D8
.bss start:0x803DF8E0 end:0x803E0C60
.sbss start:0x80452C40 end:0x80452C48
m_Do/m_Do_DVDError.cpp:
.text start:0x80016550 end:0x800166E0
.bss start:0x803E0C60 end:0x803E1BC0
.sbss start:0x80452C48 end:0x80452C50
m_Do/m_Do_MemCard.cpp:
.text start:0x800166E0 end:0x8001744C
config/GZ2P01/symbols.txt
+1 -1
View File
@@ -21731,7 +21731,7 @@ aram_cache_size = .sbss:0x80452C28; // type:object size:0x4 scope:global align:4
mSystemFar__14mDoLib_clipper = .sbss:0x80452C30; // type:object size:0x4 scope:global align:4 data:float
mFovyRate__14mDoLib_clipper = .sbss:0x80452C34; // type:object size:0x4 scope:global align:4 data:float
mResetData__6mDoRst = .sbss:0x80452C38; // type:object size:0x4 scope:global align:4 data:4byte
SyncWidthSound = .sbss:0x80452C40; // type:object size:0x1 data:byte
SyncWidthSound__9mDoDvdThd = .sbss:0x80452C40; // type:object size:0x1 data:byte
sDefaultDirection = .sbss:0x80452C41; // type:object size:0x7 data:byte
mDoDvdErr_initialized = .sbss:0x80452C48; // type:object size:0x1 data:byte
sConsole = .sbss:0x80452C50; // type:object size:0x4 scope:global align:4 data:4byte
configure.py
+16
View File
@@ -264,6 +264,22 @@ elif config.version == "RZDE01_00" or config.version == "RZDE01_02" or config.ve
else:
cflags_base.extend(["-O4,p", "-inline auto", "-RTTI off", "-str reuse", "-multibyte"])
USE_REVOLUTION_SDK_VERSIONS = [
"RZDE01_00", # Wii USA Rev 0
"RZDE01_02", # Wii USA Rev 2
"RZDP01", # Wii PAL
"RZDJ01", # Wii JPN
"RZDK01", # Wii KOR
"DZDE01", # Wii USA Kiosk Demo
"DZDP01", # Wii PAL Kiosk Demo
"Shield", # Shield
"ShieldP", # Shield Production
"ShieldD", # Shield Debug
]
if config.version in USE_REVOLUTION_SDK_VERSIONS:
cflags_base.extend(["-D__REVOLUTION_SDK__"])
# Debug flags
if args.debug:
# Or -sym dwarf-2 for Wii compilers
include/DynamicLink.h
+20 -1
View File
@@ -1,7 +1,9 @@
#ifndef DYNAMICLINK_H
#define DYNAMICLINK_H
#include "dolphin/os.h"
#include <dolphin/os.h>
#include "JSystem/JKernel/JKRHeap.h"
#include "global.h"
class JKRArchive;
class JKRFileCache;
@@ -23,6 +25,8 @@ struct DynamicModuleControlBase {
virtual void dump();
#endif
/* 80262470 */ static void dump();
static void dump(char*);
/* 802631FC */ virtual void dump2() {};
/* 802631DC */ virtual bool do_load() {return true;};
/* 802631F4 */ virtual BOOL do_load_async() {return true;};
@@ -39,8 +43,23 @@ struct DynamicModuleControlBase {
inline DynamicModuleControlBase* getNextClass() { return mNext; }
bool isLinked() const { return mLinkCount != 0; }
#if DEBUG
static void resetDoLinkCount() {} // TODO
static void dumpTag() {} // TODO
#endif
static DynamicModuleControlBase* mFirst;
static DynamicModuleControlBase* mLast;
#if DEBUG
static u8 verbose;
#endif
#if PLATFORM_WII || PLATFORM_SHIELD
static JKRHeap* getHeap() { return m_heap; }
static JKRHeap* m_heap;
#endif
};
struct DynamicModuleControl : DynamicModuleControlBase {
include/JSystem/J3DGraphBase/J3DSys.h
+1 -1
View File
@@ -162,7 +162,7 @@ struct J3DSys {
Mtx& getModelDrawMtx(u16 no) { return mModelDrawMtx[no]; }
J3DShapePacket* getShapePacket() { return mShapePacket; }
void setViewMtx(Mtx m) { MTXCopy(m, mViewMtx); }
void setViewMtx(const Mtx m) { MTXCopy(m, mViewMtx); }
J3DModel* getModel() { return mModel; }
include/JSystem/J3DGraphLoader/J3DModelSaver.h
+14
View File
@@ -0,0 +1,14 @@
#ifndef J3DMODELSAVER_H
#define J3DMODELSAVER_H
#include "JSystem/J3DGraphAnimator/J3DModel.h"
enum J3DBinaryDisplayListSaverFlag {
J3DBinaryDisplayListSaverFlag_UNK_1 = 1,
};
namespace J3DModelSaverDataBase {
void* saveBinaryDisplayList(const J3DModel*, J3DBinaryDisplayListSaverFlag, u32);
};
#endif
include/JSystem/JFramework/JFWDisplay.h
+3
View File
@@ -101,6 +101,9 @@ public:
void resetFader() { setFader(NULL); }
JUTFader* getFader() const { return mFader; }
void setClearColor(JUtility::TColor color) { mClearColor = color; }
int getEfbWidth() const { return JUTVideo::getManager()->getFbWidth(); }
int getEfbHeight() const { return JUTVideo::getManager()->getEfbHeight(); }
JUTXfb* getXfbManager() const { return mXfbManager; }
static JFWDisplay* sManager;
include/JSystem/JHostIO/JORServer.h
+3
View File
@@ -7,6 +7,9 @@
#include "JSystem/JUtility/JUTAssert.h"
void JOR_MESSAGELOOP();
void JOR_INIT();
void JOR_SETROOTNODE(const char*, JORReflexible*, u32, u32);
u32 JORMessageBox(const char* message, const char* title, u32 style);
struct JOREventCallbackListNode {
include/JSystem/JKernel/JKRAram.h
+12
View File
@@ -89,6 +89,18 @@ inline JKRAramBlock *JKRMainRamToAram(u8 *buf, u32 bufSize, u32 alignedSize, JKR
return JKRAram::mainRamToAram(buf, bufSize, alignedSize, expandSwitch, fileSize, heap, id, pSize);
}
inline u32 JKRGetAramTotalFreeSize() {
return JKRAram::getAramHeap()->getTotalFreeSize();
}
inline u32 JKRGetAramFreeSize() {
return JKRAram::getAramHeap()->getFreeSize();
}
inline u32 JKRGetAramUsedSize(u8 param_0) {
return JKRAram::getAramHeap()->getUsedSize(param_0);
}
// void JKRDecompressFromAramToMainRam(u32, void*, u32, u32, u32, u32*);
#endif /* JKRARAM_H */
include/JSystem/JKernel/JKRAramArchive.h
-1
View File
@@ -27,7 +27,6 @@ public:
static u32 fetchResource_subroutine(u32, u32, u8*, u32, int);
static u32 fetchResource_subroutine(u32, u32, JKRHeap*, int, u8**);
private:
/* 0x00 */ // vtable
/* 0x04 */ // JKRArchive
/* 0x64 */ JKRAramBlock* mBlock;
include/JSystem/JKernel/JKRAramHeap.h
+4 -4
View File
@@ -26,10 +26,10 @@ public:
JKRAramBlock* alloc(u32, EAllocMode);
JKRAramBlock* allocFromHead(u32);
JKRAramBlock* allocFromTail(u32);
u32 getFreeSize(void);
u32 getTotalFreeSize(void);
// u32 getUsedSize(void);
void dump(void);
u32 getFreeSize();
u32 getTotalFreeSize();
u32 getUsedSize(u8);
void dump();
void free(JKRAramBlock *block) {
delete block;
}
include/JSystem/JUtility/JUTProcBar.h
+1
View File
@@ -96,6 +96,7 @@ public:
void setCostFrame(int frame) { mCostFrame = frame; }
void setVisible(bool visible) { mVisible = visible; }
void setVisibleHeapBar(bool visible) { mHeapBarVisible = visible; }
void setWatchHeap(JKRHeap* pHeap) { mWatchHeap = pHeap; }
static JUTProcBar* getManager() { return sManager; }
include/c/c_dylink.h
+2
View File
@@ -23,4 +23,6 @@ BOOL cDyl_IsLinked(s16 i_ProfName);
BOOL cDyl_Unlink(s16 i_ProfName);
int cDyl_LinkASync(s16 i_ProfName);
BOOL cCc_Check();
#endif /* C_C_DYLINK_H */
include/d/actor/d_a_alink.h
+5 -3
View File
@@ -3750,9 +3750,9 @@ public:
s16 getHookshotStopTime() const { return field_0x3026; }
bool getHookshotLeft() const { return field_0x3020 == 0; }
static int getBallModelIdx() { return 0x25; }
static int getBallBtkIdx() { return 0x49; }
static int getBallBrkIdx() { return 0x41; }
static u16 getBallModelIdx() { return 0x25; }
static u16 getBallBtkIdx() { return 0x49; }
static u16 getBallBrkIdx() { return 0x41; }
bool checkRootTransClearMode() { return field_0x2f99 & 7; }
bool checkRootTransZClearMode() { return field_0x2f99 & 4; }
@@ -3828,6 +3828,8 @@ public:
u16 getReadyItem() { return dComIfGp_getSelectItem(mSelectItemId); }
static u32 getOtherHeapSize() { return 0xF0A60; }
static daAlink_BckData const m_mainBckShield[20];
static daAlink_BckData const m_mainBckSword[5];
static daAlink_BckData const m_mainBckFishing[28];
include/d/actor/d_a_guard_mng.h
+1 -1
View File
@@ -56,7 +56,7 @@ public:
}
int create() {
fopAcM_SetupActor(this, daGuardMng_c);
fopAcM_ct(this, daGuardMng_c);
create_init();
return cPhs_COMPLEATE_e;
}
include/d/actor/d_a_midna.h
+2
View File
@@ -391,6 +391,8 @@ public:
onStateFlg0(daMidna_FLG0(FLG0_PORTAL_OBJ_CALL | FLG0_TAG_WAIT));
}
static u32 getOtherHeapSize() { return 0x1D0; }
static daMidna_texData_s const m_texDataTable[21];
static daMidna_anmData_s const m_anmDataTable[53];

Some files were not shown because too many files have changed in this diff Show More