Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2024-12-02 18:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

formatting consistency

Browse Source 
also remove a useless inline declaration from enemyunit
This commit is contained in:
EpochFlame 2023-01-16 14:04:15 -05:00
parent a420995a93
commit 276a8d34a0
14 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Game/gameGenerator.h
View File

@ -325,13 +325,13 @@ struct GenObjectEnemy : public GenObject {
u8 _4C; // _4C
};
GenObject* makeObjectEnemy(void);
GenObject* makeObjectEnemy();
/**
* @size{0x10}
*/
struct GenObjectFactory {
typedef GenObject* MakeFunction(void);
typedef GenObject* MakeFunction();
void createInstance();
u32 m_typeID; // _00

4
include/JSystem/JAI/JAInter.h
View File

@ -303,9 +303,9 @@ void init(u8*, u32);
SoundInfo* getInfoPointer(u32);
u32 getInfoFormat(u32);
void setInfoTrack(u32, u8);
u8 getCategotyMax(void);
u8 getCategotyMax(); // [sic]
u16 getSoundMax(u8);
void getSoundTablePointer(void);
void getSoundTablePointer();
extern u8 mVersion;
extern u8 mCategotyMax;

2
include/JSystem/JAI/JAInter/StreamMgr.h
View File

@ -110,7 +110,7 @@ extern DeallocCallback deallocCallback;
* This isn't the same type as the param to setExternalAramBuffer.
* It must return typeof(aramParentHeap).
*/
extern JASHeap* (*externalAramCallback)(void);
extern JASHeap* (*externalAramCallback)();
extern int dataFileNumber;
extern MgrCallback mgrCallback;

6
include/JSystem/JKR/JKRArchive.h
View File

@ -178,7 +178,7 @@ struct JKRMemArchive : public JKRArchive {
void mountFixed(long, EMountDirection);
void mountFixed(const char*, EMountDirection);
void mountFixed(void*, JKRMemBreakFlag);
void unmountFixed(void);
void unmountFixed();
void open(const char*, EMountDirection);
int _5C; // _5C
@ -204,7 +204,7 @@ struct JKRCompArchive : public JKRArchive {
void fixedInit(long);
void mountFixed(long);
void mountFixed(const char*);
void unmountFixed(void);
void unmountFixed();
int _5C; // _5C
int m_mountDirection; // _60
@ -233,7 +233,7 @@ struct JKRDvdArchive : public JKRArchive {
unknown fixedInit(long, EMountDirection);
unknown mountFixed(long, EMountDirection);
unknown mountFixed(const char*, EMountDirection);
unknown unmountFixed(void);
unknown unmountFixed();
int _5C; // _5C
int _60; // _60

16
include/PSM/Demo.h
View File

@ -44,14 +44,14 @@ struct Demo : public JKRDisposer {
// _00 = VTBL
// _00-_18 = JKRDisposer
s8 _18; // _18
u8 m_doStartWithAudio; // _19, from PikDecomp
u8 _1A; // _1A, unknown/possibly padding
u8 _1B; // _1B, unknown/possibly padding
SoundID m_soundID; // _1C, from PikDecomp
SoundID m_systemSE; // _20, from PikDecomp
void* (*m_funcptr)(void); // _24
char* m_currentDemoName; // _28
s8 _18; // _18
u8 m_doStartWithAudio; // _19, from PikDecomp
u8 _1A; // _1A, unknown/possibly padding
u8 _1B; // _1B, unknown/possibly padding
SoundID m_soundID; // _1C, from PikDecomp
SoundID m_systemSE; // _20, from PikDecomp
void* (*m_funcptr)(); // _24
char* m_currentDemoName; // _28
};
} // namespace PSM

2
include/ebi/E2DGraph.h
View File

@ -13,7 +13,7 @@ struct Mgr;
namespace ebi {
struct E2DDebugWindow {
void draw(void);
void draw();
};
struct E2DFader {

8
include/ebi/E3DGraph.h
View File

@ -34,10 +34,10 @@ struct E3DAnimCtrl {
void setAnimFolder(ebi::E3DAnimFolderBase*);
void init(long, float);
void setStartFrame(void); // UNUSED
void play(void);
void playStopEnd(void);
void stop(void); // UNUSED
void setStartFrame(); // UNUSED
void play();
void playStopEnd();
void stop(); // UNUSED
f32 _00; // _00
f32 _04; // _04

2
include/og/newScreen/KanteiDemo.h
View File

@ -75,7 +75,7 @@ struct ObjKantei : public ::Screen::ObjBase {
// unused/inline
void startItemName(u64);
void startKanteiVoice(int);
void updateKanteiVoice(void);
void updateKanteiVoice();
inline void setRect(JGeometry::TBox2f& box)
{

8
src/Dolphin/MWCriticalSection_gc.cpp
View File

@ -1,8 +1,8 @@
#include "types.h"
extern "C" {
bool OSRestoreInterrupts(unsigned int);
unsigned int OSDisableInterrupts();
bool OSRestoreInterrupts(uint);
uint OSDisableInterrupts();
/*
* --INFO--
@ -19,14 +19,14 @@ void MWTerminateCriticalSection(void)
* Address: 800C1598
* Size: 000024
*/
void MWExitCriticalSection(unsigned int* section) { OSRestoreInterrupts(*section); }
void MWExitCriticalSection(uint* section) { OSRestoreInterrupts(*section); }
/*
* --INFO--
* Address: 800C15BC
* Size: 000030
*/
void MWEnterCriticalSection(unsigned int* section) { *section = OSDisableInterrupts(); }
void MWEnterCriticalSection(uint* section) { *section = OSDisableInterrupts(); }
/*
* --INFO--

16
src/Dolphin/__ppc_eabi_init.cpp
View File

@ -5,14 +5,14 @@
#ifdef __cplusplus
extern "C" {
#endif
typedef void (*voidfunctionptr)(void); // pointer to function returning void
typedef void (*voidfunctionptr)(); // pointer to function returning void
__declspec(section ".ctors") extern voidfunctionptr _ctors[];
__declspec(section ".dtors") extern voidfunctionptr _dtors[];
static void __init_cpp(void);
static void __init_cpp();
// clang-format off
__declspec(section ".init") asm void __init_hardware(void) {
__declspec(section ".init") asm void __init_hardware() {
nofralloc
mfmsr r0
ori r0,r0,0x2000
@ -25,7 +25,7 @@ __declspec(section ".init") asm void __init_hardware(void) {
blr
}
__declspec(section ".init") asm void __flush_cache(unsigned long param_1, int param_2) {
__declspec(section ".init") asm void __flush_cache(u32 param_1, int param_2) {
nofralloc
lis r5, 0xFFFFFFF1@h
ori r5, r5, 0xFFFFFFF1@l
@ -49,14 +49,14 @@ loop:
* Address: 800F2FB4
* Size: 000020
*/
void __init_user(void) { __init_cpp(); }
void __init_user() { __init_cpp(); }
/*
* --INFO--
* Address: 800F2FD4
* Size: 000054
*/
static void __init_cpp(void)
static void __init_cpp()
{
voidfunctionptr* constructor;
/*
@ -72,7 +72,7 @@ static void __init_cpp(void)
* Address: ........
* Size: 000054
*/
void __fini_cpp(void)
void __fini_cpp()
{
// UNUSED FUNCTION
}
@ -82,7 +82,7 @@ void __fini_cpp(void)
* Address: 800F3028
* Size: 000020
*/
void _ExitProcess(void) { PPCHalt(); }
void _ExitProcess() { PPCHalt(); }
#ifdef __cplusplus
}
#endif

10
src/JSystem/JUT/JUTConsole.cpp
View File

@ -68,7 +68,7 @@ static JUTConsole* sWarningConsole;
* Address: 800280DC
* Size: 000088
*/
JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int param_1, JKRHeap* param_2)
JUTConsole* JUTConsole::create(uint param_0, uint param_1, JKRHeap* param_2)
{
JUTConsoleManager* mgr = JUTConsoleManager::sManager;
u32 byteCount = getObjectSizeFromBufferSize(param_0, param_1);
@ -87,7 +87,7 @@ JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int param_1, JKRHe
* Address: 80028164
* Size: 000098
*/
JUTConsole* JUTConsole::create(unsigned int param_0, void* param_1, u32 param_2)
JUTConsole* JUTConsole::create(uint param_0, void* param_1, u32 param_2)
{
JUTConsoleManager* mgr = JUTConsoleManager::sManager;
u32 byteCount = getLineFromObjectSize(param_2, param_0);
@ -115,7 +115,7 @@ JUTConsole* JUTConsole::create(unsigned int param_0, void* param_1, u32 param_2)
* Address: 800281FC
* Size: 000100
*/
JUTConsole::JUTConsole(unsigned int param_0, unsigned int param_1, bool param_2)
JUTConsole::JUTConsole(uint param_0, uint param_1, bool param_2)
{
field_0x2c = param_2;
field_0x20 = param_0;
@ -561,7 +561,7 @@ extern "C" void JUTConsole_print_f_va_(JUTConsole* console, const char* format,
* Address: ........
* Size: 00012C
*/
void JUTConsole::dumpToTerminal(unsigned int)
void JUTConsole::dumpToTerminal(uint)
{
// UNUSED FUNCTION
}
@ -571,7 +571,7 @@ void JUTConsole::dumpToTerminal(unsigned int)
* Address: ........
* Size: 000154
*/
void JUTConsole::dumpToConsole(JUTConsole*, unsigned int)
void JUTConsole::dumpToConsole(JUTConsole*, uint)
{
// UNUSED FUNCTION
}

2
src/JSystem/JUT/JUTGamePad.cpp
View File

@ -2352,7 +2352,7 @@ void JUTGamePadRecordFixed::setDataSize(unsigned long)
* Address: ........
* Size: 000038
*/
void JUTGamePadRecord::setPart(unsigned int)
void JUTGamePadRecord::setPart(uint)
{
// UNUSED FUNCTION
}

2
src/plugProjectNishimuraU/EnemyUnit.cpp
View File

@ -7,8 +7,6 @@
namespace Game {
namespace Cave {
inline ObjectLayoutNode::ObjectLayoutNode();
/*
* --INFO--
* Address: 802440F4

8
src/sysGCU/messageRendering.cpp
View File

@ -4405,7 +4405,7 @@ lbl_8043C6C8:
* Address: 8043C6DC
* Size: 000020
*/
void TRenderingProcessor::preProcCode(unsigned int)
void TRenderingProcessor::preProcCode(uint)
{
/*
stwu r1, -0x10(r1)
@ -4424,7 +4424,7 @@ void TRenderingProcessor::preProcCode(unsigned int)
* Address: 8043C6FC
* Size: 000020
*/
void TRenderingProcessor::preProcID(unsigned int, unsigned int)
void TRenderingProcessor::preProcID(uint, uint)
{
/*
stwu r1, -0x10(r1)
@ -4463,7 +4463,7 @@ void TRenderingProcessor::preProcCenteringPost(void)
* Address: 8043C71C
* Size: 00039C
*/
void TRenderingProcessor::preProcCenteringCode(unsigned int)
void TRenderingProcessor::preProcCenteringCode(uint)
{
/*
stwu r1, -0x10(r1)
@ -4725,7 +4725,7 @@ lbl_8043CA8C:
* Address: 8043CAB8
* Size: 0003AC
*/
void TRenderingProcessor::preProcCenteringID(unsigned int, unsigned int)
void TRenderingProcessor::preProcCenteringID(uint, uint)
{
/*
stwu r1, -0x20(r1)