diff --git a/config/GALE01/splits.txt b/config/GALE01/splits.txt index 720b49666c..aea39ddcdc 100644 --- a/config/GALE01/splits.txt +++ b/config/GALE01/splits.txt @@ -3049,7 +3049,7 @@ melee/it/items/itmetamon.c: melee/it/items/itpippi.c: .text start:0x802D3260 end:0x802D36B0 .data start:0x803F7FF8 end:0x803F8058 - .sdata2 start:0x804DD4A8 end:0x804DD4B0 + .sdata2 start:0x804DD4A8 end:0x804DD4AC melee/it/items/ittogepy.c: .text start:0x802D36B0 end:0x802D3B18 @@ -3105,7 +3105,7 @@ melee/it/items/itoldkuri.c: melee/it/items/itmato.c: .text start:0x802D84F8 end:0x802D8618 .data start:0x803F83E0 end:0x803F83F0 - .sdata2 start:0x804DD5B0 end:0x804DD5B8 + .sdata2 start:0x804DD5B0 end:0x804DD5B4 melee/it/items/itheiho.c: .text start:0x802D8618 end:0x802D9A2C diff --git a/config/GALE01/symbols.txt b/config/GALE01/symbols.txt index 93152d7c3e..351e1859df 100644 --- a/config/GALE01/symbols.txt +++ b/config/GALE01/symbols.txt @@ -32600,7 +32600,7 @@ it_804DD498 = .sdata2:0x804DD498; // type:object size:0x4 scope:global data:floa it_804DD49C = .sdata2:0x804DD49C; // type:object size:0x4 scope:global data:float it_804DD4A0 = .sdata2:0x804DD4A0; // type:object size:0x4 scope:global data:float it_804DD4A4 = .sdata2:0x804DD4A4; // type:object size:0x4 scope:global data:float -@176 = .sdata2:0x804DD4A8; // type:object size:0x4 scope:local data:float +@179 = .sdata2:0x804DD4A8; // type:object size:0x4 scope:local data:float @176 = .sdata2:0x804DD4B0; // type:object size:0x4 scope:local data:float @175 = .sdata2:0x804DD4B8; // type:object size:0x4 scope:local data:float @182 = .sdata2:0x804DD4BC; // type:object size:0x4 scope:local data:float @@ -32643,7 +32643,7 @@ it_804DD594 = .sdata2:0x804DD594; // type:object size:0x4 scope:global data:floa it_804DD598 = .sdata2:0x804DD598; // type:object size:0x8 scope:global data:double it_804DD5A0 = .sdata2:0x804DD5A0; // type:object size:0x4 scope:global data:float it_804DD5A8 = .sdata2:0x804DD5A8; // type:object size:0x8 scope:global data:double -@177 = .sdata2:0x804DD5B0; // type:object size:0x4 scope:local data:float +@180 = .sdata2:0x804DD5B0; // type:object size:0x4 scope:local data:float it_804DD5B8 = .sdata2:0x804DD5B8; // type:object size:0x4 scope:global data:float it_804DD5BC = .sdata2:0x804DD5BC; // type:object size:0x4 scope:global data:float it_804DD5C0 = .sdata2:0x804DD5C0; // type:object size:0x4 scope:global data:float diff --git a/extern/dolphin/src/dolphin/ax/__ax.h b/extern/dolphin/src/dolphin/ax/__ax.h index eb5c66a128..8148eba5c0 100644 --- a/extern/dolphin/src/dolphin/ax/__ax.h +++ b/extern/dolphin/src/dolphin/ax/__ax.h @@ -4,26 +4,26 @@ #include // AXAlloc.c -AXVPB * __AXGetStackHead(u32 priority); +AXVPB* __AXGetStackHead(u32 priority); void __AXServiceCallbackStack(void); void __AXInitVoiceStacks(void); void __AXAllocInit(void); void __AXAllocQuit(void); -void __AXPushFreeStack(AXVPB * p); -AXVPB * __AXPopFreeStack(void); -void __AXPushCallbackStack(AXVPB * p); -AXVPB * __AXPopCallbackStack(void); -void __AXRemoveFromStack(AXVPB * p); -void __AXPushStackHead(AXVPB * p, u32 priority); -AXVPB * __AXPopStackFromBottom(u32 priority); +void __AXPushFreeStack(AXVPB* p); +AXVPB* __AXPopFreeStack(void); +void __AXPushCallbackStack(AXVPB* p); +AXVPB* __AXPopCallbackStack(void); +void __AXRemoveFromStack(AXVPB* p); +void __AXPushStackHead(AXVPB* p, u32 priority); +AXVPB* __AXPopStackFromBottom(u32 priority); // AXAux.c void __AXAuxInit(void); void __AXAuxQuit(void); -void __AXGetAuxAInput(u32 * p); -void __AXGetAuxAOutput(u32 * p); -void __AXGetAuxBInput(u32 * p); -void __AXGetAuxBOutput(u32 * p); +void __AXGetAuxAInput(u32* p); +void __AXGetAuxAOutput(u32* p); +void __AXGetAuxBInput(u32* p); +void __AXGetAuxBOutput(u32* p); void __AXProcessAux(void); // AXCL.c @@ -32,7 +32,7 @@ extern u32 __AXClMode; u32 __AXGetCommandListCycles(void); u32 __AXGetCommandListAddress(void); void __AXWriteToCommandList(u16 data); -void __AXNextFrame(void * sbuffer, void * buffer); +void __AXNextFrame(void* sbuffer, void* buffer); void __AXClInit(void); void __AXClQuit(void); @@ -44,23 +44,23 @@ void __AXOutInit(void); void __AXOutQuit(void); // AXProf.c -AXPROFILE * __AXGetCurrentProfile(void); +AXPROFILE* __AXGetCurrentProfile(void); // AXSPB.c u32 __AXGetStudio(void); -void __AXDepopFade(long * hostSum, long * dspVolume, s16 * dspDelta); +void __AXDepopFade(long* hostSum, long* dspVolume, s16* dspDelta); void __AXPrintStudio(void); void __AXSPBInit(void); void __AXSPBQuit(void); -void __AXDepopVoice(AXPB * p); +void __AXDepopVoice(AXPB* p); // AXVPB.c u32 __AXGetNumVoices(void); -void __AXServiceVPB(AXVPB *pvpb); -void __AXDumpVPB(AXVPB * pvpb); +void __AXServiceVPB(AXVPB* pvpb); +void __AXDumpVPB(AXVPB* pvpb); void __AXSyncPBs(u32 lessDspCycles); -AXPB * __AXGetPBs(void); -void __AXSetPBDefault(AXVPB * p); +AXPB* __AXGetPBs(void); +void __AXSetPBDefault(AXVPB* p); void __AXVPBInit(void); void __AXVPBQuit(void); diff --git a/src/MetroTRK/mpc_7xx_603e.c b/src/MetroTRK/mpc_7xx_603e.c index 8b13789179..7f24233716 100644 --- a/src/MetroTRK/mpc_7xx_603e.c +++ b/src/MetroTRK/mpc_7xx_603e.c @@ -1 +1,12 @@ +#include "mpc_7xx_603e.h" +static int const target_cpu_minor_type = 84; + +/// #TRKSaveExtended1Block + +/// #TRKRestoreExtended1Block + +int TRKTargetCPUMinorType(void) +{ + return target_cpu_minor_type; +} diff --git a/src/MetroTRK/mpc_7xx_603e.h b/src/MetroTRK/mpc_7xx_603e.h index 8b13789179..5c2269aca1 100644 --- a/src/MetroTRK/mpc_7xx_603e.h +++ b/src/MetroTRK/mpc_7xx_603e.h @@ -1 +1,10 @@ +#ifndef GALE01_32A868 +#define GALE01_32A868 +#include + +/* 32A868 */ UNK_RET TRKSaveExtended1Block(UNK_PARAMS); +/* 32AA20 */ UNK_RET TRKRestoreExtended1Block(UNK_PARAMS); +/* 32ABD8 */ int TRKTargetCPUMinorType(void); + +#endif diff --git a/src/MetroTRK/msgbuf.c b/src/MetroTRK/msgbuf.c index 8b13789179..616339ed62 100644 --- a/src/MetroTRK/msgbuf.c +++ b/src/MetroTRK/msgbuf.c @@ -1 +1,44 @@ +#include "msgbuf.h" +void TRKSetBufferUsed(UNK_T arg0, int arg1) +{ + M2C_FIELD(arg0, int*, 4) = arg1; +} + +/// #TRKInitializeMessageBuffers + +/// #TRKGetFreeBuffer + +/// #TRKGetBuffer + +/// #TRKReleaseBuffer + +/// #TRKResetBuffer + +/// #TRKSetBufferPosition + +/// #TRKAppendBuffer + +/// #TRKReadBuffer + +/// #TRKAppendBuffer1_ui16 + +/// #TRKAppendBuffer1_ui32 + +/// #TRKAppendBuffer1_ui64 + +/// #TRKAppendBuffer_ui8 + +/// #TRKAppendBuffer_ui32 + +/// #TRKReadBuffer1_ui8 + +/// #TRKReadBuffer1_ui16 + +/// #TRKReadBuffer1_ui32 + +/// #TRKReadBuffer1_ui64 + +/// #TRKReadBuffer_ui8 + +/// #TRKReadBuffer_ui32 diff --git a/src/MetroTRK/msgbuf.h b/src/MetroTRK/msgbuf.h index 8b13789179..01a6eadb82 100644 --- a/src/MetroTRK/msgbuf.h +++ b/src/MetroTRK/msgbuf.h @@ -1 +1,27 @@ +#ifndef GALE01_326C94 +#define GALE01_326C94 +#include + +/* 326C94 */ void TRKSetBufferUsed(UNK_T arg0, int arg1); +/* 326C9C */ UNK_RET TRKInitializeMessageBuffers(UNK_PARAMS); +/* 326D14 */ UNK_RET TRKGetFreeBuffer(UNK_PARAMS); +/* 326DB0 */ UNK_RET TRKGetBuffer(UNK_PARAMS); +/* 326DDC */ UNK_RET TRKReleaseBuffer(UNK_PARAMS); +/* 326E44 */ UNK_RET TRKResetBuffer(UNK_PARAMS); +/* 326E84 */ UNK_RET TRKSetBufferPosition(UNK_PARAMS); +/* 326EB4 */ UNK_RET TRKAppendBuffer(UNK_PARAMS); +/* 326F58 */ UNK_RET TRKReadBuffer(UNK_PARAMS); +/* 326FE4 */ UNK_RET TRKAppendBuffer1_ui16(UNK_PARAMS); +/* 327038 */ UNK_RET TRKAppendBuffer1_ui32(UNK_PARAMS); +/* 32709C */ UNK_RET TRKAppendBuffer1_ui64(UNK_PARAMS); +/* 327124 */ UNK_RET TRKAppendBuffer_ui8(UNK_PARAMS); +/* 32718C */ UNK_RET TRKAppendBuffer_ui32(UNK_PARAMS); +/* 327208 */ UNK_RET TRKReadBuffer1_ui8(UNK_PARAMS); +/* 32722C */ UNK_RET TRKReadBuffer1_ui16(UNK_PARAMS); +/* 3272AC */ UNK_RET TRKReadBuffer1_ui32(UNK_PARAMS); +/* 32733C */ UNK_RET TRKReadBuffer1_ui64(UNK_PARAMS); +/* 3273EC */ UNK_RET TRKReadBuffer_ui8(UNK_PARAMS); +/* 327460 */ UNK_RET TRKReadBuffer_ui32(UNK_PARAMS); + +#endif diff --git a/src/MetroTRK/msghndlr.c b/src/MetroTRK/msghndlr.c index 8b13789179..ec3f8e5bec 100644 --- a/src/MetroTRK/msghndlr.c +++ b/src/MetroTRK/msghndlr.c @@ -1 +1,58 @@ +#include "msghndlr.h" +/// #TRKMessageIntoReply + +/// #TRKSendACK + +/// #TRKStandardACK + +/// #MTRK_MsgHndlr_8032785C + +/// #MTRK_MsgHndlr_80327884 + +/// #MTRK_MsgHndlr_803278AC + +/// #TRKDoReset + +/// #TRKDoVersions + +/// #TRKDoSupportMask + +/// #TRKDoCPUType + +/// #TRKDoReadMemory + +/// #TRKDoWriteMemory + +/// #TRKDoReadRegisters + +/// #TRKDoWriteRegisters + +/// #TRKDoFlushCache + +/// #TRKDoContinue + +/// #TRKDoStep + +/// #TRKDoStop + +/// #TRKSuppAccessFile + +/// #TRKRequestSend + +bool TRKInitializeMutex(void) +{ + return false; +} + +bool TRKAcquireMutex(void) +{ + return false; +} + +bool TRKReleaseMutex(void) +{ + return false; +} + +/// #TRKDoNotifyStopped diff --git a/src/MetroTRK/msghndlr.h b/src/MetroTRK/msghndlr.h index 8b13789179..643eab5f32 100644 --- a/src/MetroTRK/msghndlr.h +++ b/src/MetroTRK/msghndlr.h @@ -1 +1,31 @@ +#ifndef GALE01_327740 +#define GALE01_327740 +#include + +/* 327740 */ UNK_RET TRKMessageIntoReply(UNK_PARAMS); +/* 3277D8 */ UNK_RET TRKSendACK(UNK_PARAMS); +/* 327828 */ UNK_RET TRKStandardACK(UNK_PARAMS); +/* 32785C */ UNK_RET MTRK_MsgHndlr_8032785C(UNK_PARAMS); +/* 327884 */ UNK_RET MTRK_MsgHndlr_80327884(UNK_PARAMS); +/* 3278AC */ UNK_RET MTRK_MsgHndlr_803278AC(UNK_PARAMS); +/* 3278FC */ UNK_RET TRKDoReset(UNK_PARAMS); +/* 32792C */ UNK_RET TRKDoVersions(UNK_PARAMS); +/* 327AB0 */ UNK_RET TRKDoSupportMask(UNK_PARAMS); +/* 327B8C */ UNK_RET TRKDoCPUType(UNK_PARAMS); +/* 327DD0 */ UNK_RET TRKDoReadMemory(UNK_PARAMS); +/* 327FB8 */ UNK_RET TRKDoWriteMemory(UNK_PARAMS); +/* 3281B4 */ UNK_RET TRKDoReadRegisters(UNK_PARAMS); +/* 3283B8 */ UNK_RET TRKDoWriteRegisters(UNK_PARAMS); +/* 3285C0 */ UNK_RET TRKDoFlushCache(UNK_PARAMS); +/* 3286F8 */ UNK_RET TRKDoContinue(UNK_PARAMS); +/* 32875C */ UNK_RET TRKDoStep(UNK_PARAMS); +/* 328960 */ UNK_RET TRKDoStop(UNK_PARAMS); +/* 3289E4 */ UNK_RET TRKSuppAccessFile(UNK_PARAMS); +/* 328CBC */ UNK_RET TRKRequestSend(UNK_PARAMS); +/* 328E60 */ bool TRKInitializeMutex(void); +/* 328E68 */ bool TRKAcquireMutex(void); +/* 328E70 */ bool TRKReleaseMutex(void); +/* 328E78 */ UNK_RET TRKDoNotifyStopped(UNK_PARAMS); + +#endif diff --git a/src/MetroTRK/serpoll.c b/src/MetroTRK/serpoll.c index f7c2397f12..48952af470 100644 --- a/src/MetroTRK/serpoll.c +++ b/src/MetroTRK/serpoll.c @@ -1,3 +1,5 @@ +#include "serpoll.h" + /// #TRKTestForPacket /// #TRKGetInput @@ -6,6 +8,9 @@ /// #TRKInitializeSerialHandler -/// #TRKTerminateSerialHandler +bool TRKTerminateSerialHandler(void) +{ + return false; +} void usr_put_initialize(void) {} diff --git a/src/MetroTRK/serpoll.h b/src/MetroTRK/serpoll.h index 5fc43461fc..2ca36ecf7e 100644 --- a/src/MetroTRK/serpoll.h +++ b/src/MetroTRK/serpoll.h @@ -7,7 +7,7 @@ /* 3275AC */ UNK_RET TRKGetInput(UNK_PARAMS); /* 327628 */ UNK_RET TRKProcessInput(UNK_PARAMS); /* 327678 */ UNK_RET TRKInitializeSerialHandler(UNK_PARAMS); -/* 32769C */ UNK_RET TRKTerminateSerialHandler(UNK_PARAMS); +/* 32769C */ bool TRKTerminateSerialHandler(void); /* 3276A4 */ UNK_RET usr_put_initialize(UNK_PARAMS); #endif diff --git a/src/MetroTRK/targimpl.c b/src/MetroTRK/targimpl.c index 8b13789179..74b62c283c 100644 --- a/src/MetroTRK/targimpl.c +++ b/src/MetroTRK/targimpl.c @@ -1 +1,94 @@ +#include "targimpl.h" +#include + +int __TRK_get_MSR(void) +{ +#ifdef MWERKS_GEKKO + asm { mfmsr r3 } +#else + NOT_IMPLEMENTED; +#endif +} + +#ifdef MWERKS_GEKKO +void __TRK_set_MSR(register int value) +{ + asm { mtmsr r3 } +} +#else +void __TRK_set_MSR(int value) +{ + NOT_IMPLEMENTED; +} +#endif + +/// #TRKValidMemory32 + +/// #TRK_ppc_memcpy + +/// #TRKTargetAccessMemory + +/// #TRKTargetReadInstruction + +/// #TRKTargetAccessDefault + +/// #TRKTargetAccessFP + +/// #TRKTargetAccessExtended1 + +/// #TRKTargetAccessExtended2 + +/// #TRKTargetVersions + +/// #TRKTargetSupportMask + +/// #TRKTargetCPUType + +/// #TRKInterruptHandler + +/// #TRKExceptionHandler + +/// #TRKPostInterruptEvent + +/// #TRKInterruptHandlerEnableInterrupts + +/// #TRKTargetInterrupt + +/// #TRKTargetAddStopInfo + +/// #TRKTargetAddExceptionInfo + +/// #TRKTargetEnableTrace + +/// #TRKTargetStepDone + +/// #TRKTargetDoStep + +/// #TRKTargetCheckStep + +/// #TRKTargetSingleStep + +/// #TRKTargetStepOutOfRange + +/// #TRKTargetGetPC + +/// #TRKTargetSupportRequest + +/// #TRKTargetFlushCache + +/// #TRKTargetStopped + +/// #TRKTargetSetStopped + +/// #TRKTargetStop + +/// #TRKPPCAccessSPR + +/// #TRKPPCAccessPairedSingleRegister + +/// #TRKPPCAccessFPRegister + +/// #TRKPPCAccessSpecialReg + +/// #TRKTargetSetInputPendingPtr diff --git a/src/MetroTRK/targimpl.h b/src/MetroTRK/targimpl.h index 8b13789179..521b70b3a6 100644 --- a/src/MetroTRK/targimpl.h +++ b/src/MetroTRK/targimpl.h @@ -1 +1,44 @@ +#ifndef GALE01_32904C +#define GALE01_32904C +#include + +/* 32904C */ int __TRK_get_MSR(void); +/* 329054 */ void __TRK_set_MSR(int); +/* 32905C */ UNK_RET TRKValidMemory32(UNK_PARAMS); +/* 329194 */ UNK_RET TRK_ppc_memcpy(UNK_PARAMS); +/* 3291D0 */ UNK_RET TRKTargetAccessMemory(UNK_PARAMS); +/* 329334 */ UNK_RET TRKTargetReadInstruction(UNK_PARAMS); +/* 329380 */ UNK_RET TRKTargetAccessDefault(UNK_PARAMS); +/* 32947C */ UNK_RET TRKTargetAccessFP(UNK_PARAMS); +/* 3295C4 */ UNK_RET TRKTargetAccessExtended1(UNK_PARAMS); +/* 32973C */ UNK_RET TRKTargetAccessExtended2(UNK_PARAMS); +/* 3298B8 */ UNK_RET TRKTargetVersions(UNK_PARAMS); +/* 3298E0 */ UNK_RET TRKTargetSupportMask(UNK_PARAMS); +/* 329984 */ UNK_RET TRKTargetCPUType(UNK_PARAMS); +/* 3299EC */ UNK_RET TRKInterruptHandler(UNK_PARAMS); +/* 329B80 */ UNK_RET TRKExceptionHandler(UNK_PARAMS); +/* 329C1C */ UNK_RET TRKPostInterruptEvent(UNK_PARAMS); +/* 329CCC */ UNK_RET TRKInterruptHandlerEnableInterrupts(UNK_PARAMS); +/* 329DE4 */ UNK_RET TRKTargetInterrupt(UNK_PARAMS); +/* 329E48 */ UNK_RET TRKTargetAddStopInfo(UNK_PARAMS); +/* 329ED8 */ UNK_RET TRKTargetAddExceptionInfo(UNK_PARAMS); +/* 329F60 */ UNK_RET TRKTargetEnableTrace(UNK_PARAMS); +/* 329F9C */ UNK_RET TRKTargetStepDone(UNK_PARAMS); +/* 32A020 */ UNK_RET TRKTargetDoStep(UNK_PARAMS); +/* 32A090 */ UNK_RET TRKTargetCheckStep(UNK_PARAMS); +/* 32A0F8 */ UNK_RET TRKTargetSingleStep(UNK_PARAMS); +/* 32A13C */ UNK_RET TRKTargetStepOutOfRange(UNK_PARAMS); +/* 32A184 */ UNK_RET TRKTargetGetPC(UNK_PARAMS); +/* 32A194 */ UNK_RET TRKTargetSupportRequest(UNK_PARAMS); +/* 32A284 */ UNK_RET TRKTargetFlushCache(UNK_PARAMS); +/* 32A2C0 */ UNK_RET TRKTargetStopped(UNK_PARAMS); +/* 32A2D0 */ UNK_RET TRKTargetSetStopped(UNK_PARAMS); +/* 32A2E0 */ UNK_RET TRKTargetStop(UNK_PARAMS); +/* 32A308 */ UNK_RET TRKPPCAccessSPR(UNK_PARAMS); +/* 32A3B8 */ UNK_RET TRKPPCAccessPairedSingleRegister(UNK_PARAMS); +/* 32A430 */ UNK_RET TRKPPCAccessFPRegister(UNK_PARAMS); +/* 32A5B0 */ UNK_RET TRKPPCAccessSpecialReg(UNK_PARAMS); +/* 32A618 */ UNK_RET TRKTargetSetInputPendingPtr(UNK_PARAMS); + +#endif diff --git a/src/dolphin/OdemuExi2/DebuggerDriver.c b/src/dolphin/OdemuExi2/DebuggerDriver.c index 86b494c202..ff1f08bdd0 100644 --- a/src/dolphin/OdemuExi2/DebuggerDriver.c +++ b/src/dolphin/OdemuExi2/DebuggerDriver.c @@ -1,3 +1,5 @@ +#include "DebuggerDriver.h" + /// #DBGEXIImm /// #DBGReadMailbox @@ -26,4 +28,7 @@ void DBOpen(void) {} void DBClose(void) {} -/// #Hu_IsStub +bool Hu_IsStub(void) +{ + return false; +} diff --git a/src/dolphin/OdemuExi2/DebuggerDriver.h b/src/dolphin/OdemuExi2/DebuggerDriver.h index 16abd8ccdd..b55eaf5c4c 100644 --- a/src/dolphin/OdemuExi2/DebuggerDriver.h +++ b/src/dolphin/OdemuExi2/DebuggerDriver.h @@ -17,6 +17,6 @@ /* 32B7FC */ UNK_RET DBWrite(UNK_PARAMS); /* 32BA5C */ UNK_RET DBOpen(UNK_PARAMS); /* 32BA60 */ UNK_RET DBClose(UNK_PARAMS); -/* 32BA64 */ UNK_RET Hu_IsStub(UNK_PARAMS); +/* 32BA64 */ bool Hu_IsStub(void); #endif diff --git a/src/dolphin/ax/AXCL.c b/src/dolphin/ax/AXCL.c index 8b13789179..4cc05ed801 100644 --- a/src/dolphin/ax/AXCL.c +++ b/src/dolphin/ax/AXCL.c @@ -1 +1,14 @@ +#include "AXCL.h" +static u32 __AXCommandListCycles; + +u32 __AXGetCommandListCycles(void) +{ + return __AXCommandListCycles; +} + +/// #__AXGetCommandListAddress + +/// #__AXNextFrame + +/// #__AXClInit diff --git a/src/dolphin/ax/AXCL.h b/src/dolphin/ax/AXCL.h index 2ea09467b3..612a0a569b 100644 --- a/src/dolphin/ax/AXCL.h +++ b/src/dolphin/ax/AXCL.h @@ -1,6 +1,11 @@ #ifndef DOLPHIN_AX_AXCL_H #define DOLPHIN_AX_AXCL_H -void __AXClInit(void); +#include + +/* 3592B4 */ u32 __AXGetCommandListCycles(void); +/* 3592BC */ UNK_RET __AXGetCommandListAddress(UNK_PARAMS); +/* 3592F8 */ UNK_RET __AXNextFrame(UNK_PARAMS); +/* 359708 */ void __AXClInit(void); #endif diff --git a/src/dolphin/ax/AXOut.c b/src/dolphin/ax/AXOut.c index 8b13789179..bd703e02ea 100644 --- a/src/dolphin/ax/AXOut.c +++ b/src/dolphin/ax/AXOut.c @@ -1 +1,24 @@ +#include "AXOut.h" +#include + +static void (*__AXUserFrameCallback)(void); + +/// #__AXOutNewFrame + +/// #__AXOutAiCallback + +/// #__AXDSPInitCallback + +/// #__AXDSPResumeCallback + +/// #__AXDSPDoneCallback + +/// #__AXOutInitDSP + +/// #__AXOutInit + +void AXRegisterCallback(void (*callback)(void)) +{ + __AXUserFrameCallback = callback; +} diff --git a/src/dolphin/ax/AXOut.h b/src/dolphin/ax/AXOut.h index d3d3d3fa0c..824fb2c578 100644 --- a/src/dolphin/ax/AXOut.h +++ b/src/dolphin/ax/AXOut.h @@ -1,6 +1,14 @@ #ifndef DOLPHIN_AX_AXOUT_H #define DOLPHIN_AX_AXOUT_H -void __AXOutInit(void); +#include + +/* 359724 */ UNK_RET __AXOutNewFrame(UNK_PARAMS); +/* 3598AC */ UNK_RET __AXOutAiCallback(UNK_PARAMS); +/* 359914 */ UNK_RET __AXDSPInitCallback(UNK_PARAMS); +/* 359920 */ UNK_RET __AXDSPResumeCallback(UNK_PARAMS); +/* 359978 */ UNK_RET __AXDSPDoneCallback(UNK_PARAMS); +/* 359984 */ UNK_RET __AXOutInitDSP(UNK_PARAMS); +/* 359A48 */ void __AXOutInit(void); #endif diff --git a/src/dolphin/ax/AXVPB.c b/src/dolphin/ax/AXVPB.c index 8b13789179..2364fbd8dd 100644 --- a/src/dolphin/ax/AXVPB.c +++ b/src/dolphin/ax/AXVPB.c @@ -1 +1,48 @@ +#include "AXVPB.h" +static u32 __AXNumVoices; + +u32 __AXGetNumVoices(void) +{ + return __AXNumVoices; +} + +/// #__AXServiceVPB + +/// #__AXSyncPBs + +/// #__AXGetPBs + +/// #__AXSetPBDefault + +/// #__AXVPBInit + +/// #AXSetVoiceState + +/// #AXVPB_8035AE20 + +/// #AXSetVoiceItdOn + +/// #AXSetVoiceItdTarget + +/// #AXSetVoiceVe + +/// #AXSetVoiceVeDelta + +/// #AXSetVoiceAddr + +/// #AXSetVoiceLoop + +/// #AXSetVoiceLoopAddr + +/// #AXSetVoiceEndAddr + +/// #AXSetVoiceCurrentAddr + +/// #AXSetVoiceAdpcm + +/// #AXSetVoiceSrc + +/// #AXSetVoiceSrcRatio + +/// #AXSetVoiceAdpcmLoop diff --git a/src/dolphin/ax/AXVPB.h b/src/dolphin/ax/AXVPB.h index 11edb0c44b..372754d146 100644 --- a/src/dolphin/ax/AXVPB.h +++ b/src/dolphin/ax/AXVPB.h @@ -5,13 +5,15 @@ #include -u32 __AXGetNumVoices(void); -void __AXServiceVPB(AXVPB* pvpb); void __AXDumpVPB(AXVPB* pvpb); -void __AXSyncPBs(u32 lessDspCycles); -AXPB* __AXGetPBs(void); -void __AXSetPBDefault(AXVPB* p); -void __AXVPBInit(void); void __AXVPBQuit(void); +/* 35A250 */ u32 __AXGetNumVoices(void); +/* 35A258 */ void __AXServiceVPB(AXVPB* pvpb); +/* 35A934 */ void __AXSyncPBs(u32 lessDspCycles); +/* 35AB7C */ AXPB* __AXGetPBs(void); +/* 35AB88 */ void __AXSetPBDefault(AXVPB* p); +/* 35ABC4 */ void __AXVPBInit(void); +/* 35AE20 */ UNK_RET AXVPB_8035AE20(UNK_PARAMS); + #endif diff --git a/src/dolphin/mcc/mcc.c b/src/dolphin/mcc/mcc.c index 8b13789179..b846800463 100644 --- a/src/dolphin/mcc/mcc.c +++ b/src/dolphin/mcc/mcc.c @@ -1 +1,70 @@ +#include "mcc.h" +static bool gIsChannelinfoDirty = true; +static u8 gLastError; + +/// #callbackEventStream + +/// #MCCStreamOpen + +/// #MCCStreamClose + +/// #MCCStreamWrite + +/// #LoadChannelInfo + +/// #FlushChannelInfo + +void SetChannelInfoDirty(bool dirty) +{ + gIsChannelinfoDirty = dirty; +} + +/// #MakeMemoryMap + +/// #SearchFreeBlocks + +/// #NotifyCompulsorily + +/// #WaitAMinute + +/// #MailboxCheck + +/// #MCCExiCallback + +/// #MCCTxCallback + +/// #MCCRxCallback + +/// #mccInitializeCheck + +/// #MCCInit + +/// #MCCExit + +/// #MCCEnumDevices + +/// #MCCGetFreeBlocks + +u8 MCCGetLastError(void) +{ + return gLastError; +} + +/// #MCCGetChannelInfo + +/// #MCCGetConnectionStatus + +/// #MCCNotify + +/// #MCCSetChannelEventMask + +/// #MCCOpen + +/// #MCCClose + +/// #MCCRead + +/// #MCCWrite + +/// #MCCCheckAsyncDone diff --git a/src/dolphin/mcc/mcc.h b/src/dolphin/mcc/mcc.h index 8b13789179..13ad4d24ef 100644 --- a/src/dolphin/mcc/mcc.h +++ b/src/dolphin/mcc/mcc.h @@ -1 +1,37 @@ +#ifndef DOLPHIN_MCC_MCC_H +#define DOLPHIN_MCC_MCC_H +#include + +/* 32C74C */ UNK_RET callbackEventStream(UNK_PARAMS); +/* 32C7D0 */ UNK_RET MCCStreamOpen(UNK_PARAMS); +/* 32C848 */ UNK_RET MCCStreamClose(UNK_PARAMS); +/* 32C880 */ UNK_RET MCCStreamWrite(UNK_PARAMS); +/* 32CA60 */ UNK_RET LoadChannelInfo(UNK_PARAMS); +/* 32CB7C */ UNK_RET FlushChannelInfo(UNK_PARAMS); +/* 32CC80 */ void SetChannelInfoDirty(bool dirty); +/* 32CC88 */ UNK_RET MakeMemoryMap(UNK_PARAMS); +/* 32CD40 */ UNK_RET SearchFreeBlocks(UNK_PARAMS); +/* 32CE40 */ UNK_RET NotifyCompulsorily(UNK_PARAMS); +/* 32CF48 */ UNK_RET WaitAMinute(UNK_PARAMS); +/* 32CFD8 */ UNK_RET MailboxCheck(UNK_PARAMS); +/* 32D260 */ UNK_RET MCCExiCallback(UNK_PARAMS); +/* 32D280 */ UNK_RET MCCTxCallback(UNK_PARAMS); +/* 32D29C */ UNK_RET MCCRxCallback(UNK_PARAMS); +/* 32D2B8 */ UNK_RET mccInitializeCheck(UNK_PARAMS); +/* 32D5E8 */ UNK_RET MCCInit(UNK_PARAMS); +/* 32D88C */ UNK_RET MCCExit(UNK_PARAMS); +/* 32D954 */ UNK_RET MCCEnumDevices(UNK_PARAMS); +/* 32D9AC */ UNK_RET MCCGetFreeBlocks(UNK_PARAMS); +/* 32DA3C */ u8 MCCGetLastError(void); +/* 32DA44 */ UNK_RET MCCGetChannelInfo(UNK_PARAMS); +/* 32DB14 */ UNK_RET MCCGetConnectionStatus(UNK_PARAMS); +/* 32DBD4 */ UNK_RET MCCNotify(UNK_PARAMS); +/* 32DCB0 */ UNK_RET MCCSetChannelEventMask(UNK_PARAMS); +/* 32DDC0 */ UNK_RET MCCOpen(UNK_PARAMS); +/* 32DFDC */ UNK_RET MCCClose(UNK_PARAMS); +/* 32E1B8 */ UNK_RET MCCRead(UNK_PARAMS); +/* 32E504 */ UNK_RET MCCWrite(UNK_PARAMS); +/* 32E868 */ UNK_RET MCCCheckAsyncDone(UNK_PARAMS); + +#endif diff --git a/src/melee/ft/chara/ftCommon/ftCo_ItemThrow.c b/src/melee/ft/chara/ftCommon/ftCo_ItemThrow.c index 8a56b65ce7..c6be99489a 100644 --- a/src/melee/ft/chara/ftCommon/ftCo_ItemThrow.c +++ b/src/melee/ft/chara/ftCommon/ftCo_ItemThrow.c @@ -17,8 +17,8 @@ #include "ft/ftcommon.h" #include "ft/types.h" #include "ftCommon/types.h" -#include "it/it_266F.h" #include "it/it_26B1.h" +#include "it/it_2725.h" #include "it/item.h" #include "lb/lb_00B0.h" #include "pl/pl_0371.h" diff --git a/src/melee/ft/chara/ftFox/ftFx_AppealS.c b/src/melee/ft/chara/ftFox/ftFx_AppealS.c index 5ad19dada3..8880fb0aab 100644 --- a/src/melee/ft/chara/ftFox/ftFx_AppealS.c +++ b/src/melee/ft/chara/ftFox/ftFx_AppealS.c @@ -11,6 +11,7 @@ #include "gr/grcorneria.h" #include "pl/pl_0371.h" #include "pl/player.h" +#include "pl/plbonus.h" #include diff --git a/src/melee/ft/chara/ftKirby/ftKb_Init.c b/src/melee/ft/chara/ftKirby/ftKb_Init.c index 43ecd5c1f2..3f13efe216 100644 --- a/src/melee/ft/chara/ftKirby/ftKb_Init.c +++ b/src/melee/ft/chara/ftKirby/ftKb_Init.c @@ -25,10 +25,12 @@ #include "ft/types.h" #include "ftCommon/ftCo_CaptureKirby.h" #include "it/it_26B1.h" -#include "it/items/it_27CF.h" #include "it/items/it_2F28.h" #include "it/items/itkirby_2F23.h" #include "it/items/itkirbyhammer.h" +#include "it/items/itnesspkflush.h" +#include "it/items/itpeachtoad.h" +#include "it/items/itpeachtoadspore.h" #include "lb/lb_00B0.h" #include "lb/lbmthp.h" #include "pl/player.h" diff --git a/src/melee/ft/chara/ftNess/ftNs_AttackHi4.c b/src/melee/ft/chara/ftNess/ftNs_AttackHi4.c index 824e83cbbe..a5cd350c32 100644 --- a/src/melee/ft/chara/ftNess/ftNs_AttackHi4.c +++ b/src/melee/ft/chara/ftNess/ftNs_AttackHi4.c @@ -16,16 +16,16 @@ #include "ft/types.h" #include "ftCommon/ftCo_Wait.h" #include "ftNess/types.h" -#include "it/items/it_27CF.h" +#include "it/items/itnessyoyo.h" #include "it/itYoyo.h" #include "it/types.h" #include "lb/lb_00B0.h" #include "lb/lbcollision.h" -#include "lb/lbrefract.h" #include "lb/lbvector.h" #include "mp/mpcoll.h" #include +#include #include void ftNs_AttackHi4_YoyoUpdateHitPos(HSD_GObj* gobj) diff --git a/src/melee/ft/chara/ftNess/ftNs_SpecialHi.c b/src/melee/ft/chara/ftNess/ftNs_SpecialHi.c index 586eb071f6..9417398c00 100644 --- a/src/melee/ft/chara/ftNess/ftNs_SpecialHi.c +++ b/src/melee/ft/chara/ftNess/ftNs_SpecialHi.c @@ -19,13 +19,13 @@ #include "ftCommon/ftCo_DownBound.h" #include "ftCommon/ftCo_FallSpecial.h" #include "ftNess/types.h" -#include "it/items/it_27CF.h" +#include "it/items/itnesspkthunderball.h" #include "lb/lb_00B0.h" -#include "lb/lbrefract.h" #include "lb/lbvector.h" #include #include +#include #include // SpecialHi/SpecialAirHi (PK Thunder) diff --git a/src/melee/ft/chara/ftNess/ftNs_SpecialN.c b/src/melee/ft/chara/ftNess/ftNs_SpecialN.c index 591f3251c3..cadb923f41 100644 --- a/src/melee/ft/chara/ftNess/ftNs_SpecialN.c +++ b/src/melee/ft/chara/ftNess/ftNs_SpecialN.c @@ -15,7 +15,7 @@ #include "ftCommon/ftCo_FallSpecial.h" #include "ftNess/ftNs_Init.h" #include "ftNess/types.h" -#include "it/items/it_27CF.h" +#include "it/items/itnesspkflush.h" #include "lb/lb_00B0.h" #include diff --git a/src/melee/ft/chara/ftNess/ftNs_SpecialS.c b/src/melee/ft/chara/ftNess/ftNs_SpecialS.c index b0b332bd06..8747cca24e 100644 --- a/src/melee/ft/chara/ftNess/ftNs_SpecialS.c +++ b/src/melee/ft/chara/ftNess/ftNs_SpecialS.c @@ -11,7 +11,7 @@ #include "ft/ftanim.h" #include "ft/types.h" #include "ftNess/types.h" -#include "it/items/it_27CF.h" +#include "it/items/itnesspkfire.h" #include "lb/lb_00B0.h" #include diff --git a/src/melee/ft/chara/ftPeach/ftPe_SpecialN.c b/src/melee/ft/chara/ftPeach/ftPe_SpecialN.c index 92faa713f9..f3d6cc2da7 100644 --- a/src/melee/ft/chara/ftPeach/ftPe_SpecialN.c +++ b/src/melee/ft/chara/ftPeach/ftPe_SpecialN.c @@ -15,7 +15,8 @@ #include "ft/ftcommon.h" #include "ft/types.h" #include "ftPeach/types.h" -#include "it/items/it_27CF.h" +#include "it/items/itpeachtoad.h" +#include "it/items/itpeachtoadspore.h" #include "lb/lb_00B0.h" #include diff --git a/src/melee/ft/chara/ftPeach/ftPe_SpecialS.c b/src/melee/ft/chara/ftPeach/ftPe_SpecialS.c index 09ed2f7ecb..09649f9276 100644 --- a/src/melee/ft/chara/ftPeach/ftPe_SpecialS.c +++ b/src/melee/ft/chara/ftPeach/ftPe_SpecialS.c @@ -11,7 +11,7 @@ #include "ft/ftcommon.h" #include "ft/types.h" #include "ftPeach/types.h" -#include "it/items/it_27CF.h" +#include "it/items/itpeachexplode.h" #include "lb/lb_00B0.h" #include diff --git a/src/melee/ft/chara/ftPikachu/ftPk_SpecialLw.c b/src/melee/ft/chara/ftPikachu/ftPk_SpecialLw.c index 0ad50fdef9..f9c4ea1e59 100644 --- a/src/melee/ft/chara/ftPikachu/ftPk_SpecialLw.c +++ b/src/melee/ft/chara/ftPikachu/ftPk_SpecialLw.c @@ -15,7 +15,7 @@ #include "ft/ftcommon.h" #include "ft/types.h" #include "ftPikachu/types.h" -#include "it/items/it_27CF.h" +#include "it/items/itpikachuthunder.h" #include diff --git a/src/melee/ft/chara/ftPikachu/ftPk_SpecialN.c b/src/melee/ft/chara/ftPikachu/ftPk_SpecialN.c index e992ea6536..ae9e3ad71c 100644 --- a/src/melee/ft/chara/ftPikachu/ftPk_SpecialN.c +++ b/src/melee/ft/chara/ftPikachu/ftPk_SpecialN.c @@ -17,7 +17,7 @@ #include "ft/ftparts.h" #include "ft/types.h" #include "ftCommon/ftCo_FallSpecial.h" -#include "it/items/it_27CF.h" +#include "it/items/itpikachutjoltground.h" #include diff --git a/src/melee/ft/chara/ftZelda/ftZd_SpecialLw.c b/src/melee/ft/chara/ftZelda/ftZd_SpecialLw.c index ce93bd2abe..a667c6377e 100644 --- a/src/melee/ft/chara/ftZelda/ftZd_SpecialLw.c +++ b/src/melee/ft/chara/ftZelda/ftZd_SpecialLw.c @@ -15,7 +15,7 @@ #include "ft/types.h" #include "ftSeak/ftSk_SpecialLw.h" #include "ftZelda/types.h" -#include "it/items/it_27CF.h" +#include "it/items/itzeldadinfire.h" #include "lb/lb_00B0.h" #include "lb/lb_00F9.h" diff --git a/src/melee/ft/chara/ftZelda/ftZd_SpecialS.c b/src/melee/ft/chara/ftZelda/ftZd_SpecialS.c index 9834cd3561..470dc02ba0 100644 --- a/src/melee/ft/chara/ftZelda/ftZd_SpecialS.c +++ b/src/melee/ft/chara/ftZelda/ftZd_SpecialS.c @@ -15,7 +15,7 @@ #include "ft/types.h" #include "ftCommon/ftCo_FallSpecial.h" #include "ftZelda/types.h" -#include "it/items/it_27CF.h" +#include "it/items/itzeldadinfire.h" #include "lb/lb_00B0.h" #include diff --git a/src/melee/ft/fighter.c b/src/melee/ft/fighter.c index b897aa4c2b..2f8ff068b3 100644 --- a/src/melee/ft/fighter.c +++ b/src/melee/ft/fighter.c @@ -57,8 +57,8 @@ #include "gr/stage.h" #include "gr/types.h" #include "if/ifmagnify.h" -#include "it/it_266F.h" #include "it/it_26B1.h" +#include "it/it_2725.h" #include "it/item.h" #include "lb/lb_00B0.h" #include "lb/lb_00CE.h" diff --git a/src/melee/gm/gm_1601.c b/src/melee/gm/gm_1601.c index bc8e3d84f0..4c360cc179 100644 --- a/src/melee/gm/gm_1601.c +++ b/src/melee/gm/gm_1601.c @@ -15,6 +15,11 @@ struct gmMainLib_8015ED8C_arg0_t lbl_803B75F8 = { 0 }; +static s8 lbl_804D6598; +static u8 lbl_804D65A0; + +static s32 lbl_804D4190 = 0xFFFFFFFF; + #define NUM_UNLOCKABLE_CHARACTERS 11 /// #gm_801601C4 @@ -333,7 +338,10 @@ bool gm_80164ABC(struct gmMainLib_8015ED8C_arg0_t* arg0) /// #gm_80167140 -/// #fn_80167194 +u8 fn_80167194(void* arg0) +{ + return M2C_FIELD(arg0, u8*, 0xD); +} /// #fn_8016719C @@ -349,9 +357,15 @@ bool gm_80164ABC(struct gmMainLib_8015ED8C_arg0_t* arg0) /// #gm_801677C0 -/// #gm_801677E8 +void gm_801677E8(s8 arg0) +{ + lbl_804D6598 = arg0; +} -/// #gm_801677F0 +u8 gm_801677F0(void) +{ + return lbl_804D6598; +} /// #gm_801677F8 @@ -758,7 +772,10 @@ void gm_801692E8(uint ticks, struct datetime* datetime) /// #fn_801701AC -/// #fn_801701B8 +u8 fn_801701B8(void) +{ + return lbl_804D65A0; +} /// #fn_801701C0 @@ -802,7 +819,10 @@ void gm_801692E8(uint ticks, struct datetime* datetime) /// #fn_80172478 -/// #fn_801724C8 +bool fn_801724C8(void) +{ + return false; +} /// #fn_801724D0 @@ -1126,7 +1146,10 @@ void gm_801692E8(uint ticks, struct datetime* datetime) /// #fn_8017BDC8 -/// #gm_8017BE84 +s32 gm_8017BE84(u32 arg0) +{ + return (arg0 >> 3) & 0x1F; +} /// #gm_8017BE8C @@ -1542,7 +1565,10 @@ void fn_80187714(void) /// #fn_8018F5F0 -/// #fn_8018F62C +s32 fn_8018F62C(void* arg0) +{ + return M2C_FIELD(arg0, s32*, 0x2C); +} /// #gm_8018F634 @@ -1566,7 +1592,10 @@ void fn_80187714(void) /// #fn_8018FA24 -/// #fn_8018FBD8 +void fn_8018FBD8(void* arg0, s32 arg1) +{ + M2C_FIELD(arg0, s32*, 0x2C) = arg1; +} /// #fn_8018FBE0 @@ -1678,7 +1707,10 @@ void fn_80187714(void) /// #fn_80196510 -/// #fn_8019655C +s32 fn_8019655C(void) +{ + return lbl_804D4190; +} /// #fn_80196564 diff --git a/src/melee/gm/gm_1601.h b/src/melee/gm/gm_1601.h index 55f72a7d07..fd5cc9f68c 100644 --- a/src/melee/gm/gm_1601.h +++ b/src/melee/gm/gm_1601.h @@ -6,43 +6,888 @@ #include +/* 1601C4 */ UNK_RET gm_801601C4(UNK_PARAMS); +/* 160244 */ UNK_RET gm_80160244(UNK_PARAMS); +/* 1602C0 */ UNK_RET gm_801602C0(UNK_PARAMS); +/* 1603B0 */ UNK_RET gm_801603B0(UNK_PARAMS); +/* 160400 */ UNK_RET fn_80160400(UNK_PARAMS); +/* 160438 */ UNK_RET gm_80160438(UNK_PARAMS); +/* 160474 */ UNK_RET gm_80160474(UNK_PARAMS); +/* 1604DC */ UNK_RET gm_801604DC(UNK_PARAMS); +/* 160564 */ UNK_RET gm_80160564(UNK_PARAMS); +/* 1605EC */ UNK_RET fn_801605EC(UNK_PARAMS); +/* 160638 */ UNK_RET gm_80160638(UNK_PARAMS); +/* 1606A8 */ UNK_RET fn_801606A8(UNK_PARAMS); +/* 160710 */ UNK_RET fn_80160710(UNK_PARAMS); +/* 16075C */ UNK_RET gm_8016075C(UNK_PARAMS); +/* 1607A8 */ UNK_RET fn_801607A8(UNK_PARAMS); +/* 1607F4 */ UNK_RET fn_801607F4(UNK_PARAMS); +/* 160840 */ UNK_RET fn_80160840(UNK_PARAMS); /* 160854 */ void gm_80160854(void); /* 160968 */ bool gm_80160968(void); +/* 160980 */ UNK_RET gm_80160980(UNK_PARAMS); +/* 1609E0 */ UNK_RET fn_801609E0(UNK_PARAMS); +/* 160A60 */ UNK_RET gm_80160A60(UNK_PARAMS); +/* 160B40 */ UNK_RET gm_80160B40(UNK_PARAMS); +/* 160C90 */ UNK_RET gm_80160C90(UNK_PARAMS); +/* 160DE8 */ UNK_RET fn_80160DE8(UNK_PARAMS); +/* 160F58 */ UNK_RET fn_80160F58(UNK_PARAMS); +/* 161004 */ UNK_RET fn_80161004(UNK_PARAMS); +/* 161154 */ UNK_RET fn_80161154(UNK_PARAMS); +/* 161C90 */ UNK_RET fn_80161C90(UNK_PARAMS); +/* 162068 */ UNK_RET fn_80162068(UNK_PARAMS); +/* 162170 */ UNK_RET fn_80162170(UNK_PARAMS); +/* 1623A4 */ UNK_RET gm_801623A4(UNK_PARAMS); +/* 1623D8 */ UNK_RET gm_801623D8(UNK_PARAMS); +/* 1623FC */ UNK_RET gm_801623FC(UNK_PARAMS); +/* 16247C */ UNK_RET gm_8016247C(UNK_PARAMS); +/* 162574 */ UNK_RET gm_80162574(UNK_PARAMS); +/* 16260C */ UNK_RET gm_8016260C(UNK_PARAMS); +/* 16279C */ UNK_RET gm_8016279C(UNK_PARAMS); +/* 162800 */ UNK_RET gm_80162800(UNK_PARAMS); +/* 1628C4 */ UNK_RET gm_801628C4(UNK_PARAMS); +/* 162968 */ UNK_RET gm_80162968(UNK_PARAMS); +/* 1629B4 */ UNK_RET gm_801629B4(UNK_PARAMS); +/* 162A00 */ UNK_RET gm_80162A00(UNK_PARAMS); +/* 162A4C */ UNK_RET gm_80162A4C(UNK_PARAMS); +/* 162A98 */ UNK_RET gm_80162A98(UNK_PARAMS); +/* 162B4C */ UNK_RET gm_80162B4C(UNK_PARAMS); +/* 162B98 */ UNK_RET gm_80162B98(UNK_PARAMS); +/* 162BD8 */ UNK_RET gm_80162BD8(UNK_PARAMS); +/* 162BFC */ UNK_RET fn_80162BFC(UNK_PARAMS); +/* 162C48 */ UNK_RET gm_80162C48(UNK_PARAMS); +/* 162CCC */ UNK_RET fn_80162CCC(UNK_PARAMS); +/* 162D1C */ UNK_RET gm_80162D1C(UNK_PARAMS); +/* 162D6C */ UNK_RET gm_80162D6C(UNK_PARAMS); +/* 162DD4 */ UNK_RET gm_80162DD4(UNK_PARAMS); +/* 162DF8 */ UNK_RET fn_80162DF8(UNK_PARAMS); +/* 162E44 */ UNK_RET gm_80162E44(UNK_PARAMS); +/* 162EC8 */ UNK_RET gm_80162EC8(UNK_PARAMS); +/* 162F18 */ UNK_RET gm_80162F18(UNK_PARAMS); +/* 162F68 */ UNK_RET gm_80162F68(UNK_PARAMS); +/* 162FD0 */ UNK_RET gm_80162FD0(UNK_PARAMS); +/* 162FF4 */ UNK_RET fn_80162FF4(UNK_PARAMS); +/* 163040 */ UNK_RET gm_80163040(UNK_PARAMS); +/* 1630C4 */ UNK_RET fn_801630C4(UNK_PARAMS); +/* 163114 */ UNK_RET gm_80163114(UNK_PARAMS); +/* 163164 */ UNK_RET gm_80163164(UNK_PARAMS); +/* 1631CC */ UNK_RET gm_801631CC(UNK_PARAMS); +/* 1631F0 */ UNK_RET gm_801631F0(UNK_PARAMS); +/* 163274 */ UNK_RET gm_80163274(UNK_PARAMS); +/* 163298 */ UNK_RET gm_80163298(UNK_PARAMS); +/* 16332C */ UNK_RET gm_8016332C(UNK_PARAMS); +/* 163374 */ UNK_RET gm_80163374(UNK_PARAMS); +/* 1634D4 */ UNK_RET gm_801634D4(UNK_PARAMS); +/* 16365C */ UNK_RET gm_8016365C(UNK_PARAMS); +/* 163690 */ UNK_RET gm_80163690(UNK_PARAMS); +/* 1636D8 */ UNK_RET gm_801636D8(UNK_PARAMS); +/* 163838 */ UNK_RET gm_80163838(UNK_PARAMS); +/* 1639C0 */ UNK_RET gm_801639C0(UNK_PARAMS); +/* 1639F4 */ UNK_RET gm_801639F4(UNK_PARAMS); +/* 163A3C */ UNK_RET gm_80163A3C(UNK_PARAMS); +/* 163B9C */ UNK_RET gm_80163B9C(UNK_PARAMS); +/* 163D24 */ UNK_RET fn_80163D24(UNK_PARAMS); +/* 163D74 */ UNK_RET fn_80163D74(UNK_PARAMS); +/* 163DC4 */ UNK_RET gm_80163DC4(UNK_PARAMS); +/* 163DE8 */ UNK_RET gm_80163DE8(UNK_PARAMS); +/* 163E3C */ UNK_RET gm_80163E3C(UNK_PARAMS); +/* 163E60 */ UNK_RET gm_80163E60(UNK_PARAMS); +/* 163EB4 */ UNK_RET gm_80163EB4(UNK_PARAMS); +/* 163ED8 */ UNK_RET gm_80163ED8(UNK_PARAMS); +/* 163F2C */ UNK_RET gm_80163F2C(UNK_PARAMS); +/* 163F50 */ UNK_RET gm_80163F50(UNK_PARAMS); +/* 163FA4 */ UNK_RET fn_80163FA4(UNK_PARAMS); +/* 16400C */ UNK_RET gm_8016400C(UNK_PARAMS); +/* 164024 */ UNK_RET gm_80164024(UNK_PARAMS); +/* 16403C */ UNK_RET gm_8016403C(UNK_PARAMS); +/* 1640B0 */ UNK_RET fn_801640B0(UNK_PARAMS); +/* 16419C */ UNK_RET fn_8016419C(UNK_PARAMS); +/* 1641B4 */ UNK_RET fn_801641B4(UNK_PARAMS); +/* 1641CC */ UNK_RET gm_801641CC(UNK_PARAMS); +/* 1641E4 */ UNK_RET gm_801641E4(UNK_PARAMS); +/* 164250 */ UNK_RET gm_80164250(UNK_PARAMS); +/* 1642A0 */ UNK_RET fn_801642A0(UNK_PARAMS); +/* 164330 */ UNK_RET gm_80164330(UNK_PARAMS); +/* 164430 */ UNK_RET gm_80164430(UNK_PARAMS); +/* 164504 */ UNK_RET gm_80164504(UNK_PARAMS); /* 164600 */ bool gm_80164600(void); +/* 16468C */ UNK_RET gm_8016468C(UNK_PARAMS); +/* 1647D0 */ UNK_RET gm_801647D0(UNK_PARAMS); +/* 1647F8 */ UNK_RET gm_801647F8(UNK_PARAMS); /* 164840 */ bool gm_80164840(u8); +/* 164910 */ UNK_RET gm_80164910(UNK_PARAMS); +/* 164A0C */ UNK_RET gm_80164A0C(UNK_PARAMS); /* 164ABC */ bool gm_80164ABC(struct gmMainLib_8015ED8C_arg0_t*); +/* 164B48 */ UNK_RET fn_80164B48(UNK_PARAMS); +/* 164F18 */ UNK_RET gm_80164F18(UNK_PARAMS); +/* 16505C */ UNK_RET gm_8016505C(UNK_PARAMS); +/* 165084 */ UNK_RET gm_80165084(UNK_PARAMS); +/* 1650E8 */ UNK_RET fn_801650E8(UNK_PARAMS); +/* 165108 */ UNK_RET fn_80165108(UNK_PARAMS); +/* 165190 */ UNK_RET fn_80165190(UNK_PARAMS); +/* 1651FC */ UNK_RET fn_801651FC(UNK_PARAMS); +/* 165268 */ UNK_RET gm_80165268(UNK_PARAMS); +/* 165290 */ UNK_RET gm_80165290(UNK_PARAMS); +/* 1652B0 */ UNK_RET fn_801652B0(UNK_PARAMS); +/* 1652D8 */ UNK_RET fn_801652D8(UNK_PARAMS); +/* 165388 */ UNK_RET gm_80165388(UNK_PARAMS); +/* 1653C8 */ UNK_RET gm_801653C8(UNK_PARAMS); +/* 1653E8 */ UNK_RET fn_801653E8(UNK_PARAMS); +/* 165418 */ UNK_RET fn_80165418(UNK_PARAMS); +/* 1654A0 */ UNK_RET fn_801654A0(UNK_PARAMS); +/* 165548 */ UNK_RET fn_80165548(UNK_PARAMS); +/* 1656A8 */ UNK_RET fn_801656A8(UNK_PARAMS); +/* 16588C */ UNK_RET fn_8016588C(UNK_PARAMS); +/* 165AC0 */ UNK_RET fn_80165AC0(UNK_PARAMS); +/* 165D60 */ UNK_RET fn_80165D60(UNK_PARAMS); +/* 165E7C */ UNK_RET fn_80165E7C(UNK_PARAMS); +/* 165FA4 */ UNK_RET fn_80165FA4(UNK_PARAMS); +/* 1661E0 */ UNK_RET fn_801661E0(UNK_PARAMS); +/* 166378 */ UNK_RET gm_80166378(UNK_PARAMS); +/* 166A8C */ UNK_RET fn_80166A8C(UNK_PARAMS); +/* 166A98 */ UNK_RET gm_80166A98(UNK_PARAMS); +/* 166CBC */ UNK_RET fn_80166CBC(UNK_PARAMS); +/* 166CCC */ UNK_RET gm_80166CCC(UNK_PARAMS); +/* 167140 */ UNK_RET gm_80167140(UNK_PARAMS); +/* 167194 */ u8 fn_80167194(UNK_T arg0); +/* 16719C */ UNK_RET fn_8016719C(UNK_PARAMS); /* 167320 */ void gm_80167320(int slot, bool); +/* 167470 */ UNK_RET gm_80167470(UNK_PARAMS); +/* 1674C4 */ UNK_RET gm_801674C4(UNK_PARAMS); +/* 16758C */ UNK_RET fn_8016758C(UNK_PARAMS); +/* 167638 */ UNK_RET fn_80167638(UNK_PARAMS); +/* 1677C0 */ UNK_RET gm_801677C0(UNK_PARAMS); +/* 1677E8 */ void gm_801677E8(s8 arg0); +/* 1677F0 */ u8 gm_801677F0(void); +/* 1677F8 */ UNK_RET gm_801677F8(UNK_PARAMS); +/* 167858 */ UNK_RET gm_80167858(UNK_PARAMS); +/* 1678F8 */ UNK_RET gm_801678F8(UNK_PARAMS); +/* 16795C */ UNK_RET gm_8016795C(UNK_PARAMS); +/* 167A14 */ UNK_RET gm_80167A14(UNK_PARAMS); +/* 167A64 */ UNK_RET gm_80167A64(UNK_PARAMS); +/* 167B50 */ UNK_RET gm_80167B50(UNK_PARAMS); +/* 167BC8 */ UNK_RET gm_80167BC8(UNK_PARAMS); +/* 167FC4 */ UNK_RET gm_80167FC4(UNK_PARAMS); +/* 1685D4 */ UNK_RET gm_801685D4(UNK_PARAMS); +/* 168638 */ UNK_RET gm_80168638(UNK_PARAMS); +/* 168710 */ UNK_RET gm_80168710(UNK_PARAMS); +/* 1688AC */ UNK_RET gm_801688AC(UNK_PARAMS); +/* 168940 */ UNK_RET gm_80168940(UNK_PARAMS); +/* 16895C */ UNK_RET gm_8016895C(UNK_PARAMS); +/* 1689E4 */ UNK_RET fn_801689E4(UNK_PARAMS); +/* 168A6C */ UNK_RET fn_80168A6C(UNK_PARAMS); /* 168B34 */ void gm_80168B34(void); +/* 168BF8 */ UNK_RET gm_80168BF8(UNK_PARAMS); +/* 168C5C */ UNK_RET gm_80168C5C(UNK_PARAMS); +/* 168E54 */ UNK_RET fn_80168E54(UNK_PARAMS); +/* 168F2C */ UNK_RET fn_80168F2C(UNK_PARAMS); +/* 168F7C */ UNK_RET fn_80168F7C(UNK_PARAMS); +/* 168F88 */ UNK_RET gm_80168F88(UNK_PARAMS); +/* 168FC4 */ UNK_RET gm_80168FC4(UNK_PARAMS); +/* 169000 */ UNK_RET fn_80169000(UNK_PARAMS); +/* 169238 */ UNK_RET gm_80169238(UNK_PARAMS); +/* 169264 */ UNK_RET gm_80169264(UNK_PARAMS); +/* 169290 */ UNK_RET gm_80169290(UNK_PARAMS); +/* 1692BC */ UNK_RET gm_801692BC(UNK_PARAMS); /* 1692E8 */ void gm_801692E8(uint ticks, struct datetime* datetime); +/* 169364 */ UNK_RET fn_80169364(UNK_PARAMS); +/* 169370 */ UNK_RET gm_80169370(UNK_PARAMS); +/* 169384 */ UNK_RET gm_80169384(UNK_PARAMS); +/* 169394 */ UNK_RET gm_80169394(UNK_PARAMS); +/* 1693A8 */ UNK_RET fn_801693A8(UNK_PARAMS); +/* 1693BC */ UNK_RET gm_801693BC(UNK_PARAMS); +/* 169434 */ UNK_RET fn_80169434(UNK_PARAMS); +/* 169444 */ UNK_RET fn_80169444(UNK_PARAMS); +/* 1694A0 */ UNK_RET gm_801694A0(UNK_PARAMS); +/* 169520 */ UNK_RET gm_80169520(UNK_PARAMS); +/* 169530 */ UNK_RET gm_80169530(UNK_PARAMS); +/* 169540 */ UNK_RET gm_80169540(UNK_PARAMS); +/* 169550 */ UNK_RET fn_80169550(UNK_PARAMS); +/* 169574 */ UNK_RET fn_80169574(UNK_PARAMS); +/* 1695BC */ UNK_RET fn_801695BC(UNK_PARAMS); +/* 1697FC */ UNK_RET fn_801697FC(UNK_PARAMS); +/* 16989C */ UNK_RET fn_8016989C(UNK_PARAMS); +/* 169900 */ UNK_RET fn_80169900(UNK_PARAMS); +/* 169A84 */ UNK_RET fn_80169A84(UNK_PARAMS); +/* 169C54 */ UNK_RET fn_80169C54(UNK_PARAMS); +/* 169F50 */ UNK_RET fn_80169F50(UNK_PARAMS); +/* 16A09C */ UNK_RET fn_8016A09C(UNK_PARAMS); +/* 16A164 */ UNK_RET gm_8016A164(UNK_PARAMS); +/* 16A1E4 */ UNK_RET fn_8016A1E4(UNK_PARAMS); +/* 16A1F8 */ UNK_RET gm_8016A1F8(UNK_PARAMS); +/* 16A21C */ UNK_RET gm_8016A21C(UNK_PARAMS); +/* 16A22C */ UNK_RET gm_8016A22C(UNK_PARAMS); +/* 16A404 */ UNK_RET gm_8016A404(UNK_PARAMS); +/* 16A414 */ UNK_RET gm_8016A414(UNK_PARAMS); +/* 16A424 */ UNK_RET gm_8016A424(UNK_PARAMS); +/* 16A434 */ UNK_RET gm_8016A434(UNK_PARAMS); +/* 16A450 */ UNK_RET fn_8016A450(UNK_PARAMS); +/* 16A46C */ UNK_RET fn_8016A46C(UNK_PARAMS); +/* 16A488 */ UNK_RET fn_8016A488(UNK_PARAMS); +/* 16A4C8 */ UNK_RET fn_8016A4C8(UNK_PARAMS); +/* 16A92C */ UNK_RET gm_8016A92C(UNK_PARAMS); +/* 16A944 */ UNK_RET gm_8016A944(UNK_PARAMS); +/* 16A97C */ UNK_RET gm_8016A97C(UNK_PARAMS); +/* 16A98C */ UNK_RET gm_8016A98C(UNK_PARAMS); +/* 16A998 */ UNK_RET gm_8016A998(UNK_PARAMS); +/* 16A9E8 */ UNK_RET gm_8016A9E8(UNK_PARAMS); +/* 16AC44 */ UNK_RET gm_8016AC44(UNK_PARAMS); /* 16AE38 */ Placeholder_8016AE38_ret_val* gm_8016AE38(void); /* 16AE44 */ bool gm_8016AE44(void); /* 16AE50 */ Placeholder_8016AE50_ret_val* gm_8016AE50(void); +/* 16AE60 */ UNK_RET fn_8016AE60(UNK_PARAMS); /* 16AE80 */ bool gm_8016AE80(void); /* 16AE94 */ f32 gm_8016AE94(void); /* 16AEA4 */ u64 gm_8016AEA4(void); -/* 16AE80 */ bool gm_8016AE80(void); +/* 16AEB8 */ UNK_RET gm_8016AEB8(UNK_PARAMS); +/* 16AEC8 */ UNK_RET gm_8016AEC8(UNK_PARAMS); /* 16AEDC */ bool gm_8016AEDC(void); +/* 16AEEC */ UNK_RET gm_8016AEEC(UNK_PARAMS); +/* 16AEFC */ UNK_RET gm_8016AEFC(UNK_PARAMS); +/* 16AF0C */ UNK_RET gm_8016AF0C(UNK_PARAMS); +/* 16AF88 */ UNK_RET gm_8016AF88(UNK_PARAMS); +/* 16B004 */ UNK_RET gm_8016B004(UNK_PARAMS); /* 16B014 */ bool gm_8016B014(void); +/* 16B094 */ UNK_RET gm_8016B094(UNK_PARAMS); /* 16B0B4 */ bool gm_8016B0B4(void); /* 16B0D4 */ bool gm_8016B0D4(void); +/* 16B0E8 */ UNK_RET gm_8016B0E8(UNK_PARAMS); /* 16B0FC */ bool gm_8016B0FC(void); +/* 16B110 */ UNK_RET gm_8016B110(UNK_PARAMS); +/* 16B124 */ UNK_RET gm_8016B124(UNK_PARAMS); +/* 16B138 */ UNK_RET fn_8016B138(UNK_PARAMS); /* 16B14C */ bool gm_8016B14C(void); /* 16B168 */ bool gm_8016B168(void); +/* 16B184 */ UNK_RET gm_8016B184(UNK_PARAMS); +/* 16B1A8 */ UNK_RET gm_8016B1A8(UNK_PARAMS); /* 16B1C4 */ bool gm_8016B1C4(void); /* 16B1D8 */ bool gm_8016B1D8(void); +/* 16B1EC */ UNK_RET gm_8016B1EC(UNK_PARAMS); +/* 16B204 */ UNK_RET gm_8016B204(UNK_PARAMS); /* 16B238 */ bool gm_8016B238(void); /* 16B248 */ void gm_8016B248(void); +/* 16B258 */ UNK_RET gm_8016B258(UNK_PARAMS); +/* 16B274 */ UNK_RET gm_8016B274(UNK_PARAMS); +/* 16B2C8 */ UNK_RET gm_8016B2C8(UNK_PARAMS); +/* 16B328 */ UNK_RET gm_8016B328(UNK_PARAMS); +/* 16B33C */ UNK_RET gm_8016B33C(UNK_PARAMS); +/* 16B350 */ UNK_RET gm_8016B350(UNK_PARAMS); +/* 16B364 */ UNK_RET gm_8016B364(UNK_PARAMS); +/* 16B378 */ UNK_RET gm_8016B378(UNK_PARAMS); +/* 16B388 */ UNK_RET fn_8016B388(UNK_PARAMS); /* 16B3A0 */ bool gm_8016B3A0(void); /* 16B3D8 */ bool gm_8016B3D8(void); /* 16B41C */ bool gm_8016B41C(void); /* 16B498 */ bool gm_8016B498(void); +/* 16B4BC */ UNK_RET fn_8016B4BC(UNK_PARAMS); +/* 16B510 */ UNK_RET fn_8016B510(UNK_PARAMS); +/* 16B558 */ UNK_RET gm_8016B558(UNK_PARAMS); +/* 16B5B0 */ UNK_RET fn_8016B5B0(UNK_PARAMS); +/* 16B6E8 */ UNK_RET gm_8016B6E8(UNK_PARAMS); +/* 16B728 */ UNK_RET fn_8016B728(UNK_PARAMS); +/* 16B738 */ UNK_RET fn_8016B738(UNK_PARAMS); +/* 16B774 */ UNK_RET gm_8016B774(UNK_PARAMS); +/* 16B784 */ UNK_RET fn_8016B784(UNK_PARAMS); +/* 16B7B4 */ UNK_RET fn_8016B7B4(UNK_PARAMS); +/* 16B7F8 */ UNK_RET fn_8016B7F8(UNK_PARAMS); +/* 16B88C */ UNK_RET fn_8016B88C(UNK_PARAMS); /* 16B8D4 */ void gm_8016B8D4(s32, s32); +/* 16B918 */ UNK_RET fn_8016B918(UNK_PARAMS); +/* 16BAF4 */ UNK_RET fn_8016BAF4(UNK_PARAMS); +/* 16BBB4 */ UNK_RET fn_8016BBB4(UNK_PARAMS); +/* 16BC74 */ UNK_RET fn_8016BC74(UNK_PARAMS); +/* 16BE80 */ UNK_RET gm_8016BE80(UNK_PARAMS); +/* 16BF74 */ UNK_RET fn_8016BF74(UNK_PARAMS); +/* 16C0C8 */ UNK_RET fn_8016C0C8(UNK_PARAMS); +/* 16C35C */ UNK_RET fn_8016C35C(UNK_PARAMS); +/* 16C46C */ UNK_RET fn_8016C46C(UNK_PARAMS); +/* 16C4F4 */ UNK_RET fn_8016C4F4(UNK_PARAMS); /* 16C5C0 */ bool gm_8016C5C0(int pl_slot); +/* 16C658 */ UNK_RET gm_8016C658(UNK_PARAMS); /* 16C6C0 */ /* static */ UNK_RET gm_8016C6C0(UNK_PARAMS); +/* 16C6C0 */ UNK_RET gm_8016C6C0(UNK_PARAMS); /* 16C75C */ /* static */ UNK_RET gm_8016C75C(UNK_PARAMS); +/* 16C75C */ UNK_RET gm_8016C75C(UNK_PARAMS); +/* 16C7D0 */ UNK_RET fn_8016C7D0(UNK_PARAMS); +/* 16C7F0 */ UNK_RET fn_8016C7F0(UNK_PARAMS); +/* 16CA68 */ UNK_RET fn_8016CA68(UNK_PARAMS); +/* 16CBE8 */ UNK_RET fn_8016CBE8(UNK_PARAMS); +/* 16CD98 */ UNK_RET fn_8016CD98(UNK_PARAMS); +/* 16CF4C */ UNK_RET fn_8016CF4C(UNK_PARAMS); +/* 16CFE0 */ UNK_RET fn_8016CFE0(UNK_PARAMS); +/* 16D32C */ UNK_RET gm_8016D32C(UNK_PARAMS); +/* 16D538 */ UNK_RET fn_8016D538(UNK_PARAMS); +/* 16D634 */ UNK_RET fn_8016D634(UNK_PARAMS); +/* 16D800 */ UNK_RET gm_8016D800(UNK_PARAMS); +/* 16D8AC */ UNK_RET fn_8016D8AC(UNK_PARAMS); +/* 16DCC0 */ UNK_RET fn_8016DCC0(UNK_PARAMS); +/* 16DEEC */ UNK_RET fn_8016DEEC(UNK_PARAMS); +/* 16E124 */ UNK_RET fn_8016E124(UNK_PARAMS); +/* 16E2BC */ UNK_RET fn_8016E2BC(UNK_PARAMS); +/* 16E5C0 */ UNK_RET fn_8016E5C0(UNK_PARAMS); +/* 16E730 */ UNK_RET fn_8016E730(UNK_PARAMS); +/* 16E934 */ UNK_RET gm_8016E934(UNK_PARAMS); +/* 16E9C8 */ UNK_RET gm_8016E9C8(UNK_PARAMS); +/* 16EBC0 */ UNK_RET gm_8016EBC0(UNK_PARAMS); +/* 16EC28 */ UNK_RET gm_8016EC28(UNK_PARAMS); +/* 16ECE8 */ UNK_RET gm_8016ECE8(UNK_PARAMS); +/* 16EDDC */ UNK_RET gm_8016EDDC(UNK_PARAMS); +/* 16EF98 */ UNK_RET fn_8016EF98(UNK_PARAMS); +/* 16F00C */ UNK_RET gm_8016F00C(UNK_PARAMS); +/* 16F030 */ UNK_RET fn_8016F030(UNK_PARAMS); +/* 16F088 */ UNK_RET gm_8016F088(UNK_PARAMS); +/* 16F120 */ UNK_RET gm_8016F120(UNK_PARAMS); +/* 16F140 */ UNK_RET fn_8016F140(UNK_PARAMS); +/* 16F160 */ UNK_RET fn_8016F160(UNK_PARAMS); +/* 16F180 */ UNK_RET fn_8016F180(UNK_PARAMS); +/* 16F1B8 */ UNK_RET gm_8016F1B8(UNK_PARAMS); +/* 16F1F0 */ UNK_RET fn_8016F1F0(UNK_PARAMS); +/* 16F208 */ UNK_RET gm_8016F208(UNK_PARAMS); +/* 16F280 */ UNK_RET fn_8016F280(UNK_PARAMS); +/* 16F2F8 */ UNK_RET gm_8016F2F8(UNK_PARAMS); +/* 16F344 */ UNK_RET fn_8016F344(UNK_PARAMS); +/* 16F39C */ UNK_RET fn_8016F39C(UNK_PARAMS); +/* 16F548 */ UNK_RET fn_8016F548(UNK_PARAMS); +/* 16F740 */ UNK_RET fn_8016F740(UNK_PARAMS); +/* 16F870 */ UNK_RET fn_8016F870(UNK_PARAMS); +/* 16F9A8 */ UNK_RET fn_8016F9A8(UNK_PARAMS); +/* 16FAD4 */ UNK_RET fn_8016FAD4(UNK_PARAMS); +/* 16FFD4 */ UNK_RET fn_8016FFD4(UNK_PARAMS); +/* 170110 */ UNK_RET fn_80170110(UNK_PARAMS); +/* 1701A0 */ UNK_RET gm_801701A0(UNK_PARAMS); +/* 1701AC */ UNK_RET fn_801701AC(UNK_PARAMS); +/* 1701B8 */ u8 fn_801701B8(void); +/* 1701C0 */ UNK_RET fn_801701C0(UNK_PARAMS); +/* 171A88 */ UNK_RET fn_80171A88(UNK_PARAMS); +/* 171AD4 */ UNK_RET fn_80171AD4(UNK_PARAMS); +/* 171B00 */ UNK_RET fn_80171B00(UNK_PARAMS); +/* 171B2C */ UNK_RET fn_80171B2C(UNK_PARAMS); +/* 171B64 */ UNK_RET fn_80171B64(UNK_PARAMS); +/* 171BA4 */ UNK_RET fn_80171BA4(UNK_PARAMS); +/* 171DC4 */ UNK_RET fn_80171DC4(UNK_PARAMS); +/* 1720B4 */ UNK_RET gm_801720B4(UNK_PARAMS); +/* 1720F8 */ UNK_RET gm_801720F8(UNK_PARAMS); +/* 172140 */ UNK_RET gm_80172140(UNK_PARAMS); +/* 172174 */ UNK_RET gm_80172174(UNK_PARAMS); +/* 17219C */ UNK_RET gm_8017219C(UNK_PARAMS); +/* 1721EC */ UNK_RET gm_801721EC(UNK_PARAMS); +/* 1722BC */ UNK_RET fn_801722BC(UNK_PARAMS); +/* 1722F4 */ UNK_RET fn_801722F4(UNK_PARAMS); +/* 17232C */ UNK_RET fn_8017232C(UNK_PARAMS); +/* 172380 */ UNK_RET fn_80172380(UNK_PARAMS); +/* 1723D4 */ UNK_RET fn_801723D4(UNK_PARAMS); +/* 172428 */ UNK_RET fn_80172428(UNK_PARAMS); +/* 172478 */ UNK_RET fn_80172478(UNK_PARAMS); +/* 1724C8 */ bool fn_801724C8(void); +/* 1724D0 */ UNK_RET fn_801724D0(UNK_PARAMS); +/* 172504 */ UNK_RET fn_80172504(UNK_PARAMS); +/* 172538 */ UNK_RET fn_80172538(UNK_PARAMS); +/* 17256C */ UNK_RET fn_8017256C(UNK_PARAMS); +/* 1725A8 */ UNK_RET fn_801725A8(UNK_PARAMS); +/* 1725E4 */ UNK_RET fn_801725E4(UNK_PARAMS); +/* 172624 */ UNK_RET fn_80172624(UNK_PARAMS); +/* 172664 */ UNK_RET fn_80172664(UNK_PARAMS); +/* 172698 */ UNK_RET fn_80172698(UNK_PARAMS); +/* 1726CC */ UNK_RET fn_801726CC(UNK_PARAMS); +/* 172700 */ UNK_RET fn_80172700(UNK_PARAMS); +/* 172734 */ UNK_RET fn_80172734(UNK_PARAMS); +/* 172768 */ UNK_RET fn_80172768(UNK_PARAMS); +/* 17279C */ UNK_RET fn_8017279C(UNK_PARAMS); +/* 17280C */ UNK_RET fn_8017280C(UNK_PARAMS); +/* 172898 */ UNK_RET gm_80172898(UNK_PARAMS); +/* 17297C */ UNK_RET gm_8017297C(UNK_PARAMS); +/* 1729EC */ UNK_RET gm_801729EC(UNK_PARAMS); +/* 172BC4 */ UNK_RET gm_80172BC4(UNK_PARAMS); +/* 172C04 */ UNK_RET gm_80172C04(UNK_PARAMS); +/* 172C44 */ UNK_RET gm_80172C44(UNK_PARAMS); +/* 172C78 */ UNK_RET fn_80172C78(UNK_PARAMS); +/* 172CC0 */ UNK_RET gm_80172CC0(UNK_PARAMS); +/* 172D78 */ UNK_RET gm_80172D78(UNK_PARAMS); +/* 172DD4 */ UNK_RET gm_80172DD4(UNK_PARAMS); +/* 172E74 */ UNK_RET gm_80172E74(UNK_PARAMS); +/* 172F00 */ UNK_RET gm_80172F00(UNK_PARAMS); +/* 172FAC */ UNK_RET fn_80172FAC(UNK_PARAMS); +/* 173098 */ UNK_RET fn_80173098(UNK_PARAMS); +/* 173224 */ UNK_RET gm_80173224(UNK_PARAMS); +/* 1732D8 */ UNK_RET gm_801732D8(UNK_PARAMS); +/* 17335C */ UNK_RET gm_8017335C(UNK_PARAMS); +/* 1733D8 */ UNK_RET gm_801733D8(UNK_PARAMS); +/* 17341C */ UNK_RET gm_8017341C(UNK_PARAMS); +/* 173460 */ UNK_RET gm_80173460(UNK_PARAMS); +/* 173498 */ UNK_RET gm_80173498(UNK_PARAMS); +/* 1734D0 */ UNK_RET gm_801734D0(UNK_PARAMS); +/* 173510 */ UNK_RET fn_80173510(UNK_PARAMS); +/* 1735F0 */ UNK_RET fn_801735F0(UNK_PARAMS); +/* 173644 */ UNK_RET fn_80173644(UNK_PARAMS); +/* 17367C */ UNK_RET fn_8017367C(UNK_PARAMS); +/* 1736DC */ UNK_RET gm_801736DC(UNK_PARAMS); +/* 1736E8 */ UNK_RET gm_801736E8(UNK_PARAMS); +/* 173754 */ UNK_RET gm_80173754(UNK_PARAMS); +/* 1737D8 */ UNK_RET gm_801737D8(UNK_PARAMS); +/* 1737E8 */ UNK_RET gm_801737E8(UNK_PARAMS); +/* 173834 */ UNK_RET fn_80173834(UNK_PARAMS); +/* 17390C */ UNK_RET gm_8017390C(UNK_PARAMS); +/* 173AA4 */ UNK_RET gm_80173AA4(UNK_PARAMS); +/* 173B30 */ UNK_RET gm_80173B30(UNK_PARAMS); +/* 173BC4 */ UNK_RET gm_80173BC4(UNK_PARAMS); +/* 173C70 */ UNK_RET gm_80173C70(UNK_PARAMS); +/* 173D3C */ UNK_RET gm_80173D3C(UNK_PARAMS); +/* 173DE4 */ UNK_RET gm_80173DE4(UNK_PARAMS); +/* 173EEC */ UNK_RET gm_80173EEC(UNK_PARAMS); +/* 174180 */ UNK_RET gm_80174180(UNK_PARAMS); +/* 1741FC */ UNK_RET gm_801741FC(UNK_PARAMS); +/* 174238 */ UNK_RET gm_80174238(UNK_PARAMS); +/* 174274 */ UNK_RET fn_80174274(UNK_PARAMS); +/* 174284 */ UNK_RET fn_80174284(UNK_PARAMS); +/* 174338 */ UNK_RET fn_80174338(UNK_PARAMS); +/* 17435C */ UNK_RET fn_8017435C(UNK_PARAMS); +/* 174380 */ UNK_RET fn_80174380(UNK_PARAMS); +/* 1743A4 */ UNK_RET gm_801743A4(UNK_PARAMS); +/* 1743C4 */ UNK_RET fn_801743C4(UNK_PARAMS); +/* 174468 */ UNK_RET fn_80174468(UNK_PARAMS); +/* 1748EC */ UNK_RET fn_801748EC(UNK_PARAMS); +/* 174920 */ UNK_RET fn_80174920(UNK_PARAMS); +/* 1749B8 */ UNK_RET fn_801749B8(UNK_PARAMS); +/* 174A60 */ UNK_RET fn_80174A60(UNK_PARAMS); +/* 174B4C */ UNK_RET fn_80174B4C(UNK_PARAMS); +/* 174FD0 */ UNK_RET fn_80174FD0(UNK_PARAMS); +/* 175038 */ UNK_RET fn_80175038(UNK_PARAMS); +/* 17507C */ UNK_RET fn_8017507C(UNK_PARAMS); +/* 175240 */ UNK_RET fn_80175240(UNK_PARAMS); +/* 17556C */ UNK_RET fn_8017556C(UNK_PARAMS); +/* 1756E0 */ UNK_RET fn_801756E0(UNK_PARAMS); +/* 175880 */ UNK_RET fn_80175880(UNK_PARAMS); +/* 175A94 */ UNK_RET fn_80175A94(UNK_PARAMS); +/* 175C5C */ UNK_RET fn_80175C5C(UNK_PARAMS); +/* 175D34 */ UNK_RET fn_80175D34(UNK_PARAMS); +/* 175DC8 */ UNK_RET fn_80175DC8(UNK_PARAMS); +/* 176A6C */ UNK_RET fn_80176A6C(UNK_PARAMS); +/* 176BCC */ UNK_RET fn_80176BCC(UNK_PARAMS); +/* 176BF0 */ UNK_RET fn_80176BF0(UNK_PARAMS); +/* 176D18 */ UNK_RET fn_80176D18(UNK_PARAMS); +/* 176D3C */ UNK_RET fn_80176D3C(UNK_PARAMS); +/* 176F60 */ UNK_RET fn_80176F60(UNK_PARAMS); +/* 1771C0 */ UNK_RET fn_801771C0(UNK_PARAMS); +/* 177368 */ UNK_RET gm_80177368(UNK_PARAMS); +/* 177704 */ UNK_RET gm_80177704(UNK_PARAMS); +/* 177724 */ UNK_RET gm_80177724(UNK_PARAMS); +/* 177748 */ UNK_RET fn_80177748(UNK_PARAMS); +/* 177920 */ UNK_RET fn_80177920(UNK_PARAMS); +/* 177B7C */ UNK_RET fn_80177B7C(UNK_PARAMS); +/* 177DD0 */ UNK_RET fn_80177DD0(UNK_PARAMS); +/* 178050 */ UNK_RET fn_80178050(UNK_PARAMS); +/* 1785B0 */ UNK_RET fn_801785B0(UNK_PARAMS); +/* 178BB4 */ UNK_RET fn_80178BB4(UNK_PARAMS); +/* 1791E4 */ UNK_RET fn_801791E4(UNK_PARAMS); +/* 179350 */ UNK_RET fn_80179350(UNK_PARAMS); +/* 1795D4 */ UNK_RET fn_801795D4(UNK_PARAMS); +/* 1796F0 */ UNK_RET fn_801796F0(UNK_PARAMS); +/* 179854 */ UNK_RET fn_80179854(UNK_PARAMS); +/* 179990 */ UNK_RET fn_80179990(UNK_PARAMS); +/* 179D3C */ UNK_RET fn_80179D3C(UNK_PARAMS); +/* 179D60 */ UNK_RET fn_80179D60(UNK_PARAMS); +/* 179D84 */ UNK_RET fn_80179D84(UNK_PARAMS); +/* 179DA8 */ UNK_RET fn_80179DA8(UNK_PARAMS); +/* 179DCC */ UNK_RET fn_80179DCC(UNK_PARAMS); +/* 179E34 */ UNK_RET fn_80179E34(UNK_PARAMS); +/* 179E9C */ UNK_RET fn_80179E9C(UNK_PARAMS); +/* 179F04 */ UNK_RET fn_80179F04(UNK_PARAMS); +/* 179F6C */ UNK_RET fn_80179F6C(UNK_PARAMS); +/* 179F84 */ UNK_RET fn_80179F84(UNK_PARAMS); +/* 17A004 */ UNK_RET fn_8017A004(UNK_PARAMS); +/* 17A078 */ UNK_RET fn_8017A078(UNK_PARAMS); +/* 17A318 */ UNK_RET fn_8017A318(UNK_PARAMS); +/* 17A67C */ UNK_RET fn_8017A67C(UNK_PARAMS); +/* 17A9B4 */ UNK_RET fn_8017A9B4(UNK_PARAMS); +/* 17AA78 */ UNK_RET fn_8017AA78(UNK_PARAMS); +/* 17AD04 */ UNK_RET fn_8017AD04(UNK_PARAMS); +/* 17AD28 */ UNK_RET fn_8017AD28(UNK_PARAMS); +/* 17AD48 */ UNK_RET fn_8017AD48(UNK_PARAMS); +/* 17AD78 */ UNK_RET fn_8017AD78(UNK_PARAMS); +/* 17ADA8 */ UNK_RET fn_8017ADA8(UNK_PARAMS); +/* 17AE0C */ UNK_RET fn_8017AE0C(UNK_PARAMS); +/* 17AE70 */ UNK_RET fn_8017AE70(UNK_PARAMS); +/* 17AED8 */ UNK_RET fn_8017AED8(UNK_PARAMS); +/* 17AF40 */ UNK_RET fn_8017AF40(UNK_PARAMS); +/* 17AFA8 */ UNK_RET fn_8017AFA8(UNK_PARAMS); +/* 17B010 */ UNK_RET fn_8017B010(UNK_PARAMS); +/* 17B07C */ UNK_RET fn_8017B07C(UNK_PARAMS); +/* 17B0E4 */ UNK_RET fn_8017B0E4(UNK_PARAMS); +/* 17B14C */ UNK_RET fn_8017B14C(UNK_PARAMS); +/* 17B1B4 */ UNK_RET fn_8017B1B4(UNK_PARAMS); +/* 17B21C */ UNK_RET fn_8017B21C(UNK_PARAMS); +/* 17B280 */ UNK_RET fn_8017B280(UNK_PARAMS); +/* 17B2E4 */ UNK_RET fn_8017B2E4(UNK_PARAMS); +/* 17B348 */ UNK_RET fn_8017B348(UNK_PARAMS); +/* 17B3AC */ UNK_RET fn_8017B3AC(UNK_PARAMS); +/* 17B410 */ UNK_RET fn_8017B410(UNK_PARAMS); +/* 17B4D0 */ UNK_RET fn_8017B4D0(UNK_PARAMS); +/* 17B534 */ UNK_RET fn_8017B534(UNK_PARAMS); +/* 17B598 */ UNK_RET fn_8017B598(UNK_PARAMS); +/* 17B5FC */ UNK_RET fn_8017B5FC(UNK_PARAMS); +/* 17B660 */ UNK_RET fn_8017B660(UNK_PARAMS); +/* 17B6C4 */ UNK_RET fn_8017B6C4(UNK_PARAMS); +/* 17B728 */ UNK_RET fn_8017B728(UNK_PARAMS); +/* 17B78C */ UNK_RET fn_8017B78C(UNK_PARAMS); +/* 17B7F0 */ UNK_RET fn_8017B7F0(UNK_PARAMS); +/* 17B854 */ UNK_RET fn_8017B854(UNK_PARAMS); +/* 17B8B8 */ UNK_RET fn_8017B8B8(UNK_PARAMS); +/* 17B91C */ UNK_RET fn_8017B91C(UNK_PARAMS); +/* 17B9F4 */ UNK_RET fn_8017B9F4(UNK_PARAMS); +/* 17BACC */ UNK_RET fn_8017BACC(UNK_PARAMS); +/* 17BB30 */ UNK_RET fn_8017BB30(UNK_PARAMS); +/* 17BB94 */ UNK_RET fn_8017BB94(UNK_PARAMS); +/* 17BC50 */ UNK_RET fn_8017BC50(UNK_PARAMS); +/* 17BD0C */ UNK_RET fn_8017BD0C(UNK_PARAMS); +/* 17BDC8 */ UNK_RET fn_8017BDC8(UNK_PARAMS); +/* 17BE84 */ s32 gm_8017BE84(u32 arg0); +/* 17BE8C */ UNK_RET gm_8017BE8C(UNK_PARAMS); +/* 17BEC8 */ UNK_RET gm_8017BEC8(UNK_PARAMS); +/* 17C0C8 */ UNK_RET fn_8017C0C8(UNK_PARAMS); +/* 17C1A4 */ UNK_RET fn_8017C1A4(UNK_PARAMS); +/* 17C71C */ UNK_RET fn_8017C71C(UNK_PARAMS); +/* 17C7A0 */ UNK_RET fn_8017C7A0(UNK_PARAMS); +/* 17C7EC */ UNK_RET fn_8017C7EC(UNK_PARAMS); +/* 17C838 */ UNK_RET gm_8017C838(UNK_PARAMS); +/* 17C984 */ UNK_RET gm_8017C984(UNK_PARAMS); +/* 17C9A8 */ UNK_RET gm_8017C9A8(UNK_PARAMS); +/* 17CA38 */ UNK_RET gm_8017CA38(UNK_PARAMS); +/* 17CBAC */ UNK_RET gm_8017CBAC(UNK_PARAMS); +/* 17CD94 */ UNK_RET gm_8017CD94(UNK_PARAMS); +/* 17CE34 */ UNK_RET gm_8017CE34(UNK_PARAMS); +/* 17D7AC */ UNK_RET gm_8017D7AC(UNK_PARAMS); +/* 17D9C0 */ UNK_RET fn_8017D9C0(UNK_PARAMS); +/* 17DB58 */ UNK_RET gm_8017DB58(UNK_PARAMS); +/* 17DB6C */ UNK_RET gm_8017DB6C(UNK_PARAMS); +/* 17DB78 */ UNK_RET gm_8017DB78(UNK_PARAMS); +/* 17DB88 */ UNK_RET gm_8017DB88(UNK_PARAMS); +/* 17DD7C */ UNK_RET fn_8017DD7C(UNK_PARAMS); +/* 17DE54 */ UNK_RET fn_8017DE54(UNK_PARAMS); +/* 17DEC8 */ UNK_RET fn_8017DEC8(UNK_PARAMS); +/* 17DF28 */ UNK_RET fn_8017DF28(UNK_PARAMS); +/* 17DF90 */ UNK_RET fn_8017DF90(UNK_PARAMS); +/* 17DFF4 */ UNK_RET gm_8017DFF4(UNK_PARAMS); /* 17E068 */ bool gm_8017E068(void); +/* 17E0E4 */ UNK_RET fn_8017E0E4(UNK_PARAMS); +/* 17E160 */ UNK_RET fn_8017E160(UNK_PARAMS); +/* 17E21C */ UNK_RET fn_8017E21C(UNK_PARAMS); /* 17E280 */ UNK_T gm_8017E280(u16, M2C_UNK); +/* 17E318 */ UNK_RET fn_8017E318(UNK_PARAMS); +/* 17E3C8 */ UNK_RET fn_8017E3C8(UNK_PARAMS); +/* 17E424 */ UNK_RET gm_8017E424(UNK_PARAMS); +/* 17E430 */ UNK_RET gm_8017E430(UNK_PARAMS); +/* 17E440 */ UNK_RET gm_8017E440(UNK_PARAMS); +/* 17E48C */ UNK_RET gm_8017E48C(UNK_PARAMS); +/* 17E4C4 */ UNK_RET gm_8017E4C4(UNK_PARAMS); +/* 17E500 */ UNK_RET gm_8017E500(UNK_PARAMS); +/* 17E528 */ UNK_RET gm_8017E528(UNK_PARAMS); +/* 17E578 */ UNK_RET gm_8017E578(UNK_PARAMS); +/* 17E5C8 */ UNK_RET gm_8017E5C8(UNK_PARAMS); +/* 17E5FC */ UNK_RET gm_8017E5FC(UNK_PARAMS); +/* 17E630 */ UNK_RET gm_8017E630(UNK_PARAMS); +/* 17E664 */ UNK_RET gm_8017E664(UNK_PARAMS); +/* 17E6B4 */ UNK_RET gm_8017E6B4(UNK_PARAMS); +/* 17E704 */ UNK_RET gm_8017E704(UNK_PARAMS); +/* 17E738 */ UNK_RET gm_8017E738(UNK_PARAMS); +/* 17E76C */ UNK_RET gm_8017E76C(UNK_PARAMS); +/* 17E7A0 */ UNK_RET gm_8017E7A0(UNK_PARAMS); +/* 17E7E0 */ UNK_RET gm_8017E7E0(UNK_PARAMS); +/* 17E7FC */ UNK_RET gm_8017E7FC(UNK_PARAMS); +/* 17E8A4 */ UNK_RET fn_8017E8A4(UNK_PARAMS); +/* 17EB30 */ UNK_RET gm_8017EB30(UNK_PARAMS); +/* 17EB3C */ UNK_RET gm_8017EB3C(UNK_PARAMS); +/* 17EB64 */ UNK_RET gm_8017EB64(UNK_PARAMS); +/* 17EB98 */ UNK_RET gm_8017EB98(UNK_PARAMS); +/* 17EBCC */ UNK_RET gm_8017EBCC(UNK_PARAMS); +/* 17EC00 */ UNK_RET gm_8017EC00(UNK_PARAMS); +/* 17EC50 */ UNK_RET gm_8017EC50(UNK_PARAMS); +/* 17ECA0 */ UNK_RET gm_8017ECA0(UNK_PARAMS); +/* 17ECD4 */ UNK_RET gm_8017ECD4(UNK_PARAMS); +/* 17ED08 */ UNK_RET gm_8017ED08(UNK_PARAMS); +/* 17ED3C */ UNK_RET gm_8017ED3C(UNK_PARAMS); +/* 17ED8C */ UNK_RET gm_8017ED8C(UNK_PARAMS); +/* 17EDDC */ UNK_RET fn_8017EDDC(UNK_PARAMS); +/* 17EE40 */ UNK_RET fn_8017EE40(UNK_PARAMS); +/* 17F008 */ UNK_RET fn_8017F008(UNK_PARAMS); +/* 17F09C */ UNK_RET fn_8017F09C(UNK_PARAMS); +/* 17F14C */ UNK_RET fn_8017F14C(UNK_PARAMS); +/* 17F1B8 */ UNK_RET fn_8017F1B8(UNK_PARAMS); +/* 17F294 */ UNK_RET fn_8017F294(UNK_PARAMS); +/* 17F2A4 */ UNK_RET fn_8017F2A4(UNK_PARAMS); +/* 17F47C */ UNK_RET fn_8017F47C(UNK_PARAMS); +/* 17F608 */ UNK_RET fn_8017F608(UNK_PARAMS); +/* 17FA1C */ UNK_RET fn_8017FA1C(UNK_PARAMS); +/* 17FBA4 */ UNK_RET fn_8017FBA4(UNK_PARAMS); +/* 17FE54 */ UNK_RET fn_8017FE54(UNK_PARAMS); +/* 17FF1C */ UNK_RET fn_8017FF1C(UNK_PARAMS); +/* 1803FC */ UNK_RET fn_801803FC(UNK_PARAMS); +/* 180630 */ UNK_RET fn_80180630(UNK_PARAMS); +/* 180AC0 */ UNK_RET fn_80180AC0(UNK_PARAMS); +/* 180AE4 */ UNK_RET gm_80180AE4(UNK_PARAMS); +/* 180AF4 */ UNK_RET gm_80180AF4(UNK_PARAMS); +/* 180B18 */ UNK_RET gm_80180B18(UNK_PARAMS); +/* 180BA0 */ UNK_RET gm_80180BA0(UNK_PARAMS); +/* 180C14 */ UNK_RET fn_80180C14(UNK_PARAMS); +/* 180C60 */ UNK_RET fn_80180C60(UNK_PARAMS); +/* 181598 */ UNK_RET fn_80181598(UNK_PARAMS); +/* 181708 */ UNK_RET fn_80181708(UNK_PARAMS); +/* 181998 */ UNK_RET gm_80181998(UNK_PARAMS); +/* 181A00 */ UNK_RET gm_80181A00(UNK_PARAMS); +/* 181A14 */ UNK_RET gm_80181A14(UNK_PARAMS); +/* 181A24 */ UNK_RET gm_80181A24(UNK_PARAMS); +/* 181A34 */ UNK_RET gm_80181A34(UNK_PARAMS); +/* 181A44 */ UNK_RET gm_80181A44(UNK_PARAMS); +/* 181AC8 */ UNK_RET gm_80181AC8(UNK_PARAMS); +/* 181B64 */ UNK_RET gm_80181B64(UNK_PARAMS); +/* 181BFC */ UNK_RET fn_80181BFC(UNK_PARAMS); +/* 181C80 */ UNK_RET fn_80181C80(UNK_PARAMS); +/* 181E18 */ UNK_RET fn_80181E18(UNK_PARAMS); +/* 182174 */ UNK_RET gm_80182174(UNK_PARAMS); +/* 182510 */ UNK_RET gm_80182510(UNK_PARAMS); +/* 182554 */ UNK_RET gm_80182554(UNK_PARAMS); +/* 182578 */ UNK_RET gm_80182578(UNK_PARAMS); +/* 182B5C */ UNK_RET fn_80182B5C(UNK_PARAMS); +/* 182DF0 */ UNK_RET gm_80182DF0(UNK_PARAMS); +/* 182F40 */ UNK_RET fn_80182F40(UNK_PARAMS); +/* 183218 */ UNK_RET gm_80183218(UNK_PARAMS); +/* 18325C */ UNK_RET fn_8018325C(UNK_PARAMS); +/* 184138 */ UNK_RET fn_80184138(UNK_PARAMS); +/* 1849E0 */ UNK_RET fn_801849E0(UNK_PARAMS); +/* 184A04 */ UNK_RET fn_80184A04(UNK_PARAMS); +/* 184A28 */ UNK_RET fn_80184A28(UNK_PARAMS); +/* 184A4C */ UNK_RET fn_80184A4C(UNK_PARAMS); +/* 184A70 */ UNK_RET fn_80184A70(UNK_PARAMS); +/* 184A94 */ UNK_RET fn_80184A94(UNK_PARAMS); +/* 184AB8 */ UNK_RET fn_80184AB8(UNK_PARAMS); +/* 18504C */ UNK_RET fn_8018504C(UNK_PARAMS); +/* 1851C0 */ UNK_RET fn_801851C0(UNK_PARAMS); +/* 1852FC */ UNK_RET fn_801852FC(UNK_PARAMS); +/* 185408 */ UNK_RET fn_80185408(UNK_PARAMS); +/* 1855BC */ UNK_RET fn_801855BC(UNK_PARAMS); +/* 18564C */ UNK_RET fn_8018564C(UNK_PARAMS); +/* 18569C */ UNK_RET fn_8018569C(UNK_PARAMS); +/* 18575C */ UNK_RET fn_8018575C(UNK_PARAMS); +/* 1857C4 */ UNK_RET fn_801857C4(UNK_PARAMS); +/* 1859C8 */ UNK_RET fn_801859C8(UNK_PARAMS); +/* 185A0C */ UNK_RET fn_80185A0C(UNK_PARAMS); +/* 185D64 */ UNK_RET fn_80185D64(UNK_PARAMS); +/* 185E34 */ UNK_RET fn_80185E34(UNK_PARAMS); +/* 185F5C */ UNK_RET fn_80185F5C(UNK_PARAMS); +/* 186080 */ UNK_RET fn_80186080(UNK_PARAMS); +/* 1861B8 */ UNK_RET fn_801861B8(UNK_PARAMS); +/* 186400 */ UNK_RET fn_80186400(UNK_PARAMS); +/* 186634 */ UNK_RET fn_80186634(UNK_PARAMS); +/* 186DFC */ UNK_RET gm_80186DFC(UNK_PARAMS); +/* 186E30 */ UNK_RET gm_80186E30(UNK_PARAMS); +/* 186EFC */ UNK_RET fn_80186EFC(UNK_PARAMS); +/* 186F6C */ UNK_RET fn_80186F6C(UNK_PARAMS); +/* 1873F0 */ UNK_RET fn_801873F0(UNK_PARAMS); +/* 187494 */ UNK_RET fn_80187494(UNK_PARAMS); +/* 1874FC */ UNK_RET fn_801874FC(UNK_PARAMS); +/* 187714 */ UNK_RET fn_80187714(UNK_PARAMS); +/* 18776C */ UNK_RET gm_8018776C(UNK_PARAMS); +/* 1877A8 */ UNK_RET gm_801877A8(UNK_PARAMS); +/* 187910 */ UNK_RET fn_80187910(UNK_PARAMS); +/* 187AB4 */ UNK_RET fn_80187AB4(UNK_PARAMS); +/* 187C9C */ UNK_RET fn_80187C9C(UNK_PARAMS); +/* 187CF4 */ UNK_RET fn_80187CF4(UNK_PARAMS); +/* 187F48 */ UNK_RET gm_80187F48(UNK_PARAMS); +/* 188364 */ UNK_RET gm_80188364(UNK_PARAMS); +/* 18838C */ UNK_RET gm_8018838C(UNK_PARAMS); +/* 1883C0 */ UNK_RET gm_801883C0(UNK_PARAMS); /* 18841C */ bool gm_8018841C(void); +/* 188454 */ UNK_RET gm_80188454(UNK_PARAMS); +/* 18846C */ UNK_RET fn_8018846C(UNK_PARAMS); +/* 1884F8 */ UNK_RET fn_801884F8(UNK_PARAMS); +/* 188550 */ UNK_RET fn_80188550(UNK_PARAMS); +/* 188644 */ UNK_RET fn_80188644(UNK_PARAMS); +/* 188738 */ UNK_RET fn_80188738(UNK_PARAMS); +/* 188910 */ UNK_RET fn_80188910(UNK_PARAMS); +/* 188B3C */ UNK_RET fn_80188B3C(UNK_PARAMS); +/* 188D3C */ UNK_RET fn_80188D3C(UNK_PARAMS); +/* 188EE8 */ UNK_RET fn_80188EE8(UNK_PARAMS); +/* 1891F4 */ UNK_RET fn_801891F4(UNK_PARAMS); +/* 189B88 */ UNK_RET fn_80189B88(UNK_PARAMS); +/* 189CDC */ UNK_RET gm_80189CDC(UNK_PARAMS); +/* 18A000 */ UNK_RET fn_8018A000(UNK_PARAMS); +/* 18A160 */ UNK_RET gm_8018A160(UNK_PARAMS); +/* 18A188 */ UNK_RET gm_8018A188(UNK_PARAMS); +/* 18A1D8 */ UNK_RET gm_8018A1D8(UNK_PARAMS); +/* 18A228 */ UNK_RET gm_8018A228(UNK_PARAMS); +/* 18A25C */ UNK_RET gm_8018A25C(UNK_PARAMS); +/* 18A290 */ UNK_RET gm_8018A290(UNK_PARAMS); +/* 18A2C4 */ UNK_RET gm_8018A2C4(UNK_PARAMS); +/* 18A314 */ UNK_RET gm_8018A314(UNK_PARAMS); +/* 18A364 */ UNK_RET fn_8018A364(UNK_PARAMS); +/* 18A514 */ UNK_RET fn_8018A514(UNK_PARAMS); +/* 18A970 */ UNK_RET fn_8018A970(UNK_PARAMS); +/* 18AA74 */ UNK_RET fn_8018AA74(UNK_PARAMS); +/* 18B090 */ UNK_RET fn_8018B090(UNK_PARAMS); +/* 18C8D4 */ UNK_RET fn_8018C8D4(UNK_PARAMS); +/* 18D50C */ UNK_RET fn_8018D50C(UNK_PARAMS); +/* 18DC18 */ UNK_RET fn_8018DC18(UNK_PARAMS); +/* 18DF68 */ UNK_RET fn_8018DF68(UNK_PARAMS); +/* 18E46C */ UNK_RET fn_8018E46C(UNK_PARAMS); +/* 18E618 */ UNK_RET fn_8018E618(UNK_PARAMS); +/* 18E85C */ UNK_RET fn_8018E85C(UNK_PARAMS); +/* 18EC48 */ UNK_RET fn_8018EC48(UNK_PARAMS); +/* 18EC7C */ UNK_RET fn_8018EC7C(UNK_PARAMS); +/* 18ECA8 */ UNK_RET fn_8018ECA8(UNK_PARAMS); +/* 18F00C */ UNK_RET fn_8018F00C(UNK_PARAMS); +/* 18F1B0 */ UNK_RET gm_8018F1B0(UNK_PARAMS); +/* 18F310 */ UNK_RET fn_8018F310(UNK_PARAMS); +/* 18F3BC */ UNK_RET fn_8018F3BC(UNK_PARAMS); +/* 18F3D0 */ UNK_RET fn_8018F3D0(UNK_PARAMS); +/* 18F410 */ UNK_RET fn_8018F410(UNK_PARAMS); +/* 18F4A0 */ UNK_RET fn_8018F4A0(UNK_PARAMS); +/* 18F508 */ UNK_RET fn_8018F508(UNK_PARAMS); +/* 18F5F0 */ UNK_RET fn_8018F5F0(UNK_PARAMS); +/* 18F62C */ s32 fn_8018F62C(UNK_T arg0); +/* 18F634 */ UNK_RET gm_8018F634(UNK_PARAMS); +/* 18F640 */ UNK_RET fn_8018F640(UNK_PARAMS); +/* 18F674 */ UNK_RET fn_8018F674(UNK_PARAMS); +/* 18F6A8 */ UNK_RET fn_8018F6A8(UNK_PARAMS); +/* 18F6DC */ UNK_RET fn_8018F6DC(UNK_PARAMS); +/* 18F6FC */ UNK_RET fn_8018F6FC(UNK_PARAMS); +/* 18F71C */ UNK_RET fn_8018F71C(UNK_PARAMS); +/* 18F74C */ UNK_RET fn_8018F74C(UNK_PARAMS); +/* 18F808 */ UNK_RET fn_8018F808(UNK_PARAMS); +/* 18F888 */ UNK_RET fn_8018F888(UNK_PARAMS); +/* 18FA24 */ UNK_RET fn_8018FA24(UNK_PARAMS); +/* 18FBD8 */ void fn_8018FBD8(UNK_T arg0, s32 arg1); +/* 18FBE0 */ UNK_RET fn_8018FBE0(UNK_PARAMS); +/* 18FDC4 */ UNK_RET fn_8018FDC4(UNK_PARAMS); +/* 18FF9C */ UNK_RET fn_8018FF9C(UNK_PARAMS); +/* 190174 */ UNK_RET fn_80190174(UNK_PARAMS); +/* 1901F8 */ UNK_RET fn_801901F8(UNK_PARAMS); +/* 19027C */ UNK_RET fn_8019027C(UNK_PARAMS); +/* 1902F0 */ UNK_RET fn_801902F0(UNK_PARAMS); +/* 19035C */ UNK_RET fn_8019035C(UNK_PARAMS); +/* 19044C */ UNK_RET fn_8019044C(UNK_PARAMS); +/* 190480 */ UNK_RET fn_80190480(UNK_PARAMS); +/* 1904D0 */ UNK_RET fn_801904D0(UNK_PARAMS); +/* 190520 */ UNK_RET fn_80190520(UNK_PARAMS); +/* 1905F0 */ UNK_RET gm_801905F0(UNK_PARAMS); +/* 190ABC */ UNK_RET fn_80190ABC(UNK_PARAMS); +/* 190EA4 */ UNK_RET gm_80190EA4(UNK_PARAMS); +/* 190FE4 */ UNK_RET gm_80190FE4(UNK_PARAMS); +/* 1910E0 */ UNK_RET fn_801910E0(UNK_PARAMS); +/* 191154 */ UNK_RET fn_80191154(UNK_PARAMS); +/* 191240 */ UNK_RET fn_80191240(UNK_PARAMS); +/* 1913BC */ UNK_RET fn_801913BC(UNK_PARAMS); +/* 191678 */ UNK_RET fn_80191678(UNK_PARAMS); +/* 19175C */ UNK_RET fn_8019175C(UNK_PARAMS); +/* 1918F0 */ UNK_RET fn_801918F0(UNK_PARAMS); +/* 191A54 */ UNK_RET fn_80191A54(UNK_PARAMS); +/* 191B5C */ UNK_RET fn_80191B5C(UNK_PARAMS); +/* 191CA4 */ UNK_RET fn_80191CA4(UNK_PARAMS); +/* 191D38 */ UNK_RET fn_80191D38(UNK_PARAMS); +/* 191E9C */ UNK_RET fn_80191E9C(UNK_PARAMS); +/* 191FD4 */ UNK_RET fn_80191FD4(UNK_PARAMS); +/* 19237C */ UNK_RET fn_8019237C(UNK_PARAMS); +/* 19249C */ UNK_RET fn_8019249C(UNK_PARAMS); +/* 192690 */ UNK_RET fn_80192690(UNK_PARAMS); +/* 192758 */ UNK_RET fn_80192758(UNK_PARAMS); +/* 192938 */ UNK_RET fn_80192938(UNK_PARAMS); +/* 192BB0 */ UNK_RET fn_80192BB0(UNK_PARAMS); +/* 192E6C */ UNK_RET fn_80192E6C(UNK_PARAMS); +/* 193230 */ UNK_RET fn_80193230(UNK_PARAMS); +/* 193308 */ UNK_RET fn_80193308(UNK_PARAMS); +/* 1935B8 */ UNK_RET fn_801935B8(UNK_PARAMS); +/* 1937C4 */ UNK_RET fn_801937C4(UNK_PARAMS); +/* 193B58 */ UNK_RET fn_80193B58(UNK_PARAMS); +/* 193FCC */ UNK_RET fn_80193FCC(UNK_PARAMS); +/* 194658 */ UNK_RET fn_80194658(UNK_PARAMS); +/* 1949B4 */ UNK_RET fn_801949B4(UNK_PARAMS); +/* 194BC4 */ UNK_RET fn_80194BC4(UNK_PARAMS); +/* 194D84 */ UNK_RET fn_80194D84(UNK_PARAMS); +/* 194F30 */ UNK_RET fn_80194F30(UNK_PARAMS); +/* 1953C8 */ UNK_RET fn_801953C8(UNK_PARAMS); +/* 195AF0 */ UNK_RET fn_80195AF0(UNK_PARAMS); +/* 195CCC */ UNK_RET fn_80195CCC(UNK_PARAMS); +/* 19610C */ UNK_RET fn_8019610C(UNK_PARAMS); +/* 19628C */ UNK_RET gm_8019628C(UNK_PARAMS); +/* 1963B4 */ UNK_RET gm_801963B4(UNK_PARAMS); +/* 1964A4 */ UNK_RET gm_801964A4(UNK_PARAMS); +/* 196510 */ UNK_RET fn_80196510(UNK_PARAMS); +/* 19655C */ s32 fn_8019655C(void); +/* 196564 */ UNK_RET fn_80196564(UNK_PARAMS); +/* 196594 */ UNK_RET fn_80196594(UNK_PARAMS); +/* 1965C4 */ UNK_RET fn_801965C4(UNK_PARAMS); +/* 196684 */ UNK_RET fn_80196684(UNK_PARAMS); +/* 1967E0 */ UNK_RET fn_801967E0(UNK_PARAMS); +/* 196CF8 */ UNK_RET fn_80196CF8(UNK_PARAMS); +/* 196DBC */ UNK_RET fn_80196DBC(UNK_PARAMS); +/* 196E30 */ UNK_RET fn_80196E30(UNK_PARAMS); +/* 196EEC */ UNK_RET fn_80196EEC(UNK_PARAMS); +/* 196FFC */ UNK_RET fn_80196FFC(UNK_PARAMS); +/* 1973F8 */ UNK_RET fn_801973F8(UNK_PARAMS); +/* 1975C8 */ UNK_RET fn_801975C8(UNK_PARAMS); +/* 1976D4 */ UNK_RET fn_801976D4(UNK_PARAMS); +/* 1977AC */ UNK_RET fn_801977AC(UNK_PARAMS); +/* 197AF0 */ UNK_RET fn_80197AF0(UNK_PARAMS); +/* 197D4C */ UNK_RET fn_80197D4C(UNK_PARAMS); +/* 197E18 */ UNK_RET fn_80197E18(UNK_PARAMS); +/* 197FD8 */ UNK_RET fn_80197FD8(UNK_PARAMS); +/* 1981A0 */ UNK_RET fn_801981A0(UNK_PARAMS); +/* 1983E4 */ UNK_RET fn_801983E4(UNK_PARAMS); +/* 198584 */ UNK_RET fn_80198584(UNK_PARAMS); +/* 1985D4 */ UNK_RET fn_801985D4(UNK_PARAMS); +/* 198824 */ UNK_RET fn_80198824(UNK_PARAMS); +/* 198BA0 */ UNK_RET fn_80198BA0(UNK_PARAMS); +/* 198C60 */ UNK_RET fn_80198C60(UNK_PARAMS); +/* 198D18 */ UNK_RET fn_80198D18(UNK_PARAMS); +/* 198EBC */ UNK_RET fn_80198EBC(UNK_PARAMS); +/* 199AF0 */ UNK_RET fn_80199AF0(UNK_PARAMS); +/* 19A158 */ UNK_RET fn_8019A158(UNK_PARAMS); +/* 19A71C */ UNK_RET fn_8019A71C(UNK_PARAMS); +/* 19A828 */ UNK_RET gm_8019A828(UNK_PARAMS); +/* 19A86C */ UNK_RET fn_8019A86C(UNK_PARAMS); +/* 19AF50 */ UNK_RET fn_8019AF50(UNK_PARAMS); +/* 19B2DC */ UNK_RET gm_8019B2DC(UNK_PARAMS); +/* 19B458 */ UNK_RET fn_8019B458(UNK_PARAMS); +/* 19B81C */ UNK_RET fn_8019B81C(UNK_PARAMS); +/* 19B860 */ UNK_RET fn_8019B860(UNK_PARAMS); +/* 19B8C4 */ UNK_RET gm_8019B8C4(UNK_PARAMS); +/* 19B9C8 */ UNK_RET gm_8019B9C8(UNK_PARAMS); +/* 19BA04 */ UNK_RET fn_8019BA04(UNK_PARAMS); +/* 19BA08 */ UNK_RET fn_8019BA08(UNK_PARAMS); +/* 19BF18 */ UNK_RET fn_8019BF18(UNK_PARAMS); +/* 19BF8C */ UNK_RET fn_8019BF8C(UNK_PARAMS); +/* 19C048 */ UNK_RET fn_8019C048(UNK_PARAMS); +/* 19C3EC */ UNK_RET fn_8019C3EC(UNK_PARAMS); +/* 19C570 */ UNK_RET fn_8019C570(UNK_PARAMS); +/* 19C6AC */ UNK_RET fn_8019C6AC(UNK_PARAMS); +/* 19C744 */ UNK_RET fn_8019C744(UNK_PARAMS); +/* 19CA38 */ UNK_RET fn_8019CA38(UNK_PARAMS); +/* 19CBFC */ UNK_RET fn_8019CBFC(UNK_PARAMS); +/* 19CC74 */ UNK_RET fn_8019CC74(UNK_PARAMS); +/* 19CDBC */ UNK_RET fn_8019CDBC(UNK_PARAMS); +/* 19CFA4 */ UNK_RET fn_8019CFA4(UNK_PARAMS); +/* 19D074 */ UNK_RET fn_8019D074(UNK_PARAMS); +/* 19D1BC */ UNK_RET fn_8019D1BC(UNK_PARAMS); +/* 19DD60 */ UNK_RET fn_8019DD60(UNK_PARAMS); +/* 19DF8C */ UNK_RET gm_8019DF8C(UNK_PARAMS); +/* 19E634 */ UNK_RET gm_8019E634(UNK_PARAMS); +/* 19ECAC */ UNK_RET gm_8019ECAC(UNK_PARAMS); +/* 19EE54 */ UNK_RET gm_8019EE54(UNK_PARAMS); +/* 19EE80 */ UNK_RET fn_8019EE80(UNK_PARAMS); +/* 19EF08 */ UNK_RET fn_8019EF08(UNK_PARAMS); +/* 19EFC4 */ UNK_RET fn_8019EFC4(UNK_PARAMS); +/* 19F1D0 */ UNK_RET fn_8019F1D0(UNK_PARAMS); +/* 19F2D4 */ UNK_RET fn_8019F2D4(UNK_PARAMS); +/* 19F6EC */ UNK_RET fn_8019F6EC(UNK_PARAMS); +/* 19F810 */ UNK_RET fn_8019F810(UNK_PARAMS); +/* 19F9C4 */ UNK_RET fn_8019F9C4(UNK_PARAMS); +/* 1A0A10 */ UNK_RET gm_801A0A10(UNK_PARAMS); +/* 1A0B18 */ UNK_RET gm_801A0B18(UNK_PARAMS); +/* 1A0B60 */ UNK_RET fn_801A0B60(UNK_PARAMS); +/* 1A0C6C */ UNK_RET gm_801A0C6C(UNK_PARAMS); +/* 1A0E0C */ UNK_RET gm_801A0E0C(UNK_PARAMS); +/* 1A0E34 */ UNK_RET fn_801A0E34(UNK_PARAMS); +/* 1A0FEC */ UNK_RET gm_801A0FEC(UNK_PARAMS); +/* 1A10FC */ UNK_RET gm_801A10FC(UNK_PARAMS); +/* 1A1134 */ UNK_RET fn_801A1134(UNK_PARAMS); /* 473A18 */ extern UNK_T gm_80473A18; #endif diff --git a/src/melee/gm/gm_1A36.c b/src/melee/gm/gm_1A36.c index 087d4167f2..5c987def0f 100644 --- a/src/melee/gm/gm_1A36.c +++ b/src/melee/gm/gm_1A36.c @@ -20,9 +20,16 @@ #include #include -/* 1A5614 */ /* static */ void gm_801A5614(void); -/* 1ACC90 */ /* static */ void gm_801ACC90(void); -/* 1BBFE4 */ /* static */ void gm_801BBFE4(void); +struct sceneData { + u32 a; + u8 scene_id; +}; + +/* 1A5614 */ static void gm_801A5614(void); +/* 1ACC90 */ static void gm_801ACC90(void); +/* 1BBFE4 */ static void gm_801BBFE4(void); + +static UNK_T gm_804D6720; typedef struct MinorScene MinorScene; @@ -229,9 +236,15 @@ void gm_801A4014(MajorScene* scene) } } -/// #gm_801A427C +s32 gm_801A427C(void* arg0) +{ + return M2C_FIELD(arg0, s32*, 0x10); +} -/// #gm_801A4284 +UNK_T gm_801A4284(UNK_T arg0) +{ + return M2C_FIELD(arg0, UNK_T*, 0x14); +} /// #gm_801A428C @@ -378,7 +391,10 @@ void gm_801A4510(void) /// #gm_801A4B74 -/// #gm_801A4B88 +void gm_801A4B88(UNK_T arg0) +{ + gm_804D6720 = arg0; +} /// #gm_801A4B90 @@ -388,7 +404,12 @@ void gm_801A4510(void) /// #gm_801A4BB8 -/// #gm_801A4BC8 +extern s32 gm_804D672C; + +s32 gm_801A4BC8(void) +{ + return gm_804D672C; +} void fn_801A4BD0(void) {} @@ -412,7 +433,12 @@ void fn_801A4BD0(void) {} /// #gm_801A5244 -/// #gm_801A5250 +extern M2C_UNK gm_804D6730; + +M2C_UNK* gm_801A5250(void) +{ + return &gm_804D6730; +} /// #gm_801A5258 @@ -1414,10 +1440,7 @@ enum { void gm_801BF9A8(void* data) { - struct { - u32 a; - u8 scene_id; - }* scene_data; + struct sceneData* scene_data; scene_data = gm_801A4284(data); diff --git a/src/melee/gm/gm_1A36.h b/src/melee/gm/gm_1A36.h index bbdcbd743e..c8cef224d8 100644 --- a/src/melee/gm/gm_1A36.h +++ b/src/melee/gm/gm_1A36.h @@ -18,7 +18,6 @@ /* 1A3F48 */ UNK_RET gm_801A3F48(UNK_PARAMS); /* 1A4014 */ UNK_RET gm_801A4014(UNK_PARAMS); /* 1A427C */ UNK_RET gm_801A427C(UNK_PARAMS); -/* 1A4284 */ UNK_RET gm_801A4284(UNK_PARAMS); /* 1A428C */ UNK_RET gm_801A428C(UNK_PARAMS); /* 1A42A0 */ UNK_RET gm_801A42A0(UNK_PARAMS); /* 1A42B4 */ UNK_RET gm_801A42B4(UNK_PARAMS); diff --git a/src/melee/gr/granime.h b/src/melee/gr/granime.h index 63b18023ad..7a0dd62ad5 100644 --- a/src/melee/gr/granime.h +++ b/src/melee/gr/granime.h @@ -4,9 +4,12 @@ #include #include +/* 1C78FC */ void grAnime_801C78FC(HSD_GObj*, s32, s32); +/* 1C7A04 */ void grAnime_801C7A04(HSD_GObj*, s32, s32, f32); /* 1C7FF8 */ void grAnime_801C7FF8(HSD_GObj*, s32, s32, s32, f32, f32); /* 1C8138 */ void grAnime_801C8138(HSD_GObj*, enum_t, bool); /* 1C83D0 */ bool grAnime_801C83D0(HSD_GObj*, bool, enum_t); +/* 1C84A4 */ bool grAnime_801C84A4(HSD_GObj*, s32, s32); /* 1C8780 */ void grAnime_801C8780(HSD_GObj*, u32, u32, f32, f32); #endif diff --git a/src/melee/gr/grbigblue.c b/src/melee/gr/grbigblue.c index c90440c98a..fb68c643db 100644 --- a/src/melee/gr/grbigblue.c +++ b/src/melee/gr/grbigblue.c @@ -1,3 +1,5 @@ +#include + void grBigBlue_801E57BC(void) {} /// #grBigBlue_801E57C0 @@ -6,13 +8,19 @@ void grBigBlue_801E59C8(void) {} /// #grBigBlue_801E59CC -/// #grBigBlue_801E59F0 +bool grBigBlue_801E59F0(void) +{ + return false; +} /// #grBigBlue_801E59F8 /// #grBigBlue_801E5AE4 -/// #grBigBlue_801E5B10 +bool grBigBlue_801E5B10(void) +{ + return false; +} void grBigBlue_801E5B18(void) {} @@ -20,7 +28,10 @@ void grBigBlue_801E5B1C(void) {} /// #grBigBlue_801E5B20 -/// #grBigBlue_801E6114 +bool grBigBlue_801E6114(void) +{ + return false; +} void grBigBlue_801E611C(void) {} @@ -30,7 +41,10 @@ void grBigBlue_801E6120(void) {} /// #grBigBlue_801E613C -/// #grBigBlue_801E61BC +bool grBigBlue_801E61BC(void) +{ + return false; +} /// #grBigBlue_801E61C4 @@ -38,7 +52,10 @@ void grBigBlue_801E61FC(void) {} /// #grBigBlue_801E6200 -/// #grBigBlue_801E6288 +bool grBigBlue_801E6288(void) +{ + return false; +} void grBigBlue_801E6290(void) {} @@ -46,7 +63,10 @@ void grBigBlue_801E6294(void) {} /// #grBigBlue_801E6298 -/// #grBigBlue_801E6354 +bool grBigBlue_801E6354(void) +{ + return false; +} void grBigBlue_801E635C(void) {} @@ -54,7 +74,10 @@ void grBigBlue_801E6360(void) {} /// #grBigBlue_801E6364 -/// #grBigBlue_801E687C +bool grBigBlue_801E687C(void) +{ + return false; +} /// #grBigBlue_801E6884 @@ -62,7 +85,10 @@ void grBigBlue_801E6360(void) {} /// #grBigBlue_801E6904 -/// #grBigBlue_801E6C58 +bool grBigBlue_801E6C58(void) +{ + return false; +} /// #grBigBlue_801E6C60 @@ -84,7 +110,10 @@ void grBigBlue_801E855C(void) {} /// #grBigBlue_801E8D64 -/// #grBigBlue_801E93D0 +bool grBigBlue_801E93D0(void) +{ + return false; +} /// #grBigBlue_801E93D8 @@ -92,7 +121,10 @@ void grBigBlue_801E9F38(void) {} /// #grBigBlue_801E9F3C -/// #grBigBlue_801EA054 +bool grBigBlue_801EA054(void) +{ + return false; +} /// #grBigBlue_801EA05C @@ -132,6 +164,9 @@ void grBigBlue_801EAB4C(void) {} /// #fn_801EFB9C -/// #grBigBlue_801EFC0C +bool grBigBlue_801EFC0C(void) +{ + return false; +} /// #grBigBlue_801EFC14 diff --git a/src/melee/gr/grbigblueroute.c b/src/melee/gr/grbigblueroute.c index 0700ebb147..1762506247 100644 --- a/src/melee/gr/grbigblueroute.c +++ b/src/melee/gr/grbigblueroute.c @@ -1,3 +1,4 @@ +#include /// #grBigBlueRoute_8020B864 @@ -7,13 +8,19 @@ /// #grBigBlueRoute_8020B95C -/// #grBigBlueRoute_8020B9CC +bool grBigBlueRoute_8020B9CC(void) +{ + return false; +} /// #grBigBlueRoute_8020B9D4 /// #grBigBlueRoute_8020BABC -/// #grBigBlueRoute_8020BB00 +bool grBigBlueRoute_8020BB00(void) +{ + return false; +} void grBigBlueRoute_8020BB08(void) {} @@ -21,7 +28,10 @@ void grBigBlueRoute_8020BB0C(void) {} /// #grBigBlueRoute_8020BB10 -/// #grBigBlueRoute_8020BB58 +bool grBigBlueRoute_8020BB58(void) +{ + return false; +} void grBigBlueRoute_8020BB60(void) {} @@ -29,7 +39,10 @@ void grBigBlueRoute_8020BB64(void) {} /// #grBigBlueRoute_8020BB68 -/// #grBigBlueRoute_8020BC24 +bool grBigBlueRoute_8020BC24(void) +{ + return false; +} void grBigBlueRoute_8020BC2C(void) {} @@ -39,7 +52,10 @@ void grBigBlueRoute_8020BC30(void) {} /// #grBigBlueRoute_8020BC68 -/// #grBigBlueRoute_8020BF30 +bool grBigBlueRoute_8020BF30(void) +{ + return false; +} /// #grBigBlueRoute_8020BF38 @@ -47,7 +63,10 @@ void grBigBlueRoute_8020C13C(void) {} /// #grBigBlueRoute_8020C140 -/// #grBigBlueRoute_8020C1D4 +bool grBigBlueRoute_8020C1D4(void) +{ + return false; +} /// #grBigBlueRoute_8020C1DC @@ -73,6 +92,9 @@ void grBigBlueRoute_8020C13C(void) {} /// #grBigBlueRoute_8020DED4 -/// #grBigBlueRoute_8020DF78 +bool grBigBlueRoute_8020DF78(void) +{ + return false; +} /// #grBigBlueRoute_8020DF80 diff --git a/src/melee/gr/grcastle.c b/src/melee/gr/grcastle.c index a28b5c69ab..d2b1989d05 100644 --- a/src/melee/gr/grcastle.c +++ b/src/melee/gr/grcastle.c @@ -14,13 +14,19 @@ void grCastle_801CD4A0(void) {} /// #grCastle_801CD4A4 -/// #grCastle_801CD4C8 +bool grCastle_801CD4C8(void) +{ + return false; +} /// #grCastle_801CD4D0 /// #grCastle_801CD5BC -/// #grCastle_801CD600 +bool grCastle_801CD600(void) +{ + return false; +} void grCastle_801CD608(void) {} @@ -30,7 +36,10 @@ void grCastle_801CD60C(void) {} /// #grCastle_801CD658 -/// #grCastle_801CD8A0 +bool grCastle_801CD8A0(void) +{ + return false; +} /// #grCastle_801CD8A8 @@ -40,7 +49,10 @@ void grCastle_801CD60C(void) {} /// #grCastle_801CDA0C -/// #grCastle_801CDC3C +bool grCastle_801CDC3C(void) +{ + return false; +} /// #grCastle_801CDC44 @@ -58,7 +70,10 @@ void grCastle_801CDF50(void) {} void fn_801CE3A0(void) {} -/// #grCastle_801CE3A4 +bool grCastle_801CE3A4(void) +{ + return false; +} /// #grCastle_801CE3AC @@ -68,7 +83,10 @@ void grCastle_801CE7E4(void) {} /// #grCastle_801CE7E8 -/// #grCastle_801CE858 +bool grCastle_801CE858(void) +{ + return false; +} /// #grCastle_801CE860 @@ -78,7 +96,10 @@ void grCastle_801CE8E4(void) {} void fn_801CE9DC(void) {} -/// #grCastle_801CE9E0 +bool grCastle_801CE9E0(void) +{ + return false; +} /// #grCastle_801CE9E8 @@ -86,7 +107,10 @@ void grCastle_801CEAC8(void) {} /// #grCastle_801CEACC -/// #grCastle_801CEEFC +bool grCastle_801CEEFC(void) +{ + return false; +} /// #grCastle_801CEF04 @@ -94,7 +118,10 @@ void grCastle_801CF0F0(void) {} /// #grCastle_801CF0F4 -/// #grCastle_801CF300 +bool grCastle_801CF300(void) +{ + return false; +} /// #grCastle_801CF308 @@ -144,7 +171,10 @@ void grCastle_801CF74C(void) {} /// #grCastle_801D0A9C -/// #grCastle_801D0B04 +bool grCastle_801D0B04(void) +{ + return false; +} bool grCastle_801D0B0C(Vec3* v, u32 arg1, HSD_JObj* jobj) { diff --git a/src/melee/gr/grcorneria.c b/src/melee/gr/grcorneria.c index a448924936..c015f86115 100644 --- a/src/melee/gr/grcorneria.c +++ b/src/melee/gr/grcorneria.c @@ -39,13 +39,19 @@ /// #grCorneria_801DD508 -/// #grCorneria_801DD52C +bool grCorneria_801DD52C(void) +{ + return false; +} /// #grCorneria_801DD534 /// #grCorneria_801DD620 -/// #grCorneria_801DD64C +bool grCorneria_801DD64C(void) +{ + return false; +} void grCorneria_801DD654(void) {} @@ -55,7 +61,10 @@ void grCorneria_801DD658(void) {} /// #grCorneria_801DD674 -/// #grCorneria_801DD9A0 +bool grCorneria_801DD9A0(void) +{ + return false; +} /// #grCorneria_801DD9A8 @@ -63,7 +72,10 @@ void grCorneria_801DDAC0(void) {} /// #grCorneria_801DDAC4 -/// #grCorneria_801DDCE8 +bool grCorneria_801DDCE8(void) +{ + return false; +} /// #grCorneria_801DDCF0 @@ -79,7 +91,10 @@ void grCorneria_801DE4BC(void) {} /// #grCorneria_801DE4C0 -/// #grCorneria_801DE560 +bool grCorneria_801DE560(void) +{ + return false; +} /// #grCorneria_801DE568 @@ -87,7 +102,10 @@ void grCorneria_801DE8E0(void) {} /// #grCorneria_801DE8E4 -/// #grCorneria_801DEC00 +bool grCorneria_801DEC00(void) +{ + return false; +} /// #grCorneria_801DEC08 @@ -99,7 +117,10 @@ void grCorneria_801DF8CC(void) {} /// #grCorneria_801DF8D0 -/// #grCorneria_801DFBC4 +bool grCorneria_801DFBC4(void) +{ + return false; +} /// #grCorneria_801DFBCC @@ -107,7 +128,10 @@ void grCorneria_801DFBEC(void) {} /// #grCorneria_801DFBF0 -/// #grCorneria_801DFC1C +bool grCorneria_801DFC1C(void) +{ + return false; +} void grCorneria_801DFC24(void) {} @@ -115,7 +139,10 @@ void grCorneria_801DFC28(void) {} /// #grCorneria_801DFC2C -/// #grCorneria_801DFC90 +bool grCorneria_801DFC90(void) +{ + return false; +} /// #grCorneria_801DFC98 @@ -123,7 +150,10 @@ void grCorneria_801DFEB4(void) {} /// #grCorneria_801DFEB8 -/// #grCorneria_801DFF18 +bool grCorneria_801DFF18(void) +{ + return false; +} /// #grCorneria_801DFF20 @@ -131,7 +161,10 @@ void grCorneria_801E013C(void) {} /// #grCorneria_801E0140 -/// #grCorneria_801E01A0 +bool grCorneria_801E01A0(void) +{ + return false; +} /// #grCorneria_801E01A8 @@ -164,7 +197,10 @@ void grCorneria_801E0C3C(HSD_GObj* gobj) gp->x11_flags.b012 = 2; } -/// #grCorneria_801E0D28 +bool grCorneria_801E0D28(void) +{ + return false; +} /// #grCorneria_801E0D30 @@ -172,7 +208,10 @@ void grCorneria_801E0DE0(void) {} /// #grCorneria_801E0DE4 -/// #grCorneria_801E0E0C +bool grCorneria_801E0E0C(void) +{ + return false; +} /// #grCorneria_801E0E14 @@ -184,7 +223,10 @@ void grCorneria_801E0F30(void) {} /// #grCorneria_801E0F34 -/// #grCorneria_801E0F64 +bool grCorneria_801E0F64(void) +{ + return false; +} /// #grCorneria_801E0F6C @@ -192,7 +234,10 @@ void grCorneria_801E0F30(void) {} void grCorneria_801E1054(void) {} -/// #grCorneria_801E1058 +bool grCorneria_801E1058(void) +{ + return false; +} /// #grCorneria_801E1060 @@ -248,7 +293,10 @@ void fn_801E12D0(void) {} /// #grCorneria_801E2EA0 -/// #grCorneria_801E2EE4 +bool grCorneria_801E2EE4(void) +{ + return false; +} bool grCorneria_801E2EEC(Vec3* v, u32 arg1, HSD_JObj* jobj) { @@ -268,14 +316,14 @@ bool grCorneria_801E2EEC(Vec3* v, u32 arg1, HSD_JObj* jobj) ((v->y - sp14.y) * ((107.0f * Ground_801C0498()) / temp_f31)) + sp14.x; if (v->x > -((107.0f * Ground_801C0498()) - temp_f31_2)) { - return 0; + return false; } } } if (v->y > sp14.y) { - return 1; + return true; } - return 0; + return false; } /// #grCorneria_801E2FCC diff --git a/src/melee/gr/grcorneria.h b/src/melee/gr/grcorneria.h index 82384c4dff..655736799d 100644 --- a/src/melee/gr/grcorneria.h +++ b/src/melee/gr/grcorneria.h @@ -5,6 +5,99 @@ #include +/* 1DCCFC */ UNK_RET grCorneria_801DCCFC(UNK_PARAMS); +/* 1DCE1C */ UNK_RET grCorneria_801DCE1C(UNK_PARAMS); +/* 1DD2C0 */ UNK_RET grCorneria_801DD2C0(UNK_PARAMS); +/* 1DD350 */ UNK_RET grCorneria_801DD350(UNK_PARAMS); +/* 1DD478 */ UNK_RET grCorneria_801DD478(UNK_PARAMS); +/* 1DD508 */ UNK_RET grCorneria_801DD508(UNK_PARAMS); +/* 1DD52C */ UNK_RET grCorneria_801DD52C(UNK_PARAMS); +/* 1DD534 */ UNK_RET grCorneria_801DD534(UNK_PARAMS); +/* 1DD620 */ UNK_RET grCorneria_801DD620(UNK_PARAMS); +/* 1DD64C */ UNK_RET grCorneria_801DD64C(UNK_PARAMS); +/* 1DD654 */ UNK_RET grCorneria_801DD654(UNK_PARAMS); +/* 1DD658 */ UNK_RET grCorneria_801DD658(UNK_PARAMS); +/* 1DD65C */ UNK_RET fn_801DD65C(UNK_PARAMS); +/* 1DD674 */ UNK_RET grCorneria_801DD674(UNK_PARAMS); +/* 1DD9A0 */ UNK_RET grCorneria_801DD9A0(UNK_PARAMS); +/* 1DD9A8 */ UNK_RET grCorneria_801DD9A8(UNK_PARAMS); +/* 1DDAC0 */ UNK_RET grCorneria_801DDAC0(UNK_PARAMS); +/* 1DDAC4 */ UNK_RET grCorneria_801DDAC4(UNK_PARAMS); +/* 1DDCE8 */ UNK_RET grCorneria_801DDCE8(UNK_PARAMS); +/* 1DDCF0 */ UNK_RET grCorneria_801DDCF0(UNK_PARAMS); +/* 1DDD4C */ UNK_RET grCorneria_801DDD4C(UNK_PARAMS); +/* 1DDDA8 */ UNK_RET grCorneria_801DDDA8(UNK_PARAMS); +/* 1DDE88 */ UNK_RET grCorneria_801DDE88(UNK_PARAMS); +/* 1DE024 */ UNK_RET grCorneria_801DE024(UNK_PARAMS); +/* 1DE4BC */ UNK_RET grCorneria_801DE4BC(UNK_PARAMS); +/* 1DE4C0 */ UNK_RET grCorneria_801DE4C0(UNK_PARAMS); +/* 1DE560 */ UNK_RET grCorneria_801DE560(UNK_PARAMS); +/* 1DE568 */ UNK_RET grCorneria_801DE568(UNK_PARAMS); +/* 1DE8E0 */ UNK_RET grCorneria_801DE8E0(UNK_PARAMS); +/* 1DE8E4 */ UNK_RET grCorneria_801DE8E4(UNK_PARAMS); +/* 1DEC00 */ UNK_RET grCorneria_801DEC00(UNK_PARAMS); +/* 1DEC08 */ UNK_RET grCorneria_801DEC08(UNK_PARAMS); +/* 1DEC94 */ UNK_RET grCorneria_801DEC94(UNK_PARAMS); +/* 1DED50 */ UNK_RET grCorneria_801DED50(UNK_PARAMS); +/* 1DF8CC */ UNK_RET grCorneria_801DF8CC(UNK_PARAMS); +/* 1DF8D0 */ UNK_RET grCorneria_801DF8D0(UNK_PARAMS); +/* 1DFBC4 */ UNK_RET grCorneria_801DFBC4(UNK_PARAMS); +/* 1DFBCC */ UNK_RET grCorneria_801DFBCC(UNK_PARAMS); +/* 1DFBEC */ UNK_RET grCorneria_801DFBEC(UNK_PARAMS); +/* 1DFBF0 */ UNK_RET grCorneria_801DFBF0(UNK_PARAMS); +/* 1DFC1C */ UNK_RET grCorneria_801DFC1C(UNK_PARAMS); +/* 1DFC24 */ UNK_RET grCorneria_801DFC24(UNK_PARAMS); +/* 1DFC28 */ UNK_RET grCorneria_801DFC28(UNK_PARAMS); +/* 1DFC2C */ UNK_RET grCorneria_801DFC2C(UNK_PARAMS); +/* 1DFC90 */ UNK_RET grCorneria_801DFC90(UNK_PARAMS); +/* 1DFC98 */ UNK_RET grCorneria_801DFC98(UNK_PARAMS); +/* 1DFEB4 */ UNK_RET grCorneria_801DFEB4(UNK_PARAMS); +/* 1DFEB8 */ UNK_RET grCorneria_801DFEB8(UNK_PARAMS); +/* 1DFF18 */ UNK_RET grCorneria_801DFF18(UNK_PARAMS); +/* 1DFF20 */ UNK_RET grCorneria_801DFF20(UNK_PARAMS); +/* 1E013C */ UNK_RET grCorneria_801E013C(UNK_PARAMS); +/* 1E0140 */ UNK_RET grCorneria_801E0140(UNK_PARAMS); +/* 1E01A0 */ UNK_RET grCorneria_801E01A0(UNK_PARAMS); +/* 1E01A8 */ UNK_RET grCorneria_801E01A8(UNK_PARAMS); +/* 1E03C4 */ UNK_RET grCorneria_801E03C4(UNK_PARAMS); +/* 1E03C8 */ UNK_RET grCorneria_801E03C8(UNK_PARAMS); +/* 1E0678 */ UNK_RET grCorneria_801E0678(UNK_PARAMS); +/* 1E08CC */ UNK_RET grCorneria_801E08CC(UNK_PARAMS); +/* 1E0A74 */ UNK_RET grCorneria_801E0A74(UNK_PARAMS); +/* 1E0C3C */ UNK_RET grCorneria_801E0C3C(UNK_PARAMS); +/* 1E0D28 */ UNK_RET grCorneria_801E0D28(UNK_PARAMS); +/* 1E0D30 */ UNK_RET grCorneria_801E0D30(UNK_PARAMS); +/* 1E0DE0 */ UNK_RET grCorneria_801E0DE0(UNK_PARAMS); +/* 1E0DE4 */ UNK_RET grCorneria_801E0DE4(UNK_PARAMS); +/* 1E0E0C */ UNK_RET grCorneria_801E0E0C(UNK_PARAMS); +/* 1E0E14 */ UNK_RET grCorneria_801E0E14(UNK_PARAMS); +/* 1E0E3C */ UNK_RET grCorneria_801E0E3C(UNK_PARAMS); +/* 1E0E40 */ UNK_RET grCorneria_801E0E40(UNK_PARAMS); +/* 1E0F30 */ UNK_RET grCorneria_801E0F30(UNK_PARAMS); +/* 1E0F34 */ UNK_RET grCorneria_801E0F34(UNK_PARAMS); +/* 1E0F64 */ UNK_RET grCorneria_801E0F64(UNK_PARAMS); +/* 1E0F6C */ UNK_RET grCorneria_801E0F6C(UNK_PARAMS); +/* 1E1030 */ UNK_RET grCorneria_801E1030(UNK_PARAMS); +/* 1E1054 */ UNK_RET grCorneria_801E1054(UNK_PARAMS); +/* 1E1058 */ UNK_RET grCorneria_801E1058(UNK_PARAMS); +/* 1E1060 */ UNK_RET grCorneria_801E1060(UNK_PARAMS); +/* 1E12CC */ UNK_RET grCorneria_801E12CC(UNK_PARAMS); +/* 1E12D0 */ UNK_RET fn_801E12D0(UNK_PARAMS); +/* 1E12D4 */ UNK_RET fn_801E12D4(UNK_PARAMS); +/* 1E1348 */ UNK_RET grCorneria_801E1348(UNK_PARAMS); +/* 1E1878 */ UNK_RET grCorneria_801E1878(UNK_PARAMS); +/* 1E1970 */ UNK_RET grCorneria_801E1970(UNK_PARAMS); +/* 1E1BF0 */ UNK_RET grCorneria_801E1BF0(UNK_PARAMS); +/* 1E2110 */ UNK_RET grCorneria_801E2110(UNK_PARAMS); +/* 1E2228 */ UNK_RET grCorneria_801E2228(UNK_PARAMS); +/* 1E2454 */ UNK_RET fn_801E2454(UNK_PARAMS); +/* 1E2480 */ UNK_RET fn_801E2480(UNK_PARAMS); +/* 1E24AC */ UNK_RET fn_801E24AC(UNK_PARAMS); +/* 1E2550 */ UNK_RET grCorneria_801E2550(UNK_PARAMS); +/* 1E2598 */ UNK_RET grCorneria_801E2598(UNK_PARAMS); +/* 1E25C4 */ UNK_RET grCorneria_801E25C4(UNK_PARAMS); +/* 1E2738 */ UNK_RET grCorneria_801E2738(UNK_PARAMS); +/* 1E277C */ UNK_RET grCorneria_801E277C(UNK_PARAMS); /* 1E2A6C */ void grCorneria_801E2A6C(void); /* 1E2AF4 */ void grCorneria_801E2AF4(void); /* 1E2B80 */ s32 grCorneria_801E2B80(void); @@ -13,5 +106,9 @@ /* 1E2D14 */ bool grCorneria_801E2D14(void); /* 1E2D90 */ bool grCorneria_801E2D90(enum_t); /* 1E2E50 */ UNK_RET grCorneria_801E2E50(UNK_PARAMS); +/* 1E2EA0 */ UNK_RET grCorneria_801E2EA0(UNK_PARAMS); +/* 1E2EE4 */ UNK_RET grCorneria_801E2EE4(UNK_PARAMS); +/* 1E2EEC */ UNK_RET grCorneria_801E2EEC(UNK_PARAMS); +/* 1E2FCC */ UNK_RET grCorneria_801E2FCC(UNK_PARAMS); #endif diff --git a/src/melee/gr/grdynamicattr.c b/src/melee/gr/grdynamicattr.c index cb0c3e4f8b..7dc9ed2b03 100644 --- a/src/melee/gr/grdynamicattr.c +++ b/src/melee/gr/grdynamicattr.c @@ -2,6 +2,7 @@ #include "gr/grdynamicattr.h" +#include "gr/types.h" #include "mp/mplib.h" #include diff --git a/src/melee/gr/grfigureget.c b/src/melee/gr/grfigureget.c index b0d6e46819..66f056e446 100644 --- a/src/melee/gr/grfigureget.c +++ b/src/melee/gr/grfigureget.c @@ -28,7 +28,7 @@ /* 219898 */ static void grFigureGet_80219898(HSD_GObj*); /* 219B0C */ static void grFigureGet_80219B0C(HSD_GObj*); /* 219C88 */ static DynamicsDesc* grFigureGet_80219C88(enum_t); -/* 219C90 */ static int grFigureGet_80219C90(Vec3*, int, HSD_JObj*); +/* 219C90 */ static bool grFigureGet_80219C90(Vec3*, int, HSD_JObj*); static StageCallbacks grFigureGet_803E7D00[2] = { { grFigureGet_802196B4, grFigureGet_802196E0, grFigureGet_802196E8, @@ -128,7 +128,10 @@ static void grFigureGet_802196EC(HSD_GObj* gobj) {} /// #grFigureGet_802196F0 -/// #grFigureGet_80219890 +bool grFigureGet_80219890(HSD_GObj* gobj) +{ + return false; +} /// #grFigureGet_80219898 @@ -140,6 +143,12 @@ void grFigureGet_80219B0C(HSD_GObj* gobj) {} /// #grFigureGet_80219C50 -/// #grFigureGet_80219C88 +DynamicsDesc* grFigureGet_80219C88(enum_t arg0) +{ + return NULL; +} -/// #grFigureGet_80219C90 +bool grFigureGet_80219C90(Vec3* arg0, int arg1, HSD_JObj* arg2) +{ + return true; +} diff --git a/src/melee/gr/grfigureget.h b/src/melee/gr/grfigureget.h index e6fab89ee2..ec429a0921 100644 --- a/src/melee/gr/grfigureget.h +++ b/src/melee/gr/grfigureget.h @@ -16,12 +16,10 @@ /* 2196E8 */ UNK_RET grFigureGet_802196E8(UNK_PARAMS); /* 2196EC */ UNK_RET grFigureGet_802196EC(UNK_PARAMS); /* 2196F0 */ UNK_RET grFigureGet_802196F0(UNK_PARAMS); -/* 219890 */ UNK_RET grFigureGet_80219890(UNK_PARAMS); /* 219898 */ UNK_RET grFigureGet_80219898(UNK_PARAMS); /* 219B10 */ UNK_RET fn_80219B10(UNK_PARAMS); /* 219C34 */ UNK_T grFigureGet_80219C34(s32); /* 219C50 */ int grFigureGet_80219C50(s32); -/* 219C88 */ UNK_RET grFigureGet_80219C88(UNK_PARAMS); /* 219C90 */ UNK_RET grFigureGet_80219C90(UNK_PARAMS); #endif diff --git a/src/melee/gr/grfourside.c b/src/melee/gr/grfourside.c index 8229a8a6af..f31b763582 100644 --- a/src/melee/gr/grfourside.c +++ b/src/melee/gr/grfourside.c @@ -1,3 +1,4 @@ +#include void grFourside_801F2D0C(void) {} @@ -7,13 +8,19 @@ void grFourside_801F2DA0(void) {} /// #grFourside_801F2DA4 -/// #grFourside_801F2DC8 +bool grFourside_801F2DC8(void) +{ + return false; +} /// #grFourside_801F2DD0 /// #grFourside_801F2EBC -/// #grFourside_801F2EE8 +bool grFourside_801F2EE8(void) +{ + return false; +} void grFourside_801F2EF0(void) {} @@ -21,7 +28,10 @@ void grFourside_801F2EF4(void) {} /// #grFourside_801F2EF8 -/// #grFourside_801F2F24 +bool grFourside_801F2F24(void) +{ + return false; +} void grFourside_801F2F2C(void) {} @@ -29,7 +39,10 @@ void grFourside_801F2F30(void) {} /// #grFourside_801F2F34 -/// #grFourside_801F3070 +bool grFourside_801F3070(void) +{ + return false; +} /// #grFourside_801F3078 @@ -39,7 +52,10 @@ void grFourside_801F309C(void) {} /// #grFourside_801F30F0 -/// #grFourside_801F3144 +bool grFourside_801F3144(void) +{ + return false; +} void grFourside_801F314C(void) {} @@ -47,7 +63,10 @@ void grFourside_801F3150(void) {} /// #grFourside_801F3154 -/// #grFourside_801F326C +bool grFourside_801F326C(void) +{ + return false; +} /// #grFourside_801F3274 @@ -55,7 +74,10 @@ void grFourside_801F37F8(void) {} /// #grFourside_801F37FC -/// #grFourside_801F388C +bool grFourside_801F388C(void) +{ + return false; +} /// #grFourside_801F3894 @@ -65,7 +87,10 @@ void grFourside_801F3B6C(void) {} /// #grFourside_801F3C40 -/// #grFourside_801F3CC0 +bool grFourside_801F3CC0(void) +{ + return false; +} /// #grFourside_801F3CC8 @@ -75,6 +100,9 @@ void grFourside_801F3F0C(void) {} /// #fn_801F3F74 -/// #grFourside_801F41E0 +bool grFourside_801F41E0(void) +{ + return false; +} /// #grFourside_801F41E8 diff --git a/src/melee/gr/grgarden.c b/src/melee/gr/grgarden.c index c98baedc03..8a000505c8 100644 --- a/src/melee/gr/grgarden.c +++ b/src/melee/gr/grgarden.c @@ -1,3 +1,4 @@ +#include void grGarden_80202B6C(void) {} @@ -7,13 +8,19 @@ void grGarden_80202B6C(void) {} /// #grGarden_80202C4C -/// #grGarden_80202C70 +bool grGarden_80202C70(void) +{ + return false; +} /// #grGarden_80202C78 /// #grGarden_80202D60 -/// #grGarden_80202D8C +bool grGarden_80202D8C(void) +{ + return false; +} void grGarden_80202D94(void) {} @@ -23,7 +30,10 @@ void grGarden_80202D98(void) {} /// #grGarden_80202DC8 -/// #grGarden_80202E40 +bool grGarden_80202E40(void) +{ + return false; +} /// #grGarden_80202E48 @@ -31,7 +41,10 @@ void grGarden_80202E68(void) {} /// #grGarden_80202E6C -/// #grGarden_80202F34 +bool grGarden_80202F34(void) +{ + return false; +} void grGarden_80202F3C(void) {} @@ -39,7 +52,10 @@ void grGarden_80202F40(void) {} /// #grGarden_80202F44 -/// #grGarden_80202F94 +bool grGarden_80202F94(void) +{ + return false; +} void grGarden_80202F9C(void) {} @@ -47,7 +63,10 @@ void grGarden_80202FA0(void) {} /// #grGarden_80202FA4 -/// #grGarden_80202FF4 +bool grGarden_80202FF4(void) +{ + return false; +} void grGarden_80202FFC(void) {} @@ -55,7 +74,10 @@ void grGarden_80203000(void) {} /// #grGarden_80203004 -/// #grGarden_80203090 +bool grGarden_80203090(void) +{ + return false; +} /// #grGarden_80203098 @@ -63,7 +85,10 @@ void grGarden_802031A0(void) {} /// #grGarden_802031A4 -/// #grGarden_80203248 +bool grGarden_80203248(void) +{ + return false; +} /// #grGarden_80203250 @@ -75,8 +100,14 @@ void fn_80203498(void) {} /// #grGarden_80203560 -/// #grGarden_802035C8 +bool grGarden_802035C8(void) +{ + return false; +} /// #grGarden_802035D0 -/// #grGarden_80203624 +f32 grGarden_80203624(void) +{ + return -20.0f; +} diff --git a/src/melee/gr/grgreatbay.c b/src/melee/gr/grgreatbay.c index cbeab1b69f..361d8573c7 100644 --- a/src/melee/gr/grgreatbay.c +++ b/src/melee/gr/grgreatbay.c @@ -1,3 +1,5 @@ +#include + void grGreatBay_801F423C(void) {} /// #grGreatBay_801F4240 @@ -6,13 +8,19 @@ void grGreatBay_801F42D0(void) {} /// #grGreatBay_801F42D4 -/// #grGreatBay_801F42F8 +bool grGreatBay_801F42F8(void) +{ + return false; +} /// #grGreatBay_801F4300 /// #grGreatBay_801F4404 -/// #grGreatBay_801F4430 +bool grGreatBay_801F4430(void) +{ + return false; +} void grGreatBay_801F4438(void) {} @@ -20,7 +28,10 @@ void grGreatBay_801F443C(void) {} /// #grGreatBay_801F4440 -/// #grGreatBay_801F44A0 +bool grGreatBay_801F44A0(void) +{ + return false; +} void grGreatBay_801F44A8(void) {} @@ -28,7 +39,10 @@ void grGreatBay_801F44AC(void) {} /// #grGreatBay_801F44B0 -/// #grGreatBay_801F4510 +bool grGreatBay_801F4510(void) +{ + return false; +} void grGreatBay_801F4518(void) {} @@ -38,7 +52,10 @@ void grGreatBay_801F451C(void) {} /// #grGreatBay_801F454C -/// #grGreatBay_801F4650 +bool grGreatBay_801F4650(void) +{ + return false; +} /// #grGreatBay_801F4658 @@ -46,7 +63,10 @@ void grGreatBay_801F4690(void) {} /// #grGreatBay_801F4694 -/// #grGreatBay_801F4994 +bool grGreatBay_801F4994(void) +{ + return false; +} /// #grGreatBay_801F499C @@ -54,7 +74,10 @@ void grGreatBay_801F545C(void) {} /// #grGreatBay_801F5460 -/// #grGreatBay_801F55F8 +bool grGreatBay_801F55F8(void) +{ + return false; +} /// #grGreatBay_801F5600 @@ -64,7 +87,10 @@ void grGreatBay_801F5988(void) {} /// #grGreatBay_801F598C -/// #grGreatBay_801F59F0 +bool grGreatBay_801F59F0(void) +{ + return false; +} void grGreatBay_801F59F8(void) {} @@ -72,7 +98,10 @@ void grGreatBay_801F59FC(void) {} /// #grGreatBay_801F5A00 -/// #grGreatBay_801F5AF0 +bool grGreatBay_801F5AF0(void) +{ + return false; +} /// #grGreatBay_801F5AF8 @@ -96,6 +125,9 @@ void grGreatBay_801F5D48(void) {} /// #grGreatBay_801F67A4 -/// #grGreatBay_801F680C +bool grGreatBay_801F680C(void) +{ + return false; +} /// #grGreatBay_801F6814 diff --git a/src/melee/gr/grgreens.c b/src/melee/gr/grgreens.c index 16f4b63ac4..376cc3b8da 100644 --- a/src/melee/gr/grgreens.c +++ b/src/melee/gr/grgreens.c @@ -1,3 +1,5 @@ +#include + /// #grGreens_80213458 /// #grGreens_80213464 @@ -6,13 +8,19 @@ void grGreens_802134F4(void) {} /// #grGreens_802134F8 -/// #grGreens_8021351C +bool grGreens_8021351C(void) +{ + return false; +} /// #grGreens_80213524 /// #grGreens_8021360C -/// #grGreens_802138AC +bool grGreens_802138AC(void) +{ + return false; +} void grGreens_802138B4(void) {} @@ -20,7 +28,10 @@ void grGreens_802138B8(void) {} /// #grGreens_802138BC -/// #grGreens_80213900 +bool grGreens_80213900(void) +{ + return false; +} void grGreens_80213908(void) {} @@ -28,7 +39,10 @@ void grGreens_8021390C(void) {} /// #grGreens_80213910 -/// #grGreens_8021393C +bool grGreens_8021393C(void) +{ + return false; +} void grGreens_80213944(void) {} @@ -36,7 +50,10 @@ void grGreens_80213948(void) {} /// #grGreens_8021394C -/// #grGreens_80213978 +bool grGreens_80213978(void) +{ + return false; +} void grGreens_80213980(void) {} @@ -44,7 +61,10 @@ void grGreens_80213984(void) {} /// #grGreens_80213988 -/// #grGreens_802139B4 +bool grGreens_802139B4(void) +{ + return false; +} void grGreens_802139BC(void) {} @@ -52,7 +72,10 @@ void grGreens_802139C0(void) {} /// #grGreens_802139C4 -/// #grGreens_80213AAC +bool grGreens_80213AAC(void) +{ + return false; +} /// #grGreens_80213AB4 @@ -66,7 +89,10 @@ void grGreens_80214654(void) {} /// #grGreens_80214674 -/// #grGreens_80214794 +bool grGreens_80214794(void) +{ + return false; +} /// #grGreens_8021479C @@ -100,6 +126,12 @@ void fn_80215D50(void) {} /// #fn_80216DE4 -/// #grGreens_80216E64 +bool grGreens_80216E64(void) +{ + return false; +} -/// #grGreens_80216E6C +bool grGreens_80216E6C(void) +{ + return true; +} diff --git a/src/melee/gr/grheal.c b/src/melee/gr/grheal.c index 3d7c03c77b..a78b7b2086 100644 --- a/src/melee/gr/grheal.c +++ b/src/melee/gr/grheal.c @@ -1,3 +1,5 @@ +#include + void grHeal_8021EF38(void) {} /// #grHeal_8021EF3C @@ -6,13 +8,19 @@ void grHeal_8021EFBC(void) {} /// #grHeal_8021EFC0 -/// #grHeal_8021EFE4 +bool grHeal_8021EFE4(void) +{ + return false; +} /// #grHeal_8021EFEC /// #grHeal_8021F0D8 -/// #grHeal_8021F170 +bool grHeal_8021F170(void) +{ + return false; +} void grHeal_8021F178(void) {} @@ -20,7 +28,10 @@ void grHeal_8021F17C(void) {} /// #grHeal_8021F180 -/// #grHeal_8021F41C +bool grHeal_8021F41C(void) +{ + return false; +} /// #fn_8021F424 @@ -34,7 +45,10 @@ void grHeal_8021F4BC(void) {} void grHeal_8021F5C8(void) {} -/// #grHeal_8021F5CC +bool grHeal_8021F5CC(void) +{ + return false; +} void grHeal_8021F5D4(void) {} @@ -42,7 +56,10 @@ void grHeal_8021F5D8(void) {} /// #grHeal_8021F5DC -/// #grHeal_8021F618 +bool grHeal_8021F618(void) +{ + return false; +} void grHeal_8021F620(void) {} @@ -52,7 +69,10 @@ void grHeal_8021F624(void) {} void grHeal_8021F6F8(void) {} -/// #grHeal_8021F6FC +bool grHeal_8021F6FC(void) +{ + return false; +} void grHeal_8021F704(void) {} @@ -62,6 +82,12 @@ void grHeal_8021F708(void) {} /// #grHeal_8021F79C -/// #grHeal_8021F830 +bool grHeal_8021F830(void) +{ + return false; +} -/// #grHeal_8021F838 +bool grHeal_8021F838(void) +{ + return true; +} diff --git a/src/melee/gr/grhomerun.c b/src/melee/gr/grhomerun.c index 6deb5582a5..74afc36281 100644 --- a/src/melee/gr/grhomerun.c +++ b/src/melee/gr/grhomerun.c @@ -1,3 +1,5 @@ +#include + void grHomeRun_8021C750(void) {} /// #grHomeRun_8021C754 @@ -6,13 +8,19 @@ void grHomeRun_8021C7FC(void) {} /// #grHomeRun_8021C800 -/// #grHomeRun_8021C824 +bool grHomeRun_8021C824(void) +{ + return false; +} /// #grHomeRun_8021C82C /// #grHomeRun_8021C914 -/// #grHomeRun_8021CB10 +bool grHomeRun_8021CB10(void) +{ + return false; +} void grHomeRun_8021CB18(void) {} @@ -20,7 +28,10 @@ void grHomeRun_8021CB1C(void) {} /// #grHomeRun_8021CB20 -/// #grHomeRun_8021D678 +bool grHomeRun_8021D678(void) +{ + return false; +} /// #grHomeRun_8021D680 @@ -28,7 +39,10 @@ void grHomeRun_8021DEB0(void) {} /// #grHomeRun_8021DEB4 -/// #grHomeRun_8021DEE0 +bool grHomeRun_8021DEE0(void) +{ + return false; +} void grHomeRun_8021DEE8(void) {} @@ -36,7 +50,10 @@ void grHomeRun_8021DEEC(void) {} /// #grHomeRun_8021DEF0 -/// #grHomeRun_8021DF48 +bool grHomeRun_8021DF48(void) +{ + return false; +} /// #grHomeRun_8021DF50 @@ -44,7 +61,10 @@ void grHomeRun_8021DEEC(void) {} /// #grHomeRun_8021E038 -/// #grHomeRun_8021E064 +bool grHomeRun_8021E064(void) +{ + return false; +} void grHomeRun_8021E06C(void) {} @@ -52,7 +72,10 @@ void grHomeRun_8021E070(void) {} /// #grHomeRun_8021E074 -/// #grHomeRun_8021E0CC +bool grHomeRun_8021E0CC(void) +{ + return false; +} /// #grHomeRun_8021E0D4 @@ -60,7 +83,10 @@ void grHomeRun_8021E070(void) {} /// #grHomeRun_8021E1BC -/// #grHomeRun_8021E1E8 +bool grHomeRun_8021E1E8(void) +{ + return false; +} void grHomeRun_8021E1F0(void) {} @@ -68,7 +94,10 @@ void grHomeRun_8021E1F4(void) {} /// #grHomeRun_8021E1F8 -/// #grHomeRun_8021E250 +bool grHomeRun_8021E250(void) +{ + return false; +} /// #grHomeRun_8021E258 @@ -76,7 +105,10 @@ void grHomeRun_8021E1F4(void) {} /// #grHomeRun_8021E340 -/// #grHomeRun_8021E36C +bool grHomeRun_8021E36C(void) +{ + return false; +} void grHomeRun_8021E374(void) {} @@ -84,7 +116,10 @@ void grHomeRun_8021E378(void) {} /// #grHomeRun_8021E37C -/// #grHomeRun_8021E3D4 +bool grHomeRun_8021E3D4(void) +{ + return false; +} /// #grHomeRun_8021E3DC @@ -92,7 +127,10 @@ void grHomeRun_8021E378(void) {} /// #grHomeRun_8021E4C4 -/// #grHomeRun_8021E4F0 +bool grHomeRun_8021E4F0(void) +{ + return false; +} void grHomeRun_8021E4F8(void) {} @@ -114,7 +152,10 @@ void grHomeRun_8021E4FC(void) {} /// #grHomeRun_8021EDD4 -/// #grHomeRun_8021EEB4 +bool grHomeRun_8021EEB4(void) +{ + return false; +} /// #grHomeRun_8021EEBC diff --git a/src/melee/gr/gricemt.c b/src/melee/gr/gricemt.c index fd0ddf9b0e..9cb7ee8815 100644 --- a/src/melee/gr/gricemt.c +++ b/src/melee/gr/gricemt.c @@ -1,3 +1,5 @@ +#include + void grIceMt_801F6868(void) {} /// #grIceMt_801F686C @@ -6,13 +8,19 @@ void grIceMt_801F6868(void) {} void grIceMt_801F71DC(void) {} -/// #grIceMt_801F71E0 +bool grIceMt_801F71E0(void) +{ + return false; +} /// #grIceMt_801F71E8 /// #grIceMt_801F72D4 -/// #grIceMt_801F75DC +bool grIceMt_801F75DC(void) +{ + return false; +} void grIceMt_801F75E4(void) {} @@ -22,7 +30,10 @@ void grIceMt_801F75E8(void) {} /// #grIceMt_801F75FC -/// #grIceMt_801F7720 +bool grIceMt_801F7720(void) +{ + return false; +} /// #grIceMt_801F7728 @@ -40,7 +51,10 @@ void grIceMt_801F7D90(void) {} /// #grIceMt_801F7D94 -/// #grIceMt_801F7EE0 +bool grIceMt_801F7EE0(void) +{ + return false; +} /// #grIceMt_801F7EE8 @@ -48,7 +62,10 @@ void grIceMt_801F7D90(void) {} /// #grIceMt_801F7F70 -/// #grIceMt_801F8154 +bool grIceMt_801F8154(void) +{ + return false; +} /// #grIceMt_801F815C @@ -56,7 +73,10 @@ void grIceMt_801F7D90(void) {} /// #grIceMt_801F8208 -/// #grIceMt_801F835C +bool grIceMt_801F835C(void) +{ + return false; +} /// #grIceMt_801F8364 @@ -64,7 +84,10 @@ void grIceMt_801F7D90(void) {} /// #grIceMt_801F83EC -/// #grIceMt_801F85BC +bool grIceMt_801F85BC(void) +{ + return false; +} /// #grIceMt_801F85C4 @@ -72,7 +95,10 @@ void grIceMt_801F7D90(void) {} /// #grIceMt_801F865C -/// #grIceMt_801F87C0 +bool grIceMt_801F87C0(void) +{ + return false; +} /// #grIceMt_801F87C8 @@ -80,7 +106,10 @@ void grIceMt_801F7D90(void) {} /// #grIceMt_801F8850 -/// #grIceMt_801F89A4 +bool grIceMt_801F89A4(void) +{ + return false; +} /// #grIceMt_801F89AC @@ -88,7 +117,10 @@ void grIceMt_801F7D90(void) {} /// #grIceMt_801F8A34 -/// #grIceMt_801F8B08 +bool grIceMt_801F8B08(void) +{ + return false; +} /// #grIceMt_801F8B10 @@ -144,6 +176,12 @@ void fn_801F91A4(void) {} /// #grIceMt_801FA854 -/// #grIceMt_801FA8F8 +bool grIceMt_801FA8F8(void) +{ + return false; +} -/// #grIceMt_801FA900 +bool grIceMt_801FA900(void) +{ + return true; +} diff --git a/src/melee/gr/grinishie1.c b/src/melee/gr/grinishie1.c index 160db03e4c..0180c63f37 100644 --- a/src/melee/gr/grinishie1.c +++ b/src/melee/gr/grinishie1.c @@ -1,3 +1,5 @@ +#include + void grInishie1_801FA908(void) {} /// #grInishie1_801FA90C @@ -6,13 +8,19 @@ void grInishie1_801FA984(void) {} /// #grInishie1_801FA988 -/// #grInishie1_801FA9AC +bool grInishie1_801FA9AC(void) +{ + return false; +} /// #grInishie1_801FA9B4 /// #grInishie1_801FAAA0 -/// #grInishie1_801FAACC +bool grInishie1_801FAACC(void) +{ + return false; +} void grInishie1_801FAAD4(void) {} @@ -20,7 +28,10 @@ void grInishie1_801FAAD8(void) {} /// #grInishie1_801FAADC -/// #grInishie1_801FAB60 +bool grInishie1_801FAB60(void) +{ + return false; +} /// #grInishie1_801FAB68 @@ -28,7 +39,10 @@ void grInishie1_801FABB0(void) {} /// #grInishie1_801FABB4 -/// #grInishie1_801FABF4 +bool grInishie1_801FABF4(void) +{ + return false; +} void grInishie1_801FABFC(void) {} @@ -36,7 +50,10 @@ void grInishie1_801FAC00(void) {} /// #grInishie1_801FAC04 -/// #grInishie1_801FAC50 +bool grInishie1_801FAC50(void) +{ + return false; +} /// #grInishie1_801FAC58 @@ -74,6 +91,12 @@ void grInishie1_801FAD80(void) {} /// #grInishie1_801FCB10 -/// #grInishie1_801FCBB0 +bool grInishie1_801FCBB0(void) +{ + return false; +} -/// #grInishie1_801FCBB8 +bool grInishie1_801FCBB8(void) +{ + return true; +} diff --git a/src/melee/gr/grinishie2.c b/src/melee/gr/grinishie2.c index 11cf39f07d..e04ed43316 100644 --- a/src/melee/gr/grinishie2.c +++ b/src/melee/gr/grinishie2.c @@ -1,3 +1,5 @@ +#include + void grInishie2_801FCBC0(void) {} /// #grInishie2_801FCBC4 @@ -6,13 +8,19 @@ void grInishie2_801FCCAC(void) {} /// #grInishie2_801FCCB0 -/// #grInishie2_801FCCD4 +bool grInishie2_801FCCD4(void) +{ + return false; +} /// #grInishie2_801FCCDC /// #grInishie2_801FCDC8 -/// #grInishie2_801FCDF4 +bool grInishie2_801FCDF4(void) +{ + return false; +} void grInishie2_801FCDFC(void) {} @@ -20,7 +28,10 @@ void grInishie2_801FCE00(void) {} /// #grInishie2_801FCE04 -/// #grInishie2_801FCF24 +bool grInishie2_801FCF24(void) +{ + return false; +} /// #grInishie2_801FCF2C @@ -34,7 +45,10 @@ void grInishie2_801FD014(void) {} /// #grInishie2_801FD198 -/// #grInishie2_801FD21C +bool grInishie2_801FD21C(void) +{ + return false; +} /// #grInishie2_801FD224 @@ -50,7 +64,10 @@ void grInishie2_801FD364(void) {} /// #grInishie2_801FD4F0 -/// #grInishie2_801FD64C +bool grInishie2_801FD64C(void) +{ + return false; +} /// #grInishie2_801FD654 @@ -66,7 +83,10 @@ void grInishie2_801FD740(void) {} /// #grInishie2_801FDE8C -/// #grInishie2_801FDED0 +bool grInishie2_801FDED0(void) +{ + return false; +} /// #grInishie2_801FDED8 @@ -74,6 +94,12 @@ void grInishie2_801FD740(void) {} void grInishie2_801FDFE4(void) {} -/// #grInishie2_801FDFE8 +bool grInishie2_801FDFE8(void) +{ + return false; +} -/// #grInishie2_801FDFF0 +bool grInishie2_801FDFF0(void) +{ + return true; +} diff --git a/src/melee/gr/grkinokoroute.c b/src/melee/gr/grkinokoroute.c index 9b1760bbec..76c5a0f0dc 100644 --- a/src/melee/gr/grkinokoroute.c +++ b/src/melee/gr/grkinokoroute.c @@ -1,3 +1,4 @@ +#include void grKinokoRoute_8020741C(void) {} @@ -7,13 +8,19 @@ void grKinokoRoute_8020741C(void) {} /// #grKinokoRoute_802074D8 -/// #grKinokoRoute_80207544 +bool grKinokoRoute_80207544(void) +{ + return false; +} /// #grKinokoRoute_8020754C /// #grKinokoRoute_80207634 -/// #grKinokoRoute_802078E8 +bool grKinokoRoute_802078E8(void) +{ + return false; +} /// #grKinokoRoute_802078F0 @@ -21,7 +28,10 @@ void grKinokoRoute_80207A94(void) {} /// #grKinokoRoute_80207A98 -/// #grKinokoRoute_80207ACC +bool grKinokoRoute_80207ACC(void) +{ + return false; +} void grKinokoRoute_80207AD4(void) {} @@ -29,7 +39,10 @@ void grKinokoRoute_80207AD8(void) {} /// #grKinokoRoute_80207ADC -/// #grKinokoRoute_80207B20 +bool grKinokoRoute_80207B20(void) +{ + return false; +} void grKinokoRoute_80207B28(void) {} @@ -39,7 +52,10 @@ void grKinokoRoute_80207B2C(void) {} /// #grKinokoRoute_80207B5C -/// #grKinokoRoute_80207C80 +bool grKinokoRoute_80207C80(void) +{ + return false; +} /// #grKinokoRoute_80207C88 @@ -57,6 +73,9 @@ void grKinokoRoute_80208368(void) {} /// #grKinokoRoute_802086EC -/// #grKinokoRoute_80208754 +bool grKinokoRoute_80208754(void) +{ + return false; +} /// #grKinokoRoute_8020875C diff --git a/src/melee/gr/grkongo.c b/src/melee/gr/grkongo.c index 143772956d..cc45fd1b11 100644 --- a/src/melee/gr/grkongo.c +++ b/src/melee/gr/grkongo.c @@ -3,19 +3,18 @@ #include "grmaterial.h" #include "types.h" -#include "ft/ftdevice.h" #include "gm/gm_1601.h" #include "gr/granime.h" #include "gr/grdisplay.h" #include "gr/ground.h" #include "gr/grzakogenerator.h" -#include "gr/inlines.h" #include "gr/stage.h" +#include "it/items/itklap.h" #include "lb/lb_00B0.h" #include "lb/lb_00F9.h" #include "mp/mplib.h" #include "MSL/math.h" -#include "MSL/math_ppc.h" +#include "MSL/math_ppc.h" // IWYU pragma: keep #include #include @@ -23,16 +22,10 @@ #include #include -void grAnime_801C78FC(HSD_GObj*, s32, s32); -bool grAnime_801C84A4(HSD_GObj*, s32, s32); -void grAnime_801C7A04(HSD_GObj*, s32, s32, f32); -void it_802E20D8(Item_GObj*); -void mpLib_800580AC(s32); /* extern */ -void mpLib_800580E0(s32); /* extern */ - -int fn_801D8134(HSD_GObj* arg0, HSD_GObj* arg1); /* static */ -void fn_801D7700(void* arg2, s32 arg4); /* static */ -void fn_801D7E60(void* arg2, s32 arg4); /* static */ +/* 1D7700 */ static void fn_801D7700(void* arg2, s32 arg4); +/* 1D7E60 */ static void fn_801D7E60(void* arg2, s32 arg4); +/* 1D8134 */ static int fn_801D8134(HSD_GObj* arg0, HSD_GObj* arg1); +/* 1D8444 */ static bool grKongo_801D8444(void); static StageCallbacks* grKg_803E16E0; @@ -84,124 +77,6 @@ static struct { extern StageInfo stage_info; -void grKongo_801D5238(void) {} -void grKongo_801D523C(void) -{ - u8* temp_r5; - - grKg_804D6980 = Ground_801C49F8(); - temp_r5 = (u8*) &stage_info.unk8C; - stage_info.unk8C.b4 = false; - stage_info.unk8C.b5 = true; - grKongo_801D5340(0); - grKongo_801D5340(10); - grKongo_801D5340(5); - grKongo_801D5340(3); - grKongo_801D5340(6); - grKongo_801D5340(4); - Ground_801C39C0(); - Ground_801C3BB4(); - mpLib_80057BC0(0); - mpLib_80057BC0(1); - if ((Stage_80225194() != 0x3D) && (gm_8016B238() == 0)) { - Ground_801C53EC(0x5A551U); - } -} - -void grKongo_801D52F8(void) {} - -void grKongo_801D52FC(void) -{ - Ground_801C2BA4(5); - // ftCo_800C0764(2, fn_801D8134); - grZakoGenerator_801CAE04(0); -} - -s32 grKongo_801D5338(void) -{ - return 0; -} - -HSD_GObj* grKongo_801D5340(s32 gobj_id) -{ - HSD_GObj* gobj; - StageCallbacks* callbacks = &grKg_803E16E0[gobj_id + 1]; - - gobj = Ground_801C14D0(gobj_id); - - if (gobj != NULL) { - Ground* gp = gobj->user_data; - gp->x8_callback = NULL; - gp->xC_callback = NULL; - GObj_SetupGXLink(gobj, grDisplay_801C5DB0, 3, 0); - if (callbacks->callback3 != NULL) { - gp->x1C_callback = callbacks->callback3; - } - // 0x80 - if (callbacks->callback0 != NULL) { - callbacks->callback0(gobj); - } - // 0x94 - if (callbacks->callback2 != NULL) { - HSD_GObjProc_8038FD54(gobj, callbacks->callback2, 4); - } - } else { - OSReport("%s:%d: couldn t get gobj(id=%d)\n", "grstory.c", 220, - gobj_id); - } - return gobj; -} - -#if 0 - ? (*temp_r12)(HSD_GObj *); - HSD_GObj *temp_r3; - HSD_GObj *temp_ret; - u32 temp_r0; - void (*temp_r4)(HSD_GObj *); - void *callbacks; - void *temp_r31; - - callbacks = &grKg_803E16E0 + (arg0 * 0x14) + 0x24; - temp_ret = Ground_801C14D0(arg0); - temp_r3 = temp_ret; - if (temp_r3 != NULL) { - temp_r31 = temp_r3->user_data; - temp_r31->unk8 = 0; - temp_r31->unkC = 0; - GObj_SetupGXLink(temp_r3, grDisplay_801C5DB0, 3U, 0U); - temp_r0 = callbacks->unkC; - if (temp_r0 != 0U) { - temp_r31->unk1C = temp_r0; - } - temp_r12 = callbacks->unk0; - if (temp_r12 != NULL) { - temp_r12(temp_r3); - } - temp_r4 = callbacks->unk8; - if (temp_r4 != NULL) { - HSD_GObjProc_8038FD54(temp_r3, temp_r4, 4U); - } - } else { - OSReport(&grKg_803E16E0 + 0x154, &grKg_803E16E0 + 0x178, 0x10E, arg0, (bitwise f32) temp_ret); - } - return temp_r3; -#endif - -void fn_801D542C(HSD_GObj*); -void mpLib_800580C8(s32, Ground*, void (*)(void*, s32)); /* extern */ - -void fn_801D542C(HSD_GObj* arg0) -{ - Ground* temp_r31; - f32 temp_f2; - - temp_r31 = arg0->user_data; - mpLib_800580C8(4, temp_r31, fn_801D7700); - temp_f2 = grKg_804D6980->unk0; - temp_r31->gv.kongo.xE4 = - (s16) (((grKg_804D6980->unk4 - temp_f2) * HSD_Randf()) + temp_f2); -} - void grKongo_801D5490(HSD_GObj* arg0) { Ground* temp_r31; @@ -1433,3 +1308,185 @@ f32 grKongo_801D8314(void) } return var_f31; } + +void grKongo_801D5238(void) {} + +void grKongo_801D523C(void) +{ + u8* temp_r5; + + grKg_804D6980 = Ground_801C49F8(); + temp_r5 = (u8*) &stage_info.unk8C; + stage_info.unk8C.b4 = false; + stage_info.unk8C.b5 = true; + grKongo_801D5340(0); + grKongo_801D5340(10); + grKongo_801D5340(5); + grKongo_801D5340(3); + grKongo_801D5340(6); + grKongo_801D5340(4); + Ground_801C39C0(); + Ground_801C3BB4(); + mpLib_80057BC0(0); + mpLib_80057BC0(1); + if ((Stage_80225194() != 0x3D) && (gm_8016B238() == 0)) { + Ground_801C53EC(0x5A551U); + } +} + +void grKongo_801D52F8(void) {} + +void grKongo_801D52FC(void) +{ + Ground_801C2BA4(5); + // ftCo_800C0764(2, fn_801D8134); + grZakoGenerator_801CAE04(0); +} + +s32 grKongo_801D5338(void) +{ + return 0; +} + +HSD_GObj* grKongo_801D5340(s32 gobj_id) +{ + HSD_GObj* gobj; + StageCallbacks* callbacks = &grKg_803E16E0[gobj_id + 1]; + + gobj = Ground_801C14D0(gobj_id); + + if (gobj != NULL) { + Ground* gp = gobj->user_data; + gp->x8_callback = NULL; + gp->xC_callback = NULL; + GObj_SetupGXLink(gobj, grDisplay_801C5DB0, 3, 0); + if (callbacks->callback3 != NULL) { + gp->x1C_callback = callbacks->callback3; + } + // 0x80 + if (callbacks->callback0 != NULL) { + callbacks->callback0(gobj); + } + // 0x94 + if (callbacks->callback2 != NULL) { + HSD_GObjProc_8038FD54(gobj, callbacks->callback2, 4); + } + } else { + OSReport("%s:%d: couldn t get gobj(id=%d)\n", "grstory.c", 220, + gobj_id); + } + return gobj; +} + +void fn_801D542C(HSD_GObj* arg0) +{ + Ground* temp_r31; + f32 temp_f2; + + temp_r31 = arg0->user_data; + mpLib_800580C8(4, temp_r31, fn_801D7700); + temp_f2 = grKg_804D6980->unk0; + temp_r31->gv.kongo.xE4 = + (s16) (((grKg_804D6980->unk4 - temp_f2) * HSD_Randf()) + temp_f2); +} + +/// #grKongo_801D5490 + +/// #grKongo_801D5574 + +/// #grKongo_801D557C + +/// #grKongo_801D55D4 + +/// #grKongo_801D55D8 + +/// #grKongo_801D5774 + +/// #grKongo_801D577C + +/// #grKongo_801D5FA4 + +/// #grKongo_801D5FA8 + +/// #grKongo_801D5FD4 + +/// #grKongo_801D5FDC + +/// #grKongo_801D5FE0 + +/// #grKongo_801D5FE4 + +/// #grKongo_801D6028 + +/// #grKongo_801D6030 + +/// #grKongo_801D6034 + +/// #grKongo_801D6038 + +/// #grKongo_801D6064 + +/// #grKongo_801D606C + +/// #grKongo_801D6070 + +/// #grKongo_801D6074 + +/// #grKongo_801D6190 + +/// #grKongo_801D6198 + +/// #grKongo_801D6378 + +/// #grKongo_801D637C + +/// #grKongo_801D64B4 + +/// #grKongo_801D64BC + +/// #grKongo_801D6518 + +/// #grKongo_801D651C + +/// #grKongo_801D6660 + +/// #grKongo_801D6668 + +/// #grKongo_801D69AC + +/// #grKongo_801D69B0 + +/// #grKongo_801D6AFC + +/// #grKongo_801D7134 + +/// #fn_801D7700 + +/// #grKongo_801D77E0 + +/// #grKongo_801D7BBC + +/// #fn_801D7E60 + +/// #grKongo_801D7E78 + +/// #grKongo_801D7F78 + +/// #grKongo_801D8058 + +/// #grKongo_801D8078 + +/// #fn_801D8134 + +/// #grKongo_801D8270 + +/// #grKongo_801D828C + +/// #grKongo_801D8314 + +bool grKongo_801D8444(void) +{ + return false; +} + +/// #grKongo_801D844C diff --git a/src/melee/gr/grkongo.h b/src/melee/gr/grkongo.h index beba2fbdb9..ca89310048 100644 --- a/src/melee/gr/grkongo.h +++ b/src/melee/gr/grkongo.h @@ -2,9 +2,10 @@ #define GALE01_1D5238 #include -#include "lb/forward.h" #include +#include + /* 1D5238 */ void grKongo_801D5238(void); /* 1D523C */ void grKongo_801D523C(void); /* 1D52F8 */ void grKongo_801D52F8(void); @@ -36,8 +37,6 @@ /* 1D6190 */ s32 grKongo_801D6190(void); /* 1D6198 */ void grKongo_801D6198(HSD_GObj*); /* 1D6378 */ void grKongo_801D6378(void); -/* 1D8270 */ void grKongo_801D8270(HSD_GObj*); -/* 1D828C */ void grKongo_801D828C(HSD_GObj*); /* 1D637C */ void grKongo_801D637C(HSD_GObj*); /* 1D64B4 */ s32 grKongo_801D64B4(void); /* 1D64BC */ void grKongo_801D64BC(HSD_GObj*); @@ -48,12 +47,16 @@ /* 1D69AC */ void grKongo_801D69AC(void); /* 1D69B0 */ void grKongo_801D69B0(HSD_GObj*); /* 1D6AFC */ void grKongo_801D6AFC(void); -/* 1D69B0 */ void grKongo_801D69B0(HSD_GObj*); /* 1D7134 */ void grKongo_801D7134(HSD_GObj*, s32); /* 1D77E0 */ void grKongo_801D77E0(HSD_GObj*, s32); /* 1D7BBC */ void grKongo_801D7BBC(HSD_GObj*); +/* 1D7E78 */ UNK_RET grKongo_801D7E78(UNK_PARAMS); /* 1D7F78 */ bool grKongo_801D7F78(HSD_GObj*); +/* 1D8058 */ UNK_RET grKongo_801D8058(UNK_PARAMS); /* 1D8078 */ HSD_GObj* grKongo_801D8078(HSD_GObj*); +/* 1D8270 */ void grKongo_801D8270(HSD_GObj*); +/* 1D828C */ void grKongo_801D828C(HSD_GObj*); /* 1D8314 */ f32 grKongo_801D8314(void); +/* 1D844C */ UNK_RET grKongo_801D844C(UNK_PARAMS); #endif diff --git a/src/melee/gr/grkraid.c b/src/melee/gr/grkraid.c index f72593ab9e..7985252a33 100644 --- a/src/melee/gr/grkraid.c +++ b/src/melee/gr/grkraid.c @@ -1,3 +1,4 @@ +#include void grKraid_801FDFF8(void) {} @@ -7,13 +8,19 @@ void grKraid_801FE094(void) {} /// #grKraid_801FE098 -/// #grKraid_801FE0BC +bool grKraid_801FE0BC(void) +{ + return false; +} /// #grKraid_801FE0C4 /// #grKraid_801FE1B0 -/// #grKraid_801FE1DC +bool grKraid_801FE1DC(void) +{ + return false; +} void grKraid_801FE1E4(void) {} @@ -21,7 +28,10 @@ void grKraid_801FE1E8(void) {} /// #grKraid_801FE1EC -/// #grKraid_801FE2C8 +bool grKraid_801FE2C8(void) +{ + return false; +} /// #grKraid_801FE2D0 @@ -29,7 +39,10 @@ void grKraid_801FE35C(void) {} /// #grKraid_801FE360 -/// #grKraid_801FE3A4 +bool grKraid_801FE3A4(void) +{ + return false; +} void grKraid_801FE3AC(void) {} @@ -37,7 +50,10 @@ void grKraid_801FE3B0(void) {} /// #grKraid_801FE3B4 -/// #grKraid_801FE438 +bool grKraid_801FE438(void) +{ + return false; +} /// #grKraid_801FE440 @@ -47,7 +63,10 @@ void grKraid_801FE6D4(void) {} /// #grKraid_801FE818 -/// #grKraid_801FE9F8 +bool grKraid_801FE9F8(void) +{ + return false; +} /// #grKraid_801FEA00 @@ -61,6 +80,12 @@ void grKraid_801FF14C(void) {} void grKraid_801FF150(void) {} -/// #grKraid_801FF154 +bool grKraid_801FF154(void) +{ + return false; +} -/// #grKraid_801FF15C +bool grKraid_801FF15C(void) +{ + return true; +} diff --git a/src/melee/gr/grlast.c b/src/melee/gr/grlast.c index 16ba033c21..997128524f 100644 --- a/src/melee/gr/grlast.c +++ b/src/melee/gr/grlast.c @@ -1,3 +1,5 @@ +#include + /// #grLast_8021A620 /// #grLast_8021A740 @@ -6,13 +8,19 @@ void grLast_8021A7C4(void) {} /// #grLast_8021A7C8 -/// #grLast_8021A7EC +bool grLast_8021A7EC(void) +{ + return false; +} /// #grLast_8021A7F4 /// #grLast_8021A8E0 -/// #grLast_8021A90C +bool grLast_8021A90C(void) +{ + return false; +} void grLast_8021A914(void) {} @@ -20,7 +28,10 @@ void grLast_8021A918(void) {} /// #grLast_8021A91C -/// #grLast_8021A960 +bool grLast_8021A960(void) +{ + return false; +} void grLast_8021A968(void) {} @@ -28,7 +39,10 @@ void grLast_8021A96C(void) {} /// #grLast_8021A970 -/// #grLast_8021A99C +bool grLast_8021A99C(void) +{ + return false; +} void grLast_8021A9A4(void) {} @@ -38,7 +52,10 @@ void grLast_8021A9A8(void) {} /// #grLast_8021A9C4 -/// #grLast_8021AAA8 +bool grLast_8021AAA8(void) +{ + return false; +} /// #grLast_8021AAB0 @@ -46,7 +63,10 @@ void grLast_8021AB30(void) {} /// #grLast_8021AB34 -/// #grLast_8021AB78 +bool grLast_8021AB78(void) +{ + return false; +} void grLast_8021AB80(void) {} @@ -54,7 +74,10 @@ void grLast_8021AB84(void) {} /// #grLast_8021AB88 -/// #grLast_8021ABCC +bool grLast_8021ABCC(void) +{ + return false; +} void grLast_8021ABD4(void) {} @@ -62,7 +85,10 @@ void grLast_8021ABD8(void) {} /// #grLast_8021ABDC -/// #grLast_8021AC20 +bool grLast_8021AC20(void) +{ + return false; +} void grLast_8021AC28(void) {} @@ -70,7 +96,10 @@ void grLast_8021AC2C(void) {} /// #grLast_8021AC30 -/// #grLast_8021ADC8 +bool grLast_8021ADC8(void) +{ + return false; +} /// #grLast_8021ADD0 @@ -78,7 +107,10 @@ void grLast_8021B23C(void) {} /// #grLast_8021B240 -/// #grLast_8021B284 +bool grLast_8021B284(void) +{ + return false; +} void grLast_8021B28C(void) {} @@ -86,7 +118,10 @@ void grLast_8021B290(void) {} /// #grLast_8021B294 -/// #grLast_8021B2D8 +bool grLast_8021B2D8(void) +{ + return false; +} void grLast_8021B2E0(void) {} @@ -106,6 +141,12 @@ void grLast_8021B2E4(void) {} /// #grLast_8021C6AC -/// #grLast_8021C740 +bool grLast_8021C740(void) +{ + return false; +} -/// #grLast_8021C748 +bool grLast_8021C748(void) +{ + return true; +} diff --git a/src/melee/gr/grmaterial.c b/src/melee/gr/grmaterial.c index 51d6442ce1..a457718efc 100644 --- a/src/melee/gr/grmaterial.c +++ b/src/melee/gr/grmaterial.c @@ -1,9 +1,10 @@ #include "lb/forward.h" #include -#include "it/it_266F.h" +#include "it/it_2725.h" #include "it/item.h" #include "it/items/it_2E6A.h" +#include "it/types.h" #include #include diff --git a/src/melee/gr/grmutecity.c b/src/melee/gr/grmutecity.c index 82d666b128..01c6545602 100644 --- a/src/melee/gr/grmutecity.c +++ b/src/melee/gr/grmutecity.c @@ -1,3 +1,4 @@ +#include void grMuteCity_801EFC68(void) {} @@ -7,13 +8,19 @@ void grMuteCity_801EFCDC(void) {} /// #grMuteCity_801EFCE0 -/// #grMuteCity_801EFD04 +bool grMuteCity_801EFD04(void) +{ + return false; +} /// #grMuteCity_801EFD0C /// #grMuteCity_801EFDF8 -/// #grMuteCity_801F0118 +bool grMuteCity_801F0118(void) +{ + return false; +} /// #grMuteCity_801F0120 @@ -21,7 +28,10 @@ void grMuteCity_801F01B0(void) {} /// #grMuteCity_801F01B4 -/// #grMuteCity_801F0288 +bool grMuteCity_801F0288(void) +{ + return false; +} /// #grMuteCity_801F0290 @@ -29,7 +39,10 @@ void grMuteCity_801F040C(void) {} /// #grMuteCity_801F0410 -/// #grMuteCity_801F043C +bool grMuteCity_801F043C(void) +{ + return false; +} void grMuteCity_801F0444(void) {} @@ -37,7 +50,10 @@ void grMuteCity_801F0448(void) {} /// #grMuteCity_801F044C -/// #grMuteCity_801F04A8 +bool grMuteCity_801F04A8(void) +{ + return false; +} void grMuteCity_801F04B0(void) {} diff --git a/src/melee/gr/groldkongo.c b/src/melee/gr/groldkongo.c index 6e57ecf2c2..954763c2ef 100644 --- a/src/melee/gr/groldkongo.c +++ b/src/melee/gr/groldkongo.c @@ -1,3 +1,5 @@ +#include + void grOldKongo_8020F468(void) {} /// #grOldKongo_8020F46C @@ -6,13 +8,19 @@ void grOldKongo_8020F4E4(void) {} /// #grOldKongo_8020F4E8 -/// #grOldKongo_8020F524 +bool grOldKongo_8020F524(void) +{ + return false; +} /// #grOldKongo_8020F52C /// #grOldKongo_8020F618 -/// #grOldKongo_8020F644 +bool grOldKongo_8020F644(void) +{ + return false; +} void grOldKongo_8020F64C(void) {} @@ -20,7 +28,10 @@ void grOldKongo_8020F650(void) {} /// #grOldKongo_8020F654 -/// #grOldKongo_8020F6B4 +bool grOldKongo_8020F6B4(void) +{ + return false; +} /// #grOldKongo_8020F6BC @@ -28,7 +39,10 @@ void grOldKongo_8020F6E0(void) {} /// #grOldKongo_8020F6E4 -/// #grOldKongo_8020F880 +bool grOldKongo_8020F880(void) +{ + return false; +} /// #grOldKongo_8020F888 @@ -36,7 +50,10 @@ void grOldKongo_80210058(void) {} /// #grOldKongo_8021005C -/// #grOldKongo_802100F4 +bool grOldKongo_802100F4(void) +{ + return false; +} /// #grOldKongo_802100FC @@ -50,6 +67,9 @@ void grOldKongo_80210450(void) {} /// #grOldKongo_80210650 -/// #grOldKongo_80210780 +bool grOldKongo_80210780(void) +{ + return false; +} /// #grOldKongo_80210788 diff --git a/src/melee/gr/groldpupupu.c b/src/melee/gr/groldpupupu.c index c454eb6b69..59c2d4ec8f 100644 --- a/src/melee/gr/groldpupupu.c +++ b/src/melee/gr/groldpupupu.c @@ -1,3 +1,5 @@ +#include + void grOldPupupu_802107DC(void) {} /// #grOldPupupu_802107E0 @@ -6,13 +8,19 @@ void grOldPupupu_80210884(void) {} /// #grOldPupupu_80210888 -/// #grOldPupupu_802108AC +bool grOldPupupu_802108AC(void) +{ + return false; +} /// #grOldPupupu_802108B4 /// #grOldPupupu_8021099C -/// #grOldPupupu_802109C8 +bool grOldPupupu_802109C8(void) +{ + return false; +} void grOldPupupu_802109D0(void) {} @@ -20,7 +28,10 @@ void grOldPupupu_802109D4(void) {} /// #grOldPupupu_802109D8 -/// #grOldPupupu_80210A1C +bool grOldPupupu_80210A1C(void) +{ + return false; +} /// #grOldPupupu_80210A24 @@ -28,7 +39,10 @@ void grOldPupupu_80210B00(void) {} /// #grOldPupupu_80210B04 -/// #grOldPupupu_80210B48 +bool grOldPupupu_80210B48(void) +{ + return false; +} void grOldPupupu_80210B50(void) {} @@ -36,7 +50,10 @@ void grOldPupupu_80210B54(void) {} /// #grOldPupupu_80210B58 -/// #grOldPupupu_80210BB8 +bool grOldPupupu_80210BB8(void) +{ + return false; +} /// #grOldPupupu_80210BC0 @@ -44,7 +61,10 @@ void grOldPupupu_80210BE0(void) {} /// #grOldPupupu_80210BE4 -/// #grOldPupupu_80210C2C +bool grOldPupupu_80210C2C(void) +{ + return false; +} /// #grOldPupupu_80210C34 @@ -52,7 +72,10 @@ void grOldPupupu_80210C78(void) {} /// #grOldPupupu_80210C7C -/// #grOldPupupu_80210D08 +bool grOldPupupu_80210D08(void) +{ + return false; +} /// #grOldPupupu_80210D10 @@ -60,7 +83,10 @@ void grOldPupupu_8021110C(void) {} /// #grOldPupupu_80211110 -/// #grOldPupupu_8021118C +bool grOldPupupu_8021118C(void) +{ + return false; +} void grOldPupupu_80211194(void) {} @@ -68,7 +94,10 @@ void grOldPupupu_80211198(void) {} /// #grOldPupupu_8021119C -/// #grOldPupupu_80211284 +bool grOldPupupu_80211284(void) +{ + return false; +} /// #grOldPupupu_8021128C @@ -80,12 +109,18 @@ void grOldPupupu_80211C0C(void) {} void grOldPupupu_80211C10(void) {} -/// #grOldPupupu_80211C14 +bool grOldPupupu_80211C14(void) +{ + return false; +} /// #grOldPupupu_80211C1C void grOldPupupu_80211C9C(void) {} -/// #grOldPupupu_80211CA0 +bool grOldPupupu_80211CA0(void) +{ + return false; +} /// #grOldPupupu_80211CA8 diff --git a/src/melee/gr/groldyoshi.c b/src/melee/gr/groldyoshi.c index 5db4bcb29c..85debf82f2 100644 --- a/src/melee/gr/groldyoshi.c +++ b/src/melee/gr/groldyoshi.c @@ -1,3 +1,5 @@ +#include + void grOldYoshi_8020E798(void) {} /// #grOldYoshi_8020E79C @@ -6,13 +8,19 @@ void grOldYoshi_8020E824(void) {} /// #grOldYoshi_8020E828 -/// #grOldYoshi_8020E84C +bool grOldYoshi_8020E84C(void) +{ + return false; +} /// #grOldYoshi_8020E854 /// #grOldYoshi_8020E93C -/// #grOldYoshi_8020E968 +bool grOldYoshi_8020E968(void) +{ + return false; +} void grOldYoshi_8020E970(void) {} @@ -20,7 +28,10 @@ void grOldYoshi_8020E974(void) {} /// #grOldYoshi_8020E978 -/// #grOldYoshi_8020E9E0 +bool grOldYoshi_8020E9E0(void) +{ + return false; +} void grOldYoshi_8020E9E8(void) {} @@ -28,7 +39,10 @@ void grOldYoshi_8020E9EC(void) {} /// #grOldYoshi_8020E9F0 -/// #grOldYoshi_8020EA5C +bool grOldYoshi_8020EA5C(void) +{ + return false; +} /// #grOldYoshi_8020EA64 @@ -36,7 +50,10 @@ void grOldYoshi_8020EA88(void) {} /// #grOldYoshi_8020EA8C -/// #grOldYoshi_8020EAEC +bool grOldYoshi_8020EAEC(void) +{ + return false; +} void grOldYoshi_8020EAF4(void) {} @@ -44,7 +61,10 @@ void grOldYoshi_8020EAF8(void) {} /// #grOldYoshi_8020EAFC -/// #grOldYoshi_8020EC08 +bool grOldYoshi_8020EC08(void) +{ + return false; +} /// #grOldYoshi_8020EC10 @@ -52,7 +72,10 @@ void grOldYoshi_8020EFC8(void) {} /// #grOldYoshi_8020EFCC -/// #grOldYoshi_8020F080 +bool grOldYoshi_8020F080(void) +{ + return false; +} /// #grOldYoshi_8020F088 @@ -62,6 +85,9 @@ void grOldYoshi_8020F2A4(void) {} /// #grOldYoshi_8020F31C -/// #grOldYoshi_8020F404 +bool grOldYoshi_8020F404(void) +{ + return false; +} /// #grOldYoshi_8020F40C diff --git a/src/melee/gr/gronett.c b/src/melee/gr/gronett.c index 3c819e5e85..2cd0a3bee8 100644 --- a/src/melee/gr/gronett.c +++ b/src/melee/gr/gronett.c @@ -1,3 +1,5 @@ +#include + void grOnett_801E3734(void) {} /// #grOnett_801E3738 @@ -6,13 +8,19 @@ void grOnett_801E37C4(void) {} /// #grOnett_801E37C8 -/// #grOnett_801E37EC +bool grOnett_801E37EC(void) +{ + return false; +} /// #grOnett_801E37F4 /// #grOnett_801E38DC -/// #grOnett_801E3920 +bool grOnett_801E3920(void) +{ + return false; +} void grOnett_801E3928(void) {} @@ -22,7 +30,10 @@ void grOnett_801E392C(void) {} /// #grOnett_801E3A34 -/// #grOnett_801E3C58 +bool grOnett_801E3C58(void) +{ + return false; +} /// #grOnett_801E3C60 @@ -30,7 +41,10 @@ void grOnett_801E3CE0(void) {} /// #grOnett_801E3CE4 -/// #grOnett_801E3D98 +bool grOnett_801E3D98(void) +{ + return false; +} /// #grOnett_801E3DA0 @@ -42,7 +56,10 @@ void grOnett_801E40E0(void) {} /// #grOnett_801E41C8 -/// #grOnett_801E43D8 +bool grOnett_801E43D8(void) +{ + return false; +} /// #grOnett_801E43E0 @@ -62,6 +79,9 @@ void grOnett_801E502C(void) {} /// #grOnett_801E56FC -/// #grOnett_801E5760 +bool grOnett_801E5760(void) +{ + return false; +} /// #grOnett_801E5768 diff --git a/src/melee/gr/ground.c b/src/melee/gr/ground.c index 2d36d14ca3..f463ef8025 100644 --- a/src/melee/gr/ground.c +++ b/src/melee/gr/ground.c @@ -18,6 +18,7 @@ #include "gm/gm_1601.h" #include "it/it_266F.h" #include "it/it_26B1.h" +#include "it/it_2725.h" #include "it/items/it_27CF.h" #include "it/types.h" #include "lb/lb_00B0.h" diff --git a/src/melee/gr/grpura.c b/src/melee/gr/grpura.c index 695ba165d6..e9308c4c4b 100644 --- a/src/melee/gr/grpura.c +++ b/src/melee/gr/grpura.c @@ -1,3 +1,5 @@ +#include + void grPura_80211CFC(void) {} /// #grPura_80211D00 @@ -6,13 +8,19 @@ void grPura_80211DD8(void) {} /// #grPura_80211DDC -/// #grPura_80211E00 +bool grPura_80211E00(void) +{ + return false; +} /// #grPura_80211E08 /// #grPura_80211EF0 -/// #grPura_80211F1C +bool grPura_80211F1C(void) +{ + return false; +} void grPura_80211F24(void) {} @@ -20,7 +28,10 @@ void grPura_80211F28(void) {} /// #grPura_80211F2C -/// #grPura_80211F58 +bool grPura_80211F58(void) +{ + return false; +} void grPura_80211F60(void) {} @@ -28,7 +39,10 @@ void grPura_80211F64(void) {} /// #grPura_80211F68 -/// #grPura_80211FD0 +bool grPura_80211FD0(void) +{ + return false; +} /// #grPura_80211FD8 @@ -36,7 +50,10 @@ void grPura_80212020(void) {} /// #grPura_80212024 -/// #grPura_802120D8 +bool grPura_802120D8(void) +{ + return false; +} /// #grPura_802120E0 @@ -44,7 +61,10 @@ void grPura_8021228C(void) {} /// #grPura_80212290 -/// #grPura_80212314 +bool grPura_80212314(void) +{ + return false; +} /// #grPura_8021231C @@ -60,9 +80,15 @@ void grPura_802125EC(void) {} /// #grPura_80213030 -/// #grPura_802130C0 +bool grPura_802130C0(void) +{ + return false; +} -/// #grPura_802130C8 +bool grPura_802130C8(void) +{ + return true; +} /// #fn_802130D0 diff --git a/src/melee/gr/grpushon.c b/src/melee/gr/grpushon.c index ab670a8c53..be2d0fb0f3 100644 --- a/src/melee/gr/grpushon.c +++ b/src/melee/gr/grpushon.c @@ -1,3 +1,5 @@ +#include + void grPushOn_802182C4(void) {} /// #grPushOn_802182C8 @@ -6,13 +8,19 @@ void grPushOn_802182C4(void) {} /// #grPushOn_80218378 -/// #grPushOn_802183DC +bool grPushOn_802183DC(void) +{ + return false; +} /// #grPushOn_802183E4 /// #grPushOn_802184CC -/// #grPushOn_80218590 +bool grPushOn_80218590(void) +{ + return false; +} void grPushOn_80218598(void) {} @@ -20,7 +28,10 @@ void grPushOn_8021859C(void) {} /// #grPushOn_802185A0 -/// #grPushOn_80218670 +bool grPushOn_80218670(void) +{ + return false; +} /// #fn_80218678 @@ -30,7 +41,10 @@ void grPushOn_802187A4(void) {} /// #grPushOn_802187A8 -/// #grPushOn_80218880 +bool grPushOn_80218880(void) +{ + return false; +} /// #grPushOn_80218888 @@ -52,4 +66,7 @@ void grPushOn_80218ED0(void) {} /// #grPushOn_80219458 -/// #grPushOn_80219528 +bool grPushOn_80219528(void) +{ + return true; +} diff --git a/src/melee/gr/grrcruise.c b/src/melee/gr/grrcruise.c index c2b467d4f6..5534a978da 100644 --- a/src/melee/gr/grrcruise.c +++ b/src/melee/gr/grrcruise.c @@ -1,3 +1,4 @@ +#include void grRCruise_801FF164(void) {} @@ -7,13 +8,19 @@ void grRCruise_801FF298(void) {} /// #grRCruise_801FF29C -/// #grRCruise_801FF2C0 +bool grRCruise_801FF2C0(void) +{ + return false; +} /// #grRCruise_801FF2C8 /// #grRCruise_801FF3B4 -/// #grRCruise_801FF3E0 +bool grRCruise_801FF3E0(void) +{ + return false; +} void grRCruise_801FF3E8(void) {} @@ -21,7 +28,10 @@ void grRCruise_801FF3EC(void) {} /// #grRCruise_801FF3F0 -/// #grRCruise_801FF434 +bool grRCruise_801FF434(void) +{ + return false; +} void grRCruise_801FF43C(void) {} @@ -31,7 +41,10 @@ void grRCruise_801FF440(void) {} /// #grRCruise_801FF5B4 -/// #grRCruise_801FF6CC +bool grRCruise_801FF6CC(void) +{ + return false; +} /// #grRCruise_801FF6D4 @@ -39,7 +52,10 @@ void grRCruise_801FF738(void) {} /// #grRCruise_801FF73C -/// #grRCruise_801FF794 +bool grRCruise_801FF794(void) +{ + return false; +} void grRCruise_801FF79C(void) {} @@ -47,7 +63,10 @@ void grRCruise_801FF7A0(void) {} /// #grRCruise_801FF7A4 -/// #grRCruise_801FF8DC +bool grRCruise_801FF8DC(void) +{ + return false; +} /// #grRCruise_801FF8E4 @@ -55,7 +74,10 @@ void grRCruise_801FF920(void) {} /// #grRCruise_801FF924 -/// #grRCruise_801FFAD4 +bool grRCruise_801FFAD4(void) +{ + return false; +} /// #grRCruise_801FFADC @@ -63,7 +85,10 @@ void grRCruise_80200070(void) {} /// #grRCruise_80200074 -/// #grRCruise_8020014C +bool grRCruise_8020014C(void) +{ + return false; +} /// #grRCruise_80200154 @@ -99,6 +124,12 @@ void grRCruise_8020045C(void) {} /// #fn_80201BE0 -/// #grRCruise_80201C50 +bool grRCruise_80201C50(void) +{ + return false; +} -/// #grRCruise_80201C58 +bool grRCruise_80201C58(void) +{ + return true; +} diff --git a/src/melee/gr/grshrineroute.c b/src/melee/gr/grshrineroute.c index 9a7d2ebd4d..b8318f6df1 100644 --- a/src/melee/gr/grshrineroute.c +++ b/src/melee/gr/grshrineroute.c @@ -1,4 +1,11 @@ -/// #grShrineRoute_802087B0 +#include + +extern float grNKr_804DB868; + +float grShrineRoute_802087B0(void) +{ + return grNKr_804DB868; +} void grShrineRoute_802087B8(void) {} @@ -8,13 +15,19 @@ void grShrineRoute_802087B8(void) {} /// #grShrineRoute_80208850 -/// #grShrineRoute_802088B8 +bool grShrineRoute_802088B8(void) +{ + return false; +} /// #grShrineRoute_802088C0 /// #grShrineRoute_802089AC -/// #grShrineRoute_802089D8 +bool grShrineRoute_802089D8(void) +{ + return false; +} void grShrineRoute_802089E0(void) {} @@ -22,7 +35,10 @@ void grShrineRoute_802089E4(void) {} /// #grShrineRoute_802089E8 -/// #grShrineRoute_80208A28 +bool grShrineRoute_80208A28(void) +{ + return false; +} void grShrineRoute_80208A30(void) {} @@ -32,7 +48,10 @@ void grShrineRoute_80208A34(void) {} /// #grShrineRoute_80208D14 -/// #grShrineRoute_80208F0C +bool grShrineRoute_80208F0C(void) +{ + return false; +} /// #fn_80208F14 @@ -42,7 +61,10 @@ void grShrineRoute_80209AEC(void) {} /// #grShrineRoute_80209AF0 -/// #grShrineRoute_80209BE4 +bool grShrineRoute_80209BE4(void) +{ + return false; +} /// #grShrineRoute_80209BEC @@ -50,7 +72,10 @@ void grShrineRoute_8020A100(void) {} /// #grShrineRoute_8020A104 -/// #grShrineRoute_8020A214 +bool grShrineRoute_8020A214(void) +{ + return false; +} /// #grShrineRoute_8020A21C @@ -58,7 +83,10 @@ void grShrineRoute_8020A864(void) {} /// #grShrineRoute_8020A868 -/// #grShrineRoute_8020A894 +bool grShrineRoute_8020A894(void) +{ + return false; +} void grShrineRoute_8020A89C(void) {} @@ -84,6 +112,9 @@ void grShrineRoute_8020A8A0(void) {} /// #grShrineRoute_8020B0AC -/// #grShrineRoute_8020B104 +bool grShrineRoute_8020B104(void) +{ + return false; +} /// #grShrineRoute_8020B10C diff --git a/src/melee/gr/grstadium.c b/src/melee/gr/grstadium.c index f289519267..f335054b7d 100644 --- a/src/melee/gr/grstadium.c +++ b/src/melee/gr/grstadium.c @@ -1,3 +1,7 @@ +#include + +#include + void grStadium_801D1018(void) {} /// #grStadium_801D101C @@ -6,7 +10,10 @@ void grStadium_801D10C8(void) {} /// #grStadium_801D10CC -/// #grStadium_801D10F0 +bool grStadium_801D10F0(void) +{ + return false; +} /// #grStadium_801D10F8 @@ -14,7 +21,10 @@ void grStadium_801D10C8(void) {} /// #grStadium_801D1290 -/// #grStadium_801D1388 +bool grStadium_801D1388(void) +{ + return false; +} /// #grStadium_801D1390 @@ -24,7 +34,10 @@ void grStadium_801D13C4(void) {} /// #grStadium_801D13E0 -/// #grStadium_801D1518 +bool grStadium_801D1518(void) +{ + return false; +} /// #grStadium_801D1520 @@ -32,7 +45,10 @@ void grStadium_801D156C(void) {} /// #grStadium_801D1570 -/// #grStadium_801D15FC +bool grStadium_801D15FC(void) +{ + return false; +} /// #grStadium_801D1604 @@ -40,7 +56,10 @@ void grStadium_801D156C(void) {} /// #grStadium_801D1648 -/// #grStadium_801D16D4 +bool grStadium_801D16D4(void) +{ + return false; +} /// #grStadium_801D16DC @@ -48,7 +67,10 @@ void grStadium_801D156C(void) {} /// #grStadium_801D1720 -/// #grStadium_801D17E0 +bool grStadium_801D17E0(void) +{ + return false; +} /// #grStadium_801D17E8 @@ -56,7 +78,10 @@ void grStadium_801D156C(void) {} /// #grStadium_801D1840 -/// #grStadium_801D19D0 +bool grStadium_801D19D0(void) +{ + return false; +} /// #grStadium_801D19D8 @@ -64,7 +89,10 @@ void grStadium_801D156C(void) {} /// #grStadium_801D1A38 -/// #grStadium_801D1B40 +bool grStadium_801D1B40(void) +{ + return false; +} /// #grStadium_801D1B48 @@ -72,7 +100,10 @@ void grStadium_801D156C(void) {} /// #grStadium_801D1DE4 -/// #grStadium_801D1E10 +bool grStadium_801D1E10(void) +{ + return false; +} void grStadium_801D1E18(void) {} @@ -138,7 +169,10 @@ void grStadium_801D1E1C(void) {} /// #grStadium_801D42B8 -/// #grStadium_801D4354 +bool grStadium_801D4354(void* arg0) +{ + return M2C_FIELD(arg0, s32*, 0x2C); +} /// #grStadium_801D435C @@ -148,7 +182,10 @@ void grStadium_801D1E1C(void) {} /// #fn_801D5074 -/// #grStadium_801D50B8 +bool grStadium_801D50B8(void) +{ + return false; +} /// #grStadium_801D50C0 diff --git a/src/melee/gr/grtest.c b/src/melee/gr/grtest.c index b125a4ae7a..777b8a153a 100644 --- a/src/melee/gr/grtest.c +++ b/src/melee/gr/grtest.c @@ -1,3 +1,4 @@ +#include void grTest_80206E2C(void) {} @@ -7,13 +8,19 @@ void grTest_80207014(void) {} /// #grTest_80207018 -/// #grTest_8020703C +bool grTest_8020703C(void) +{ + return false; +} /// #grTest_80207044 /// #grTest_80207130 -/// #grTest_8020715C +bool grTest_8020715C(void) +{ + return false; +} void grTest_80207164(void) {} @@ -21,7 +28,10 @@ void grTest_80207168(void) {} /// #grTest_8020716C -/// #grTest_802071BC +bool grTest_802071BC(void) +{ + return false; +} /// #grTest_802071C4 @@ -31,12 +41,21 @@ void grTest_802073AC(void) {} /// #grTest_802073D0 -/// #grTest_802073FC +bool grTest_802073FC(void) +{ + return false; +} void grTest_80207404(void) {} void grTest_80207408(void) {} -/// #grTest_8020740C +bool grTest_8020740C(void) +{ + return false; +} -/// #grTest_80207414 +bool grTest_80207414(void) +{ + return true; +} diff --git a/src/melee/gr/grvenom.c b/src/melee/gr/grvenom.c index 3eb161ac4a..dea6a30b55 100644 --- a/src/melee/gr/grvenom.c +++ b/src/melee/gr/grvenom.c @@ -1,3 +1,4 @@ +#include /// #grVenom_8020362C @@ -9,13 +10,19 @@ void grVenom_80203B14(void) {} /// #grVenom_80203E80 -/// #grVenom_80203EA4 +bool grVenom_80203EA4(void) +{ + return false; +} /// #grVenom_80203EAC /// #grVenom_80203F98 -/// #grVenom_80203FC4 +bool grVenom_80203FC4(void) +{ + return false; +} void grVenom_80203FCC(void) {} @@ -23,7 +30,10 @@ void grVenom_80203FD0(void) {} /// #grVenom_80203FD4 -/// #grVenom_802040A4 +bool grVenom_802040A4(void) +{ + return false; +} void grVenom_802040AC(void) {} @@ -33,7 +43,10 @@ void grVenom_802040B0(void) {} /// #grVenom_802040F0 -/// #grVenom_8020427C +bool grVenom_8020427C(void) +{ + return false; +} /// #grVenom_80204284 @@ -41,7 +54,10 @@ void grVenom_80204424(void) {} /// #grVenom_80204428 -/// #grVenom_80204544 +bool grVenom_80204544(void) +{ + return false; +} /// #grVenom_8020454C @@ -51,7 +67,10 @@ void grVenom_80204B84(void) {} void grVenom_80204CE0(void) {} -/// #grVenom_80204CE4 +bool grVenom_80204CE4(void) +{ + return false; +} /// #grVenom_80204CEC @@ -59,7 +78,10 @@ void grVenom_80204CE0(void) {} /// #grVenom_80204DD4 -/// #grVenom_80204EF4 +bool grVenom_80204EF4(void) +{ + return false; +} /// #grVenom_80204EFC @@ -67,7 +89,10 @@ void grVenom_80204F1C(void) {} /// #grVenom_80204F20 -/// #grVenom_802052D8 +bool grVenom_802052D8(void) +{ + return false; +} /// #grVenom_802052E0 @@ -77,7 +102,10 @@ void grVenom_802056AC(void) {} /// #grVenom_802056B0 -/// #grVenom_80205750 +bool grVenom_80205750(void) +{ + return false; +} /// #grVenom_80205758 @@ -85,7 +113,10 @@ void grVenom_80205AD0(void) {} /// #grVenom_80205AD4 -/// #grVenom_80205DF0 +bool grVenom_80205DF0(void) +{ + return false; +} /// #grVenom_80205DF8 @@ -97,7 +128,10 @@ void grVenom_80206870(void) {} /// #grVenom_80206874 -/// #grVenom_80206B68 +bool grVenom_80206B68(void) +{ + return false; +} /// #grVenom_80206B70 @@ -105,7 +139,10 @@ void grVenom_80206B90(void) {} /// #grVenom_80206B94 -/// #grVenom_80206BBC +bool grVenom_80206BBC(void) +{ + return false; +} /// #grVenom_80206BC4 @@ -117,6 +154,9 @@ void grVenom_80206BEC(void) {} /// #grVenom_80206D10 -/// #grVenom_80206D74 +bool grVenom_80206D74(void) +{ + return false; +} /// #grVenom_80206D7C diff --git a/src/melee/gr/gryorster.c b/src/melee/gr/gryorster.c index 71204cee8a..48ad966e27 100644 --- a/src/melee/gr/gryorster.c +++ b/src/melee/gr/gryorster.c @@ -1,3 +1,4 @@ +#include void grYorster_80201FA0(void) {} @@ -7,13 +8,19 @@ void grYorster_8020200C(void) {} /// #grYorster_80202010 -/// #grYorster_80202034 +bool grYorster_80202034(void) +{ + return false; +} /// #grYorster_8020203C /// #grYorster_80202124 -/// #grYorster_80202150 +bool grYorster_80202150(void) +{ + return false; +} void grYorster_80202158(void) {} @@ -23,7 +30,10 @@ void grYorster_8020215C(void) {} /// #grYorster_802021AC -/// #grYorster_8020224C +bool grYorster_8020224C(void) +{ + return false; +} /// #grYorster_80202254 @@ -37,6 +47,12 @@ void grYorster_802022A0(void) {} /// #grYorster_8020266C -/// #grYorster_80202B5C +bool grYorster_80202B5C(void) +{ + return false; +} -/// #grYorster_80202B64 +bool grYorster_80202B64(void) +{ + return true; +} diff --git a/src/melee/gr/grzebes.c b/src/melee/gr/grzebes.c index 32314940df..2e50270c04 100644 --- a/src/melee/gr/grzebes.c +++ b/src/melee/gr/grzebes.c @@ -1,3 +1,5 @@ +#include + void grZebes_801D84A0(void) {} /// #grZebes_801D84A4 @@ -6,13 +8,19 @@ void grZebes_801D8528(void) {} /// #grZebes_801D852C -/// #grZebes_801D8550 +bool grZebes_801D8550(void) +{ + return false; +} /// #grZebes_801D8558 /// #grZebes_801D8644 -/// #grZebes_801D8814 +bool grZebes_801D8814(void) +{ + return false; +} /// #grZebes_801D881C @@ -20,7 +28,10 @@ void grZebes_801D90FC(void) {} /// #grZebes_801D9100 -/// #grZebes_801D9254 +bool grZebes_801D9254(void) +{ + return false; +} /// #grZebes_801D925C @@ -28,7 +39,10 @@ void grZebes_801D93D8(void) {} /// #grZebes_801D93DC -/// #grZebes_801D9408 +bool grZebes_801D9408(void) +{ + return false; +} /// #grZebes_801D9410 @@ -38,7 +52,10 @@ void grZebes_801D94EC(void) {} /// #grZebes_801D9508 -/// #grZebes_801D95B0 +bool grZebes_801D95B0(void) +{ + return false; +} /// #grZebes_801D95B8 @@ -48,7 +65,10 @@ void grZebes_801D9754(void) {} /// #grZebes_801D9798 -/// #grZebes_801D99D8 +bool grZebes_801D99D8(void) +{ + return false; +} /// #grZebes_801D99E0 @@ -56,7 +76,10 @@ void grZebes_801D9F2C(void) {} /// #grZebes_801D9F30 -/// #grZebes_801D9F7C +bool grZebes_801D9F7C(void) +{ + return false; +} /// #grZebes_801D9F84 @@ -104,8 +127,14 @@ void grZebes_801DA0C0(void) {} /// #fn_801DCBFC -/// #grZebes_801DCCB8 +bool grZebes_801DCCB8(void) +{ + return false; +} -/// #grZebes_801DCCC0 +bool grZebes_801DCCC0(void) +{ + return true; +} /// #grZebes_801DCCC8 diff --git a/src/melee/gr/grzebesroute.c b/src/melee/gr/grzebesroute.c index 350f2f33df..940e2da9b2 100644 --- a/src/melee/gr/grzebesroute.c +++ b/src/melee/gr/grzebesroute.c @@ -1,3 +1,4 @@ +#include void grZebesRoute_8020B160(void) {} @@ -7,13 +8,19 @@ void grZebesRoute_8020B160(void) {} /// #grZebesRoute_8020B1F4 -/// #grZebesRoute_8020B258 +bool grZebesRoute_8020B258(void) +{ + return false; +} /// #grZebesRoute_8020B260 /// #grZebesRoute_8020B348 -/// #grZebesRoute_8020B374 +bool grZebesRoute_8020B374(void) +{ + return false; +} void grZebesRoute_8020B37C(void) {} @@ -21,7 +28,10 @@ void grZebesRoute_8020B380(void) {} /// #grZebesRoute_8020B384 -/// #grZebesRoute_8020B3B0 +bool grZebesRoute_8020B3B0(void) +{ + return false; +} void grZebesRoute_8020B3B8(void) {} @@ -29,7 +39,10 @@ void grZebesRoute_8020B3BC(void) {} /// #grZebesRoute_8020B3C0 -/// #grZebesRoute_8020B424 +bool grZebesRoute_8020B424(void) +{ + return false; +} /// #grZebesRoute_8020B42C @@ -39,6 +52,12 @@ void grZebesRoute_8020B4D4(void) {} /// #grZebesRoute_8020B548 -/// #grZebesRoute_8020B854 +bool grZebesRoute_8020B854(void) +{ + return false; +} -/// #grZebesRoute_8020B85C +bool grZebesRoute_8020B85C(void) +{ + return true; +} diff --git a/src/melee/if/ifall.c b/src/melee/if/ifall.c index 8b13789179..ec5cc6aba4 100644 --- a/src/melee/if/ifall.c +++ b/src/melee/if/ifall.c @@ -1 +1,38 @@ +#include "ifall.h" +/* 4D6D58 */ static u8 ifAll_804D6D58; +/* 4D6D5C */ static UNK_T ifAll_804D6D5C; + +/// #ifAll_802F3394 + +/// #ifAll_802F33CC + +/// #ifAll_802F3404 + +/// #ifAll_802F3414 + +/// #ifAll_802F3424 + +/// #ifAll_802F343C + +UNK_T ifAll_802F3690(void) +{ + return &ifAll_804D6D5C; +} + +/// #ifAll_802F3698 + +/// #ifAll_802F36A4 + +u8 ifAll_802F36B0(void) +{ + return ifAll_804D6D58; +} + +/// #fn_802F36B8 + +/// #ifAll_802F370C + +/// #ifAll_802F390C + +/// #ifAll_802F3A64 diff --git a/src/melee/if/ifall.h b/src/melee/if/ifall.h index 609ed4e652..0feac51665 100644 --- a/src/melee/if/ifall.h +++ b/src/melee/if/ifall.h @@ -3,8 +3,21 @@ #include +#include + +/* 2F3394 */ UNK_RET ifAll_802F3394(UNK_PARAMS); +/* 2F33CC */ UNK_RET ifAll_802F33CC(UNK_PARAMS); +/* 2F3404 */ UNK_RET ifAll_802F3404(UNK_PARAMS); +/* 2F3414 */ UNK_RET ifAll_802F3414(UNK_PARAMS); /* 2F3424 */ void ifAll_802F3424(void); /* 2F343C */ void ifAll_802F343C(void); -/* 2F3690 */ void ifAll_802F3690(void); +/* 2F3690 */ UNK_T ifAll_802F3690(void); +/* 2F3698 */ UNK_RET ifAll_802F3698(UNK_PARAMS); +/* 2F36A4 */ UNK_RET ifAll_802F36A4(UNK_PARAMS); +/* 2F36B0 */ u8 ifAll_802F36B0(void); +/* 2F36B8 */ UNK_RET fn_802F36B8(UNK_PARAMS); +/* 2F370C */ UNK_RET ifAll_802F370C(UNK_PARAMS); +/* 2F390C */ UNK_RET ifAll_802F390C(UNK_PARAMS); +/* 2F3A64 */ UNK_RET ifAll_802F3A64(UNK_PARAMS); #endif diff --git a/src/melee/it/it_266F.h b/src/melee/it/it_266F.h index 55554775b0..74e2fb4845 100644 --- a/src/melee/it/it_266F.h +++ b/src/melee/it/it_266F.h @@ -91,79 +91,6 @@ typedef void (*ItCallback)(HSD_GObj*); /* 2722B0 */ void it_802722B0(HSD_GObj* gobj); /* 272304 */ void it_80272304(HSD_GObj* gobj); /* 272460 */ void it_80272460(HitCapsule* hitbox, s32 damage, HSD_GObj* gobj); -/* 2725D4 */ void it_802725D4(HSD_GObj*); -/* 272784 */ void it_80272784(HSD_GObj* gobj); -/* 272818 */ UNK_RET it_80272818(UNK_PARAMS); -/* 272860 */ void it_80272860(Item_GObj*, f32, f32); -/* 2728C8 */ void it_802728C8(HSD_GObj* gobj); -/* 272A18 */ void it_80272A18(HSD_JObj* item_jobj); -/* 272A3C */ void it_80272A3C(HSD_JObj* item_jobj); -/* 272BA4 */ void it_80272BA4(Item_GObj*); -/* 272C08 */ void it_80272C08(Item_GObj*); -/* 272C6C */ bool it_80272C6C(HSD_GObj*); -/* 272C90 */ HSD_JObj* it_80272C90(Item_GObj* gobj); -/* 272D1C */ bool it_80272D1C(HSD_GObj* gobj); -/* 272D40 */ s32 it_80272D40(HSD_GObj* gobj); -/* 272db0 */ bool itColl_BounceOffVictim(Item_GObj*); -/* 272F7C */ void it_80272F7C(HSD_JObj*, f32); -/* 273030 */ bool it_80273030(Item_GObj*); -/* 273078 */ bool itColl_BounceOffShield(Item_GObj*); -/* 273130 */ enum_t it_80273130(Item_GObj*); -/* 273168 */ void it_80273168(HSD_GObj* gobj); -/* 2731A4 */ void it_802731A4(HSD_GObj*); -/* 2731E0 */ void it_802731E0(HSD_GObj*); -/* 27327C */ void it_8027327C(HSD_GObj* gobj, s32 ID1, s32 ID2); -/* 273454 */ void it_80273454(Item_GObj*); -/* 27346C */ void it_8027346C(HSD_GObj* gobj); -/* 273484 */ void it_80273484(HSD_GObj* gobj); -/* 273500 */ void it_80273500(HSD_GObj*, Vec3*); -/* 273748 */ void it_80273748(HSD_GObj*, Vec3*, Vec3*); -/* 273B50 */ void it_80273B50(HSD_GObj*, Vec3*); -/* 274198 */ void it_80274198(HSD_GObj*, s32); -/* 2741F4 */ void it_802741F4(HSD_GObj*, s32); -/* 27429C */ void it_8027429C(HSD_GObj*, Vec3*); -/* 2742F4 */ void it_802742F4(HSD_GObj*, HSD_GObj*, Fighter_Part); -/* 274594 */ void it_80274594(Item_GObj*); -/* 274658 */ void it_80274658(HSD_GObj*, f32); -/* 274740 */ void it_80274740(HSD_GObj* gobj); -/* 274A64 */ void it_80274A64(HSD_GObj* gobj); -/* 274C78 */ bool it_80274C78(HSD_GObj* gobj); -/* 274DAC */ void it_80274DAC(HSD_GObj*); -/* 274EE8 */ void it_80274EE8(u32); -/* 274EF8 */ void it_80274EF8(HSD_GObj* gobj); -/* 274F10 */ void it_80274F10(HSD_GObj* gobj); -/* 275158 */ void it_80275158(HSD_GObj* gobj, f32 lifetime); -/* 27518C */ void it_8027518C(Item_GObj*); -/* 2751D8 */ bool it_802751D8(Item_GObj*); -/* 275390 */ void it_80275390(HSD_GObj*); -/* 2753BC */ void it_802753BC(HSD_GObj*, s16); -/* 2753DC */ void it_802753DC(HSD_GObj*); -/* 275444 */ void it_80275444(Item_GObj*); -/* 275474 */ void it_80275474(HSD_GObj* gobj); -/* 2754D4 */ void it_802754D4(HSD_GObj*); -/* 275504 */ void it_80275504(HSD_GObj* gobj); -/* 2756D0 */ void it_802756D0(HSD_GObj* gobj); -/* 2756E0 */ void it_802756E0(HSD_GObj* gobj); -/* 27574C */ void it_8027574C(HSD_GObj* gobj); -/* 275870 */ bool it_80275870(HSD_GObj* gobj); -/* 275E98 */ void it_80275E98(HSD_GObj*, SpawnItem*); -/* 2762B0 */ void it_802762B0(Item*); -/* 2762BC */ void it_802762BC(Item*); -/* 276308 */ bool it_80276308(Item_GObj*); -/* 2763E0 */ bool it_802763E0(Item_GObj*); -/* 27737C */ void it_8027737C(HSD_GObj* gobj, Vec3* pos); -/* 27870C */ void it_8027870C(s32); -/* 2799E4 */ void it_802799E4(HSD_GObj* gobj); -/* 279B64 */ void it_80279B64(Item*); -/* 279B88 */ void it_80279B88(Item* item_data, s32 arg1, s32 arg2); -/* 279BBC */ void it_80279BBC(Item* item_data); -/* 279BE0 */ void it_80279BE0(HSD_GObj* gobj); -/* 279CDC */ void it_80279CDC(HSD_GObj*, f32); -/* 27A160 */ void it_8027A160(HSD_JObj* bone, Item*); -/* 27A344 */ void it_8027A344(Item_GObj*); -/* 27B0C4 */ void it_8027B0C4(HSD_GObj*, SpawnItem*); -/* 27B4A4 */ void it_8027B4A4(Fighter_GObj*, Item_GObj*); -/* 27B5B0 */ Item_GObj* it_8027B5B0(s32, s32, HSD_JObj*, Vec3*, s32); /* 4A0E30 */ extern HSD_ObjAllocUnk4 it_804A0E30; /* 4A0E50 */ extern HSD_ObjAllocUnk6 it_804A0E50; diff --git a/src/melee/it/it_26B1.c b/src/melee/it/it_26B1.c index bb64920bf5..ea7d1b5e6e 100644 --- a/src/melee/it/it_26B1.c +++ b/src/melee/it/it_26B1.c @@ -7,6 +7,7 @@ #include "gm/gm_1601.h" #include "it/inlines.h" #include "it/it_266F.h" +#include "it/it_2725.h" #include "it/itCommonItems.h" #include "it/item.h" #include "it/items/it_27CF.h" diff --git a/src/melee/it/it_2725.c b/src/melee/it/it_2725.c index 8c4613fa86..c165d18c68 100644 --- a/src/melee/it/it_2725.c +++ b/src/melee/it/it_2725.c @@ -3075,3 +3075,480 @@ struct ItemLogicTable it_803F3100[] = { it_802E709C, }, }; + +/// #it_80272560 + +/// #it_802725D4 + +/// #it_80272674 + +/// #it_80272784 + +/// #it_80272818 + +/// #it_80272828 + +/// #it_80272860 + +/// #it_802728C8 + +/// #it_80272940 + +/// #it_80272980 + +/// #it_80272A18 + +/// #it_80272A3C + +/// #it_80272A60 + +/// #it_80272AC4 + +/// #it_80272B40 + +/// #it_80272BA4 + +/// #it_80272C08 + +/// #it_80272C6C + +/// #it_80272C90 + +/// #it_80272CC0 + +/// #it_80272D1C + +/// #it_80272D40 + +/// #itColl_BounceOffVictim + +/// #it_80272DE4 + +/// #it_80272F7C + +/// #it_80273030 + +/// #itColl_BounceOffShield + +/// #it_80273130 + +/// #it_80273168 + +/// #it_802731A4 + +/// #it_802731E0 + +/// #it_8027321C + +/// #it_8027327C + +/// #it_802732E4 + +/// #it_80273318 + +/// #it_80273408 + +/// #it_80273454 + +/// #it_8027346C + +/// #it_80273484 + +/// #it_8027349C + +/// #it_802734B4 + +/// #it_80273500 + +/// #it_80273598 + +/// #it_80273600 + +/// #it_80273648 + +/// #it_80273670 + +/// #it_80273748 + +/// #it_80273B50 + +/// #it_80273F34 + +/// #it_80274198 + +/// #it_802741F4 + +/// #it_80274250 + +/// #it_8027429C + +/// #it_802742F4 + +/// #it_80274484 + +/// #it_80274574 + +/// #it_80274594 + +/// #it_80274658 + +/// #it_802746F8 + +/// #it_80274740 + +/// #it_80274990 + +/// #it_80274A64 + +/// #it_80274C60 + +/// #it_80274C78 + +/// #it_80274C88 + +/// #it_80274CAC + +/// #it_80274D04 + +/// #it_80274D6C + +/// #it_80274DAC + +/// #it_80274DFC + +/// #it_80274E44 + +/// #it_80274ECC + +/// #it_80274ED8 + +/// #it_80274EE8 + +/// #it_80274EF8 + +/// #it_80274F10 + +/// #it_80274F28 + +/// #it_80274F48 + +/// #it_80274FDC + +/// #it_80275070 + +/// #it_802750E8 + +/// #it_802750F8 + +/// #it_80275158 + +/// #it_80275174 + +/// #it_8027518C + +/// #it_802751D8 + +/// #it_80275210 + +/// #it_80275228 + +/// #it_80275240 + +/// #it_80275258 + +/// #it_80275270 + +/// #it_80275288 + +/// #it_802752D8 + +/// #it_80275328 + +/// #it_80275390 + +/// #it_802753BC + +/// #it_802753DC + +/// #it_80275414 + +/// #it_8027542C + +/// #it_80275444 + +/// #it_80275474 + +/// #it_802754A4 + +/// #it_802754BC + +/// #it_802754D4 + +/// #it_80275504 + +/// #it_80275534 + +/// #it_80275594 + +/// #it_802755C0 + +/// #it_80275640 + +/// #it_802756D0 + +/// #it_802756E0 + +/// #it_8027570C + +/// #it_8027572C + +/// #it_8027574C + +/// #it_80275788 + +/// #it_80275820 + +/// #it_80275870 + +/// #it_802758D4 + +/// #it_802759DC + +/// #it_80275BC8 + +/// #it_80275D5C + +/// #it_80275DFC + +/// #it_80275E98 + +/// #it_80276100 + +/// #it_80276174 + +/// #it_80276214 + +/// #it_80276278 + +/// #it_802762B0 + +/// #it_802762BC + +/// #it_802762D8 + +/// #it_80276308 + +/// #it_80276348 + +/// #it_802763B8 + +/// #it_802763E0 + +/// #it_80276408 + +/// #it_8027649C + +/// #it_802765BC + +/// #it_80276934 + +/// #it_80276CB8 + +/// #it_80276CEC + +/// #it_80276D9C + +/// #it_80276FC4 + +/// #it_80277040 + +/// #it_8027737C + +/// #it_80277544 + +/// #it_802775F0 + +/// #it_8027770C + +/// #it_8027781C + +/// #it_80277C40 + +/// #it_80277D08 + +/// #fn_80277D8C + +/// #it_80277F90 + +/// #it_80278108 + +/// #it_80278574 + +/// #it_8027870C + +/// #it_802787B4 + +/// #it_80278800 + +/// #it_80278F2C + +/// #it_802790C0 + +/// #it_80279544 + +/// #it_802795EC + +/// #it_80279680 + +/// #it_802796C4 + +/// #it_802796FC + +/// #it_80279720 + +/// #it_80279744 + +/// #it_80279768 + +/// #it_8027978C + +/// #it_80279888 + +/// #it_802798D4 + +/// #it_8027990C + +/// #it_80279958 + +/// #it_802799A8 + +/// #it_802799E4 + +/// #it_80279AF0 + +/// #it_80279B10 + +/// #fn_80279B30 + +/// #it_80279B64 + +/// #it_80279B88 + +/// #it_80279BBC + +/// #it_80279BE0 + +/// #it_80279C48 + +/// #it_80279CDC + +/// #it_80279D38 + +/// #it_80279D5C + +/// #it_80279E24 + +/// #it_80279FF8 + +/// #it_8027A09C + +/// #it_8027A118 + +/// #it_8027A13C + +/// #it_8027A160 + +/// #it_8027A344 + +/// #it_8027A364 + +/// #it_8027A4D4 + +/// #it_8027A780 + +/// #it_8027A9B8 + +/// #it_8027AAA0 + +/// #it_8027AB64 + +/// #it_8027ADEC + +/// #it_8027AE34 + +/// #it_8027AF50 + +/// #it_8027B070 + +/// #it_8027B0C4 + +/// #it_8027B1F4 + +/// #it_8027B288 + +/// #it_8027B330 + +/// #it_8027B378 + +/// #it_8027B408 + +/// #it_8027B4A4 + +/// #it_8027B508 + +/// #it_8027B564 + +/// #it_8027B5B0 + +/// #it_8027B730 + +/// #it_8027B798 + +/// #it_8027B964 + +/// #it_8027BA54 + +/// #it_8027BB1C + +/// #it_8027BBF4 + +/// #it_8027C0A8 + +/// #it_8027C0CC + +/// #it_8027C0F0 + +/// #it_8027C56C + +bool it_8027C794(void) +{ + return false; +} + +/// #it_8027C79C + +/// #it_8027C824 + +/// #it_8027C8B0 + +/// #it_8027C8D0 + +/// #it_8027C9D8 + +/// #it_8027CA7C + +/// #it_8027CAD8 + +/// #it_8027CB3C + +/// #it_8027CBA4 + +/// #it_8027CBFC + +/// #it_8027CC88 + +/// #it_8027CE18 + +/// #it_8027CE44 + +/// #it_8027CE64 diff --git a/src/melee/it/it_2725.h b/src/melee/it/it_2725.h index ed3dd4abc8..5c296c6b03 100644 --- a/src/melee/it/it_2725.h +++ b/src/melee/it/it_2725.h @@ -11,49 +11,241 @@ #include +/* 272560 */ UNK_RET it_80272560(UNK_PARAMS); +/* 2725D4 */ void it_802725D4(HSD_GObj*); +/* 272674 */ UNK_RET it_80272674(UNK_PARAMS); +/* 272784 */ void it_80272784(HSD_GObj* gobj); +/* 272818 */ UNK_RET it_80272818(UNK_PARAMS); /* 272828 */ s32 it_80272828(s32); +/* 272860 */ void it_80272860(Item_GObj*, f32, f32); +/* 2728C8 */ void it_802728C8(HSD_GObj* gobj); /* 272940 */ void it_80272940(Item_GObj* gobj); /* 272980 */ void it_80272980(Item_GObj*, f32); +/* 272A18 */ void it_80272A18(HSD_JObj* item_jobj); +/* 272A3C */ void it_80272A3C(HSD_JObj* item_jobj); /* 272A60 */ void it_80272A60(Item_GObj*); +/* 272AC4 */ UNK_RET it_80272AC4(UNK_PARAMS); +/* 272B40 */ UNK_RET it_80272B40(UNK_PARAMS); +/* 272BA4 */ void it_80272BA4(Item_GObj*); +/* 272C08 */ void it_80272C08(Item_GObj*); +/* 272C6C */ bool it_80272C6C(HSD_GObj*); +/* 272C90 */ HSD_JObj* it_80272C90(Item_GObj* gobj); /* 272CC0 */ HSD_JObj* it_80272CC0(Item_GObj*, enum_t); +/* 272D1C */ bool it_80272D1C(HSD_GObj* gobj); +/* 272D40 */ s32 it_80272D40(HSD_GObj* gobj); +/* 272db0 */ bool itColl_BounceOffVictim(Item_GObj*); +/* 272DE4 */ UNK_RET it_80272DE4(UNK_PARAMS); +/* 272F7C */ void it_80272F7C(HSD_JObj*, f32); +/* 273030 */ bool it_80273030(Item_GObj*); +/* 273078 */ bool itColl_BounceOffShield(Item_GObj*); +/* 273130 */ enum_t it_80273130(Item_GObj*); +/* 273168 */ void it_80273168(HSD_GObj* gobj); +/* 2731A4 */ void it_802731A4(HSD_GObj*); +/* 2731E0 */ void it_802731E0(HSD_GObj*); +/* 27321C */ UNK_RET it_8027321C(UNK_PARAMS); +/* 27327C */ void it_8027327C(HSD_GObj* gobj, s32 ID1, s32 ID2); +/* 2732E4 */ UNK_RET it_802732E4(UNK_PARAMS); /* 273318 */ void it_80273318(Item_GObj*, HSD_Joint*, s32); /* 273408 */ void it_80273408(Item_GObj* gobj); +/* 273454 */ void it_80273454(Item_GObj*); +/* 27346C */ void it_8027346C(HSD_GObj* gobj); +/* 273484 */ void it_80273484(HSD_GObj* gobj); +/* 27349C */ UNK_RET it_8027349C(UNK_PARAMS); /* 2734B4 */ void it_802734B4(HSD_GObj*); +/* 273500 */ void it_80273500(HSD_GObj*, Vec3*); +/* 273598 */ UNK_RET it_80273598(UNK_PARAMS); +/* 273600 */ UNK_RET it_80273600(UNK_PARAMS); +/* 273648 */ UNK_RET it_80273648(UNK_PARAMS); /* 273670 */ void it_80273670(HSD_GObj*, int, float); +/* 273748 */ void it_80273748(HSD_GObj*, Vec3*, Vec3*); +/* 273B50 */ void it_80273B50(HSD_GObj*, Vec3*); +/* 273F34 */ UNK_RET it_80273F34(UNK_PARAMS); +/* 274198 */ void it_80274198(HSD_GObj*, s32); +/* 2741F4 */ void it_802741F4(HSD_GObj*, s32); /* 274250 */ void it_80274250(Item_GObj*, Vec3*); +/* 27429C */ void it_8027429C(HSD_GObj*, Vec3*); +/* 2742F4 */ void it_802742F4(HSD_GObj*, HSD_GObj*, Fighter_Part); +/* 274484 */ UNK_RET it_80274484(UNK_PARAMS); +/* 274574 */ UNK_RET it_80274574(UNK_PARAMS); +/* 274594 */ void it_80274594(Item_GObj*); +/* 274658 */ void it_80274658(HSD_GObj*, f32); +/* 2746F8 */ UNK_RET it_802746F8(UNK_PARAMS); +/* 274740 */ void it_80274740(HSD_GObj* gobj); +/* 274990 */ UNK_RET it_80274990(UNK_PARAMS); +/* 274A64 */ void it_80274A64(HSD_GObj* gobj); +/* 274C60 */ UNK_RET it_80274C60(UNK_PARAMS); +/* 274C78 */ bool it_80274C78(HSD_GObj* gobj); /* 274C88 */ void it_80274C88(Item_GObj* gobj); +/* 274CAC */ UNK_RET it_80274CAC(UNK_PARAMS); +/* 274D04 */ UNK_RET it_80274D04(UNK_PARAMS); +/* 274D6C */ UNK_RET it_80274D6C(UNK_PARAMS); +/* 274DAC */ void it_80274DAC(HSD_GObj*); +/* 274DFC */ UNK_RET it_80274DFC(UNK_PARAMS); +/* 274E44 */ UNK_RET it_80274E44(UNK_PARAMS); /* 274ECC */ void it_80274ECC(Item_GObj* gobj, bool); /* 274ED8 */ void it_80274ED8(void); +/* 274EE8 */ void it_80274EE8(u32); +/* 274EF8 */ void it_80274EF8(HSD_GObj* gobj); +/* 274F10 */ void it_80274F10(HSD_GObj* gobj); +/* 274F28 */ UNK_RET it_80274F28(UNK_PARAMS); /* 274F48 */ void it_80274F48(Item_GObj*, s32, HSD_GObj*, Fighter_Part); +/* 274FDC */ UNK_RET it_80274FDC(UNK_PARAMS); /* 275070 */ void it_80275070(Item_GObj*, s32); +/* 2750E8 */ UNK_RET it_802750E8(UNK_PARAMS); /* 2750F8 */ void it_802750F8(Item_GObj*); +/* 275158 */ void it_80275158(HSD_GObj* gobj, f32 lifetime); +/* 275174 */ UNK_RET it_80275174(UNK_PARAMS); +/* 27518C */ void it_8027518C(Item_GObj*); +/* 2751D8 */ bool it_802751D8(Item_GObj*); +/* 275210 */ UNK_RET it_80275210(UNK_PARAMS); +/* 275228 */ UNK_RET it_80275228(UNK_PARAMS); +/* 275240 */ UNK_RET it_80275240(UNK_PARAMS); +/* 275258 */ UNK_RET it_80275258(UNK_PARAMS); +/* 275270 */ UNK_RET it_80275270(UNK_PARAMS); +/* 275288 */ UNK_RET it_80275288(UNK_PARAMS); +/* 2752D8 */ UNK_RET it_802752D8(UNK_PARAMS); +/* 275328 */ UNK_RET it_80275328(UNK_PARAMS); +/* 275390 */ void it_80275390(HSD_GObj*); +/* 2753BC */ void it_802753BC(HSD_GObj*, s16); +/* 2753DC */ void it_802753DC(HSD_GObj*); /* 275414 */ void it_80275414(HSD_GObj*); +/* 27542C */ UNK_RET it_8027542C(UNK_PARAMS); +/* 275444 */ void it_80275444(Item_GObj*); +/* 275474 */ void it_80275474(HSD_GObj* gobj); /* 2754A4 */ void it_802754A4(Item_GObj*); +/* 2754BC */ UNK_RET it_802754BC(UNK_PARAMS); +/* 2754D4 */ void it_802754D4(HSD_GObj*); +/* 275504 */ void it_80275504(HSD_GObj* gobj); +/* 275534 */ UNK_RET it_80275534(UNK_PARAMS); +/* 275594 */ UNK_RET it_80275594(UNK_PARAMS); +/* 2755C0 */ UNK_RET it_802755C0(UNK_PARAMS); +/* 275640 */ UNK_RET it_80275640(UNK_PARAMS); +/* 2756D0 */ void it_802756D0(HSD_GObj* gobj); +/* 2756E0 */ void it_802756E0(HSD_GObj* gobj); +/* 27570C */ UNK_RET it_8027570C(UNK_PARAMS); +/* 27572C */ UNK_RET it_8027572C(UNK_PARAMS); +/* 27574C */ void it_8027574C(HSD_GObj* gobj); +/* 275788 */ UNK_RET it_80275788(UNK_PARAMS); +/* 275820 */ UNK_RET it_80275820(UNK_PARAMS); +/* 275870 */ bool it_80275870(HSD_GObj* gobj); +/* 2758D4 */ UNK_RET it_802758D4(UNK_PARAMS); +/* 2759DC */ UNK_RET it_802759DC(UNK_PARAMS); +/* 275BC8 */ UNK_RET it_80275BC8(UNK_PARAMS); /* 275D5C */ void it_80275D5C(HSD_GObj*, ECB*); /* 275DFC */ void it_80275DFC(HSD_GObj*); +/* 275E98 */ void it_80275E98(HSD_GObj*, SpawnItem*); +/* 276100 */ UNK_RET it_80276100(UNK_PARAMS); +/* 276174 */ UNK_RET it_80276174(UNK_PARAMS); /* 276214 */ bool it_80276214(Item_GObj*); +/* 276278 */ UNK_RET it_80276278(UNK_PARAMS); +/* 2762B0 */ void it_802762B0(Item*); +/* 2762BC */ void it_802762BC(Item*); /* 2762D8 */ bool it_802762D8(HSD_GObj*); +/* 276308 */ bool it_80276308(Item_GObj*); +/* 276348 */ UNK_RET it_80276348(UNK_PARAMS); +/* 2763B8 */ UNK_RET it_802763B8(UNK_PARAMS); +/* 2763E0 */ bool it_802763E0(Item_GObj*); /* 276408 */ void it_80276408(Item_GObj*, CollData*, f32*); +/* 27649C */ UNK_RET it_8027649C(UNK_PARAMS); +/* 2765BC */ UNK_RET it_802765BC(UNK_PARAMS); +/* 276934 */ UNK_RET it_80276934(UNK_PARAMS); /* 276CB8 */ void it_80276CB8(Item_GObj* gobj); /* 276CEC */ void it_80276CEC(HSD_GObj*); +/* 276D9C */ UNK_RET it_80276D9C(UNK_PARAMS); /* 276FC4 */ void it_80276FC4(HSD_GObj*); /* 277040 */ bool it_80277040(Item_GObj*); +/* 27737C */ void it_8027737C(HSD_GObj* gobj, Vec3* pos); /* 277544 */ bool it_80277544(HSD_GObj*); +/* 2775F0 */ UNK_RET it_802775F0(UNK_PARAMS); +/* 27770C */ UNK_RET it_8027770C(UNK_PARAMS); /* 27781C */ bool it_8027781C(Item_GObj*); +/* 277C40 */ UNK_RET it_80277C40(UNK_PARAMS); +/* 277D08 */ UNK_RET it_80277D08(UNK_PARAMS); +/* 277D8C */ UNK_RET fn_80277D8C(UNK_PARAMS); +/* 277F90 */ UNK_RET it_80277F90(UNK_PARAMS); +/* 278108 */ UNK_RET it_80278108(UNK_PARAMS); +/* 278574 */ UNK_RET it_80278574(UNK_PARAMS); +/* 27870C */ void it_8027870C(s32); /* 2787B4 */ void it_802787B4(Item_GObj*, s32); +/* 278800 */ UNK_RET it_80278800(UNK_PARAMS); +/* 278F2C */ UNK_RET it_80278F2C(UNK_PARAMS); +/* 2790C0 */ UNK_RET it_802790C0(UNK_PARAMS); +/* 279544 */ UNK_RET it_80279544(UNK_PARAMS); +/* 2795EC */ UNK_RET it_802795EC(UNK_PARAMS); +/* 279680 */ UNK_RET it_80279680(UNK_PARAMS); +/* 2796C4 */ UNK_RET it_802796C4(UNK_PARAMS); +/* 2796FC */ UNK_RET it_802796FC(UNK_PARAMS); +/* 279720 */ UNK_RET it_80279720(UNK_PARAMS); +/* 279744 */ UNK_RET it_80279744(UNK_PARAMS); +/* 279768 */ UNK_RET it_80279768(UNK_PARAMS); +/* 27978C */ UNK_RET it_8027978C(UNK_PARAMS); +/* 279888 */ UNK_RET it_80279888(UNK_PARAMS); +/* 2798D4 */ UNK_RET it_802798D4(UNK_PARAMS); +/* 27990C */ UNK_RET it_8027990C(UNK_PARAMS); +/* 279958 */ UNK_RET it_80279958(UNK_PARAMS); +/* 2799A8 */ UNK_RET it_802799A8(UNK_PARAMS); +/* 2799E4 */ void it_802799E4(HSD_GObj* gobj); +/* 279AF0 */ UNK_RET it_80279AF0(UNK_PARAMS); +/* 279B10 */ UNK_RET it_80279B10(UNK_PARAMS); +/* 279B30 */ UNK_RET fn_80279B30(UNK_PARAMS); +/* 279B64 */ void it_80279B64(Item*); +/* 279B88 */ void it_80279B88(Item* item_data, s32 arg1, s32 arg2); +/* 279BBC */ void it_80279BBC(Item* item_data); +/* 279BE0 */ void it_80279BE0(HSD_GObj* gobj); /* 279C48 */ void it_80279C48(Item_GObj*, Article*); +/* 279CDC */ void it_80279CDC(HSD_GObj*, f32); +/* 279D38 */ UNK_RET it_80279D38(UNK_PARAMS); +/* 279D5C */ UNK_RET it_80279D5C(UNK_PARAMS); +/* 279E24 */ UNK_RET it_80279E24(UNK_PARAMS); /* 279FF8 */ void it_80279FF8(Item_GObj*); /* 27A09C */ bool it_8027A09C(Item_GObj*); /* 27A118 */ bool it_8027A118(Item_GObj*, void (*)(Item_GObj*)); /* 27A13C */ void it_8027A13C(Item_GObj*); +/* 27A160 */ void it_8027A160(HSD_JObj* bone, Item*); +/* 27A344 */ void it_8027A344(Item_GObj*); +/* 27A364 */ UNK_RET it_8027A364(UNK_PARAMS); +/* 27A4D4 */ UNK_RET it_8027A4D4(UNK_PARAMS); +/* 27A780 */ UNK_RET it_8027A780(UNK_PARAMS); +/* 27A9B8 */ UNK_RET it_8027A9B8(UNK_PARAMS); +/* 27AAA0 */ UNK_RET it_8027AAA0(UNK_PARAMS); +/* 27AB64 */ UNK_RET it_8027AB64(UNK_PARAMS); /* 27ADEC */ M2C_UNK it_8027ADEC(M2C_UNK, Item_GObj*, HSD_JObj*, f32); +/* 27AE34 */ UNK_RET it_8027AE34(UNK_PARAMS); +/* 27AF50 */ UNK_RET it_8027AF50(UNK_PARAMS); /* 27B070 */ void it_8027B070(Item_GObj* gobj, Fighter_GObj* owner_gobj); +/* 27B0C4 */ void it_8027B0C4(HSD_GObj*, SpawnItem*); +/* 27B1F4 */ UNK_RET it_8027B1F4(UNK_PARAMS); +/* 27B288 */ UNK_RET it_8027B288(UNK_PARAMS); +/* 27B330 */ UNK_RET it_8027B330(UNK_PARAMS); /* 27B378 */ void it_8027B378(Fighter_GObj*, Item_GObj*, float); +/* 27B408 */ UNK_RET it_8027B408(UNK_PARAMS); +/* 27B4A4 */ void it_8027B4A4(Fighter_GObj*, Item_GObj*); +/* 27B508 */ UNK_RET it_8027B508(UNK_PARAMS); +/* 27B564 */ UNK_RET it_8027B564(UNK_PARAMS); +/* 27B5B0 */ Item_GObj* it_8027B5B0(s32, s32, HSD_JObj*, Vec3*, s32); /* 27B730 */ void it_8027B730(void); /* 27B798 */ s32 it_8027B798(Item_GObj*, Vec3*); +/* 27B964 */ UNK_RET it_8027B964(UNK_PARAMS); +/* 27BA54 */ UNK_RET it_8027BA54(UNK_PARAMS); +/* 27BB1C */ UNK_RET it_8027BB1C(UNK_PARAMS); +/* 27BBF4 */ UNK_RET it_8027BBF4(UNK_PARAMS); +/* 27C0A8 */ UNK_RET it_8027C0A8(UNK_PARAMS); +/* 27C0CC */ UNK_RET it_8027C0CC(UNK_PARAMS); +/* 27C0F0 */ UNK_RET it_8027C0F0(UNK_PARAMS); /* 27C56C */ void it_8027C56C(Item_GObj*, f32); +/* 27C794 */ bool it_8027C794(void); +/* 27C79C */ UNK_RET it_8027C79C(UNK_PARAMS); +/* 27C824 */ UNK_RET it_8027C824(UNK_PARAMS); /* 27C8B0 */ void it_8027C8B0(Item_GObj*); +/* 27C8D0 */ UNK_RET it_8027C8D0(UNK_PARAMS); +/* 27C9D8 */ UNK_RET it_8027C9D8(UNK_PARAMS); +/* 27CA7C */ UNK_RET it_8027CA7C(UNK_PARAMS); +/* 27CAD8 */ UNK_RET it_8027CAD8(UNK_PARAMS); +/* 27CB3C */ UNK_RET it_8027CB3C(UNK_PARAMS); +/* 27CBA4 */ UNK_RET it_8027CBA4(UNK_PARAMS); /* 27CBFC */ f32 it_8027CBFC(Item_GObj*); +/* 27CC88 */ UNK_RET it_8027CC88(UNK_PARAMS); +/* 27CE18 */ UNK_RET it_8027CE18(UNK_PARAMS); /* 27CE44 */ void it_8027CE44(Item_GObj*); /* 27CE64 */ void it_8027CE64(Item_GObj*, Item_GObj*, s32); /* 3F14C4 */ extern struct ItemLogicTable it_803F14C4[43]; diff --git a/src/melee/it/items/it_27CF.h b/src/melee/it/items/it_27CF.h index fcd1128293..6633e95e3e 100644 --- a/src/melee/it/items/it_27CF.h +++ b/src/melee/it/items/it_27CF.h @@ -19,16 +19,6 @@ float); /* 2A850C */ void it_802A850C(Item_GObj*, Vec3*, Vec3*, float, float, float); /* 2A8A7C */ void it_802A8A7C(Item_GObj* gobj); -/* 2AA054 */ void it_802AA054(Item_GObj*, Vec3*, Vec3*, float, float); -/* 2AA7E4 */ HSD_GObj* it_802AA7E4(Item_GObj*); -/* 2AA7F0 */ enum_t it_802AA7F0(Item_GObj*); -/* 2AA8C0 */ HSD_GObj* it_802AA8C0(Item_GObj*, Vec3*, enum_t, float); -/* 2AAA50 */ void it_802AAA50(Item_GObj*); -/* 2AB3F0 */ void it_802AB3F0(Item_GObj*, void*, s32); -/* 2AB568 */ HSD_GObj* it_802AB568(Item_GObj*); -/* 2AB58C */ HSD_GObj* it_802AB58C(Item_GObj* owner, Vec3* pos, - float facing_dir); -/* 2AB9C0 */ void it_802AB9C0(Item_GObj*); /* 2ADDD0 */ void it_802ADDD0(Item_GObj*, s32); /* 2AE1D0 */ void it_802AE1D0(Item_GObj*); /* 2AE538 */ void it_802AE538(Item_GObj*); @@ -36,15 +26,10 @@ /* 2AE8A8 */ Item_GObj* it_802AE8A8(float, Fighter_GObj*, Vec3*, Fighter_Part, ItemKind); /* 2AEAB4 */ void it_802AEAB4(Item_GObj*); -/* 2B1DEC */ s32 it_802B1DEC(u32); -/* 2B1DF8 */ u32 it_802B1DF8(Item_GObj*, Vec3*, Vec3*, s32, s32, s32); -/* 2B1FC8 */ s32 it_802B1FC8(u32); -/* 2B1FE8 */ void it_802B1FE8(u32, Vec3*); /* 2B2560 */ HSD_GObj* it_802B2560(Item_GObj*, float, Vec3*, long, u32); /* 2B2674 */ void it_802B2674(Item_GObj*); /* 2B26C0 */ void it_802B26C0(Item_GObj*); /* 2B26E0 */ void it_802B26E0(Item_GObj*); -/* 2B338C */ void it_802B338C(Item_GObj*, Vec3*, float facing_dir, u32); /* 2BAEEC */ void it_802BAEEC(Item_GObj*); /* 2BAF0C */ void it_802BAF0C(Item_GObj*); /* 2BB20C */ void it_802BB20C(Item_GObj*); @@ -54,33 +39,13 @@ /* 2BCFC4 */ void it_802BCFC4(Item_GObj* gobj, float* arg1, itChainSegment* chainSegment, Item* item_data, float arg4); -/* 2BD158 */ void it_802BD158(Item_GObj* gobj, Vec3*, int, float); /* 2BDBF8 */ void it_802BDBF8(Item_GObj* gobj); /* 2BDC18 */ void it_802BDC18(Item_GObj* gobj); /* 2BDC38 */ bool it_802BDC38(Item_GObj* gobj); -/* 2BDE18 */ HSD_GObj* it_802BDE18(Item_GObj*, Vec3*, Fighter_Part, enum_t, - float); -/* 2BDF40 */ void it_802BDF40(Item_GObj* gobj); -/* 2BDFA0 */ void it_802BDFA0(Item_GObj* gobj); -/* 2BDFC0 */ void it_802BDFC0(Item_GObj* gobj); -/* 2BE100 */ void it_802BE100(Item_GObj* gobj); -/* 2BE214 */ void it_802BE214(Item_GObj* gobj, Vec3* pos, enum_t, - float facing_dir); -/* 2BE598 */ void it_802BE598(Item_GObj*); -/* 2BE5B8 */ void it_802BE5B8(Item_GObj*); -/* 2BE5D8 */ void it_802BE5D8(void*, float); -/* 2BE958 */ void it_802BE958(void*); -/* 2BE9D8 */ HSD_GObj* it_802BE9D8(float, HSD_GObj*, Vec3*, s32); -/* 2BFE5C */ void it_802BFE5C(Item_GObj*, Vec3*, float); -/* 2BFEC4 */ void it_802BFEC4(void*); -/* 2C0010 */ void it_802C0010(Item_GObj*, void*); /* 2C0510 */ void it_802C0510(Item_GObj*, Vec3*, s32, s32, float facing_dir); /* 2C0850 */ u32 it_802C0850(Item_GObj*, Vec3*, u32, s32, float facing_direction); /* 2C0DBC */ void it_802C0DBC(u32 arg0); -/* 2C3AF0 */ HSD_GObj* it_802C3AF0(Item_GObj*); -/* 2C3BAC */ HSD_GObj* it_802C3BAC(Item_GObj*, Vec3*, float facing_dir, float); -/* 2C3D44 */ void it_802C3D44(Item_GObj*); /* 2C61F4 */ HSD_GObj* it_802C61F4(Item_GObj*, Vec3*, s32, float); /* 2C6328 */ void it_802C6328(Item_GObj*); /* 2C6374 */ void it_802C6374(Item_GObj*); diff --git a/src/melee/it/items/it_2ADA.c b/src/melee/it/items/it_2ADA.c index 01a4ea5047..44fbf8bbbd 100644 --- a/src/melee/it/items/it_2ADA.c +++ b/src/melee/it/items/it_2ADA.c @@ -5,6 +5,7 @@ #include "it/inlines.h" #include "it/it_266F.h" #include "it/it_26B1.h" +#include "it/it_2725.h" #include "it/itCommonItems.h" #include "it/item.h" diff --git a/src/melee/it/items/itarwinglaser.c b/src/melee/it/items/itarwinglaser.c index 8b13789179..e0d65910fc 100644 --- a/src/melee/it/items/itarwinglaser.c +++ b/src/melee/it/items/itarwinglaser.c @@ -1 +1,13 @@ +#include +#include + +bool it_802E8418(void) +{ + return true; +} + +bool it_802E8784(void) +{ + return true; +} diff --git a/src/melee/it/items/itbat.c b/src/melee/it/items/itbat.c index 263068b8b9..1a0de3b021 100644 --- a/src/melee/it/items/itbat.c +++ b/src/melee/it/items/itbat.c @@ -3,6 +3,7 @@ #include "it/inlines.h" #include "it/it_266F.h" #include "it/it_26B1.h" +#include "it/it_2725.h" #include "it/itCommonItems.h" #include "it/item.h" diff --git a/src/melee/it/items/itbombhei.c b/src/melee/it/items/itbombhei.c index b20c4bb516..3ffa1e9549 100644 --- a/src/melee/it/items/itbombhei.c +++ b/src/melee/it/items/itbombhei.c @@ -1,3 +1,7 @@ +#include + +#include + /// #it_8027D670 /// #it_8027D730 @@ -16,7 +20,10 @@ void it_8027DDE8(void) {} /// #it_8027DE18 -/// #it_8027E018 +bool it_8027E018(void) +{ + return false; +} /// #it_8027E020 @@ -94,11 +101,17 @@ void it_8027FC78(void) {} void it_80280E90(void) {} -/// #it_80280E94 +bool it_80280E94(void) +{ + return false; +} /// #it_80280E9C -/// #it_80281030 +bool it_80281030(void) +{ + return false; +} void it_80281038(void) {} diff --git a/src/melee/it/items/itbox.c b/src/melee/it/items/itbox.c index 26f551dd04..f5d3080cf8 100644 --- a/src/melee/it/items/itbox.c +++ b/src/melee/it/items/itbox.c @@ -1,3 +1,7 @@ +#include + +#include + /// #it_80286088 /// #it_802861CC @@ -20,7 +24,10 @@ void it_80286518(void) {} /// #it_8028655C -/// #it_80286598 +bool it_80286598(void) +{ + return false; +} /// #it_802865A0 @@ -28,7 +35,10 @@ void it_80286518(void) {} /// #it_80286780 -/// #it_802867A8 +bool it_802867A8(void) +{ + return false; +} void it_802867B0(void) {} @@ -48,7 +58,10 @@ void it_802867B0(void) {} void it_80286B94(void) {} -/// #it_80286B98 +bool it_80286B98(void) +{ + return false; +} /// #it_80286BA0 @@ -56,7 +69,10 @@ void it_80286B94(void) {} void it_80286CA8(void) {} -/// #it_80286CAC +bool it_80286CAC(void) +{ + return false; +} /// #it_80286CB4 @@ -70,7 +86,10 @@ void it_80286CA8(void) {} /// #it_80286FC8 -/// #it_80287044 +bool it_80287044(void) +{ + return false; +} void it_8028704C(void) {} @@ -80,10 +99,16 @@ void it_8028704C(void) {} /// #it_802870A4 -/// #it_80287104 +bool it_80287104(void) +{ + return false; +} /// #it_8028710C -/// #it_80287334 +bool it_80287334(void) +{ + return false; +} /// #it_8028733C diff --git a/src/melee/it/items/itcapsule.c b/src/melee/it/items/itcapsule.c index 1393154abf..6330d756ea 100644 --- a/src/melee/it/items/itcapsule.c +++ b/src/melee/it/items/itcapsule.c @@ -8,6 +8,7 @@ #include "it/inlines.h" #include "it/it_266F.h" #include "it/it_26B1.h" +#include "it/it_2725.h" #include "it/itCommonItems.h" #include "it/item.h" #include "it/types.h" diff --git a/src/melee/it/items/itchicoritaleaf.c b/src/melee/it/items/itchicoritaleaf.c index 3a19e0b55a..b19e73c366 100644 --- a/src/melee/it/items/itchicoritaleaf.c +++ b/src/melee/it/items/itchicoritaleaf.c @@ -1,8 +1,16 @@ +#include +#include "it/forward.h" + +#include + /// #it_802C9B20 /// #it_802C9C20 -/// #it_802C9C78 +bool it_802C9C78(Item_GObj* arg0) +{ + return false; +} /// #it_802C9C80 diff --git a/src/melee/it/items/itclimbersblizzard.c b/src/melee/it/items/itclimbersblizzard.c index 8b13789179..e46cefb9bb 100644 --- a/src/melee/it/items/itclimbersblizzard.c +++ b/src/melee/it/items/itclimbersblizzard.c @@ -1 +1,29 @@ +#include +#include "it/forward.h" +#include + +bool it_802C2424(Item_GObj* arg0) +{ + return true; +} + +bool it_802C244C(Item_GObj* arg0) +{ + return true; +} + +bool it_802C2454(Item_GObj* arg0) +{ + return true; +} + +bool it_802C245C(Item_GObj* arg0) +{ + return true; +} + +bool it_802C2464(Item_GObj* arg0) +{ + return true; +} diff --git a/src/melee/it/items/itclimbersice.c b/src/melee/it/items/itclimbersice.c index ac80ac1590..2f305d6b0f 100644 --- a/src/melee/it/items/itclimbersice.c +++ b/src/melee/it/items/itclimbersice.c @@ -1,3 +1,8 @@ +#include +#include "it/forward.h" + +#include + /// #it_802C1590 /// #it_802C16F8 @@ -18,7 +23,10 @@ void it_802C1A14(void) {} /// #it_802C1A58 -/// #it_802C1A80 +bool it_802C1A80(void) +{ + return false; +} /// #it_802C1A88 @@ -40,15 +48,24 @@ void it_802C1A14(void) {} /// #it_802C1E94 -/// #it_802C1FC8 +bool it_802C1FC8(Item_GObj* arg0) +{ + return true; +} /// #it_802C1FD0 -/// #it_802C1FF0 +bool it_802C1FF0(Item_GObj* arg0) +{ + return true; +} /// #it_802C1FF8 -/// #it_802C20E4 +bool it_802C20E4(Item_GObj* arg0) +{ + return true; +} /// #it_802C20EC diff --git a/src/melee/it/items/itclinkmilk.c b/src/melee/it/items/itclinkmilk.c index b5f229473c..a8698cd045 100644 --- a/src/melee/it/items/itclinkmilk.c +++ b/src/melee/it/items/itclinkmilk.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802C8B28 @@ -9,6 +12,9 @@ void it_802C8F20(void) {} -/// #it_802C8F24 +bool it_802C8F24(void) +{ + return false; +} /// #it_802C8F2C diff --git a/src/melee/it/items/itcrazyhandbomb.c b/src/melee/it/items/itcrazyhandbomb.c index 3330f0384d..484c6ece67 100644 --- a/src/melee/it/items/itcrazyhandbomb.c +++ b/src/melee/it/items/itcrazyhandbomb.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802F0F6C @@ -11,7 +14,10 @@ /// #it_802F10F8 -/// #it_802F1168 +bool it_802F1168(void) +{ + return false; +} /// #it_802F1170 @@ -25,6 +31,9 @@ void it_802F1340(void) {} void it_802F13A4(void) {} -/// #it_802F13A8 +bool it_802F13A8(void) +{ + return false; +} void it_802F13B0(void) {} diff --git a/src/melee/it/items/itdosei.c b/src/melee/it/items/itdosei.c index 9e534360e3..5cf7c78af0 100644 --- a/src/melee/it/items/itdosei.c +++ b/src/melee/it/items/itdosei.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_80281164 @@ -45,7 +48,10 @@ void it_802826F4(void) {} /// #it_802829FC -/// #it_80282AC0 +bool it_80282AC0(void) +{ + return false; +} /// #it_80282AC8 diff --git a/src/melee/it/items/itegg.c b/src/melee/it/items/itegg.c index ba7c33a619..735fccda08 100644 --- a/src/melee/it/items/itegg.c +++ b/src/melee/it/items/itegg.c @@ -6,6 +6,7 @@ #include "it/inlines.h" #include "it/it_266F.h" #include "it/it_26B1.h" +#include "it/it_2725.h" #include "it/item.h" #include diff --git a/src/melee/it/items/itevyoshiegg.c b/src/melee/it/items/itevyoshiegg.c index 5c2466bd43..4addd44438 100644 --- a/src/melee/it/items/itevyoshiegg.c +++ b/src/melee/it/items/itevyoshiegg.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_8029B0C8 @@ -7,7 +10,10 @@ /// #it_8029B1D8 -/// #it_8029B230 +bool it_8029B230(void) +{ + return false; +} void it_8029B238(void) {} @@ -15,7 +21,10 @@ void it_8029B238(void) {} /// #it_8029B268 -/// #it_8029B290 +bool it_8029B290(void) +{ + return false; +} /// #it_8029B298 @@ -23,7 +32,10 @@ void it_8029B238(void) {} /// #it_8029B2F4 -/// #it_8029B31C +bool it_8029B31C(void) +{ + return false; +} void it_8029B324(void) {} @@ -39,7 +51,10 @@ void it_8029B324(void) {} void it_8029B460(void) {} -/// #it_8029B464 +bool it_8029B464(void) +{ + return false; +} /// #it_8029B46C @@ -53,7 +68,10 @@ void it_8029B460(void) {} /// #it_8029B670 -/// #it_8029B698 +bool it_8029B698(void) +{ + return false; +} void it_8029B6A0(void) {} diff --git a/src/melee/it/items/itfflower.c b/src/melee/it/items/itfflower.c index ca2f043576..4c12bb1933 100644 --- a/src/melee/it/items/itfflower.c +++ b/src/melee/it/items/itfflower.c @@ -7,6 +7,7 @@ #include "it/inlines.h" #include "it/it_266F.h" #include "it/it_26B1.h" +#include "it/it_2725.h" #include "it/item.h" #include diff --git a/src/melee/it/items/itfire.c b/src/melee/it/items/itfire.c index 315c05bb1a..f4bf59e976 100644 --- a/src/melee/it/items/itfire.c +++ b/src/melee/it/items/itfire.c @@ -1,3 +1,7 @@ +#include + +#include + /// #it_802CC6E4 void it_802CC740(void) {} @@ -18,7 +22,10 @@ void it_802CC7D4(void) {} /// #it_802CC91C -/// #it_802CC93C +bool it_802CC93C(void) +{ + return false; +} /// #it_802CC944 diff --git a/src/melee/it/items/itflipper.c b/src/melee/it/items/itflipper.c index 9c520d5781..ea22ec5ea1 100644 --- a/src/melee/it/items/itflipper.c +++ b/src/melee/it/items/itflipper.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_80290938 @@ -13,7 +16,10 @@ /// #it_80290E78 -/// #it_80290EC8 +bool it_80290EC8(void) +{ + return false; +} void it_80290ED0(void) {} @@ -21,7 +27,10 @@ void it_80290ED0(void) {} /// #it_80290F00 -/// #it_80290F28 +bool it_80290F28(void) +{ + return false; +} /// #it_80290F30 @@ -29,7 +38,10 @@ void it_80290ED0(void) {} /// #it_80290F8C -/// #it_80290FB4 +bool it_80290FB4(void) +{ + return false; +} void it_80290FBC(void) {} @@ -71,7 +83,10 @@ void it_80290FBC(void) {} /// #it_80291B58 -/// #it_80291B80 +bool it_80291B80(void) +{ + return false; +} void it_80291B88(void) {} diff --git a/src/melee/it/items/itfoxlaser.c b/src/melee/it/items/itfoxlaser.c index 852404374a..7e390ae8d6 100644 --- a/src/melee/it/items/itfoxlaser.c +++ b/src/melee/it/items/itfoxlaser.c @@ -3,6 +3,7 @@ #include "itfoxlaser.h" #include "it/inlines.h" +#include "it/it_2725.h" #include "it/itCharItems.h" #include "it/types.h" diff --git a/src/melee/it/items/itfreeze.c b/src/melee/it/items/itfreeze.c index 70a2f3380c..bf3eb8abaa 100644 --- a/src/melee/it/items/itfreeze.c +++ b/src/melee/it/items/itfreeze.c @@ -1,4 +1,6 @@ +#include "itfreeze.h" + /// #it_8028EB88 /// #it_8028EC98 @@ -15,7 +17,10 @@ /// #it_8028EF34 -/// #it_8028EF88 +bool it_8028EF88(void) +{ + return false; +} /// #it_8028EF90 @@ -23,7 +28,10 @@ /// #it_8028F1D8 -/// #it_8028F200 +bool it_8028F200(void) +{ + return false; +} /// #it_8028F208 @@ -31,7 +39,10 @@ /// #it_8028F2B4 -/// #it_8028F310 +bool it_8028F310(void) +{ + return false; +} /// #it_8028F318 @@ -41,23 +52,41 @@ /// #it_8028F398 -/// #it_8028F3CC +bool it_8028F3CC(Item_GObj* arg0) +{ + return true; +} -/// #it_8028F3D4 +bool it_8028F3D4(Item_GObj* arg0) +{ + return true; +} -/// #it_8028F3DC +bool it_8028F3DC(Item_GObj* arg0) +{ + return true; +} -/// #it_8028F3E4 +bool it_8028F3E4(Item_GObj* arg0) +{ + return true; +} /// #it_8028F3EC /// #it_8028F40C -/// #it_8028F42C +bool it_8028F42C(Item_GObj* arg0) +{ + return true; +} /// #it_8028F434 -/// #it_8028F4AC +bool it_8028F4AC(void) +{ + return false; +} /// #it_8028F4B4 @@ -65,7 +94,10 @@ /// #it_8028F7C8 -/// #it_8028F828 +bool it_8028F828(void) +{ + return false; +} void it_8028F830(void) {} diff --git a/src/melee/it/items/itfreeze.h b/src/melee/it/items/itfreeze.h index fc182fc24e..f8cf4973b3 100644 --- a/src/melee/it/items/itfreeze.h +++ b/src/melee/it/items/itfreeze.h @@ -14,15 +14,15 @@ /* 28ED50 */ void it_8028ED50(Item_GObj*); /* 28EDBC */ UNK_RET it_8028EDBC(UNK_PARAMS); /* 28EF34 */ UNK_RET it_8028EF34(UNK_PARAMS); -/* 28EF88 */ UNK_RET it_8028EF88(UNK_PARAMS); +/* 28EF88 */ bool it_8028EF88(void); /* 28EF90 */ UNK_RET it_8028EF90(UNK_PARAMS); /* 28EFB0 */ UNK_RET it_8028EFB0(UNK_PARAMS); /* 28F1D8 */ UNK_RET it_8028F1D8(UNK_PARAMS); -/* 28F200 */ UNK_RET it_8028F200(UNK_PARAMS); +/* 28F200 */ bool it_8028F200(void); /* 28F208 */ UNK_RET it_8028F208(UNK_PARAMS); /* 28F238 */ UNK_RET it_8028F238(UNK_PARAMS); /* 28F2B4 */ void it_8028F2B4(Item_GObj*); -/* 28F310 */ UNK_RET it_8028F310(UNK_PARAMS); +/* 28F310 */ bool it_8028F310(void); /* 28F318 */ void it_8028F318(Item_GObj*); /* 28F340 */ void it_8028F340(Item_GObj*); /* 28F368 */ UNK_RET it_8028F368(UNK_PARAMS); @@ -35,11 +35,11 @@ /* 28F40C */ bool it_8028F40C(Item_GObj*); /* 28F42C */ bool it_8028F42C(Item_GObj*); /* 28F434 */ UNK_RET it_8028F434(UNK_PARAMS); -/* 28F4AC */ UNK_RET it_8028F4AC(UNK_PARAMS); +/* 28F4AC */ bool it_8028F4AC(void); /* 28F4B4 */ UNK_RET it_8028F4B4(UNK_PARAMS); /* 28F560 */ UNK_RET it_8028F560(UNK_PARAMS); /* 28F7C8 */ UNK_RET it_8028F7C8(UNK_PARAMS); -/* 28F828 */ UNK_RET it_8028F828(UNK_PARAMS); +/* 28F828 */ bool it_8028F828(void); /* 28F830 */ UNK_RET it_8028F830(UNK_PARAMS); /* 28F834 */ UNK_RET it_8028F834(UNK_PARAMS); /* 28F8C4 */ void it_8028F8C4(Item_GObj*, Item_GObj*); diff --git a/src/melee/it/items/itfreezer.c b/src/melee/it/items/itfreezer.c index 991b6a68fb..5db73456d1 100644 --- a/src/melee/it/items/itfreezer.c +++ b/src/melee/it/items/itfreezer.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802CCF9C @@ -19,7 +22,10 @@ void it_802CD060(void) {} /// #it_802CD230 -/// #it_802CD288 +bool it_802CD288(void) +{ + return false; +} /// #it_802CD290 diff --git a/src/melee/it/items/itfushigibana.c b/src/melee/it/items/itfushigibana.c index 99db394859..bb684715f8 100644 --- a/src/melee/it/items/itfushigibana.c +++ b/src/melee/it/items/itfushigibana.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802D6FD0 @@ -21,7 +24,10 @@ void it_802D72E4(void) {} /// #it_802D7328 -/// #it_802D736C +bool it_802D736C(void) +{ + return false; +} /// #it_802D7374 diff --git a/src/melee/it/items/itgamewatchrescue.c b/src/melee/it/items/itgamewatchrescue.c index ff5059ee98..019ac69953 100644 --- a/src/melee/it/items/itgamewatchrescue.c +++ b/src/melee/it/items/itgamewatchrescue.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802C8038 @@ -13,6 +16,9 @@ void it_802C8350(void) {} -/// #it_802C8354 +bool it_802C8354(void) +{ + return false; +} /// #it_802C835C diff --git a/src/melee/it/items/itgreatfoxlaser.c b/src/melee/it/items/itgreatfoxlaser.c index 8b13789179..e7e1a84d11 100644 --- a/src/melee/it/items/itgreatfoxlaser.c +++ b/src/melee/it/items/itgreatfoxlaser.c @@ -1 +1,18 @@ +#include +#include + +bool it_802EB444(void) +{ + return false; +} + +bool it_802EB44C(void) +{ + return false; +} + +bool it_802EB454(void) +{ + return false; +} diff --git a/src/melee/it/items/itgshell.c b/src/melee/it/items/itgshell.c index 704ded03a5..2ad4f82fc6 100644 --- a/src/melee/it/items/itgshell.c +++ b/src/melee/it/items/itgshell.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_8028B8D8 @@ -13,7 +16,10 @@ /// #it_8028BE54 -/// #it_8028BEE8 +bool it_8028BEE8(void) +{ + return false; +} void it_8028BEF0(void) {} @@ -29,7 +35,10 @@ void it_8028BEF0(void) {} /// #it_8028C148 -/// #it_8028C1A0 +bool it_8028C1A0(void) +{ + return false; +} void it_8028C1A8(void) {} @@ -67,7 +76,10 @@ void it_8028C1A8(void) {} /// #it_8028CB24 -/// #it_8028CB70 +bool it_8028CB70(void) +{ + return false; +} void it_8028CB78(void) {} diff --git a/src/melee/it/items/ithammerhead.c b/src/melee/it/items/ithammerhead.c index 132a1273e1..8bc143f89d 100644 --- a/src/melee/it/items/ithammerhead.c +++ b/src/melee/it/items/ithammerhead.c @@ -1,3 +1,7 @@ +#include +#include "it/forward.h" + +#include /// #it_80299C48 @@ -7,7 +11,10 @@ /// #it_80299DD0 -/// #it_80299E1C +bool it_80299E1C(void) +{ + return false; +} void it_80299E24(void) {} @@ -31,14 +38,26 @@ void it_8029A080(void) {} /// #it_8029A084 -/// #it_8029A0B0 +bool it_8029A0B0(Item_GObj* arg0) +{ + return false; +} -/// #it_8029A0B8 +bool it_8029A0B8(Item_GObj* arg0) +{ + return false; +} -/// #it_8029A0C0 +bool it_8029A0C0(Item_GObj* arg0) +{ + return false; +} /// #it_8029A0C8 -/// #it_8029A0EC +bool it_8029A0EC(Item_GObj* arg0) +{ + return false; +} /// #it_8029A0F4 diff --git a/src/melee/it/items/itharisen.c b/src/melee/it/items/itharisen.c index 94ecac0e24..3161f8ba8c 100644 --- a/src/melee/it/items/itharisen.c +++ b/src/melee/it/items/itharisen.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802927E8 @@ -7,7 +10,10 @@ /// #it_8029287C -/// #it_802928D4 +bool it_802928D4(void) +{ + return false; +} void it_802928DC(void) {} @@ -15,7 +21,10 @@ void it_802928DC(void) {} /// #it_8029290C -/// #it_80292934 +bool it_80292934(void) +{ + return false; +} /// #it_8029293C @@ -31,7 +40,10 @@ void it_802928DC(void) {} /// #it_80292A5C -/// #it_80292A84 +bool it_80292A84(void) +{ + return false; +} void it_80292A8C(void) {} @@ -49,7 +61,10 @@ void it_80292A8C(void) {} /// #it_80292C08 -/// #it_80292C30 +bool it_80292C30(void) +{ + return false; +} void it_80292C38(void) {} diff --git a/src/melee/it/items/itheart.c b/src/melee/it/items/itheart.c index 73bbbe636c..22fa75c91b 100644 --- a/src/melee/it/items/itheart.c +++ b/src/melee/it/items/itheart.c @@ -4,6 +4,7 @@ #include "it/inlines.h" #include "it/it_266F.h" #include "it/it_26B1.h" +#include "it/it_2725.h" #include "it/itCommonItems.h" #include "it/item.h" diff --git a/src/melee/it/items/ithinoarashi.c b/src/melee/it/items/ithinoarashi.c index 8b13789179..1a5a6ca3c4 100644 --- a/src/melee/it/items/ithinoarashi.c +++ b/src/melee/it/items/ithinoarashi.c @@ -1 +1,10 @@ +#include +#include + +/* 2D60C8 */ static bool it_802D60C8(void); + +bool it_802D60C8(void) +{ + return false; +} diff --git a/src/melee/it/items/ithitodeman.c b/src/melee/it/items/ithitodeman.c index 077e9e6136..b59d06e74d 100644 --- a/src/melee/it/items/ithitodeman.c +++ b/src/melee/it/items/ithitodeman.c @@ -1,3 +1,7 @@ +#include +#include "it/forward.h" + +#include /// #it_802D42C4 @@ -15,7 +19,10 @@ void it_802D43AC(void) {} /// #it_802D472C -/// #it_802D48A8 +bool it_802D48A8(void) +{ + return false; +} /// #it_802D48B0 @@ -25,7 +32,10 @@ void it_802D43AC(void) {} /// #it_802D4B14 -/// #it_802D4B48 +bool it_802D4B48(void) +{ + return false; +} void it_802D4B50(void) {} @@ -47,9 +57,15 @@ void it_802D4B50(void) {} /// #it_802D4F28 -/// #it_802D4F48 +bool it_802D4F48(Item_GObj* arg0) +{ + return true; +} -/// #it_802D4F50 +bool it_802D4F50(Item_GObj* arg0) +{ + return true; +} /// #it_802D4F58 @@ -59,4 +75,7 @@ void it_802D4B50(void) {} void it_802D5044(void) {} -/// #it_802D5048 +bool it_802D5048(void) +{ + return false; +} diff --git a/src/melee/it/items/ithouou.c b/src/melee/it/items/ithouou.c index f8dd1a1dbf..587dc933aa 100644 --- a/src/melee/it/items/ithouou.c +++ b/src/melee/it/items/ithouou.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802D251C @@ -9,7 +12,10 @@ void it_802D25B8(void) {} /// #it_802D2640 -/// #it_802D2660 +bool it_802D2660(void) +{ + return false; +} /// #it_802D2668 @@ -17,7 +23,10 @@ void it_802D25B8(void) {} /// #it_802D26FC -/// #it_802D27A8 +bool it_802D27A8(void) +{ + return false; +} /// #it_802D27B0 @@ -25,7 +34,10 @@ void it_802D25B8(void) {} /// #it_802D288C -/// #it_802D2904 +bool it_802D2904(void) +{ + return false; +} /// #it_802D290C @@ -33,7 +45,10 @@ void it_802D25B8(void) {} /// #it_802D29D4 -/// #it_802D2A50 +bool it_802D2A50(void) +{ + return false; +} /// #it_802D2A58 @@ -41,7 +56,10 @@ void it_802D25B8(void) {} /// #it_802D2B24 -/// #it_802D2B44 +bool it_802D2B44(void) +{ + return false; +} /// #it_802D2B4C diff --git a/src/melee/it/items/itkabigon.c b/src/melee/it/items/itkabigon.c index fa5e68c78b..3207a4bba3 100644 --- a/src/melee/it/items/itkabigon.c +++ b/src/melee/it/items/itkabigon.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802C9D40 @@ -25,7 +28,10 @@ void it_802C9DFC(void) {} void it_802CA318(void) {} -/// #it_802CA31C +bool it_802CA31C(void) +{ + return false; +} /// #it_802CA324 diff --git a/src/melee/it/items/itkamex.c b/src/melee/it/items/itkamex.c index 763dc40a75..aed71b80bb 100644 --- a/src/melee/it/items/itkamex.c +++ b/src/melee/it/items/itkamex.c @@ -1,3 +1,7 @@ +#include +#include "it/forward.h" + +#include /// #it_802CA49C @@ -45,9 +49,15 @@ void it_802CA534(void) {} /// #it_802CACD0 -/// #it_802CADC0 +bool it_802CADC0(Item_GObj* arg0) +{ + return true; +} -/// #it_802CADC8 +bool it_802CADC8(Item_GObj* arg0) +{ + return false; +} /// #it_802CADD0 diff --git a/src/melee/it/items/itkirby_2F23.c b/src/melee/it/items/itkirby_2F23.c index ce57136659..7b9bbc1045 100644 --- a/src/melee/it/items/itkirby_2F23.c +++ b/src/melee/it/items/itkirby_2F23.c @@ -1,22 +1,37 @@ +#include + +#include /// #it_802F23AC /// #it_802F23EC -/// #it_802F2578 +bool it_802F2578(void) +{ + return false; +} void it_802F2580(void) {} -/// #it_802F2584 +bool it_802F2584(void) +{ + return false; +} /// #it_802F258C /// #it_802F2810 -/// #it_802F2888 +bool it_802F2888(void) +{ + return false; +} void it_802F2890(void) {} -/// #it_802F2894 +bool it_802F2894(void) +{ + return false; +} /// #it_802F289C diff --git a/src/melee/it/items/itkirbycutterbeam.c b/src/melee/it/items/itkirbycutterbeam.c index 8b13789179..0e51ffc192 100644 --- a/src/melee/it/items/itkirbycutterbeam.c +++ b/src/melee/it/items/itkirbycutterbeam.c @@ -1 +1,40 @@ +#include +#include "it/forward.h" +#include + +/// #it_8029BAB8 + +/// #it_8029BB90 + +/// #it_8029BC88 + +/// #it_8029BCA8 + +/// #it_8029BDD4 + +bool it_8029BFB4(Item_GObj* arg0) +{ + return false; +} + +bool it_8029BFBC(Item_GObj* arg0) +{ + return true; +} + +bool it_8029BFC4(Item_GObj* arg0) +{ + return true; +} + +/// #it_8029BFCC + +/// #it_8029C208 + +bool it_8029C4AC(Item_GObj* arg0) +{ + return true; +} + +/// #it_8029C4B4 diff --git a/src/melee/it/items/itkirbycutterbeam.h b/src/melee/it/items/itkirbycutterbeam.h index 5d1a7c7b27..a4b0b1b5cd 100644 --- a/src/melee/it/items/itkirbycutterbeam.h +++ b/src/melee/it/items/itkirbycutterbeam.h @@ -6,6 +6,11 @@ #include "it/items/types.h" +/* 29BAB8 */ UNK_RET it_8029BAB8(UNK_PARAMS); +/* 29BB90 */ UNK_RET it_8029BB90(UNK_PARAMS); +/* 29BC88 */ UNK_RET it_8029BC88(UNK_PARAMS); +/* 29BCA8 */ UNK_RET it_8029BCA8(UNK_PARAMS); +/* 29BDD4 */ UNK_RET it_8029BDD4(UNK_PARAMS); /* 29BFB4 */ bool it_8029BFB4(Item_GObj*); /* 29BFBC */ bool it_8029BFBC(Item_GObj*); /* 29BFC4 */ bool it_8029BFC4(Item_GObj*); diff --git a/src/melee/it/items/itkirbyhammer.c b/src/melee/it/items/itkirbyhammer.c index af30af6507..0c6ebddd3f 100644 --- a/src/melee/it/items/itkirbyhammer.c +++ b/src/melee/it/items/itkirbyhammer.c @@ -4,8 +4,8 @@ #include "ef/efasync.h" #include "ft/chara/ftKirby/ftKb_Init.h" #include "it/inlines.h" -#include "it/it_266F.h" #include "it/it_26B1.h" +#include "it/it_2725.h" #include "it/item.h" ItemStateTable it_803F6C98[] = { diff --git a/src/melee/it/items/itklap.c b/src/melee/it/items/itklap.c index e9e03b541c..bb7fe42b61 100644 --- a/src/melee/it/items/itklap.c +++ b/src/melee/it/items/itklap.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802E1820 @@ -7,7 +10,10 @@ /// #it_802E1930 -/// #it_802E1968 +bool it_802E1968(void) +{ + return false; +} /// #it_802E1970 @@ -17,29 +23,47 @@ /// #it_802E1C84 -/// #it_802E1D24 +bool it_802E1D24(void) +{ + return false; +} /// #it_802E1D2C -/// #it_802E1E54 +bool it_802E1E54(void) +{ + return false; +} /// #it_802E1E5C /// #it_802E1E94 -/// #it_802E1F2C +bool it_802E1F2C(void) +{ + return false; +} /// #it_802E1F34 -/// #it_802E20D0 +bool it_802E20D0(void) +{ + return false; +} /// #it_802E20D8 -/// #it_802E2148 +bool it_802E2148(void) +{ + return false; +} void it_802E2150(void) {} -/// #it_802E2154 +bool it_802E2154(void) +{ + return false; +} /// #it_802E215C diff --git a/src/melee/it/items/itklap.h b/src/melee/it/items/itklap.h index f5573deaae..659a300e04 100644 --- a/src/melee/it/items/itklap.h +++ b/src/melee/it/items/itklap.h @@ -1,6 +1,8 @@ #ifndef GALE01_2E1820 #define GALE01_2E1820 +#include "it/forward.h" + #include /* 2E1820 */ UNK_RET it_802E1820(UNK_PARAMS); @@ -20,7 +22,7 @@ /* 2E1F2C */ UNK_RET it_802E1F2C(UNK_PARAMS); /* 2E1F34 */ UNK_RET it_802E1F34(UNK_PARAMS); /* 2E20D0 */ UNK_RET it_802E20D0(UNK_PARAMS); -/* 2E20D8 */ UNK_RET it_802E20D8(UNK_PARAMS); +/* 2E20D8 */ void it_802E20D8(Item_GObj*); /* 2E2148 */ UNK_RET it_802E2148(UNK_PARAMS); /* 2E2150 */ UNK_RET it_802E2150(UNK_PARAMS); /* 2E2154 */ UNK_RET it_802E2154(UNK_PARAMS); diff --git a/src/melee/it/items/itkoopaflame.c b/src/melee/it/items/itkoopaflame.c index 8b13789179..de2a4df7be 100644 --- a/src/melee/it/items/itkoopaflame.c +++ b/src/melee/it/items/itkoopaflame.c @@ -1 +1,19 @@ +#include +#include "it/forward.h" +#include + +bool it_802AD2E8(Item_GObj* arg0) +{ + return false; +} + +bool it_802AD384(Item_GObj* arg0) +{ + return false; +} + +bool it_802AD450(Item_GObj* arg0) +{ + return false; +} diff --git a/src/melee/it/items/itkusudama.c b/src/melee/it/items/itkusudama.c index 3ee575e159..5c35a857ad 100644 --- a/src/melee/it/items/itkusudama.c +++ b/src/melee/it/items/itkusudama.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802896CC @@ -47,13 +50,19 @@ void it_8028A7F0(void) {} /// #it_8028A93C -/// #it_8028A964 +bool it_8028A964(void) +{ + return false; +} void it_8028A96C(void) {} /// #it_8028A970 -/// #it_8028A9AC +bool it_8028A9AC(void) +{ + return false; +} /// #it_8028A9B4 @@ -69,7 +78,10 @@ void it_8028A96C(void) {} void it_8028AD38(void) {} -/// #it_8028AD3C +bool it_8028AD3C(void) +{ + return false; +} /// #it_8028AD44 @@ -77,7 +89,10 @@ void it_8028AD38(void) {} void it_8028AE98(void) {} -/// #it_8028AE9C +bool it_8028AE9C(void) +{ + return false; +} /// #it_8028AEA4 diff --git a/src/melee/it/items/itleadead.c b/src/melee/it/items/itleadead.c index 4bc018a8d3..7fa96a86e7 100644 --- a/src/melee/it/items/itleadead.c +++ b/src/melee/it/items/itleadead.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802E8BCC @@ -5,7 +8,10 @@ /// #it_802E8F24 -/// #it_802E8F7C +bool it_802E8F7C(void) +{ + return false; +} /// #it_802E8F84 @@ -21,7 +27,10 @@ /// #it_802E9308 -/// #it_802E9354 +bool it_802E9354(void) +{ + return false; +} /// #it_802E935C @@ -49,7 +58,10 @@ /// #it_802E98E0 -/// #it_802E9948 +bool it_802E9948(void) +{ + return false; +} /// #it_802E9950 @@ -73,7 +85,10 @@ void it_802E9D10(void) {} /// #it_802E9D50 -/// #it_802E9D94 +bool it_802E9D94(void) +{ + return false; +} /// #it_802E9D9C @@ -83,7 +98,10 @@ void it_802E9D10(void) {} void it_802EA004(void) {} -/// #it_802EA008 +bool it_802EA008(void) +{ + return false; +} /// #it_802EA010 @@ -109,7 +127,10 @@ void it_802EA150(void) {} /// #it_802EA2A0 -/// #it_802EA308 +bool it_802EA308(void) +{ + return false; +} void it_802EA310(void) {} @@ -117,13 +138,19 @@ void it_802EA310(void) {} /// #it_802EA334 -/// #it_802EA394 +bool it_802EA394(void) +{ + return false; +} /// #it_802EA39C /// #it_802EA3B8 -/// #it_802EA3D8 +bool it_802EA3D8(void) +{ + return false; +} /// #it_802EA3E0 diff --git a/src/melee/it/items/itlgun.c b/src/melee/it/items/itlgun.c index 71685bba4f..d2337b9987 100644 --- a/src/melee/it/items/itlgun.c +++ b/src/melee/it/items/itlgun.c @@ -5,6 +5,7 @@ #include "it/inlines.h" #include "it/it_266F.h" #include "it/it_26B1.h" +#include "it/it_2725.h" #include "it/types.h" #include diff --git a/src/melee/it/items/itlgunray.c b/src/melee/it/items/itlgunray.c index 15e0144150..a1c45a4c5c 100644 --- a/src/melee/it/items/itlgunray.c +++ b/src/melee/it/items/itlgunray.c @@ -2,8 +2,8 @@ #include "db/db_2253.h" #include "it/inlines.h" -#include "it/it_266F.h" #include "it/it_26B1.h" +#include "it/it_2725.h" #include "it/items/itfoxlaser.h" #include "it/types.h" #include "lb/lbvector.h" diff --git a/src/melee/it/items/itlikelike.c b/src/melee/it/items/itlikelike.c index 5dc13c6916..4232f592bc 100644 --- a/src/melee/it/items/itlikelike.c +++ b/src/melee/it/items/itlikelike.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802D9A2C @@ -43,7 +46,10 @@ /// #it_802DAA10 -/// #it_802DAAD0 +bool it_802DAAD0(void) +{ + return false; +} /// #it_802DAAD8 @@ -61,7 +67,10 @@ /// #it_802DAD18 -/// #it_802DAE0C +bool it_802DAE0C(void) +{ + return false; +} /// #it_802DAE14 @@ -145,7 +154,10 @@ void it_802DBF2C(void) {} /// #it_802DC000 -/// #it_802DC050 +bool it_802DC050(void) +{ + return false; +} /// #it_802DC058 @@ -153,7 +165,10 @@ void it_802DBF2C(void) {} /// #it_802DC0AC -/// #it_802DC114 +bool it_802DC114(void) +{ + return false; +} /// #it_802DC11C @@ -169,7 +184,10 @@ void it_802DC3B8(void) {} /// #it_802DC3DC -/// #it_802DC43C +bool it_802DC43C(void) +{ + return false; +} /// #it_802DC444 diff --git a/src/melee/it/items/itlinkhookshot.c b/src/melee/it/items/itlinkhookshot.c index 90e9e6488e..542b0df83a 100644 --- a/src/melee/it/items/itlinkhookshot.c +++ b/src/melee/it/items/itlinkhookshot.c @@ -7,20 +7,17 @@ #include "ft/chara/ftCommon/ftCo_AirCatch.h" #include "ft/chara/ftCommon/ftCo_CliffJump.h" #include "ft/chara/ftCommon/ftCo_DamageFall.h" -#include "ft/chara/ftCommon/inlines.h" #include "ft/ft_081B.h" #include "ft/ftcliffcommon.h" #include "ft/ftcoll.h" #include "ft/ftcommon.h" -#include "ft/ftlib.h" #include "ft/ftparts.h" #include "ft/inlines.h" #include "it/inlines.h" -#include "it/it_266F.h" +#include "it/it_2725.h" #include "it/item.h" #include "lb/lbaudio_ax.h" #include "lb/lbvector.h" -#include "MetroTRK/intrinsics.h" #include "mp/mpcoll.h" #include "mp/mpisland.h" #include "mp/mplib.h" @@ -28,7 +25,8 @@ #include "sysdolphin/baselib/gobjobject.h" #include "sysdolphin/baselib/gobjplink.h" #include "sysdolphin/baselib/jobj.h" -#include "sysdolphin/baselib/mtx.h" + +#include ItemStateTable it_803F6998[] = { { -1, diff --git a/src/melee/it/items/itlipstick.c b/src/melee/it/items/itlipstick.c index 3bbbffe334..adc3e4ff27 100644 --- a/src/melee/it/items/itlipstick.c +++ b/src/melee/it/items/itlipstick.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_8029570C @@ -7,7 +10,10 @@ /// #it_802957AC -/// #it_80295804 +bool it_80295804(void) +{ + return false; +} void it_8029580C(void) {} @@ -15,7 +21,10 @@ void it_8029580C(void) {} /// #it_8029583C -/// #it_80295864 +bool it_80295864(void) +{ + return false; +} /// #it_8029586C @@ -41,7 +50,10 @@ void it_80295904(void) {} /// #it_80295B08 -/// #it_80295B30 +bool it_80295B30(void) +{ + return false; +} void it_80295B38(void) {} diff --git a/src/melee/it/items/itlipstickspore.c b/src/melee/it/items/itlipstickspore.c index 8b13789179..a9e88328a8 100644 --- a/src/melee/it/items/itlipstickspore.c +++ b/src/melee/it/items/itlipstickspore.c @@ -1 +1,55 @@ +#include +#include "it/forward.h" +#include + +/* 29A5F8 */ static bool it_8029A5F8(void); + +/// #it_8029A114 + +/// #it_8029A218 + +/// #it_8029A31C + +/// #it_8029A498 + +/// #it_8029A504 + +/// #it_8029A524 + +/// #it_8029A58C + +/// #it_8029A5C0 + +/// #it_8029A5E0 + +bool it_8029A5F8(void) +{ + return false; +} + +bool it_8029A600(Item_GObj* arg0) +{ + return true; +} + +bool it_8029A608(Item_GObj* arg0) +{ + return true; +} + +bool it_8029A610(Item_GObj* arg0) +{ + return true; +} + +bool it_8029A618(Item_GObj* arg0) +{ + return true; +} + +/// #it_8029A620 + +/// #it_8029A704 + +/// #it_8029A728 diff --git a/src/melee/it/items/itlipstickspore.h b/src/melee/it/items/itlipstickspore.h index 75b29923bc..3ee711d5ae 100644 --- a/src/melee/it/items/itlipstickspore.h +++ b/src/melee/it/items/itlipstickspore.h @@ -6,6 +6,16 @@ #include "it/items/types.h" +/* 29A114 */ UNK_RET it_8029A114(UNK_PARAMS); +/* 29A218 */ UNK_RET it_8029A218(UNK_PARAMS); +/* 29A31C */ UNK_RET it_8029A31C(UNK_PARAMS); +/* 29A498 */ UNK_RET it_8029A498(UNK_PARAMS); +/* 29A504 */ UNK_RET it_8029A504(UNK_PARAMS); +/* 29A524 */ UNK_RET it_8029A524(UNK_PARAMS); +/* 29A58C */ UNK_RET it_8029A58C(UNK_PARAMS); +/* 29A5C0 */ UNK_RET it_8029A5C0(UNK_PARAMS); +/* 29A5E0 */ UNK_RET it_8029A5E0(UNK_PARAMS); +/* 29A5F8 */ UNK_RET it_8029A5F8(UNK_PARAMS); /* 29A600 */ bool it_8029A600(Item_GObj*); /* 29A608 */ bool it_8029A608(Item_GObj*); /* 29A610 */ bool it_8029A610(Item_GObj*); diff --git a/src/melee/it/items/itlizardon.c b/src/melee/it/items/itlizardon.c index f765c4a5d1..96d2910836 100644 --- a/src/melee/it/items/itlizardon.c +++ b/src/melee/it/items/itlizardon.c @@ -1,3 +1,7 @@ +#include +#include "it/forward.h" + +#include /// #it_802CB8AC @@ -55,9 +59,15 @@ void it_802CB93C(void) {} /// #it_802CC5A4 -/// #it_802CC5C4 +bool it_802CC5C4(Item_GObj* arg0) +{ + return true; +} -/// #it_802CC5CC +bool it_802CC5CC(Item_GObj* arg0) +{ + return true; +} /// #it_802CC5D4 diff --git a/src/melee/it/items/itlucky.c b/src/melee/it/items/itlucky.c index db41e1e6a2..aa0ca8c15c 100644 --- a/src/melee/it/items/itlucky.c +++ b/src/melee/it/items/itlucky.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802D5050 @@ -21,13 +24,19 @@ void it_802D53F0(void) {} /// #it_802D546C -/// #it_802D54C4 +bool it_802D54C4(void) +{ + return false; +} /// #it_802D54CC /// #it_802D54FC -/// #it_802D5528 +bool it_802D5528(void) +{ + return false; +} /// #it_802D5530 @@ -65,7 +74,10 @@ void it_802D58BC(void) {} /// #it_802D59A8 -/// #it_802D59D0 +bool it_802D59D0(void) +{ + return false; +} void it_802D59D8(void) {} diff --git a/src/melee/it/items/itlugia.c b/src/melee/it/items/itlugia.c index 2094c171fc..59ebd26883 100644 --- a/src/melee/it/items/itlugia.c +++ b/src/melee/it/items/itlugia.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802D1438 @@ -9,7 +12,10 @@ void it_802D14D0(void) {} /// #it_802D1558 -/// #it_802D1578 +bool it_802D1578(void) +{ + return false; +} /// #it_802D1580 @@ -17,7 +23,10 @@ void it_802D14D0(void) {} /// #it_802D1620 -/// #it_802D16CC +bool it_802D16CC(void) +{ + return false; +} /// #it_802D16D4 @@ -25,7 +34,10 @@ void it_802D14D0(void) {} /// #it_802D17B0 -/// #it_802D1828 +bool it_802D1828(void) +{ + return false; +} /// #it_802D1830 @@ -33,7 +45,10 @@ void it_802D14D0(void) {} /// #it_802D19C0 -/// #it_802D1A3C +bool it_802D1A3C(void) +{ + return false; +} /// #it_802D1A44 @@ -41,7 +56,10 @@ void it_802D14D0(void) {} /// #it_802D1B94 -/// #it_802D1BB4 +bool it_802D1BB4(void) +{ + return false; +} /// #it_802D1BBC diff --git a/src/melee/it/items/itluigifireball.c b/src/melee/it/items/itluigifireball.c index 0719807d16..af2d34be7c 100644 --- a/src/melee/it/items/itluigifireball.c +++ b/src/melee/it/items/itluigifireball.c @@ -12,7 +12,6 @@ #include "it/item.h" #include -#include #include #include #include diff --git a/src/melee/it/items/itmaril.c b/src/melee/it/items/itmaril.c index 8b13789179..1b4869aec6 100644 --- a/src/melee/it/items/itmaril.c +++ b/src/melee/it/items/itmaril.c @@ -1 +1,75 @@ +#include +#include "it/forward.h" +#include + +/// #it_802D66F8 + +/// #it_802D6740 + +/// #it_802D6798 + +bool it_802D6808(Item_GObj* arg0) +{ + return false; +} + +/// #it_802D6810 + +bool it_802D6830(Item_GObj* arg0) +{ + return true; +} + +bool it_802D6838(Item_GObj* arg0) +{ + return false; +} + +bool it_802D6840(Item_GObj* arg0) +{ + return true; +} + +bool it_802D6848(Item_GObj* arg0) +{ + return true; +} + +/// #it_802D6850 + +/// #it_802D6870 + +/// #it_802D68FC + +/// #it_802D6978 + +/// #it_802D699C + +/// #it_802D69BC + +/// #it_802D69E4 + +/// #it_802D6A54 + +/// #it_802D6AD4 + +/// #it_802D6C2C + +/// #it_802D6C60 + +/// #it_802D6DDC + +/// #it_802D6E04 + +/// #it_802D6E3C + +/// #it_802D6E6C + +/// #it_802D6E98 + +/// #it_802D6ED0 + +/// #it_802D6F00 + +/// #it_802D6FB0 diff --git a/src/melee/it/items/itmaril.h b/src/melee/it/items/itmaril.h index 495df788ef..1fa2ed2568 100644 --- a/src/melee/it/items/itmaril.h +++ b/src/melee/it/items/itmaril.h @@ -6,6 +6,9 @@ #include "it/items/types.h" +/* 2D66F8 */ UNK_RET it_802D66F8(UNK_PARAMS); +/* 2D6740 */ UNK_RET it_802D6740(UNK_PARAMS); +/* 2D6798 */ UNK_RET it_802D6798(UNK_PARAMS); /* 2D6808 */ bool it_802D6808(Item_GObj*); /* 2D6810 */ bool it_802D6810(Item_GObj*); /* 2D6830 */ bool it_802D6830(Item_GObj*); @@ -14,6 +17,21 @@ /* 2D6848 */ bool it_802D6848(Item_GObj*); /* 2D6850 */ void it_802D6850(Item_GObj*, Item_GObj*); /* 2D6870 */ void it_802D6870(Item_GObj*); +/* 2D68FC */ UNK_RET it_802D68FC(UNK_PARAMS); +/* 2D6978 */ UNK_RET it_802D6978(UNK_PARAMS); +/* 2D699C */ UNK_RET it_802D699C(UNK_PARAMS); +/* 2D69BC */ UNK_RET it_802D69BC(UNK_PARAMS); +/* 2D69E4 */ UNK_RET it_802D69E4(UNK_PARAMS); +/* 2D6A54 */ UNK_RET it_802D6A54(UNK_PARAMS); +/* 2D6AD4 */ UNK_RET it_802D6AD4(UNK_PARAMS); +/* 2D6C2C */ UNK_RET it_802D6C2C(UNK_PARAMS); +/* 2D6C60 */ UNK_RET it_802D6C60(UNK_PARAMS); +/* 2D6DDC */ UNK_RET it_802D6DDC(UNK_PARAMS); +/* 2D6E04 */ UNK_RET it_802D6E04(UNK_PARAMS); +/* 2D6E3C */ UNK_RET it_802D6E3C(UNK_PARAMS); +/* 2D6E6C */ UNK_RET it_802D6E6C(UNK_PARAMS); +/* 2D6E98 */ UNK_RET it_802D6E98(UNK_PARAMS); +/* 2D6ED0 */ UNK_RET it_802D6ED0(UNK_PARAMS); /* 2D6F00 */ bool it_802D6F00(Item_GObj*); /* 2D6FB0 */ void it_802D6FB0(Item_GObj*, Item_GObj*); /* 3F82B0 */ extern ItemStateTable it_803F82B0[]; diff --git a/src/melee/it/items/itmasterhandbullet.c b/src/melee/it/items/itmasterhandbullet.c index 970083f41c..9febc920c8 100644 --- a/src/melee/it/items/itmasterhandbullet.c +++ b/src/melee/it/items/itmasterhandbullet.c @@ -1,3 +1,7 @@ +#include +#include "it/forward.h" + +#include /// #it_802F0AE0 @@ -17,14 +21,26 @@ void it_802F0F04(void) {} void it_802F0F08(void) {} -/// #it_802F0F0C +bool it_802F0F0C(Item_GObj* arg0) +{ + return true; +} /// #it_802F0F14 -/// #it_802F0F34 +bool it_802F0F34(Item_GObj* arg0) +{ + return true; +} -/// #it_802F0F3C +bool it_802F0F3C(Item_GObj* arg0) +{ + return true; +} /// #it_802F0F44 -/// #it_802F0F64 +bool it_802F0F64(Item_GObj* arg0) +{ + return true; +} diff --git a/src/melee/it/items/itmasterhandlaser.c b/src/melee/it/items/itmasterhandlaser.c index 7b1d334b91..60ec031036 100644 --- a/src/melee/it/items/itmasterhandlaser.c +++ b/src/melee/it/items/itmasterhandlaser.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802F0340 @@ -11,7 +14,10 @@ void it_802F059C(void) {} -/// #it_802F05A0 +bool it_802F05A0(void) +{ + return false; +} /// #it_802F05A8 diff --git a/src/melee/it/items/itmatadogas.c b/src/melee/it/items/itmatadogas.c index 2153b2aff7..c68b147301 100644 --- a/src/melee/it/items/itmatadogas.c +++ b/src/melee/it/items/itmatadogas.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802CAFD4 @@ -41,4 +44,7 @@ void it_802CB280(void) {} /// #it_802CB844 -/// #it_802CB8A4 +bool it_802CB8A4(void) +{ + return false; +} diff --git a/src/melee/it/items/itmball.c b/src/melee/it/items/itmball.c index 4983ccee7e..f70aadb48b 100644 --- a/src/melee/it/items/itmball.c +++ b/src/melee/it/items/itmball.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802978DC @@ -5,7 +8,10 @@ /// #it_80297944 -/// #it_8029799C +bool it_8029799C(void) +{ + return false; +} void it_802979A4(void) {} @@ -13,7 +19,10 @@ void it_802979A4(void) {} /// #it_802979D4 -/// #it_80297A1C +bool it_80297A1C(void) +{ + return false; +} /// #it_80297A24 @@ -21,7 +30,10 @@ void it_802979A4(void) {} /// #it_80297ABC -/// #it_80297AE4 +bool it_80297AE4(void) +{ + return false; +} void it_80297AEC(void) {} @@ -37,7 +49,10 @@ void it_80297AEC(void) {} /// #it_80297BF8 -/// #it_80297C84 +bool it_80297C84(void) +{ + return false; +} void it_80297C8C(void) {} diff --git a/src/melee/it/items/itmewtwodisable.c b/src/melee/it/items/itmewtwodisable.c index 8813bce741..f5106aeb17 100644 --- a/src/melee/it/items/itmewtwodisable.c +++ b/src/melee/it/items/itmewtwodisable.c @@ -1,3 +1,7 @@ +#include +#include "it/forward.h" + +#include /// #it_802C49E0 @@ -15,16 +19,31 @@ void it_802C4C3C(void) {} /// #it_802C4C40 -/// #it_802C4C90 +bool it_802C4C90(Item_GObj* arg0) +{ + return true; +} /// #it_802C4C98 -/// #it_802C4CB8 - -/// #it_802C4CC0 - -/// #it_802C4CC8 - -/// #it_802C4CD0 +bool it_802C4CB8(Item_GObj* arg0) +{ + return true; +} + +bool it_802C4CC0(Item_GObj* arg0) +{ + return true; +} + +bool it_802C4CC8(Item_GObj* arg0) +{ + return true; +} + +bool it_802C4CD0(Item_GObj* arg0) +{ + return true; +} /// #it_802C4CD8 diff --git a/src/melee/it/items/itmewtwoshadowball.c b/src/melee/it/items/itmewtwoshadowball.c index 7fad6251b0..a9cd267d07 100644 --- a/src/melee/it/items/itmewtwoshadowball.c +++ b/src/melee/it/items/itmewtwoshadowball.c @@ -1,3 +1,4 @@ +#include "itmewtwoshadowball.h" /// #it_802C4D10 @@ -19,7 +20,10 @@ void it_802C5B0C(void) {} -/// #it_802C5B10 +bool it_802C5B10(void) +{ + return false; +} /// #it_802C5B18 @@ -43,17 +47,32 @@ void it_802C5DCC(void) {} /// #it_802C6094 -/// #it_802C60AC +bool it_802C60AC(void) +{ + return false; +} -/// #it_802C60B4 +bool it_802C60B4(Item_GObj* arg0) +{ + return true; +} -/// #it_802C60BC +bool it_802C60BC(Item_GObj* arg0) +{ + return true; +} -/// #it_802C60C4 +bool it_802C60C4(Item_GObj* arg0) +{ + return true; +} /// #it_802C60CC -/// #it_802C6138 +bool it_802C6138(Item_GObj* arg0) +{ + return true; +} /// #it_802C6140 diff --git a/src/melee/it/items/itmewtwoshadowball.h b/src/melee/it/items/itmewtwoshadowball.h index 63ec0558e8..49ce9d04a6 100644 --- a/src/melee/it/items/itmewtwoshadowball.h +++ b/src/melee/it/items/itmewtwoshadowball.h @@ -17,7 +17,7 @@ /* 2C578C */ void it_802C578C(Item_GObj*); /* 2C57C8 */ UNK_RET it_802C57C8(UNK_PARAMS); /* 2C5B0C */ UNK_RET it_802C5B0C(UNK_PARAMS); -/* 2C5B10 */ UNK_RET it_802C5B10(UNK_PARAMS); +/* 2C5B10 */ bool it_802C5B10(void); /* 2C5B18 */ UNK_RET it_802C5B18(UNK_PARAMS); /* 2C5BF8 */ UNK_RET it_802C5BF8(UNK_PARAMS); /* 2C5CF4 */ UNK_RET it_802C5CF4(UNK_PARAMS); @@ -29,7 +29,7 @@ /* 2C5E5C */ UNK_RET it_802C5E5C(UNK_PARAMS); /* 2C5F7C */ UNK_RET it_802C5F7C(UNK_PARAMS); /* 2C6094 */ UNK_RET it_802C6094(UNK_PARAMS); -/* 2C60AC */ UNK_RET it_802C60AC(UNK_PARAMS); +/* 2C60AC */ bool it_802C60AC(void); /* 2C60B4 */ bool it_802C60B4(Item_GObj*); /* 2C60BC */ bool it_802C60BC(Item_GObj*); /* 2C60C4 */ bool it_802C60C4(Item_GObj*); diff --git a/src/melee/it/items/itmsbomb.c b/src/melee/it/items/itmsbomb.c index 8b13789179..80a5a6a83d 100644 --- a/src/melee/it/items/itmsbomb.c +++ b/src/melee/it/items/itmsbomb.c @@ -1 +1,61 @@ +/// #it_8028FE90 +/// #it_8028FED4 + +/// #it_8028FF1C + +/// #it_8028FF60 + +/// #it_8028FF8C + +/// #it_80290070 + +/// #it_802900A0 + +/// #it_802900CC + +/// #it_802900F4 + +/// #it_80290114 + +/// #it_802901C0 + +/// #it_8029020C + +/// #it_80290238 + +/// #it_80290314 + +/// #it_80290404 + +/// #it_8029047C + +/// #it_80290560 + +/// #it_802905AC + +/// #it_802905D8 + +/// #it_80290614 + +/// #it_802906C4 + +/// #it_802906E4 + +/// #it_80290738 + +/// #it_80290794 + +/// #it_802907BC + +/// #it_802907F0 + +/// #it_80290830 + +/// #it_80290850 + +/// #it_802908A4 + +/// #it_802908D8 + +/// #it_80290918 diff --git a/src/melee/it/items/itmsbomb.h b/src/melee/it/items/itmsbomb.h index ef0342f82e..ce34e791f4 100644 --- a/src/melee/it/items/itmsbomb.h +++ b/src/melee/it/items/itmsbomb.h @@ -6,18 +6,36 @@ #include "it/items/types.h" -/* 28FED4 */ void it_8028FED4(Item_GObj*); /* 28FE90 */ void it_8028FE90(Item_GObj*); +/* 28FED4 */ void it_8028FED4(Item_GObj*); +/* 28FF1C */ UNK_RET it_8028FF1C(UNK_PARAMS); +/* 28FF60 */ UNK_RET it_8028FF60(UNK_PARAMS); +/* 28FF8C */ UNK_RET it_8028FF8C(UNK_PARAMS); +/* 290070 */ UNK_RET it_80290070(UNK_PARAMS); +/* 2900A0 */ UNK_RET it_802900A0(UNK_PARAMS); /* 2900CC */ void it_802900CC(Item_GObj*); /* 2900F4 */ void it_802900F4(Item_GObj*); /* 290114 */ void it_80290114(Item_GObj*); +/* 2901C0 */ UNK_RET it_802901C0(UNK_PARAMS); +/* 29020C */ UNK_RET it_8029020C(UNK_PARAMS); +/* 290238 */ UNK_RET it_80290238(UNK_PARAMS); +/* 290314 */ UNK_RET it_80290314(UNK_PARAMS); +/* 290404 */ UNK_RET it_80290404(UNK_PARAMS); +/* 29047C */ UNK_RET it_8029047C(UNK_PARAMS); +/* 290560 */ UNK_RET it_80290560(UNK_PARAMS); +/* 2905AC */ UNK_RET it_802905AC(UNK_PARAMS); +/* 2905D8 */ UNK_RET it_802905D8(UNK_PARAMS); +/* 290614 */ UNK_RET it_80290614(UNK_PARAMS); +/* 2906C4 */ UNK_RET it_802906C4(UNK_PARAMS); /* 2906E4 */ bool it_802906E4(Item_GObj*); /* 290738 */ bool it_80290738(Item_GObj*); /* 290794 */ void it_80290794(Item_GObj*); +/* 2907BC */ UNK_RET it_802907BC(UNK_PARAMS); /* 2907F0 */ bool it_802907F0(Item_GObj*); /* 290830 */ bool it_80290830(Item_GObj*); /* 290850 */ bool it_80290850(Item_GObj*); /* 2908A4 */ bool it_802908A4(Item_GObj*); +/* 2908D8 */ UNK_RET it_802908D8(UNK_PARAMS); /* 290918 */ void it_80290918(Item_GObj*, Item_GObj*); /* 3F5E00 */ extern ItemStateTable it_803F5E00[]; diff --git a/src/melee/it/items/itnessbat.c b/src/melee/it/items/itnessbat.c index 2368b70ca8..e998ac0498 100644 --- a/src/melee/it/items/itnessbat.c +++ b/src/melee/it/items/itnessbat.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802AD478 @@ -11,12 +14,18 @@ void it_802AD8D0(void) {} -/// #it_802AD8D4 +bool it_802AD8D4(void) +{ + return false; +} /// #it_802AD8DC void it_802AD9F0(void) {} -/// #it_802AD9F4 +bool it_802AD9F4(void) +{ + return false; +} /// #it_802AD9FC diff --git a/src/melee/it/items/itnesspkfire.c b/src/melee/it/items/itnesspkfire.c index 8b13789179..c0f1a38c7b 100644 --- a/src/melee/it/items/itnesspkfire.c +++ b/src/melee/it/items/itnesspkfire.c @@ -1 +1,32 @@ +#include +#include "it/forward.h" +#include + +/// #it_802AA054 + +/// #it_802AA1D8 + +/// #it_802AA22C + +/// #it_802AA264 + +/// #it_802AA284 + +/// #it_802AA2E8 + +bool it_802AA34C(Item_GObj* arg0) +{ + return true; +} + +bool it_802AA354(Item_GObj* arg0) +{ + return true; +} + +/// #it_802AA35C + +/// #it_802AA37C + +/// #it_802AA474 diff --git a/src/melee/it/items/itnesspkfire.h b/src/melee/it/items/itnesspkfire.h index 7bab9b0b61..30a2104489 100644 --- a/src/melee/it/items/itnesspkfire.h +++ b/src/melee/it/items/itnesspkfire.h @@ -3,9 +3,14 @@ #include #include "it/forward.h" +#include #include "it/items/types.h" +/* 2AA054 */ void it_802AA054(Item_GObj*, Vec3*, Vec3*, float, float); +/* 2AA1D8 */ UNK_RET it_802AA1D8(UNK_PARAMS); +/* 2AA22C */ UNK_RET it_802AA22C(UNK_PARAMS); +/* 2AA264 */ UNK_RET it_802AA264(UNK_PARAMS); /* 2AA284 */ bool it_802AA284(Item_GObj*); /* 2AA2E8 */ bool it_802AA2E8(Item_GObj*); /* 2AA34C */ bool it_802AA34C(Item_GObj*); diff --git a/src/melee/it/items/itnesspkflush.c b/src/melee/it/items/itnesspkflush.c index 8b13789179..61d3e2b1f8 100644 --- a/src/melee/it/items/itnesspkflush.c +++ b/src/melee/it/items/itnesspkflush.c @@ -1 +1,56 @@ +#include "itnesspkflush.h" +/* 2AB29C */ static bool it_802AB29C(void); +/* 2AB2A4 */ static bool it_802AB2A4(void); + +/// #it_802AA7E4 + +/// #it_802AA7F0 + +/// #it_802AA810 + +/// #it_802AA8C0 + +/// #it_802AA9CC + +/// #it_802AAA50 + +/// #it_802AAA80 + +/// #it_802AAB70 + +/// #it_802AAD48 + +/// #it_802AAEE4 + +/// #it_802AAFDC + +/// #it_802AB128 + +/// #it_802AB140 + +/// #it_802AB158 + +bool it_802AB29C(void) +{ + return false; +} + +bool it_802AB2A4(void) +{ + return false; +} + +/// #it_802AB2AC + +bool it_802AB3C0(Item_GObj* arg0) +{ + return true; +} + +bool it_802AB3C8(Item_GObj* arg0) +{ + return true; +} + +/// #it_802AB3D0 diff --git a/src/melee/it/items/itnesspkflush.h b/src/melee/it/items/itnesspkflush.h index 9bec620ee3..0246c4b71c 100644 --- a/src/melee/it/items/itnesspkflush.h +++ b/src/melee/it/items/itnesspkflush.h @@ -3,10 +3,24 @@ #include #include "it/forward.h" +#include #include "it/items/types.h" +/* 2AA7E4 */ HSD_GObj* it_802AA7E4(Item_GObj*); +/* 2AA7F0 */ enum_t it_802AA7F0(Item_GObj*); +/* 2AA810 */ UNK_RET it_802AA810(UNK_PARAMS); +/* 2AA8C0 */ HSD_GObj* it_802AA8C0(Item_GObj*, Vec3*, enum_t, float); /* 2AA9CC */ void it_802AA9CC(Item_GObj*); +/* 2AAA50 */ void it_802AAA50(Item_GObj*); +/* 2AAA80 */ UNK_RET it_802AAA80(UNK_PARAMS); +/* 2AAB70 */ UNK_RET it_802AAB70(UNK_PARAMS); +/* 2AAD48 */ UNK_RET it_802AAD48(UNK_PARAMS); +/* 2AAEE4 */ UNK_RET it_802AAEE4(UNK_PARAMS); +/* 2AAFDC */ UNK_RET it_802AAFDC(UNK_PARAMS); +/* 2AB128 */ UNK_RET it_802AB128(UNK_PARAMS); +/* 2AB140 */ UNK_RET it_802AB140(UNK_PARAMS); +/* 2AB158 */ UNK_RET it_802AB158(UNK_PARAMS); /* 2AB2AC */ bool it_802AB2AC(Item_GObj*); /* 2AB3C0 */ bool it_802AB3C0(Item_GObj*); /* 2AB3C8 */ bool it_802AB3C8(Item_GObj*); diff --git a/src/melee/it/items/itnesspkflushexplode.c b/src/melee/it/items/itnesspkflushexplode.c index 8b13789179..aa3d321638 100644 --- a/src/melee/it/items/itnesspkflushexplode.c +++ b/src/melee/it/items/itnesspkflushexplode.c @@ -1 +1,43 @@ +#include +#include "it/forward.h" +#include + +/* 2AFD44 */ static bool it_802AFD44(void); + +/// #it_802AF940 + +/// #it_802AFA2C + +/// #it_802AFA70 + +/// #it_802AFBA4 + +/// #it_802AFD2C + +bool it_802AFD44(void) +{ + return false; +} + +bool it_802AFD4C(Item_GObj* arg0) +{ + return true; +} + +bool it_802AFD54(Item_GObj* arg0) +{ + return true; +} + +bool it_802AFD5C(Item_GObj* arg0) +{ + return true; +} + +bool it_802AFD64(Item_GObj* arg0) +{ + return true; +} + +/// #it_802AFD6C diff --git a/src/melee/it/items/itnesspkflushexplode.h b/src/melee/it/items/itnesspkflushexplode.h index 789e620ede..3d7757dd77 100644 --- a/src/melee/it/items/itnesspkflushexplode.h +++ b/src/melee/it/items/itnesspkflushexplode.h @@ -6,7 +6,12 @@ #include "it/items/types.h" +/* 2AF940 */ UNK_RET it_802AF940(UNK_PARAMS); /* 2AFA2C */ void it_802AFA2C(Item_GObj*); +/* 2AFA70 */ UNK_RET it_802AFA70(UNK_PARAMS); +/* 2AFBA4 */ UNK_RET it_802AFBA4(UNK_PARAMS); +/* 2AFD2C */ UNK_RET it_802AFD2C(UNK_PARAMS); +/* 2AFD44 */ UNK_RET it_802AFD44(UNK_PARAMS); /* 2AFD4C */ bool it_802AFD4C(Item_GObj*); /* 2AFD54 */ bool it_802AFD54(Item_GObj*); /* 2AFD5C */ bool it_802AFD5C(Item_GObj*); diff --git a/src/melee/it/items/itnesspkthunderball.c b/src/melee/it/items/itnesspkthunderball.c index 8b13789179..ca144a4894 100644 --- a/src/melee/it/items/itnesspkthunderball.c +++ b/src/melee/it/items/itnesspkthunderball.c @@ -1 +1,35 @@ +/// #it_802AB3F0 +/// #it_802AB468 + +/// #it_802AB4B8 + +/// #it_802AB568 + +/// #it_802AB58C + +/// #it_802AB90C + +/// #it_802AB9C0 + +/// #it_802ABA4C + +/// #it_802ABBB0 + +/// #it_802ABCDC + +/// #it_802AC000 + +/// #it_802AC050 + +/// #it_802AC074 + +/// #it_802AC098 + +/// #it_802AC338 + +/// #it_802AC35C + +/// #it_802AC3F8 + +/// #it_802AC41C diff --git a/src/melee/it/items/itnesspkthunderball.h b/src/melee/it/items/itnesspkthunderball.h index 9444e94323..a129f317e1 100644 --- a/src/melee/it/items/itnesspkthunderball.h +++ b/src/melee/it/items/itnesspkthunderball.h @@ -3,10 +3,21 @@ #include #include "it/forward.h" +#include #include "it/items/types.h" +/* 2AB3F0 */ void it_802AB3F0(Item_GObj*, void*, s32); +/* 2AB468 */ UNK_RET it_802AB468(UNK_PARAMS); +/* 2AB4B8 */ UNK_RET it_802AB4B8(UNK_PARAMS); +/* 2AB568 */ HSD_GObj* it_802AB568(Item_GObj*); +/* 2AB58C */ HSD_GObj* it_802AB58C(Item_GObj* owner, Vec3* pos, + float facing_dir); /* 2AB90C */ void it_802AB90C(Item_GObj*); +/* 2AB9C0 */ void it_802AB9C0(Item_GObj*); +/* 2ABA4C */ UNK_RET it_802ABA4C(UNK_PARAMS); +/* 2ABBB0 */ UNK_RET it_802ABBB0(UNK_PARAMS); +/* 2ABCDC */ UNK_RET it_802ABCDC(UNK_PARAMS); /* 2AC050 */ bool it_802AC050(Item_GObj*); /* 2AC074 */ bool it_802AC074(Item_GObj*); /* 2AC098 */ bool it_802AC098(Item_GObj*); diff --git a/src/melee/it/items/itnesspkthundertrail.c b/src/melee/it/items/itnesspkthundertrail.c index 8b13789179..234ca5915b 100644 --- a/src/melee/it/items/itnesspkthundertrail.c +++ b/src/melee/it/items/itnesspkthundertrail.c @@ -1 +1,22 @@ +#include +#include + +/* 2AC8A0 */ static bool it_802AC8A0(void); + +/// #it_802AC43C + +/// #it_802AC58C + +/// #it_802AC5D8 + +/// #it_802AC604 + +/// #it_802AC62C + +/// #it_802AC6B0 + +bool it_802AC8A0(void) +{ + return false; +} diff --git a/src/melee/it/items/itnesspkthundertrail.h b/src/melee/it/items/itnesspkthundertrail.h index 2e620e61c5..08f57e4752 100644 --- a/src/melee/it/items/itnesspkthundertrail.h +++ b/src/melee/it/items/itnesspkthundertrail.h @@ -1,10 +1,15 @@ #ifndef GALE01_2AC43C #define GALE01_2AC43C -#include "it/forward.h" - #include "it/items/types.h" +/* 2AC43C */ UNK_RET it_802AC43C(UNK_PARAMS); +/* 2AC58C */ UNK_RET it_802AC58C(UNK_PARAMS); +/* 2AC5D8 */ UNK_RET it_802AC5D8(UNK_PARAMS); +/* 2AC604 */ UNK_RET it_802AC604(UNK_PARAMS); +/* 2AC62C */ UNK_RET it_802AC62C(UNK_PARAMS); +/* 2AC6B0 */ UNK_RET it_802AC6B0(UNK_PARAMS); +/* 2AC8A0 */ UNK_RET it_802AC8A0(UNK_PARAMS); /* 3F6C08 */ extern ItemStateTable it_803F6C08[]; #endif diff --git a/src/melee/it/items/itnessyoyo.c b/src/melee/it/items/itnessyoyo.c index 8b13789179..0bd38d0317 100644 --- a/src/melee/it/items/itnessyoyo.c +++ b/src/melee/it/items/itnessyoyo.c @@ -1 +1,45 @@ +/// #it_802BE598 +/// #it_802BE5B8 + +/// #it_802BE5D8 + +/// #it_802BE65C + +/// #it_802BE958 + +/// #it_802BE9D8 + +/// #it_802BEB38 + +/// #it_802BEB5C + +/// #it_802BEC58 + +/// #it_802BED54 + +/// #it_802BEE88 + +/// #it_802BF030 + +/// #it_802BF180 + +/// #it_802BF28C + +/// #it_802BF4A0 + +/// #it_802BF800 + +/// #it_802BF900 + +/// #it_802BFAFC + +/// #it_802BFE34 + +/// #it_802BFE5C + +/// #it_802BFEC4 + +/// #it_802C0010 + +/// #it_802C016C diff --git a/src/melee/it/items/itnessyoyo.h b/src/melee/it/items/itnessyoyo.h index 365e6daaba..6366fa0652 100644 --- a/src/melee/it/items/itnessyoyo.h +++ b/src/melee/it/items/itnessyoyo.h @@ -2,10 +2,32 @@ #define GALE01_2BE598 #include "it/forward.h" +#include #include "it/items/types.h" +/* 2BE598 */ void it_802BE598(Item_GObj*); +/* 2BE5B8 */ void it_802BE5B8(Item_GObj*); +/* 2BE5D8 */ void it_802BE5D8(void*, float); +/* 2BE65C */ UNK_RET it_802BE65C(UNK_PARAMS); +/* 2BE958 */ void it_802BE958(void*); +/* 2BE9D8 */ HSD_GObj* it_802BE9D8(float, HSD_GObj*, Vec3*, s32); +/* 2BEB38 */ UNK_RET it_802BEB38(UNK_PARAMS); +/* 2BEB5C */ UNK_RET it_802BEB5C(UNK_PARAMS); +/* 2BEC58 */ UNK_RET it_802BEC58(UNK_PARAMS); +/* 2BED54 */ UNK_RET it_802BED54(UNK_PARAMS); +/* 2BEE88 */ UNK_RET it_802BEE88(UNK_PARAMS); +/* 2BF030 */ UNK_RET it_802BF030(UNK_PARAMS); +/* 2BF180 */ UNK_RET it_802BF180(UNK_PARAMS); +/* 2BF28C */ UNK_RET it_802BF28C(UNK_PARAMS); +/* 2BF4A0 */ UNK_RET it_802BF4A0(UNK_PARAMS); +/* 2BF800 */ UNK_RET it_802BF800(UNK_PARAMS); +/* 2BF900 */ UNK_RET it_802BF900(UNK_PARAMS); +/* 2BFAFC */ UNK_RET it_802BFAFC(UNK_PARAMS); /* 2BFE34 */ void it_802BFE34(Item_GObj*); +/* 2BFE5C */ void it_802BFE5C(Item_GObj*, Vec3*, float); +/* 2BFEC4 */ void it_802BFEC4(void*); +/* 2C0010 */ void it_802C0010(Item_GObj*, void*); /* 2C016C */ void it_802C016C(Item_GObj*, Item_GObj*); /* 3F7558 */ extern ItemStateTable it_803F7558[]; diff --git a/src/melee/it/items/itnokonoko.c b/src/melee/it/items/itnokonoko.c index 5daa1246e4..28a07533ce 100644 --- a/src/melee/it/items/itnokonoko.c +++ b/src/melee/it/items/itnokonoko.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802DC69C @@ -7,7 +10,10 @@ /// #fn_802DC8B8 -/// #it_802DC910 +bool it_802DC910(void) +{ + return false; +} /// #it_802DC918 @@ -23,7 +29,10 @@ /// #it_802DCB9C -/// #it_802DCC58 +bool it_802DCC58(void) +{ + return false; +} /// #it_802DCC60 @@ -51,7 +60,10 @@ /// #it_802DD1DC -/// #it_802DD25C +bool it_802DD25C(void) +{ + return false; +} /// #it_802DD264 diff --git a/src/melee/it/items/itoctarock.c b/src/melee/it/items/itoctarock.c index 2bf2ba3ccd..95f0a60bd2 100644 --- a/src/melee/it/items/itoctarock.c +++ b/src/melee/it/items/itoctarock.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802E4A44 @@ -13,7 +16,10 @@ /// #it_802E4DB4 -/// #it_802E4DF8 +bool it_802E4DF8(void) +{ + return false; +} /// #it_802E4E00 @@ -71,7 +77,10 @@ void it_802E587C(void) {} /// #it_802E58A0 -/// #it_802E5900 +bool it_802E5900(void) +{ + return false; +} /// #it_802E5908 diff --git a/src/melee/it/items/itoctarockstone.c b/src/melee/it/items/itoctarockstone.c index 8d3534be09..5166e6ab6f 100644 --- a/src/melee/it/items/itoctarockstone.c +++ b/src/melee/it/items/itoctarockstone.c @@ -1,13 +1,29 @@ +#include +#include "it/forward.h" + +#include /// #it_802E878C -/// #it_802E87D8 +bool it_802E87D8(Item_GObj* arg0) +{ + return true; +} -/// #it_802E87E0 +bool it_802E87E0(Item_GObj* arg0) +{ + return true; +} -/// #it_802E87E8 +bool it_802E87E8(Item_GObj* arg0) +{ + return true; +} -/// #it_802E87F0 +bool it_802E87F0(Item_GObj* arg0) +{ + return true; +} /// #it_802E87F8 @@ -23,7 +39,10 @@ void it_802E8898(void) {} /// #it_802E890C -/// #it_802E896C +bool it_802E896C(void) +{ + return false; +} /// #it_802E8974 diff --git a/src/melee/it/items/itoldkuri.c b/src/melee/it/items/itoldkuri.c index b8607af85a..37c0bbcd3d 100644 --- a/src/melee/it/items/itoldkuri.c +++ b/src/melee/it/items/itoldkuri.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802D73D0 @@ -5,7 +8,10 @@ /// #it_802D747C -/// #it_802D74D0 +bool it_802D74D0(void) +{ + return false; +} /// #it_802D74D8 diff --git a/src/melee/it/items/itoldottosea.c b/src/melee/it/items/itoldottosea.c index c34535d5b8..2c43920917 100644 --- a/src/melee/it/items/itoldottosea.c +++ b/src/melee/it/items/itoldottosea.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802E2470 @@ -21,7 +24,10 @@ /// #it_802E2BC0 -/// #it_802E2C0C +bool it_802E2C0C(void) +{ + return false; +} /// #it_802E2C14 diff --git a/src/melee/it/items/itparasol.c b/src/melee/it/items/itparasol.c index f7447bb9d7..ff468362d9 100644 --- a/src/melee/it/items/itparasol.c +++ b/src/melee/it/items/itparasol.c @@ -5,6 +5,7 @@ #include "it/inlines.h" #include "it/it_266F.h" #include "it/it_26B1.h" +#include "it/it_2725.h" #include "it/item.h" #include diff --git a/src/melee/it/items/itpatapata.c b/src/melee/it/items/itpatapata.c index d57be880ee..9bbf75e456 100644 --- a/src/melee/it/items/itpatapata.c +++ b/src/melee/it/items/itpatapata.c @@ -1,9 +1,15 @@ +#include + +#include /// #it_802E05A0 /// #it_802E0678 -/// #it_802E06B4 +bool it_802E06B4(void) +{ + return false; +} /// #it_802E06BC diff --git a/src/melee/it/items/itpeachexplode.c b/src/melee/it/items/itpeachexplode.c index 8b13789179..4765223e4c 100644 --- a/src/melee/it/items/itpeachexplode.c +++ b/src/melee/it/items/itpeachexplode.c @@ -1 +1,17 @@ +#include +#include "it/forward.h" +#include + +/// #it_802BD158 + +bool it_802BD240(Item_GObj* arg0) +{ + return false; +} + +/// #it_802BD248 + +/// #it_802BD2EC + +/// #it_802BD30C diff --git a/src/melee/it/items/itpeachexplode.h b/src/melee/it/items/itpeachexplode.h index 3bd2dd9740..f84ccae560 100644 --- a/src/melee/it/items/itpeachexplode.h +++ b/src/melee/it/items/itpeachexplode.h @@ -3,10 +3,14 @@ #include #include "it/forward.h" +#include #include "it/items/types.h" +/* 2BD158 */ void it_802BD158(Item_GObj* gobj, Vec3*, int, float); /* 2BD240 */ bool it_802BD240(Item_GObj*); +/* 2BD248 */ UNK_RET it_802BD248(UNK_PARAMS); +/* 2BD2EC */ UNK_RET it_802BD2EC(UNK_PARAMS); /* 2BD30C */ void it_802BD30C(Item_GObj*, Item_GObj*); /* 3F7488 */ extern ItemStateTable it_803F7488[]; diff --git a/src/melee/it/items/itpeachtoad.c b/src/melee/it/items/itpeachtoad.c index 8b13789179..d35ac8f7f5 100644 --- a/src/melee/it/items/itpeachtoad.c +++ b/src/melee/it/items/itpeachtoad.c @@ -1 +1,19 @@ +/// #it_802BDE18 +/// #it_802BDEFC + +/// #it_802BDF40 + +/// #it_802BDFA0 + +/// #it_802BDFC0 + +/// #it_802BDFE0 + +/// #it_802BE02C + +/// #it_802BE100 + +/// #it_802BE168 + +/// #it_802BE1F4 diff --git a/src/melee/it/items/itpeachtoad.h b/src/melee/it/items/itpeachtoad.h index f348e7e6ae..c4611448bc 100644 --- a/src/melee/it/items/itpeachtoad.h +++ b/src/melee/it/items/itpeachtoad.h @@ -1,12 +1,22 @@ #ifndef GALE01_2BDE18 #define GALE01_2BDE18 +#include "ft/forward.h" #include "it/forward.h" +#include #include "it/items/types.h" +/* 2BDE18 */ HSD_GObj* it_802BDE18(Item_GObj*, Vec3*, Fighter_Part, enum_t, + float); /* 2BDEFC */ void it_802BDEFC(Item_GObj*); +/* 2BDF40 */ void it_802BDF40(Item_GObj* gobj); +/* 2BDFA0 */ void it_802BDFA0(Item_GObj* gobj); +/* 2BDFC0 */ void it_802BDFC0(Item_GObj* gobj); /* 2BDFE0 */ void it_802BDFE0(Item_GObj*); +/* 2BE02C */ UNK_RET it_802BE02C(UNK_PARAMS); +/* 2BE100 */ void it_802BE100(Item_GObj* gobj); +/* 2BE168 */ UNK_RET it_802BE168(UNK_PARAMS); /* 2BE1F4 */ void it_802BE1F4(Item_GObj*, Item_GObj*); /* 3F7528 */ extern ItemStateTable it_803F7528[]; diff --git a/src/melee/it/items/itpeachtoadspore.c b/src/melee/it/items/itpeachtoadspore.c index 8b13789179..4e2331eabb 100644 --- a/src/melee/it/items/itpeachtoadspore.c +++ b/src/melee/it/items/itpeachtoadspore.c @@ -1 +1,21 @@ +/// #it_802BE214 +/// #it_802BE2E8 + +/// #it_802BE408 + +/// #it_802BE458 + +/// #it_802BE488 + +/// #it_802BE4AC + +/// #it_802BE4D0 + +/// #it_802BE4F4 + +/// #it_802BE518 + +/// #it_802BE538 + +/// #it_802BE578 diff --git a/src/melee/it/items/itpeachtoadspore.h b/src/melee/it/items/itpeachtoadspore.h index 8964bd0593..64cf629ca5 100644 --- a/src/melee/it/items/itpeachtoadspore.h +++ b/src/melee/it/items/itpeachtoadspore.h @@ -3,9 +3,15 @@ #include #include "it/forward.h" +#include #include "it/items/types.h" +/* 2BE214 */ void it_802BE214(Item_GObj* gobj, Vec3* pos, enum_t, + float facing_dir); +/* 2BE2E8 */ UNK_RET it_802BE2E8(UNK_PARAMS); +/* 2BE408 */ UNK_RET it_802BE408(UNK_PARAMS); +/* 2BE458 */ UNK_RET it_802BE458(UNK_PARAMS); /* 2BE488 */ bool it_802BE488(Item_GObj*); /* 2BE4AC */ bool it_802BE4AC(Item_GObj*); /* 2BE4D0 */ bool it_802BE4D0(Item_GObj*); diff --git a/src/melee/it/items/itpeachturnip.c b/src/melee/it/items/itpeachturnip.c index e53bf35e5f..a04c4fbd14 100644 --- a/src/melee/it/items/itpeachturnip.c +++ b/src/melee/it/items/itpeachturnip.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802BD32C @@ -9,7 +12,10 @@ /// #it_802BD628 -/// #it_802BD6D4 +bool it_802BD6D4(void) +{ + return false; +} void it_802BD6DC(void) {} diff --git a/src/melee/it/items/itpikachuthunder.c b/src/melee/it/items/itpikachuthunder.c index 8b13789179..ee71a0d07e 100644 --- a/src/melee/it/items/itpikachuthunder.c +++ b/src/melee/it/items/itpikachuthunder.c @@ -1 +1,50 @@ +#include +#include "it/forward.h" +#include + +/// #it_802B1DEC + +/// #it_802B1DF8 + +/// #it_802B1FC8 + +/// #it_802B1FE8 + +/// #it_802B202C + +/// #it_802B2080 + +/// #it_802B20DC + +/// #it_802B211C + +/// #it_802B21A8 + +/// #it_802B21E0 + +/// #it_802B22B8 + +/// #it_802B2340 + +bool it_802B2508(Item_GObj* arg0) +{ + return false; +} + +bool it_802B2510(Item_GObj* arg0) +{ + return false; +} + +bool it_802B2518(Item_GObj* arg0) +{ + return false; +} + +bool it_802B2520(Item_GObj* arg0) +{ + return false; +} + +/// #it_802B2528 diff --git a/src/melee/it/items/itpikachuthunder.h b/src/melee/it/items/itpikachuthunder.h index 43a0ad863b..4d9bb4e15e 100644 --- a/src/melee/it/items/itpikachuthunder.h +++ b/src/melee/it/items/itpikachuthunder.h @@ -3,15 +3,26 @@ #include #include "it/forward.h" +#include #include "it/items/types.h" +/* 2B1DEC */ s32 it_802B1DEC(u32); +/* 2B1DF8 */ u32 it_802B1DF8(Item_GObj*, Vec3*, Vec3*, s32, s32, s32); +/* 2B1FC8 */ s32 it_802B1FC8(u32); +/* 2B1FE8 */ void it_802B1FE8(u32, Vec3*); /* 2B202C */ void it_802B202C(Item_GObj*); +/* 2B2080 */ UNK_RET it_802B2080(UNK_PARAMS); +/* 2B20DC */ UNK_RET it_802B20DC(UNK_PARAMS); +/* 2B211C */ UNK_RET it_802B211C(UNK_PARAMS); +/* 2B21A8 */ UNK_RET it_802B21A8(UNK_PARAMS); +/* 2B21E0 */ UNK_RET it_802B21E0(UNK_PARAMS); +/* 2B22B8 */ UNK_RET it_802B22B8(UNK_PARAMS); +/* 2B2340 */ UNK_RET it_802B2340(UNK_PARAMS); /* 2B2508 */ bool it_802B2508(Item_GObj*); /* 2B2510 */ bool it_802B2510(Item_GObj*); /* 2B2518 */ bool it_802B2518(Item_GObj*); /* 2B2520 */ bool it_802B2520(Item_GObj*); /* 2B2528 */ void it_802B2528(Item_GObj*, Item_GObj*); /* 3F70C8 */ extern ItemStateTable it_803F70C8[]; - #endif diff --git a/src/melee/it/items/itpikachutjoltair.c b/src/melee/it/items/itpikachutjoltair.c index 8b13789179..d216b41edc 100644 --- a/src/melee/it/items/itpikachutjoltair.c +++ b/src/melee/it/items/itpikachutjoltair.c @@ -1 +1,42 @@ +#include +#include + +/* 2B45E8 */ static bool it_802B45E8(void); + +bool it_802B45E8(void) +{ + return false; +} + +/// #it_802B3EFC + +/// #it_802B3F20 + +/// #it_802B3F88 + +/// #it_802B4224 + +/// #it_802B43B0 + +/// #it_802B43D0 + +/// #it_802B4450 + +/// #it_802B45D0 + +/// #it_802B45E8 + +/// #it_802B45F0 + +/// #it_802B4638 + +/// #it_802B4680 + +/// #it_802B46C8 + +/// #it_802B4A18 + +/// #it_802B4A60 + +/// #it_802B4AA8 diff --git a/src/melee/it/items/itpikachutjoltair.h b/src/melee/it/items/itpikachutjoltair.h index 28a54e6214..b6df3254a8 100644 --- a/src/melee/it/items/itpikachutjoltair.h +++ b/src/melee/it/items/itpikachutjoltair.h @@ -6,6 +6,15 @@ #include "it/items/types.h" +/* 2B3EFC */ UNK_RET it_802B3EFC(UNK_PARAMS); +/* 2B3F20 */ UNK_RET it_802B3F20(UNK_PARAMS); +/* 2B3F88 */ UNK_RET it_802B3F88(UNK_PARAMS); +/* 2B4224 */ UNK_RET it_802B4224(UNK_PARAMS); +/* 2B43B0 */ UNK_RET it_802B43B0(UNK_PARAMS); +/* 2B43D0 */ UNK_RET it_802B43D0(UNK_PARAMS); +/* 2B4450 */ UNK_RET it_802B4450(UNK_PARAMS); +/* 2B45D0 */ UNK_RET it_802B45D0(UNK_PARAMS); +/* 2B45E8 */ UNK_RET it_802B45E8(UNK_PARAMS); /* 2B45F0 */ bool it_802B45F0(Item_GObj*); /* 2B4638 */ bool it_802B4638(Item_GObj*); /* 2B4680 */ bool it_802B4680(Item_GObj*); diff --git a/src/melee/it/items/itpikachutjoltground.c b/src/melee/it/items/itpikachutjoltground.c index 8b13789179..0125131073 100644 --- a/src/melee/it/items/itpikachutjoltground.c +++ b/src/melee/it/items/itpikachutjoltground.c @@ -1 +1,35 @@ +/// #it_802B3368 +/// #it_802B338C + +/// #it_802B34E4 + +/// #it_802B3544 + +/// #it_802B3554 + +/// #it_802B3680 + +/// #it_802B36BC + +/// #it_802B3790 + +/// #it_802B37F0 + +/// #it_802B3808 + +/// #it_802B397C + +/// #it_802B3A94 + +/// #it_802B3AF8 + +/// #it_802B3C44 + +/// #it_802B3CA8 + +/// #it_802B3D0C + +/// #it_802B3D70 + +/// #it_802B3EDC diff --git a/src/melee/it/items/itpikachutjoltground.h b/src/melee/it/items/itpikachutjoltground.h index c44a6cb640..ce9c366a5f 100644 --- a/src/melee/it/items/itpikachutjoltground.h +++ b/src/melee/it/items/itpikachutjoltground.h @@ -3,10 +3,21 @@ #include #include "it/forward.h" +#include #include "it/items/types.h" +/* 2B3368 */ UNK_RET it_802B3368(UNK_PARAMS); +/* 2B338C */ void it_802B338C(Item_GObj*, Vec3*, float facing_dir, u32); /* 2B34E4 */ void it_802B34E4(Item_GObj*); +/* 2B3544 */ UNK_RET it_802B3544(UNK_PARAMS); +/* 2B3554 */ UNK_RET it_802B3554(UNK_PARAMS); +/* 2B3680 */ UNK_RET it_802B3680(UNK_PARAMS); +/* 2B36BC */ UNK_RET it_802B36BC(UNK_PARAMS); +/* 2B3790 */ UNK_RET it_802B3790(UNK_PARAMS); +/* 2B37F0 */ UNK_RET it_802B37F0(UNK_PARAMS); +/* 2B3808 */ UNK_RET it_802B3808(UNK_PARAMS); +/* 2B397C */ UNK_RET it_802B397C(UNK_PARAMS); /* 2B3A94 */ bool it_802B3A94(Item_GObj*); /* 2B3AF8 */ bool it_802B3AF8(Item_GObj*); /* 2B3C44 */ bool it_802B3C44(Item_GObj*); diff --git a/src/melee/it/items/itporygon2.c b/src/melee/it/items/itporygon2.c index e7af922083..515a613ebf 100644 --- a/src/melee/it/items/itporygon2.c +++ b/src/melee/it/items/itporygon2.c @@ -1,6 +1,7 @@ #include "itporygon2.h" #include "it/inlines.h" +#include "it/it_2725.h" #include #include diff --git a/src/melee/it/items/itrabbitc.c b/src/melee/it/items/itrabbitc.c index cf67ea1cc4..44c1630a07 100644 --- a/src/melee/it/items/itrabbitc.c +++ b/src/melee/it/items/itrabbitc.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_80294DA0 @@ -13,7 +16,10 @@ /// #it_80295138 -/// #it_80295188 +bool it_80295188(void) +{ + return false; +} void it_80295190(void) {} @@ -21,7 +27,10 @@ void it_80295190(void) {} /// #it_802951C0 -/// #it_802951E8 +bool it_802951E8(void) +{ + return false; +} /// #it_802951F0 @@ -29,7 +38,10 @@ void it_80295190(void) {} /// #it_8029524C -/// #it_80295290 +bool it_80295290(void) +{ + return false; +} /// #it_80295298 @@ -39,7 +51,10 @@ void it_80295190(void) {} /// #it_80295340 -/// #it_80295368 +bool it_80295368(void) +{ + return false; +} void it_80295370(void) {} diff --git a/src/melee/it/items/itraikou.c b/src/melee/it/items/itraikou.c index 6fcaa98b13..a3df6fd96f 100644 --- a/src/melee/it/items/itraikou.c +++ b/src/melee/it/items/itraikou.c @@ -7,6 +7,7 @@ #include "it/it_266F.h" #include "it/it_26B1.h" #include "it/it_2725.h" +#include "it/item.h" #include "it/types.h" #include diff --git a/src/melee/it/items/itraikou.h b/src/melee/it/items/itraikou.h index adec513585..32cc110742 100644 --- a/src/melee/it/items/itraikou.h +++ b/src/melee/it/items/itraikou.h @@ -2,23 +2,23 @@ #define GALE01_2CF814 #include +#include "it/forward.h" -#include "it/item.h" #include "it/items/types.h" -void it_802CF814(Item_GObj*); -void it_802CF880(Item_GObj*); -void it_802CF884(Item_GObj*, Item_GObj*); -void it_802CF8A4(Item_GObj*); -void it_802CF908(Item_GObj*); -bool it_802CF978(Item_GObj*); -void it_802CFA74(Item_GObj*); -bool it_802CFAB0(Item_GObj*); -void it_802CFAFC(Item_GObj*); -void it_802CFB78(Item_GObj*); -bool it_802CFBDC(Item_GObj*); -void it_802CFC00(Item_GObj*); -bool it_802CFC20(Item_GObj*); -extern ItemStateTable it_803F7DE8[]; +/* 2CF814 */ void it_802CF814(Item_GObj*); +/* 2CF880 */ void it_802CF880(Item_GObj*); +/* 2CF884 */ void it_802CF884(Item_GObj*, Item_GObj*); +/* 2CF8A4 */ void it_802CF8A4(Item_GObj*); +/* 2CF908 */ void it_802CF908(Item_GObj*); +/* 2CF978 */ bool it_802CF978(Item_GObj*); +/* 2CFA74 */ void it_802CFA74(Item_GObj*); +/* 2CFAB0 */ bool it_802CFAB0(Item_GObj*); +/* 2CFAFC */ void it_802CFAFC(Item_GObj*); +/* 2CFB78 */ void it_802CFB78(Item_GObj*); +/* 2CFBDC */ bool it_802CFBDC(Item_GObj*); +/* 2CFC00 */ void it_802CFC00(Item_GObj*); +/* 2CFC20 */ bool it_802CFC20(Item_GObj*); +/* 3F7DE8 */ extern ItemStateTable it_803F7DE8[]; #endif diff --git a/src/melee/it/items/itrshell.c b/src/melee/it/items/itrshell.c index 881fb805c6..68f8ed38cd 100644 --- a/src/melee/it/items/itrshell.c +++ b/src/melee/it/items/itrshell.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_8028CFE0 @@ -21,7 +24,10 @@ /// #it_8028D62C -/// #it_8028D6C0 +bool it_8028D6C0(void) +{ + return false; +} void it_8028D6C8(void) {} @@ -29,7 +35,10 @@ void it_8028D6C8(void) {} /// #it_8028D7F0 -/// #it_8028D818 +bool it_8028D818(void) +{ + return false; +} /// #it_8028D820 @@ -37,7 +46,10 @@ void it_8028D6C8(void) {} /// #it_8028D898 -/// #it_8028D8D4 +bool it_8028D8D4(void) +{ + return false; +} void it_8028D8DC(void) {} @@ -75,7 +87,10 @@ void it_8028D8DC(void) {} /// #it_8028E3CC -/// #it_8028E408 +bool it_8028E408(void) +{ + return false; +} void it_8028E410(void) {} diff --git a/src/melee/it/items/itsamusbomb.c b/src/melee/it/items/itsamusbomb.c index e696e28391..a3c3b4b0d2 100644 --- a/src/melee/it/items/itsamusbomb.c +++ b/src/melee/it/items/itsamusbomb.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802B4AC8 diff --git a/src/melee/it/items/itsamuschargeshot.c b/src/melee/it/items/itsamuschargeshot.c index 409bfdcdd9..0d0e5f9b38 100644 --- a/src/melee/it/items/itsamuschargeshot.c +++ b/src/melee/it/items/itsamuschargeshot.c @@ -1,3 +1,7 @@ +#include +#include "it/forward.h" + +#include /// #it_802B5518 @@ -15,7 +19,10 @@ void it_802B5CB0(void) {} -/// #it_802B5CB4 +bool it_802B5CB4(void) +{ + return false; +} /// #it_802B5CBC @@ -27,15 +34,27 @@ void it_802B5CB0(void) {} /// #it_802B5EDC -/// #it_802B5FD8 +bool it_802B5FD8(Item_GObj* arg0) +{ + return true; +} -/// #it_802B5FE0 +bool it_802B5FE0(Item_GObj* arg0) +{ + return true; +} -/// #it_802B5FE8 +bool it_802B5FE8(Item_GObj* arg0) +{ + return true; +} /// #it_802B5FF0 -/// #it_802B613C +bool it_802B613C(Item_GObj* arg0) +{ + return true; +} /// #it_802B6144 diff --git a/src/melee/it/items/itsamusgrapple.c b/src/melee/it/items/itsamusgrapple.c index 8b13789179..8eabc7dc90 100644 --- a/src/melee/it/items/itsamusgrapple.c +++ b/src/melee/it/items/itsamusgrapple.c @@ -1 +1,95 @@ +/// #it_802B7150 +/// #it_802B7160 + +/// #it_802B743C + +/// #it_802B75FC + +/// #it_802B7B84 + +/// #it_802B7C18 + +/// #fn_802B7E34 + +/// #it_802B8048 + +/// #fn_802B805C + +/// #it_802B8370 + +/// #fn_802B8384 + +/// #it_802B8510 + +/// #fn_802B8524 + +/// #it_802B8670 + +/// #fn_802B8684 + +/// #it_802B8800 + +/// #fn_802B8814 + +/// #it_802B8948 + +/// #fn_802B895C + +/// #it_802B8B40 + +/// #fn_802B8B54 + +/// #it_802B8D24 + +/// #fn_802B8D38 + +/// #it_802B8FF8 + +/// #it_802B900C + +/// #it_802B91C4 + +/// #it_802B9328 + +/// #it_802B99A0 + +/// #it_802B9CE8 + +/// #it_802B9FD4 + +/// #it_802BA194 + +/// #it_802BA2D8 + +/// #it_802BA3BC + +/// #it_802BA5DC + +/// #it_802BA760 + +/// #it_802BA97C + +/// #it_802BA9B8 + +/// #it_802BAA08 + +/// #it_802BAA58 + +/// #it_802BAA94 + +/// #it_802BAAE4 + +/// #it_802BAB40 + +/// #it_802BAB7C + +/// #it_802BABB8 + +/// #it_802BAC3C + +/// #it_802BAC80 + +/// #it_802BACC4 + +/// #it_802BAEA0 diff --git a/src/melee/it/items/itsamusgrapple.h b/src/melee/it/items/itsamusgrapple.h index d27cec755b..1990b030c9 100644 --- a/src/melee/it/items/itsamusgrapple.h +++ b/src/melee/it/items/itsamusgrapple.h @@ -10,11 +10,49 @@ /* 2A77DC */ void it_802A77DC(Item_GObj* gobj); /* 2B7150 */ void it_802B7150(Item_GObj*); +/* 2B7160 */ UNK_RET it_802B7160(UNK_PARAMS); +/* 2B743C */ UNK_RET it_802B743C(UNK_PARAMS); +/* 2B75FC */ UNK_RET it_802B75FC(UNK_PARAMS); /* 2B7B84 */ void it_802B7B84(Item_GObj* gobj); /* 2B7C18 */ Item_GObj* it_802B7C18(Fighter_GObj*, Vec3*, float facing_dir); +/* 2B7E34 */ UNK_RET fn_802B7E34(UNK_PARAMS); +/* 2B8048 */ UNK_RET it_802B8048(UNK_PARAMS); +/* 2B805C */ UNK_RET fn_802B805C(UNK_PARAMS); +/* 2B8370 */ UNK_RET it_802B8370(UNK_PARAMS); +/* 2B8384 */ UNK_RET fn_802B8384(UNK_PARAMS); +/* 2B8510 */ UNK_RET it_802B8510(UNK_PARAMS); +/* 2B8524 */ UNK_RET fn_802B8524(UNK_PARAMS); +/* 2B8670 */ UNK_RET it_802B8670(UNK_PARAMS); +/* 2B8684 */ UNK_RET fn_802B8684(UNK_PARAMS); +/* 2B8800 */ UNK_RET it_802B8800(UNK_PARAMS); +/* 2B8814 */ UNK_RET fn_802B8814(UNK_PARAMS); +/* 2B8948 */ UNK_RET it_802B8948(UNK_PARAMS); +/* 2B895C */ UNK_RET fn_802B895C(UNK_PARAMS); +/* 2B8B40 */ UNK_RET it_802B8B40(UNK_PARAMS); +/* 2B8B54 */ UNK_RET fn_802B8B54(UNK_PARAMS); +/* 2B8D24 */ UNK_RET it_802B8D24(UNK_PARAMS); +/* 2B8D38 */ UNK_RET fn_802B8D38(UNK_PARAMS); +/* 2B8FF8 */ UNK_RET it_802B8FF8(UNK_PARAMS); +/* 2B900C */ UNK_RET it_802B900C(UNK_PARAMS); +/* 2B91C4 */ UNK_RET it_802B91C4(UNK_PARAMS); +/* 2B9328 */ UNK_RET it_802B9328(UNK_PARAMS); +/* 2B99A0 */ UNK_RET it_802B99A0(UNK_PARAMS); +/* 2B9CE8 */ UNK_RET it_802B9CE8(UNK_PARAMS); +/* 2B9FD4 */ UNK_RET it_802B9FD4(UNK_PARAMS); +/* 2BA194 */ UNK_RET it_802BA194(UNK_PARAMS); +/* 2BA2D8 */ UNK_RET it_802BA2D8(UNK_PARAMS); +/* 2BA3BC */ UNK_RET it_802BA3BC(UNK_PARAMS); +/* 2BA5DC */ UNK_RET it_802BA5DC(UNK_PARAMS); +/* 2BA760 */ UNK_RET it_802BA760(UNK_PARAMS); /* 2BA97C */ void it_802BA97C(Item_GObj*); +/* 2BA9B8 */ UNK_RET it_802BA9B8(UNK_PARAMS); +/* 2BAA08 */ UNK_RET it_802BAA08(UNK_PARAMS); /* 2BAA58 */ void it_802BAA58(Item_GObj* gobj); +/* 2BAA94 */ UNK_RET it_802BAA94(UNK_PARAMS); /* 2BAAE4 */ void it_802BAAE4(HSD_GObj*, Vec3*, float facing_dir); +/* 2BAB40 */ UNK_RET it_802BAB40(UNK_PARAMS); +/* 2BAB7C */ UNK_RET it_802BAB7C(UNK_PARAMS); +/* 2BABB8 */ UNK_RET it_802BABB8(UNK_PARAMS); /* 2BAC3C */ void it_802BAC3C(Fighter_GObj* gobj); /* 2BAC80 */ void it_802BAC80(Fighter_GObj* gobj); /* 2BACC4 */ void it_802BACC4(Fighter_GObj* gobj); diff --git a/src/melee/it/items/itscball.c b/src/melee/it/items/itscball.c index 063cf1b2ed..8259d6569c 100644 --- a/src/melee/it/items/itscball.c +++ b/src/melee/it/items/itscball.c @@ -5,6 +5,7 @@ #include "it/inlines.h" #include "it/it_266F.h" #include "it/it_26B1.h" +#include "it/it_2725.h" #include "it/item.h" #include diff --git a/src/melee/it/items/itseakneedleheld.c b/src/melee/it/items/itseakneedleheld.c index b3722d029f..4b8a1918c5 100644 --- a/src/melee/it/items/itseakneedleheld.c +++ b/src/melee/it/items/itseakneedleheld.c @@ -1,3 +1,4 @@ +#include "itseakneedleheld.h" /// #it_802B18B0 @@ -9,6 +10,9 @@ void it_802B1C34(void) {} -/// #it_802B1C38 +bool it_802B1C38(void) +{ + return false; +} /// #it_802B1C40 diff --git a/src/melee/it/items/itseakneedleheld.h b/src/melee/it/items/itseakneedleheld.h index 26fc618ed2..8546c1f071 100644 --- a/src/melee/it/items/itseakneedleheld.h +++ b/src/melee/it/items/itseakneedleheld.h @@ -12,7 +12,7 @@ /* 2B1AAC */ void it_802B1AAC(Item_GObj*); /* 2B1AD4 */ UNK_RET it_802B1AD4(UNK_PARAMS); /* 2B1C34 */ UNK_RET it_802B1C34(UNK_PARAMS); -/* 2B1C38 */ UNK_RET it_802B1C38(UNK_PARAMS); +/* 2B1C38 */ bool it_802B1C38(void); /* 2B1C40 */ void it_802B1C40(Item_GObj*, Item_GObj*); /* 3F70A8 */ extern ItemStateTable it_803F70A8[]; diff --git a/src/melee/it/items/itseakneedlethrown.c b/src/melee/it/items/itseakneedlethrown.c index b9ca3c4c17..bb0f04aec8 100644 --- a/src/melee/it/items/itseakneedlethrown.c +++ b/src/melee/it/items/itseakneedlethrown.c @@ -1,3 +1,4 @@ +#include "itseakneedlethrown.h" /// #it_802AFD8C @@ -35,7 +36,10 @@ void it_802B057C(void) {} /// #it_802B0AB8 -/// #it_802B0C5C +bool it_802B0C5C(void) +{ + return false; +} /// #it_802B0C64 diff --git a/src/melee/it/items/itseakneedlethrown.h b/src/melee/it/items/itseakneedlethrown.h index 20c3cf5fa0..07ab0bca4f 100644 --- a/src/melee/it/items/itseakneedlethrown.h +++ b/src/melee/it/items/itseakneedlethrown.h @@ -27,7 +27,7 @@ /* 2B05CC */ UNK_RET it_802B05CC(UNK_PARAMS); /* 2B0900 */ UNK_RET it_802B0900(UNK_PARAMS); /* 2B0AB8 */ UNK_RET it_802B0AB8(UNK_PARAMS); -/* 2B0C5C */ UNK_RET it_802B0C5C(UNK_PARAMS); +/* 2B0C5C */ bool it_802B0C5C(void); /* 2B0C64 */ UNK_RET it_802B0C64(UNK_PARAMS); /* 2B0D84 */ bool it_802B0D84(Item_GObj*); /* 2B0F34 */ bool it_802B0F34(Item_GObj*); diff --git a/src/melee/it/items/itseakvanish.c b/src/melee/it/items/itseakvanish.c index d7ee12bb35..3261dc4c64 100644 --- a/src/melee/it/items/itseakvanish.c +++ b/src/melee/it/items/itseakvanish.c @@ -1,6 +1,7 @@ #include "itseakvanish.h" #include "it/inlines.h" +#include "it/it_2725.h" #include #include diff --git a/src/melee/it/items/itsscope.c b/src/melee/it/items/itsscope.c index 8ed183e2d4..0144979198 100644 --- a/src/melee/it/items/itsscope.c +++ b/src/melee/it/items/itsscope.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_80291BE0 @@ -17,7 +20,10 @@ /// #it_80292030 -/// #it_80292080 +bool it_80292080(void) +{ + return false; +} void it_80292088(void) {} @@ -25,7 +31,10 @@ void it_80292088(void) {} /// #it_802920B8 -/// #it_802920E0 +bool it_802920E0(void) +{ + return false; +} /// #it_802920E8 @@ -33,7 +42,10 @@ void it_80292088(void) {} /// #it_8029215C -/// #it_80292184 +bool it_80292184(void) +{ + return false; +} void it_8029218C(void) {} @@ -55,7 +67,10 @@ void it_8029218C(void) {} /// #it_802922D8 -/// #it_80292300 +bool it_80292300(void) +{ + return false; +} void it_80292308(void) {} diff --git a/src/melee/it/items/itsscopebeam.c b/src/melee/it/items/itsscopebeam.c index 76160a0726..bc749d8f59 100644 --- a/src/melee/it/items/itsscopebeam.c +++ b/src/melee/it/items/itsscopebeam.c @@ -1,3 +1,7 @@ +#include +#include "it/forward.h" + +#include /// #it_80298DEC @@ -9,13 +13,25 @@ void it_80299148(void) {} /// #it_8029914C -/// #it_80299360 - -/// #it_80299368 - -/// #it_80299370 - -/// #it_80299378 +bool it_80299360(Item_GObj* arg0) +{ + return true; +} + +bool it_80299368(Item_GObj* arg0) +{ + return true; +} + +bool it_80299370(Item_GObj* arg0) +{ + return true; +} + +bool it_80299378(Item_GObj* arg0) +{ + return true; +} /// #it_80299380 diff --git a/src/melee/it/items/itstar.c b/src/melee/it/items/itstar.c index 1b70c418ce..b085da48f1 100644 --- a/src/melee/it/items/itstar.c +++ b/src/melee/it/items/itstar.c @@ -3,6 +3,7 @@ #include "itstar.h" #include "it/inlines.h" +#include "it/it_2725.h" #include "it/itCommonItems.h" #include "it/types.h" diff --git a/src/melee/it/items/itstarrod.c b/src/melee/it/items/itstarrod.c index ae67c14d23..9c82c13a3f 100644 --- a/src/melee/it/items/itstarrod.c +++ b/src/melee/it/items/itstarrod.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_80292360 @@ -7,7 +10,10 @@ /// #it_802923F8 -/// #it_80292450 +bool it_80292450(void) +{ + return false; +} void it_80292458(void) {} @@ -15,7 +21,10 @@ void it_80292458(void) {} /// #it_80292488 -/// #it_802924B0 +bool it_802924B0(void) +{ + return false; +} /// #it_802924B8 @@ -23,7 +32,10 @@ void it_80292458(void) {} /// #it_80292514 -/// #it_8029253C +bool it_8029253C(void) +{ + return false; +} void it_80292544(void) {} @@ -41,7 +53,10 @@ void it_80292544(void) {} /// #it_802926A8 -/// #it_802926D0 +bool it_802926D0(void) +{ + return false; +} void it_802926D8(void) {} diff --git a/src/melee/it/items/itstarrodstar.c b/src/melee/it/items/itstarrodstar.c index 102f703b17..972367dabc 100644 --- a/src/melee/it/items/itstarrodstar.c +++ b/src/melee/it/items/itstarrodstar.c @@ -1,3 +1,7 @@ +#include +#include "it/forward.h" + +#include /// #it_802988E4 @@ -9,13 +13,25 @@ void it_80298BAC(void) {} /// #it_80298BB0 -/// #it_80298BE4 - -/// #it_80298BEC - -/// #it_80298BF4 - -/// #it_80298BFC +bool it_80298BE4(Item_GObj* arg0) +{ + return true; +} + +bool it_80298BEC(Item_GObj* arg0) +{ + return true; +} + +bool it_80298BF4(Item_GObj* arg0) +{ + return true; +} + +bool it_80298BFC(Item_GObj* arg0) +{ + return true; +} /// #it_80298C04 diff --git a/src/melee/it/items/ittaru.c b/src/melee/it/items/ittaru.c index 69454515f3..0aa3491dc1 100644 --- a/src/melee/it/items/ittaru.c +++ b/src/melee/it/items/ittaru.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_80287458 @@ -13,7 +16,10 @@ void it_80287B68(void) {} /// #it_80287D0C -/// #it_80287D48 +bool it_80287D48(void) +{ + return false; +} /// #it_80287D50 @@ -21,7 +27,10 @@ void it_80287B68(void) {} /// #it_80287E68 -/// #it_80287E9C +bool it_80287E9C(void) +{ + return false; +} void it_80287EA4(void) {} @@ -61,7 +70,10 @@ void it_80287EA4(void) {} void it_802886B8(void) {} -/// #it_802886BC +bool it_802886BC(void) +{ + return false; +} /// #it_802886C4 @@ -69,7 +81,10 @@ void it_802886B8(void) {} void it_8028880C(void) {} -/// #it_80288810 +bool it_80288810(void) +{ + return false; +} /// #it_80288818 diff --git a/src/melee/it/items/ittarucann.c b/src/melee/it/items/ittarucann.c index 2595772e17..6cbfe8e4f8 100644 --- a/src/melee/it/items/ittarucann.c +++ b/src/melee/it/items/ittarucann.c @@ -1,3 +1,7 @@ +#include +#include "it/forward.h" + +#include /// #it_80295ED4 @@ -71,16 +75,31 @@ void it_802968D4(void) {} void it_80297784(void) {} -/// #it_80297788 +bool it_80297788(void) +{ + return false; +} /// #it_80297790 -/// #it_8029789C - -/// #it_802978A4 - -/// #it_802978AC - -/// #it_802978B4 +bool it_8029789C(Item_GObj* arg0) +{ + return false; +} + +bool it_802978A4(Item_GObj* arg0) +{ + return false; +} + +bool it_802978AC(Item_GObj* arg0) +{ + return false; +} + +bool it_802978B4(Item_GObj* arg0) +{ + return false; +} /// #it_802978BC diff --git a/src/melee/it/items/itthunder.c b/src/melee/it/items/itthunder.c index 466a82d6e2..fa74a16c1b 100644 --- a/src/melee/it/items/itthunder.c +++ b/src/melee/it/items/itthunder.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802CCAB4 @@ -19,7 +22,10 @@ void it_802CCB10(void) {} /// #it_802CCD9C -/// #it_802CCE20 +bool it_802CCE20(void) +{ + return false; +} /// #it_802CCE28 diff --git a/src/melee/it/items/ittincle.c b/src/melee/it/items/ittincle.c index fca24ce321..21539d2f42 100644 --- a/src/melee/it/items/ittincle.c +++ b/src/melee/it/items/ittincle.c @@ -1,3 +1,6 @@ +#include + +#include /// #it_802EB5C8 @@ -7,7 +10,10 @@ /// #it_802EB6DC -/// #it_802EB808 +bool it_802EB808(void) +{ + return false; +} /// #it_802EB810 @@ -15,7 +21,10 @@ /// #it_802EB870 -/// #it_802EB994 +bool it_802EB994(void) +{ + return false; +} /// #it_802EB99C @@ -31,7 +40,10 @@ /// #it_802EBD14 -/// #it_802EBDC8 +bool it_802EBDC8(void) +{ + return false; +} /// #it_802EBDD0 @@ -39,7 +51,10 @@ /// #it_802EBE5C -/// #it_802EBF00 +bool it_802EBF00(void) +{ + return false; +} /// #it_802EBF08 @@ -47,7 +62,10 @@ /// #it_802EBFAC -/// #it_802EC0FC +bool it_802EC0FC(void) +{ + return false; +} /// #it_802EC104 @@ -65,7 +83,10 @@ void it_802EC2E4(void) {} /// #it_802EC35C -/// #it_802EC390 +bool it_802EC390(void) +{ + return false; +} /// #it_802EC398 @@ -97,7 +118,10 @@ void it_802EC66C(void) {} /// #it_802EC69C -/// #it_802EC7A0 +bool it_802EC7A0(void) +{ + return false; +} /// #it_802EC7A8 diff --git a/src/melee/it/items/ittomato.c b/src/melee/it/items/ittomato.c index ff3ff939e9..e6339d1d9b 100644 --- a/src/melee/it/items/ittomato.c +++ b/src/melee/it/items/ittomato.c @@ -1,10 +1,10 @@ #include "ittomato.h" #include "baselib/jobj.h" -#include "gm/gm_1601.h" #include "it/inlines.h" #include "it/it_266F.h" #include "it/it_26B1.h" +#include "it/it_2725.h" #include "it/itCommonItems.h" #include "it/item.h" diff --git a/src/melee/it/items/itunknown.c b/src/melee/it/items/itunknown.c index b0f3ebdb1b..ed7243c0d9 100644 --- a/src/melee/it/items/itunknown.c +++ b/src/melee/it/items/itunknown.c @@ -1,3 +1,4 @@ +#include "itunknown.h" /// #it_802CE710 @@ -9,7 +10,10 @@ void it_802CE7CC(void) {} /// #it_802CE870 -/// #it_802CE8C8 +bool it_802CE8C8(void) +{ + return false; +} /// #it_802CE8D0 @@ -17,7 +21,10 @@ void it_802CE7CC(void) {} void it_802CEC18(void) {} -/// #it_802CEC1C +bool it_802CEC1C(void) +{ + return false; +} /// #it_802CEC24 @@ -39,4 +46,7 @@ void it_802CEC18(void) {} /// #it_802CF154 -/// #it_802CF3D8 +bool it_802CF3D8(void) +{ + return false; +} diff --git a/src/melee/it/items/itunknown.h b/src/melee/it/items/itunknown.h index dfe9067820..6158561e1c 100644 --- a/src/melee/it/items/itunknown.h +++ b/src/melee/it/items/itunknown.h @@ -12,11 +12,11 @@ /* 2CE7D0 */ void it_802CE7D0(Item_GObj*, Item_GObj*); /* 2CE7F0 */ UNK_RET it_802CE7F0(UNK_PARAMS); /* 2CE870 */ UNK_RET it_802CE870(UNK_PARAMS); -/* 2CE8C8 */ UNK_RET it_802CE8C8(UNK_PARAMS); +/* 2CE8C8 */ bool it_802CE8C8(void); /* 2CE8D0 */ UNK_RET it_802CE8D0(UNK_PARAMS); /* 2CEB9C */ UNK_RET it_802CEB9C(UNK_PARAMS); /* 2CEC18 */ UNK_RET it_802CEC18(UNK_PARAMS); -/* 2CEC1C */ UNK_RET it_802CEC1C(UNK_PARAMS); +/* 2CEC1C */ bool it_802CEC1C(void); /* 2CEC24 */ UNK_RET it_802CEC24(UNK_PARAMS); /* 2CEC88 */ UNK_RET it_802CEC88(UNK_PARAMS); /* 2CECAC */ UNK_RET it_802CECAC(UNK_PARAMS); @@ -27,7 +27,7 @@ /* 2CF0D4 */ UNK_RET it_802CF0D4(UNK_PARAMS); /* 2CF120 */ UNK_RET it_802CF120(UNK_PARAMS); /* 2CF154 */ UNK_RET it_802CF154(UNK_PARAMS); -/* 2CF3D8 */ UNK_RET it_802CF3D8(UNK_PARAMS); +/* 2CF3D8 */ bool it_802CF3D8(void); /* 3F7D60 */ extern ItemStateTable it_803F7D60[]; /* 3F7D90 */ extern ItemStateTable it_803F7D90[]; diff --git a/src/melee/it/items/itwhispyapple.c b/src/melee/it/items/itwhispyapple.c index 0ac42c80d8..4cb1b174fc 100644 --- a/src/melee/it/items/itwhispyapple.c +++ b/src/melee/it/items/itwhispyapple.c @@ -1,3 +1,4 @@ +#include "itwhispyapple.h" /// #it_802EE200 @@ -27,7 +28,10 @@ void it_802EE7CC(void) {} /// #it_802EEA08 -/// #it_802EEA64 +bool it_802EEA64(void) +{ + return false; +} void it_802EEA6C(void) {} @@ -49,9 +53,15 @@ void it_802EECC8(void) {} void it_802EEEC4(void) {} -/// #it_802EEEC8 +bool it_802EEEC8(void) +{ + return false; +} -/// #it_802EEED0 +bool it_802EEED0(void) +{ + return true; +} /// #it_802EEED8 diff --git a/src/melee/it/items/itwhispyapple.h b/src/melee/it/items/itwhispyapple.h index 04285c036e..a910cb2400 100644 --- a/src/melee/it/items/itwhispyapple.h +++ b/src/melee/it/items/itwhispyapple.h @@ -17,7 +17,7 @@ /* 2EE914 */ UNK_RET it_802EE914(UNK_PARAMS); /* 2EE944 */ UNK_RET it_802EE944(UNK_PARAMS); /* 2EEA08 */ UNK_RET it_802EEA08(UNK_PARAMS); -/* 2EEA64 */ UNK_RET it_802EEA64(UNK_PARAMS); +/* 2EEA64 */ bool it_802EEA64(void); /* 2EEA6C */ UNK_RET it_802EEA6C(UNK_PARAMS); /* 2EEA70 */ UNK_RET it_802EEA70(UNK_PARAMS); /* 2EEB28 */ UNK_RET it_802EEB28(UNK_PARAMS); @@ -28,8 +28,8 @@ /* 2EED00 */ UNK_RET it_802EED00(UNK_PARAMS); /* 2EEDD4 */ UNK_RET it_802EEDD4(UNK_PARAMS); /* 2EEEC4 */ UNK_RET it_802EEEC4(UNK_PARAMS); -/* 2EEEC8 */ UNK_RET it_802EEEC8(UNK_PARAMS); -/* 2EEED0 */ UNK_RET it_802EEED0(UNK_PARAMS); +/* 2EEEC8 */ bool it_802EEEC8(void); +/* 2EEED0 */ bool it_802EEED0(void); /* 2EEED8 */ UNK_RET it_802EEED8(UNK_PARAMS); /* 2EEF10 */ UNK_RET it_802EEF10(UNK_PARAMS); /* 2EEF30 */ UNK_RET it_802EEF30(UNK_PARAMS); diff --git a/src/melee/it/items/itwhitebea.c b/src/melee/it/items/itwhitebea.c index d92d283c82..6b8c4c8f71 100644 --- a/src/melee/it/items/itwhitebea.c +++ b/src/melee/it/items/itwhitebea.c @@ -1,3 +1,4 @@ +#include "itwhitebea.h" /// #it_802E31F8 @@ -27,7 +28,10 @@ void it_802E34B8(void) {} /// #it_802E3528 -/// #it_802E3588 +bool it_802E3588(void) +{ + return false; +} /// #it_802E3590 @@ -61,7 +65,10 @@ void it_802E34B8(void) {} /// #it_802E3DA0 -/// #it_802E3E5C +bool it_802E3E5C(void) +{ + return false; +} /// #it_802E3E64 @@ -95,7 +102,10 @@ void it_802E4424(void) {} /// #it_802E4464 -/// #it_802E44E4 +bool it_802E44E4(void) +{ + return false; +} /// #it_802E44EC @@ -135,7 +145,10 @@ void it_802E495C(void) {} /// #it_802E4980 -/// #it_802E49E0 +bool it_802E49E0(void) +{ + return false; +} /// #it_802E49E8 diff --git a/src/melee/it/items/itwhitebea.h b/src/melee/it/items/itwhitebea.h index d5c0598d50..fb5074f069 100644 --- a/src/melee/it/items/itwhitebea.h +++ b/src/melee/it/items/itwhitebea.h @@ -19,7 +19,7 @@ /* 2E34BC */ UNK_RET it_802E34BC(UNK_PARAMS); /* 2E34DC */ void it_802E34DC(Item_GObj*); /* 2E3528 */ UNK_RET it_802E3528(UNK_PARAMS); -/* 2E3588 */ UNK_RET it_802E3588(UNK_PARAMS); +/* 2E3588 */ bool it_802E3588(void); /* 2E3590 */ UNK_RET it_802E3590(UNK_PARAMS); /* 2E35AC */ UNK_RET it_802E35AC(UNK_PARAMS); /* 2E35CC */ UNK_RET it_802E35CC(UNK_PARAMS); @@ -36,7 +36,7 @@ /* 2E3C70 */ UNK_RET it_802E3C70(UNK_PARAMS); /* 2E3D38 */ UNK_RET it_802E3D38(UNK_PARAMS); /* 2E3DA0 */ UNK_RET it_802E3DA0(UNK_PARAMS); -/* 2E3E5C */ UNK_RET it_802E3E5C(UNK_PARAMS); +/* 2E3E5C */ bool it_802E3E5C(void); /* 2E3E64 */ UNK_RET it_802E3E64(UNK_PARAMS); /* 2E3E94 */ UNK_RET it_802E3E94(UNK_PARAMS); /* 2E3ED0 */ UNK_RET it_802E3ED0(UNK_PARAMS); @@ -53,7 +53,7 @@ /* 2E4424 */ UNK_RET it_802E4424(UNK_PARAMS); /* 2E4428 */ UNK_RET it_802E4428(UNK_PARAMS); /* 2E4464 */ UNK_RET it_802E4464(UNK_PARAMS); -/* 2E44E4 */ UNK_RET it_802E44E4(UNK_PARAMS); +/* 2E44E4 */ bool it_802E44E4(void); /* 2E44EC */ UNK_RET it_802E44EC(UNK_PARAMS); /* 2E451C */ UNK_RET it_802E451C(UNK_PARAMS); /* 2E4558 */ UNK_RET it_802E4558(UNK_PARAMS); @@ -73,7 +73,7 @@ /* 2E495C */ UNK_RET it_802E495C(UNK_PARAMS); /* 2E4960 */ UNK_RET it_802E4960(UNK_PARAMS); /* 2E4980 */ UNK_RET it_802E4980(UNK_PARAMS); -/* 2E49E0 */ UNK_RET it_802E49E0(UNK_PARAMS); +/* 2E49E0 */ bool it_802E49E0(void); /* 2E49E8 */ UNK_RET it_802E49E8(UNK_PARAMS); /* 2E4A04 */ UNK_RET it_802E4A04(UNK_PARAMS); /* 2E4A24 */ UNK_RET it_802E4A24(UNK_PARAMS); diff --git a/src/melee/it/items/itwstar.c b/src/melee/it/items/itwstar.c index 1160433e92..1073ae225e 100644 --- a/src/melee/it/items/itwstar.c +++ b/src/melee/it/items/itwstar.c @@ -1,3 +1,4 @@ +#include "itwstar.h" /// #it_80294364 @@ -9,7 +10,10 @@ /// #it_8029455C -/// #it_802945AC +bool it_802945AC(void) +{ + return false; +} /// #it_802945B4 @@ -17,7 +21,10 @@ /// #it_80294624 -/// #it_8029464C +bool it_8029464C(void) +{ + return false; +} /// #it_80294654 @@ -27,7 +34,10 @@ /// #it_80294728 -/// #it_80294788 +bool it_80294788(void) +{ + return false; +} /// #it_80294790 @@ -37,11 +47,17 @@ void it_80294A1C(void) {} -/// #it_80294A20 +bool it_80294A20(void) +{ + return false; +} /// #it_80294A28 -/// #it_80294A50 +bool it_80294A50(void) +{ + return false; +} void it_80294A58(void) {} diff --git a/src/melee/it/items/itwstar.h b/src/melee/it/items/itwstar.h index 624a67835d..8d917a9fa1 100644 --- a/src/melee/it/items/itwstar.h +++ b/src/melee/it/items/itwstar.h @@ -13,23 +13,23 @@ /* 2944AC */ void it_802944AC(Item_GObj*, ftCollisionBox*); /* 29451C */ void it_8029451C(Item_GObj*); /* 29455C */ UNK_RET it_8029455C(UNK_PARAMS); -/* 2945AC */ UNK_RET it_802945AC(UNK_PARAMS); +/* 2945AC */ bool it_802945AC(void); /* 2945B4 */ UNK_RET it_802945B4(UNK_PARAMS); /* 2945F8 */ UNK_RET it_802945F8(UNK_PARAMS); /* 294624 */ UNK_RET it_80294624(UNK_PARAMS); -/* 29464C */ UNK_RET it_8029464C(UNK_PARAMS); +/* 29464C */ bool it_8029464C(void); /* 294654 */ UNK_RET it_80294654(UNK_PARAMS); /* 294684 */ UNK_RET it_80294684(UNK_PARAMS); /* 2946B0 */ void it_802946B0(Item_GObj*); /* 294728 */ void it_80294728(Item_GObj*); -/* 294788 */ UNK_RET it_80294788(UNK_PARAMS); +/* 294788 */ bool it_80294788(void); /* 294790 */ void it_80294790(Item_GObj*); /* 2947CC */ void it_802947CC(Item_GObj* gobj, Vec3* pos); /* 2949C0 */ UNK_RET it_802949C0(UNK_PARAMS); /* 294A1C */ UNK_RET it_80294A1C(UNK_PARAMS); -/* 294A20 */ UNK_RET it_80294A20(UNK_PARAMS); +/* 294A20 */ bool it_80294A20(void); /* 294A28 */ void it_80294A28(Item_GObj*); -/* 294A50 */ UNK_RET it_80294A50(UNK_PARAMS); +/* 294A50 */ bool it_80294A50(void); /* 294A58 */ UNK_RET it_80294A58(UNK_PARAMS); /* 294A5C */ UNK_RET it_80294A5C(UNK_PARAMS); /* 294A90 */ void it_80294A90(Item_GObj*, Item_GObj*); diff --git a/src/melee/it/items/ityoshistar.c b/src/melee/it/items/ityoshistar.c index a0cd51d076..f4ce33725f 100644 --- a/src/melee/it/items/ityoshistar.c +++ b/src/melee/it/items/ityoshistar.c @@ -3,6 +3,7 @@ #include "math.h" #include "it/inlines.h" +#include "it/it_2725.h" #include #include diff --git a/src/melee/it/items/itzeldadinfire.c b/src/melee/it/items/itzeldadinfire.c index 8b13789179..e66aca9d3b 100644 --- a/src/melee/it/items/itzeldadinfire.c +++ b/src/melee/it/items/itzeldadinfire.c @@ -1 +1,44 @@ +#include "itzeldadinfire.h" +/* 2C4434 */ static bool it_802C4434(void); + +/// #it_802C3AF0 + +/// #it_802C3AFC + +/// #it_802C3BAC + +/// #it_802C3CBC + +/// #it_802C3D44 + +/// #it_802C3D74 + +/// #it_802C3E94 + +/// #it_802C40A4 + +/// #it_802C4208 + +/// #it_802C4364 + +/// #it_802C437C + +bool it_802C4434(void) +{ + return false; +} + +/// #it_802C443C + +bool it_802C4550(Item_GObj* arg0) +{ + return true; +} + +bool it_802C4558(Item_GObj* arg0) +{ + return true; +} + +/// #it_802C4560 diff --git a/src/melee/it/items/itzeldadinfire.h b/src/melee/it/items/itzeldadinfire.h index d6d91fa234..39e0ee7221 100644 --- a/src/melee/it/items/itzeldadinfire.h +++ b/src/melee/it/items/itzeldadinfire.h @@ -3,10 +3,21 @@ #include #include "it/forward.h" +#include #include "it/items/types.h" +/* 2C3AF0 */ HSD_GObj* it_802C3AF0(Item_GObj*); +/* 2C3AFC */ UNK_RET it_802C3AFC(UNK_PARAMS); +/* 2C3BAC */ HSD_GObj* it_802C3BAC(Item_GObj*, Vec3*, float facing_dir, float); /* 2C3CBC */ void it_802C3CBC(Item_GObj*); +/* 2C3D44 */ void it_802C3D44(Item_GObj*); +/* 2C3D74 */ UNK_RET it_802C3D74(UNK_PARAMS); +/* 2C3E94 */ UNK_RET it_802C3E94(UNK_PARAMS); +/* 2C40A4 */ UNK_RET it_802C40A4(UNK_PARAMS); +/* 2C4208 */ UNK_RET it_802C4208(UNK_PARAMS); +/* 2C4364 */ UNK_RET it_802C4364(UNK_PARAMS); +/* 2C437C */ UNK_RET it_802C437C(UNK_PARAMS); /* 2C443C */ bool it_802C443C(Item_GObj*); /* 2C4550 */ bool it_802C4550(Item_GObj*); /* 2C4558 */ bool it_802C4558(Item_GObj*); diff --git a/src/melee/it/items/itzeldadinfireexplode.c b/src/melee/it/items/itzeldadinfireexplode.c index 8b13789179..3b6df6c4f6 100644 --- a/src/melee/it/items/itzeldadinfireexplode.c +++ b/src/melee/it/items/itzeldadinfireexplode.c @@ -1 +1,40 @@ +#include "itzeldadinfireexplode.h" +/* 2C4998 */ static bool it_802C4998(void); + +/// #it_802C4580 + +/// #it_802C4670 + +/// #it_802C46C4 + +/// #it_802C4820 + +/// #it_802C4980 + +bool it_802C4998(void) +{ + return false; +} + +bool it_802C49A0(Item_GObj* arg0) +{ + return true; +} + +bool it_802C49A8(Item_GObj* arg0) +{ + return true; +} + +bool it_802C49B0(Item_GObj* arg0) +{ + return true; +} + +bool it_802C49B8(Item_GObj* arg0) +{ + return true; +} + +/// #it_802C49C0 diff --git a/src/melee/it/items/itzeldadinfireexplode.h b/src/melee/it/items/itzeldadinfireexplode.h index 0d1913ffba..f3d16ac629 100644 --- a/src/melee/it/items/itzeldadinfireexplode.h +++ b/src/melee/it/items/itzeldadinfireexplode.h @@ -6,7 +6,11 @@ #include "it/items/types.h" +/* 2C4580 */ UNK_RET it_802C4580(UNK_PARAMS); /* 2C4670 */ void it_802C4670(Item_GObj*); +/* 2C46C4 */ UNK_RET it_802C46C4(UNK_PARAMS); +/* 2C4820 */ UNK_RET it_802C4820(UNK_PARAMS); +/* 2C4980 */ UNK_RET it_802C4980(UNK_PARAMS); /* 2C49A0 */ bool it_802C49A0(Item_GObj*); /* 2C49A8 */ bool it_802C49A8(Item_GObj*); /* 2C49B0 */ bool it_802C49B0(Item_GObj*); diff --git a/src/melee/it/items/itzgshell.c b/src/melee/it/items/itzgshell.c index f5a6d8d4fd..bc6f5fa778 100644 --- a/src/melee/it/items/itzgshell.c +++ b/src/melee/it/items/itzgshell.c @@ -1 +1,126 @@ #include "itzgshell.h" + +/// #it_802DDB38 + +/// #it_802DDBE8 + +/// #fn_802DDC8C + +/// #it_802DDD38 + +/// #it_802DDEB4 + +/// #it_802DE040 + +/// #it_802DE0F0 + +bool it_802DE190(Item_GObj* arg0) +{ + return false; +} + +/// #it_802DE198 + +/// #it_802DE1FC + +/// #it_802DE320 + +/// #it_802DE35C + +/// #it_802DE3D8 + +/// #it_802DE408 + +/// #it_802DE434 + +bool it_802DE490(Item_GObj* arg0) +{ + return false; +} + +/// #it_802DE498 + +/// #it_802DE4FC + +/// #it_802DE544 + +/// #it_802DE5EC + +/// #it_802DE61C + +/// #it_802DE648 + +/// #it_802DE670 + +/// #it_802DE694 + +/// #it_802DE6C4 + +/// #it_802DE6F0 + +/// #it_802DE884 + +/// #it_802DEA0C + +/// #it_802DEB44 + +/// #it_802DEC80 + +/// #it_802DEE04 + +/// #it_802DEE98 + +/// #it_802DEEC8 + +/// #it_802DEEF4 + +bool it_802DEF78(Item_GObj* arg0) +{ + return false; +} + +/// #it_802DEF80 + +/// #it_802DF104 + +/// #it_802DF230 + +/// #it_802DF724 + +/// #it_802DF93C + +/// #it_802DF970 + +/// #it_802DF9F8 + +/// #it_802DFA68 + +/// #it_802DFB90 + +/// #it_802DFBAC + +/// #it_802DFC34 + +/// #it_802DFC58 + +/// #it_802DFC90 + +/// #it_802DFCB0 + +/// #it_802DFD60 + +/// #it_802DFE40 + +/// #fn_802DFE7C + +/// #it_802DFED4 + +/// #it_802DFEF4 + +/// #it_802DFF14 + +/// #it_802DFFA0 + +/// #it_802DFFB8 + +/// #it_802E0100 diff --git a/src/melee/it/items/itzgshell.h b/src/melee/it/items/itzgshell.h index 8788ba4d55..8ca9e15a50 100644 --- a/src/melee/it/items/itzgshell.h +++ b/src/melee/it/items/itzgshell.h @@ -1,53 +1,69 @@ -#ifndef _itzgshell_h_ -#define _itzgshell_h_ +#ifndef GALE01_2DDB38 +#define GALE01_2DDB38 #include #include "it/forward.h" -#include "it/items/types.h" +#include -void it_802DE040(Item_GObj*); -void it_802DE0F0(Item_GObj*); -bool it_802DE190(Item_GObj*); -void it_802DE198(Item_GObj*); -bool it_802DE1FC(Item_GObj*); -void it_802DE320(Item_GObj*); -bool it_802DE35C(Item_GObj*); -void it_802DE3D8(Item_GObj*); -bool it_802DE408(Item_GObj*); -void it_802DE434(Item_GObj*); -bool it_802DE490(Item_GObj*); -void it_802DE498(Item_GObj*); -void it_802DE4FC(Item_GObj*); -bool it_802DE544(Item_GObj*); -void it_802DE5EC(Item_GObj*); -bool it_802DE61C(Item_GObj*); -void it_802DE648(Item_GObj*); -bool it_802DE670(Item_GObj*); -void it_802DE694(Item_GObj*); -bool it_802DE6C4(Item_GObj*); -bool it_802DE884(Item_GObj*); -void it_802DEA0C(Item_GObj*); -bool it_802DEB44(Item_GObj*); -bool it_802DEE04(Item_GObj*); -void it_802DEE98(Item_GObj*); -bool it_802DEEC8(Item_GObj*); -void it_802DEEF4(Item_GObj*); -bool it_802DEF78(Item_GObj*); -void it_802DEF80(Item_GObj*); -bool it_802DF104(Item_GObj*); -bool it_802DF724(Item_GObj*); -void it_802DF93C(Item_GObj*); -bool it_802DF970(Item_GObj*); -bool it_802DFA68(Item_GObj*); -void it_802DFB90(Item_GObj*); -bool it_802DFBAC(Item_GObj*); -void it_802DFC34(Item_GObj*); -void it_802DFC58(Item_GObj*); -void it_802DFC90(Item_GObj*); -void it_802E0408(Item_GObj*); -void it_802DFCB0(Item_GObj*); -void it_802DFD60(Item_GObj*); -void it_802DFE40(Item_GObj*); +/* 2DDB38 */ UNK_RET it_802DDB38(UNK_PARAMS); +/* 2DDBE8 */ UNK_RET it_802DDBE8(UNK_PARAMS); +/* 2DDC8C */ UNK_RET fn_802DDC8C(UNK_PARAMS); +/* 2DDD38 */ UNK_RET it_802DDD38(UNK_PARAMS); +/* 2DDEB4 */ UNK_RET it_802DDEB4(UNK_PARAMS); +/* 2DE040 */ void it_802DE040(Item_GObj*); +/* 2DE0F0 */ void it_802DE0F0(Item_GObj*); +/* 2DE190 */ bool it_802DE190(Item_GObj*); +/* 2DE198 */ void it_802DE198(Item_GObj*); +/* 2DE1FC */ bool it_802DE1FC(Item_GObj*); +/* 2DE320 */ void it_802DE320(Item_GObj*); +/* 2DE35C */ bool it_802DE35C(Item_GObj*); +/* 2DE3D8 */ void it_802DE3D8(Item_GObj*); +/* 2DE408 */ bool it_802DE408(Item_GObj*); +/* 2DE434 */ void it_802DE434(Item_GObj*); +/* 2DE490 */ bool it_802DE490(Item_GObj*); +/* 2DE498 */ void it_802DE498(Item_GObj*); +/* 2DE4FC */ void it_802DE4FC(Item_GObj*); +/* 2DE544 */ bool it_802DE544(Item_GObj*); +/* 2DE5EC */ void it_802DE5EC(Item_GObj*); +/* 2DE61C */ bool it_802DE61C(Item_GObj*); +/* 2DE648 */ void it_802DE648(Item_GObj*); +/* 2DE670 */ bool it_802DE670(Item_GObj*); +/* 2DE694 */ void it_802DE694(Item_GObj*); +/* 2DE6C4 */ bool it_802DE6C4(Item_GObj*); +/* 2DE6F0 */ UNK_RET it_802DE6F0(UNK_PARAMS); +/* 2DE884 */ bool it_802DE884(Item_GObj*); +/* 2DEA0C */ void it_802DEA0C(Item_GObj*); +/* 2DEB44 */ bool it_802DEB44(Item_GObj*); +/* 2DEC80 */ UNK_RET it_802DEC80(UNK_PARAMS); +/* 2DEE04 */ bool it_802DEE04(Item_GObj*); +/* 2DEE98 */ void it_802DEE98(Item_GObj*); +/* 2DEEC8 */ bool it_802DEEC8(Item_GObj*); +/* 2DEEF4 */ void it_802DEEF4(Item_GObj*); +/* 2DEF78 */ bool it_802DEF78(Item_GObj*); +/* 2DEF80 */ void it_802DEF80(Item_GObj*); +/* 2DF104 */ bool it_802DF104(Item_GObj*); +/* 2DF230 */ UNK_RET it_802DF230(UNK_PARAMS); +/* 2DF724 */ bool it_802DF724(Item_GObj*); +/* 2DF93C */ void it_802DF93C(Item_GObj*); +/* 2DF970 */ bool it_802DF970(Item_GObj*); +/* 2DF9F8 */ UNK_RET it_802DF9F8(UNK_PARAMS); +/* 2DFA68 */ bool it_802DFA68(Item_GObj*); +/* 2DFB90 */ void it_802DFB90(Item_GObj*); +/* 2DFBAC */ bool it_802DFBAC(Item_GObj*); +/* 2DFC34 */ void it_802DFC34(Item_GObj*); +/* 2DFC58 */ void it_802DFC58(Item_GObj*); +/* 2DFC90 */ void it_802DFC90(Item_GObj*); +/* 2DFCB0 */ void it_802DFCB0(Item_GObj*); +/* 2DFD60 */ void it_802DFD60(Item_GObj*); +/* 2DFE40 */ void it_802DFE40(Item_GObj*); +/* 2DFE7C */ UNK_RET fn_802DFE7C(UNK_PARAMS); +/* 2DFED4 */ UNK_RET it_802DFED4(UNK_PARAMS); +/* 2DFEF4 */ UNK_RET it_802DFEF4(UNK_PARAMS); +/* 2DFF14 */ UNK_RET it_802DFF14(UNK_PARAMS); +/* 2DFFA0 */ UNK_RET it_802DFFA0(UNK_PARAMS); +/* 2DFFB8 */ UNK_RET it_802DFFB8(UNK_PARAMS); +/* 2E0100 */ UNK_RET it_802E0100(UNK_PARAMS); +/* 2E0408 */ void it_802E0408(Item_GObj*); #endif diff --git a/src/melee/lb/lb_00F9.c b/src/melee/lb/lb_00F9.c index e68566bec0..26d290f4af 100644 --- a/src/melee/lb/lb_00F9.c +++ b/src/melee/lb/lb_00F9.c @@ -3,6 +3,9 @@ #include /* 011B74 */ static void lb_80011B74(HSD_DObj* dobj, u32 flags); +/* 013BB0 */ bool lb_80013BB0(void); + +/* 4D63B4 */ static enum_t lb_804D63B4; static inline bool checkJObjFlags(HSD_JObj* jobj) { @@ -19,7 +22,118 @@ void lb_8000F9F8(HSD_JObj* jobj) } } -/* -@note: The number of HSD_JObjs that get passed into arg1 is the number of -variable arguments passed until -1 is passed. lb_80011E24 -*/ +/// #lb_8000FA94 + +/// #lb_8000FCDC + +/// #lb_8000FD18 + +/// #lb_8000FD48 + +/// #lb_800100B0 + +/// #lb_800101C8 + +/// #lb_800103B8 + +/// #lb_800103D8 + +/// #lb_8001044C + +/// #lb_800115F4 + +/// #lb_80011710 + +/// #lb_800117F4 + +/// #lb_800119DC + +/// #lb_80011A50 + +enum_t lb_80011ABC(void) +{ + return lb_804D63B4; +} + +/// #lb_80011AC4 + +/// #lb_80011B74 + +/// #lb_80011C18 + +/** + * @note: The number of HSD_JObjs that get passed into arg1 is the number of + * variable arguments passed until -1 is passed. + */ +/// #lb_80011E24 + +/// #lb_8001204C + +/// #lb_800121FC + +/// #lb_800122C8 + +/// #lb_800122F0 + +/// #lb_8001271C + +/// #lb_8001285C + +/// #lb_80012994 + +/// #fn_80013614 + +/// #fn_800138AC + +/// #lb_800138CC + +/// #lb_800138D8 + +/// #lb_800138EC + +/// #lb_80013B14 + +bool lb_80013BB0(void) +{ + return true; +} + +/// #lb_80013BB8 + +/// #lb_80013BE4 + +/// #lb_80013C18 + +/// #lb_80013D68 + +/// #lb_80013E3C + +/// #lb_80013F78 + +/// #lb_80013FF0 + +/// #lb_80014014 + +/// #lb_800140F8 + +/// #lb_80014234 + +/// #lb_80014258 + +/// #lb_80014498 + +/// #lb_800144C8 + +/// #lb_80014534 + +/// #lb_80014574 + +/// #lb_800145C0 + +/// #lb_800145F4 + +/// #lb_80014638 + +/// #lb_80014770 + +/// #lb_800149E0 diff --git a/src/melee/lb/lb_00F9.h b/src/melee/lb/lb_00F9.h index 738418b5d2..b5bf7af39f 100644 --- a/src/melee/lb/lb_00F9.h +++ b/src/melee/lb/lb_00F9.h @@ -10,9 +10,14 @@ #include /* 00F9F8 */ void lb_8000F9F8(HSD_JObj* jobj); +/* 00FA94 */ UNK_RET lb_8000FA94(UNK_PARAMS); /* 00FCDC */ void lb_8000FCDC(void); /* 00FD18 */ void lb_8000FD18(UNK_T); /* 00FD48 */ void lb_8000FD48(HSD_JObj*, DynamicsDesc*, size_t); +/* 0100B0 */ UNK_RET lb_800100B0(UNK_PARAMS); +/* 0101C8 */ UNK_RET lb_800101C8(UNK_PARAMS); +/* 0103B8 */ UNK_RET lb_800103B8(UNK_PARAMS); +/* 0103D8 */ UNK_RET lb_800103D8(UNK_PARAMS); /* 01044C */ void lb_8001044C(DynamicsDesc*, UNK_T, int, float pos_y, bool, Fighter_Part part, int, bool); /* 0115F4 */ void lb_800115F4(void); @@ -25,15 +30,38 @@ /* 011AC4 */ HSD_LObj* lb_80011AC4(UNK_T); /* 011C18 */ void lb_80011C18(HSD_JObj* jobj, u32 flags); /* 011E24 */ int lb_80011E24(HSD_JObj*, HSD_JObj**, ...); +/* 01204C */ UNK_RET lb_8001204C(UNK_PARAMS); +/* 0121FC */ void lb_800121FC(HSD_ImageDesc*, int, int, int, int); /* 0122C8 */ void lb_800122C8(HSD_ImageDesc*, int, int, int); -/* 0122FC */ void lb_800121FC(HSD_ImageDesc*, int, int, int, int); +/* 0122F0 */ UNK_RET lb_800122F0(UNK_PARAMS); +/* 01271C */ UNK_RET lb_8001271C(UNK_PARAMS); +/* 01285C */ UNK_RET lb_8001285C(UNK_PARAMS); +/* 012994 */ UNK_RET lb_80012994(UNK_PARAMS); +/* 013614 */ UNK_RET fn_80013614(UNK_PARAMS); +/* 0138AC */ UNK_RET fn_800138AC(UNK_PARAMS); +/* 0138CC */ UNK_RET lb_800138CC(UNK_PARAMS); +/* 0138D8 */ UNK_RET lb_800138D8(UNK_PARAMS); +/* 0138EC */ UNK_RET lb_800138EC(UNK_PARAMS); /* 013B14 */ HSD_CObj* lb_80013B14(HSD_CameraDescPerspective*); +/* 013BB8 */ UNK_RET lb_80013BB8(UNK_PARAMS); +/* 013BE4 */ UNK_RET lb_80013BE4(UNK_PARAMS); +/* 013C18 */ UNK_RET lb_80013C18(UNK_PARAMS); +/* 013D68 */ UNK_RET lb_80013D68(UNK_PARAMS); +/* 013E3C */ UNK_RET lb_80013E3C(UNK_PARAMS); +/* 013F78 */ UNK_RET lb_80013F78(UNK_PARAMS); +/* 013FF0 */ UNK_RET lb_80013FF0(UNK_PARAMS); +/* 014014 */ UNK_RET lb_80014014(UNK_PARAMS); +/* 0140F8 */ UNK_RET lb_800140F8(UNK_PARAMS); +/* 014234 */ UNK_RET lb_80014234(UNK_PARAMS); /* 014258 */ bool lb_80014258(HSD_GObj* gobj, UNK_T arg1, FtCmd cmd); /* 014498 */ void lb_80014498(UNK_T arg0); /* 0144C8 */ bool lb_800144C8(ftDeviceUnk2*, void*, s32, s32); +/* 014534 */ UNK_RET lb_80014534(UNK_PARAMS); /* 014574 */ void lb_80014574(u8, int, int, int); /* 0145C0 */ void lb_800145C0(u8); +/* 0145F4 */ UNK_RET lb_800145F4(UNK_PARAMS); /* 014638 */ UNK_T lb_80014638(void); /* 014770 */ bool lb_80014770(Vec3*, int); +/* 0149E0 */ UNK_RET lb_800149E0(UNK_PARAMS); #endif diff --git a/src/melee/lb/lbarq.c b/src/melee/lb/lbarq.c index 8b13789179..eb04629bab 100644 --- a/src/melee/lb/lbarq.c +++ b/src/melee/lb/lbarq.c @@ -1 +1,14 @@ +#include +#include + +s32 lbArq_80014ABC(void* arg0) +{ + return M2C_FIELD(arg0, s32*, 4); +} + +/// #lbArq_80014AC4 + +/// #lbArq_80014BD0 + +/// #lbArq_80014D2C diff --git a/src/melee/lb/lbarq.h b/src/melee/lb/lbarq.h index 5882974e64..e730a2cc1c 100644 --- a/src/melee/lb/lbarq.h +++ b/src/melee/lb/lbarq.h @@ -1,8 +1,13 @@ -#ifndef MELEE_LB_LBARQ_H -#define MELEE_LB_LBARQ_H +#ifndef GALE01_014ABC +#define GALE01_014ABC #include -void lbArq_80014D2C(void); +#include + +/* 014ABC */ UNK_RET lbArq_80014ABC(UNK_PARAMS); +/* 014AC4 */ UNK_RET lbArq_80014AC4(UNK_PARAMS); +/* 014BD0 */ UNK_RET lbArq_80014BD0(UNK_PARAMS); +/* 014D2C */ void lbArq_80014D2C(void); #endif diff --git a/src/melee/lb/lbaudio_ax.c b/src/melee/lb/lbaudio_ax.c index 6a8966bc2d..3947c4c04f 100644 --- a/src/melee/lb/lbaudio_ax.c +++ b/src/melee/lb/lbaudio_ax.c @@ -1,11 +1,83 @@ #include +static s32 lbl_804D6408; + +/// #lbAudioAx_8002306C + +/// #lbAudioAx_80023090 + +/// #lbAudioAx_800230C8 + +/// #lbAudioAx_80023130 + +/// #lbAudioAx_80023220 + +/// #fn_80023254 + +/// #lbAudioAx_800233EC + +/// #lbAudioAx_80023694 + int lbAudioAx_800236B8(HSD_SM* arg0) { AXDriverKeyOff(arg0); return -1; } +/// #lbAudioAx_800236DC + +/// #lbAudioAx_80023710 + +/// #lbAudioAx_80023730 + +/// #fn_80023750 + +/// #lbAudioAx_800237A8 + +/// #lbAudioAx_80023870 + +/// #lbAudioAx_8002392C + +/// #lbAudioAx_80023968 + +/// #lbAudioAx_80023A44 + +/// #lbAudioAx_80023B24 + +/// #fn_80023ED4 + +/// #lbAudioAx_80023F28 + +/// #lbAudioAx_80024030 + +/// #lbAudioAx_800240B4 + +/// #lbAudioAx_8002411C + +/// #lbAudioAx_80024184 + +/// #lbAudioAx_80024304 + +/// #lbAudioAx_8002438C + +/// #lbAudioAx_800243F4 + +/// #fn_800244F4 + +/// #lbAudioAx_800245D4 + +/// #lbAudioAx_800245F4 + +/// #lbAudioAx_80024614 + +/// #lbAudioAx_80024634 + +/// #fn_80024654 + +/// #lbAudioAx_80024B1C + +/// #lbAudioAx_80024B58 + int lbAudioAx_80024B94(int arg0, int arg1) { int const limit = 0x4B0; @@ -17,3 +89,120 @@ int lbAudioAx_80024B94(int arg0, int arg1) } return AXDriver_8038D4E4(arg0, arg1); } + +/// #lbAudioAx_80024BD0 + +/// #lbAudioAx_80024C08 + +/// #lbAudioAx_80024C84 + +/// #lbAudioAx_80024D50 + +/// #lbAudioAx_80024D78 + +/// #lbAudioAx_80024DC4 + +/// #lbAudioAx_80024E50 + +/// #lbAudioAx_80024E84 + +/// #lbAudioAx_80024F08 + +/// #lbAudioAx_80024F6C + +/// #lbAudioAx_80024FDC + +/// #lbAudioAx_80024FF4 + +/// #lbAudioAx_8002500C + +/// #lbAudioAx_80025038 + +/// #lbAudioAx_80025064 + +void lbAudioAx_80025098(s32 arg0) +{ + lbl_804D6408 = arg0; +} + +/// #fn_800250A0 + +/// #fn_800251EC + +/// #fn_800253D8 + +/// #fn_800256BC + +/// #fn_800259A0 + +/// #fn_800259EC + +/// #fn_80025A98 + +/// #fn_80025B44 + +/// #fn_80025CBC + +/// #fn_80025E38 + +/// #fn_80025FAC + +/// #fn_800262A0 + +/// #fn_800263B4 + +/// #lbAudioAx_800263E8 + +/// #lbAudioAx_800264E4 + +/// #lbAudioAx_80026510 + +/// #lbAudioAx_800265C4 + +/// #fn_80026650 + +/// #fn_800267B0 + +/// #fn_800268B4 + +/// #fn_800269AC + +/// #fn_80026C04 + +/// #fn_80026E58 + +/// #lbAudioAx_80026E84 + +/// #lbAudioAx_80026EBC + +/// #lbAudioAx_80026F2C + +/// #lbAudioAx_8002702C + +/// #lbAudioAx_80027168 + +/// #fn_80027488 + +/// #lbAudioAx_80027648 + +/// #lbAudioAx_8002785C + +/// #lbAudioAx_80027AB0 + +/// #lbAudioAx_80027DBC + +/// #lbAudioAx_80027DF8 + +/// #lbAudioAx_8002835C + +/// #lbAudioAx_8002838C + +/// #lbAudioAx_80028690 + +/// #lbAudioAx_80028B2C + +/// #lbAudioAx_80028B4C + +/// #lbAudioAx_80028B6C + +/// #lbAudioAx_80028B90 diff --git a/src/melee/lb/lbaudio_ax.h b/src/melee/lb/lbaudio_ax.h index c6f25f8dea..7c2fa59b84 100644 --- a/src/melee/lb/lbaudio_ax.h +++ b/src/melee/lb/lbaudio_ax.h @@ -10,32 +10,98 @@ #define SFX_NONE -1 /* 02305C */ s32 lbAudioAx_8002305C(s32, s32); +/* 023090 */ UNK_RET lbAudioAx_80023090(UNK_PARAMS); /* 0230C8 */ s32 lbAudioAx_800230C8(s32, int*, int*); /* 023130 */ s32 lbAudioAx_80023130(void); /* 023220 */ s32 lbAudioAx_80023220(s32); +/* 023254 */ UNK_RET fn_80023254(UNK_PARAMS); /* 0233EC */ s32 lbAudioAx_800233EC(s32); +/* 023694 */ UNK_RET lbAudioAx_80023694(UNK_PARAMS); /* 0236B8 */ void lbAudioAx_800236B8(s32); +/* 0236DC */ UNK_RET lbAudioAx_800236DC(UNK_PARAMS); /* 023710 */ bool lbAudioAx_80023710(s32); +/* 023730 */ UNK_RET lbAudioAx_80023730(UNK_PARAMS); +/* 023750 */ UNK_RET fn_80023750(UNK_PARAMS); /* 0237A8 */ u32 lbAudioAx_800237A8(enum_t sfx_id, u8 sfx_vol, u8 sfx_pan); /* 023870 */ int lbAudioAx_80023870(int, int, int, int); +/* 02392C */ UNK_RET lbAudioAx_8002392C(UNK_PARAMS); +/* 023968 */ UNK_RET lbAudioAx_80023968(UNK_PARAMS); +/* 023A44 */ UNK_RET lbAudioAx_80023A44(UNK_PARAMS); +/* 023B24 */ UNK_RET lbAudioAx_80023B24(UNK_PARAMS); +/* 023ED4 */ UNK_RET fn_80023ED4(UNK_PARAMS); /* 023F28 */ void lbAudioAx_80023F28(s32); -/* 024030 */ void lbAudioAx_80024030(s32); // plays menu SFX +/* 024030 */ void lbAudioAx_80024030(s32); +/* 0240B4 */ UNK_RET lbAudioAx_800240B4(UNK_PARAMS); +/* 02411C */ UNK_RET lbAudioAx_8002411C(UNK_PARAMS); /* 024184 */ int lbAudioAx_80024184(int, int, int, int); +/* 024304 */ UNK_RET lbAudioAx_80024304(UNK_PARAMS); /* 02438C */ void lbAudioAx_8002438C(s32); +/* 0243F4 */ UNK_RET lbAudioAx_800243F4(UNK_PARAMS); +/* 0244F4 */ UNK_RET fn_800244F4(UNK_PARAMS); +/* 0245D4 */ UNK_RET lbAudioAx_800245D4(UNK_PARAMS); +/* 0245F4 */ UNK_RET lbAudioAx_800245F4(UNK_PARAMS); +/* 024614 */ UNK_RET lbAudioAx_80024614(UNK_PARAMS); +/* 024634 */ UNK_RET lbAudioAx_80024634(UNK_PARAMS); +/* 024654 */ UNK_RET fn_80024654(UNK_PARAMS); /* 024B1C */ void lbAudioAx_80024B1C(s32, s32); /* 024B58 */ void lbAudioAx_80024B58(s32, s32); /* 024B94 */ void lbAudioAx_80024B94(int, int); +/* 024BD0 */ u8 lbAudioAx_80024BD0(void); +/* 024C08 */ void lbAudioAx_80024C08(u8); +/* 024C84 */ UNK_RET lbAudioAx_80024C84(UNK_PARAMS); +/* 024D50 */ UNK_RET lbAudioAx_80024D50(UNK_PARAMS); +/* 024D78 */ UNK_RET lbAudioAx_80024D78(UNK_PARAMS); /* 024DC4 */ void lbAudioAx_80024DC4(void); +/* 024E50 */ UNK_RET lbAudioAx_80024E50(UNK_PARAMS); +/* 024E84 */ UNK_RET lbAudioAx_80024E84(UNK_PARAMS); +/* 024F08 */ UNK_RET lbAudioAx_80024F08(UNK_PARAMS); +/* 024F6C */ UNK_RET lbAudioAx_80024F6C(UNK_PARAMS); /* 024FDC */ void lbAudioAx_80024FDC(void); /* 024FF4 */ void lbAudioAx_80024FF4(void); /* 02500C */ void lbAudioAx_8002500C(s32); /* 025038 */ void lbAudioAx_80025038(s32); +/* 025064 */ UNK_RET lbAudioAx_80025064(UNK_PARAMS); +/* 025098 */ UNK_RET lbAudioAx_80025098(UNK_PARAMS); +/* 0250A0 */ UNK_RET fn_800250A0(UNK_PARAMS); +/* 0251EC */ UNK_RET fn_800251EC(UNK_PARAMS); +/* 0253D8 */ UNK_RET fn_800253D8(UNK_PARAMS); +/* 0256BC */ UNK_RET fn_800256BC(UNK_PARAMS); +/* 0259A0 */ UNK_RET fn_800259A0(UNK_PARAMS); +/* 0259EC */ UNK_RET fn_800259EC(UNK_PARAMS); +/* 025A98 */ UNK_RET fn_80025A98(UNK_PARAMS); +/* 025B44 */ UNK_RET fn_80025B44(UNK_PARAMS); +/* 025CBC */ UNK_RET fn_80025CBC(UNK_PARAMS); +/* 025E38 */ UNK_RET fn_80025E38(UNK_PARAMS); +/* 025FAC */ UNK_RET fn_80025FAC(UNK_PARAMS); +/* 0262A0 */ UNK_RET fn_800262A0(UNK_PARAMS); +/* 0263B4 */ UNK_RET fn_800263B4(UNK_PARAMS); /* 0263E8 */ void lbAudioAx_800263E8(HSD_GObj*, int, int, int, float); /* 0264E4 */ bool lbAudioAx_800264E4(void); /* 026510 */ void lbAudioAx_80026510(HSD_GObj*); /* 0265C4 */ enum_t lbAudioAx_800265C4(HSD_GObj*, enum_t sfx); +/* 026650 */ UNK_RET fn_80026650(UNK_PARAMS); +/* 0267B0 */ UNK_RET fn_800267B0(UNK_PARAMS); +/* 0268B4 */ UNK_RET fn_800268B4(UNK_PARAMS); +/* 0269AC */ UNK_RET fn_800269AC(UNK_PARAMS); +/* 026C04 */ UNK_RET fn_80026C04(UNK_PARAMS); +/* 026E58 */ UNK_RET fn_80026E58(UNK_PARAMS); +/* 026E84 */ UNK_RET lbAudioAx_80026E84(UNK_PARAMS); +/* 026EBC */ UNK_RET lbAudioAx_80026EBC(UNK_PARAMS); +/* 026F2C */ void lbAudioAx_80026F2C(s32); +/* 02702C */ void lbAudioAx_8002702C(s32, u64); +/* 027168 */ void lbAudioAx_80027168(void); +/* 027488 */ UNK_RET fn_80027488(UNK_PARAMS); +/* 027648 */ f32 lbAudioAx_80027648(void); +/* 02785C */ UNK_RET lbAudioAx_8002785C(UNK_PARAMS); +/* 027AB0 */ UNK_RET lbAudioAx_80027AB0(UNK_PARAMS); /* 027DBC */ void lbAudioAx_80027DBC(void); +/* 027DF8 */ UNK_RET lbAudioAx_80027DF8(UNK_PARAMS); +/* 02835C */ UNK_RET lbAudioAx_8002835C(UNK_PARAMS); /* 02838C */ void lbAudioAx_8002838C(void); -/* 026F2C */ void lbAudioAx_80026F2C(s32); +/* 028690 */ UNK_RET lbAudioAx_80028690(UNK_PARAMS); +/* 028B2C */ UNK_RET lbAudioAx_80028B2C(UNK_PARAMS); +/* 028B4C */ UNK_RET lbAudioAx_80028B4C(UNK_PARAMS); +/* 028B6C */ UNK_RET lbAudioAx_80028B6C(UNK_PARAMS); +/* 028B90 */ UNK_RET lbAudioAx_80028B90(UNK_PARAMS); #endif diff --git a/src/melee/lb/lbbgflash.c b/src/melee/lb/lbbgflash.c index a30fb855bd..86b6ec394c 100644 --- a/src/melee/lb/lbbgflash.c +++ b/src/melee/lb/lbbgflash.c @@ -34,7 +34,12 @@ /// #fn_800219E4 -/// #lbBgFlash_80021A10 +extern f32 lbl_804D63D8; + +void lbBgFlash_80021A10(f32 arg8) +{ + lbl_804D63D8 = arg8; +} /// #lbBgFlash_80021A18 @@ -47,3 +52,49 @@ void fn_80021C18(void) {} /// #lbBgFlash_80021C48 /// #fn_80021C80 +/// #fn_8001FC08 + +/// #fn_8001FEC4 + +/// #fn_800204C8 + +/// #lbBgFlash_800205F0 + +/// #lbBgFlash_8002063C + +/// #lbBgFlash_80020688 + +/// #lbBgFlash_800206D4 + +/// #fn_8002087C + +/// #fn_800208B0 + +/// #lbBgFlash_800208EC + +/// #lbBgFlash_800209F4 + +/// #fn_80020AEC + +/// #lbBgFlash_80020E38 + +/// #fn_8002113C + +/// #lbBgFlash_80021410 + +/// #fn_800219E4 + +/// #lbBgFlash_80021A10 + +/// #lbBgFlash_80021A18 + +/// #fn_80021B04 + +/// #fn_80021C18 + +/// #fn_80021C1C + +/// #lbBgFlash_80021C48 + +/// #fn_80021C80 + diff --git a/src/melee/lb/lbsnap.c b/src/melee/lb/lbsnap.c index fb2accb2b4..9ad5e7bbab 100644 --- a/src/melee/lb/lbsnap.c +++ b/src/melee/lb/lbsnap.c @@ -36,3 +36,8 @@ int lbSnap_8001D350(int i) } return ptr->unk0; } + +s32 lbSnap_8001E210(void) +{ + return 0x840; +} diff --git a/src/melee/lb/lbsnap.h b/src/melee/lb/lbsnap.h index 91784e32af..c16a164deb 100644 --- a/src/melee/lb/lbsnap.h +++ b/src/melee/lb/lbsnap.h @@ -1,8 +1,31 @@ -#ifndef MELEE_LB_LBSNAP_H -#define MELEE_LB_LBSNAP_H +#ifndef GALE01_01D2BC +#define GALE01_01D2BC #include -void lbSnap_8001E290(void); +#include + +/* 01D2BC */ UNK_RET lbSnap_8001D2BC(UNK_PARAMS); +/* 01D338 */ UNK_RET lbSnap_8001D338(UNK_PARAMS); +/* 01D350 */ UNK_RET lbSnap_8001D350(UNK_PARAMS); +/* 01D394 */ UNK_RET lbSnap_8001D394(UNK_PARAMS); +/* 01D3B0 */ UNK_RET lbSnap_8001D3B0(UNK_PARAMS); +/* 01D3CC */ UNK_RET lbSnap_8001D3CC(UNK_PARAMS); +/* 01D3E8 */ UNK_RET lbSnap_8001D3E8(UNK_PARAMS); +/* 01D40C */ UNK_RET lbSnap_8001D40C(UNK_PARAMS); +/* 01D4A4 */ UNK_RET lbSnap_8001D4A4(UNK_PARAMS); +/* 01D5FC */ UNK_RET lbSnap_8001D5FC(UNK_PARAMS); +/* 01D7B0 */ UNK_RET lbSnap_8001D7B0(UNK_PARAMS); +/* 01DA5C */ UNK_RET lbSnap_8001DA5C(UNK_PARAMS); +/* 01DC0C */ UNK_RET lbSnap_8001DC0C(UNK_PARAMS); +/* 01DE8C */ UNK_RET lbSnap_8001DE8C(UNK_PARAMS); +/* 01DF20 */ UNK_RET lbSnap_8001DF20(UNK_PARAMS); +/* 01DF6C */ UNK_RET lbSnap_8001DF6C(UNK_PARAMS); +/* 01E058 */ UNK_RET lbSnap_8001E058(UNK_PARAMS); +/* 01E204 */ UNK_RET lbSnap_8001E204(UNK_PARAMS); +/* 01E210 */ UNK_RET lbSnap_8001E210(UNK_PARAMS); +/* 01E218 */ UNK_RET lbSnap_8001E218(UNK_PARAMS); +/* 01E27C */ UNK_RET lbSnap_8001E27C(UNK_PARAMS); +/* 01E290 */ void lbSnap_8001E290(void); #endif diff --git a/src/melee/mn/mnhyaku.c b/src/melee/mn/mnhyaku.c index fd986e9a07..735c986e96 100644 --- a/src/melee/mn/mnhyaku.c +++ b/src/melee/mn/mnhyaku.c @@ -2,7 +2,6 @@ #include "mnhyaku.h" -#include "lb/lb_00F9.h" #include "lb/lbarchive.h" #include "lb/lbaudio_ax.h" #include "mn/inlines.h" @@ -14,10 +13,6 @@ static HSD_GObj* mnHyaku_804D6C58; void gm_801677E8(void); -void lbAudioAx_8002702C(s32, u64); -void lbAudioAx_80027168(void); -f32 lbAudioAx_80027648(void); - static f32 mnHyaku_803EF668[3] = { 0.0f, 19.0f, -0.1f }; static f32 mnHyaku_803EF674[3] = { 20.0f, 29.0f, -0.1f }; diff --git a/src/melee/mn/mnsound.c b/src/melee/mn/mnsound.c index fbe695354a..d615f51e76 100644 --- a/src/melee/mn/mnsound.c +++ b/src/melee/mn/mnsound.c @@ -28,7 +28,6 @@ Vec3 mnSound_803EEED8[] = { { 0.0f, 199.0f, 0.0f }, { 0.0f, 29.0f, 0.0f }, void gmMainLib_8015ED80(u8); /* extern */ void gm_801602C0(u8); /* extern */ -void lbAudioAx_80024C08(u8); /* extern */ void lb_8001CE00(void); /* extern */ StaticModelDesc mnSound_desc; @@ -205,7 +204,6 @@ void fn_80249A1C(HSD_GObj* arg0) } u8 gmMainLib_8015ED74(void); /* extern */ -u8 lbAudioAx_80024BD0(void); /* extern */ StaticModelDesc mnSound_804A08A8; void mnSound_80249C08(void) diff --git a/src/melee/mp/mplib.c b/src/melee/mp/mplib.c index 1cc0e069d9..6c23521107 100644 --- a/src/melee/mp/mplib.c +++ b/src/melee/mp/mplib.c @@ -1,15 +1,53 @@ #include "mplib.h" +#include "mp/types.h" + #include -static int mpLib_804D64B4; -static IntVec2* mpLib_804D64BC; +/* 4D64B0 */ static int mpLib_804D64B0; +/* 4D64B4 */ static int mpLib_804D64B4; +/* 4D64B8 */ static int mpLib_804D64B8; +/* 4D64BC */ static mp_UnkStruct2* mpLib_804D64BC; +/* 4D64C0 */ static int mpLib_804D64C0; int mpLib_8004D164(void) { return mpLib_804D64B4; } +int mpLib_8004D16C(void) +{ + return mpLib_804D64B8; +} + +mp_UnkStruct2* mpLib_8004D174(void) +{ + return mpLib_804D64BC; +} + +int mpLib_8004D17C(void) +{ + return mpLib_804D64C0; +} + +/// #mpLib_8004D184 + +/// #mpLib_8004D288 + +/// #mpLib_8004DB78 + +/// #mpLib_8004DC04 + +/// #mpLib_8004DC90 + +/// #mpLib_8004DD90 + +/// #mpLib_8004E090 + +/// #mpLib_8004E398 + +/// #mpLib_8004E684 + bool mpLib_8004E97C(double arg0, double arg1, double arg2, double arg3, double arg4, double arg5, double arg6, double arg7, float* arg8, float* arg9) @@ -100,21 +138,240 @@ bool mpLib_8004E97C(double arg0, double arg1, double arg2, double arg3, return false; } +/// #mpLib_8004EBF8 + +/// #mpLib_8004ED5C + +/// #mpLib_8004F008 + +/// #mpLib_8004F400 + +/// #mpLib_8004F8A4 + +/// #mpLib_8004FC2C + +/// #mpLib_80050068 + +/// #mpLib_800501CC + +/// #mpLib_8005057C + +/// #mpLib_800509B8 + +/// #mpLib_80050D68 + +/// #mpLib_800511A4 + +/// #mpLib_800515A0 + +/// #mpLib_8005199C + +/// #mpLib_80051BA8 + +/// #mpLib_80051EC8 + +/// #mpLib_800524DC + +/// #mpLib_80052508 + +/// #mpLib_80052534 + +/// #mpLib_80052700 + +/// #mpLib_800528CC + +/// #mpLib_80052A98 + +/// #mpLib_80052C64 + +/// #mpLib_80052E30 + +/// #mpLib_80052FFC + +/// #mpLib_800531C8 + +/// #mpLib_80053394 + +/// #mpLib_80053448 + +/// #mpLib_800534FC + +/// #mpLib_800536CC + +/// #mpLib_8005389C + +/// #mpLib_80053950 + +/// #mpLib_80053A04 + +/// #mpLib_80053BD4 + +/// #mpLib_80053DA4 + +/// #mpLib_80053ECC + +/// #mpLib_80053FF4 + +/// #mpLib_80054158 + +/// #mpLib_800542BC + +/// #mpLib_80054420 + +/// #mpLib_80054584 + +/// #mpLib_800546E8 + +/// #mpLib_8005484C + +/// #mpLib_800549B0 + +/// #mpLib_80054B14 + +/// #mpLib_80054BC0 + +/// #mpLib_80054C6C + +/// #mpLib_80054CEC + +/// #mpLib_80054D68 + +/// #mpLib_80054DFC + bool mpLib_80054ED8(int line) { if (line == -1) { return false; } - if (line < 0 || line >= mpLib_804D64BC[0].x) { + if (line < 0 || line >= mpLib_804D64BC[0].x0->x0) { OSReport("%s:%d:not found lineID=%d\n", __FILE__, 4636); while (true) { continue; }; } - if (!(mpLib_804D64BC[line].y & 0x10000) || - (mpLib_804D64BC[line].y & 0x40000)) + if (!(mpLib_804D64BC[line].x4 & 0x10000) || + (mpLib_804D64BC[line].x4 & 0x40000)) { return false; } return true; } + +/// #mpLib_80054F68 + +/// #mpLib_800552B0 + +/// #mpLib_8005541C + +/// #mpLib_800557D0 + +/// #mpLib_80055C5C + +/// #mpLib_80055E24 + +/// #mpLib_80055E9C + +/// #mpLib_800565DC + +/// #mpLib_8005667C + +/// #mpLib_800566D8 + +/// #mpLib_800566F8 + +/// #mpLib_80056710 + +/// #mpLib_80056758 + +/// #mpLib_800567C0 + +/// #mpLib_800569EC + +/// #mpLib_80056A1C + +/// #mpLib_80056A54 + +/// #mpLib_80056A8C + +/// #mpLib_80056AC4 + +/// #mpLib_80056AFC + +/// #mpLib_80056B34 + +/// #mpLib_80056B6C + +/// #mpLib_80056C54 + +/// #mpLib_80057424 + +/// #mpLib_80057528 + +/// #mpLib_800575B0 + +/// #mpLib_80057638 + +/// #mpLib_80057B4C + +/// #mpLib_80057BC0 + +/// #mpLib_80057FDC + +/// #mpLib_80058044 + +/// #mpLib_800580AC + +/// #mpLib_800580C8 + +/// #mpLib_800580E0 + +/// #mpLib_800580FC + +/// #mpLib_8005811C + +/// #mpLib_800581A4 + +/// #mpLib_800581BC + +/// #mpLib_800581DC + +/// #mpLib_80058560 + +/// #mpLib_80058614 + +/// #fn_800587FC + +/// #mpLib_80058820 + +int mpLib_800588C8(void) +{ + return mpLib_804D64B0; +} + +/// #mpLib_800588D0 + +/// #mpLib_80058970 + +/// #mpLib_800589D0 + +/// #mpLib_80058AA0 + +/// #mpLib_80058ACC + +/// #mpLib_80058B5C + +/// #mpLib_800590F4 + +/// #mpLib_80059404 + +/// #mpLib_80059554 + +/// #mpLib_80059E60 + +/// #mpLib_80059FE0 + +/// #mpLib_8005A220 + +/// #mpLib_8005A2DC + +/// #mpLib_8005A340 diff --git a/src/melee/mp/mplib.h b/src/melee/mp/mplib.h index 9aa2af88ac..c0de98f187 100644 --- a/src/melee/mp/mplib.h +++ b/src/melee/mp/mplib.h @@ -2,52 +2,99 @@ #define GALE01_04D164 #include +#include "gr/forward.h" #include "mp/forward.h" #include #include -#include "ft/types.h" - #include #include +/* 04D164 */ int mpLib_8004D164(void); +/* 04D16C */ int mpLib_8004D16C(void); +/* 04D174 */ mp_UnkStruct2* mpLib_8004D174(void); /* 04D17C */ int mpLib_8004D17C(void); +/* 04D184 */ UNK_RET mpLib_8004D184(UNK_PARAMS); /* 04D288 */ void mpLib_8004D288(UNK_T); /* 04DB78 */ s32 mpLib_8004DB78(s32 gr_idx); /* 04DC04 */ s32 mpLib_8004DC04(s32 gr_idx); /* 04DD90 */ bool mpLib_8004DD90(int idx, float*, float*, UNK_T, Vec3* normal); /* 04E090 */ enum_t mpLib_8004E090(int idx, Vec3*, float*, u32*, Vec3* normal); /* 04E398 */ bool mpLib_8004E398(int, float*, int, int, int, float); +/* 04E684 */ UNK_RET mpLib_8004E684(UNK_PARAMS); +/* 04EBF8 */ UNK_RET mpLib_8004EBF8(UNK_PARAMS); +/* 04ED5C */ UNK_RET mpLib_8004ED5C(UNK_PARAMS); /* 04F008 */ bool mpLib_8004F008(Vec3*, int*, int, int, int, int, int, int, float, float, float, float, float); +/* 04F400 */ UNK_RET mpLib_8004F400(UNK_PARAMS); /* 04F8A4 */ UNK_RET mpLib_8004F8A4(UNK_PARAMS); +/* 04FC2C */ UNK_RET mpLib_8004FC2C(UNK_PARAMS); +/* 050068 */ UNK_RET mpLib_80050068(UNK_PARAMS); /* 0501CC */ bool mpLib_800501CC(float surface_normal_y, float surface_normal_x, float right_x, float right_y, Vec3* coll_vec, UNK_T, UNK_T, UNK_T, u32, u32); +/* 05057C */ UNK_RET mpLib_8005057C(UNK_PARAMS); /* 0509B8 */ bool mpLib_800509B8(float surface_normal_y, float surface_normal_x, float left_x, float left_y, Vec3* coll_vec, UNK_T, UNK_T, UNK_T, u32, u32); +/* 050D68 */ UNK_RET mpLib_80050D68(UNK_PARAMS); +/* 0511A4 */ UNK_RET mpLib_800511A4(UNK_PARAMS); +/* 0515A0 */ UNK_RET mpLib_800515A0(UNK_PARAMS); +/* 05199C */ UNK_RET mpLib_8005199C(UNK_PARAMS); +/* 051BA8 */ UNK_RET mpLib_80051BA8(UNK_PARAMS); /* 051EC8 */ s32 mpLib_80051EC8(Vec3*, s32*, s32*, Vec3*, s32, s32, s32, float, float, float, float); /* 0524DC */ bool mpLib_800524DC(Vec3*, int, Vec3*, Vec3*, int, int, float x, float y, float z, float); /* 052508 */ UNK_RET mpLib_80052508(UNK_PARAMS); +/* 052534 */ UNK_RET mpLib_80052534(UNK_PARAMS); /* 052700 */ s32 mpLib_80052700(int idx); +/* 0528CC */ UNK_RET mpLib_800528CC(UNK_PARAMS); +/* 052A98 */ UNK_RET mpLib_80052A98(UNK_PARAMS); +/* 052C64 */ UNK_RET mpLib_80052C64(UNK_PARAMS); +/* 052E30 */ UNK_RET mpLib_80052E30(UNK_PARAMS); +/* 052FFC */ UNK_RET mpLib_80052FFC(UNK_PARAMS); +/* 0531C8 */ UNK_RET mpLib_800531C8(UNK_PARAMS); +/* 053394 */ UNK_RET mpLib_80053394(UNK_PARAMS); +/* 053448 */ UNK_RET mpLib_80053448(UNK_PARAMS); +/* 0534FC */ UNK_RET mpLib_800534FC(UNK_PARAMS); +/* 0536CC */ UNK_RET mpLib_800536CC(UNK_PARAMS); +/* 05389C */ UNK_RET mpLib_8005389C(UNK_PARAMS); +/* 053950 */ UNK_RET mpLib_80053950(UNK_PARAMS); +/* 053A04 */ UNK_RET mpLib_80053A04(UNK_PARAMS); +/* 053BD4 */ UNK_RET mpLib_80053BD4(UNK_PARAMS); /* 053DA4 */ void mpLib_80053DA4(int ledge_id, Vec3*); /* 053ECC */ void mpLib_80053ECC(int ledge_id, Vec3*); /* 053FF4 */ void mpLib_80053FF4(s32, Vec3*); /* 054158 */ void mpLib_80054158(s32, Vec3*); +/* 0542BC */ UNK_RET mpLib_800542BC(UNK_PARAMS); +/* 054420 */ UNK_RET mpLib_80054420(UNK_PARAMS); /* 054584 */ s32 mpLib_80054584(int, float*); +/* 0546E8 */ UNK_RET mpLib_800546E8(UNK_PARAMS); +/* 05484C */ UNK_RET mpLib_8005484C(UNK_PARAMS); +/* 0549B0 */ UNK_RET mpLib_800549B0(UNK_PARAMS); +/* 054B14 */ UNK_RET mpLib_80054B14(UNK_PARAMS); +/* 054BC0 */ UNK_RET mpLib_80054BC0(UNK_PARAMS); /* 054C6C */ enum_t mpLib_80054C6C(int); /* 054CEC */ u32 mpLib_80054CEC(enum_t); +/* 054D68 */ UNK_RET mpLib_80054D68(UNK_PARAMS); /* 054DFC */ void mpLib_80054DFC(enum_t, Vec3*); /* 054ED8 */ bool mpLib_80054ED8(int); /* 054F68 */ bool mpLib_80054F68(s32, s32); /* 0552B0 */ void mpLib_800552B0(s16 x, HSD_JObj*, s16 z); +/* 05541C */ UNK_RET mpLib_8005541C(UNK_PARAMS); +/* 0557D0 */ UNK_RET mpLib_800557D0(UNK_PARAMS); +/* 055C5C */ UNK_RET mpLib_80055C5C(UNK_PARAMS); +/* 055E24 */ UNK_RET mpLib_80055E24(UNK_PARAMS); /* 055E9C */ void mpLib_80055E9C(s16 x); -/* 5667C */ void mpLib_8005667C(s16); +/* 0565DC */ UNK_RET mpLib_800565DC(UNK_PARAMS); +/* 05667C */ void mpLib_8005667C(s16); +/* 0566D8 */ UNK_RET mpLib_800566D8(UNK_PARAMS); +/* 0566F8 */ UNK_RET mpLib_800566F8(UNK_PARAMS); +/* 056710 */ UNK_RET mpLib_80056710(UNK_PARAMS); +/* 056758 */ UNK_RET mpLib_80056758(UNK_PARAMS); /* 0567C0 */ bool mpLib_800567C0(s32 wall_id, Vec3* ecb_side_vtx, Vec3* result); /* 0569EC */ void mpLib_800569EC(void); @@ -61,17 +108,40 @@ /* 056C54 */ bool mpLib_80056C54(s32 idx, Vec3* pos, bool, Vec3*, bool, bool, float, float, float, float); /* 057424 */ void mpLib_80057424(s32); +/* 057528 */ UNK_RET mpLib_80057528(UNK_PARAMS); +/* 0575B0 */ UNK_RET mpLib_800575B0(UNK_PARAMS); /* 057638 */ void mpLib_80057638(s32); +/* 057B4C */ UNK_RET mpLib_80057B4C(UNK_PARAMS); /* 057BC0 */ void mpLib_80057BC0(s32); +/* 057FDC */ UNK_RET mpLib_80057FDC(UNK_PARAMS); +/* 058044 */ UNK_RET mpLib_80058044(UNK_PARAMS); +/* 0580AC */ void mpLib_800580AC(s32); +/* 0580C8 */ void mpLib_800580C8(s32, Ground*, void (*)(void*, s32)); +/* 0580E0 */ void mpLib_800580E0(s32); /* 0580FC */ void mpLib_800580FC(int, mpLib_Callback*, UNK_T); /* 05811C */ void mpLib_8005811C(CollData*, s32 ledge_id); +/* 0581A4 */ UNK_RET mpLib_800581A4(UNK_PARAMS); /* 0581BC */ void mpLib_800581BC(int, mpLib_Callback*, UNK_T); +/* 0581DC */ UNK_RET mpLib_800581DC(UNK_PARAMS); +/* 058560 */ UNK_RET mpLib_80058560(UNK_PARAMS); +/* 058614 */ UNK_RET mpLib_80058614(UNK_PARAMS); +/* 0587FC */ UNK_RET fn_800587FC(UNK_PARAMS); /* 058820 */ void mpLib_80058820(void); +/* 0588C8 */ int mpLib_800588C8(void); /* 0588D0 */ void mpLib_800588D0(float left, float bottom, float right, float top); +/* 058970 */ UNK_RET mpLib_80058970(UNK_PARAMS); +/* 0589D0 */ UNK_RET mpLib_800589D0(UNK_PARAMS); /* 058AA0 */ void mpLib_80058AA0(void); -/* 04D164 */ int mpLib_8004D164(void); -/* 04D16C */ int mpLib_8004D16C(void); -/* 04D174 */ mp_UnkStruct2* mpLib_8004D174(void); +/* 058ACC */ UNK_RET mpLib_80058ACC(UNK_PARAMS); +/* 058B5C */ UNK_RET mpLib_80058B5C(UNK_PARAMS); +/* 0590F4 */ UNK_RET mpLib_800590F4(UNK_PARAMS); +/* 059404 */ UNK_RET mpLib_80059404(UNK_PARAMS); +/* 059554 */ UNK_RET mpLib_80059554(UNK_PARAMS); +/* 059E60 */ UNK_RET mpLib_80059E60(UNK_PARAMS); +/* 059FE0 */ UNK_RET mpLib_80059FE0(UNK_PARAMS); +/* 05A220 */ UNK_RET mpLib_8005A220(UNK_PARAMS); +/* 05A2DC */ UNK_RET mpLib_8005A2DC(UNK_PARAMS); +/* 05A340 */ UNK_RET mpLib_8005A340(UNK_PARAMS); #endif diff --git a/src/melee/pl/pl_0371.h b/src/melee/pl/pl_0371.h index b61b1ddd9c..3ca108eb3d 100644 --- a/src/melee/pl/pl_0371.h +++ b/src/melee/pl/pl_0371.h @@ -11,9 +11,6 @@ /* 037C60 */ void pl_80037C60(HSD_GObj*, s32); /* 037ECC */ void pl_80037ECC(void); /* 038144 */ void pl_80038144(void); -/* 0386D8 */ u32 pl_800386D8(void*, s32); -/* 03891C */ void pl_8003891C(int slot); -/* 038F10 */ void pl_80038F10(int slot); /* 03D60C */ void pl_8003D60C(void); /* 03E058 */ void pl_8003E058(s32, s32, s32, s32); /* 03E0E8 */ void pl_8003E0E8(u8, int); diff --git a/src/melee/pl/player.c b/src/melee/pl/player.c index 2f1875d952..761cfc536d 100644 --- a/src/melee/pl/player.c +++ b/src/melee/pl/player.c @@ -14,8 +14,8 @@ #include "gm/gm_1601.h" #include "if/ifstatus.h" #include "lb/lbarchive.h" -#include "pl/pl_0371.h" #include "pl/plattack.h" +#include "pl/plbonus.h" #include "pl/plstale.h" #include "pl/types.h" diff --git a/src/melee/pl/player.h b/src/melee/pl/player.h index 4e0c7c6587..bb4966b008 100644 --- a/src/melee/pl/player.h +++ b/src/melee/pl/player.h @@ -313,5 +313,6 @@ void Player_80037054(s32 slot, s32 arg1); void Player_SetOtherStamina(s32 slot, s32 stamina); void Player_SetFlagsAEBit0(s32 slot, u8 bit0); s32 Player_80033BB8(int slot); +/* 4D6470 */ extern void* pl_804D6470; #endif diff --git a/src/melee/pl/plbonus.c b/src/melee/pl/plbonus.c index 8b13789179..6d72863a37 100644 --- a/src/melee/pl/plbonus.c +++ b/src/melee/pl/plbonus.c @@ -1 +1,50 @@ +#include +#include "pl/player.h" + +#include + +/// #pl_800386D8 + +/// #pl_800386E8 + +/// #fn_80038700 + +/// #pl_80038788 + +/// #pl_80038824 + +/// #pl_80038898 + +void* pl_80038914(void) +{ + return pl_804D6470; +} + +/// #pl_8003891C + +/// #pl_80038F10 + +/// #fn_80038FB8 + +/// #pl_8003906C + +/// #pl_80039238 + +/// #pl_80039418 + +/// #pl_80039450 + +/// #fn_80039618 + +/// #fn_8003B044 + +/// #fn_8003B9A4 + +/// #fn_8003BD60 + +/// #fn_8003C340 + +/// #fn_8003CC84 + +/// #fn_8003D2EC diff --git a/src/melee/pl/plbonus.h b/src/melee/pl/plbonus.h index 8b13789179..55eabee883 100644 --- a/src/melee/pl/plbonus.h +++ b/src/melee/pl/plbonus.h @@ -1 +1,28 @@ +#ifndef GALE01_0386D8 +#define GALE01_0386D8 +#include + +/* 0386D8 */ u32 pl_800386D8(void*, s32); +/* 0386E8 */ UNK_RET pl_800386E8(UNK_PARAMS); +/* 038700 */ UNK_RET fn_80038700(UNK_PARAMS); +/* 038788 */ UNK_RET pl_80038788(UNK_PARAMS); +/* 038824 */ UNK_RET pl_80038824(UNK_PARAMS); +/* 038898 */ UNK_RET pl_80038898(UNK_PARAMS); +/* 038914 */ UNK_RET pl_80038914(UNK_PARAMS); +/* 03891C */ void pl_8003891C(int slot); +/* 038F10 */ void pl_80038F10(int slot); +/* 038FB8 */ UNK_RET fn_80038FB8(UNK_PARAMS); +/* 03906C */ UNK_RET pl_8003906C(UNK_PARAMS); +/* 039238 */ UNK_RET pl_80039238(UNK_PARAMS); +/* 039418 */ UNK_RET pl_80039418(UNK_PARAMS); +/* 039450 */ UNK_RET pl_80039450(UNK_PARAMS); +/* 039618 */ UNK_RET fn_80039618(UNK_PARAMS); +/* 03B044 */ UNK_RET fn_8003B044(UNK_PARAMS); +/* 03B9A4 */ UNK_RET fn_8003B9A4(UNK_PARAMS); +/* 03BD60 */ UNK_RET fn_8003BD60(UNK_PARAMS); +/* 03C340 */ UNK_RET fn_8003C340(UNK_PARAMS); +/* 03CC84 */ UNK_RET fn_8003CC84(UNK_PARAMS); +/* 03D2EC */ UNK_RET fn_8003D2EC(UNK_PARAMS); + +#endif diff --git a/src/melee/un/un_2FC9.c b/src/melee/un/un_2FC9.c index d9875c45ba..5c35c4d92b 100644 --- a/src/melee/un/un_2FC9.c +++ b/src/melee/un/un_2FC9.c @@ -1,3 +1,10 @@ +#include + +#include + +/* 4D6E1C */ static UNK_T un_804D6E1C; +/* 4D6E44 */ static UNK_T un_804D6E44; + /// #un_802FC9B4 /// #fn_802FCAA4 @@ -110,7 +117,10 @@ void fn_802FF360(void) {} /// #un_802FF7DC -/// #un_802FF884 +bool un_802FF884(void) +{ + return false; +} /// #un_802FF88C @@ -130,7 +140,10 @@ void fn_802FF360(void) {} /// #un_802FFC6C -/// #fn_802FFCC8 +bool fn_802FFCC8(void) +{ + return false; +} /// #un_802FFCD0 @@ -334,7 +347,10 @@ void fn_802FF360(void) {} /// #un_80301E78 -/// #un_80301FB4 +UNK_T un_80301FB4(void) +{ + return un_804D6E1C; +} /// #un_80301FBC @@ -394,9 +410,15 @@ void fn_803020F8(void) {} /// #un_80302D4C -/// #un_80302DF0 +UNK_T un_80302DF0(void) +{ + return un_804D6E44; +} -/// #un_80302DF8 +void un_80302DF8(void* arg0, s32 arg1) +{ + M2C_FIELD(arg0, s32*, 0xC) = arg1; +} /// #un_80302E00 diff --git a/src/sysdolphin/baselib/axdriver.c b/src/sysdolphin/baselib/axdriver.c index 6748942432..4ff867e198 100644 --- a/src/sysdolphin/baselib/axdriver.c +++ b/src/sysdolphin/baselib/axdriver.c @@ -49,3 +49,83 @@ void AXDriverUnlink(HSD_SM* v, HSD_SM** head) } } } + +/// #AXDriverKeyOff + +/// #HSD_AudioSFXKeyOffAll + +/// #HSD_AudioSFXKeyOffTrack + +/// #AXDriver_8038BF6C + +/// #fn_8038C678 + +/// #AXDriver_8038C6C0 + +/// #fn_8038CC1C + +/// #fn_8038CEA4 + +/// #fn_8038CF48 + +/// #AXDriver_8038CFF4 + +/// #AXDriver_8038D2B4 + +/// #AXDriver_8038D3B8 + +/// #AXDriver_8038D4E4 + +/// #AXDriver_8038D5B4 + +/// #AXDriver_8038D914 + +/// #AXDriver_8038D9D8 + +/// #fn_8038DA5C + +/// #AXDriver_8038DA70 + +/// #AXDriver_8038DCFC + +/// #AXDriverSetupAux + +/// #AXDriver_8038E034 + +/// #AXDriver_8038E30C + +/// #AXDriver_8038E37C + +/// #AXDriver_8038E498 + +extern s32 AXDriver_804D77C8; + +s32 AXDriver_8038E5D4(void) +{ + return AXDriver_804D77C8; +} + +extern s32 AXDriver_804D77D0; + +s32 AXDriver_8038E5DC(void) +{ + return AXDriver_804D77D0; +} + +/// #AXDriver_8038E5E4 + +/// #AXDriver_8038E6C0 + +/// #AXDriver_8038E768 + +/// #AXDriver_8038E844 + +/// #AXDriver_8038E8EC + +/// #AXDriver_8038E968 + +/// #AXDriver_8038E9A8 + +/// #AXDriver_8038E9E0 + +/// #AXDriver_8038EA18 diff --git a/src/sysdolphin/baselib/particle.c b/src/sysdolphin/baselib/particle.c index f8c0617d48..00ac208737 100644 --- a/src/sysdolphin/baselib/particle.c +++ b/src/sysdolphin/baselib/particle.c @@ -1,3 +1,8 @@ +#include "particle.h" + +static int hsd_804D78C0; +extern int hsd_804D78C8; + /// #hsd_80391580 /// #hsd_80391664 @@ -52,7 +57,10 @@ void hsd_80393840(void) {} /// #hsd_80393A04 -/// #hsd_80393A54 +void hsd_80393A54(int arg0) +{ + hsd_804D78C0 = arg0; +} /// #hsd_80393A5C @@ -166,7 +174,10 @@ void fn_8039710C(void) {} /// #hsd_80397DA4 -/// #Exception_StoreDebugLevel +void Exception_StoreDebugLevel(int arg0) +{ + hsd_804D78C8 = arg0; +} /// #hsd_80397DFC @@ -204,7 +215,10 @@ void fn_8039710C(void) {} /// #hsd_8039D0A0 -/// #hsd_8039D1E4 +void hsd_8039D1E4(UNK_T arg0, int arg1) +{ + M2C_FIELD(arg0, int*, 0x58) = arg1; +} /// #hsd_8039D1EC diff --git a/src/sysdolphin/baselib/particle.h b/src/sysdolphin/baselib/particle.h index f8d4b0d3fa..fbf07bafe5 100644 --- a/src/sysdolphin/baselib/particle.h +++ b/src/sysdolphin/baselib/particle.h @@ -33,7 +33,7 @@ /* 393840 */ UNK_RET hsd_80393840(UNK_PARAMS); /* 393844 */ UNK_RET hsd_80393844(UNK_PARAMS); /* 393A04 */ bool hsd_80393A04(void); -/* 393A54 */ void hsd_80393A54(bool); +/* 393A54 */ void hsd_80393A54(int); /* 393A5C */ UNK_RET hsd_80393A5C(UNK_PARAMS); /* 393C14 */ UNK_RET fn_80393C14(UNK_PARAMS); /* 393D2C */ UNK_RET hsd_80393D2C(UNK_PARAMS); @@ -90,7 +90,7 @@ /* 3975D4 */ UNK_RET hsd_803975D4(UNK_PARAMS); /* 397814 */ UNK_RET fn_80397814(UNK_PARAMS); /* 397DA4 */ UNK_RET hsd_80397DA4(UNK_PARAMS); -/* 397DF4 */ UNK_RET Exception_StoreDebugLevel(UNK_PARAMS); +/* 397DF4 */ void Exception_StoreDebugLevel(int); /* 397DFC */ UNK_RET hsd_80397DFC(UNK_PARAMS); /* 397E0C */ UNK_RET baselib_mfspr(UNK_PARAMS); /* 3982E4 */ UNK_RET fn_803982E4(UNK_PARAMS); @@ -113,7 +113,7 @@ /* 39CF4C */ UNK_RET hsd_8039CF4C(UNK_PARAMS); /* 39D048 */ UNK_RET hsd_8039D048(UNK_PARAMS); /* 39D0A0 */ UNK_RET hsd_8039D0A0(UNK_PARAMS); -/* 39D1E4 */ UNK_RET hsd_8039D1E4(UNK_PARAMS); +/* 39D1E4 */ void hsd_8039D1E4(UNK_T arg0, int arg1); /* 39D1EC */ UNK_RET hsd_8039D1EC(UNK_PARAMS); /* 39D214 */ UNK_RET hsd_8039D214(UNK_PARAMS); /* 39D354 */ UNK_RET hsd_8039D354(UNK_PARAMS); diff --git a/src/sysdolphin/baselib/synth.c b/src/sysdolphin/baselib/synth.c index 8b13789179..9d0a0e4ca3 100644 --- a/src/sysdolphin/baselib/synth.c +++ b/src/sysdolphin/baselib/synth.c @@ -1 +1,116 @@ +#include "synth.h" +static UNK_T driverInactivatedCallback; +extern UNK_T driverMasterClockCallback; +extern UNK_T driverPauseCallback; + +/// #HSD_AudioMalloc + +/// #HSD_AudioFree + +/// #HSD_SynthSFXSampleLoadCallback + +/// #HSD_SynthSFXHeaderLoadCallback + +/// #HSD_SynthSFXLoadNewProc + +/// #HSD_SynthSFXLoad + +/// #HSD_Synth_80388B0C + +/// #HSD_Synth_80388B50 + +/// #HSD_Synth_80388B60 + +/// #HSD_Synth_80388CB0 + +/// #HSD_Synth_80388D30 + +/// #HSD_Synth_80388DC8 + +/// #HSD_Synth_80388E08 + +/// #HSD_SynthSFXGroupDataReaddressCallback + +/// #HSD_SynthSFXGroupDataReaddress + +/// #HSD_SynthSFXBankDeflag + +/// #HSD_SynthSFXBankDeflagSync + +/// #HSD_Synth_80389094 + +/// #HSD_Synth_803890B4 + +/// #HSD_Synth_8038912C + +/// #dropcallback + +/// #HSD_Synth_80389334 + +/// #HSD_Synth_803896F0 + +/// #HSD_SynthSFXKeyOff + +/// #HSD_SynthSFXStopRange + +/// #HSD_SynthSFXPause + +/// #HSD_SynthSFXResume + +/// #HSD_SynthSFXCheck + +/// #HSD_SynthSFXSetVolumeFade + +/// #HSD_Synth_80389CC4 + +/// #HSD_SynthSFXSetMix + +/// #HSD_SynthSFXUpdatePitch + +/// #HSD_Synth_80389E2C + +/// #HSD_Synth_80389F4C + +/// #HSD_Synth_8038A000 + +/// #HSD_SynthSFXUpdateVolume + +/// #HSD_SynthSFXUpdateMix + +/// #HSD_SynthSFXUpdateAllVolume + +void HSD_SynthSFXSetDriverInactivatedCallback(UNK_T arg0) +{ + driverInactivatedCallback = arg0; +} + +void HSD_SynthSFXSetDriverMasterClockCallback(UNK_T arg0) +{ + driverMasterClockCallback = arg0; +} + +void HSD_SynthSFXSetDriverPauseCallback(UNK_T arg0) +{ + driverPauseCallback = arg0; +} + +/// #HSD_SynthCallback + +/// #fn_8038AD60 + +/// #HSD_Synth_8038AD74 + +/// #HSD_Synth_8038ADD0 + +/// #HSD_Synth_8038B120 + +/// #HSD_SynthPStreamFirstHakoHeaderCallback + +/// #HSD_SynthPStreamHeaderCallback + +/// #HSD_Synth_8038B5AC + +/// #HSD_SynthStreamSetVolume + +/// #HSD_SynthInit diff --git a/src/sysdolphin/baselib/synth.h b/src/sysdolphin/baselib/synth.h index 8b13789179..74e18aad2c 100644 --- a/src/sysdolphin/baselib/synth.h +++ b/src/sysdolphin/baselib/synth.h @@ -1 +1,58 @@ +#ifndef GALE01_388330 +#define GALE01_388330 +#include + +/* 388330 */ UNK_RET HSD_AudioMalloc(UNK_PARAMS); +/* 38838C */ UNK_RET HSD_AudioFree(UNK_PARAMS); +/* 3883B4 */ UNK_RET HSD_SynthSFXSampleLoadCallback(UNK_PARAMS); +/* 3887DC */ UNK_RET HSD_SynthSFXHeaderLoadCallback(UNK_PARAMS); +/* 38893C */ UNK_RET HSD_SynthSFXLoadNewProc(UNK_PARAMS); +/* 3889B8 */ UNK_RET HSD_SynthSFXLoad(UNK_PARAMS); +/* 388B0C */ UNK_RET HSD_Synth_80388B0C(UNK_PARAMS); +/* 388B50 */ UNK_RET HSD_Synth_80388B50(UNK_PARAMS); +/* 388B60 */ UNK_RET HSD_Synth_80388B60(UNK_PARAMS); +/* 388CB0 */ UNK_RET HSD_Synth_80388CB0(UNK_PARAMS); +/* 388D30 */ UNK_RET HSD_Synth_80388D30(UNK_PARAMS); +/* 388DC8 */ UNK_RET HSD_Synth_80388DC8(UNK_PARAMS); +/* 388E08 */ UNK_RET HSD_Synth_80388E08(UNK_PARAMS); +/* 388EB4 */ UNK_RET HSD_SynthSFXGroupDataReaddressCallback(UNK_PARAMS); +/* 388EFC */ UNK_RET HSD_SynthSFXGroupDataReaddress(UNK_PARAMS); +/* 388FF0 */ UNK_RET HSD_SynthSFXBankDeflag(UNK_PARAMS); +/* 389084 */ UNK_RET HSD_SynthSFXBankDeflagSync(UNK_PARAMS); +/* 389094 */ UNK_RET HSD_Synth_80389094(UNK_PARAMS); +/* 3890B4 */ UNK_RET HSD_Synth_803890B4(UNK_PARAMS); +/* 38912C */ UNK_RET HSD_Synth_8038912C(UNK_PARAMS); +/* 3891D0 */ UNK_RET dropcallback(UNK_PARAMS); +/* 389334 */ UNK_RET HSD_Synth_80389334(UNK_PARAMS); +/* 3896F0 */ UNK_RET HSD_Synth_803896F0(UNK_PARAMS); +/* 38987C */ UNK_RET HSD_SynthSFXKeyOff(UNK_PARAMS); +/* 3899B0 */ UNK_RET HSD_SynthSFXStopRange(UNK_PARAMS); +/* 389A50 */ UNK_RET HSD_SynthSFXPause(UNK_PARAMS); +/* 389AD0 */ UNK_RET HSD_SynthSFXResume(UNK_PARAMS); +/* 389B50 */ UNK_RET HSD_SynthSFXCheck(UNK_PARAMS); +/* 389BD8 */ UNK_RET HSD_SynthSFXSetVolumeFade(UNK_PARAMS); +/* 389CC4 */ UNK_RET HSD_Synth_80389CC4(UNK_PARAMS); +/* 389D24 */ UNK_RET HSD_SynthSFXSetMix(UNK_PARAMS); +/* 389D8C */ UNK_RET HSD_SynthSFXUpdatePitch(UNK_PARAMS); +/* 389E2C */ UNK_RET HSD_Synth_80389E2C(UNK_PARAMS); +/* 389F4C */ UNK_RET HSD_Synth_80389F4C(UNK_PARAMS); +/* 38A000 */ UNK_RET HSD_Synth_8038A000(UNK_PARAMS); +/* 38A5A4 */ UNK_RET HSD_SynthSFXUpdateVolume(UNK_PARAMS); +/* 38A600 */ UNK_RET HSD_SynthSFXUpdateMix(UNK_PARAMS); +/* 38AAB0 */ UNK_RET HSD_SynthSFXUpdateAllVolume(UNK_PARAMS); +/* 38ABBC */ void HSD_SynthSFXSetDriverInactivatedCallback(UNK_T arg0); +/* 38ABC4 */ void HSD_SynthSFXSetDriverMasterClockCallback(UNK_T arg0); +/* 38ABCC */ void HSD_SynthSFXSetDriverPauseCallback(UNK_T arg0); +/* 38ABD4 */ UNK_RET HSD_SynthCallback(UNK_PARAMS); +/* 38AD60 */ UNK_RET fn_8038AD60(UNK_PARAMS); +/* 38AD74 */ UNK_RET HSD_Synth_8038AD74(UNK_PARAMS); +/* 38ADD0 */ UNK_RET HSD_Synth_8038ADD0(UNK_PARAMS); +/* 38B120 */ UNK_RET HSD_Synth_8038B120(UNK_PARAMS); +/* 38B380 */ UNK_RET HSD_SynthPStreamFirstHakoHeaderCallback(UNK_PARAMS); +/* 38B3E0 */ UNK_RET HSD_SynthPStreamHeaderCallback(UNK_PARAMS); +/* 38B5AC */ UNK_RET HSD_Synth_8038B5AC(UNK_PARAMS); +/* 38B81C */ UNK_RET HSD_SynthStreamSetVolume(UNK_PARAMS); +/* 38B938 */ UNK_RET HSD_SynthInit(UNK_PARAMS); + +#endif diff --git a/tools/easy_funcs.py b/tools/easy_funcs.py index 4c48152e28..d1fdf75e81 100755 --- a/tools/easy_funcs.py +++ b/tools/easy_funcs.py @@ -22,6 +22,11 @@ ROOT = Path(__file__).parents[1] MODULE = "main" REPORT_PATH = "build/GALE01/report.json" +GAP_RE = re.compile(r"^gap_\d{2}_[0-9A-F]{8}_text$") + +SKIP_SYMBOLS = { + "GetR2_80322F20", +} @dataclass(frozen=True) @@ -96,6 +101,12 @@ def print_funcs( for function in functions: func_name = cast(str, function["name"]) + if func_name in SKIP_SYMBOLS: + continue + + if GAP_RE.match(func_name) is not None: + continue + func_size = int(cast(str, function["size"])) if func_size < size[0] or func_size > size[1]: continue diff --git a/tools/fix.py b/tools/fix.py index 8389aaaf97..c950192074 100755 --- a/tools/fix.py +++ b/tools/fix.py @@ -24,13 +24,13 @@ def replace(m: re.Match[str]) -> str: return "true" case "0U" | "0u": return "NULL" - case "int": + case "int" | "s32": return "bool" case _: assert False, f'Unknown regex match "{s}"' return re.sub( - r"(?