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

Formatting fixes

This commit is contained in:
jdflyer 2022-01-17 20:19:43 -07:00
parent ecc987f34c
commit 252c5daba7
6 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -113,8 +113,16 @@ clean:
rm -f -d -r $(BUILD_DIR)/src rm -f -d -r $(BUILD_DIR)/src
rm -f $(ELF) rm -f $(ELF)
rm -f $(DOL) rm -f $(DOL)
rm -f $(ELF_SHIFT)
rm -f $(DOL_SHIFT)
rm -f $(BUILD_DIR)/*.a rm -f $(BUILD_DIR)/*.a
clean_game:
rm -r -f -d $(TARGET)/game
clean_assets:
rm -r -f -d game
clean_all: clean_all:
rm -f -d -r build rm -f -d -r build

29
include/DynamicLink.h
View File

@ -7,12 +7,13 @@
#include "JSystem/JKernel/JKRFileCache.h" #include "JSystem/JKernel/JKRFileCache.h"
struct DynamicModuleControlBase { struct DynamicModuleControlBase {
u16 mLinkCount; //0x0 /* 0x00 */u16 mLinkCount;
u16 mDoLinkCount; //0x2 /* 0x02 */u16 mDoLinkCount;
DynamicModuleControlBase* mPrev; //0x4 /* 0x04 */DynamicModuleControlBase* mPrev;
DynamicModuleControlBase* mNext; //0x8 /* 0x08 */DynamicModuleControlBase* mNext;
/* 802621CC */ virtual ~DynamicModuleControlBase(); //0xC /* 0x0C */ /*vtable*/
/* 802621CC */ virtual ~DynamicModuleControlBase();
/* 800188DC */ virtual const char* getModuleName() const; /* 800188DC */ virtual const char* getModuleName() const;
/* 80263210 */ virtual int getModuleSize() const; /* 80263210 */ virtual int getModuleSize() const;
/* 80263200 */ virtual const char* getModuleTypeString() const; /* 80263200 */ virtual const char* getModuleTypeString() const;
@ -54,15 +55,15 @@ struct DynamicModuleControl : DynamicModuleControlBase {
/* 8026275C */ bool initialize(); /* 8026275C */ bool initialize();
/* 80262794 */ static void* callback(void*); /* 80262794 */ static void* callback(void*);
OSModuleInfo* mModule; //0x10 /* 0x10 */OSModuleInfo* mModule;
void* mBss; //0x14 /* 0x14 */void* mBss;
u32 unk_24; //0x18 /* 0x18 */u32 unk_24;
const char* mName; //0x1c /* 0x1c */const char* mName;
u8 mResourceType; //0x20 /* 0x20 */u8 mResourceType;
u8 unk_33; //0x21 /* 0x21 */u8 unk_33;
u16 mChecksum; //0x22 /* 0x22 */u16 mChecksum;
s32 mSize; //0x24 /* 0x24 */s32 mSize;
mDoDvdThd_callback_c* mAsyncLoadCallback; //0x28 /* 0x28 */mDoDvdThd_callback_c* mAsyncLoadCallback;
static u32 sAllocBytes; static u32 sAllocBytes;
static JKRArchive* sArchive; static JKRArchive* sArchive;

10
include/d/map/d_map_path.h
View File

@ -7,11 +7,11 @@
class dDrawPath_c : public dDlst_base_c { class dDrawPath_c : public dDlst_base_c {
public: public:
struct line_class { struct line_class {
/*0x0*/ u8 unk0; /* 0x00 */ u8 unk0;
/*0x1*/ u8 unk1; /* 0x01 */ u8 unk1;
/*0x2*/ u8 unk2; /* 0x02 */ u8 unk2;
/*0x3*/ u8 unk3; /* 0x03 */ u8 unk3;
/*0x4*/ u16* unk4; /* 0x04 */ u16* unk4;
}; };
struct poly_class {}; struct poly_class {};

2
include/d/map/d_map_path_dmap.h
View File

@ -78,7 +78,7 @@ public:
/* 8003FF14 */ virtual void preDrawPath(); /* 8003FF14 */ virtual void preDrawPath();
/* 8003FFC4 */ virtual void postDrawPath(); /* 8003FFC4 */ virtual void postDrawPath();
/* 800402C0 */ virtual void isDrawPath(); /* 800402C0 */ virtual void isDrawPath();
/* 8003FE4C */ virtual void getBackColor() const; /* 8003FE4C */ virtual GXColor* getBackColor() const;
/* 800402E0 */ virtual bool getFirstDrawLayerNo(); /* 800402E0 */ virtual bool getFirstDrawLayerNo();
/* 800402E8 */ virtual void getNextDrawLayerNo(int); /* 800402E8 */ virtual void getNextDrawLayerNo(int);
/* 800409E0 */ virtual void isDrawIconSingle(dTres_c::data_s const*, int, int, bool, bool, /* 800409E0 */ virtual void isDrawIconSingle(dTres_c::data_s const*, int, int, bool, bool,

2
src/DynamicLink.cpp
View File

@ -669,7 +669,7 @@ extern "C" void ModuleUnresolved() {
OSReport_Error("Address: Back Chain LR Save\n"); OSReport_Error("Address: Back Chain LR Save\n");
u32 i = 0; u32 i = 0;
u32* stackPtr = (u32*)OSGetStackPointer(); u32* stackPtr = (u32*)OSGetStackPointer();
while(stackPtr!=NULL&&(u32)stackPtr!=0xFFFFFFFF&&i++<0x10) { while((stackPtr != NULL) && ((u32)stackPtr != 0xFFFFFFFF) && (i++ < 0x10)) {
OSReport_Error("0x%08x: 0x%08x 0x%08x\n",stackPtr,*stackPtr,*(stackPtr+1)); OSReport_Error("0x%08x: 0x%08x 0x%08x\n",stackPtr,*stackPtr,*(stackPtr+1));
stackPtr = (u32*)*stackPtr; stackPtr = (u32*)*stackPtr;
} }

2
src/d/map/d_map_path_dmap.cpp
View File

@ -635,7 +635,7 @@ SECTION_SDATA2 static u8 l_mapBaseColor[4] = {
#pragma push #pragma push
#pragma optimization_level 0 #pragma optimization_level 0
#pragma optimizewithasm off #pragma optimizewithasm off
asm void renderingDAmap_c::getBackColor() const { asm GXColor* renderingDAmap_c::getBackColor() const {
nofralloc nofralloc
#include "asm/d/map/d_map_path_dmap/getBackColor__16renderingDAmap_cCFv.s" #include "asm/d/map/d_map_path_dmap/getBackColor__16renderingDAmap_cCFv.s"
} }