mirror
/
tp
mirror of https://github.com/zeldaret/tp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

* 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 10:30:49 -07:00 committed by GitHub
parent 31c0f94a10
commit 850fae1aa3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
870 changed files with 10837 additions and 964 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/GZ2E01/splits.txt
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

4
config/GZ2E01/symbols.txt
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

4
config/GZ2J01/splits.txt
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

4
config/GZ2J01/symbols.txt
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

4
config/GZ2P01/splits.txt
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

2
config/GZ2P01/symbols.txt
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

16
configure.py
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

21
include/DynamicLink.h
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 {

2
include/JSystem/J3DGraphBase/J3DSys.h
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; }

14
include/JSystem/J3DGraphLoader/J3DModelSaver.h Normal file
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

3
include/JSystem/JFramework/JFWDisplay.h
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;

3
include/JSystem/JHostIO/JORServer.h
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 {

12
include/JSystem/JKernel/JKRAram.h
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 */

1
include/JSystem/JKernel/JKRAramArchive.h
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;

8
include/JSystem/JKernel/JKRAramHeap.h
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;
}

1
include/JSystem/JUtility/JUTProcBar.h
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; }

2
include/c/c_dylink.h
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 */

8
include/d/actor/d_a_alink.h
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];

2
include/d/actor/d_a_guard_mng.h
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;
}

2
include/d/actor/d_a_midna.h
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];

2
include/d/actor/d_a_tag_arena.h
View File

@ -6,7 +6,7 @@
class daTagArena_c : public fopAc_ac_c {
public:
int create() {
fopAcM_SetupActor(this, daTagArena_c);
fopAcM_ct(this, daTagArena_c);
return cPhs_COMPLEATE_e;
}

2
include/d/actor/d_a_tag_assistance.h
View File

@ -11,7 +11,7 @@ public:
}
int create() {
fopAcM_SetupActor(this, daTagAssist_c);
fopAcM_ct(this, daTagAssist_c);
create_init();
return cPhs_COMPLEATE_e;
}

2
include/d/actor/d_a_tag_chkpoint.h
View File

@ -14,7 +14,7 @@ public:
u8 getSwBit2() { return fopAcM_GetParam(this) >> 16; }
int create() {
fopAcM_SetupActor(this, daTag_Chk_c);
fopAcM_ct(this, daTag_Chk_c);
if (getAreaType() == 0) {
scale.x *= 50.0f;

2
include/d/actor/d_a_tag_gra.h
View File

@ -30,7 +30,7 @@ public:
}
int create() {
fopAcM_SetupActor(this, daTagGra_c);
fopAcM_ct(this, daTagGra_c);
if (getMode() == 2) {
if (dComIfGs_isSwitch(getSwBit(),fopAcM_GetRoomNo(this))) {

2
include/d/actor/d_a_tag_schedule.h
View File

@ -6,7 +6,7 @@
class daTagSchedule_c : public fopAc_ac_c {
public:
int create() {
fopAcM_SetupActor(this, daTagSchedule_c);
fopAcM_ct(this, daTagSchedule_c);
return cPhs_COMPLEATE_e;
}

2
include/d/actor/d_a_tag_theB_hint.h
View File

@ -68,7 +68,7 @@ public:
}
int create() {
fopAcM_SetupActor(this, daTagTheBHint_c);
fopAcM_ct(this, daTagTheBHint_c);
field_0x568 = pow(scale.x * 100.0f,2.0f);
return cPhs_COMPLEATE_e;
}

1
include/d/d_attention.h
View File

@ -249,6 +249,7 @@ public:
void runDebugDisp0();
#endif
JKRSolidHeap* getHeap() { return heap; }
fopAc_ac_c* getCatghTarget() { return mCatghTarget.getCatghTarget(); }
fopAc_ac_c* getZHintTarget() { return mZHintTarget.getZHintTarget(); }
u8 getCatchChgItem() { return mCatghTarget.getChangeItem(); }

2
include/d/d_bg_s.h
View File

@ -141,6 +141,8 @@ public:
fopAc_ac_c* GetActorPointer(cBgS_PolyInfo const& param_0) const { return cBgS::GetActorPointer(param_0); }
f32 GroundCross(cBgS_GndChk* i_gndChk) { return (f32)((cBgS*)this)->GroundCross(i_gndChk); }
void ChkDeleteActorRegist(fopAc_ac_c*);
#ifdef DEBUG
/* 0x1404 */ u8 field_0x1404[0x1408 - 0x1404];
/* 0x1408 */ dBgS_HIO m_hio;

2
include/d/d_cc_s.h
View File

@ -59,6 +59,8 @@ public:
mMass_Mng.SetAttr(radius, height, param_2, param_3);
}
void ChkActor(fopAc_ac_c*);
static bool m_mtrl_hit_tbl[64];
// /* 0x0000 */ cCcS mCCcS;

18
include/d/d_com_inf_game.h
View File

@ -295,6 +295,7 @@ public:
dEvent_manager_c& getEvtManager() { return mEvtManager; }
dAttention_c* getAttention() { return &mAttention; }
dStage_startStage_c* getStartStage() { return &mStartStage; }
dSmplMdl_draw_c* getSimpleModel() { return mSimpleModel; }
void setCurrentGrafPort(J2DOrthoGraph* i_graf) { mCurrentGrafPort = i_graf; }
void setCurrentWindow(dDlst_window_c* i_window) { mCurrentWindow = i_window; }
@ -589,6 +590,7 @@ public:
void setExpHeap2D(void* heap) { mItemInfo.mExpHeap2D = (JKRExpHeap*)heap; }
void setMsgExpHeap(void* heap) { mItemInfo.mMsgExpHeap = (JKRExpHeap*)heap; }
JKRArchive* getMsgDtArchive() { return mMsgDtArchive[0]; }
JKRArchive* getMsgDtArchive(int idx) { return mMsgDtArchive[idx]; }
JKRArchive* getMsgArchive(int idx) { return mMsgArchive[idx]; }
JKRArchive* getMsgCommonArchive() { return mMsgCommonArchive; }
@ -864,6 +866,10 @@ extern GXColor g_clearColor;
extern GXColor g_whiteColor;
extern GXColor g_saftyWhiteColor;
inline void dComIfG_ct() {
g_dComIfG_gameInfo.ct();
}
int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn*, void*);
BOOL dComIfG_resetToOpening(scene_class* scene);
char* dComIfG_getRoomArcName(int roomNo);
@ -979,6 +985,10 @@ inline void* dComIfG_getObjectRes(const char* i_arcName, int i_index) {
return g_dComIfG_gameInfo.mResControl.getObjectRes(i_arcName, i_index);
}
inline void dComIfG_dumpResControl() {
g_dComIfG_gameInfo.mResControl.dump();
}
inline dBgS& dComIfG_Bgsp() {
return g_dComIfG_gameInfo.play.mBgs;
}
@ -1816,6 +1826,10 @@ inline void dComIfGs_removeZone(int i_zoneNo) {
g_dComIfG_gameInfo.info.removeZone(i_zoneNo);
}
inline dSmplMdl_draw_c* dComIfGp_getSimpleModel() {
return g_dComIfG_gameInfo.play.getSimpleModel();
}
inline int dComIfGp_addSimpleModel(J3DModelData* i_modelData, int roomNo, u8 i_drawBG) {
return g_dComIfG_gameInfo.play.addSimpleModel(i_modelData, roomNo, i_drawBG);
}
@ -2314,6 +2328,10 @@ inline JKRArchive* dComIfGp_getDemoMsgArchive() {
return g_dComIfG_gameInfo.play.getDemoMsgArchive();
}
inline JKRArchive* dComIfGp_getMsgDtArchive() {
return g_dComIfG_gameInfo.play.getMsgDtArchive();
}
inline JKRArchive* dComIfGp_getMsgDtArchive(int idx) {
return g_dComIfG_gameInfo.play.getMsgDtArchive(idx);
}

6
include/d/d_demo.h
View File

@ -361,7 +361,11 @@ public:
/* 80039EEC */ static void setBranchId(u16, s16);
/* 80039F04 */ static void reset();
static dDemo_actor_c* getActor(u8 param_0) { return m_object->getActor(param_0); }
static dDemo_actor_c* getActor(u8 param_0) {
JUT_ASSERT(546, m_object != NULL);
return m_object->getActor(param_0);
}
static u32 getFrameNoMsg() { return m_frameNoMsg; }
static s32 getMode() { return m_mode; }
static u32 getFrame() { return m_frame; }

2
include/d/d_particle.h
View File

@ -403,6 +403,8 @@ public:
void draw2DmenuFore(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 17); }
void draw2DmenuBack(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 18); }
JKRSolidHeap* getHeap() { return mHeap; }
JKRSolidHeap* getSceneHeap() { return m_sceneHeap; }
JKRExpHeap* getResHeap() { return m_resHeap; }
void levelAllForceOnEventMove() { field_0x210.allForceOnEventMove(); }

7
include/d/d_resorce.h
View File

@ -67,6 +67,7 @@ public:
int setObjectRes(char const* i_arcName, void* i_archiveRes, u32 i_bufferSize, JKRHeap* i_heap);
int setStageRes(char const* i_arcName, JKRHeap* i_heap);
void dump();
void dump(char*);
int getObjectResName2Index(char const* i_arcName, char const* i_resName);
static int setRes(char const* i_arcName, dRes_info_c* i_resInfo, int i_infoNum, char const* i_path, u8 i_mountDirection, JKRHeap* i_heap);
@ -126,6 +127,12 @@ public:
dRes_info_c* getStageResInfo(const char* i_arcName) {
return getResInfo(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo));
}
#if DEBUG
void dumpTag() {
// TODO
}
#endif
/* 0x0000 */ dRes_info_c mObjectInfo[128];
/* 0x1200 */ dRes_info_c mStageInfo[64];

10
include/d/d_s_play.h
View File

@ -15,13 +15,17 @@ public:
/* 0x7C */ s16 mShortReg[10];
};
class dScnPly_reg_HIO_c {
class dScnPly_reg_HIO_c : public JORReflexible {
public:
/* 8025AD78 */ virtual ~dScnPly_reg_HIO_c() {}
/* 0x4 */ u8 field_0x4[0x8 - 0x4];
#ifdef DEBUG
void genMessage(JORMContext*);
/* 0x4 */ s8 id;
/* 0x8 */ dScnPly_reg_childHIO_c mChildReg[26];
#else
/* 0x4 */ u8 field_0x4[0x8 - 0x4];
#endif
};
@ -50,7 +54,7 @@ public:
virtual void genMessage(JORMContext*);
virtual ~dScnPly_preset_HIO_c() {}
/* 0x0004 */ u8 field_0x4;
/* 0x0004 */ s8 field_0x4;
/* 0x0005 */ u8 field_0x5;
/* 0x0006 */ u8 mPresetData[10000];
/* 0x2716 */ u8 field_0x2716;

37
include/d/d_s_play_env.h
View File

@ -8,14 +8,37 @@ public:
/* 8025AC0C */ virtual ~dScnPly_env_otherHIO_c() {}
void genMessage(JORMContext*);
/* 0x04 */ f32 mShadowDensity;
/* 0x08 */ u8 mLODBias;
/* 0x09 */ u8 field_0x9;
/* 0x0A */ u8 mDispTransCylinder;
#ifdef DEBUG
/* 0x0B */ u8 field_0xb[0x46 - 0xb];
/* 0x46 */ u8 field_0x46;
/* 0x47 */ u8 field_0x47[0x4f - 0x47];
/* 0x04 */ s8 field_0x04;
#endif
/* 0x08 */ f32 mShadowDensity;
#ifdef DEBUG
/* 0x0C */ f32 mCullFarValue;
/* 0x10 */ f32 mRailSize;
/* 0x14 */ s16 mRailColorR;
/* 0x16 */ s16 mRailColorG;
/* 0x18 */ s16 mRailColorB;
/* 0x1A */ s16 field_0x1a;
/* 0x1C */ s16 field_0x1c[20];
#endif
/* 0x44 */ u8 mAdjustLODBias;
/* 0x45 */ u8 field_0x45;
/* 0x46 */ u8 mDisplayTransparentCyl;
#ifdef DEBUG
/* 0x47 */ u8 mDisplayShadows;
/* 0x48 */ u8 mDisplayShadowImage;
/* 0x49 */ u8 mDisplayShadowPoly;
/* 0x4A */ u8 mDisplayCullBox;
/* 0x4B */ u8 mLoadAllRooms;
/* 0x4C */ u8 mDepthOfField;
/* 0x4D */ u8 mDisplayParticleInfo;
/* 0x4E */ u8 field_0x4e;
/* 0x4F */ u8 field_0x4f;
/* 0x50 */ u8 mAdjustCullFar;
#endif
};

4
include/d/d_stage.h
View File

@ -1153,6 +1153,8 @@ public:
return cLib_onBit(mStatus[i_roomNo].mFlag, flag);
}
static JKRExpHeap* getMemoryBlockHeap(int i_no) { return mMemoryBlock[i_no]; }
static const int MEMORY_BLOCK_MAX = 19;
static JKRExpHeap* mMemoryBlock[MEMORY_BLOCK_MAX];
@ -1426,7 +1428,7 @@ inline u32 dStage_FileList_dt_GetEnemyAppear1Flag(dStage_FileList_dt_c* p_fList)
return p_fList->mParameters & 0x20000000;
}
inline int dStage_FileList_dt_GetBitSw(dStage_FileList_dt_c* p_fList) {
inline u8 dStage_FileList_dt_GetBitSw(dStage_FileList_dt_c* p_fList) {
return p_fList->mBitSw;
}

4
include/d/d_tresure.h
View File

@ -94,6 +94,10 @@ public:
offStatus(0, param_0, i_flag);
}
static typeGroupData_c* getTypeGroupData() {
return mTypeGroupData;
}
static u8 const typeToTypeGroup[17][2];
static type_group_list mTypeGroupListAll[17];
static typeGroupData_c* mTypeGroupData;

4
include/dolphin/ai.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_AI_H_
#define _DOLPHIN_AI_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/ai.h>
#else
#include <dolphin/types.h>
#ifdef __cplusplus
@ -48,3 +51,4 @@ void AIReset(void);
#endif
#endif
#endif

4
include/dolphin/ax.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_AX_H_
#define _DOLPHIN_AX_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/ax.h>
#else
#include <dolphin/types.h>
#ifdef __cplusplus
@ -322,4 +325,5 @@ extern u16 axDspSlave[AX_DSP_SLAVE_LENGTH];
}
#endif
#endif
#endif // _DOLPHIN_AX_H_

4
include/dolphin/axart.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_AXART_H_
#define _DOLPHIN_AXART_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/axart.h>
#else
#include <dolphin/types.h>
#include <dolphin/ax.h>
@ -221,4 +224,5 @@ void AXARTLpf(AXART_LPF*, AXVPB*);
}
#endif
#endif
#endif // _DOLPHIN_AXART_H_

4
include/dolphin/axfx.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_AXFX_H_
#define _DOLPHIN_AXFX_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/axfx.h>
#else
#include <dolphin/types.h>
#ifdef __cplusplus
@ -193,4 +196,5 @@ void AXFXReverbStdCallback(AXFX_BUFFERUPDATE* bufferUpdate, AXFX_REVERBSTD* reve
}
#endif
#endif
#endif // _DOLPHIN_AXFX_H_

4
include/dolphin/base/PPCArch.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_PPCARCH
#define _DOLPHIN_PPCARCH
#ifdef __REVOLUTION_SDK__
#include <revolution/base/PPCArch.h>
#else
#include "dolphin/types.h"
#ifdef __cplusplus
@ -539,4 +542,5 @@ void PMInstructions(void);
}
#endif
#endif
#endif // _DOLPHIN_PPCARCH

4
include/dolphin/db.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_DB_H_
#define _DOLPHIN_DB_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/db.h>
#else
#include <dolphin/types.h>
#include <dolphin/db/DBInterface.h>
@ -19,4 +22,5 @@ u32 DBRead(u8*, u32);
}
#endif
#endif
#endif // _DOLPHIN_DB_H_

4
include/dolphin/db/DBInterface.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_DBINTERFACE_H_
#define _DOLPHIN_DBINTERFACE_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/db/DBInterface.h>
#else
#include <dolphin/os.h>
#ifdef __cplusplus
@ -29,3 +32,4 @@ void __DBSetPresent(u32 value);
#endif
#endif
#endif

4
include/dolphin/dolphin.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_H_
#define _DOLPHIN_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/revolution.h>
#else
#include <dolphin/types.h>
#include <dolphin/os.h>
#include <dolphin/dsp.h>
@ -22,3 +25,4 @@
#include <dolphin/si.h>
#endif
#endif

4
include/dolphin/dsp.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_DSP_H_
#define _DOLPHIN_DSP_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/dsp.h>
#else
#include <dolphin/os.h>
#ifdef __cplusplus
@ -55,3 +58,4 @@ DSPTaskInfo* __DSPGetCurrentTask(void);
#endif
#endif
#endif

4
include/dolphin/dvd.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_DVD_H_
#define _DOLPHIN_DVD_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/dvd.h>
#else
#include <dolphin/types.h>
#ifdef __cplusplus
@ -234,3 +237,4 @@ void DVDDumpWaitingQueue(void);
#endif
#endif
#endif

4
include/dolphin/exi.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_EXI_H_
#define _DOLPHIN_EXI_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/exi.h>
#else
#include <dolphin/os.h>
#ifdef __cplusplus
@ -101,3 +104,4 @@ char* EXIGetTypeString(u32 type);
#endif
#endif
#endif

4
include/dolphin/gd.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GD_H_
#define _DOLPHIN_GD_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gd.h>
#else
#include <dolphin/gd/GDBase.h>
#include <dolphin/gd/GDFile.h>
#include <dolphin/gd/GDGeometry.h>
@ -12,3 +15,4 @@
#include <dolphin/gd/GDTransform.h>
#endif
#endif

4
include/dolphin/gd/GDBase.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GD_BASE_H
#define _DOLPHIN_GD_BASE_H
#ifdef __REVOLUTION_SDK__
#include <revolution/gd/GDBase.h>
#else
#include <dolphin/types.h>
#include <dolphin/gx/GXEnum.h>
#include <dolphin/gx/GXCommandList.h>
@ -149,3 +152,4 @@ static inline u32 GDGetGDLObjOffset(const GDLObj* dl) {
#endif
#endif
#endif

4
include/dolphin/gd/GDFile.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GD_FILE_H
#define _DOLPHIN_GD_FILE_H
#ifdef __REVOLUTION_SDK__
#include <revolution/gd/GDFile.h>
#else
#include <dolphin/types.h>
#ifdef __cplusplus
@ -29,3 +32,4 @@ s32 GDReadDLFile(const char* fName, u32* numDLs, u32* numPLs, GDGList** DLDescAr
#endif
#endif
#endif

4
include/dolphin/gd/GDGeometry.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GD_GEOMETRY_H_
#define _DOLPHIN_GD_GEOMETRY_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gd/GDGeometry.h>
#else
#include <dolphin/gx/GXStruct.h>
#ifdef __cplusplus
@ -522,3 +525,4 @@ void GDSetCoPlanar(u8 enable);
#endif
#endif
#endif

4
include/dolphin/gd/GDIndirect.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GD_INDIRECT_H_
#define _DOLPHIN_GD_INDIRECT_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gd/GDIndirect.h>
#else
#include <dolphin/types.h>
#include <dolphin/gx/GXEnum.h>
#include <dolphin/mtx.h>
@ -89,3 +92,4 @@ void __GDSetIndTexMask(u32 mask);
#endif
#endif
#endif

4
include/dolphin/gd/GDLight.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GD_LIGHT_H_
#define _DOLPHIN_GD_LIGHT_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gd/GDLight.h>
#else
#include <dolphin/gx/GXEnum.h>
#include <dolphin/gx/GXStruct.h>
#include "global.h"
@ -72,3 +75,4 @@ inline static u16 __GDLightID2Offset(GXLightID id) {
#endif
#endif
#endif

4
include/dolphin/gd/GDPixel.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GD_PIXEL_H
#define _DOLPHIN_GD_PIXEL_H
#ifdef __REVOLUTION_SDK__
#include <revolution/gd/GDPixel.h>
#else
#include <dolphin/gx/GXEnum.h>
#include <dolphin/gx/GXStruct.h>
@ -93,3 +96,4 @@ void GDSetDrawSync(u16 token);
#endif
#endif
#endif

4
include/dolphin/gd/GDTev.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GD_TEV_H
#define _DOLPHIN_GD_TEV_H
#ifdef __REVOLUTION_SDK__
#include <revolution/gd/GDTev.h>
#else
#include <dolphin/gx/GXEnum.h>
#include <dolphin/gx/GXStruct.h>
@ -131,3 +134,4 @@ void GDSetTevOrder(GXTevStageID evenStage, GXTexCoordID coord0, GXTexMapID map0,
#endif
#endif
#endif

4
include/dolphin/gd/GDTexture.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GD_TEXTURE_H
#define _DOLPHIN_GD_TEXTURE_H
#ifdef __REVOLUTION_SDK__
#include <revolution/gd/GDTexture.h>
#else
#include <dolphin/types.h>
#include <dolphin/gx/GXEnum.h>
@ -125,3 +128,4 @@ void GDLoadTlutRaw(u32 tlut_ptr_raw, u32 tmem_addr, GXTlutSize size);
#endif
#endif
#endif

4
include/dolphin/gd/GDTransform.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GD_TRANSFORM_H_
#define _DOLPHIN_GD_TRANSFORM_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gd/GDTransform.h>
#else
#include <dolphin/types.h>
#include <dolphin/gx/GXEnum.h>
#include <dolphin/mtx.h>
@ -54,3 +57,4 @@ void GDSetProjection(const Mtx44 mtx, GXProjectionType type);
#endif
#endif
#endif

4
include/dolphin/gf.h
View File

@ -1,9 +1,13 @@
#ifndef _DOLPHIN_GF_H_
#define _DOLPHIN_GF_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gf.h>
#else
#include <dolphin/gf/GFGeometry.h>
#include <dolphin/gf/GFLight.h>
#include <dolphin/gf/GFPixel.h>
#include <dolphin/gf/GFTev.h>
#endif
#endif

10
include/dolphin/gf/GFGeometry.h
View File

@ -1,6 +1,9 @@
#ifndef GFGEOMETRY_H
#define GFGEOMETRY_H
#ifndef _DOLPHIN_GF_GFGEOMETRY_H_
#define _DOLPHIN_GF_GFGEOMETRY_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gf/GFGeometry.h>
#else
#include <dolphin/gx.h>
#define GF_GEN_MODE(nTexGens, nChans, nTevs, cm, nInds) \
@ -38,4 +41,5 @@ static inline void GFWriteXFCmd(u16 addr, u32 val) {
void GFSetGenMode2(u8 nTexGens, u8 nChans, u8 nTevs, u8 nInds, GXCullMode cm);
#endif /* GFGEOMETRY_H */
#endif
#endif /* _DOLPHIN_GF_GFGEOMETRY_H_ */

10
include/dolphin/gf/GFLight.h
View File

@ -1,8 +1,12 @@
#ifndef GFLIGHT_H
#define GFLIGHT_H
#ifndef _DOLPHIN_GF_GFLIGHT_H
#define _DOLPHIN_GF_GFLIGHT_H
#ifdef __REVOLUTION_SDK__
#include <revolution/gf/GFLight.h>
#else
#include <dolphin/gx.h>
void GFSetChanAmbColor(GXChannelID chan, GXColor color);
#endif /* GFLIGHT_H */
#endif
#endif /* _DOLPHIN_GF_GFLIGHT_H */

10
include/dolphin/gf/GFPixel.h
View File

@ -1,6 +1,9 @@
#ifndef GFPIXEL_H
#define GFPIXEL_H
#ifndef _DOLPHIN_GF_GFPIXEL_H
#define _DOLPHIN_GF_GFPIXEL_H
#ifdef __REVOLUTION_SDK__
#include <revolution/gf/GFPixel.h>
#else
#include <dolphin/gx.h>
void GFSetFog(GXFogType type, f32 startz, f32 endz, f32 nearz, f32 farz, GXColor color);
@ -10,4 +13,5 @@ void GFSetBlendModeEtc(GXBlendMode type, GXBlendFactor src_factor,
u8 dither_enable);
void GFSetZMode(u8 compare_enable, GXCompare func, u8 update_enable);
#endif /* GFPIXEL_H */
#endif
#endif /* _DOLPHIN_GF_GFPIXEL_H */

10
include/dolphin/gf/GFTev.h
View File

@ -1,8 +1,12 @@
#ifndef GFTEV_H
#define GFTEV_H
#ifndef _DOLPHIN_GF_GFTEV_H
#define _DOLPHIN_GF_GFTEV_H
#ifdef __REVOLUTION_SDK__
#include <revolution/gf/GFTev.h>
#else
#include <dolphin/gx.h>
void GFSetTevColorS10(GXTevRegID reg, GXColorS10 color);
#endif /* GFTEV_H */
#endif
#endif /* _DOLPHIN_GF_GFTEV_H */

4
include/dolphin/gx.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_H_
#define _DOLPHIN_GX_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx.h>
#else
#include <dolphin/gx/GXStruct.h>
#include <dolphin/gx/GXTransform.h>
#include <dolphin/gx/GXTev.h>
@ -38,3 +41,4 @@ void GXSetDrawSync(u16 token);
#endif
#endif
#endif

4
include/dolphin/gx/GXBump.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXBUMP_H_
#define _DOLPHIN_GX_GXBUMP_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXBump.h>
#else
#include <dolphin/gx/GXEnum.h>
#ifdef __cplusplus
@ -27,3 +30,4 @@ void __GXSetIndirectMask(u32 mask);
#endif
#endif
#endif

4
include/dolphin/gx/GXCommandList.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXCOMMANDLIST_H_
#define _DOLPHIN_GX_GXCOMMANDLIST_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXCommandList.h>
#else
#include <dolphin/types.h>
#define GX_NOP 0x00
@ -35,3 +38,4 @@ extern u8 GXTexImage3Ids[8];
extern u8 GXTexTlutIds[8];
#endif
#endif

4
include/dolphin/gx/GXCpu2Efb.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXCPU2EFB_H_
#define _DOLPHIN_GX_GXCPU2EFB_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXCpu2Efb.h>
#else
#include <dolphin/gx/GXEnum.h>
#ifdef __cplusplus
@ -27,3 +30,4 @@ u32 GXDecompressZ16(u32 z16, GXZFmt16 zfmt);
#endif
#endif
#endif

4
include/dolphin/gx/GXCull.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXCULL_H_
#define _DOLPHIN_GX_GXCULL_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXCull.h>
#else
#include <dolphin/gx/GXEnum.h>
#ifdef __cplusplus
@ -16,3 +19,4 @@ void GXSetCoPlanar(GXBool enable);
#endif
#endif
#endif

4
include/dolphin/gx/GXDispList.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXDISPLIST_H_
#define _DOLPHIN_GX_GXDISPLIST_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXDispList.h>
#else
#include <dolphin/types.h>
#ifdef __cplusplus
@ -16,3 +19,4 @@ void GXCallDisplayList(void* list, u32 nbytes);
#endif
#endif
#endif

4
include/dolphin/gx/GXDraw.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXDRAW_H_
#define _DOLPHIN_GX_GXDRAW_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXDraw.h>
#else
#include <dolphin/types.h>
#ifdef __cplusplus
@ -22,3 +25,4 @@ u32 GXGenNormalTable(u8 depth, f32* table);
#endif
#endif
#endif

4
include/dolphin/gx/GXEnum.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXENUM_H_
#define _DOLPHIN_GX_GXENUM_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXEnum.h>
#else
#include <dolphin/types.h>
typedef u8 GXBool;
@ -922,3 +925,4 @@ typedef enum _GXCPRegs {
} GXCPRegs;
#endif
#endif

4
include/dolphin/gx/GXFifo.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXFIFO_H_
#define _DOLPHIN_GX_GXFIFO_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXFifo.h>
#else
#include <dolphin/gx/GXEnum.h>
#include <dolphin/os/OSThread.h>
@ -44,3 +47,4 @@ void GXRestoreWriteGatherPipe(void);
#endif
#endif
#endif

4
include/dolphin/gx/GXFrameBuffer.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXFRAMEBUFFER_H_
#define _DOLPHIN_GX_GXFRAMEBUFFER_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXFrameBuffer.h>
#else
#include <dolphin/gx/GXStruct.h>
#include <dolphin/gx/GXEnum.h>
@ -64,3 +67,4 @@ f32 GXGetYScaleFactor(u16 efbHeight, u16 xfbHeight);
#endif
#endif
#endif

4
include/dolphin/gx/GXGeometry.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXGEOMETRY_H_
#define _DOLPHIN_GX_GXGEOMETRY_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXGeometry.h>
#else
#include <dolphin/gx/GXEnum.h>
#include <dolphin/gx/GXStruct.h>
@ -45,3 +48,4 @@ void GXEnableTexOffsets(GXTexCoordID coord, u8 line_enable, u8 point_enable);
#endif
#endif
#endif

4
include/dolphin/gx/GXGet.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXGET_H_
#define _DOLPHIN_GX_GXGET_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXGet.h>
#else
#include <dolphin/gx/GXEnum.h>
#include <dolphin/gx/GXStruct.h>
@ -62,3 +65,4 @@ void GXGetScissor(u32* left, u32* top, u32* wd, u32* ht);
#endif
#endif
#endif

4
include/dolphin/gx/GXLighting.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXLIGHTING_H_
#define _DOLPHIN_GX_GXLIGHTING_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXLighting.h>
#else
#include <dolphin/gx/GXEnum.h>
#include <dolphin/gx/GXStruct.h>
@ -30,3 +33,4 @@ void GXSetChanCtrl(GXChannelID chan, GXBool enable, GXColorSrc amb_src, GXColorS
#endif
#endif
#endif

4
include/dolphin/gx/GXManage.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXMANAGE_H_
#define _DOLPHIN_GX_GXMANAGE_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXManage.h>
#else
#include <dolphin/gx/GXFifo.h>
#ifdef __cplusplus
@ -34,3 +37,4 @@ GXDrawDoneCallback GXSetDrawDoneCallback(GXDrawDoneCallback cb);
#endif
#endif
#endif

4
include/dolphin/gx/GXPerf.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXPERF_H_
#define _DOLPHIN_GX_GXPERF_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXPerf.h>
#else
#include <dolphin/gx/GXEnum.h>
#ifdef __cplusplus
@ -28,3 +31,4 @@ u32 GXReadClksPerVtx(void);
#endif
#endif
#endif

4
include/dolphin/gx/GXPixel.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXPIXEL_H_
#define _DOLPHIN_GX_GXPIXEL_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXPixel.h>
#else
#include <dolphin/gx/GXEnum.h>
#include <dolphin/gx/GXStruct.h>
@ -28,3 +31,4 @@ void GXSetFogColor(GXColor color);
#endif
#endif
#endif

4
include/dolphin/gx/GXStruct.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXSTRUCT_H_
#define _DOLPHIN_GX_GXSTRUCT_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXStruct.h>
#else
#include <dolphin/gx/GXEnum.h>
#include <dolphin/vi/vitypes.h>
@ -73,3 +76,4 @@ typedef struct _GXVtxAttrFmtList {
#endif
#endif
#endif

4
include/dolphin/gx/GXTev.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXTEV_H_
#define _DOLPHIN_GX_GXTEV_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXTev.h>
#else
#include <dolphin/gx/GXEnum.h>
#include <dolphin/gx/GXStruct.h>
@ -31,3 +34,4 @@ void GXSetNumTevStages(u8 nStages);
#endif
#endif
#endif

4
include/dolphin/gx/GXTexture.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXTEXTURE_H_
#define _DOLPHIN_GX_GXTEXTURE_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXTexture.h>
#else
#include <dolphin/gx/GXEnum.h>
#include <dolphin/gx/GXStruct.h>
@ -50,3 +53,4 @@ void GXInitTexObjMaxAniso(GXTexObj* obj, GXAnisotropy max_aniso);
#endif
#endif
#endif

5
include/dolphin/gx/GXTransform.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXTRANSFORM_H_
#define _DOLPHIN_GX_GXTRANSFORM_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXTransform.h>
#else
#include <dolphin/gx/GXEnum.h>
#ifdef __cplusplus
@ -30,5 +33,5 @@ void GXSetZScaleOffset(f32 scale, f32 offset);
#ifdef __cplusplus
}
#endif
#endif
#endif

4
include/dolphin/gx/GXVerify.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXVERIFY_H_
#define _DOLPHIN_GX_GXVERIFY_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXVerify.h>
#else
#include <dolphin/gx/GXEnum.h>
#include <dolphin/gx/GXStruct.h>
@ -27,3 +30,4 @@ void __GXVerifyVATImm(GXAttr attr, GXCompCnt cnt, GXCompType type, u8 frac);
#endif
#endif
#endif

4
include/dolphin/gx/GXVert.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_GX_GXVERT_H_
#define _DOLPHIN_GX_GXVERT_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/gx/GXVert.h>
#else
#include <dolphin/types.h>
#include <dolphin/os.h>
@ -138,3 +141,4 @@ FUNC_1PARAM(GXMatrixIndex, u8)
#endif
#endif
#endif

4
include/dolphin/mix.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_MIX_H_
#define _DOLPHIN_MIX_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/mix.h>
#else
#include <dolphin/types.h>
#include <dolphin/ax.h>
@ -92,4 +95,5 @@ void MIXUpdateSettings(void);
}
#endif
#endif
#endif // _DOLPHIN_MIX_H_

4
include/dolphin/mtx.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_MTX_H_
#define _DOLPHIN_MTX_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/mtx.h>
#else
#include <dolphin/types.h>
#ifdef __cplusplus
@ -381,3 +384,4 @@ void C_QUATCompA(const Quaternion* qprev, const Quaternion* q, const Quaternion*
#endif
#endif
#endif

4
include/dolphin/os.h
View File

@ -3,6 +3,9 @@
#include <stdio.h>
#ifdef __REVOLUTION_SDK__
#include <revolution/os.h>
#else
#include <dolphin/types.h>
#include <dolphin/gx/GXStruct.h>
void OSReportInit(void);
@ -351,3 +354,4 @@ static inline void OSInitFastCast(void) {
#endif
#endif
#endif

4
include/dolphin/os/OSAlarm.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_OSALARM_H_
#define _DOLPHIN_OSALARM_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/os/OSAlarm.h>
#else
#include <dolphin/os.h>
#ifdef __cplusplus
@ -33,4 +36,5 @@ void OSCancelAlarms(u32 tag);
}
#endif
#endif
#endif // _DOLPHIN_OSALARM_H_

4
include/dolphin/os/OSAlloc.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_OSALLOC_H_
#define _DOLPHIN_OSALLOC_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/os/OSAlloc.h>
#else
#include <dolphin/types.h>
#ifdef __cplusplus
@ -32,3 +35,4 @@ void OSVisitAllocated(void (*visitor)(void*, u32));
#endif
#endif
#endif

4
include/dolphin/os/OSCache.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_OSCACHE_H_
#define _DOLPHIN_OSCACHE_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/os/OSCache.h>
#else
#include <dolphin/types.h>
#ifdef __cplusplus
@ -36,3 +39,4 @@ void __OSCacheInit(void);
#endif
#endif
#endif

4
include/dolphin/os/OSContext.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_OSCONTEXT_H_
#define _DOLPHIN_OSCONTEXT_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/os/OSContext.h>
#else
#include <dolphin/types.h>
#ifdef __cplusplus
@ -171,3 +174,4 @@ void OSFillFPUContext(OSContext* context);
#endif
#endif
#endif

5
include/dolphin/os/OSDC.h
View File

@ -1,6 +1,10 @@
#ifndef _DOLPHIN_OSDC_H_
#define _DOLPHIN_OSDC_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/os/OSDC.h>
#else
#ifdef __cplusplus
extern "C" {
#endif
@ -21,3 +25,4 @@ void DCBlockInvalidate(void* addr);
#endif
#endif
#endif

4
include/dolphin/os/OSError.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_OSERROR_H_
#define _DOLPHIN_OSERROR_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/os/OSError.h>
#else
#include <dolphin/os/OSContext.h>
#ifdef __cplusplus
@ -36,3 +39,4 @@ extern OSErrorHandler __OSErrorTable[17];
#endif
#endif
#endif

4
include/dolphin/os/OSException.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_OSEXCEPTION_H_
#define _DOLPHIN_OSEXCEPTION_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/os/OSException.h>
#else
#include <dolphin/os/OSContext.h>
#include <dolphin/types.h>
@ -58,4 +61,5 @@ __OSExceptionHandler __OSGetExceptionHandler(__OSException exception);
}
#endif
#endif
#endif // _DOLPHIN_OSEXCEPTION_H_

4
include/dolphin/os/OSExec.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_OSEXEC_H_
#define _DOLPHIN_OSEXEC_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/os/OSExec.h>
#else
#include <dolphin/types.h>
#ifdef __cplusplus
@ -33,3 +36,4 @@ void OSExecl(const char* dolfile, const char* arg0, ...);
#endif
#endif
#endif

4
include/dolphin/os/OSFont.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_OSFONT_H_
#define _DOLPHIN_OSFONT_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/os/OSFont.h>
#else
#include <dolphin/types.h>
#include <dolphin/os/OSUtf.h>
@ -56,3 +59,4 @@ int OSSetFontWidth(int fixed);
#endif
#endif
#endif

5
include/dolphin/os/OSIC.h
View File

@ -1,6 +1,10 @@
#ifndef _DOLPHIN_OSIC_H_
#define _DOLPHIN_OSIC_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/os/OSIC.h>
#else
#ifdef __cplusplus
extern "C" {
#endif
@ -18,3 +22,4 @@ void ICSync(void);
#endif
#endif
#endif

4
include/dolphin/os/OSInterrupt.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_OSINTERRUPT_H_
#define _DOLPHIN_OSINTERRUPT_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/os/OSInterrupt.h>
#else
#include <dolphin/types.h>
#include <dolphin/os/OSException.h>
@ -116,3 +119,4 @@ OSInterruptMask __OSUnmaskInterrupts(OSInterruptMask mask);
#endif
#endif
#endif

4
include/dolphin/os/OSL2.h
View File

@ -1,6 +1,9 @@
#ifndef _DOLPHIN_OSL2_H_
#define _DOLPHIN_OSL2_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/os/OSL2.h>
#else
#include <dolphin/types.h>
#ifdef __cplusplus
@ -18,3 +21,4 @@ void L2SetWriteThrough(BOOL writeThrough);
#endif
#endif
#endif

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