diff --git a/asm/JSystem/JAudio2/JASAiCtrl/getSubFrameCounter__9JASDriverFv.s b/asm/JSystem/JAudio2/JASAiCtrl/getSubFrameCounter__9JASDriverFv.s deleted file mode 100644 index 6459b4437be..00000000000 --- a/asm/JSystem/JAudio2/JASAiCtrl/getSubFrameCounter__9JASDriverFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8029CCD4: -/* 8029CCD4 80 6D 8D 44 */ lwz r3, sSubFrameCounter__9JASDriver(r13) -/* 8029CCD8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASAiCtrl/getSubFrames__9JASDriverFv.s b/asm/JSystem/JAudio2/JASAiCtrl/getSubFrames__9JASDriverFv.s deleted file mode 100644 index 405c7145f3a..00000000000 --- a/asm/JSystem/JAudio2/JASAiCtrl/getSubFrames__9JASDriverFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8029C9F0: -/* 8029C9F0 80 6D 82 34 */ lwz r3, sSubFrames__9JASDriver(r13) -/* 8029C9F4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASDriverIF/getChannelLevel_dsp__9JASDriverFv.s b/asm/JSystem/JAudio2/JASDriverIF/getChannelLevel_dsp__9JASDriverFv.s deleted file mode 100644 index af79a3f321a..00000000000 --- a/asm/JSystem/JAudio2/JASDriverIF/getChannelLevel_dsp__9JASDriverFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8029E150: -/* 8029E150 A0 6D 82 40 */ lhz r3, MAX_MIXERLEVEL__9JASDriver(r13) -/* 8029E154 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASDriverIF/getOutputMode__9JASDriverFv.s b/asm/JSystem/JAudio2/JASDriverIF/getOutputMode__9JASDriverFv.s deleted file mode 100644 index d365af77566..00000000000 --- a/asm/JSystem/JAudio2/JASDriverIF/getOutputMode__9JASDriverFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8029E180: -/* 8029E180 80 6D 82 44 */ lwz r3, JAS_SYSTEM_OUTPUT_MODE__9JASDriver(r13) -/* 8029E184 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASDvdThread/getThreadPointer__6JASDvdFv.s b/asm/JSystem/JAudio2/JASDvdThread/getThreadPointer__6JASDvdFv.s deleted file mode 100644 index 1a27ccf929b..00000000000 --- a/asm/JSystem/JAudio2/JASDvdThread/getThreadPointer__6JASDvdFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8028FEFC: -/* 8028FEFC 80 6D 8C 88 */ lwz r3, sThread__6JASDvd(r13) -/* 8028FF00 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASHeapCtrl/getCommandHeap__9JASKernelFv.s b/asm/JSystem/JAudio2/JASHeapCtrl/getCommandHeap__9JASKernelFv.s deleted file mode 100644 index 150e710a52b..00000000000 --- a/asm/JSystem/JAudio2/JASHeapCtrl/getCommandHeap__9JASKernelFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80290AC8: -/* 80290AC8 80 6D 8C 9C */ lwz r3, sCommandHeap__9JASKernel(r13) -/* 80290ACC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASHeapCtrl/getSystemHeap__9JASKernelFv.s b/asm/JSystem/JAudio2/JASHeapCtrl/getSystemHeap__9JASKernelFv.s deleted file mode 100644 index a593e49031c..00000000000 --- a/asm/JSystem/JAudio2/JASHeapCtrl/getSystemHeap__9JASKernelFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80290AC0: -/* 80290AC0 80 6D 8C 98 */ lwz r3, sSystemHeap__9JASKernel(r13) -/* 80290AC4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JKernel/JKRDvdRipper/isErrorRetry__12JKRDvdRipperFv.s b/asm/JSystem/JKernel/JKRDvdRipper/isErrorRetry__12JKRDvdRipperFv.s deleted file mode 100644 index 0eb82a89e0e..00000000000 --- a/asm/JSystem/JKernel/JKRDvdRipper/isErrorRetry__12JKRDvdRipperFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802DA7D4: -/* 802DA7D4 88 6D 83 48 */ lbz r3, data_804508C8(r13) -/* 802DA7D8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTConsole/JUTGetReportConsole.s b/asm/JSystem/JUtility/JUTConsole/JUTGetReportConsole.s deleted file mode 100644 index 8fc7cefb18e..00000000000 --- a/asm/JSystem/JUtility/JUTConsole/JUTGetReportConsole.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802E8528: -/* 802E8528 80 6D 8F F4 */ lwz r3, sReportConsole(r13) -/* 802E852C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTConsole/JUTGetWarningConsole.s b/asm/JSystem/JUtility/JUTConsole/JUTGetWarningConsole.s deleted file mode 100644 index 3c59a635eba..00000000000 --- a/asm/JSystem/JUtility/JUTConsole/JUTGetWarningConsole.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802E8538: -/* 802E8538 80 6D 8F F8 */ lwz r3, sWarningConsole(r13) -/* 802E853C 4E 80 00 20 */ blr diff --git a/asm/d/d_camera/getMidnaActor__9daPy_py_cFv.s b/asm/d/d_camera/getMidnaActor__9daPy_py_cFv.s deleted file mode 100644 index 7106d918e5b..00000000000 --- a/asm/d/d_camera/getMidnaActor__9daPy_py_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80182ABC: -/* 80182ABC 80 6D 8A 98 */ lwz r3, m_midnaActor__9daPy_py_c(r13) -/* 80182AC0 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/isExistMapPathData__8dMpath_cFv.s b/asm/d/map/d_map_path_dmap/isExistMapPathData__8dMpath_cFv.s deleted file mode 100644 index b440f15adcc..00000000000 --- a/asm/d/map/d_map_path_dmap/isExistMapPathData__8dMpath_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8003F758: -/* 8003F758 88 6D 89 08 */ lbz r3, data_80450E88(r13) -/* 8003F75C 4E 80 00 20 */ blr diff --git a/asm/dolphin/ar/ar/ARGetSize.s b/asm/dolphin/ar/ar/ARGetSize.s deleted file mode 100644 index d6a763a8feb..00000000000 --- a/asm/dolphin/ar/ar/ARGetSize.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_803507F0: -/* 803507F0 80 6D 93 3C */ lwz r3, __AR_Size(r13) -/* 803507F4 4E 80 00 20 */ blr diff --git a/asm/dolphin/gx/GXFifo/GXGetCPUFifo.s b/asm/dolphin/gx/GXFifo/GXGetCPUFifo.s deleted file mode 100644 index c53c911b00f..00000000000 --- a/asm/dolphin/gx/GXFifo/GXGetCPUFifo.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8035AEA8: -/* 8035AEA8 80 6D 93 C8 */ lwz r3, CPUFifo(r13) -/* 8035AEAC 4E 80 00 20 */ blr diff --git a/asm/dolphin/gx/GXFifo/GXGetCurrentGXThread.s b/asm/dolphin/gx/GXFifo/GXGetCurrentGXThread.s deleted file mode 100644 index ffb94e5253d..00000000000 --- a/asm/dolphin/gx/GXFifo/GXGetCurrentGXThread.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8035AEA0: -/* 8035AEA0 80 6D 93 D0 */ lwz r3, __GXCurrentThread(r13) -/* 8035AEA4 4E 80 00 20 */ blr diff --git a/asm/dolphin/gx/GXFifo/GXGetGPFifo.s b/asm/dolphin/gx/GXFifo/GXGetGPFifo.s deleted file mode 100644 index dad124fd3de..00000000000 --- a/asm/dolphin/gx/GXFifo/GXGetGPFifo.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8035AEB0: -/* 8035AEB0 80 6D 93 CC */ lwz r3, GPFifo(r13) -/* 8035AEB4 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSArena/OSGetArenaHi.s b/asm/dolphin/os/OSArena/OSGetArenaHi.s deleted file mode 100644 index c41524c81cd..00000000000 --- a/asm/dolphin/os/OSArena/OSGetArenaHi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8033B28C: -/* 8033B28C 80 6D 90 D0 */ lwz r3, __OSArenaHi(r13) -/* 8033B290 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSArena/OSGetArenaLo.s b/asm/dolphin/os/OSArena/OSGetArenaLo.s deleted file mode 100644 index 690f1c4f19f..00000000000 --- a/asm/dolphin/os/OSArena/OSGetArenaLo.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8033B294: -/* 8033B294 80 6D 84 18 */ lwz r3, __OSArenaLo(r13) -/* 8033B298 4E 80 00 20 */ blr diff --git a/asm/dolphin/vi/vi/VIGetCurrentFrameBuffer.s b/asm/dolphin/vi/vi/VIGetCurrentFrameBuffer.s deleted file mode 100644 index e8212203dfb..00000000000 --- a/asm/dolphin/vi/vi/VIGetCurrentFrameBuffer.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8034D838: -/* 8034D838 80 6D 92 B4 */ lwz r3, CurrBufAddr(r13) -/* 8034D83C 4E 80 00 20 */ blr diff --git a/asm/dolphin/vi/vi/VIGetNextFrameBuffer.s b/asm/dolphin/vi/vi/VIGetNextFrameBuffer.s deleted file mode 100644 index 6be69849231..00000000000 --- a/asm/dolphin/vi/vi/VIGetNextFrameBuffer.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8034D830: -/* 8034D830 80 6D 92 B0 */ lwz r3, NextBufAddr(r13) -/* 8034D834 4E 80 00 20 */ blr diff --git a/asm/dolphin/vi/vi/VIGetRetraceCount.s b/asm/dolphin/vi/vi/VIGetRetraceCount.s deleted file mode 100644 index 849d6272039..00000000000 --- a/asm/dolphin/vi/vi/VIGetRetraceCount.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8034D8BC: -/* 8034D8BC 80 6D 92 64 */ lwz r3, retraceCount(r13) -/* 8034D8C0 4E 80 00 20 */ blr diff --git a/asm/f_pc/f_pc_layer/fpcLy_CurrentLayer__Fv.s b/asm/f_pc/f_pc_layer/fpcLy_CurrentLayer__Fv.s deleted file mode 100644 index 25958295eb5..00000000000 --- a/asm/f_pc/f_pc_layer/fpcLy_CurrentLayer__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800216F4: -/* 800216F4 80 6D 87 98 */ lwz r3, l_fpcLy_CurrLayer_p(r13) -/* 800216F8 4E 80 00 20 */ blr diff --git a/asm/init/__get_debug_bba.s b/asm/init/__get_debug_bba.s deleted file mode 100644 index 71213585f86..00000000000 --- a/asm/init/__get_debug_bba.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000314C: -/* 8000314C 88 6D 91 50 */ lbz r3, data_804516D0(r13) -/* 80003150 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_Reset/getResetData__6mDoRstFv.s b/asm/m_Do/m_Do_Reset/getResetData__6mDoRstFv.s deleted file mode 100644 index a3145946e62..00000000000 --- a/asm/m_Do/m_Do_Reset/getResetData__6mDoRstFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800157F4: -/* 800157F4 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 800157F8 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getArchiveHeapPtr__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getArchiveHeapPtr__Fv.s deleted file mode 100644 index c7e08bdb1ac..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getArchiveHeapPtr__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000EDF4: -/* 8000EDF4 80 6D 86 B4 */ lwz r3, archiveHeap(r13) -/* 8000EDF8 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getArchiveHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getArchiveHeap__Fv.s deleted file mode 100644 index 595904f8d52..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getArchiveHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000EDEC: -/* 8000EDEC 80 6D 86 B4 */ lwz r3, archiveHeap(r13) -/* 8000EDF0 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getAssertHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getAssertHeap__Fv.s deleted file mode 100644 index 55be85bb6c0..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getAssertHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000ECE4: -/* 8000ECE4 80 6D 86 A0 */ lwz r3, AssertHeap(r13) -/* 8000ECE8 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getCommandHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getCommandHeap__Fv.s deleted file mode 100644 index 395ff002c92..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getCommandHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000EDB0: -/* 8000EDB0 80 6D 86 B0 */ lwz r3, commandHeap(r13) -/* 8000EDB4 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getCurrentHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getCurrentHeap__Fv.s deleted file mode 100644 index e2d00efc07e..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getCurrentHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000F1EC: -/* 8000F1EC 80 6D 8D F4 */ lwz r3, sCurrentHeap__7JKRHeap(r13) -/* 8000F1F0 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getDbPrintHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getDbPrintHeap__Fv.s deleted file mode 100644 index 916c6278900..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getDbPrintHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000ED14: -/* 8000ED14 80 6D 86 A4 */ lwz r3, DbPrintHeap(r13) -/* 8000ED18 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getGameHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getGameHeap__Fv.s deleted file mode 100644 index 32dc37d42e3..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getGameHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000ED50: -/* 8000ED50 80 6D 86 A8 */ lwz r3, gameHeap(r13) -/* 8000ED54 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getHostIOHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getHostIOHeap__Fv.s deleted file mode 100644 index 5f1256cf817..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getHostIOHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000EE38: -/* 8000EE38 80 6D 86 BC */ lwz r3, HostIOHeap(r13) -/* 8000EE3C 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getJ2dHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getJ2dHeap__Fv.s deleted file mode 100644 index b1ce011f21c..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getJ2dHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000EE30: -/* 8000EE30 80 6D 86 B8 */ lwz r3, j2dHeap(r13) -/* 8000EE34 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getZeldaHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getZeldaHeap__Fv.s deleted file mode 100644 index f1cfd107c74..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getZeldaHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000ED80: -/* 8000ED80 80 6D 86 AC */ lwz r3, zeldaHeap(r13) -/* 8000ED84 4E 80 00 20 */ blr diff --git a/libs/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/J2DGraph/J2DMatBlock.cpp index 8f52d5d1939..eb125a07be9 100644 --- a/libs/JSystem/J2DGraph/J2DMatBlock.cpp +++ b/libs/JSystem/J2DGraph/J2DMatBlock.cpp @@ -77,15 +77,15 @@ struct J2DTevOrder { /* 802F1B70 */ J2DTevOrder(); }; -struct J2DGXColorS10 { - /* 802F1B90 */ J2DGXColorS10(); -}; - struct J2DIndTevStage { /* 802EA044 */ void load(u8); /* 802F18A0 */ J2DIndTevStage(); }; +struct J2DGXColorS10 { + /* 802F1B90 */ J2DGXColorS10(); +}; + struct J2DTevBlock8 { /* 802EED64 */ J2DTevBlock8(); /* 802EEE8C */ ~J2DTevBlock8(); diff --git a/libs/JSystem/J2DGraph/J2DMaterial.cpp b/libs/JSystem/J2DGraph/J2DMaterial.cpp index 1256fcbeb22..e11c7b155ef 100644 --- a/libs/JSystem/J2DGraph/J2DMaterial.cpp +++ b/libs/JSystem/J2DGraph/J2DMaterial.cpp @@ -86,6 +86,12 @@ struct J2DAnmTextureSRTKey { /* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const; }; +struct J2DAnmTexPattern { + /* 8030BEE8 */ void getTexNo(u16, u16*) const; + /* 8030BF9C */ void getResTIMG(u16) const; + /* 8030BFF0 */ void getPalette(u16) const; +}; + struct J2DAnmColor { /* 802EB390 */ void getColor(u16, _GXColor*) const; }; @@ -95,12 +101,6 @@ struct J2DAnmTevRegKey { /* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const; }; -struct J2DAnmTexPattern { - /* 8030BEE8 */ void getTexNo(u16, u16*) const; - /* 8030BF9C */ void getResTIMG(u16) const; - /* 8030BFF0 */ void getPalette(u16) const; -}; - struct J2DMaterial { struct J2DMaterialAnmPointer { /* 802EA79C */ J2DMaterialAnmPointer(); diff --git a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp index 595cd2f6fb0..1b113de5a5c 100644 --- a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -38,13 +38,13 @@ struct J2DResReference { /* 8030CF44 */ void getName(u16) const; }; -struct J2DMaterialBlock {}; - struct J2DMaterial { /* 802EA410 */ void createTevBlock(int, bool); /* 802EA5C4 */ void createIndBlock(int, bool); }; +struct J2DMaterialBlock {}; + struct J2DMaterialFactory { /* 802F2AD0 */ J2DMaterialFactory(J2DMaterialBlock const&); /* 802F2C94 */ void countStages(int) const; diff --git a/libs/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/J2DGraph/J2DPane.cpp index 1345dd6b3d2..07ff9a44f0d 100644 --- a/libs/JSystem/J2DGraph/J2DPane.cpp +++ b/libs/JSystem/J2DGraph/J2DPane.cpp @@ -60,29 +60,29 @@ struct J2DScreen { struct J2DRotateAxis {}; +struct J2DAnmVtxColor {}; + +struct J2DAnmTexPattern {}; + +struct J2DAnmTextureSRTKey {}; + struct J2DAnmTevRegKey {}; -struct J2DAnmTransform {}; +struct J2DBasePosition {}; struct J2DGrafContext { /* 802E8E20 */ void setScissor(); /* 802E90C0 */ void scissor(JGeometry::TBox2 const&); }; -struct J2DAnmVtxColor {}; - -struct J2DAnmTextureSRTKey {}; +struct J2DAnmVisibilityFull {}; struct J2DAnmColor {}; -struct J2DBasePosition {}; - -struct J2DAnmVisibilityFull {}; +struct J2DAnmTransform {}; struct J2DAnmBase {}; -struct J2DAnmTexPattern {}; - struct J2DPane { /* 80020158 */ void setAlpha(u8); /* 80053BC0 */ void calcMtx(); diff --git a/libs/JSystem/J2DGraph/J2DPicture.cpp b/libs/JSystem/J2DGraph/J2DPicture.cpp index 7162e7f3cc5..688a2ec303c 100644 --- a/libs/JSystem/J2DGraph/J2DPicture.cpp +++ b/libs/JSystem/J2DGraph/J2DPicture.cpp @@ -75,23 +75,21 @@ struct J2DScreen { struct J2DMirror {}; -struct J2DBinding {}; - -struct J2DAnmColor {}; - -struct J2DAnmTevRegKey {}; - -struct J2DAnmVisibilityFull {}; - -struct J2DAnmBase {}; - -struct J2DAnmTransform {}; +struct J2DAnmTexPattern {}; struct J2DAnmVtxColor {}; +struct J2DAnmVisibilityFull {}; + +struct J2DAnmColor {}; + +struct J2DAnmTransform {}; + struct J2DAnmTextureSRTKey {}; -struct J2DAnmTexPattern {}; +struct J2DAnmTevRegKey {}; + +struct J2DAnmBase {}; struct J2DPane { /* 80020158 */ void setAlpha(u8); @@ -136,6 +134,8 @@ struct J2DPane { struct J2DMaterial {}; +struct J2DBinding {}; + struct J2DPicture { /* 800202CC */ void setBlendRatio(f32, f32); /* 802FF208 */ void append(JUTTexture*, f32); diff --git a/libs/JSystem/J2DGraph/J2DPictureEx.cpp b/libs/JSystem/J2DGraph/J2DPictureEx.cpp index b97ba1700e4..07e4e2cd5f0 100644 --- a/libs/JSystem/J2DGraph/J2DPictureEx.cpp +++ b/libs/JSystem/J2DGraph/J2DPictureEx.cpp @@ -71,18 +71,30 @@ struct J2DScreen { /* 802F9640 */ void getNameResource(char const*); }; -struct J2DAnmTevRegKey {}; - -struct J2DAnmTransform {}; +struct J2DAnmTexPattern {}; struct J2DAnmVtxColor {}; struct J2DAnmTextureSRTKey {}; +struct J2DAnmColor {}; + +struct J2DAnmTevRegKey {}; + +struct J2DMaterial { + /* 802EA38C */ void setGX(); + /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); + /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); + /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); + /* 802EA89C */ void setAnimation(J2DAnmColor*); +}; + struct J2DAnmVisibilityFull { /* 8030C048 */ void getVisibility(u16, u8*) const; }; +struct J2DAnmTransform {}; + struct J2DAnmBase {}; struct J2DPane { @@ -110,18 +122,6 @@ struct J2DPane { /* 802F8474 */ void update(); }; -struct J2DAnmTexPattern {}; - -struct J2DAnmColor {}; - -struct J2DMaterial { - /* 802EA38C */ void setGX(); - /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); - /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); - /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802EA89C */ void setAnimation(J2DAnmColor*); -}; - struct J2DPictureEx { struct stage_enum {}; diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp index bb02b93edb4..48216f54788 100644 --- a/libs/JSystem/J2DGraph/J2DScreen.cpp +++ b/libs/JSystem/J2DGraph/J2DScreen.cpp @@ -52,15 +52,33 @@ struct JGeometry { struct TBox2__template0 {}; }; +struct J2DAnmTextureSRTKey {}; + +struct J2DAnmTexPattern {}; + +struct J2DAnmColor {}; + +struct J2DAnmTevRegKey {}; + +struct J2DMaterial { + /* 802EA1AC */ J2DMaterial(); + /* 802EA2CC */ ~J2DMaterial(); + /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); + /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); + /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); + /* 802EA89C */ void setAnimation(J2DAnmColor*); + /* 802EAC78 */ void animation(); +}; + struct J2DAnmVisibilityFull {}; -struct J2DAnmBase {}; +struct J2DAnmVtxColor {}; struct J2DAnmTransform {}; -struct J2DGrafContext {}; +struct J2DAnmBase {}; -struct J2DAnmVtxColor {}; +struct J2DGrafContext {}; struct J2DPane { /* 80020158 */ void setAlpha(u8); @@ -91,24 +109,6 @@ struct J2DPane { /* 802F8478 */ void drawSelf(f32, f32); }; -struct J2DAnmTextureSRTKey {}; - -struct J2DAnmColor {}; - -struct J2DAnmTevRegKey {}; - -struct J2DAnmTexPattern {}; - -struct J2DMaterial { - /* 802EA1AC */ J2DMaterial(); - /* 802EA2CC */ ~J2DMaterial(); - /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); - /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); - /* 802EA89C */ void setAnimation(J2DAnmColor*); - /* 802EAC78 */ void animation(); -}; - struct J2DWindowEx { /* 80300C94 */ J2DWindowEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*); }; diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp index 976bfce1068..5ddd27ad8c7 100644 --- a/libs/JSystem/J2DGraph/J2DTextBox.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp @@ -53,21 +53,21 @@ struct J2DTextBoxVBinding {}; struct J2DTextBoxHBinding {}; -struct J2DAnmColor {}; - -struct J2DAnmTevRegKey {}; - -struct J2DAnmVisibilityFull {}; - -struct J2DAnmBase {}; - -struct J2DAnmTransform {}; +struct J2DAnmTexPattern {}; struct J2DAnmVtxColor {}; +struct J2DAnmVisibilityFull {}; + +struct J2DAnmColor {}; + +struct J2DAnmTransform {}; + struct J2DAnmTextureSRTKey {}; -struct J2DAnmTexPattern {}; +struct J2DAnmTevRegKey {}; + +struct J2DAnmBase {}; struct J2DPane { /* 80020158 */ void setAlpha(u8); diff --git a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp index e5ce8cbfc3a..d5d05f1b3fc 100644 --- a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp @@ -38,20 +38,30 @@ struct J2DTextBoxVBinding {}; struct J2DTextBoxHBinding {}; -struct J2DAnmTevRegKey {}; - -struct J2DAnmTransform {}; - -struct J2DTevStage {}; +struct J2DAnmTexPattern {}; struct J2DAnmVtxColor {}; struct J2DAnmTextureSRTKey {}; +struct J2DAnmColor {}; + +struct J2DAnmTevRegKey {}; + +struct J2DMaterial { + /* 802EA38C */ void setGX(); + /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); + /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); + /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); + /* 802EA89C */ void setAnimation(J2DAnmColor*); +}; + struct J2DAnmVisibilityFull { /* 8030C048 */ void getVisibility(u16, u8*) const; }; +struct J2DAnmTransform {}; + struct J2DAnmBase {}; struct J2DPane { @@ -77,17 +87,7 @@ struct J2DPane { /* 802F8474 */ void update(); }; -struct J2DAnmTexPattern {}; - -struct J2DAnmColor {}; - -struct J2DMaterial { - /* 802EA38C */ void setGX(); - /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); - /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); - /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802EA89C */ void setAnimation(J2DAnmColor*); -}; +struct J2DTevStage {}; struct J2DTextBoxEx { struct stage_enum {}; diff --git a/libs/JSystem/J2DGraph/J2DWindow.cpp b/libs/JSystem/J2DGraph/J2DWindow.cpp index ef5d119eaec..03cf27c7ffe 100644 --- a/libs/JSystem/J2DGraph/J2DWindow.cpp +++ b/libs/JSystem/J2DGraph/J2DWindow.cpp @@ -57,21 +57,21 @@ struct JGeometry { struct TBox2__template0 {}; }; -struct J2DAnmColor {}; - -struct J2DAnmTevRegKey {}; - -struct J2DAnmVisibilityFull {}; - -struct J2DAnmBase {}; - -struct J2DAnmTransform {}; +struct J2DAnmTexPattern {}; struct J2DAnmVtxColor {}; +struct J2DAnmVisibilityFull {}; + +struct J2DAnmColor {}; + +struct J2DAnmTransform {}; + struct J2DAnmTextureSRTKey {}; -struct J2DAnmTexPattern {}; +struct J2DAnmTevRegKey {}; + +struct J2DAnmBase {}; struct J2DPane { /* 80020158 */ void setAlpha(u8); diff --git a/libs/JSystem/J2DGraph/J2DWindowEx.cpp b/libs/JSystem/J2DGraph/J2DWindowEx.cpp index c71e16e4078..08da9806147 100644 --- a/libs/JSystem/J2DGraph/J2DWindowEx.cpp +++ b/libs/JSystem/J2DGraph/J2DWindowEx.cpp @@ -41,22 +41,42 @@ struct JGeometry { struct TBox2__template0 {}; }; -struct J2DAnmTevRegKey {}; - -struct J2DAnmTransform {}; - -struct J2DTevStage {}; +struct J2DAnmTexPattern {}; struct J2DAnmVtxColor { /* 8030363C */ void getColor(u8, u16, _GXColor*) const; }; +struct J2DWindow { + struct TMaterial {}; + + /* 802F9A7C */ J2DWindow(); + /* 802FA880 */ ~J2DWindow(); + /* 802FB000 */ void resize(f32, f32); + /* 802FB1D8 */ void drawSelf(f32, f32); + /* 802FBF98 */ s32 getTypeID() const; +}; + struct J2DAnmTextureSRTKey {}; +struct J2DAnmColor {}; + +struct J2DAnmTevRegKey {}; + +struct J2DMaterial { + /* 802EA38C */ void setGX(); + /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); + /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); + /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); + /* 802EA89C */ void setAnimation(J2DAnmColor*); +}; + struct J2DAnmVisibilityFull { /* 8030C048 */ void getVisibility(u16, u8*) const; }; +struct J2DAnmTransform {}; + struct J2DAnmBase {}; struct J2DPane { @@ -85,27 +105,7 @@ struct J2DPane { /* 802F8474 */ void update(); }; -struct J2DAnmTexPattern {}; - -struct J2DAnmColor {}; - -struct J2DWindow { - struct TMaterial {}; - - /* 802F9A7C */ J2DWindow(); - /* 802FA880 */ ~J2DWindow(); - /* 802FB000 */ void resize(f32, f32); - /* 802FB1D8 */ void drawSelf(f32, f32); - /* 802FBF98 */ s32 getTypeID() const; -}; - -struct J2DMaterial { - /* 802EA38C */ void setGX(); - /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); - /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); - /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802EA89C */ void setAnimation(J2DAnmColor*); -}; +struct J2DTevStage {}; struct J2DWindowEx { struct stage_enum {}; diff --git a/libs/JSystem/J3DGraphAnimator/J3DCluster.cpp b/libs/JSystem/J3DGraphAnimator/J3DCluster.cpp index 311e649ae5e..f3e391c6c3f 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DCluster.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DCluster.cpp @@ -29,10 +29,10 @@ struct J3DDeformData { /* 8032E364 */ void setAnm(J3DAnmCluster*); }; -struct J3DClusterKey {}; - struct J3DCluster {}; +struct J3DClusterKey {}; + struct J3DDeformer { /* 8032E39C */ J3DDeformer(J3DDeformData*); /* 8032EAB4 */ void deform(J3DVertexBuffer*, u16, f32*); diff --git a/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp b/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp index 61829936218..a9d333fea9a 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp @@ -23,13 +23,13 @@ struct J3DTevKColorAnm {}; struct J3DTevColorAnm {}; -struct J3DAnmColor {}; - -struct J3DAnmTexPattern {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmColor {}; + +struct J3DAnmTexPattern {}; struct J3DMaterialTable { /* 8032F5A8 */ void clear(); diff --git a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp index 8cc33ec883e..42ea6a7b138 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp @@ -14,11 +14,6 @@ struct Vec {}; struct J3DModel; -struct J3DDeformData { - /* 8032E230 */ void offAllFlag(u32); - /* 8032E274 */ void deform(J3DModel*); -}; - struct J3DModelData { /* 803260F8 */ void syncJ3DSysFlags() const; }; @@ -31,6 +26,11 @@ struct J3DSkinDeform { /* 8032DFDC */ void deform(J3DModel*); }; +struct J3DDeformData { + /* 8032E230 */ void offAllFlag(u32); + /* 8032E274 */ void deform(J3DModel*); +}; + struct J3DModel { /* 80327100 */ void initialize(); /* 80327184 */ void entryModelData(J3DModelData*, u32, u32); diff --git a/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp index 05b4414d6ee..380808cbbdd 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp @@ -27,10 +27,10 @@ struct J3DSkinNList { /* 8032C8E4 */ void calcSkin_VtxNrmF32(f32 (*)[4], void*, void*); }; -struct J3DModelData {}; - struct J3DMtxBuffer {}; +struct J3DModelData {}; + struct J3DSkinDeform { /* 8032C96C */ J3DSkinDeform(); /* 8032C9B0 */ void initSkinInfo(J3DModelData*); diff --git a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp index 016ca133ed6..b5340be7c2b 100644 --- a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -45,8 +45,6 @@ struct J3DTexMtx { /* 80323C0C */ void calcPostTexMtx(f32 const (*)[4]); }; -struct J3DTexCoord {}; - struct J3DNBTScale {}; struct J3DTexGenBlock { @@ -55,6 +53,8 @@ struct J3DTexGenBlock { /* 80317424 */ void setNBTScale(J3DNBTScale const*); }; +struct J3DTexCoord {}; + struct J3DTexGenBlockPatched { /* 80317180 */ ~J3DTexGenBlockPatched(); /* 80317644 */ void initialize(); @@ -115,10 +115,10 @@ struct J3DTevStage {}; struct J3DTevOrder {}; -struct J3DIndTevStage {}; - struct J3DGXColorS10 {}; +struct J3DIndTevStage {}; + struct J3DGXColor {}; struct J3DTevBlock { @@ -452,10 +452,10 @@ struct J3DPEBlockOpa { /* 80323334 */ ~J3DPEBlockOpa(); }; -struct J3DBlend {}; - struct J3DAlphaComp {}; +struct J3DBlend {}; + struct J3DFog {}; struct J3DPEBlock { diff --git a/libs/JSystem/J3DGraphBase/J3DMaterial.cpp b/libs/JSystem/J3DGraphBase/J3DMaterial.cpp index 12e49683152..484310fd5aa 100644 --- a/libs/JSystem/J3DGraphBase/J3DMaterial.cpp +++ b/libs/JSystem/J3DGraphBase/J3DMaterial.cpp @@ -30,12 +30,12 @@ struct J3DTexGenBlock4 { /* 80317674 */ void initialize(); }; +struct J3DNBTScale {}; + struct J3DTexCoord { /* 8000E464 */ J3DTexCoord(); }; -struct J3DNBTScale {}; - struct J3DTexGenBlock { /* 8000DFD8 */ bool getTexMtx(u32); /* 8000DFE0 */ bool getTexCoord(u32); @@ -109,10 +109,10 @@ struct J3DPEBlockFogOff { struct J3DBlend {}; -struct J3DAlphaComp {}; - struct J3DFog {}; +struct J3DAlphaComp {}; + struct J3DPEBlock { /* 8000DBCC */ void patch(); /* 8000DF3C */ bool getZCompLoc() const; diff --git a/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp index 49fdf5df8ce..c707f266d68 100644 --- a/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp @@ -79,15 +79,15 @@ struct J3DAnmLoader { /* 80339800 */ ~J3DAnmLoader(); }; -struct J3DAnmClusterKey {}; - struct J3DAnmColorKeyData {}; +struct J3DAnmClusterKeyData {}; + struct J3DAnmColorKey { /* 8032AB00 */ J3DAnmColorKey(); }; -struct J3DAnmClusterKeyData {}; +struct J3DAnmClusterKey {}; struct J3DAnmKeyLoader_v15 { /* 803384E0 */ J3DAnmKeyLoader_v15(); @@ -108,14 +108,14 @@ struct J3DAnmKeyLoader_v15 { /* 80339634 */ void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*); }; +struct J3DAnmColorFullData {}; + struct J3DAnmColorFull { /* 8032A93C */ J3DAnmColorFull(); }; struct J3DAnmClusterFullData {}; -struct J3DAnmColorFullData {}; - struct J3DAnmClusterFull {}; struct J3DAnmFullLoader_v15 { diff --git a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp index 03d69fd9d13..5459112a69f 100644 --- a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp @@ -79,10 +79,6 @@ struct J3DTevBlockPatched { /* 803176E0 */ void initialize(); }; -struct J3DIndTevStage { - /* 8000E14C */ J3DIndTevStage(); -}; - struct J3DGXColorS10 { /* 8000E460 */ J3DGXColorS10(); }; @@ -91,6 +87,10 @@ struct J3DGXColor { /* 8000E538 */ J3DGXColor(); }; +struct J3DIndTevStage { + /* 8000E14C */ J3DIndTevStage(); +}; + struct J3DTevBlock { /* 8000DBC8 */ void patchTexNoAndTexCoordScale(); /* 8000DBD4 */ void patch(); @@ -164,10 +164,10 @@ struct J3DPEBlockNull { struct J3DBlend {}; -struct J3DAlphaComp {}; - struct J3DFog {}; +struct J3DAlphaComp {}; + struct J3DPEBlock { /* 8000DBCC */ void patch(); /* 8000DF3C */ bool getZCompLoc() const; @@ -197,10 +197,6 @@ struct J3DPEBlock { /* 80317394 */ void setFogOffset(u32); }; -struct J3DMaterialDLBlock {}; - -struct J3DMaterialBlock {}; - struct J3DMaterial { /* 803157A0 */ void createColorBlock(u32); /* 803159A0 */ void createTexGenBlock(u32); @@ -216,6 +212,10 @@ struct J3DMaterial { /* 80332B94 */ ~J3DMaterial(); }; +struct J3DMaterialBlock {}; + +struct J3DMaterialDLBlock {}; + struct J3DMaterialFactory { struct MaterialType {}; diff --git a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp index 8eea17083a7..d4769de6ef2 100644 --- a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp @@ -22,8 +22,6 @@ struct J3DTevStage { /* 8003AACC */ J3DTevStage(J3DTevStageInfo const&); }; -struct J3DMaterialBlock_v21 {}; - struct J3DMaterial { /* 803157A0 */ void createColorBlock(u32); /* 803159A0 */ void createTexGenBlock(u32); @@ -33,6 +31,8 @@ struct J3DMaterial { /* 80316240 */ void initialize(); }; +struct J3DMaterialBlock_v21 {}; + struct J3DMaterialFactory_v21 { /* 80332DA4 */ J3DMaterialFactory_v21(J3DMaterialBlock_v21 const&); /* 80332F84 */ void countUniqueMaterials(); diff --git a/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp index a225195168a..0b050dd5749 100644 --- a/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp @@ -126,16 +126,16 @@ struct J3DModelLoaderDataBase { /* 803346BC */ void load(void const*, u32); }; -struct J3DMaterialDLBlock {}; - -struct J3DEnvelopeBlock {}; - struct J3DModelInfoBlock {}; struct J3DJointBlock {}; struct J3DDrawBlock {}; +struct J3DEnvelopeBlock {}; + +struct J3DMaterialDLBlock {}; + struct J3DModelLoader { /* 8033468C */ J3DModelLoader(); /* 803347E0 */ void load(void const*, u32); diff --git a/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp index b835dfcc028..6d82ff98b93 100644 --- a/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp @@ -28,16 +28,16 @@ struct J3DModelLoader_v26 { /* 80336F60 */ void calcSizeMaterialTable(J3DMaterialBlock const*, u32); }; -struct J3DMaterialDLBlock {}; - -struct J3DEnvelopeBlock {}; - struct J3DModelInfoBlock {}; struct J3DJointBlock {}; struct J3DDrawBlock {}; +struct J3DEnvelopeBlock {}; + +struct J3DMaterialDLBlock {}; + struct J3DModelLoader { /* 80336794 */ void countMaterialNum(void const*); /* 803367D4 */ void calcLoadSize(void const*, u32); diff --git a/libs/JSystem/JAudio2/JAISeqMgr.cpp b/libs/JSystem/JAudio2/JAISeqMgr.cpp index f01b30ce1f6..e40cbf7f19e 100644 --- a/libs/JSystem/JAudio2/JAISeqMgr.cpp +++ b/libs/JSystem/JAudio2/JAISeqMgr.cpp @@ -66,9 +66,9 @@ struct JAISound { /* 802A24DC */ void stop(u32); }; +struct JAISeqMgr; struct JAIAudience {}; -struct JAISeqMgr; struct JAISeq { /* 802A0A8C */ JAISeq(JAISeqMgr*, JAISoundStrategyMgr*); /* 802A0B64 */ void JAISeqMgr_startID_(JAISoundID, JGeometry::TVec3 const*, JAIAudience*, diff --git a/libs/JSystem/JAudio2/JAISoundStarter.cpp b/libs/JSystem/JAudio2/JAISoundStarter.cpp index 59ddaa1e4fe..aa110d6d20a 100644 --- a/libs/JSystem/JAudio2/JAISoundStarter.cpp +++ b/libs/JSystem/JAudio2/JAISoundStarter.cpp @@ -18,10 +18,10 @@ struct JGeometry { struct TVec3__template0 {}; }; -struct JAISoundHandle {}; - struct JAISoundID {}; +struct JAISoundHandle {}; + struct JAISoundStarter { /* 802A2F6C */ JAISoundStarter(bool); /* 802A2F88 */ ~JAISoundStarter(); diff --git a/libs/JSystem/JAudio2/JAIStream.cpp b/libs/JSystem/JAudio2/JAIStream.cpp index 1c8cdbcc9e7..e9bbc280d7e 100644 --- a/libs/JSystem/JAudio2/JAIStream.cpp +++ b/libs/JSystem/JAudio2/JAIStream.cpp @@ -49,8 +49,6 @@ struct JASAramStream { struct JAIStreamMgr {}; -struct JAIAudience {}; - template struct JAISoundStrategyMgr {}; /* JAISoundStrategyMgr */ @@ -58,6 +56,8 @@ struct JAISoundStrategyMgr__template2 {}; struct JAISoundID {}; +struct JAIAudience {}; + struct JAISoundActivity {}; struct JAIStream { diff --git a/libs/JSystem/JAudio2/JAIStreamMgr.cpp b/libs/JSystem/JAudio2/JAIStreamMgr.cpp index 770ea3466ab..99e2e3f17b9 100644 --- a/libs/JSystem/JAudio2/JAIStreamMgr.cpp +++ b/libs/JSystem/JAudio2/JAIStreamMgr.cpp @@ -44,10 +44,10 @@ struct JASGenericMemPool { /* 80290994 */ void free(void*, u32); }; -struct JAISoundHandle {}; - struct JAISoundID {}; +struct JAISoundHandle {}; + struct JAIStreamMgr { /* 802A3B68 */ JAIStreamMgr(bool); /* 802A3C3C */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); @@ -60,13 +60,13 @@ struct JAIStreamMgr { /* 802A4174 */ void newStream_(); }; -struct JAIAudience {}; - template struct JAISoundStrategyMgr {}; /* JAISoundStrategyMgr */ struct JAISoundStrategyMgr__template2 {}; +struct JAIAudience {}; + struct JAISoundActivity {}; struct JAIStream { diff --git a/libs/JSystem/JAudio2/JASAiCtrl.cpp b/libs/JSystem/JAudio2/JASAiCtrl.cpp index 6bd817948d5..2821a277919 100644 --- a/libs/JSystem/JAudio2/JASAiCtrl.cpp +++ b/libs/JSystem/JAudio2/JASAiCtrl.cpp @@ -48,14 +48,14 @@ struct JASDriver { /* 8029C900 */ void finishDSPFrame(); /* 8029C9DC */ void registerMixCallback(s16* (*)(s32), JASMixMode); /* 8029C9E8 */ void getDacRate(); - /* 8029C9F0 */ void getSubFrames(); + /* 8029C9F0 */ u32 getSubFrames(); /* 8029C9F8 */ void getDacSize(); /* 8029CA04 */ void getFrameSamples(); /* 8029CA10 */ void mixMonoTrack(s16*, u32, s16* (*)(s32)); /* 8029CAC0 */ void mixMonoTrackWide(s16*, u32, s16* (*)(s32)); /* 8029CB70 */ void mixExtraTrack(s16*, u32, s16* (*)(s32)); /* 8029CC50 */ void mixInterleaveTrack(s16*, u32, s16* (*)(s32)); - /* 8029CCD4 */ void getSubFrameCounter(); + /* 8029CCD4 */ u32 getSubFrameCounter(); /* 8029E2A8 */ void subframeCallback(); /* 8029E2D0 */ void DSPSyncCallback(); @@ -113,14 +113,14 @@ extern "C" void readDspBuffer__9JASDriverFPsUl(); extern "C" void finishDSPFrame__9JASDriverFv(); extern "C" void registerMixCallback__9JASDriverFPFl_Ps10JASMixMode(); extern "C" void getDacRate__9JASDriverFv(); -extern "C" void getSubFrames__9JASDriverFv(); +extern "C" u32 getSubFrames__9JASDriverFv(); extern "C" void getDacSize__9JASDriverFv(); extern "C" void getFrameSamples__9JASDriverFv(); extern "C" void mixMonoTrack__9JASDriverFPsUlPFl_Ps(); extern "C" void mixMonoTrackWide__9JASDriverFPsUlPFl_Ps(); extern "C" void mixExtraTrack__9JASDriverFPsUlPFl_Ps(); extern "C" void mixInterleaveTrack__9JASDriverFPsUlPFl_Ps(); -extern "C" void getSubFrameCounter__9JASDriverFv(); +extern "C" u32 getSubFrameCounter__9JASDriverFv(); extern "C" void* const sMixFuncs__9JASDriver[4]; extern "C" extern char const* const JASAiCtrl__stringBase0; extern "C" u8 sDmaDacBuffer__9JASDriver[12 + 4 /* padding */]; @@ -257,7 +257,7 @@ SECTION_SDATA u32 JASDriver::sMixMode = 0x00000002; /* 804507B0-804507B4 000230 0004+00 2/2 0/0 0/0 .sdata sDacRate__9JASDriver */ SECTION_SDATA f32 JASDriver::sDacRate = 32028.5f; -/* 804507B4-804507B8 000234 0004+00 4/4 0/0 0/0 .sdata sSubFrames__9JASDriver */ +/* 804507B4-804507B8 000234 0004+00 4/3 0/0 0/0 .sdata sSubFrames__9JASDriver */ SECTION_SDATA u32 JASDriver::sSubFrames = 0x00000007; /* 80455720-80455724 003D20 0004+00 1/1 0/0 0/0 .sdata2 @233 */ @@ -289,7 +289,7 @@ SECTION_RODATA void* const JASDriver::sMixFuncs[4] = { }; COMPILER_STRIP_GATE(8039B2E0, &JASDriver::sMixFuncs); -/* 804512C4-804512C8 0007C4 0004+00 2/2 0/0 0/0 .sbss sSubFrameCounter__9JASDriver */ +/* 804512C4-804512C8 0007C4 0004+00 2/1 0/0 0/0 .sbss sSubFrameCounter__9JASDriver */ u8 JASDriver::sSubFrameCounter[4]; /* 804512C8-804512CC 0007C8 0004+00 1/1 0/0 0/0 .sbss dacp$239 */ @@ -386,15 +386,10 @@ asm void JASDriver::getDacRate() { } #pragma pop -/* 8029C9F0-8029C9F8 297330 0008+00 2/2 2/2 0/0 .text getSubFrames__9JASDriverFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASDriver::getSubFrames() { - nofralloc -#include "asm/JSystem/JAudio2/JASAiCtrl/getSubFrames__9JASDriverFv.s" +/* 8029C9F0-8029C9F8 -00001 0008+00 0/0 0/0 0/0 .text getSubFrames__9JASDriverFv */ +u32 JASDriver::getSubFrames() { + return *(u32*)(&JASDriver::sSubFrames); } -#pragma pop /* 8029C9F8-8029CA04 297338 000C+00 2/2 0/0 0/0 .text getDacSize__9JASDriverFv */ #pragma push @@ -457,15 +452,10 @@ asm void JASDriver::mixInterleaveTrack(s16* param_0, u32 param_1, s16* (*)(s32)) } #pragma pop -/* 8029CCD4-8029CCDC 297614 0008+00 0/0 1/1 0/0 .text getSubFrameCounter__9JASDriverFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASDriver::getSubFrameCounter() { - nofralloc -#include "asm/JSystem/JAudio2/JASAiCtrl/getSubFrameCounter__9JASDriverFv.s" +/* 8029CCD4-8029CCDC -00001 0008+00 0/0 0/0 0/0 .text getSubFrameCounter__9JASDriverFv */ +u32 JASDriver::getSubFrameCounter() { + return *(u32*)(&JASDriver::sSubFrameCounter); } -#pragma pop /* 8039B2F0-8039B338 027950 0048+00 5/5 0/0 0/0 .rodata @stringBase0 */ #pragma push diff --git a/libs/JSystem/JAudio2/JASAramStream.cpp b/libs/JSystem/JAudio2/JASAramStream.cpp index ce0174600e4..de3c45d4c1c 100644 --- a/libs/JSystem/JAudio2/JASAramStream.cpp +++ b/libs/JSystem/JAudio2/JASAramStream.cpp @@ -41,10 +41,6 @@ struct JASGenericMemPool { /* 80290948 */ void alloc(u32); }; -struct JASDvd { - /* 8028FEFC */ void getThreadPointer(); -}; - struct JASDsp { struct TChannel {}; }; diff --git a/libs/JSystem/JAudio2/JASChannel.cpp b/libs/JSystem/JAudio2/JASChannel.cpp index 6ee509145f0..fc9bdb2b949 100644 --- a/libs/JSystem/JAudio2/JASChannel.cpp +++ b/libs/JSystem/JAudio2/JASChannel.cpp @@ -67,8 +67,6 @@ struct JASDsp { struct JASDriver { /* 8029C9E8 */ void getDacRate(); - /* 8029E150 */ void getChannelLevel_dsp(); - /* 8029E180 */ void getOutputMode(); }; struct JASDSPChannel { diff --git a/libs/JSystem/JAudio2/JASDriverIF.cpp b/libs/JSystem/JAudio2/JASDriverIF.cpp index 5cec2cefc88..34dd234233f 100644 --- a/libs/JSystem/JAudio2/JASDriverIF.cpp +++ b/libs/JSystem/JAudio2/JASDriverIF.cpp @@ -17,12 +17,11 @@ struct JASDsp { }; struct JASDriver { - /* 8029CCD4 */ void getSubFrameCounter(); /* 8029E130 */ void setDSPLevel(f32); - /* 8029E150 */ void getChannelLevel_dsp(); + /* 8029E150 */ u16 getChannelLevel_dsp(); /* 8029E158 */ void getDSPLevel(); /* 8029E178 */ void setOutputMode(u32); - /* 8029E180 */ void getOutputMode(); + /* 8029E180 */ u32 getOutputMode(); /* 8029E188 */ void waitSubFrame(); /* 8029E1C4 */ void rejectCallback(s32 (*)(void*), void*); /* 8029E240 */ void registerDspSyncCallback(s32 (*)(void*), void*); @@ -53,10 +52,10 @@ struct JASCallbackMgr { // extern "C" void setDSPLevel__9JASDriverFf(); -extern "C" void getChannelLevel_dsp__9JASDriverFv(); +extern "C" u16 getChannelLevel_dsp__9JASDriverFv(); extern "C" void getDSPLevel__9JASDriverFv(); extern "C" void setOutputMode__9JASDriverFUl(); -extern "C" void getOutputMode__9JASDriverFv(); +extern "C" u32 getOutputMode__9JASDriverFv(); extern "C" void waitSubFrame__9JASDriverFv(); extern "C" void rejectCallback__9JASDriverFPFPv_lPv(); extern "C" void registerDspSyncCallback__9JASDriverFPFPv_lPv(); @@ -102,23 +101,18 @@ asm void JASDriver::setDSPLevel(f32 param_0) { #pragma pop /* ############################################################################################## */ -/* 804507C0-804507C4 000240 0002+02 1/1 0/0 0/0 .sdata MAX_MIXERLEVEL__9JASDriver */ +/* 804507C0-804507C4 000240 0002+02 1/0 0/0 0/0 .sdata MAX_MIXERLEVEL__9JASDriver */ SECTION_SDATA u16 JASDriver::MAX_MIXERLEVEL[1 + 1 /* padding */] = { 0x2EE0, /* padding */ 0x0000, }; -/* 8029E150-8029E158 298A90 0008+00 0/0 2/2 0/0 .text getChannelLevel_dsp__9JASDriverFv +/* 8029E150-8029E158 -00001 0008+00 0/0 0/0 0/0 .text getChannelLevel_dsp__9JASDriverFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASDriver::getChannelLevel_dsp() { - nofralloc -#include "asm/JSystem/JAudio2/JASDriverIF/getChannelLevel_dsp__9JASDriverFv.s" +u16 JASDriver::getChannelLevel_dsp() { + return *(u16*)(&JASDriver::MAX_MIXERLEVEL); } -#pragma pop /* 8029E158-8029E178 298A98 0020+00 0/0 3/3 0/0 .text getDSPLevel__9JASDriverFv */ #pragma push @@ -131,7 +125,7 @@ asm void JASDriver::getDSPLevel() { #pragma pop /* ############################################################################################## */ -/* 804507C4-804507C8 000244 0004+00 2/2 0/0 0/0 .sdata JAS_SYSTEM_OUTPUT_MODE__9JASDriver +/* 804507C4-804507C8 000244 0004+00 2/1 0/0 0/0 .sdata JAS_SYSTEM_OUTPUT_MODE__9JASDriver */ SECTION_SDATA u32 JASDriver::JAS_SYSTEM_OUTPUT_MODE = 0x00000001; @@ -145,15 +139,10 @@ asm void JASDriver::setOutputMode(u32 param_0) { } #pragma pop -/* 8029E180-8029E188 298AC0 0008+00 0/0 4/4 1/1 .text getOutputMode__9JASDriverFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASDriver::getOutputMode() { - nofralloc -#include "asm/JSystem/JAudio2/JASDriverIF/getOutputMode__9JASDriverFv.s" +/* 8029E180-8029E188 -00001 0008+00 0/0 0/0 0/0 .text getOutputMode__9JASDriverFv */ +u32 JASDriver::getOutputMode() { + return *(u32*)(&JASDriver::JAS_SYSTEM_OUTPUT_MODE); } -#pragma pop /* 8029E188-8029E1C4 298AC8 003C+00 0/0 1/1 0/0 .text waitSubFrame__9JASDriverFv */ #pragma push diff --git a/libs/JSystem/JAudio2/JASDvdThread.cpp b/libs/JSystem/JAudio2/JASDvdThread.cpp index aa27e363cd8..d7a53806787 100644 --- a/libs/JSystem/JAudio2/JASDvdThread.cpp +++ b/libs/JSystem/JAudio2/JASDvdThread.cpp @@ -21,7 +21,7 @@ struct JASTaskThread { }; struct JASDvd { - /* 8028FEFC */ void getThreadPointer(); + /* 8028FEFC */ u32 getThreadPointer(); /* 8028FF04 */ void createThread(s32, int, u32); static u8 sThread[4 + 4 /* padding */]; @@ -31,7 +31,7 @@ struct JASDvd { // Forward References: // -extern "C" void getThreadPointer__6JASDvdFv(); +extern "C" u32 getThreadPointer__6JASDvdFv(); extern "C" void createThread__6JASDvdFliUl(); extern "C" u8 sThread__6JASDvd[4 + 4 /* padding */]; @@ -53,18 +53,13 @@ extern "C" u8 sCurrentHeap__7JKRHeap[4]; // /* ############################################################################################## */ -/* 80451208-80451210 000708 0004+04 2/2 0/0 0/0 .sbss sThread__6JASDvd */ +/* 80451208-80451210 000708 0004+04 2/1 0/0 0/0 .sbss sThread__6JASDvd */ u8 JASDvd::sThread[4 + 4 /* padding */]; -/* 8028FEFC-8028FF04 28A83C 0008+00 0/0 6/6 0/0 .text getThreadPointer__6JASDvdFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASDvd::getThreadPointer() { - nofralloc -#include "asm/JSystem/JAudio2/JASDvdThread/getThreadPointer__6JASDvdFv.s" +/* 8028FEFC-8028FF04 -00001 0008+00 0/0 0/0 0/0 .text getThreadPointer__6JASDvdFv */ +u32 JASDvd::getThreadPointer() { + return *(u32*)(&JASDvd::sThread); } -#pragma pop /* 8028FF04-8028FFA8 28A844 00A4+00 0/0 1/1 0/0 .text createThread__6JASDvdFliUl */ #pragma push diff --git a/libs/JSystem/JAudio2/JASHeapCtrl.cpp b/libs/JSystem/JAudio2/JASHeapCtrl.cpp index 40b5c6a2afd..f4e0d56fa6d 100644 --- a/libs/JSystem/JAudio2/JASHeapCtrl.cpp +++ b/libs/JSystem/JAudio2/JASHeapCtrl.cpp @@ -35,8 +35,8 @@ struct JKRExpHeap { struct JASKernel { /* 802909B8 */ void setupRootHeap(JKRSolidHeap*, u32); - /* 80290AC0 */ void getSystemHeap(); - /* 80290AC8 */ void getCommandHeap(); + /* 80290AC0 */ u32 getSystemHeap(); + /* 80290AC8 */ u32 getCommandHeap(); /* 80290AD0 */ void setupAramHeap(u32, u32); /* 80290B08 */ void getAramHeap(); @@ -90,8 +90,8 @@ extern "C" void newMemPool__17JASGenericMemPoolFUli(); extern "C" void alloc__17JASGenericMemPoolFUl(); extern "C" void free__17JASGenericMemPoolFPvUl(); extern "C" void setupRootHeap__9JASKernelFP12JKRSolidHeapUl(); -extern "C" void getSystemHeap__9JASKernelFv(); -extern "C" void getCommandHeap__9JASKernelFv(); +extern "C" u32 getSystemHeap__9JASKernelFv(); +extern "C" u32 getCommandHeap__9JASKernelFv(); extern "C" void setupAramHeap__9JASKernelFUlUl(); extern "C" void getAramHeap__9JASKernelFv(); extern "C" void __sinit_JASHeapCtrl_cpp(); @@ -287,10 +287,10 @@ asm void JASGenericMemPool::free(void* param_0, u32 param_1) { /* 80451214-80451218 000714 0004+00 1/1 0/0 0/0 .sbss sAramBase__9JASKernel */ u8 JASKernel::sAramBase[4]; -/* 80451218-8045121C 000718 0004+00 2/2 0/0 0/0 .sbss sSystemHeap__9JASKernel */ +/* 80451218-8045121C 000718 0004+00 2/1 0/0 0/0 .sbss sSystemHeap__9JASKernel */ u8 JASKernel::sSystemHeap[4]; -/* 8045121C-80451220 00071C 0004+00 2/2 0/0 0/0 .sbss sCommandHeap__9JASKernel */ +/* 8045121C-80451220 00071C 0004+00 2/1 0/0 0/0 .sbss sCommandHeap__9JASKernel */ u8 JASKernel::sCommandHeap[4]; /* 802909B8-80290AC0 28B2F8 0108+00 0/0 1/1 0/0 .text setupRootHeap__9JASKernelFP12JKRSolidHeapUl @@ -304,25 +304,15 @@ asm void JASKernel::setupRootHeap(JKRSolidHeap* param_0, u32 param_1) { } #pragma pop -/* 80290AC0-80290AC8 28B400 0008+00 1/1 3/3 0/0 .text getSystemHeap__9JASKernelFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASKernel::getSystemHeap() { - nofralloc -#include "asm/JSystem/JAudio2/JASHeapCtrl/getSystemHeap__9JASKernelFv.s" +/* 80290AC0-80290AC8 -00001 0008+00 0/0 0/0 0/0 .text getSystemHeap__9JASKernelFv */ +u32 JASKernel::getSystemHeap() { + return *(u32*)(&JASKernel::sSystemHeap); } -#pragma pop -/* 80290AC8-80290AD0 28B408 0008+00 0/0 6/6 0/0 .text getCommandHeap__9JASKernelFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASKernel::getCommandHeap() { - nofralloc -#include "asm/JSystem/JAudio2/JASHeapCtrl/getCommandHeap__9JASKernelFv.s" +/* 80290AC8-80290AD0 -00001 0008+00 0/0 0/0 0/0 .text getCommandHeap__9JASKernelFv */ +u32 JASKernel::getCommandHeap() { + return *(u32*)(&JASKernel::sCommandHeap); } -#pragma pop /* ############################################################################################## */ /* 804315D0-804315DC 05E2F0 000C+00 1/1 0/0 0/0 .bss @313 */ diff --git a/libs/JSystem/JAudio2/JASResArcLoader.cpp b/libs/JSystem/JAudio2/JASResArcLoader.cpp index 5efaf88cbbc..2b69315bd10 100644 --- a/libs/JSystem/JAudio2/JASResArcLoader.cpp +++ b/libs/JSystem/JAudio2/JASResArcLoader.cpp @@ -28,10 +28,6 @@ struct JASResArcLoader { /* 80290D18 */ void loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, u32), u32); }; -struct JASDvd { - /* 8028FEFC */ void getThreadPointer(); -}; - // // Forward References: // diff --git a/libs/JSystem/JAudio2/JASTaskThread.cpp b/libs/JSystem/JAudio2/JASTaskThread.cpp index 85d3a1123ff..2a227472ce7 100644 --- a/libs/JSystem/JAudio2/JASTaskThread.cpp +++ b/libs/JSystem/JAudio2/JASTaskThread.cpp @@ -31,11 +31,6 @@ struct JASTaskThread { /* 8028FE88 */ void pause(bool); }; -struct JASKernel { - /* 80290AC0 */ void getSystemHeap(); - /* 80290AC8 */ void getCommandHeap(); -}; - struct JASCalc { /* 8028F354 */ void bcopy(void const*, void*, u32); }; diff --git a/libs/JSystem/JAudio2/JASTrack.cpp b/libs/JSystem/JAudio2/JASTrack.cpp index 7d3b54348e0..bdc414b5ff3 100644 --- a/libs/JSystem/JAudio2/JASTrack.cpp +++ b/libs/JSystem/JAudio2/JASTrack.cpp @@ -32,6 +32,8 @@ struct JASTrackPort { /* 802935E8 */ void writeExport(u32, u16); }; +struct JASSoundParams {}; + struct JASOscillator { struct Point {}; @@ -46,8 +48,6 @@ struct JASChannel { /* 8029BBFC */ void free(); }; -struct JASSoundParams {}; - struct JASDsp { struct TChannel { /* 8029E00C */ void setFilterMode(u16); @@ -175,7 +175,6 @@ struct JASGenericMemPool { struct JASDriver { /* 8029C9E8 */ void getDacRate(); - /* 8029C9F0 */ void getSubFrames(); /* 8029E274 */ void registerSubFrameCallback(s32 (*)(void*), void*); }; diff --git a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp index 3eca957f564..135315119ea 100644 --- a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp +++ b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp @@ -70,14 +70,9 @@ struct JASTaskThread { }; struct JASKernel { - /* 80290AC0 */ void getSystemHeap(); /* 80290B08 */ void getAramHeap(); }; -struct JASDvd { - /* 8028FEFC */ void getThreadPointer(); -}; - // // Forward References: // diff --git a/libs/JSystem/JAudio2/JAUInitializer.cpp b/libs/JSystem/JAudio2/JAUInitializer.cpp index e10b2d7bda2..ae0f02007fc 100644 --- a/libs/JSystem/JAudio2/JAUInitializer.cpp +++ b/libs/JSystem/JAudio2/JAUInitializer.cpp @@ -88,7 +88,6 @@ struct JASGenericMemPool { }; struct JASDvd { - /* 8028FEFC */ void getThreadPointer(); /* 8028FF04 */ void createThread(s32, int, u32); }; diff --git a/libs/JSystem/JAudio2/JAUSectionHeap.cpp b/libs/JSystem/JAudio2/JAUSectionHeap.cpp index bda8767bead..6de896cd25c 100644 --- a/libs/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/libs/JSystem/JAudio2/JAUSectionHeap.cpp @@ -84,12 +84,12 @@ struct JAUSeqCollection { /* 802A66AC */ void init(void const*); }; +struct JAISeqData {}; + struct JAISoundID {}; struct JAISeqDataUser {}; -struct JAISeqData {}; - struct JAUSectionHeap { struct TSectionHeapData { /* 802A5DF4 */ TSectionHeapData(); diff --git a/libs/JSystem/JAudio2/JAUSeqCollection.cpp b/libs/JSystem/JAudio2/JAUSeqCollection.cpp index b424e8c35b9..626cb9145e1 100644 --- a/libs/JSystem/JAudio2/JAUSeqCollection.cpp +++ b/libs/JSystem/JAudio2/JAUSeqCollection.cpp @@ -11,12 +11,12 @@ // Types: // +struct JAISeqData {}; + struct JAISoundID {}; struct JAISeqDataUser {}; -struct JAISeqData {}; - struct JAUSeqDataMgr_SeqCollection { /* 802A677C */ JAUSeqDataMgr_SeqCollection(); /* 802A67D0 */ void setSeqDataUser(JAISeqDataUser*); diff --git a/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp b/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp index badbc54953c..421a24b9a14 100644 --- a/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp +++ b/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp @@ -28,12 +28,12 @@ struct JSULink__template1 {}; struct JKRArchive {}; -struct JAISoundID {}; - struct JAUSeqDataBlock { /* 802A68F4 */ JAUSeqDataBlock(); }; +struct JAISoundID {}; + struct JAUSeqDataBlocks { /* 802A6928 */ void getSeqData(JAISoundID); /* 802A6974 */ void seekFreeBlock(u32); @@ -42,10 +42,10 @@ struct JAUSeqDataBlocks { /* 802A6A18 */ void hasFailedBlock(JAISoundID); }; -struct JAISeqDataUser {}; - struct JAISeqData {}; +struct JAISeqDataUser {}; + struct JAUDynamicSeqDataBlocks { /* 802A6A58 */ JAUDynamicSeqDataBlocks(); /* 802A6AA0 */ void setSeqDataArchive(JKRArchive*); diff --git a/libs/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/JKernel/JKRAram.cpp index 8015323ef75..5622857eea1 100644 --- a/libs/JSystem/JKernel/JKRAram.cpp +++ b/libs/JSystem/JKernel/JKRAram.cpp @@ -53,10 +53,10 @@ struct JKRAramStream { /* 802D3B48 */ void create(s32); }; -struct JKRAramBlock {}; - struct JKRAMCommand {}; +struct JKRAramBlock {}; + struct JKRAramPiece { /* 802D3838 */ void orderSync(int, u32, u32, u32, JKRAramBlock*); /* 802D38CC */ void startDMA(JKRAMCommand*); diff --git a/libs/JSystem/JKernel/JKRAramPiece.cpp b/libs/JSystem/JKernel/JKRAramPiece.cpp index 71d0bbd9b06..4aab58ca895 100644 --- a/libs/JSystem/JKernel/JKRAramPiece.cpp +++ b/libs/JSystem/JKernel/JKRAramPiece.cpp @@ -45,13 +45,13 @@ struct JKRDecomp { /* 802DB8D0 */ void sendCommand(JKRDecompCommand*); }; -struct JKRAramBlock {}; - struct JKRAMCommand { /* 802D39EC */ JKRAMCommand(); /* 802D3A5C */ ~JKRAMCommand(); }; +struct JKRAramBlock {}; + struct JKRAramPiece { /* 802D3574 */ void prepareCommand(int, u32, u32, u32, JKRAramBlock*, void (*)(u32)); /* 802D35F4 */ void sendCommand(JKRAMCommand*); diff --git a/libs/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/JKernel/JKRDvdRipper.cpp index 018c0bced28..72a6a2842fb 100644 --- a/libs/JSystem/JKernel/JKRDvdRipper.cpp +++ b/libs/JSystem/JKernel/JKRDvdRipper.cpp @@ -53,7 +53,7 @@ struct JKRDvdRipper { JKRDvdRipper::EAllocDirection, u32, int*, u32*); /* 802D9B98 */ void loadToMainRAM(char const*, u8*, JKRExpandSwitch, u32, JKRHeap*, JKRDvdRipper::EAllocDirection, u32, int*, u32*); - /* 802DA7D4 */ void isErrorRetry(); + /* 802DA7D4 */ u8 isErrorRetry(); static u8 sDvdAsyncList[12]; static u32 sSZSBufferSize; @@ -78,7 +78,7 @@ extern "C" static void JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl(); extern "C" static void decompSZS_subroutine__FPUcPUc(); extern "C" static void firstSrcData__Fv(); extern "C" static void nextSrcData__FPUc(); -extern "C" void isErrorRetry__12JKRDvdRipperFv(); +extern "C" u8 isErrorRetry__12JKRDvdRipperFv(); extern "C" void __sinit_JKRDvdRipper_cpp(); extern "C" void func_802DA820(); extern "C" extern char const* const JKRDvdRipper__stringBase0; @@ -159,7 +159,7 @@ asm void JKRDvdRipper::loadToMainRAM(s32 param_0, u8* param_1, JKRExpandSwitch p #pragma pop /* ############################################################################################## */ -/* 804508C8-804508CC 000348 0004+00 3/3 0/0 0/0 .sdata None */ +/* 804508C8-804508CC 000348 0004+00 3/2 0/0 0/0 .sdata None */ SECTION_SDATA static u32 data_804508C8 = 0x01000000; /* 802D9D10-802DA1E4 2D4650 04D4+00 2/2 0/0 0/0 .text @@ -277,15 +277,10 @@ static asm void nextSrcData(u8* param_0) { } #pragma pop -/* 802DA7D4-802DA7DC 2D5114 0008+00 1/1 0/0 0/0 .text isErrorRetry__12JKRDvdRipperFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JKRDvdRipper::isErrorRetry() { - nofralloc -#include "asm/JSystem/JKernel/JKRDvdRipper/isErrorRetry__12JKRDvdRipperFv.s" +/* 802DA7D4-802DA7DC -00001 0008+00 0/0 0/0 0/0 .text isErrorRetry__12JKRDvdRipperFv */ +u8 JKRDvdRipper::isErrorRetry() { + return *(u8*)(&data_804508C8); } -#pragma pop /* 802DA7DC-802DA820 2D511C 0044+00 0/0 1/0 0/0 .text __sinit_JKRDvdRipper_cpp */ #pragma push diff --git a/libs/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/JKernel/JKRHeap.cpp index 8f4d692c2e2..2a04a85c8fb 100644 --- a/libs/JSystem/JKernel/JKRHeap.cpp +++ b/libs/JSystem/JKernel/JKRHeap.cpp @@ -214,7 +214,7 @@ SECTION_DATA extern void* __vt__7JKRHeap[24] = { /* 80451370-80451374 000870 0004+00 3/3 44/44 0/0 .sbss sSystemHeap__7JKRHeap */ u8 JKRHeap::sSystemHeap[4]; -/* 80451374-80451378 000874 0004+00 4/4 23/23 0/0 .sbss sCurrentHeap__7JKRHeap */ +/* 80451374-80451378 000874 0004+00 4/4 23/22 0/0 .sbss sCurrentHeap__7JKRHeap */ u8 JKRHeap::sCurrentHeap[4]; /* 80451378-8045137C 000878 0004+00 3/3 10/10 0/0 .sbss sRootHeap__7JKRHeap */ diff --git a/libs/JSystem/JParticle/JPAEmitterManager.cpp b/libs/JSystem/JParticle/JPAEmitterManager.cpp index fb5edff064c..519d017276d 100644 --- a/libs/JSystem/JParticle/JPAEmitterManager.cpp +++ b/libs/JSystem/JParticle/JPAEmitterManager.cpp @@ -38,9 +38,6 @@ struct JPAResourceManager { struct JPAEmitterWorkData {}; -struct JPAResource; -struct JPAParticleCallBack {}; - struct JGeometry { template struct TVec3 {}; @@ -48,13 +45,15 @@ struct JGeometry { struct TVec3__template0 {}; }; -struct JPAEmitterCallBack {}; - struct JPADrawInfo {}; struct JKRHeap {}; +struct JPAEmitterCallBack {}; + struct JPABaseEmitter; +struct JPAParticleCallBack {}; + struct JPAEmitterManager { /* 8027DCA0 */ JPAEmitterManager(u32, u32, JKRHeap*, u8, u8); /* 8027DEBC */ void createSimpleEmitterID(JGeometry::TVec3 const&, u16, u8, u8, @@ -69,6 +68,7 @@ struct JPAEmitterManager { /* 8027E3F4 */ void calcYBBCam(); }; +struct JPAResource; struct JPABaseEmitter { /* 8027E5EC */ ~JPABaseEmitter(); /* 8027E64C */ JPABaseEmitter(); diff --git a/libs/JSystem/JParticle/JPAFieldBlock.cpp b/libs/JSystem/JParticle/JPAFieldBlock.cpp index 869c0bc5154..65c787c2525 100644 --- a/libs/JSystem/JParticle/JPAFieldBlock.cpp +++ b/libs/JSystem/JParticle/JPAFieldBlock.cpp @@ -11,10 +11,10 @@ // Types: // -struct JPAEmitterWorkData {}; - struct JPABaseParticle {}; +struct JPAEmitterWorkData {}; + struct JKRHeap {}; struct JPAFieldBlock { diff --git a/libs/JSystem/JParticle/JPAResource.cpp b/libs/JSystem/JParticle/JPAResource.cpp index df320d3ec11..bdc3535c901 100644 --- a/libs/JSystem/JParticle/JPAResource.cpp +++ b/libs/JSystem/JParticle/JPAResource.cpp @@ -19,16 +19,16 @@ struct JUTTexture { struct JPAEmitterWorkData {}; -struct JPABaseEmitter { - /* 8027EDD4 */ void processTillStartFrame(); - /* 8027EE14 */ void processTermination(); -}; - struct JPABaseParticle { /* 8027FFD0 */ void calc_p(JPAEmitterWorkData*); /* 80280260 */ void calc_c(JPAEmitterWorkData*); }; +struct JPABaseEmitter { + /* 8027EDD4 */ void processTillStartFrame(); + /* 8027EE14 */ void processTermination(); +}; + struct JKRHeap { /* 802CE474 */ void alloc(u32, int, JKRHeap*); }; diff --git a/libs/JSystem/JStage/JSGCamera.cpp b/libs/JSystem/JStage/JSGCamera.cpp index d8012939683..a9d6c3e818f 100644 --- a/libs/JSystem/JStage/JSGCamera.cpp +++ b/libs/JSystem/JStage/JSGCamera.cpp @@ -14,10 +14,10 @@ struct Vec {}; struct JStage { - struct TECameraProjection {}; - struct TECameraView {}; + struct TECameraProjection {}; + struct TCamera { /* 80280BA0 */ ~TCamera(); /* 80280C00 */ s32 JSGFGetType() const; diff --git a/libs/JSystem/JStage/JSGSystem.cpp b/libs/JSystem/JStage/JSGSystem.cpp index 372be35dbe0..62ae7a01f11 100644 --- a/libs/JSystem/JStage/JSGSystem.cpp +++ b/libs/JSystem/JStage/JSGSystem.cpp @@ -12,8 +12,6 @@ // struct JStage { - struct TEObject {}; - struct TObject { /* 80280DD4 */ ~TObject(); /* 80280E1C */ bool JSGGetName() const; @@ -29,6 +27,8 @@ struct JStage { /* 80280E54 */ void JSGGetNodeTransformation(u32, f32 (*)[4]) const; }; + struct TEObject {}; + struct TSystem { /* 80280E90 */ ~TSystem(); /* 80280EF0 */ bool JSGFGetType() const; diff --git a/libs/JSystem/JStudio/JStudio/fvb.cpp b/libs/JSystem/JStudio/JStudio/fvb.cpp index 430789bd319..554bf8dcdf1 100644 --- a/libs/JSystem/JStudio/JStudio/fvb.cpp +++ b/libs/JSystem/JStudio/JStudio/fvb.cpp @@ -49,18 +49,6 @@ struct TVector_pointer_void { namespace JStudio { namespace fvb { -struct data { - struct TParse_TBlock {}; - - struct TParse_TParagraph { - struct TData {}; - - /* 802850AC */ void getData(JStudio::fvb::data::TParse_TParagraph::TData*) const; - }; - - static f32 ga4cSignature[1 + 1 /* padding */]; -}; - struct TObject; struct TControl { /* 80284668 */ TControl(); @@ -73,6 +61,18 @@ struct TControl { /* 802848D4 */ void getObject_index(u32); }; +struct data { + struct TParse_TBlock {}; + + struct TParse_TParagraph { + struct TData {}; + + /* 802850AC */ void getData(JStudio::fvb::data::TParse_TParagraph::TData*) const; + }; + + static f32 ga4cSignature[1 + 1 /* padding */]; +}; + struct TObject { /* 80283F80 */ ~TObject(); /* 80283FC8 */ void prepare(JStudio::fvb::data::TParse_TBlock const&, JStudio::fvb::TControl*); diff --git a/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp b/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp index 71f4a79a054..74879b27bdd 100644 --- a/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp +++ b/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp @@ -111,12 +111,12 @@ struct JAISoundStatus_ { /* 802A2244 */ void unlockIfLocked(); }; +struct JAISoundID {}; + struct JAISoundHandle { /* 802A2184 */ void releaseSound(); }; -struct JAISoundID {}; - struct JAISoundStarter { /* 802A2FEC */ void startLevelSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); }; diff --git a/libs/JSystem/JStudio/JStudio_JParticle/control.cpp b/libs/JSystem/JStudio/JStudio_JParticle/control.cpp index c57815bce00..792613c03c8 100644 --- a/libs/JSystem/JStudio/JStudio_JParticle/control.cpp +++ b/libs/JSystem/JStudio/JStudio_JParticle/control.cpp @@ -55,6 +55,8 @@ struct JStudio_JParticle { struct JPAParticleCallBack {}; +struct JPAEmitterCallBack {}; + struct JGeometry { template struct TVec3 {}; @@ -62,8 +64,6 @@ struct JGeometry { struct TVec3__template0 {}; }; -struct JPAEmitterCallBack {}; - struct JPAEmitterManager { /* 8027DEBC */ void createSimpleEmitterID(JGeometry::TVec3 const&, u16, u8, u8, JPAEmitterCallBack*, JPAParticleCallBack*); diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp index 3018a7f3533..e6b77b2a4a6 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp @@ -13,6 +13,14 @@ struct Vec {}; +struct JStage { + struct TSystem {}; + + struct TActor {}; + + struct TObject {}; +}; + namespace JStudio { struct data { struct TEOperationData {}; @@ -56,14 +64,6 @@ struct TAdaptor_actor { }; // namespace JStudio -struct JStage { - struct TSystem {}; - - struct TActor {}; - - struct TObject {}; -}; - struct JStudio_JStage { struct TAdaptor_actor { struct TVVOutput_ANIMATION_FRAME_ { diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp index e1ea67641b3..4f6635346ad 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp @@ -13,14 +13,6 @@ struct Vec {}; -struct JStage { - struct TSystem {}; - - struct TCamera {}; - - struct TObject {}; -}; - namespace JStudio { struct data { struct TEOperationData {}; @@ -55,6 +47,14 @@ struct TAdaptor_camera { }; // namespace JStudio +struct JStage { + struct TSystem {}; + + struct TCamera {}; + + struct TObject {}; +}; + struct JStudio_JStage { struct TAdaptor_camera { /* 8028B8A0 */ TAdaptor_camera(JStage::TSystem const*, JStage::TCamera*); diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp index 395503ea0d5..3f03f637277 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp @@ -13,12 +13,6 @@ struct _GXColor {}; -struct JStage { - struct TSystem {}; - - struct TFog {}; -}; - namespace JStudio { struct TAdaptor { /* 802862AC */ void adaptor_setVariableValue_GXColor(u32 const*, _GXColor const&); @@ -44,6 +38,12 @@ struct TAdaptor_fog { }; // namespace JStudio +struct JStage { + struct TSystem {}; + + struct TFog {}; +}; + struct JStudio_JStage { struct TAdaptor_fog { /* 8028C574 */ TAdaptor_fog(JStage::TSystem const*, JStage::TFog*); diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp index 448fabda6b4..98fc75ab1a7 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp @@ -15,12 +15,6 @@ struct _GXColor {}; struct Vec {}; -struct JStage { - struct TSystem {}; - - struct TLight {}; -}; - namespace JStudio { struct data { struct TEOperationData {}; @@ -54,6 +48,12 @@ struct TAdaptor_light { }; // namespace JStudio +struct JStage { + struct TSystem {}; + + struct TLight {}; +}; + struct JStudio_JStage { struct TAdaptor_light { struct TVVOutput_direction_ { diff --git a/libs/JSystem/JUtility/JUTConsole.cpp b/libs/JSystem/JUtility/JUTConsole.cpp index a85f652d426..d503493cda2 100644 --- a/libs/JSystem/JUtility/JUTConsole.cpp +++ b/libs/JSystem/JUtility/JUTConsole.cpp @@ -118,9 +118,9 @@ extern "C" void draw__17JUTConsoleManagerCFv(); extern "C" void drawDirect__17JUTConsoleManagerCFb(); extern "C" void setDirectConsole__17JUTConsoleManagerFP10JUTConsole(); extern "C" void JUTSetReportConsole(); -extern "C" static void JUTGetReportConsole(); +extern "C" u32 JUTGetReportConsole(); extern "C" void JUTSetWarningConsole(); -extern "C" static void JUTGetWarningConsole(); +extern "C" u32 JUTGetWarningConsole(); extern "C" static void JUTReportConsole_f_va(); extern "C" void JUTReportConsole_f(); extern "C" void JUTReportConsole(); @@ -453,7 +453,7 @@ asm void JUTConsoleManager::setDirectConsole(JUTConsole* param_0) { #pragma pop /* ############################################################################################## */ -/* 80451574-80451578 000A74 0004+00 2/2 0/0 0/0 .sbss sReportConsole */ +/* 80451574-80451578 000A74 0004+00 2/1 0/0 0/0 .sbss sReportConsole */ static u8 sReportConsole[4]; /* 802E8520-802E8528 2E2E60 0008+00 1/1 1/1 0/0 .text JUTSetReportConsole */ @@ -466,18 +466,13 @@ asm void JUTSetReportConsole() { } #pragma pop -/* 802E8528-802E8530 2E2E68 0008+00 2/2 0/0 0/0 .text JUTGetReportConsole */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void JUTGetReportConsole() { - nofralloc -#include "asm/JSystem/JUtility/JUTConsole/JUTGetReportConsole.s" +/* 802E8528-802E8530 -00001 0008+00 0/0 0/0 0/0 .text JUTGetReportConsole */ +u32 JUTGetReportConsole() { + return *(u32*)(&sReportConsole); } -#pragma pop /* ############################################################################################## */ -/* 80451578-80451580 000A78 0004+04 2/2 0/0 0/0 .sbss sWarningConsole */ +/* 80451578-80451580 000A78 0004+04 2/1 0/0 0/0 .sbss sWarningConsole */ static u8 sWarningConsole[4 + 4 /* padding */]; /* 802E8530-802E8538 2E2E70 0008+00 1/1 1/1 0/0 .text JUTSetWarningConsole */ @@ -490,15 +485,10 @@ asm void JUTSetWarningConsole() { } #pragma pop -/* 802E8538-802E8540 2E2E78 0008+00 1/1 0/0 0/0 .text JUTGetWarningConsole */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void JUTGetWarningConsole() { - nofralloc -#include "asm/JSystem/JUtility/JUTConsole/JUTGetWarningConsole.s" +/* 802E8538-802E8540 -00001 0008+00 0/0 0/0 0/0 .text JUTGetWarningConsole */ +u32 JUTGetWarningConsole() { + return *(u32*)(&sWarningConsole); } -#pragma pop /* 802E8540-802E85C8 2E2E80 0088+00 2/2 0/0 0/0 .text JUTReportConsole_f_va */ #pragma push diff --git a/libs/JSystem/JUtility/JUTGamePad.cpp b/libs/JSystem/JUtility/JUTGamePad.cpp index 018e4cb995f..930817da97d 100644 --- a/libs/JSystem/JUtility/JUTGamePad.cpp +++ b/libs/JSystem/JUtility/JUTGamePad.cpp @@ -29,10 +29,10 @@ struct JUTGamePad { /* 802E1CD8 */ CButton(); }; - struct EWhichStick {}; - struct EStickMode {}; + struct EWhichStick {}; + struct CStick { /* 802E121C */ void clear(); /* 802E1238 */ void update(s8, s8, JUTGamePad::EStickMode, JUTGamePad::EWhichStick, u32); diff --git a/libs/SSystem/SComponent/c_angle.cpp b/libs/SSystem/SComponent/c_angle.cpp index 55abecb1c9d..26c47b4ab62 100644 --- a/libs/SSystem/SComponent/c_angle.cpp +++ b/libs/SSystem/SComponent/c_angle.cpp @@ -13,6 +13,7 @@ struct cXyz {}; +struct cSPolar; struct cSAngle { /* 80030510 */ ~cSAngle(); /* 80270F98 */ cSAngle(s16); @@ -46,7 +47,6 @@ struct cSAngle { static u8 _270[2 + 6 /* padding */]; }; -struct cSPolar; struct cSGlobe { /* 80271820 */ cSGlobe(f32, s16, s16); /* 80271880 */ cSGlobe(cXyz const&); diff --git a/libs/SSystem/SComponent/c_cc_d.cpp b/libs/SSystem/SComponent/c_cc_d.cpp index 84e4ca57d92..0fcf6bb4c98 100644 --- a/libs/SSystem/SComponent/c_cc_d.cpp +++ b/libs/SSystem/SComponent/c_cc_d.cpp @@ -43,10 +43,7 @@ struct cM3dGAab { /* 8026EE68 */ void PlusR(f32); }; -struct cCcD_AabAttr {}; - -struct cCcD_PntAttr {}; - +struct cCcD_TriAttr; struct cCcD_ShapeAttr { struct Shape {}; @@ -60,9 +57,12 @@ struct cCcD_ShapeAttr { static f32 m_virtual_center[3]; }; +struct cCcD_AabAttr {}; + struct cCcD_CpsAttr; -struct cCcD_TriAttr; struct cCcD_SphAttr; +struct cCcD_PntAttr {}; + struct cCcD_CylAttr { /* 80084CC0 */ void GetCoCP() const; /* 80037A4C */ void GetCoCP(); diff --git a/libs/SSystem/SComponent/c_cc_s.cpp b/libs/SSystem/SComponent/c_cc_s.cpp index 75cda80ead5..8f460beed92 100644 --- a/libs/SSystem/SComponent/c_cc_s.cpp +++ b/libs/SSystem/SComponent/c_cc_s.cpp @@ -21,6 +21,8 @@ struct cM3dGAab { /* 8026EE24 */ void CalcCenter(cXyz*) const; }; +struct cCcD_GObjInf {}; + struct cCcD_Stts { /* 80263934 */ void PlusCcMove(f32, f32, f32); /* 8026395C */ void ClrCcMove(); @@ -34,8 +36,6 @@ struct cCcD_Obj { /* 80263A48 */ void GetAc(); }; -struct cCcD_GObjInf {}; - struct cCcS { /* 80030BDC */ ~cCcS(); /* 80264A6C */ cCcS(); diff --git a/libs/Z2AudioLib/Z2Audience.cpp b/libs/Z2AudioLib/Z2Audience.cpp index 425048ffe5e..245678698bf 100644 --- a/libs/Z2AudioLib/Z2Audience.cpp +++ b/libs/Z2AudioLib/Z2Audience.cpp @@ -88,14 +88,14 @@ struct Z2Audience3DSetting { /* 802BC6F8 */ void updateDolbyDist(f32, f32); }; -struct Z2AudibleChannel { - /* 802BBE74 */ Z2AudibleChannel(); -}; - struct JAIAudible { /* 8029EFAC */ ~JAIAudible(); }; +struct Z2AudibleChannel { + /* 802BBE74 */ Z2AudibleChannel(); +}; + struct Z2Audience { /* 802BD130 */ Z2Audience(); /* 802BD1FC */ ~Z2Audience(); diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp index 2ca4d220431..a1ce62d2e79 100644 --- a/libs/Z2AudioLib/Z2AudioMgr.cpp +++ b/libs/Z2AudioLib/Z2AudioMgr.cpp @@ -70,14 +70,6 @@ struct Z2FxLineMgr { /* 802BA7DC */ Z2FxLineMgr(); }; -struct JAISoundHandle {}; - -struct JKRSolidHeap {}; - -struct JKRArchive {}; - -struct JAISoundID {}; - struct JGeometry { template struct TVec3 {}; @@ -85,6 +77,14 @@ struct JGeometry { struct TVec3__template0 {}; }; +struct JAISoundID {}; + +struct JKRArchive {}; + +struct JKRSolidHeap {}; + +struct JAISoundHandle {}; + struct Z2AudioMgr { /* 802CD248 */ Z2AudioMgr(); /* 802CD34C */ void init(JKRSolidHeap*, u32, void*, JKRArchive*); @@ -191,7 +191,6 @@ struct JASGenericMemPool { }; struct JASDriver { - /* 8029C9F0 */ void getSubFrames(); /* 8029E178 */ void setOutputMode(u32); }; diff --git a/libs/Z2AudioLib/Z2Creature.cpp b/libs/Z2AudioLib/Z2Creature.cpp index 0f7196ba952..ddb087dc9d7 100644 --- a/libs/Z2AudioLib/Z2Creature.cpp +++ b/libs/Z2AudioLib/Z2Creature.cpp @@ -22,15 +22,10 @@ struct Z2SoundObjSimple { /* 802BE844 */ Z2SoundObjSimple(); }; -template -struct JSULink {}; -/* JSULink */ -struct JSULink__template2 {}; +struct JAISoundID {}; struct Vec {}; -struct JAISoundID {}; - struct Z2CreatureEnemy { /* 802C0F64 */ Z2CreatureEnemy(); /* 802C0FC4 */ void deleteObject(); @@ -48,6 +43,11 @@ struct Z2CreatureEnemy { /* 802C1B90 */ void setEnemyName(char const*); }; +template +struct JSULink {}; +/* JSULink */ +struct JSULink__template2 {}; + struct Z2SoundObjMgr { /* 802C0074 */ void getEnemyID(char const*, JSULink*); /* 802C0190 */ void removeEnemy(JSULink*); diff --git a/libs/Z2AudioLib/Z2FxLineMgr.cpp b/libs/Z2AudioLib/Z2FxLineMgr.cpp index 595981c31f4..f9124a09b79 100644 --- a/libs/Z2AudioLib/Z2FxLineMgr.cpp +++ b/libs/Z2AudioLib/Z2FxLineMgr.cpp @@ -11,15 +11,15 @@ // Types: // -struct JKRArchive { - /* 802D5D38 */ void getResource(u16); - /* 802D610C */ void countResource() const; +struct JKRHeap { + /* 802CE500 */ void free(void*, JKRHeap*); }; struct Z2FxLineConfig {}; -struct JKRHeap { - /* 802CE500 */ void free(void*, JKRHeap*); +struct JKRArchive { + /* 802D5D38 */ void getResource(u16); + /* 802D610C */ void countResource() const; }; struct Z2FxLineMgr { diff --git a/libs/Z2AudioLib/Z2LinkMgr.cpp b/libs/Z2AudioLib/Z2LinkMgr.cpp index 9a54c459f55..a980dd11c1f 100644 --- a/libs/Z2AudioLib/Z2LinkMgr.cpp +++ b/libs/Z2AudioLib/Z2LinkMgr.cpp @@ -19,10 +19,6 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct JAISoundHandle {}; - -struct JAISoundID {}; - struct JGeometry { template struct TVec3 {}; @@ -30,6 +26,10 @@ struct JGeometry { struct TVec3__template0 {}; }; +struct JAISoundID {}; + +struct JAISoundHandle {}; + struct Z2SoundStarter { /* 802AAB94 */ Z2SoundStarter(bool); /* 802AAC3C */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*, u32, diff --git a/libs/Z2AudioLib/Z2SoundHandles.cpp b/libs/Z2AudioLib/Z2SoundHandles.cpp index 0aa55237015..92f0bca9689 100644 --- a/libs/Z2AudioLib/Z2SoundHandles.cpp +++ b/libs/Z2AudioLib/Z2SoundHandles.cpp @@ -11,8 +11,6 @@ // Types: // -struct JAISoundID {}; - struct JGeometry { template struct TVec3 {}; @@ -20,6 +18,8 @@ struct JGeometry { struct TVec3__template0 {}; }; +struct JAISoundID {}; + struct Z2SoundHandles { /* 802AB07C */ Z2SoundHandles(); /* 802AB0B4 */ ~Z2SoundHandles(); diff --git a/libs/Z2AudioLib/Z2SoundInfo.cpp b/libs/Z2AudioLib/Z2SoundInfo.cpp index 39fe74f38d9..032484bba06 100644 --- a/libs/Z2AudioLib/Z2SoundInfo.cpp +++ b/libs/Z2AudioLib/Z2SoundInfo.cpp @@ -11,16 +11,16 @@ // Types: // -struct JAISound {}; - -struct JAISeq {}; +struct JAISe {}; struct JAISoundID {}; -struct JAISe {}; +struct JAISeq {}; struct JAIStream {}; +struct JAISound {}; + struct Z2SoundInfo { /* 802BB00C */ void getBgmSeqResourceID(JAISoundID) const; /* 802BB090 */ void getSoundType(JAISoundID) const; diff --git a/libs/Z2AudioLib/Z2SoundMgr.cpp b/libs/Z2AudioLib/Z2SoundMgr.cpp index 4ecefbfebd3..27e5d363e20 100644 --- a/libs/Z2AudioLib/Z2SoundMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundMgr.cpp @@ -15,12 +15,6 @@ struct Z2SpeechMgr2 { /* 802CC190 */ void speakOneWord(bool); }; -struct JAISound {}; - -struct JAISoundHandle {}; - -struct JAISoundID {}; - struct JGeometry { template struct TVec3 {}; @@ -28,6 +22,12 @@ struct JGeometry { struct TVec3__template0 {}; }; +struct JAISound {}; + +struct JAISoundID {}; + +struct JAISoundHandle {}; + struct Z2SoundMgr { /* 802A9E80 */ Z2SoundMgr(); /* 802A9EE8 */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); diff --git a/libs/Z2AudioLib/Z2SoundObjMgr.cpp b/libs/Z2AudioLib/Z2SoundObjMgr.cpp index 8248d7878e0..5820dc5131e 100644 --- a/libs/Z2AudioLib/Z2SoundObjMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundObjMgr.cpp @@ -11,13 +11,13 @@ // Types: // +struct Z2CreatureEnemy {}; + template struct JSULink {}; /* JSULink */ struct JSULink__template2 {}; -struct Z2CreatureEnemy {}; - struct Z2SoundObjMgr { /* 802BF920 */ Z2SoundObjMgr(); /* 802BF980 */ void setForceBattleArea(bool, u16, u16, u16); diff --git a/libs/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp index be926d5585f..b8644dd3c2b 100644 --- a/libs/Z2AudioLib/Z2SoundObject.cpp +++ b/libs/Z2AudioLib/Z2SoundObject.cpp @@ -19,10 +19,10 @@ struct Z2SoundStarter { /* 802AAEDC */ void setPortData(JAISoundHandle*, u32, u16, s8); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SoundObjSimple { /* 802BE844 */ Z2SoundObjSimple(); /* 802BE880 */ void init(Vec*, u8); @@ -50,8 +50,6 @@ struct Z2SoundObjArrow { /* 802BEB74 */ void init(Vec*, u8); }; -struct JAUSoundAnimationSound {}; - struct JGeometry { template struct TVec3 {}; @@ -59,6 +57,8 @@ struct JGeometry { struct TVec3__template0 {}; }; +struct JAUSoundAnimationSound {}; + struct Z2SoundObjAnime { /* 802BEB94 */ Z2SoundObjAnime(); /* 802BEBDC */ void init(Vec*, u8); diff --git a/libs/Z2AudioLib/Z2SoundStarter.cpp b/libs/Z2AudioLib/Z2SoundStarter.cpp index 82e63bb6ef0..e449e19b819 100644 --- a/libs/Z2AudioLib/Z2SoundStarter.cpp +++ b/libs/Z2AudioLib/Z2SoundStarter.cpp @@ -11,10 +11,6 @@ // Types: // -struct JAISoundHandle {}; - -struct JAISoundID {}; - struct JGeometry { template struct TVec3 {}; @@ -22,6 +18,10 @@ struct JGeometry { struct TVec3__template0 {}; }; +struct JAISoundID {}; + +struct JAISoundHandle {}; + struct Z2SoundStarter { /* 802AAB94 */ Z2SoundStarter(bool); /* 802AAC3C */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*, u32, diff --git a/libs/Z2AudioLib/Z2SpeechMgr2.cpp b/libs/Z2AudioLib/Z2SpeechMgr2.cpp index d22fe8d8f33..6a6733264a2 100644 --- a/libs/Z2AudioLib/Z2SpeechMgr2.cpp +++ b/libs/Z2AudioLib/Z2SpeechMgr2.cpp @@ -11,12 +11,6 @@ // Types: // -struct JAISoundHandle { - /* 802A2184 */ void releaseSound(); -}; - -struct JAISoundID {}; - struct JGeometry { template struct TVec3 {}; @@ -24,6 +18,12 @@ struct JGeometry { struct TVec3__template0 {}; }; +struct JAISoundID {}; + +struct JAISoundHandle { + /* 802A2184 */ void releaseSound(); +}; + struct Z2SpeechStarter { /* 802CBCEC */ ~Z2SpeechStarter(); /* 802CCFB8 */ Z2SpeechStarter(); diff --git a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp index 2be8f8d2702..b3a96186dac 100644 --- a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp +++ b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp @@ -11,10 +11,10 @@ // Types: // -struct Vec {}; - struct Z2WolfHowlData {}; +struct Vec {}; + struct Z2WolfHowlMgr { /* 802CAAC0 */ Z2WolfHowlMgr(); /* 802CAB8C */ void resetState(); diff --git a/libs/dolphin/ar/ar.cpp b/libs/dolphin/ar/ar.cpp index 675446a76fa..a2025ad6abd 100644 --- a/libs/dolphin/ar/ar.cpp +++ b/libs/dolphin/ar/ar.cpp @@ -16,7 +16,7 @@ extern "C" void ARGetDMAStatus(); extern "C" void ARStartDMA(); extern "C" void ARAlloc(); extern "C" void ARInit(); -extern "C" void ARGetSize(); +extern "C" u32 ARGetSize(); extern "C" void __ARHandler(); extern "C" void __ARClearInterrupt(); extern "C" void __ARGetInterruptStatus(); @@ -77,7 +77,7 @@ asm void ARStartDMA() { #pragma pop /* ############################################################################################## */ -/* 804518BC-804518C0 000DBC 0004+00 2/2 0/0 0/0 .sbss __AR_Size */ +/* 804518BC-804518C0 000DBC 0004+00 2/1 0/0 0/0 .sbss __AR_Size */ static u8 __AR_Size[4]; /* 804518C0-804518C4 000DC0 0004+00 1/1 0/0 0/0 .sbss __AR_InternalSize */ @@ -203,15 +203,10 @@ asm void ARInit() { } #pragma pop -/* 803507F0-803507F8 34B130 0008+00 0/0 1/1 0/0 .text ARGetSize */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void ARGetSize() { - nofralloc -#include "asm/dolphin/ar/ar/ARGetSize.s" +/* 803507F0-803507F8 -00001 0008+00 0/0 0/0 0/0 .text ARGetSize */ +u32 ARGetSize() { + return *(u32*)(&__AR_Size); } -#pragma pop /* 803507F8-80350870 34B138 0078+00 1/1 0/0 0/0 .text __ARHandler */ #pragma push diff --git a/libs/dolphin/gx/GXFifo.cpp b/libs/dolphin/gx/GXFifo.cpp index 74c15b6677f..12d256dc561 100644 --- a/libs/dolphin/gx/GXFifo.cpp +++ b/libs/dolphin/gx/GXFifo.cpp @@ -31,9 +31,9 @@ extern "C" void __GXWriteFifoIntEnable(); extern "C" void __GXWriteFifoIntReset(); extern "C" void __GXCleanGPFifo(); extern "C" void GXSetCurrentGXThread(); -extern "C" void GXGetCurrentGXThread(); -extern "C" void GXGetCPUFifo(); -extern "C" void GXGetGPFifo(); +extern "C" u32 GXGetCurrentGXThread(); +extern "C" u32 GXGetCPUFifo(); +extern "C" u32 GXGetGPFifo(); // // External References: @@ -59,13 +59,13 @@ extern "C" extern void* __GXData; // /* ############################################################################################## */ -/* 80451948-8045194C 000E48 0004+00 4/4 0/0 0/0 .sbss CPUFifo */ +/* 80451948-8045194C 000E48 0004+00 4/3 0/0 0/0 .sbss CPUFifo */ static u8 CPUFifo[4]; -/* 8045194C-80451950 000E4C 0004+00 4/4 0/0 0/0 .sbss GPFifo */ +/* 8045194C-80451950 000E4C 0004+00 4/3 0/0 0/0 .sbss GPFifo */ static u8 GPFifo[4]; -/* 80451950-80451954 000E50 0004+00 4/4 0/0 0/0 .sbss __GXCurrentThread */ +/* 80451950-80451954 000E50 0004+00 4/3 0/0 0/0 .sbss __GXCurrentThread */ static u8 __GXCurrentThread[4]; /* 80451954-80451958 000E54 0004+00 3/3 0/0 0/0 .sbss None */ @@ -280,32 +280,17 @@ asm void GXSetCurrentGXThread() { } #pragma pop -/* 8035AEA0-8035AEA8 3557E0 0008+00 0/0 1/1 0/0 .text GXGetCurrentGXThread */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void GXGetCurrentGXThread() { - nofralloc -#include "asm/dolphin/gx/GXFifo/GXGetCurrentGXThread.s" +/* 8035AEA0-8035AEA8 -00001 0008+00 0/0 0/0 0/0 .text GXGetCurrentGXThread */ +u32 GXGetCurrentGXThread() { + return *(u32*)(&__GXCurrentThread); } -#pragma pop -/* 8035AEA8-8035AEB0 3557E8 0008+00 1/1 1/1 0/0 .text GXGetCPUFifo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void GXGetCPUFifo() { - nofralloc -#include "asm/dolphin/gx/GXFifo/GXGetCPUFifo.s" +/* 8035AEA8-8035AEB0 -00001 0008+00 0/0 0/0 0/0 .text GXGetCPUFifo */ +u32 GXGetCPUFifo() { + return *(u32*)(&CPUFifo); } -#pragma pop -/* 8035AEB0-8035AEB8 3557F0 0008+00 1/1 2/2 0/0 .text GXGetGPFifo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void GXGetGPFifo() { - nofralloc -#include "asm/dolphin/gx/GXFifo/GXGetGPFifo.s" +/* 8035AEB0-8035AEB8 -00001 0008+00 0/0 0/0 0/0 .text GXGetGPFifo */ +u32 GXGetGPFifo() { + return *(u32*)(&GPFifo); } -#pragma pop diff --git a/libs/dolphin/os/OSArena.cpp b/libs/dolphin/os/OSArena.cpp index ebaa01a2e6e..3c659d76c07 100644 --- a/libs/dolphin/os/OSArena.cpp +++ b/libs/dolphin/os/OSArena.cpp @@ -11,8 +11,8 @@ // Forward References: // -extern "C" void OSGetArenaHi(); -extern "C" void OSGetArenaLo(); +extern "C" u32 OSGetArenaHi(); +extern "C" u32 OSGetArenaLo(); extern "C" void OSSetArenaHi(); extern "C" void OSSetArenaLo(); extern "C" void OSAllocFromArenaLo(); @@ -26,36 +26,26 @@ extern "C" void OSAllocFromArenaLo(); // /* ############################################################################################## */ -/* 80451650-80451658 000B50 0004+04 2/2 0/0 0/0 .sbss __OSArenaHi */ +/* 80451650-80451658 000B50 0004+04 2/1 0/0 0/0 .sbss __OSArenaHi */ static u8 __OSArenaHi[4 + 4 /* padding */]; -/* 8033B28C-8033B294 335BCC 0008+00 0/0 7/7 0/0 .text OSGetArenaHi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void OSGetArenaHi() { - nofralloc -#include "asm/dolphin/os/OSArena/OSGetArenaHi.s" +/* 8033B28C-8033B294 -00001 0008+00 0/0 0/0 0/0 .text OSGetArenaHi */ +u32 OSGetArenaHi() { + return *(u32*)(&__OSArenaHi); } -#pragma pop /* ############################################################################################## */ -/* 80450998-804509A0 000418 0004+04 3/3 0/0 0/0 .sdata __OSArenaLo */ +/* 80450998-804509A0 000418 0004+04 3/2 0/0 0/0 .sdata __OSArenaLo */ SECTION_SDATA static u32 __OSArenaLo[1 + 1 /* padding */] = { 0xFFFFFFFF, /* padding */ 0x00000000, }; -/* 8033B294-8033B29C 335BD4 0008+00 0/0 4/4 0/0 .text OSGetArenaLo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void OSGetArenaLo() { - nofralloc -#include "asm/dolphin/os/OSArena/OSGetArenaLo.s" +/* 8033B294-8033B29C -00001 0008+00 0/0 0/0 0/0 .text OSGetArenaLo */ +u32 OSGetArenaLo() { + return *(u32*)(&__OSArenaLo); } -#pragma pop /* 8033B29C-8033B2A4 335BDC 0008+00 0/0 5/5 0/0 .text OSSetArenaHi */ #pragma push diff --git a/libs/dolphin/os/OSThread.cpp b/libs/dolphin/os/OSThread.cpp index 3f2ecde481e..ed39bb20f3d 100644 --- a/libs/dolphin/os/OSThread.cpp +++ b/libs/dolphin/os/OSThread.cpp @@ -2522,6 +2522,6 @@ static asm void OSClearStack() { #pragma pop /* ############################################################################################## */ -/* 804516D0-804516D8 000BD0 0008+00 0/0 2/2 0/0 .sbss None */ +/* 804516D0-804516D8 000BD0 0008+00 0/0 2/1 0/0 .sbss None */ extern u8 data_804516D0[8]; u8 data_804516D0[8]; diff --git a/libs/dolphin/vi/vi.cpp b/libs/dolphin/vi/vi.cpp index 7fc4648d6e2..94f7d82ac7d 100644 --- a/libs/dolphin/vi/vi.cpp +++ b/libs/dolphin/vi/vi.cpp @@ -23,10 +23,10 @@ extern "C" static void setVerticalRegs(); extern "C" void VIConfigure(); extern "C" void VIFlush(); extern "C" void VISetNextFrameBuffer(); -extern "C" void VIGetNextFrameBuffer(); -extern "C" void VIGetCurrentFrameBuffer(); +extern "C" u32 VIGetNextFrameBuffer(); +extern "C" u32 VIGetCurrentFrameBuffer(); extern "C" void VISetBlack(); -extern "C" void VIGetRetraceCount(); +extern "C" u32 VIGetRetraceCount(); extern "C" static void GetCurrentDisplayPosition(); extern "C" static void getCurrentFieldEvenOdd(); extern "C" void VIGetNextField(); @@ -69,7 +69,7 @@ static u8 regs[118 + 2 /* padding */]; /* 804517E0-804517E4 000CE0 0004+00 1/1 0/0 0/0 .sbss IsInitialized */ static u8 IsInitialized[4]; -/* 804517E4-804517E8 000CE4 0004+00 4/4 0/0 0/0 .sbss retraceCount */ +/* 804517E4-804517E8 000CE4 0004+00 4/3 0/0 0/0 .sbss retraceCount */ static u8 retraceCount[4]; /* 804517E8-804517EC 000CE8 0004+00 3/3 0/0 0/0 .sbss flushFlag */ @@ -119,10 +119,10 @@ static u8 CurrTiming[4]; /* 8045182C-80451830 000D2C 0004+00 3/3 0/0 0/0 .sbss CurrTvMode */ static u8 CurrTvMode[4]; -/* 80451830-80451834 000D30 0004+00 3/3 0/0 0/0 .sbss NextBufAddr */ +/* 80451830-80451834 000D30 0004+00 3/2 0/0 0/0 .sbss NextBufAddr */ static u8 NextBufAddr[4]; -/* 80451834-80451838 000D34 0004+00 2/2 0/0 0/0 .sbss CurrBufAddr */ +/* 80451834-80451838 000D34 0004+00 2/1 0/0 0/0 .sbss CurrBufAddr */ static u8 CurrBufAddr[4]; /* 8034BF6C-8034C1E0 3468AC 0274+00 1/1 0/0 0/0 .text __VIRetraceHandler */ @@ -798,25 +798,15 @@ asm void VISetNextFrameBuffer() { } #pragma pop -/* 8034D830-8034D838 348170 0008+00 0/0 1/1 0/0 .text VIGetNextFrameBuffer */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void VIGetNextFrameBuffer() { - nofralloc -#include "asm/dolphin/vi/vi/VIGetNextFrameBuffer.s" +/* 8034D830-8034D838 -00001 0008+00 0/0 0/0 0/0 .text VIGetNextFrameBuffer */ +u32 VIGetNextFrameBuffer() { + return *(u32*)(&NextBufAddr); } -#pragma pop -/* 8034D838-8034D840 348178 0008+00 0/0 1/1 0/0 .text VIGetCurrentFrameBuffer */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void VIGetCurrentFrameBuffer() { - nofralloc -#include "asm/dolphin/vi/vi/VIGetCurrentFrameBuffer.s" +/* 8034D838-8034D840 -00001 0008+00 0/0 0/0 0/0 .text VIGetCurrentFrameBuffer */ +u32 VIGetCurrentFrameBuffer() { + return *(u32*)(&CurrBufAddr); } -#pragma pop /* 8034D840-8034D8BC 348180 007C+00 0/0 7/7 0/0 .text VISetBlack */ #pragma push @@ -828,15 +818,10 @@ asm void VISetBlack() { } #pragma pop -/* 8034D8BC-8034D8C4 3481FC 0008+00 0/0 9/9 0/0 .text VIGetRetraceCount */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void VIGetRetraceCount() { - nofralloc -#include "asm/dolphin/vi/vi/VIGetRetraceCount.s" +/* 8034D8BC-8034D8C4 -00001 0008+00 0/0 0/0 0/0 .text VIGetRetraceCount */ +u32 VIGetRetraceCount() { + return *(u32*)(&retraceCount); } -#pragma pop /* 8034D8C4-8034D900 348204 003C+00 1/1 0/0 0/0 .text GetCurrentDisplayPosition */ #pragma push diff --git a/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp b/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp index 3099eb5671e..d841561d62b 100644 --- a/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp +++ b/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp b/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp index 7cbb304f037..c9502bc353c 100644 --- a/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp +++ b/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp @@ -69,16 +69,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp b/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp index 71b160d3fd3..8657e8b8bc8 100644 --- a/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp +++ b/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp @@ -34,10 +34,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); @@ -47,16 +47,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -75,10 +75,10 @@ struct daPy_py_c { /* 8015F398 */ void checkMasterSwordEquip(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daB_DR_c { /* 805BAF80 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 805BB120 */ void JointCallBack(J3DJoint*, int); @@ -188,12 +188,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; -struct _GXColor {}; - struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); diff --git a/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp b/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp index 3ecfb8311c5..b294576c523 100644 --- a/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp +++ b/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp @@ -50,16 +50,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp b/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp index d7e18f243cf..cd5383be8a4 100644 --- a/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp +++ b/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp @@ -64,16 +64,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -94,10 +94,10 @@ struct daPy_py_c { /* 805DC9DC */ void changeDemoMode(u32, int, int, s16); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daB_DS_c { /* 805CB314 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 805CB4A4 */ void JointCallBack(J3DJoint*, int); diff --git a/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp b/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp index 891087d08d9..261ee1bc5f0 100644 --- a/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp +++ b/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp @@ -36,16 +36,16 @@ struct mDoGph_gInf_c { /* 80008078 */ void onBlure(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -70,10 +70,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daB_GG_c { /* 805DE464 */ void CreateHeap(); /* 805DE650 */ void initCc(); diff --git a/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp b/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp index 60e92f2a96b..6356a34c95b 100644 --- a/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp +++ b/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp @@ -46,16 +46,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp b/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp index 4d21842d58e..f327e22ab08 100644 --- a/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp +++ b/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp @@ -60,16 +60,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp index 23f92cfce0c..b1b462f18f8 100644 --- a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp +++ b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp b/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp index 3e168dce880..0afa8a79146 100644 --- a/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp +++ b/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp @@ -20,16 +20,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp b/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp index 303771112cf..dcc1f61404c 100644 --- a/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp +++ b/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp @@ -64,16 +64,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -100,10 +100,10 @@ struct daObjBHASHI_c { /* 80577500 */ void Obj_Damage(cXyz); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daB_MGN_c { /* 8060577C */ void ctrlJoint(J3DJoint*, J3DModel*); /* 8060584C */ void JointCallBack(J3DJoint*, int); diff --git a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp index 82e01946ab9..fb9fac8fa94 100644 --- a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp +++ b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp @@ -86,18 +86,18 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C06F4 */ void stopAnime(); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp b/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp index 0f67aa0b526..f4a540b9861 100644 --- a/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp +++ b/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp @@ -55,11 +55,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -97,13 +97,13 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 8061D8FC */ ~csXyz(); /* 8061D938 */ csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, diff --git a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp index c6c53164188..7243b525ba4 100644 --- a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp +++ b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp @@ -52,16 +52,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp b/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp index a518f66fdde..2045c85e98e 100644 --- a/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp +++ b/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp @@ -37,25 +37,25 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -79,6 +79,8 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; +struct J3DModel {}; + struct J3DJoint {}; struct dCcD_SrcSph {}; @@ -90,8 +92,6 @@ struct dCcD_Sph { /* 8062D678 */ dCcD_Sph(); }; -struct J3DModel {}; - struct daB_TN_c { /* 8061EC58 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 8061ED10 */ void JointCallBack(J3DJoint*, int); diff --git a/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp b/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp index 387345a0d8e..01a23d68013 100644 --- a/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp +++ b/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp @@ -44,11 +44,11 @@ struct mDoGph_gInf_c { /* 80008078 */ void onBlure(); }; -struct J3DAnmTexPattern {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmTexPattern {}; struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); @@ -75,16 +75,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp b/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp index d982711afc7..73123664104 100644 --- a/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp +++ b/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp @@ -53,16 +53,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp b/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp index b1fc7231654..94e96984616 100644 --- a/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp +++ b/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp @@ -26,10 +26,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); @@ -39,16 +39,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp b/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp index c41b58fc8ae..0ed82e6bbff 100644 --- a/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp +++ b/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp @@ -24,16 +24,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp b/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp index 590ba410af6..db1d32c0f8c 100644 --- a/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp +++ b/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp @@ -24,16 +24,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp b/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp index 021a8523935..83a50e752d0 100644 --- a/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp +++ b/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct Vec {}; - struct csXyz {}; +struct Vec {}; + struct cXyz { /* 8026702C */ bool operator==(Vec const&) const; /* 805ADDD8 */ void abs(Vec const&) const; @@ -37,16 +37,16 @@ struct mDoExt_morf_c { /* 805ADDA8 */ void isStop(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/d_a_bd/d_a_bd.cpp b/rel/d/a/d_a_bd/d_a_bd.cpp index 77924e92292..9c09681d759 100644 --- a/rel/d/a/d_a_bd/d_a_bd.cpp +++ b/rel/d/a/d_a_bd/d_a_bd.cpp @@ -32,11 +32,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, diff --git a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp index e3727289326..fb454fb5806 100644 --- a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp +++ b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp @@ -51,13 +51,13 @@ struct daSetBgObj_c { /* 80031870 */ void getArcName(fopAc_ac_c*); }; +struct J3DModel {}; + struct dBgW { /* 8007B970 */ dBgW(); /* 8007B9C0 */ void Move(); }; -struct J3DModel {}; - struct cCcD_Obj {}; struct daBgObj_c { diff --git a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp index a99d68ac1da..a9f41d951d1 100644 --- a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp +++ b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp @@ -34,10 +34,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); @@ -156,8 +156,6 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; -struct dBgS_AcchCir {}; - struct cBgS_PolyInfo {}; struct dBgS { @@ -167,6 +165,8 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; +struct dBgS_AcchCir {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp b/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp index 5d0030d8aea..563690f3995 100644 --- a/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp +++ b/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp @@ -36,18 +36,18 @@ struct daCoachFire_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); diff --git a/rel/d/a/d_a_cow/d_a_cow.cpp b/rel/d/a/d_a_cow/d_a_cow.cpp index 7ea05eb86a0..747d7ad3158 100644 --- a/rel/d/a/d_a_cow/d_a_cow.cpp +++ b/rel/d/a/d_a_cow/d_a_cow.cpp @@ -44,19 +44,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -75,10 +75,10 @@ struct daPy_py_c { /* 80662D84 */ void checkNowWolf(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daCow_c { /* 806585CC */ void calcRunAnime(int); /* 80658730 */ void setBck(int, u8, f32, f32); @@ -189,6 +189,8 @@ struct dRes_control_c { struct dPath {}; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); @@ -196,8 +198,6 @@ struct dBgS_AcchCir { /* 806625B4 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/d_a_crod/d_a_crod.cpp b/rel/d/a/d_a_crod/d_a_crod.cpp index 23441c15712..644ee5786c8 100644 --- a/rel/d/a/d_a_crod/d_a_crod.cpp +++ b/rel/d/a/d_a_crod/d_a_crod.cpp @@ -27,10 +27,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/d_a_cstaf/d_a_cstaF.cpp b/rel/d/a/d_a_cstaf/d_a_cstaF.cpp index c49f9602ea4..b644449e204 100644 --- a/rel/d/a/d_a_cstaf/d_a_cstaF.cpp +++ b/rel/d/a/d_a_cstaf/d_a_cstaF.cpp @@ -59,10 +59,12 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct mDoExt_McaMorfCallBack2_c {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfCallBack1_c {}; +struct mDoExt_McaMorfCallBack2_c {}; + struct Vec {}; struct Z2Creature { @@ -71,8 +73,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -150,12 +150,6 @@ struct dPa_control_c { cXyz const*, f32); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 804DE220 */ ~dBgS_AcchCir(); -}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; @@ -165,6 +159,12 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F58 */ void SetWall(f32, f32); + /* 804DE220 */ ~dBgS_AcchCir(); +}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/d_a_cstatue/d_a_cstatue.cpp b/rel/d/a/d_a_cstatue/d_a_cstatue.cpp index 6caee03f9a8..2c9a7c4fd16 100644 --- a/rel/d/a/d_a_cstatue/d_a_cstatue.cpp +++ b/rel/d/a/d_a_cstatue/d_a_cstatue.cpp @@ -67,20 +67,20 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -185,12 +185,6 @@ struct dPa_control_c { cXyz const*, f32); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80664768 */ ~dBgS_AcchCir(); -}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; @@ -202,6 +196,12 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F58 */ void SetWall(f32, f32); + /* 80664768 */ ~dBgS_AcchCir(); +}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/d_a_demo00/d_a_demo00.cpp b/rel/d/a/d_a_demo00/d_a_demo00.cpp index 02ee8cbd6d3..d8e6d5501f8 100644 --- a/rel/d/a/d_a_demo00/d_a_demo00.cpp +++ b/rel/d/a/d_a_demo00/d_a_demo00.cpp @@ -24,12 +24,12 @@ struct mDoGph_gInf_c { static u8 mFrameBufferTimg[4]; }; -struct J3DDeformData {}; - struct J3DSkinDeform { /* 8032C96C */ J3DSkinDeform(); }; +struct J3DDeformData {}; + struct J3DModel { /* 80327A2C */ void setDeformData(J3DDeformData*, u32); /* 80327AA0 */ void setSkinDeform(J3DSkinDeform*, u32); @@ -52,13 +52,13 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DAnmColor {}; - -struct J3DAnmTexPattern {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmColor {}; + +struct J3DAnmTexPattern {}; struct J3DMaterialTable { /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); @@ -97,20 +97,20 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/d_a_disappear/d_a_disappear.cpp b/rel/d/a/d_a_disappear/d_a_disappear.cpp index 28d74adc60a..901c731269c 100644 --- a/rel/d/a/d_a_disappear/d_a_disappear.cpp +++ b/rel/d/a/d_a_disappear/d_a_disappear.cpp @@ -19,14 +19,14 @@ struct disappear_class {}; struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/d_a_dmidna/d_a_dmidna.cpp b/rel/d/a/d_a_dmidna/d_a_dmidna.cpp index 9fa39c6ed6e..3afec268d5d 100644 --- a/rel/d/a/d_a_dmidna/d_a_dmidna.cpp +++ b/rel/d/a/d_a_dmidna/d_a_dmidna.cpp @@ -21,16 +21,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/d_a_do/d_a_do.cpp b/rel/d/a/d_a_do/d_a_do.cpp index 0612a582f22..a56cb4ae27c 100644 --- a/rel/d/a/d_a_do/d_a_do.cpp +++ b/rel/d/a/d_a_do/d_a_do.cpp @@ -39,11 +39,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, diff --git a/rel/d/a/d_a_fr/d_a_fr.cpp b/rel/d/a/d_a_fr/d_a_fr.cpp index 6195e782333..c3355a018dc 100644 --- a/rel/d/a/d_a_fr/d_a_fr.cpp +++ b/rel/d/a/d_a_fr/d_a_fr.cpp @@ -32,11 +32,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, diff --git a/rel/d/a/d_a_grass/d_a_grass.cpp b/rel/d/a/d_a_grass/d_a_grass.cpp index 5baa0247a4b..a5f59eb678e 100644 --- a/rel/d/a/d_a_grass/d_a_grass.cpp +++ b/rel/d/a/d_a_grass/d_a_grass.cpp @@ -73,8 +73,6 @@ struct dScnKy_env_light_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; struct csXyz { @@ -82,6 +80,8 @@ struct csXyz { /* 8051EB4C */ ~csXyz(); }; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/d_a_horse/d_a_horse.cpp b/rel/d/a/d_a_horse/d_a_horse.cpp index b0c48f77918..7aedeba6908 100644 --- a/rel/d/a/d_a_horse/d_a_horse.cpp +++ b/rel/d/a/d_a_horse/d_a_horse.cpp @@ -66,10 +66,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); @@ -303,12 +303,6 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 808452E4 */ ~dBgS_AcchCir(); -}; - struct dBgS { /* 80074B98 */ void GetExitId(cBgS_PolyInfo const&); /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); @@ -318,6 +312,12 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F58 */ void SetWall(f32, f32); + /* 808452E4 */ ~dBgS_AcchCir(); +}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/d_a_hozelda/d_a_hozelda.cpp b/rel/d/a/d_a_hozelda/d_a_hozelda.cpp index 5b687951ad2..a398e4e2149 100644 --- a/rel/d/a/d_a_hozelda/d_a_hozelda.cpp +++ b/rel/d/a/d_a_hozelda/d_a_hozelda.cpp @@ -49,10 +49,10 @@ struct mDoExt_btkAnm { /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/d_a_kago/d_a_kago.cpp b/rel/d/a/d_a_kago/d_a_kago.cpp index b4a89087d2f..be6112df707 100644 --- a/rel/d/a/d_a_kago/d_a_kago.cpp +++ b/rel/d/a/d_a_kago/d_a_kago.cpp @@ -36,16 +36,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -79,10 +79,10 @@ struct daObj_Balloon_c { /* 80BA80F4 */ void saveBestScore(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daKago_c { /* 80849660 */ void getBckName(int); /* 808496F0 */ void setBck(int, u8, f32, f32); diff --git a/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp b/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp index 3efb0280543..8475a658060 100644 --- a/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp +++ b/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp @@ -51,11 +51,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, diff --git a/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp b/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp index 4686388e73f..a4409ed1f06 100644 --- a/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp +++ b/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp @@ -35,10 +35,10 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, diff --git a/rel/d/a/d_a_midna/d_a_midna.cpp b/rel/d/a/d_a_midna/d_a_midna.cpp index 575d238bd68..a5f330216f6 100644 --- a/rel/d/a/d_a_midna/d_a_midna.cpp +++ b/rel/d/a/d_a_midna/d_a_midna.cpp @@ -62,10 +62,10 @@ struct mDoExt_blkAnm { /* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); @@ -76,12 +76,12 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfCallBack2_c {}; struct J3DTransformInfo {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -371,11 +371,6 @@ struct J3DSys { static u8 mCurrentMtx[48]; }; -struct J3DAnmTexPattern { - /* 8032AF50 */ void getTexNo(u16, u16*) const; - /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); -}; - struct J3DAnmTevRegKey { /* 8032B1F8 */ void getTevColorReg(u16, _GXColorS10*) const; /* 8032B4BC */ void getTevKonstReg(u16, _GXColor*) const; @@ -386,6 +381,11 @@ struct J3DAnmTextureSRTKey { /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*); }; +struct J3DAnmTexPattern { + /* 8032AF50 */ void getTexNo(u16, u16*) const; + /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); +}; + struct J3DMaterialTable { /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); diff --git a/rel/d/a/d_a_movie_player/d_a_movie_player.cpp b/rel/d/a/d_a_movie_player/d_a_movie_player.cpp index 0674cc223e9..50ca04632d4 100644 --- a/rel/d/a/d_a_movie_player/d_a_movie_player.cpp +++ b/rel/d/a/d_a_movie_player/d_a_movie_player.cpp @@ -94,7 +94,6 @@ struct JASMixMode {}; struct JASDriver { /* 8029C9DC */ void registerMixCallback(s16* (*)(s32), JASMixMode); - /* 8029E180 */ void getOutputMode(); }; // diff --git a/rel/d/a/d_a_myna/d_a_myna.cpp b/rel/d/a/d_a_myna/d_a_myna.cpp index da599536e9b..0bc2896c0b7 100644 --- a/rel/d/a/d_a_myna/d_a_myna.cpp +++ b/rel/d/a/d_a_myna/d_a_myna.cpp @@ -52,20 +52,20 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -94,16 +94,16 @@ struct daObj_SSItem_c { /* 80CE77F8 */ void getExchangeItemPtr(); }; -struct J3DModel {}; - -struct J3DAnmTransformKey {}; +struct J3DJoint {}; struct J3DFrameCtrl { /* 803283FC */ void init(s16); /* 80946370 */ ~J3DFrameCtrl(); }; -struct J3DJoint {}; +struct J3DAnmTransformKey {}; + +struct J3DModel {}; struct daMyna_c { /* 80945E80 */ void baseMotion00(int); diff --git a/rel/d/a/d_a_nbomb/d_a_nbomb.cpp b/rel/d/a/d_a_nbomb/d_a_nbomb.cpp index 230a4f36e07..150dbb02ede 100644 --- a/rel/d/a/d_a_nbomb/d_a_nbomb.cpp +++ b/rel/d/a/d_a_nbomb/d_a_nbomb.cpp @@ -40,10 +40,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/d_a_ni/d_a_ni.cpp b/rel/d/a/d_a_ni/d_a_ni.cpp index 9a53535d227..d3173dbb178 100644 --- a/rel/d/a/d_a_ni/d_a_ni.cpp +++ b/rel/d/a/d_a_ni/d_a_ni.cpp @@ -41,11 +41,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, diff --git a/rel/d/a/d_a_peru/d_a_peru.cpp b/rel/d/a/d_a_peru/d_a_peru.cpp index 57804039b0a..72f89cb99a7 100644 --- a/rel/d/a/d_a_peru/d_a_peru.cpp +++ b/rel/d/a/d_a_peru/d_a_peru.cpp @@ -22,12 +22,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -36,8 +38,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -65,6 +65,14 @@ struct daPy_py_c { /* 80D4C034 */ void checkNowWolf(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -72,14 +80,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80D4B7BC */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daPeru_c { /* 80D46EEC */ ~daPeru_c(); /* 80D46FCC */ void create(); @@ -154,10 +154,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); diff --git a/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp b/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp index bfb5bf12c8e..be750eafdfa 100644 --- a/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp +++ b/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp @@ -17,10 +17,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/d_a_spinner/d_a_spinner.cpp b/rel/d/a/d_a_spinner/d_a_spinner.cpp index 1e0a8a58197..57082f48dec 100644 --- a/rel/d/a/d_a_spinner/d_a_spinner.cpp +++ b/rel/d/a/d_a_spinner/d_a_spinner.cpp @@ -30,10 +30,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); @@ -132,13 +132,6 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80075F58 */ void SetWall(f32, f32); - /* 804D1EF8 */ ~dBgS_AcchCir(); -}; - struct dBgS { /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); /* 80074CBC */ void GetSpecialCode(cBgS_PolyInfo const&); @@ -147,6 +140,13 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F40 */ void SetWallR(f32); + /* 80075F58 */ void SetWall(f32, f32); + /* 804D1EF8 */ ~dBgS_AcchCir(); +}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/d_a_sq/d_a_sq.cpp b/rel/d/a/d_a_sq/d_a_sq.cpp index 3c620ae1e3b..883a4863821 100644 --- a/rel/d/a/d_a_sq/d_a_sq.cpp +++ b/rel/d/a/d_a_sq/d_a_sq.cpp @@ -34,11 +34,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, diff --git a/rel/d/a/d_a_swhit0/d_a_swhit0.cpp b/rel/d/a/d_a_swhit0/d_a_swhit0.cpp index 7e71a1afb5c..5349694f602 100644 --- a/rel/d/a/d_a_swhit0/d_a_swhit0.cpp +++ b/rel/d/a/d_a_swhit0/d_a_swhit0.cpp @@ -17,19 +17,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/d_a_tbox/d_a_tbox.cpp b/rel/d/a/d_a_tbox/d_a_tbox.cpp index 2b62be79133..0334902ace5 100644 --- a/rel/d/a/d_a_tbox/d_a_tbox.cpp +++ b/rel/d/a/d_a_tbox/d_a_tbox.cpp @@ -37,19 +37,19 @@ struct mDoHIO_entry_c { /* 80490E08 */ ~mDoHIO_entry_c(); }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); @@ -210,12 +210,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; -struct _GXColor {}; - struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/d_a_tbox2/d_a_tbox2.cpp b/rel/d/a/d_a_tbox2/d_a_tbox2.cpp index 3d21085ac6b..851979e77cc 100644 --- a/rel/d/a/d_a_tbox2/d_a_tbox2.cpp +++ b/rel/d/a/d_a_tbox2/d_a_tbox2.cpp @@ -25,10 +25,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/d_a_title/d_a_title.cpp b/rel/d/a/d_a_title/d_a_title.cpp index ba12f4c40c6..6c29e8d1f2f 100644 --- a/rel/d/a/d_a_title/d_a_title.cpp +++ b/rel/d/a/d_a_title/d_a_title.cpp @@ -46,10 +46,10 @@ struct mDoExt_bpkAnm { /* 8000D518 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/d_a_ykgr/d_a_ykgr.cpp b/rel/d/a/d_a_ykgr/d_a_ykgr.cpp index 2ecd5061616..dd498d16b44 100644 --- a/rel/d/a/d_a_ykgr/d_a_ykgr.cpp +++ b/rel/d/a/d_a_ykgr/d_a_ykgr.cpp @@ -37,14 +37,14 @@ struct daYkgr_HIO_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp b/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp index 22a8b610403..1b353b6068d 100644 --- a/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp +++ b/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp @@ -17,10 +17,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp b/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp index 664fd0e3a69..d651179da3c 100644 --- a/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp +++ b/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp @@ -25,10 +25,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp b/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp index e5ca2ec9c3d..9596bb109d6 100644 --- a/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp +++ b/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp @@ -35,10 +35,10 @@ struct mDoExt_btkAnm { /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); @@ -135,12 +135,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; -struct _GXColor {}; - struct csXyz {}; struct dPa_control_c { diff --git a/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp b/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp index d672c0e5f24..2cf92716bed 100644 --- a/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp +++ b/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp @@ -19,10 +19,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp b/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp index c70ac9cab65..9bfeaaaaede 100644 --- a/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp +++ b/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp @@ -36,10 +36,10 @@ struct mDoExt_btkAnm { /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); @@ -171,12 +171,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; diff --git a/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp b/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp index a4bda510b14..c9f0cf696dd 100644 --- a/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp +++ b/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp @@ -37,10 +37,10 @@ struct mDoExt_btkAnm { /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); @@ -197,12 +197,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; diff --git a/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp b/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp index a698540b3ea..2d582951315 100644 --- a/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp +++ b/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp @@ -42,16 +42,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -127,10 +127,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, diff --git a/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp b/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp index e9074423b4e..51918bf606e 100644 --- a/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp +++ b/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_bee/d_a_e_bee.cpp b/rel/d/a/e/d_a_e_bee/d_a_e_bee.cpp index d324ed7ca74..60a71dee39c 100644 --- a/rel/d/a/e/d_a_e_bee/d_a_e_bee.cpp +++ b/rel/d/a/e/d_a_e_bee/d_a_e_bee.cpp @@ -61,10 +61,10 @@ struct dPa_control_c { /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); diff --git a/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp b/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp index 695a3ac0159..9e97e52c743 100644 --- a/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp +++ b/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp @@ -19,10 +19,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); @@ -32,16 +32,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -56,10 +56,10 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_BG_c { /* 8068585C */ void ctrlJoint(J3DJoint*, J3DModel*); /* 80685948 */ void JointCallBack(J3DJoint*, int); diff --git a/rel/d/a/e/d_a_e_bi/d_a_e_bi.cpp b/rel/d/a/e/d_a_e_bi/d_a_e_bi.cpp index e7cfbe8b864..339bc89b6cd 100644 --- a/rel/d/a/e/d_a_e_bi/d_a_e_bi.cpp +++ b/rel/d/a/e/d_a_e_bi/d_a_e_bi.cpp @@ -20,16 +20,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_bs/d_a_e_bs.cpp b/rel/d/a/e/d_a_e_bs/d_a_e_bs.cpp index 5d1b8977968..235eed90254 100644 --- a/rel/d/a/e/d_a_e_bs/d_a_e_bs.cpp +++ b/rel/d/a/e/d_a_e_bs/d_a_e_bs.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_bu/d_a_e_bu.cpp b/rel/d/a/e/d_a_e_bu/d_a_e_bu.cpp index c2376d6860d..705b0049287 100644 --- a/rel/d/a/e/d_a_e_bu/d_a_e_bu.cpp +++ b/rel/d/a/e/d_a_e_bu/d_a_e_bu.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_bug/d_a_e_bug.cpp b/rel/d/a/e/d_a_e_bug/d_a_e_bug.cpp index f994888c317..89d01c99dca 100644 --- a/rel/d/a/e/d_a_e_bug/d_a_e_bug.cpp +++ b/rel/d/a/e/d_a_e_bug/d_a_e_bug.cpp @@ -65,10 +65,10 @@ struct dPa_control_c { /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); diff --git a/rel/d/a/e/d_a_e_cr/d_a_e_cr.cpp b/rel/d/a/e/d_a_e_cr/d_a_e_cr.cpp index ffbf7c56b0e..165f80974d9 100644 --- a/rel/d/a/e/d_a_e_cr/d_a_e_cr.cpp +++ b/rel/d/a/e/d_a_e_cr/d_a_e_cr.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_db/d_a_e_db.cpp b/rel/d/a/e/d_a_e_db/d_a_e_db.cpp index b9b8814276a..ef42839421d 100644 --- a/rel/d/a/e/d_a_e_db/d_a_e_db.cpp +++ b/rel/d/a/e/d_a_e_db/d_a_e_db.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -55,10 +55,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); diff --git a/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp b/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp index 08099575842..ff875f865e6 100644 --- a/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp +++ b/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp @@ -21,10 +21,10 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, diff --git a/rel/d/a/e/d_a_e_dd/d_a_e_dd.cpp b/rel/d/a/e/d_a_e_dd/d_a_e_dd.cpp index bb1154a1e6e..4e9c879aed8 100644 --- a/rel/d/a/e/d_a_e_dd/d_a_e_dd.cpp +++ b/rel/d/a/e/d_a_e_dd/d_a_e_dd.cpp @@ -19,10 +19,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); @@ -32,16 +32,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_df/d_a_e_df.cpp b/rel/d/a/e/d_a_e_df/d_a_e_df.cpp index 5a0b9dfc179..3ff36a221d7 100644 --- a/rel/d/a/e/d_a_e_df/d_a_e_df.cpp +++ b/rel/d/a/e/d_a_e_df/d_a_e_df.cpp @@ -28,16 +28,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -65,10 +65,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_DF_c { /* 806A7710 */ void CreateHeap(); /* 806A7828 */ void initCcCylinder(); diff --git a/rel/d/a/e/d_a_e_dk/d_a_e_dk.cpp b/rel/d/a/e/d_a_e_dk/d_a_e_dk.cpp index 776cb68bb5d..c9c3fff2530 100644 --- a/rel/d/a/e/d_a_e_dk/d_a_e_dk.cpp +++ b/rel/d/a/e/d_a_e_dk/d_a_e_dk.cpp @@ -45,16 +45,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -69,14 +69,14 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct cBgD_Vtx_t {}; - struct cM3dGPla {}; struct dBgS_SphChk { /* 80078A14 */ dBgS_SphChk(); }; +struct cBgD_Vtx_t {}; + struct daE_DK_c { /* 806AA228 */ void draw(); /* 806AA5C8 */ void setBck(int, u8, f32, f32); diff --git a/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp b/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp index ded276fea9a..11d163a2879 100644 --- a/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp +++ b/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -90,13 +90,13 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 804EE350 */ csXyz(); /* 804EE85C */ ~csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); diff --git a/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp b/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp index b509ad022c9..7d0a2c67539 100644 --- a/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp +++ b/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp @@ -39,16 +39,16 @@ struct mDoGph_gInf_c { /* 80008078 */ void onBlure(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -67,10 +67,10 @@ struct daPy_py_c { /* 8015F914 */ void setPlayerDamage(int, int); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_DT_c { /* 806AD97C */ void ctrlJoint(J3DJoint*, J3DModel*); /* 806ADBA0 */ void JointCallBack(J3DJoint*, int); diff --git a/rel/d/a/e/d_a_e_fb/d_a_e_fb.cpp b/rel/d/a/e/d_a_e_fb/d_a_e_fb.cpp index 1782716cfaf..7faabbaa052 100644 --- a/rel/d/a/e/d_a_e_fb/d_a_e_fb.cpp +++ b/rel/d/a/e/d_a_e_fb/d_a_e_fb.cpp @@ -34,25 +34,25 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_fk/d_a_e_fk.cpp b/rel/d/a/e/d_a_e_fk/d_a_e_fk.cpp index 499427fc46c..adeaf8bc554 100644 --- a/rel/d/a/e/d_a_e_fk/d_a_e_fk.cpp +++ b/rel/d/a/e/d_a_e_fk/d_a_e_fk.cpp @@ -35,16 +35,16 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_fm/d_a_e_fm.cpp b/rel/d/a/e/d_a_e_fm/d_a_e_fm.cpp index 255652dc00d..1811c6cd51d 100644 --- a/rel/d/a/e/d_a_e_fm/d_a_e_fm.cpp +++ b/rel/d/a/e/d_a_e_fm/d_a_e_fm.cpp @@ -60,10 +60,10 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, diff --git a/rel/d/a/e/d_a_e_fs/d_a_e_fs.cpp b/rel/d/a/e/d_a_e_fs/d_a_e_fs.cpp index d44d61977a4..e0506d19602 100644 --- a/rel/d/a/e/d_a_e_fs/d_a_e_fs.cpp +++ b/rel/d/a/e/d_a_e_fs/d_a_e_fs.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_ga/d_a_e_ga.cpp b/rel/d/a/e/d_a_e_ga/d_a_e_ga.cpp index e28f25e3d25..e5b81c3477c 100644 --- a/rel/d/a/e/d_a_e_ga/d_a_e_ga.cpp +++ b/rel/d/a/e/d_a_e_ga/d_a_e_ga.cpp @@ -54,10 +54,10 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); diff --git a/rel/d/a/e/d_a_e_gb/d_a_e_gb.cpp b/rel/d/a/e/d_a_e_gb/d_a_e_gb.cpp index aa4acc8fc52..9dd6969f2a0 100644 --- a/rel/d/a/e/d_a_e_gb/d_a_e_gb.cpp +++ b/rel/d/a/e/d_a_e_gb/d_a_e_gb.cpp @@ -19,10 +19,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); @@ -36,11 +36,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, diff --git a/rel/d/a/e/d_a_e_ge/d_a_e_ge.cpp b/rel/d/a/e/d_a_e_ge/d_a_e_ge.cpp index 153e9d8be46..245cd42916a 100644 --- a/rel/d/a/e/d_a_e_ge/d_a_e_ge.cpp +++ b/rel/d/a/e/d_a_e_ge/d_a_e_ge.cpp @@ -31,16 +31,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_gi/d_a_e_gi.cpp b/rel/d/a/e/d_a_e_gi/d_a_e_gi.cpp index 4ef18929656..2866ffff5e6 100644 --- a/rel/d/a/e/d_a_e_gi/d_a_e_gi.cpp +++ b/rel/d/a/e/d_a_e_gi/d_a_e_gi.cpp @@ -30,16 +30,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -66,10 +66,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_GI_c { /* 806CD4F4 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 806CD594 */ void JointCallBack(J3DJoint*, int); diff --git a/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp b/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp index bc573a3845d..dcf9666982e 100644 --- a/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp +++ b/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp @@ -35,16 +35,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_gob/d_a_e_gob.cpp b/rel/d/a/e/d_a_e_gob/d_a_e_gob.cpp index be2c0bb8da7..04983b9f8b2 100644 --- a/rel/d/a/e/d_a_e_gob/d_a_e_gob.cpp +++ b/rel/d/a/e/d_a_e_gob/d_a_e_gob.cpp @@ -26,18 +26,18 @@ struct mDoGph_gInf_c { /* 80007FD8 */ void fadeOut(f32, _GXColor&); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_gs/d_a_e_gs.cpp b/rel/d/a/e/d_a_e_gs/d_a_e_gs.cpp index a81bfbdbad4..b68ec357719 100644 --- a/rel/d/a/e/d_a_e_gs/d_a_e_gs.cpp +++ b/rel/d/a/e/d_a_e_gs/d_a_e_gs.cpp @@ -28,16 +28,16 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp b/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp index 17d302a0ab8..dcff86f4bbc 100644 --- a/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp +++ b/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -55,10 +55,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); diff --git a/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp b/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp index f3dc4e585ab..e8aa5016854 100644 --- a/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp +++ b/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp @@ -21,10 +21,10 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, diff --git a/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp b/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp index 1e50c2054d3..f053d6a703b 100644 --- a/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp +++ b/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp @@ -52,16 +52,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -89,10 +89,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_HM_c { /* 806E043C */ void CreateHeap(); /* 806E06C0 */ void initCcCylinder(); diff --git a/rel/d/a/e/d_a_e_hp/d_a_e_hp.cpp b/rel/d/a/e/d_a_e_hp/d_a_e_hp.cpp index e16fed90e69..7b316925dc7 100644 --- a/rel/d/a/e/d_a_e_hp/d_a_e_hp.cpp +++ b/rel/d/a/e/d_a_e_hp/d_a_e_hp.cpp @@ -40,16 +40,16 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_hz/d_a_e_hz.cpp b/rel/d/a/e/d_a_e_hz/d_a_e_hz.cpp index a623f6d3e73..e45b1489fd4 100644 --- a/rel/d/a/e/d_a_e_hz/d_a_e_hz.cpp +++ b/rel/d/a/e/d_a_e_hz/d_a_e_hz.cpp @@ -33,16 +33,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -69,10 +69,10 @@ struct daObjCarry_c { /* 80474448 */ void mode_init_drop(u8); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_HZ_c { /* 806EA690 */ void setBck(int, u8, f32, f32); /* 806EA734 */ void checkBck(int); @@ -143,12 +143,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; -struct _GXColor {}; - struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp b/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp index b56b43b33ec..739ed7326a0 100644 --- a/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp +++ b/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp @@ -41,16 +41,16 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_is/d_a_e_is.cpp b/rel/d/a/e/d_a_e_is/d_a_e_is.cpp index d638ee47f9d..75556edd515 100644 --- a/rel/d/a/e/d_a_e_is/d_a_e_is.cpp +++ b/rel/d/a/e/d_a_e_is/d_a_e_is.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_kg/d_a_e_kg.cpp b/rel/d/a/e/d_a_e_kg/d_a_e_kg.cpp index ead6b814d31..ea0d690feb3 100644 --- a/rel/d/a/e/d_a_e_kg/d_a_e_kg.cpp +++ b/rel/d/a/e/d_a_e_kg/d_a_e_kg.cpp @@ -28,16 +28,16 @@ struct mDoExt_btpAnm { /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp b/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp index 3c99a20ca2b..3a68fb13ef6 100644 --- a/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp +++ b/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp @@ -22,16 +22,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -52,10 +52,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct Vec {}; struct cXyz { diff --git a/rel/d/a/e/d_a_e_kr/d_a_e_kr.cpp b/rel/d/a/e/d_a_e_kr/d_a_e_kr.cpp index 2a50f0fda38..8f975a37e68 100644 --- a/rel/d/a/e/d_a_e_kr/d_a_e_kr.cpp +++ b/rel/d/a/e/d_a_e_kr/d_a_e_kr.cpp @@ -21,16 +21,16 @@ struct mDoHIO_entry_c { /* 8070563C */ ~mDoHIO_entry_c(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_mb/d_a_e_mb.cpp b/rel/d/a/e/d_a_e_mb/d_a_e_mb.cpp index 37986d8b6af..f1953b37f89 100644 --- a/rel/d/a/e/d_a_e_mb/d_a_e_mb.cpp +++ b/rel/d/a/e/d_a_e_mb/d_a_e_mb.cpp @@ -29,16 +29,16 @@ struct mDoExt_btpAnm { /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -70,10 +70,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); diff --git a/rel/d/a/e/d_a_e_md/d_a_e_md.cpp b/rel/d/a/e/d_a_e_md/d_a_e_md.cpp index a4763d07402..736cd707c16 100644 --- a/rel/d/a/e/d_a_e_md/d_a_e_md.cpp +++ b/rel/d/a/e/d_a_e_md/d_a_e_md.cpp @@ -26,16 +26,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp b/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp index a6984712619..99b39dd95d8 100644 --- a/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp +++ b/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -88,13 +88,13 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 80713418 */ csXyz(); /* 80713924 */ ~csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); diff --git a/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp b/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp index e3aebea26dd..14a82743cdc 100644 --- a/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp +++ b/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp @@ -29,16 +29,16 @@ struct mDoExt_btpAnm { /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.cpp b/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.cpp index cdc202a20a2..22dcc25de96 100644 --- a/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.cpp +++ b/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.cpp @@ -37,11 +37,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -82,10 +82,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); diff --git a/rel/d/a/e/d_a_e_mm/d_a_e_mm.cpp b/rel/d/a/e/d_a_e_mm/d_a_e_mm.cpp index 1e5ca1e47fb..c9f51782094 100644 --- a/rel/d/a/e/d_a_e_mm/d_a_e_mm.cpp +++ b/rel/d/a/e/d_a_e_mm/d_a_e_mm.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp b/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp index 9df16b84734..2125f905bbe 100644 --- a/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp +++ b/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp @@ -20,16 +20,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_nz/d_a_e_nz.cpp b/rel/d/a/e/d_a_e_nz/d_a_e_nz.cpp index d71b5193f10..af7026bc020 100644 --- a/rel/d/a/e/d_a_e_nz/d_a_e_nz.cpp +++ b/rel/d/a/e/d_a_e_nz/d_a_e_nz.cpp @@ -34,16 +34,16 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_oc/d_a_e_oc.cpp b/rel/d/a/e/d_a_e_oc/d_a_e_oc.cpp index 0a8c2900e61..54187f7f6de 100644 --- a/rel/d/a/e/d_a_e_oc/d_a_e_oc.cpp +++ b/rel/d/a/e/d_a_e_oc/d_a_e_oc.cpp @@ -31,16 +31,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -61,10 +61,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_OC_c { /* 8072C630 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 8072C6E8 */ void JointCallBack(J3DJoint*, int); diff --git a/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp b/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp index baa274886ec..cb1091596de 100644 --- a/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp +++ b/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp @@ -20,10 +20,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); @@ -33,16 +33,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -70,10 +70,10 @@ struct fopAcM_gc_c { static f32 mGroundY; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_OctBg_c { /* 8073626C */ void setAction(void (daE_OctBg_c::*)()); /* 80736310 */ void setSparkEffect(); diff --git a/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp b/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp index 96e8a5917cf..063269d0bc1 100644 --- a/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp +++ b/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp @@ -43,16 +43,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp b/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp index a5593bd099d..73ab795ccaf 100644 --- a/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp +++ b/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp @@ -24,16 +24,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -49,10 +49,10 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_PH_c { /* 8073D48C */ void initCcSph(); /* 8073D5C4 */ void SetStopingCam(); diff --git a/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp b/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp index b1920db1f4f..3dc0c3d5100 100644 --- a/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp +++ b/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp @@ -39,16 +39,16 @@ struct mDoExt_btpAnm { /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -86,10 +86,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_PM_c { /* 80741FB4 */ void DemoSkip(int); /* 80742004 */ void DemoSkipCallBack(void*, int); diff --git a/rel/d/a/e/d_a_e_po/d_a_e_po.cpp b/rel/d/a/e/d_a_e_po/d_a_e_po.cpp index 57f7b28c663..18fba168c5a 100644 --- a/rel/d/a/e/d_a_e_po/d_a_e_po.cpp +++ b/rel/d/a/e/d_a_e_po/d_a_e_po.cpp @@ -50,16 +50,16 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -154,13 +154,13 @@ struct dPa_hermiteEcallBack_c { /* 8004F6B8 */ void setOldPosP(cXyz const*, cXyz const*); }; -struct _GXColor {}; - struct csXyz { /* 80756D8C */ csXyz(); /* 80757290 */ ~csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); diff --git a/rel/d/a/e/d_a_e_pz/d_a_e_pz.cpp b/rel/d/a/e/d_a_e_pz/d_a_e_pz.cpp index 0aa7940ad4f..34f6de1b150 100644 --- a/rel/d/a/e/d_a_e_pz/d_a_e_pz.cpp +++ b/rel/d/a/e/d_a_e_pz/d_a_e_pz.cpp @@ -48,16 +48,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_rb/d_a_e_rb.cpp b/rel/d/a/e/d_a_e_rb/d_a_e_rb.cpp index b685e2bca05..a7d9a965e5b 100644 --- a/rel/d/a/e/d_a_e_rb/d_a_e_rb.cpp +++ b/rel/d/a/e/d_a_e_rb/d_a_e_rb.cpp @@ -27,16 +27,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp b/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp index aff7a325979..976291c0632 100644 --- a/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp +++ b/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp @@ -26,16 +26,16 @@ struct mDoGph_gInf_c { /* 80008078 */ void onBlure(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.cpp b/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.cpp index e55c5d9fb84..2714abb70a3 100644 --- a/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.cpp +++ b/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.cpp @@ -26,16 +26,16 @@ struct mDoGph_gInf_c { /* 80007FD8 */ void fadeOut(f32, _GXColor&); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp b/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp index 524f3a059f9..755272bc84b 100644 --- a/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp +++ b/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp @@ -25,16 +25,16 @@ struct mDoGph_gInf_c { /* 80007FD8 */ void fadeOut(f32, _GXColor&); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp b/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp index f5e1d29d59e..3203942f996 100644 --- a/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp +++ b/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp @@ -24,16 +24,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_sb/d_a_e_sb.cpp b/rel/d/a/e/d_a_e_sb/d_a_e_sb.cpp index b4540ff668e..5e7a4fd2a12 100644 --- a/rel/d/a/e/d_a_e_sb/d_a_e_sb.cpp +++ b/rel/d/a/e/d_a_e_sb/d_a_e_sb.cpp @@ -29,16 +29,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -64,10 +64,10 @@ struct daPy_py_c { /* 8015F398 */ void checkMasterSwordEquip(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_SB_c { /* 807816D8 */ void CreateHeap(); /* 807817F0 */ void initCcCylinder(); diff --git a/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp b/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp index 0b24202b75c..e7941ca1dc7 100644 --- a/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp +++ b/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_sh/d_a_e_sh.cpp b/rel/d/a/e/d_a_e_sh/d_a_e_sh.cpp index 6f22706852c..b29b568582c 100644 --- a/rel/d/a/e/d_a_e_sh/d_a_e_sh.cpp +++ b/rel/d/a/e/d_a_e_sh/d_a_e_sh.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_sm/d_a_e_sm.cpp b/rel/d/a/e/d_a_e_sm/d_a_e_sm.cpp index dbc964226cf..cf284b5a829 100644 --- a/rel/d/a/e/d_a_e_sm/d_a_e_sm.cpp +++ b/rel/d/a/e/d_a_e_sm/d_a_e_sm.cpp @@ -27,16 +27,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.cpp b/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.cpp index e2d30e00c42..05b1f2dffaa 100644 --- a/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.cpp +++ b/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.cpp @@ -48,16 +48,16 @@ struct mDoExt_btkAnm { /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_st/d_a_e_st.cpp b/rel/d/a/e/d_a_e_st/d_a_e_st.cpp index 7877acac5d3..0e51c1f2698 100644 --- a/rel/d/a/e/d_a_e_st/d_a_e_st.cpp +++ b/rel/d/a/e/d_a_e_st/d_a_e_st.cpp @@ -24,16 +24,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_sw/d_a_e_sw.cpp b/rel/d/a/e/d_a_e_sw/d_a_e_sw.cpp index 98832e97463..3b307141f54 100644 --- a/rel/d/a/e/d_a_e_sw/d_a_e_sw.cpp +++ b/rel/d/a/e/d_a_e_sw/d_a_e_sw.cpp @@ -25,16 +25,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_th/d_a_e_th.cpp b/rel/d/a/e/d_a_e_th/d_a_e_th.cpp index 5765f8f9fcd..89d25e4cfd8 100644 --- a/rel/d/a/e/d_a_e_th/d_a_e_th.cpp +++ b/rel/d/a/e/d_a_e_th/d_a_e_th.cpp @@ -25,16 +25,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_tk/d_a_e_tk.cpp b/rel/d/a/e/d_a_e_tk/d_a_e_tk.cpp index bd5f227495d..c74a34da464 100644 --- a/rel/d/a/e/d_a_e_tk/d_a_e_tk.cpp +++ b/rel/d/a/e/d_a_e_tk/d_a_e_tk.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.cpp b/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.cpp index 5bde35df157..328bac2414b 100644 --- a/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.cpp +++ b/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_tt/d_a_e_tt.cpp b/rel/d/a/e/d_a_e_tt/d_a_e_tt.cpp index 6cb07f33d69..9b34febb470 100644 --- a/rel/d/a/e/d_a_e_tt/d_a_e_tt.cpp +++ b/rel/d/a/e/d_a_e_tt/d_a_e_tt.cpp @@ -23,16 +23,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -67,10 +67,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_TT_c { /* 807BD7EC */ void ctrlJoint(J3DJoint*, J3DModel*); /* 807BD8E0 */ void JointCallBack(J3DJoint*, int); @@ -129,12 +129,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; -struct _GXColor {}; - struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); diff --git a/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp b/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp index 98bf296a73a..4075e658263 100644 --- a/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp +++ b/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp @@ -47,10 +47,10 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); @@ -60,16 +60,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -88,10 +88,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); diff --git a/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.cpp b/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.cpp index 28e0ce492b9..246ec52483c 100644 --- a/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.cpp +++ b/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.cpp @@ -88,12 +88,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp index 3b7150c86fe..4a234cc05f3 100644 --- a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp +++ b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp @@ -35,16 +35,16 @@ struct mDoGph_gInf_c { /* 807DFAB4 */ void fadeIn(f32, _GXColor&); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp b/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp index 1be4a190fe7..877d47f7ad7 100644 --- a/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp +++ b/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp @@ -31,16 +31,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_ww/d_a_e_ww.cpp b/rel/d/a/e/d_a_e_ww/d_a_e_ww.cpp index d476db6f4ba..a53cadd902a 100644 --- a/rel/d/a/e/d_a_e_ww/d_a_e_ww.cpp +++ b/rel/d/a/e/d_a_e_ww/d_a_e_ww.cpp @@ -33,16 +33,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -65,10 +65,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_WW_c { /* 807E7748 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 807E7800 */ void JointCallBack(J3DJoint*, int); diff --git a/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp b/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp index 25474459bf1..e3167ed6ee1 100644 --- a/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp +++ b/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -76,10 +76,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); diff --git a/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp b/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp index 04432396acd..99753cd5901 100644 --- a/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp +++ b/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp @@ -19,10 +19,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); @@ -32,16 +32,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -68,10 +68,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); diff --git a/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp b/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp index 7d3b526ef30..89b90bf0116 100644 --- a/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp +++ b/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp @@ -23,10 +23,10 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, diff --git a/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp b/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp index 3663c14e9d6..e4e69e6f646 100644 --- a/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp +++ b/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp @@ -25,16 +25,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_yh/d_a_e_yh.cpp b/rel/d/a/e/d_a_e_yh/d_a_e_yh.cpp index 0b46a1f2cc0..efe1d1680f3 100644 --- a/rel/d/a/e/d_a_e_yh/d_a_e_yh.cpp +++ b/rel/d/a/e/d_a_e_yh/d_a_e_yh.cpp @@ -19,10 +19,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); @@ -32,16 +32,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -68,10 +68,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); diff --git a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp index 39f3064a175..724075f4b77 100644 --- a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp +++ b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp b/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp index 6bead6a2459..c518b8f1a07 100644 --- a/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp +++ b/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp @@ -34,10 +34,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); @@ -47,16 +47,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.cpp b/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.cpp index cc1ac4cccaf..4c1728fbc29 100644 --- a/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.cpp +++ b/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.cpp @@ -40,10 +40,10 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); @@ -53,16 +53,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_yr/d_a_e_yr.cpp b/rel/d/a/e/d_a_e_yr/d_a_e_yr.cpp index 38df4485e04..4016c744904 100644 --- a/rel/d/a/e/d_a_e_yr/d_a_e_yr.cpp +++ b/rel/d/a/e/d_a_e_yr/d_a_e_yr.cpp @@ -21,16 +21,16 @@ struct mDoHIO_entry_c { /* 80828394 */ ~mDoHIO_entry_c(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_zh/d_a_e_zh.cpp b/rel/d/a/e/d_a_e_zh/d_a_e_zh.cpp index f5ae3f2a439..772a93203b8 100644 --- a/rel/d/a/e/d_a_e_zh/d_a_e_zh.cpp +++ b/rel/d/a/e/d_a_e_zh/d_a_e_zh.cpp @@ -36,16 +36,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_zm/d_a_e_zm.cpp b/rel/d/a/e/d_a_e_zm/d_a_e_zm.cpp index 39f44b095e4..acaced1396e 100644 --- a/rel/d/a/e/d_a_e_zm/d_a_e_zm.cpp +++ b/rel/d/a/e/d_a_e_zm/d_a_e_zm.cpp @@ -23,16 +23,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp b/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp index 5d91b8805e1..5d6cbe75901 100644 --- a/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp +++ b/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp @@ -23,16 +23,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp b/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp index de662d61486..b96384a5c91 100644 --- a/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp +++ b/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp @@ -25,14 +25,14 @@ struct dPath {}; struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp b/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp index 1188c496b8c..5b3c5ced4a2 100644 --- a/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp +++ b/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp @@ -64,14 +64,14 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp index 69ed6c377b2..351e859f788 100644 --- a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp +++ b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp @@ -28,16 +28,16 @@ struct dSv_event_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct cXyz { /* 808589A4 */ ~cXyz(); }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, diff --git a/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp b/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp index 42be640af48..c193e199f7a 100644 --- a/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp +++ b/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp @@ -27,14 +27,14 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp b/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp index ce059b55a5e..51820280a58 100644 --- a/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp +++ b/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp @@ -21,14 +21,14 @@ struct dPath {}; struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.cpp b/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.cpp index 63451c06a2a..0f41ef82add 100644 --- a/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.cpp +++ b/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -55,6 +55,14 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -63,14 +71,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80956DDC */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Aru_c { /* 8095178C */ ~daNpc_Aru_c(); /* 809518C4 */ void create(); @@ -143,20 +143,20 @@ struct daNpc_Aru_Param_c { static u8 const m[160]; }; +struct csXyz { + /* 80956784 */ ~csXyz(); + /* 80956CD8 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; - struct _GXColorS10 {}; -struct csXyz { - /* 80956784 */ ~csXyz(); - /* 80956CD8 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -255,14 +255,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80956E24 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp b/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp index 316b35ed94c..5226ef688b3 100644 --- a/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp +++ b/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp @@ -23,12 +23,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -61,16 +61,16 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -137,10 +137,10 @@ struct daNpcF_ActorMngr_c { /* 8095CDD4 */ daNpcF_ActorMngr_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcAsh_c { /* 809582EC */ daNpcAsh_c(); /* 80958610 */ ~daNpcAsh_c(); diff --git a/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.cpp b/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.cpp index 879fc741a09..f1cdfba6655 100644 --- a/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.cpp +++ b/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.cpp @@ -23,12 +23,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -50,16 +50,16 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -128,10 +128,10 @@ struct daNpcF_ActorMngr_c { /* 809618DC */ daNpcF_ActorMngr_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcAshB_c { /* 8095DE4C */ daNpcAshB_c(); /* 8095E060 */ ~daNpcAshB_c(); diff --git a/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp b/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp index e6b1050bc1e..01258e9ee10 100644 --- a/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp +++ b/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp @@ -27,19 +27,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -64,6 +64,14 @@ struct daNpc_Len_c { /* 80A660D8 */ void checkStartDemo13StbEvt(fopAc_ac_c*, f32, f32, f32, f32, f32, f32, f32); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -72,14 +80,6 @@ struct daNpcT_MotionSeqMngr_c { /* 8096741C */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Bans_c { /* 809628CC */ ~daNpc_Bans_c(); /* 80962AA0 */ void create(); @@ -141,20 +141,20 @@ struct daNpc_Bans_Param_c { static u8 const m[144]; }; +struct csXyz { + /* 80966ED8 */ ~csXyz(); + /* 80967318 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; - struct _GXColorS10 {}; -struct csXyz { - /* 80966ED8 */ ~csXyz(); - /* 80967318 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.cpp b/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.cpp index 0305fc660fc..c305fbe2e89 100644 --- a/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.cpp +++ b/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -51,6 +51,14 @@ struct daNpc_Len_c { /* 80A660D8 */ void checkStartDemo13StbEvt(fopAc_ac_c*, f32, f32, f32, f32, f32, f32, f32); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -59,14 +67,6 @@ struct daNpcT_MotionSeqMngr_c { /* 8053DDB8 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Besu_c { /* 80536E4C */ ~daNpc_Besu_c(); /* 8053701C */ void create(); @@ -145,12 +145,17 @@ struct daNpc_Besu_Param_c { static u8 const m[144]; }; +struct csXyz { + /* 8053D760 */ ~csXyz(); + /* 8053DCB4 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -159,12 +164,7 @@ struct cXyz { /* 8053DDB4 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 8053D760 */ ~csXyz(); - /* 8053DCB4 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.cpp b/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.cpp index 69a0d04b2cd..80c5675a62e 100644 --- a/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.cpp +++ b/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.cpp @@ -17,12 +17,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -31,8 +33,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -106,10 +106,10 @@ struct daNpcF_ActorMngr_c { /* 8096BFD8 */ daNpcF_ActorMngr_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcBlueNS_c { /* 8096896C */ daNpcBlueNS_c(); /* 80968B80 */ ~daNpcBlueNS_c(); diff --git a/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.cpp b/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.cpp index 93908ed0c18..ae94c41912f 100644 --- a/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.cpp +++ b/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -47,6 +47,14 @@ struct daNpc_Jagar_c { /* 80A150AC */ void getType(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -54,14 +62,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80971FD0 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Bou_c { /* 8096CF8C */ ~daNpc_Bou_c(); /* 8096D0D8 */ void create(); @@ -125,13 +125,18 @@ struct daNpc_Bou_Param_c { static u8 const m[156]; }; +struct csXyz { + /* 80971930 */ ~csXyz(); + /* 80971ECC */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -140,12 +145,7 @@ struct cXyz { /* 80971FCC */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80971930 */ ~csXyz(); - /* 80971ECC */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.cpp b/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.cpp index ccf7d084b7d..d0ea0b1eb41 100644 --- a/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.cpp +++ b/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.cpp @@ -37,12 +37,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -65,16 +65,16 @@ struct daNpcWrestler_c { /* 80B301BC */ void checkStartUp(); }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -137,10 +137,10 @@ struct daNpcF_ActorMngr_c { /* 80977C08 */ daNpcF_ActorMngr_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcBouS_c { /* 8097354C */ daNpcBouS_c(); /* 80973760 */ ~daNpcBouS_c(); diff --git a/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.cpp b/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.cpp index 76515503dbd..700cae4ca4f 100644 --- a/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.cpp +++ b/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.cpp @@ -202,10 +202,10 @@ struct dSv_danBit_c { /* 80034B98 */ void onSwitch(int); }; -struct dKy_tevstr_c {}; - struct J3DModelData {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); }; diff --git a/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.cpp b/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.cpp index 40661288678..eb14a46d397 100644 --- a/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.cpp +++ b/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.cpp @@ -38,11 +38,11 @@ struct mDoExt_morf_c { /* 8000FB7C */ void setMorf(f32); }; -struct J3DAnmTexPattern {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmTexPattern {}; struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); @@ -62,16 +62,16 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -127,12 +127,12 @@ struct daNpcF_ActorMngr_c { /* 80985C9C */ daNpcF_ActorMngr_c(); }; +struct J3DJoint {}; + struct _GXColorS10 {}; struct J3DModel {}; -struct J3DJoint {}; - struct daNpcChat_c { /* 8098084C */ daNpcChat_c(); /* 80980A60 */ ~daNpcChat_c(); diff --git a/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.cpp b/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.cpp index ac91b3e69e2..389af470442 100644 --- a/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.cpp +++ b/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.cpp @@ -55,12 +55,12 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -80,14 +80,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -148,11 +148,11 @@ struct daNpcF_ActorMngr_c { /* 80990F14 */ daNpcF_ActorMngr_c(); }; -struct dKy_tevstr_c {}; +struct J3DModel {}; struct J3DJoint {}; -struct J3DModel {}; +struct dKy_tevstr_c {}; struct daNpcChin_c { struct _SpotLight_c { diff --git a/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.cpp b/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.cpp index f6dab730873..229b4e578c9 100644 --- a/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.cpp +++ b/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.cpp @@ -25,19 +25,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -49,6 +49,14 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -57,14 +65,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80994F78 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_clerkA_c { /* 8099252C */ ~daNpc_clerkA_c(); /* 8099266C */ void create(); @@ -122,10 +122,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); diff --git a/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.cpp b/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.cpp index e243249e696..3b44becb771 100644 --- a/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.cpp +++ b/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.cpp @@ -41,19 +41,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -66,15 +66,6 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct daNpcT_MotionSeqMngr_c { - struct sequenceStepData_c {}; - - /* 80145898 */ void initialize(); - /* 8099907C */ ~daNpcT_MotionSeqMngr_c(); -}; - -struct daNpcT_motionAnmData_c {}; - struct dMsgFlow_c { /* 80249F00 */ dMsgFlow_c(); /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); @@ -86,6 +77,15 @@ struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_evtData_c {}; +struct daNpcT_motionAnmData_c {}; + +struct daNpcT_MotionSeqMngr_c { + struct sequenceStepData_c {}; + + /* 80145898 */ void initialize(); + /* 8099907C */ ~daNpcT_MotionSeqMngr_c(); +}; + struct daNpc_clerkB_c { /* 80995F2C */ ~daNpc_clerkB_c(); /* 80996090 */ void create(); @@ -147,10 +147,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); diff --git a/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.cpp b/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.cpp index a22d5657392..a7bc453099f 100644 --- a/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.cpp +++ b/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.cpp @@ -25,19 +25,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -55,6 +55,8 @@ struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_evtData_c {}; +struct J3DJoint {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -67,11 +69,9 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; -struct J3DJoint {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.cpp b/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.cpp index e19c20b35df..214a4b7e1ab 100644 --- a/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.cpp +++ b/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.cpp @@ -57,12 +57,12 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -99,10 +99,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); @@ -124,12 +124,12 @@ struct daNpcTheB_c { /* 80AFD5F0 */ void getHandPos2(int); }; -struct J3DModel {}; - struct SVec {}; struct J3DJoint {}; +struct J3DModel {}; + struct daNpcCoach_c { /* 8099DA60 */ void hitFireArrow(cXyz); /* 8099DBA4 */ void deleteFireArrow(unsigned int); diff --git a/rel/d/a/npc/d_a_npc_df/d_a_npc_df.cpp b/rel/d/a/npc/d_a_npc_df/d_a_npc_df.cpp index c3836d7f6b2..13bd267eac0 100644 --- a/rel/d/a/npc/d_a_npc_df/d_a_npc_df.cpp +++ b/rel/d/a/npc/d_a_npc_df/d_a_npc_df.cpp @@ -37,10 +37,10 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); diff --git a/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.cpp b/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.cpp index 349c6b4cd14..34fb704efca 100644 --- a/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.cpp +++ b/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +59,6 @@ struct daNpcT_MotionSeqMngr_c { /* 809A9B74 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Doc_c { /* 809A6C8C */ ~daNpc_Doc_c(); /* 809A6DC0 */ void create(); @@ -113,13 +113,18 @@ struct daNpc_Doc_Param_c { static u8 const m[144]; }; +struct csXyz { + /* 809A9510 */ ~csXyz(); + /* 809A9A28 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -128,12 +133,7 @@ struct cXyz { /* 809A9B28 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 809A9510 */ ~csXyz(); - /* 809A9A28 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -232,14 +232,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 809A9BBC */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.cpp b/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.cpp index c53aedb3f01..c5a60ba6e2e 100644 --- a/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.cpp +++ b/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.cpp @@ -17,16 +17,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -39,12 +39,12 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DAnmTransformKey {}; + struct _GXColorS10 {}; struct J3DAnmTexPattern {}; -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -108,10 +108,10 @@ struct daNpcF_ActorMngr_c { /* 809AD118 */ daNpcF_ActorMngr_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcDoorBoy_c { /* 809AAC8C */ daNpcDoorBoy_c(); /* 809AAEA0 */ ~daNpcDoorBoy_c(); diff --git a/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.cpp b/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.cpp index 57394479153..ef48f0c6097 100644 --- a/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.cpp +++ b/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.cpp @@ -17,12 +17,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -31,8 +33,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -49,10 +49,10 @@ struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; -struct _GXColorS10 {}; - struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_du/d_a_npc_du.cpp b/rel/d/a/npc/d_a_npc_du/d_a_npc_du.cpp index 97a6d6dbfb0..18cde658c31 100644 --- a/rel/d/a/npc/d_a_npc_du/d_a_npc_du.cpp +++ b/rel/d/a/npc/d_a_npc_du/d_a_npc_du.cpp @@ -34,11 +34,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, diff --git a/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.cpp b/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.cpp index f891fd94a38..ea16e9b2fd5 100644 --- a/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.cpp +++ b/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.cpp @@ -38,12 +38,14 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -52,8 +54,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -70,6 +70,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -77,14 +85,6 @@ struct daNpcT_MotionSeqMngr_c { /* 809B88E8 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Fairy_c { /* 809B228C */ ~daNpc_Fairy_c(); /* 809B2430 */ void Create(); @@ -197,14 +197,16 @@ struct daNpc_Fairy_Param_c { static u8 const m[148]; }; +struct J3DAnmColor {}; + +struct J3DAnmTransformKey {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - -struct J3DAnmColor {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -212,9 +214,7 @@ struct cXyz { /* 809B889C */ cXyz(); }; -struct _GXColorS10 {}; - -struct J3DAnmTransformKey {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -339,14 +339,14 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 809B8930 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.cpp b/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.cpp index 1c13f8e28ea..df0780c43f2 100644 --- a/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.cpp +++ b/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.cpp @@ -20,8 +20,12 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_evtData_c {}; +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -29,10 +33,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80541898 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_motionAnmData_c {}; - struct daNpc_FairySeirei_c { /* 8053FF6C */ ~daNpc_FairySeirei_c(); /* 8054006C */ void create(); @@ -72,14 +72,14 @@ struct daNpc_FairySeirei_Param_c { static u8 const m[148]; }; -struct J3DModel {}; +struct J3DJoint {}; struct cXyz { /* 805412D0 */ ~cXyz(); /* 8054184C */ cXyz(); }; -struct J3DJoint {}; +struct J3DModel {}; struct daNpcT_c { /* 8014852C */ void execute(); @@ -152,8 +152,6 @@ struct daNpcT_ActorMngr_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; struct csXyz { @@ -161,6 +159,8 @@ struct csXyz { /* 8054174C */ csXyz(); }; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); diff --git a/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp b/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp index 5716b7dd957..4d1b3263086 100644 --- a/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp +++ b/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp @@ -101,12 +101,12 @@ struct dBgS_AcchCir { /* 809BB31C */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct cXyz { /* 809BB2E0 */ ~cXyz(); }; -struct dBgS {}; - struct csXyz { /* 809BB0D0 */ ~csXyz(); }; diff --git a/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.cpp b/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.cpp index a01e30ff80e..19c8767f615 100644 --- a/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.cpp +++ b/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +58,6 @@ struct daNpcT_MotionSeqMngr_c { /* 809BDC98 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Gnd_c { /* 809BB60C */ ~daNpc_Gnd_c(); /* 809BB730 */ void create(); @@ -109,12 +109,16 @@ struct daNpc_Gnd_Param_c { static u8 const m[140]; }; +struct J3DAnmColor {}; + +struct J3DAnmTevRegKey {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -122,11 +126,7 @@ struct cXyz { /* 809BDC4C */ cXyz(); }; -struct J3DAnmColor {}; - -struct _GXColorS10 {}; - -struct J3DAnmTevRegKey {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.cpp b/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.cpp index 14d4b1a00da..f99c5d5e97b 100644 --- a/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.cpp +++ b/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.cpp @@ -41,12 +41,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -76,10 +76,10 @@ struct daTagGra_c { /* 809C9D0C */ void getGraPos(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_grA_c { struct daNpc_GrA_prtclMngr_c { /* 809BEB24 */ ~daNpc_GrA_prtclMngr_c(); @@ -178,20 +178,20 @@ struct daNpcT_ActorMngr_c { /* 80145708 */ void getActorP(); }; -struct J3DAnmTextureSRTKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct _GXColorS10 {}; - struct J3DAnmTexPattern {}; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -287,12 +287,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; -struct _GXColor {}; - struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -306,6 +306,8 @@ struct dPa_control_c { cXyz const*); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); @@ -313,8 +315,6 @@ struct dBgS_AcchCir { /* 809C98F8 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.cpp b/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.cpp index d4f0ff7074b..c79f513bfe3 100644 --- a/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.cpp +++ b/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.cpp @@ -23,12 +23,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -49,10 +49,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_grC_c { /* 809CB4CC */ daNpc_grC_c(); /* 809CB6E0 */ ~daNpc_grC_c(); @@ -108,25 +108,25 @@ struct daNpc_grC_Param_c { static u8 const m[108]; }; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct J3DAnmTextureSRTKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct _GXColorS10 {}; - struct J3DAnmTexPattern {}; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -201,6 +201,8 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); @@ -208,8 +210,6 @@ struct dBgS_AcchCir { /* 809CF274 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.cpp b/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.cpp index bb6ad241b1b..8df956c4d1f 100644 --- a/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.cpp +++ b/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.cpp @@ -33,12 +33,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -57,10 +57,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_Grd_c { /* 809CFD2C */ daNpc_Grd_c(); /* 809CFF40 */ ~daNpc_Grd_c(); @@ -112,27 +112,27 @@ struct daNpc_Grd_Param_c { static u8 const m[108]; }; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct J3DAnmTextureSRTKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.cpp b/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.cpp index 9b335775aef..a6fec7edc23 100644 --- a/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.cpp +++ b/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -28,8 +30,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -41,6 +41,14 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -48,14 +56,6 @@ struct daNpcT_MotionSeqMngr_c { /* 809D66EC */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_grM_c { /* 809D406C */ ~daNpc_grM_c(); /* 809D4194 */ void create(); @@ -116,7 +116,7 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -124,7 +124,7 @@ struct cXyz { /* 809D66A0 */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.cpp b/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.cpp index dc684720422..0d3db9921ff 100644 --- a/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.cpp +++ b/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -28,8 +30,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -41,6 +41,14 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -48,14 +56,6 @@ struct daNpcT_MotionSeqMngr_c { /* 809D9728 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_grMC_c { /* 809D740C */ ~daNpc_grMC_c(); /* 809D7534 */ void create(); @@ -114,7 +114,7 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -122,7 +122,7 @@ struct cXyz { /* 809D96DC */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.cpp b/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.cpp index 88567c2d8d6..189562920e1 100644 --- a/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.cpp +++ b/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.cpp @@ -34,12 +34,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -58,10 +58,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_grO_c { /* 809DA56C */ daNpc_grO_c(); /* 809DA780 */ ~daNpc_grO_c(); @@ -120,27 +120,27 @@ struct daNpc_Maro_c { /* 80562CA4 */ void choccai(void*); }; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct J3DAnmTextureSRTKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.cpp b/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.cpp index 7bee3d9006e..b5532943f8c 100644 --- a/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.cpp +++ b/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.cpp @@ -33,12 +33,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -57,10 +57,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_grR_c { /* 809DF8CC */ daNpc_grR_c(); /* 809DFAE0 */ ~daNpc_grR_c(); @@ -112,27 +112,27 @@ struct daNpc_grR_Param_c { static u8 const m[108]; }; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct J3DAnmTextureSRTKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.cpp b/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.cpp index 30891499809..1e6cc4cea62 100644 --- a/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.cpp +++ b/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.cpp @@ -33,12 +33,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -57,10 +57,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_grS_c { /* 809E40CC */ daNpc_grS_c(); /* 809E42E0 */ ~daNpc_grS_c(); @@ -113,27 +113,27 @@ struct daNpc_grS_Param_c { static u8 const m[108]; }; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct J3DAnmTextureSRTKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.cpp b/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.cpp index 71cc57cd313..727d31df5a3 100644 --- a/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.cpp +++ b/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.cpp @@ -29,13 +29,13 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DAnmTexPattern { - /* 8032AF50 */ void getTexNo(u16, u16*) const; -}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmTexPattern { + /* 8032AF50 */ void getTexNo(u16, u16*) const; +}; struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); @@ -61,12 +61,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -92,10 +92,10 @@ struct fopAcM_gc_c { static f32 mGroundY; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_Grz_c { struct daNpc_GrZ_prtclMngr_c { /* 809E8658 */ ~daNpc_GrZ_prtclMngr_c(); @@ -164,11 +164,6 @@ struct daNpc_Grz_Param_c { static u8 const m[128]; }; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { @@ -177,6 +172,11 @@ struct dCcD_Cyl { struct J3DAnmTransformKey {}; +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -284,12 +284,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; -struct _GXColor {}; - struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -303,6 +303,8 @@ struct dPa_control_c { cXyz const*); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); @@ -310,8 +312,6 @@ struct dBgS_AcchCir { /* 809EEE94 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.cpp b/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.cpp index 57dc98eee52..306a631614f 100644 --- a/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.cpp +++ b/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.cpp @@ -94,10 +94,10 @@ struct daNpcCd2_c { static u8 const m_cylDat[68]; }; -struct dKy_tevstr_c {}; - struct J3DModelData {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); }; diff --git a/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.cpp b/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.cpp index ef9ff32a507..426c2746d58 100644 --- a/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.cpp +++ b/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.cpp @@ -34,13 +34,13 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DAnmTexPattern { - /* 8032AF50 */ void getTexNo(u16, u16*) const; -}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmTexPattern { + /* 8032AF50 */ void getTexNo(u16, u16*) const; +}; struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); @@ -66,12 +66,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -97,16 +97,16 @@ struct fopAcM_gc_c { static f32 mGroundY; }; -struct _GXColorS10 {}; - -struct J3DModel {}; - -struct J3DJoint {}; - struct dBgS_ObjAcch { /* 809F828C */ ~dBgS_ObjAcch(); }; +struct J3DJoint {}; + +struct _GXColorS10 {}; + +struct J3DModel {}; + struct daNpc_GWolf_c { /* 809F30AC */ daNpc_GWolf_c(); /* 809F32C0 */ ~daNpc_GWolf_c(); @@ -164,11 +164,6 @@ struct daNpc_GWolf_Param_c { static u8 const m[140]; }; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { @@ -177,6 +172,11 @@ struct dCcD_Cyl { struct J3DAnmTransformKey {}; +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.cpp b/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.cpp index 6e51d5d0759..af8b8b6a3ae 100644 --- a/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.cpp +++ b/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.cpp @@ -34,20 +34,20 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -65,6 +65,14 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -73,14 +81,6 @@ struct daNpcT_MotionSeqMngr_c { /* 809FF8BC */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Hanjo_c { /* 809F908C */ ~daNpc_Hanjo_c(); /* 809F9278 */ void create(); @@ -168,10 +168,10 @@ struct dCcD_GObjInf { /* 800846F0 */ void GetCoHitObj(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); @@ -300,14 +300,14 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 809FF904 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp b/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp index 0a616d5bd61..047770553d1 100644 --- a/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp +++ b/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp @@ -49,10 +49,10 @@ struct mDoExt_btkAnm { /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9E8 */ void entryJoint(J3DModelData*, u16, f32); diff --git a/rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz.cpp b/rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz.cpp index 774456c3045..0b72153eb0e 100644 --- a/rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz.cpp +++ b/rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -52,6 +52,14 @@ struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -59,14 +67,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80A05DF0 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Hoz_c { /* 80A0150C */ ~daNpc_Hoz_c(); /* 80A01658 */ void create(); @@ -138,7 +138,7 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -146,7 +146,7 @@ struct cXyz { /* 80A05DEC */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.cpp b/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.cpp index 854c9973813..9f226ef68fb 100644 --- a/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.cpp +++ b/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.cpp @@ -33,12 +33,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -64,10 +64,10 @@ struct fopAcM_gc_c { static f32 mGroundY; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcImpal_c { /* 80A079EC */ daNpcImpal_c(); /* 80A07C00 */ ~daNpcImpal_c(); @@ -108,16 +108,16 @@ struct daNpcImpal_Param_c { static u8 const m[112]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp b/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp index 76d7297126d..58a6055e67f 100644 --- a/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp +++ b/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp @@ -25,11 +25,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, diff --git a/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.cpp b/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.cpp index 76229c19c6a..35acfa2710a 100644 --- a/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.cpp +++ b/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.cpp @@ -30,12 +30,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -57,14 +57,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DModel {}; +struct J3DJoint {}; struct cXyz { /* 80A136EC */ ~cXyz(); /* 80A13728 */ cXyz(); }; -struct J3DJoint {}; +struct J3DModel {}; struct daNpcIns_c { /* 80A0E24C */ daNpcIns_c(); @@ -116,16 +116,16 @@ struct daNpcIns_Param_c { static u8 const m[112]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.cpp b/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.cpp index c5facd6c244..40d59a0222b 100644 --- a/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.cpp +++ b/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +58,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80A19A8C */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Jagar_c { /* 80A1470C */ ~daNpc_Jagar_c(); /* 80A14858 */ void create(); @@ -130,13 +130,18 @@ struct daNpc_Bou_Param_c { static u8 const m[156]; }; +struct csXyz { + /* 80A193EC */ ~csXyz(); + /* 80A19988 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -145,12 +150,7 @@ struct cXyz { /* 80A19A88 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80A193EC */ ~csXyz(); - /* 80A19988 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -259,14 +259,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80A19AD4 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp b/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp index 35d734eb18d..e965c89837f 100644 --- a/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp +++ b/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp @@ -17,19 +17,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -42,6 +42,16 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct J3DModel {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -49,16 +59,6 @@ struct daNpcT_MotionSeqMngr_c { /* 8054E460 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DModel {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Kakashi_c { /* 8054B36C */ ~daNpc_Kakashi_c(); /* 8054B4E8 */ void create(); @@ -111,6 +111,11 @@ struct daNpc_Kakashi_Param_c { static u8 const m[152]; }; +struct csXyz { + /* 8054DED8 */ ~csXyz(); + /* 8054E8F8 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); @@ -119,18 +124,13 @@ struct dCcD_GObjInf { /* 800845B0 */ void getHitSeID(u8, int); }; +struct _GXColorS10 {}; + struct cXyz { /* 8054DDD0 */ ~cXyz(); /* 8054E414 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 8054DED8 */ ~csXyz(); - /* 8054E8F8 */ csXyz(); -}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -222,10 +222,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.cpp b/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.cpp index 9a6f5b17977..6b94323587f 100644 --- a/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.cpp @@ -29,16 +29,16 @@ struct mDoExt_morf_c { /* 8000FB7C */ void setMorf(f32); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -85,16 +85,14 @@ struct daNpcKasi_Mng_c { /* 80A2065C */ void getCenterPos(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DAnmTransformKey {}; + struct _GXColorS10 {}; struct J3DAnmTexPattern {}; -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -132,6 +130,8 @@ struct daNpcF_c { static u8 mCcDCyl[68]; }; +struct J3DModel {}; + struct daNpcKasiHana_c { /* 80A1BE44 */ daNpcKasiHana_c(); /* 80A1C0A4 */ ~daNpcKasiHana_c(); diff --git a/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.cpp b/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.cpp index b5b666f28f6..e97d79c0e6f 100644 --- a/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.cpp @@ -28,16 +28,16 @@ struct mDoExt_morf_c { /* 8000FB7C */ void setMorf(f32); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -50,7 +50,7 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DModel {}; +struct J3DJoint {}; struct Vec {}; @@ -60,14 +60,12 @@ struct cXyz { /* 80A251B0 */ cXyz(); }; -struct J3DJoint {}; +struct J3DAnmTransformKey {}; struct _GXColorS10 {}; struct J3DAnmTexPattern {}; -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -101,6 +99,8 @@ struct daNpcF_c { static u8 mCcDCyl[68]; }; +struct J3DModel {}; + struct daNpcKasiKyu_c { /* 80A219CC */ daNpcKasiKyu_c(); /* 80A21C14 */ ~daNpcKasiKyu_c(); diff --git a/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.cpp b/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.cpp index 428fdd1190f..59d23b84f5b 100644 --- a/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.cpp @@ -28,16 +28,16 @@ struct mDoExt_morf_c { /* 8000FB7C */ void setMorf(f32); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -50,7 +50,7 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DModel {}; +struct J3DJoint {}; struct Vec {}; @@ -60,14 +60,12 @@ struct cXyz { /* 80A29944 */ cXyz(); }; -struct J3DJoint {}; +struct J3DAnmTransformKey {}; struct _GXColorS10 {}; struct J3DAnmTexPattern {}; -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -101,6 +99,8 @@ struct daNpcF_c { static u8 mCcDCyl[68]; }; +struct J3DModel {}; + struct daNpcKasiMich_c { /* 80A261CC */ daNpcKasiMich_c(); /* 80A26414 */ ~daNpcKasiMich_c(); diff --git a/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.cpp b/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.cpp index 62fae9d5cca..1f43b6b5794 100644 --- a/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.cpp +++ b/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +59,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80552C04 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Kkri_c { /* 8054F3AC */ ~daNpc_Kkri_c(); /* 8054F4F8 */ void create(); @@ -114,12 +114,17 @@ struct daNpc_Kkri_Param_c { static u8 const m[140]; }; +struct csXyz { + /* 80552564 */ ~csXyz(); + /* 80552B00 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -128,12 +133,7 @@ struct cXyz { /* 80552C00 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80552564 */ ~csXyz(); - /* 80552B00 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.cpp b/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.cpp index be617626f40..c0017b7ec7a 100644 --- a/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.cpp +++ b/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.cpp @@ -50,13 +50,13 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DAnmColor {}; - -struct J3DAnmTexPattern {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmColor {}; + +struct J3DAnmTexPattern {}; struct J3DMaterialTable { /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); @@ -83,10 +83,10 @@ struct mDoExt_bpkAnm { /* 8000D518 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); @@ -97,10 +97,10 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct mDoExt_McaMorfCallBack2_c {}; - struct mDoExt_McaMorfCallBack1_c {}; +struct mDoExt_McaMorfCallBack2_c {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -133,6 +133,21 @@ struct daPy_py_c { /* 8015F3FC */ void getAttentionOffsetY(); }; +struct J3DFrameCtrl { + /* 803283FC */ void init(s16); + /* 80A3C62C */ ~J3DFrameCtrl(); +}; + +struct daNpcT_motionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct J3DAnmTransformKey {}; + +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -149,23 +164,8 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; -struct daNpcT_evtData_c {}; - struct _GXColorS10 {}; -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80A3C62C */ ~J3DFrameCtrl(); -}; - -struct J3DJoint {}; - -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct J3DAnmTransformKey {}; - struct daNpc_Kn_c { struct daNpc_Kn_prtclMngr_c { /* 80A2AF98 */ ~daNpc_Kn_prtclMngr_c(); @@ -421,12 +421,6 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80A3C4F0 */ ~dBgS_AcchCir(); -}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; @@ -437,6 +431,12 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F40 */ void SetWallR(f32); + /* 80A3C4F0 */ ~dBgS_AcchCir(); +}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.cpp b/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.cpp index b3fd774ab9d..ecf2128fa74 100644 --- a/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.cpp +++ b/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.cpp @@ -11,12 +11,14 @@ // Types: // +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -25,8 +27,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -40,6 +40,12 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -47,12 +53,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80A4511C */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Knj_c { /* 80A4356C */ ~daNpc_Knj_c(); /* 80A43608 */ void create(); @@ -95,20 +95,20 @@ struct daNpc_Knj_Param_c { static u8 const m[140]; }; -struct J3DModel {}; +struct J3DJoint {}; + +struct J3DAnmTexPattern {}; + +struct J3DAnmTevRegKey {}; + +struct _GXColorS10 {}; struct cXyz { /* 80A44B54 */ ~cXyz(); /* 80A450D0 */ cXyz(); }; -struct _GXColorS10 {}; - -struct J3DJoint {}; - -struct J3DAnmTexPattern {}; - -struct J3DAnmTevRegKey {}; +struct J3DModel {}; struct daNpcT_c { /* 801480D0 */ void getTexPtrnAnmP(char const*, int); diff --git a/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.cpp b/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.cpp index a2f6e1a6215..1a438b358e4 100644 --- a/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.cpp +++ b/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.cpp @@ -26,20 +26,20 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -61,6 +61,14 @@ struct daNpc_Len_c { /* 80A660D8 */ void checkStartDemo13StbEvt(fopAc_ac_c*, f32, f32, f32, f32, f32, f32, f32); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -69,14 +77,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80559C18 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Kolin_c { /* 80553FEC */ ~daNpc_Kolin_c(); /* 80554138 */ void create(); @@ -148,20 +148,20 @@ struct daNpc_Kolin_Param_c { static u8 const m[160]; }; +struct csXyz { + /* 80559578 */ ~csXyz(); + /* 80559B14 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; - struct _GXColorS10 {}; -struct csXyz { - /* 80559578 */ ~csXyz(); - /* 80559B14 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -277,14 +277,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80559C60 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.cpp b/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.cpp index a77c9cd6f4f..bd556e8995f 100644 --- a/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.cpp +++ b/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +58,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80A48184 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Kolinb_c { /* 80A4598C */ ~daNpc_Kolinb_c(); /* 80A45ADC */ void create(); @@ -112,12 +112,17 @@ struct daNpc_Kolinb_Param_c { static u8 const m[140]; }; +struct csXyz { + /* 80A47B20 */ ~csXyz(); + /* 80A48038 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -125,12 +130,7 @@ struct cXyz { /* 80A48138 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80A47B20 */ ~csXyz(); - /* 80A48038 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp b/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp index 00d58db681f..48ed9f0109d 100644 --- a/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp +++ b/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp @@ -39,12 +39,14 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -52,8 +54,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.cpp b/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.cpp index b265fa2c506..332fdb576d7 100644 --- a/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.cpp +++ b/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +58,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80A630D4 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Kyury_c { /* 80A600CC */ ~daNpc_Kyury_c(); /* 80A60218 */ void create(); @@ -115,7 +115,7 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -124,7 +124,7 @@ struct cXyz { /* 80A630D0 */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_len/d_a_npc_len.cpp b/rel/d/a/npc/d_a_npc_len/d_a_npc_len.cpp index 2763c6381e3..82bed04176f 100644 --- a/rel/d/a/npc/d_a_npc_len/d_a_npc_len.cpp +++ b/rel/d/a/npc/d_a_npc_len/d_a_npc_len.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -47,6 +47,14 @@ struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -54,14 +62,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80A68604 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Len_c { /* 80A6432C */ ~daNpc_Len_c(); /* 80A64478 */ void create(); @@ -120,13 +120,18 @@ struct daNpc_Len_Param_c { static u8 const m[148]; }; +struct csXyz { + /* 80A67F64 */ ~csXyz(); + /* 80A68500 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -135,12 +140,7 @@ struct cXyz { /* 80A68600 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80A67F64 */ ~csXyz(); - /* 80A68500 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -244,14 +244,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80A6864C */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.cpp b/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.cpp index 1c36e668830..154572504af 100644 --- a/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.cpp +++ b/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -47,6 +47,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -55,14 +63,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80A6F518 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Lud_c { /* 80A6ABAC */ ~daNpc_Lud_c(); /* 80A6ACF4 */ void create(); @@ -130,13 +130,18 @@ struct daNpc_Len_c { /* 80A660D8 */ void checkStartDemo13StbEvt(fopAc_ac_c*, f32, f32, f32, f32, f32, f32, f32); }; +struct csXyz { + /* 80A6EEC0 */ ~csXyz(); + /* 80A6F414 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -145,12 +150,7 @@ struct cXyz { /* 80A6F514 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80A6EEC0 */ ~csXyz(); - /* 80A6F414 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.cpp b/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.cpp index 85a42c9df2d..ca365b30620 100644 --- a/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.cpp +++ b/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.cpp @@ -27,19 +27,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -60,6 +60,14 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -67,14 +75,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80563F14 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Maro_c { /* 8055B58C */ ~daNpc_Maro_c(); /* 8055B6E0 */ void create(); @@ -159,19 +159,19 @@ struct daNpc_Len_c { /* 80A660D8 */ void checkStartDemo13StbEvt(fopAc_ac_c*, f32, f32, f32, f32, f32, f32, f32); }; +struct csXyz { + /* 805639D0 */ ~csXyz(); + /* 80563E10 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; -struct csXyz { - /* 805639D0 */ ~csXyz(); - /* 80563E10 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.cpp b/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.cpp index b4b97236138..fbad28405fa 100644 --- a/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.cpp +++ b/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -44,6 +44,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +59,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80A731A4 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_midP_c { /* 80A70C6C */ ~daNpc_midP_c(); /* 80A70D90 */ void create(); @@ -116,7 +116,7 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -124,7 +124,7 @@ struct cXyz { /* 80A73158 */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.cpp b/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.cpp index fae374c6395..9231058c3bd 100644 --- a/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.cpp +++ b/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,15 +43,7 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct daNpcT_MotionSeqMngr_c { - struct sequenceStepData_c {}; - - /* 80145898 */ void initialize(); - /* 80145A24 */ void checkEndSequence(); - /* 80A7A5C8 */ ~daNpcT_MotionSeqMngr_c(); -}; - -struct daNpcT_motionAnmData_c {}; +struct J3DJoint {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -60,12 +52,20 @@ struct cXyz { /* 80A7A5C4 */ cXyz(); }; -struct J3DJoint {}; - struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_evtData_c {}; +struct daNpcT_motionAnmData_c {}; + +struct daNpcT_MotionSeqMngr_c { + struct sequenceStepData_c {}; + + /* 80145898 */ void initialize(); + /* 80145A24 */ void checkEndSequence(); + /* 80A7A5C8 */ ~daNpcT_MotionSeqMngr_c(); +}; + struct daNpc_Moi_c { /* 80A73F4C */ ~daNpc_Moi_c(); /* 80A74150 */ void create(); @@ -144,6 +144,11 @@ struct daNpc_Moi_Param_c { static u8 const m[188]; }; +struct csXyz { + /* 80A79EA8 */ ~csXyz(); + /* 80A7AE08 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); @@ -151,14 +156,9 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; - struct _GXColorS10 {}; -struct csXyz { - /* 80A79EA8 */ ~csXyz(); - /* 80A7AE08 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -280,14 +280,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80A7A610 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.cpp b/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.cpp index 7a8445c6fad..267e38af18f 100644 --- a/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.cpp +++ b/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.cpp @@ -23,12 +23,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -50,10 +50,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcMoiR_c { /* 80A7C16C */ daNpcMoiR_c(); /* 80A7C380 */ ~daNpcMoiR_c(); @@ -102,16 +102,16 @@ struct daNpcMoiR_Param_c { static u8 const m[116]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.cpp b/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.cpp index 615abab2dfe..e91313344e7 100644 --- a/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.cpp +++ b/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.cpp @@ -28,19 +28,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -102,24 +102,24 @@ struct daNpc_myna2_Param_c { static u8 const m[116]; }; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084658 */ void ChkCoHit(); -}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct _GXColorS10 {}; - struct J3DAnmTexPattern {}; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); + /* 80084658 */ void ChkCoHit(); +}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp b/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp index aa68f141811..9885e75a1fc 100644 --- a/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp +++ b/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp @@ -44,11 +44,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, diff --git a/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.cpp b/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.cpp index d93a9a7345a..9b6fdf9ee4a 100644 --- a/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,15 +43,7 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct daNpcT_MotionSeqMngr_c { - struct sequenceStepData_c {}; - - /* 80145898 */ void initialize(); - /* 80145A24 */ void checkEndSequence(); - /* 80A961D4 */ ~daNpcT_MotionSeqMngr_c(); -}; - -struct daNpcT_motionAnmData_c {}; +struct J3DJoint {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -59,12 +51,20 @@ struct cXyz { /* 80A961D0 */ cXyz(); }; -struct J3DJoint {}; - struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_evtData_c {}; +struct daNpcT_motionAnmData_c {}; + +struct daNpcT_MotionSeqMngr_c { + struct sequenceStepData_c {}; + + /* 80145898 */ void initialize(); + /* 80145A24 */ void checkEndSequence(); + /* 80A961D4 */ ~daNpcT_MotionSeqMngr_c(); +}; + struct daNpc_Pachi_Besu_c { /* 80A92D6C */ ~daNpc_Pachi_Besu_c(); /* 80A92EA4 */ void create(); @@ -155,10 +155,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); diff --git a/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.cpp b/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.cpp index f52167818d4..8e871eb7378 100644 --- a/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,14 +43,7 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct daNpcT_MotionSeqMngr_c { - struct sequenceStepData_c {}; - - /* 80145898 */ void initialize(); - /* 80A9B054 */ ~daNpcT_MotionSeqMngr_c(); -}; - -struct daNpcT_motionAnmData_c {}; +struct J3DJoint {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -58,12 +51,19 @@ struct cXyz { /* 80A9B050 */ cXyz(); }; -struct J3DJoint {}; - struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_evtData_c {}; +struct daNpcT_motionAnmData_c {}; + +struct daNpcT_MotionSeqMngr_c { + struct sequenceStepData_c {}; + + /* 80145898 */ void initialize(); + /* 80A9B054 */ ~daNpcT_MotionSeqMngr_c(); +}; + struct daNpc_Pachi_Maro_c { /* 80A97C8C */ ~daNpc_Pachi_Maro_c(); /* 80A97DC4 */ void create(); @@ -156,10 +156,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); diff --git a/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.cpp b/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.cpp index 1ea2d169c67..51ba83ddac5 100644 --- a/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,15 +43,7 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct daNpcT_MotionSeqMngr_c { - struct sequenceStepData_c {}; - - /* 80145898 */ void initialize(); - /* 80145A24 */ void checkEndSequence(); - /* 80AA0D74 */ ~daNpcT_MotionSeqMngr_c(); -}; - -struct daNpcT_motionAnmData_c {}; +struct J3DJoint {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -59,12 +51,20 @@ struct cXyz { /* 80AA0D70 */ cXyz(); }; -struct J3DJoint {}; - struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_evtData_c {}; +struct daNpcT_motionAnmData_c {}; + +struct daNpcT_MotionSeqMngr_c { + struct sequenceStepData_c {}; + + /* 80145898 */ void initialize(); + /* 80145A24 */ void checkEndSequence(); + /* 80AA0D74 */ ~daNpcT_MotionSeqMngr_c(); +}; + struct daNpc_Pachi_Taro_c { /* 80A9C28C */ ~daNpc_Pachi_Taro_c(); /* 80A9C3C4 */ void create(); @@ -173,10 +173,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); diff --git a/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.cpp b/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.cpp index 4fe27244444..bcd6440988e 100644 --- a/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.cpp +++ b/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.cpp @@ -186,12 +186,12 @@ struct dBgS_AcchCir { /* 80AA68A0 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct cXyz { /* 80AA6654 */ ~cXyz(); }; -struct dBgS {}; - struct csXyz { /* 80AA6690 */ ~csXyz(); }; diff --git a/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.cpp b/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.cpp index cff6e0bbe69..e84c18e370c 100644 --- a/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.cpp +++ b/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.cpp @@ -103,10 +103,10 @@ struct dBgS_AcchCir { /* 80AA892C */ ~dBgS_AcchCir(); }; -struct cXyz {}; - struct dBgS {}; +struct cXyz {}; + struct csXyz {}; struct dBgS_Acch { diff --git a/rel/d/a/npc/d_a_npc_post/d_a_npc_post.cpp b/rel/d/a/npc/d_a_npc_post/d_a_npc_post.cpp index 7f4a6915f80..158f1b30ed7 100644 --- a/rel/d/a/npc/d_a_npc_post/d_a_npc_post.cpp +++ b/rel/d/a/npc/d_a_npc_post/d_a_npc_post.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -59,6 +59,14 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -67,14 +75,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80AAC968 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Post_c { /* 80AA8C8C */ ~daNpc_Post_c(); /* 80AA8DE8 */ void create(); @@ -135,19 +135,19 @@ struct daNpc_Post_Param_c { static u8 const m[148]; }; +struct csXyz { + /* 80AAC2C8 */ ~csXyz(); + /* 80AAC864 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; -struct csXyz { - /* 80AAC2C8 */ ~csXyz(); - /* 80AAC864 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -252,14 +252,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80AAC9B0 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp b/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp index da1bf2f6501..7466079c628 100644 --- a/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp +++ b/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp @@ -23,12 +23,14 @@ struct mDoGph_gInf_c { static f32 mFadeRate; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -37,8 +39,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -51,6 +51,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -58,14 +66,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80AB1824 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Pouya_c { /* 80AADDAC */ ~daNpc_Pouya_c(); /* 80AADEE0 */ void create(); @@ -121,13 +121,20 @@ struct daNpc_Pouya_Param_c { static u8 const m[140]; }; +struct csXyz { + /* 80AB11C0 */ ~csXyz(); + /* 80AB16D8 */ csXyz(); +}; + +struct J3DAnmTevRegKey {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -136,14 +143,7 @@ struct cXyz { /* 80AB17D8 */ cXyz(); }; -struct _GXColorS10 {}; - -struct J3DAnmTevRegKey {}; - -struct csXyz { - /* 80AB11C0 */ ~csXyz(); - /* 80AB16D8 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.cpp b/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.cpp index 3d485f837f4..c323ede2351 100644 --- a/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.cpp +++ b/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.cpp @@ -25,16 +25,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -47,10 +47,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcPray_c { /* 80AB2DEC */ daNpcPray_c(); /* 80AB3000 */ ~daNpcPray_c(); @@ -94,10 +94,10 @@ struct daNpcPray_Param_c { static u8 const m[108]; }; -struct _GXColorS10 {}; - struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.cpp b/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.cpp index a3d7315d73c..a83ff9c3e08 100644 --- a/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.cpp +++ b/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -54,6 +54,14 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -61,14 +69,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80AB86A4 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Raca_c { /* 80AB5CAC */ ~daNpc_Raca_c(); /* 80AB5DFC */ void create(); @@ -128,10 +128,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -234,14 +234,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80AB86EC */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80AB8004 */ ~csXyz(); /* 80AB85A0 */ csXyz(); diff --git a/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.cpp b/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.cpp index bb855be5654..7043fce07c5 100644 --- a/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.cpp +++ b/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.cpp @@ -23,12 +23,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -50,10 +50,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcRafrel_c { /* 80AB962C */ daNpcRafrel_c(); /* 80AB9840 */ ~daNpcRafrel_c(); @@ -100,16 +100,16 @@ struct daNpcRafrel_Param_c { static u8 const m[116]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.cpp b/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.cpp index eba330b0be4..39b1ab6c206 100644 --- a/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.cpp +++ b/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +59,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80AC3CE8 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Saru_c { /* 80AC042C */ ~daNpc_Saru_c(); /* 80AC0578 */ void create(); @@ -112,12 +112,17 @@ struct daNpc_Saru_Param_c { static u8 const m[144]; }; +struct csXyz { + /* 80AC3648 */ ~csXyz(); + /* 80AC3BE4 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -126,12 +131,7 @@ struct cXyz { /* 80AC3CE4 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80AC3648 */ ~csXyz(); - /* 80AC3BE4 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.cpp b/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.cpp index e78175a1a26..e025f4d5a11 100644 --- a/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.cpp +++ b/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.cpp @@ -11,12 +11,14 @@ // Types: // +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -25,8 +27,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -39,6 +39,12 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -47,12 +53,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80AC6C2C */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_seiB_c { /* 80AC50EC */ ~daNpc_seiB_c(); /* 80AC5188 */ void create(); @@ -95,20 +95,20 @@ struct daNpc_seiB_Param_c { static u8 const m[148]; }; -struct J3DModel {}; +struct J3DJoint {}; + +struct J3DAnmTevRegKey {}; struct J3DAnmTextureSRTKey {}; +struct _GXColorS10 {}; + struct cXyz { /* 80AC6664 */ ~cXyz(); /* 80AC6BE0 */ cXyz(); }; -struct _GXColorS10 {}; - -struct J3DJoint {}; - -struct J3DAnmTevRegKey {}; +struct J3DModel {}; struct daNpcT_c { /* 8014810C */ void getTexSRTKeyAnmP(char const*, int); diff --git a/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.cpp b/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.cpp index ebb138ded6e..6578519343d 100644 --- a/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.cpp +++ b/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.cpp @@ -11,12 +11,14 @@ // Types: // +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -25,8 +27,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -39,6 +39,12 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -46,12 +52,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80AC8E24 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_seiC_c { /* 80AC754C */ ~daNpc_seiC_c(); /* 80AC75E8 */ void create(); @@ -94,20 +94,20 @@ struct daNpc_seiC_Param_c { static u8 const m[148]; }; -struct J3DModel {}; +struct J3DJoint {}; + +struct J3DAnmTevRegKey {}; struct J3DAnmTextureSRTKey {}; +struct _GXColorS10 {}; + struct cXyz { /* 80AC885C */ ~cXyz(); /* 80AC8DD8 */ cXyz(); }; -struct _GXColorS10 {}; - -struct J3DJoint {}; - -struct J3DAnmTevRegKey {}; +struct J3DModel {}; struct daNpcT_c { /* 8014810C */ void getTexSRTKeyAnmP(char const*, int); diff --git a/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.cpp b/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.cpp index d43535dae44..c26fb20e23e 100644 --- a/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.cpp +++ b/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.cpp @@ -11,12 +11,14 @@ // Types: // +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -25,8 +27,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -39,6 +39,12 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -46,12 +52,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80ACAF64 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_seiD_c { /* 80AC968C */ ~daNpc_seiD_c(); /* 80AC9728 */ void create(); @@ -94,20 +94,20 @@ struct daNpc_seiD_Param_c { static u8 const m[148]; }; -struct J3DModel {}; +struct J3DJoint {}; + +struct J3DAnmTevRegKey {}; struct J3DAnmTextureSRTKey {}; +struct _GXColorS10 {}; + struct cXyz { /* 80ACA99C */ ~cXyz(); /* 80ACAF18 */ cXyz(); }; -struct _GXColorS10 {}; - -struct J3DJoint {}; - -struct J3DAnmTevRegKey {}; +struct J3DModel {}; struct daNpcT_c { /* 8014810C */ void getTexSRTKeyAnmP(char const*, int); diff --git a/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.cpp b/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.cpp index bfdfc8fa405..4c7bed0c2a6 100644 --- a/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.cpp +++ b/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -28,8 +30,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -45,6 +45,14 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -53,14 +61,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80ACF47C */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Seira_c { /* 80ACB7CC */ ~daNpc_Seira_c(); /* 80ACB918 */ void create(); @@ -138,7 +138,7 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -146,7 +146,7 @@ struct cXyz { /* 80ACF478 */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.cpp b/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.cpp index cda3877b566..4af3d71ca75 100644 --- a/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.cpp +++ b/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -28,8 +30,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -45,6 +45,14 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -53,14 +61,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80AD40F4 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Seira2_c { /* 80AD0C0C */ ~daNpc_Seira2_c(); /* 80AD0D58 */ void create(); @@ -129,7 +129,7 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -137,7 +137,7 @@ struct cXyz { /* 80AD40F0 */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.cpp b/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.cpp index 4c35518715f..a0078e9d5dc 100644 --- a/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.cpp +++ b/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,12 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,12 +57,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80AD787C */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Seirei_c { /* 80AD572C */ ~daNpc_Seirei_c(); /* 80AD57C4 */ void create(); @@ -102,20 +102,20 @@ struct daNpc_Seirei_Param_c { static u8 const m[148]; }; -struct J3DModel {}; +struct J3DJoint {}; + +struct J3DAnmTevRegKey {}; struct J3DAnmTextureSRTKey {}; +struct _GXColorS10 {}; + struct cXyz { /* 80AD72B4 */ ~cXyz(); /* 80AD7830 */ cXyz(); }; -struct _GXColorS10 {}; - -struct J3DJoint {}; - -struct J3DAnmTevRegKey {}; +struct J3DModel {}; struct daNpcT_c { /* 8014810C */ void getTexSRTKeyAnmP(char const*, int); @@ -204,8 +204,6 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; struct csXyz { @@ -213,6 +211,8 @@ struct csXyz { /* 80AD7730 */ csXyz(); }; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); diff --git a/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.cpp b/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.cpp index 14d0d0d3e57..8ba1dff4022 100644 --- a/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.cpp +++ b/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.cpp @@ -33,12 +33,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -63,10 +63,10 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcShad_c { /* 80AD820C */ daNpcShad_c(); /* 80AD8420 */ ~daNpcShad_c(); @@ -123,16 +123,16 @@ struct daNpcShad_Param_c { static u8 const m[112]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.cpp b/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.cpp index eb68fab3cfe..004a9342fb4 100644 --- a/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.cpp +++ b/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +58,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80AE5E70 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Sha_c { /* 80AE2DCC */ ~daNpc_Sha_c(); /* 80AE2EEC */ void create(); @@ -126,13 +126,18 @@ struct daNpc_Sha_Param_c { static u8 const m[140]; }; +struct csXyz { + /* 80AE58E4 */ ~csXyz(); + /* 80AE5D24 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -141,12 +146,7 @@ struct cXyz { /* 80AE5E24 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80AE58E4 */ ~csXyz(); - /* 80AE5D24 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.cpp b/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.cpp index 0a0b11ac326..f60ea5efbda 100644 --- a/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.cpp +++ b/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.cpp @@ -30,16 +30,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -52,10 +52,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcShoe_c { /* 80AE794C */ daNpcShoe_c(); /* 80AE7B60 */ ~daNpcShoe_c(); @@ -91,12 +91,12 @@ struct daNpcShoe_Param_c { static u8 const m[108]; }; +struct J3DAnmTransformKey {}; + struct _GXColorS10 {}; struct J3DAnmTexPattern {}; -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp b/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp index f21ed248fd9..af00e815191 100644 --- a/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp +++ b/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp @@ -17,10 +17,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.cpp b/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.cpp index c24438e44cd..487898e2526 100644 --- a/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.cpp +++ b/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.cpp @@ -27,21 +27,21 @@ struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_evtData_c {}; -struct daNpcT_MotionSeqMngr_c { - struct sequenceStepData_c {}; - - /* 80145898 */ void initialize(); - /* 80AEC6BC */ ~daNpcT_MotionSeqMngr_c(); -}; - -struct J3DModel {}; +struct J3DJoint {}; struct cXyz { /* 80AEC0DC */ ~cXyz(); /* 80AEC670 */ cXyz(); }; -struct J3DJoint {}; +struct J3DModel {}; + +struct daNpcT_MotionSeqMngr_c { + struct sequenceStepData_c {}; + + /* 80145898 */ void initialize(); + /* 80AEC6BC */ ~daNpcT_MotionSeqMngr_c(); +}; struct daNpcT_c { /* 801490D4 */ void ctrlBtk(); diff --git a/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.cpp b/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.cpp index c9685633f59..fef37c08e92 100644 --- a/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.cpp +++ b/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +58,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80AEE8F0 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_solA_c { /* 80AECBAC */ ~daNpc_solA_c(); /* 80AECCD0 */ void create(); @@ -110,7 +110,7 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -118,7 +118,7 @@ struct cXyz { /* 80AEE8A4 */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.cpp b/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.cpp index b7be407b7a3..563f71b3c73 100644 --- a/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.cpp +++ b/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.cpp @@ -28,20 +28,20 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -54,10 +54,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_SoldierA_c { /* 80AEF58C */ daNpc_SoldierA_c(); /* 80AEF7A0 */ ~daNpc_SoldierA_c(); @@ -104,6 +104,8 @@ struct daNpc_SoldierA_Param_c { static u8 const m[108]; }; +struct J3DAnmTransformKey {}; + struct _GXColorS10 {}; struct dCcD_GObjInf { @@ -117,8 +119,6 @@ struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.cpp b/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.cpp index 42ab793a019..14fbad8e326 100644 --- a/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.cpp +++ b/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.cpp @@ -28,20 +28,20 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -54,10 +54,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_SoldierB_c { /* 80AF2CAC */ daNpc_SoldierB_c(); /* 80AF2EC0 */ ~daNpc_SoldierB_c(); @@ -103,6 +103,8 @@ struct daNpc_SoldierB_Param_c { static u8 const m[108]; }; +struct J3DAnmTransformKey {}; + struct _GXColorS10 {}; struct dCcD_GObjInf { @@ -116,8 +118,6 @@ struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp b/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp index 8cec009f35b..7b6c562a00c 100644 --- a/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp +++ b/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp @@ -34,11 +34,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, diff --git a/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.cpp b/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.cpp index 9d7691453cd..561ad058e39 100644 --- a/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.cpp +++ b/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -55,6 +55,14 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -63,14 +71,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80570C8C */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Taro_c { /* 80565E8C */ ~daNpc_Taro_c(); /* 8056604C */ void create(); @@ -158,19 +158,19 @@ struct daNpc_Len_c { /* 80A660D8 */ void checkStartDemo13StbEvt(fopAc_ac_c*, f32, f32, f32, f32, f32, f32, f32); }; +struct csXyz { + /* 80570634 */ ~csXyz(); + /* 80570B88 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; -struct csXyz { - /* 80570634 */ ~csXyz(); - /* 80570B88 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -286,14 +286,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80570CD4 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_the/d_a_npc_the.cpp b/rel/d/a/npc/d_a_npc_the/d_a_npc_the.cpp index effbb839607..d3f3a92ce9a 100644 --- a/rel/d/a/npc/d_a_npc_the/d_a_npc_the.cpp +++ b/rel/d/a/npc/d_a_npc_the/d_a_npc_the.cpp @@ -23,12 +23,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -60,10 +60,10 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcThe_c { /* 80AF76CC */ daNpcThe_c(); /* 80AF78E0 */ ~daNpcThe_c(); @@ -104,16 +104,16 @@ struct daNpcThe_Param_c { static u8 const m[108]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_theB/d_a_npc_theB.cpp b/rel/d/a/npc/d_a_npc_theB/d_a_npc_theB.cpp index 0c8074996de..5c2613a8ae5 100644 --- a/rel/d/a/npc/d_a_npc_theB/d_a_npc_theB.cpp +++ b/rel/d/a/npc/d_a_npc_theB/d_a_npc_theB.cpp @@ -34,12 +34,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -70,10 +70,10 @@ struct daStartAndGoal_c { /* 80D4DBAC */ void isStartCheck(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcTheB_c { /* 80AFC76C */ daNpcTheB_c(); /* 80AFC980 */ ~daNpcTheB_c(); @@ -122,16 +122,16 @@ struct daNpcTheB_Param_c { static u8 const m[108]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp b/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp index 82b63a9854c..578148dc40f 100644 --- a/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp +++ b/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp @@ -37,19 +37,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -72,10 +72,10 @@ struct daNpc_Hanjo_c { /* 809F9C98 */ void getType(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNPC_TK_c { /* 80B01498 */ void setBck(int, u8, f32, f32); /* 80B0153C */ void checkBck(int); diff --git a/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.cpp b/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.cpp index 2df762fe95d..331b21294dc 100644 --- a/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.cpp +++ b/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.cpp @@ -42,12 +42,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -67,10 +67,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcTkc_c { /* 80B0C7CC */ daNpcTkc_c(); /* 80B0C964 */ ~daNpcTkc_c(); @@ -118,16 +118,16 @@ struct daNpcTkc_Param_c { static u8 const m[164]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.cpp b/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.cpp index 02ca907d847..9972fdbf8c9 100644 --- a/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.cpp +++ b/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -49,6 +49,14 @@ struct daNpc_Tkj_Param_c { static u8 const m[140]; }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -56,14 +64,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80575D54 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpcTkj_c { /* 8057372C */ ~daNpcTkj_c(); /* 80573850 */ void create(); @@ -113,7 +113,7 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -121,7 +121,7 @@ struct cXyz { /* 80575D08 */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.cpp b/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.cpp index 6188c2fb108..b02c78c5039 100644 --- a/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.cpp +++ b/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.cpp @@ -48,16 +48,16 @@ struct mDoExt_btkAnm { /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.cpp b/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.cpp index 2e99ae6e3df..0dec71ad663 100644 --- a/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.cpp +++ b/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.cpp @@ -41,12 +41,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -74,10 +74,10 @@ struct daObj { /* 80037210 */ void make_eff_break_kotubo2(fopAc_ac_c*); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcTks_c { /* 80B1462C */ daNpcTks_c(); /* 80B14844 */ ~daNpcTks_c(); @@ -139,16 +139,16 @@ struct daNpcTkc_c { /* 80B0D37C */ void setActionFollow(); }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.cpp b/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.cpp index 1db89a289cf..911d96d4534 100644 --- a/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.cpp +++ b/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -51,6 +51,14 @@ struct daObj_AutoMata_c { /* 80BA6500 */ void setAnm(int, bool); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -59,14 +67,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80B2418C */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Toby_c { /* 80B1E64C */ ~daNpc_Toby_c(); /* 80B1E798 */ void create(); @@ -134,13 +134,18 @@ struct daNpc_Toby_Param_c { static u8 const m[156]; }; +struct csXyz { + /* 80B23AEC */ ~csXyz(); + /* 80B24088 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -149,12 +154,7 @@ struct cXyz { /* 80B24188 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80B23AEC */ ~csXyz(); - /* 80B24088 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -272,14 +272,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80B241D4 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp b/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp index 0e956d3ce0e..27acfb85dcc 100644 --- a/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp +++ b/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,15 +43,7 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct daNpcT_MotionSeqMngr_c { - struct sequenceStepData_c {}; - - /* 80145898 */ void initialize(); - /* 80145A24 */ void checkEndSequence(); - /* 80B2C56C */ ~daNpcT_MotionSeqMngr_c(); -}; - -struct daNpcT_motionAnmData_c {}; +struct J3DJoint {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -60,12 +52,20 @@ struct cXyz { /* 80B2C568 */ cXyz(); }; -struct J3DJoint {}; - struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_evtData_c {}; +struct daNpcT_motionAnmData_c {}; + +struct daNpcT_MotionSeqMngr_c { + struct sequenceStepData_c {}; + + /* 80145898 */ void initialize(); + /* 80145A24 */ void checkEndSequence(); + /* 80B2C56C */ ~daNpcT_MotionSeqMngr_c(); +}; + struct daNpc_Uri_c { /* 80B267AC */ ~daNpc_Uri_c(); /* 80B268F8 */ void create(); @@ -134,19 +134,19 @@ struct daNpc_Uri_Param_c { static u8 const m[172]; }; +struct csXyz { + /* 80B2BECC */ ~csXyz(); + /* 80B2C468 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; -struct csXyz { - /* 80B2BECC */ ~csXyz(); - /* 80B2C468 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -263,14 +263,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80B2C5B4 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.cpp b/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.cpp index 7e0745a4d96..1d00fff2772 100644 --- a/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.cpp +++ b/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.cpp @@ -41,12 +41,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -81,10 +81,10 @@ struct daNpc_grA_c { /* 809C1160 */ void getMode1(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcWrestler_c { /* 80B2F28C */ daNpcWrestler_c(); /* 80B2F4A0 */ ~daNpcWrestler_c(); @@ -167,16 +167,16 @@ struct daNpcWrestler_Param_c { static u8 const m[404]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -256,10 +256,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); diff --git a/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.cpp b/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.cpp index f2df8d1988f..e25c2a6817a 100644 --- a/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.cpp +++ b/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -44,6 +44,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +59,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80B45828 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_yamiD_c { /* 80B42F4C */ ~daNpc_yamiD_c(); /* 80B43084 */ void create(); @@ -119,7 +119,7 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -127,7 +127,7 @@ struct cXyz { /* 80B457DC */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.cpp b/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.cpp index a2118aa9bd8..1437daad3e9 100644 --- a/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.cpp +++ b/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -44,6 +44,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +59,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80B48E8C */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_yamiS_c { /* 80B4656C */ ~daNpc_yamiS_c(); /* 80B466A4 */ void create(); @@ -119,7 +119,7 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -127,7 +127,7 @@ struct cXyz { /* 80B48E40 */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.cpp b/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.cpp index 0addb42a7d5..ac65145580f 100644 --- a/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.cpp +++ b/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -49,6 +49,14 @@ struct daTagYami_c { /* 80D65F24 */ void offMidnaTagSw2(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -56,14 +64,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80B4C5EC */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_yamiT_c { /* 80B49BEC */ ~daNpc_yamiT_c(); /* 80B49D24 */ void create(); @@ -125,7 +125,7 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -133,7 +133,7 @@ struct cXyz { /* 80B4C5A0 */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.cpp b/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.cpp index 2fc60dbd1af..d715b72e4ed 100644 --- a/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.cpp +++ b/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +59,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80B51A44 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Yelia_c { /* 80B4D30C */ ~daNpc_Yelia_c(); /* 80B4D458 */ void create(); @@ -122,7 +122,7 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -131,7 +131,7 @@ struct cXyz { /* 80B51A40 */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.cpp b/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.cpp index 930005376f9..4577b1cbe81 100644 --- a/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.cpp +++ b/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.cpp @@ -33,20 +33,20 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -76,6 +76,14 @@ struct daNpc_ykW_c { /* 80B5FCC8 */ void getType(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -84,14 +92,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80B5CDC0 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_ykM_c { /* 80B534EC */ ~daNpc_ykM_c(); /* 80B53698 */ void create(); @@ -177,10 +177,10 @@ struct dCcD_GObjInf { /* 80084658 */ void ChkCoHit(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); diff --git a/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.cpp b/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.cpp index 8cb590f7a4e..ef35a2dbc7d 100644 --- a/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.cpp +++ b/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.cpp @@ -26,20 +26,20 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -57,6 +57,14 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -65,14 +73,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80B672D8 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_ykW_c { /* 80B5EF0C */ ~daNpc_ykW_c(); /* 80B5F084 */ void create(); @@ -152,19 +152,19 @@ struct daNpc_ykM_c { struct daNpcT_pntData_c {}; +struct csXyz { + /* 80B66C38 */ ~csXyz(); + /* 80B671D4 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; -struct csXyz { - /* 80B66C38 */ ~csXyz(); - /* 80B671D4 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -302,12 +302,12 @@ struct dPath {}; struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -318,16 +318,16 @@ struct dPa_control_c { cXyz const*); }; +struct dBgS { + /* 80074E50 */ void GetPolyAtt0(cBgS_PolyInfo const&); +}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80B67320 */ ~dBgS_AcchCir(); }; -struct dBgS { - /* 80074E50 */ void GetPolyAtt0(cBgS_PolyInfo const&); -}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.cpp b/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.cpp index 7139f5a4647..98148dcc68c 100644 --- a/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.cpp +++ b/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -44,6 +44,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +59,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80B6B4B0 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_zanB_c { /* 80B68F2C */ ~daNpc_zanB_c(); /* 80B6904C */ void create(); @@ -110,12 +110,17 @@ struct daNpc_zanB_Param_c { static u8 const m[140]; }; +struct csXyz { + /* 80B6AF24 */ ~csXyz(); + /* 80B6B364 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -124,12 +129,7 @@ struct cXyz { /* 80B6B464 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80B6AF24 */ ~csXyz(); - /* 80B6B364 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.cpp b/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.cpp index 72bc46d0f86..93f3fa7774d 100644 --- a/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.cpp +++ b/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.cpp @@ -11,12 +11,14 @@ // Types: // +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -25,8 +27,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -40,6 +40,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -47,14 +55,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80B6E19C */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Zant_c { /* 80B6C1AC */ ~daNpc_Zant_c(); /* 80B6C2D0 */ void create(); @@ -105,7 +105,7 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -113,7 +113,7 @@ struct cXyz { /* 80B6E150 */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.cpp b/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.cpp index 7dac2d17151..24c77398df4 100644 --- a/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.cpp +++ b/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +58,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80B7133C */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_ZelR_c { /* 80B6EE2C */ ~daNpc_ZelR_c(); /* 80B6EF64 */ void create(); @@ -115,7 +115,7 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -123,7 +123,7 @@ struct cXyz { /* 80B712F0 */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.cpp b/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.cpp index 8e1e8e58dfa..b8c16332bff 100644 --- a/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.cpp +++ b/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +58,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80B744B8 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_ZelRo_c { /* 80B71FAC */ ~daNpc_ZelRo_c(); /* 80B720E4 */ void create(); @@ -116,7 +116,7 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; @@ -124,7 +124,7 @@ struct cXyz { /* 80B7446C */ cXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.cpp b/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.cpp index dfb1cfc86eb..8f6bfc16cda 100644 --- a/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.cpp +++ b/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DJoint {}; + +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +58,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80B777B0 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Zelda_c { /* 80B7512C */ ~daNpc_Zelda_c(); /* 80B7524C */ void create(); @@ -110,12 +110,17 @@ struct daNpc_Zelda_Param_c { static u8 const m[140]; }; +struct csXyz { + /* 80B77224 */ ~csXyz(); + /* 80B77664 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; +struct _GXColorS10 {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; @@ -124,12 +129,7 @@ struct cXyz { /* 80B77764 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80B77224 */ ~csXyz(); - /* 80B77664 */ csXyz(); -}; +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra.cpp b/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra.cpp index d198eb0d576..19930a28f61 100644 --- a/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra.cpp +++ b/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra.cpp @@ -44,16 +44,16 @@ struct mDoExt_morf_c { /* 8000FB7C */ void setMorf(f32); }; +struct J3DAnmTextureSRTKey {}; + +struct J3DAnmTevRegKey {}; + struct J3DAnmColor {}; struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTevRegKey {}; - -struct J3DAnmTextureSRTKey {}; - struct J3DMaterialTable { /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); @@ -89,12 +89,12 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -119,10 +119,10 @@ struct daObjZraMark_c { /* 80D43314 */ void entryPointer(fopAc_ac_c*); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daNpc_zrA_c { /* 80B7956C */ daNpc_zrA_c(); /* 80B79828 */ ~daNpc_zrA_c(); @@ -250,14 +250,14 @@ struct daNpc_Hoz_c { /* 80A01F54 */ void getType(); }; +struct J3DAnmTransformKey {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 80084460 */ void ChkTgHit(); }; -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -366,6 +366,8 @@ struct dRes_control_c { struct dPnt {}; +struct dBgS {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); @@ -373,8 +375,6 @@ struct dBgS_AcchCir { /* 80B7F524 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.cpp b/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.cpp index bbe5f002ddd..b05db26a472 100644 --- a/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.cpp +++ b/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.cpp @@ -27,12 +27,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -73,9 +73,19 @@ struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; -struct J3DJoint {}; +struct dCcD_SrcCyl {}; -struct J3DModel {}; +struct dCcD_Cyl { + /* 800848B4 */ void Set(dCcD_SrcCyl const&); +}; + +struct J3DAnmTexPattern { + /* 8032AF50 */ void getTexNo(u16, u16*) const; +}; + +struct J3DAnmTransformKey {}; + +struct _GXColorS10 {}; struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); @@ -84,20 +94,6 @@ struct dCcD_GObjInf { struct J3DAnmTextureSRTKey {}; -struct dCcD_SrcCyl {}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct _GXColorS10 {}; - -struct J3DAnmTexPattern { - /* 8032AF50 */ void getTexNo(u16, u16*) const; -}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -139,6 +135,10 @@ struct daNpcF_c { static u8 mCcDCyl[68]; }; +struct J3DModel {}; + +struct J3DJoint {}; + struct daNpc_zrC_c { /* 80B8DC0C */ daNpc_zrC_c(); /* 80B8DE20 */ ~daNpc_zrC_c(); diff --git a/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.cpp b/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.cpp index e76ed83cf18..692f3a0d906 100644 --- a/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.cpp +++ b/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.cpp @@ -47,13 +47,13 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DAnmTexPattern { - /* 8032AF50 */ void getTexNo(u16, u16*) const; -}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmTexPattern { + /* 8032AF50 */ void getTexNo(u16, u16*) const; +}; struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); @@ -79,12 +79,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -110,10 +110,10 @@ struct fopAcM_gc_c { static f32 mGroundY; }; -struct _GXColorS10 {}; - struct J3DJoint {}; +struct _GXColorS10 {}; + struct daNpc_zrZ_c { /* 80B93DCC */ daNpc_zrZ_c(); /* 80B94014 */ ~daNpc_zrZ_c(); @@ -182,11 +182,6 @@ struct daNpc_zrZ_Param_c { static u8 const m[132]; }; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { @@ -195,6 +190,11 @@ struct dCcD_Cyl { struct J3DAnmTransformKey {}; +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp b/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp index a8cedf6b609..1ddb5e4ef30 100644 --- a/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp +++ b/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp @@ -28,10 +28,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp b/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp index 99691c79d3f..2db7b29d940 100644 --- a/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp +++ b/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp @@ -49,19 +49,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -85,10 +85,10 @@ struct daObj_AriHIO_c { /* 80BA5360 */ ~daObj_AriHIO_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daObjARI_c { /* 80BA26BC */ void InitCcSph(); /* 80BA2728 */ void SetCcSph(); diff --git a/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp b/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp index 84fb55c6289..57ac3f63a67 100644 --- a/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp +++ b/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp @@ -39,12 +39,14 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -53,8 +55,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp b/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp index 60f0d04fe8a..4c275ece78e 100644 --- a/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp +++ b/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp @@ -17,10 +17,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp b/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp index 4f2e46f5f82..aeb86eedc4e 100644 --- a/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp +++ b/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp @@ -44,12 +44,14 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -57,8 +59,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp b/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp index a5a25c10104..d6084a9651a 100644 --- a/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp +++ b/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp @@ -58,10 +58,10 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp b/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp index 1ee405014ce..01e1591f4ff 100644 --- a/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp +++ b/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp @@ -21,10 +21,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp b/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp index 06dabfe861b..0254404249f 100644 --- a/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp +++ b/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp @@ -19,10 +19,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); diff --git a/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp b/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp index eb05531428e..0a108118048 100644 --- a/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp +++ b/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp @@ -27,10 +27,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); diff --git a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp index 0c6b0844ed2..480377734bf 100644 --- a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp +++ b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; -struct Quaternion {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct Quaternion {}; + struct mDoMtx_stack_c { /* 8000CD9C */ void transM(f32, f32, f32); /* 8000CF44 */ void ZXYrotM(csXyz const&); diff --git a/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp b/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp index 0535926204f..4b760a82770 100644 --- a/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp +++ b/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp @@ -17,10 +17,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp b/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp index 7ff8972fd1a..9775ab392fb 100644 --- a/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp +++ b/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp @@ -49,19 +49,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp b/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp index f863c707b0c..55c7001c390 100644 --- a/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp +++ b/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp @@ -21,10 +21,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); diff --git a/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp b/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp index db12d3b0a19..7b91366f6a7 100644 --- a/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp +++ b/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp @@ -49,19 +49,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp b/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp index d996e3ad3aa..6a660ca3088 100644 --- a/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp +++ b/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp @@ -34,10 +34,10 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, _GXColor const&, int, f32); diff --git a/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp b/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp index 16692c152a8..0d35c9d461f 100644 --- a/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp +++ b/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp @@ -37,10 +37,10 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, _GXColor const&, int, f32); diff --git a/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp b/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp index 5c7a6a1e0d0..a9fbe244445 100644 --- a/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp +++ b/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp @@ -97,8 +97,6 @@ struct cXyz { static f32 Zero[3]; }; -struct dKy_tevstr_c {}; - struct csXyz { /* 80BE02D8 */ ~csXyz(); /* 80BE0314 */ csXyz(); @@ -106,6 +104,8 @@ struct csXyz { static u8 Zero[4]; }; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp b/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp index 79d25c3b2db..fdd82c6dae5 100644 --- a/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp +++ b/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp @@ -32,14 +32,14 @@ struct daObj { struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp b/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp index 7764635c1bc..04f80839a20 100644 --- a/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp +++ b/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp @@ -48,14 +48,14 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, diff --git a/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp b/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp index 5d0c4f6d03c..f00008a2192 100644 --- a/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp +++ b/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp @@ -51,14 +51,14 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, diff --git a/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp b/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp index 845f61a0ed0..e49d9176b81 100644 --- a/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp +++ b/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp @@ -40,10 +40,10 @@ struct mDoExt_btkAnm { /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp b/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp index 3158a91a4b2..74659024ff3 100644 --- a/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp +++ b/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp @@ -46,12 +46,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; @@ -78,10 +78,10 @@ struct daPy_py_c { /* 8015F3FC */ void getAttentionOffsetY(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct dBgW {}; struct daObj_GrA_c { @@ -271,10 +271,10 @@ struct daBaseNpc_lookat_c { /* 8014E6AC */ void getRot(int); }; -struct J3DAnmTexPattern {}; - struct J3DAnmTransformKey {}; +struct J3DAnmTexPattern {}; + struct daBaseNpc_c { /* 8014E89C */ ~daBaseNpc_c(); /* 8014EAD0 */ void execute(); @@ -337,10 +337,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -354,16 +354,16 @@ struct dPa_control_c { cXyz const*); }; -struct dBgS_AcchCir { - /* 80075F58 */ void SetWall(f32, f32); -}; - struct dBgW_Base {}; struct dBgS { /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); }; +struct dBgS_AcchCir { + /* 80075F58 */ void SetWall(f32, f32); +}; + struct dBgS_Acch { /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); /* 80076AAC */ void CrrPos(dBgS&); diff --git a/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp b/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp index 046408c8608..a7be62b7438 100644 --- a/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp +++ b/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp @@ -68,10 +68,7 @@ struct dPa_control_c { }; }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; +struct csXyz {}; struct cBgS_PolyInfo {}; @@ -80,7 +77,10 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; -struct csXyz {}; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F58 */ void SetWall(f32, f32); +}; struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); diff --git a/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp b/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp index 5a3020c408f..e44e3f0c98b 100644 --- a/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp +++ b/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp @@ -39,12 +39,12 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; +struct J3DAnmTransform {}; + struct J3DModelData { /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); }; -struct J3DAnmTransform {}; - struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp b/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp index aa7d1a0745b..0452e264b0f 100644 --- a/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp +++ b/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp @@ -67,10 +67,10 @@ struct dPa_modelEcallBack { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, diff --git a/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp b/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp index 31b03bb5055..537d2befe67 100644 --- a/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp +++ b/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp @@ -25,10 +25,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); @@ -98,12 +98,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; -struct _GXColor {}; - struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp b/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp index ccb85943f91..b6316086254 100644 --- a/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp +++ b/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp @@ -50,19 +50,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp b/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp index bc7de429e23..16f52880404 100644 --- a/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp +++ b/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp @@ -45,12 +45,14 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -58,8 +60,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp b/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp index 279a0e651ef..185815c3a03 100644 --- a/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp +++ b/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp @@ -35,10 +35,10 @@ struct fopAcM_gc_c { static f32 mGroundY; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daObjKaisou_c { /* 80C34058 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 80C34390 */ void initCcCylinder(); diff --git a/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp b/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp index 98dcec3c174..e6231abe169 100644 --- a/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp +++ b/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp @@ -50,19 +50,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp b/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp index 7dd65907a87..99b523a0166 100644 --- a/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp +++ b/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp @@ -107,12 +107,12 @@ struct dBgS_AcchCir { /* 80C38E98 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct cXyz { /* 80266B84 */ void operator*(f32) const; }; -struct dBgS {}; - struct csXyz {}; struct dBgS_Acch { diff --git a/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp b/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp index acb3f54f9e8..04398412f10 100644 --- a/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp +++ b/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp @@ -49,19 +49,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -85,10 +85,10 @@ struct daObj_KatHIO_c { /* 80C3C5CC */ ~daObj_KatHIO_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daObjKAT_c { /* 80C39994 */ void InitCcSph(); /* 80C39A00 */ void SetCcSph(); diff --git a/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp b/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp index ea5575e3e31..133a6bdeb18 100644 --- a/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp +++ b/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp @@ -26,11 +26,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, diff --git a/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp b/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp index f43aacb63b5..32f8ec9d561 100644 --- a/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp +++ b/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp @@ -30,10 +30,10 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, diff --git a/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp b/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp index 0555ecca9d1..d415c24354c 100644 --- a/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp +++ b/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp @@ -36,6 +36,8 @@ struct daObjKnBullet_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct Vec {}; struct cXyz { @@ -45,8 +47,6 @@ struct cXyz { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); diff --git a/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp b/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp index d0f7936ff4b..e99e1900cc0 100644 --- a/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp +++ b/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp @@ -26,10 +26,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_ktonfire/d_a_obj_ktOnFire.cpp b/rel/d/a/obj/d_a_obj_ktonfire/d_a_obj_ktOnFire.cpp index e8403f36259..5e10212bac4 100644 --- a/rel/d/a/obj/d_a_obj_ktonfire/d_a_obj_ktOnFire.cpp +++ b/rel/d/a/obj/d_a_obj_ktonfire/d_a_obj_ktOnFire.cpp @@ -50,14 +50,14 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, diff --git a/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp b/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp index 2cca8679b34..abaf148aeb5 100644 --- a/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp +++ b/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp @@ -50,19 +50,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp b/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp index 38072d1f4f8..19bf5a368ef 100644 --- a/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp +++ b/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp @@ -21,10 +21,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); diff --git a/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp b/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp index 0be214f70ed..d21c8a786c5 100644 --- a/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp +++ b/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp @@ -103,10 +103,10 @@ struct dPa_followEcallBack { /* 80049580 */ dPa_followEcallBack(u8, u8); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp b/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp index e2fa1bdcd51..f9aec445928 100644 --- a/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp +++ b/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp @@ -52,10 +52,10 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); diff --git a/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp b/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp index 8dced449ad7..0d6ca0df424 100644 --- a/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp +++ b/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp @@ -24,17 +24,17 @@ struct daObjWaterEff_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct cXyz { /* 80C5C670 */ ~cXyz(); /* 80C5C6AC */ cXyz(); }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp b/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp index 7c032cdce7c..1738d40d5d3 100644 --- a/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp +++ b/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp @@ -19,10 +19,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp b/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp index 84ff8264547..0aae37cfc6f 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp @@ -34,10 +34,10 @@ struct mDoExt_btkAnm { /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp b/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp index 8a704e69924..8b4fbac81b6 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp @@ -50,10 +50,10 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp b/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp index ed4961f0ecb..a4865651bd4 100644 --- a/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp +++ b/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp @@ -40,14 +40,14 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, diff --git a/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp b/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp index 6942f91b225..b3a57367e0f 100644 --- a/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp +++ b/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp @@ -22,10 +22,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp b/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp index 842d6615f25..b6f56e456c4 100644 --- a/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp +++ b/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp @@ -49,10 +49,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); diff --git a/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp b/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp index 595def125f7..8df1b6daf5a 100644 --- a/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp +++ b/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp @@ -19,10 +19,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); diff --git a/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp b/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp index 9677da733ec..283227facef 100644 --- a/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp +++ b/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp @@ -50,6 +50,8 @@ struct dBgW { }; struct daObjMovebox { + struct BgcSrc_c {}; + struct Act_c { struct Prm_e {}; @@ -91,8 +93,6 @@ struct daObjMovebox { static u8 const M_attr[1280]; }; - struct BgcSrc_c {}; - struct Bgc_c { /* 8047DAEC */ Bgc_c(); /* 8047DBF0 */ void gnd_pos(daObjMovebox::Act_c const*, daObjMovebox::BgcSrc_c const*, int, diff --git a/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp b/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp index 9a8c1b64496..70a6c8884cb 100644 --- a/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp +++ b/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp @@ -36,16 +36,16 @@ struct daObjNagaisu_c { static u8 const REMOVE_ISU_IDX[28]; }; -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - struct dMdl_obj_c {}; struct dMdl_c { /* 8009C668 */ void entryObj(dMdl_obj_c*); }; +struct dCcD_Stts { + /* 80083860 */ void Init(int, int, fopAc_ac_c*); +}; + struct daObjIsuChild_c { /* 80C9FA90 */ daObjIsuChild_c(); /* 80C9FCDC */ ~daObjIsuChild_c(); diff --git a/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp b/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp index 583369756b5..29ec45e9840 100644 --- a/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp +++ b/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp @@ -49,19 +49,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp b/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp index 59def58a3c0..dc19b6584c0 100644 --- a/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp +++ b/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp @@ -29,10 +29,10 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct cXyz {}; struct dPa_control_c { diff --git a/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp b/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp index f7cbf034106..b9f13196d52 100644 --- a/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp +++ b/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp @@ -40,10 +40,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); diff --git a/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp b/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp index 578a70bfe88..1333f02a687 100644 --- a/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp +++ b/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp @@ -75,6 +75,8 @@ struct dSv_player_get_item_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct Vec {}; struct cXyz { @@ -83,12 +85,10 @@ struct cXyz { /* 80266B84 */ void operator*(f32) const; }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B8B4 */ void forceOnEventMove(u32); diff --git a/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp b/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp index c5cd97c0291..1b1d1dd7349 100644 --- a/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp +++ b/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp @@ -37,10 +37,10 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp b/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp index 97019c8b3e3..87b30b5e0fb 100644 --- a/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp +++ b/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp @@ -36,10 +36,10 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); diff --git a/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp b/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp index a85913b1fc5..6b35c9f44b3 100644 --- a/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp +++ b/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp @@ -42,10 +42,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); diff --git a/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp b/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp index e24b2145762..7fc51d1dacd 100644 --- a/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp +++ b/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp @@ -21,10 +21,10 @@ struct mDoHIO_entry_c { /* 80CBE9DC */ ~mDoHIO_entry_c(); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp b/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp index 47a8e80df65..37154ab4062 100644 --- a/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp +++ b/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp @@ -50,10 +50,10 @@ struct dRes_control_c { /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); diff --git a/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp b/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp index 2c9c8dd9fa2..4c1eae9a7fc 100644 --- a/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp +++ b/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp @@ -25,10 +25,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); @@ -67,10 +67,10 @@ struct dRes_control_c { /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); diff --git a/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp b/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp index 33cb699490d..592e8363fe3 100644 --- a/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp +++ b/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp @@ -30,10 +30,10 @@ struct mDoExt_btkAnm { /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp b/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp index 459ee638d23..4a99e91e97b 100644 --- a/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp +++ b/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp @@ -39,10 +39,10 @@ struct mDoExt_btkAnm { /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp b/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp index eedd6848a3e..06ef0824904 100644 --- a/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp +++ b/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp @@ -17,10 +17,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.cpp b/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.cpp index d808921cb50..9d84cfe5709 100644 --- a/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.cpp +++ b/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.cpp @@ -57,20 +57,20 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -92,6 +92,12 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct daNpcT_faceMotionAnmData_c {}; + +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -100,12 +106,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80CD52AC */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daObj_Sekizoa_c { /* 80CCE34C */ ~daObj_Sekizoa_c(); /* 80CCE570 */ void create(); @@ -178,6 +178,8 @@ struct daObj_SekiDoor_c { /* 80CCD5DC */ void evtSkip(); }; +struct J3DJoint {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); @@ -190,8 +192,6 @@ struct dCcD_GObjInf { struct _GXColorS10 {}; -struct J3DJoint {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80147FD4 */ void srchActor(void*, void*); diff --git a/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp b/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp index 21bff357a17..b0bf6e579c9 100644 --- a/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp +++ b/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp @@ -111,10 +111,10 @@ struct dPa_followEcallBack { /* 80CDA48C */ void __defctor(); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp b/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp index e0f22e77c09..d52854bc08d 100644 --- a/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp +++ b/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp @@ -34,14 +34,14 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp b/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp index 4b94a6cdef0..7a40439db54 100644 --- a/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp +++ b/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp @@ -39,18 +39,18 @@ struct daSnowEffTag_HIO_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); diff --git a/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp b/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp index 3428b16ee55..61b733a51f4 100644 --- a/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp +++ b/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp @@ -21,10 +21,10 @@ struct mDoHIO_entry_c { /* 80CE81AC */ ~mDoHIO_entry_c(); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp b/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp index c3e71cb13d9..3469395b59b 100644 --- a/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp +++ b/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; -struct Quaternion {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct Quaternion {}; + struct mDoMtx_stack_c { /* 8000CF44 */ void ZXYrotM(csXyz const&); /* 8000CF7C */ void quatM(Quaternion const*); diff --git a/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp b/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp index 74254cb08b6..e0fc6aee4c3 100644 --- a/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp +++ b/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp @@ -32,11 +32,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -56,10 +56,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); diff --git a/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp b/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp index 0f1912d550b..dd9fec5d261 100644 --- a/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp +++ b/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp @@ -35,13 +35,13 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct J3DJoint {}; + struct dBgW { /* 8007B970 */ dBgW(); /* 8007B9C0 */ void Move(); }; -struct J3DJoint {}; - struct daObjSwpush { struct Act_c { struct Prm_e {}; diff --git a/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp b/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp index c33c1ff0ec9..e697b1d989c 100644 --- a/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp +++ b/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp @@ -25,11 +25,11 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DAnmColor {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmColor {}; struct J3DMaterialTable { /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); diff --git a/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp b/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp index 8b5927a4e4a..053eba1a02b 100644 --- a/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp +++ b/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp @@ -36,10 +36,10 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); diff --git a/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp b/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp index 065f9649553..9e93f061447 100644 --- a/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp +++ b/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp @@ -50,19 +50,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp b/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp index 57ba24ac48b..18decd2a7df 100644 --- a/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp +++ b/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp @@ -46,14 +46,14 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, diff --git a/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp b/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp index ffbbf6b007e..6eea2a0caa3 100644 --- a/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp +++ b/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp @@ -41,12 +41,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -66,10 +66,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daObjTks_c { /* 80D0F28C */ daObjTks_c(); /* 80D0F480 */ ~daObjTks_c(); @@ -108,16 +108,16 @@ struct daObjTks_Param_c { static u8 const m[128]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + +struct J3DAnmTextureSRTKey {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; diff --git a/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp b/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp index bc7eaa6b2b5..37d6f5a4c63 100644 --- a/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp +++ b/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp @@ -95,10 +95,10 @@ struct dEvt_control_c { /* 80042468 */ void reset(); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); diff --git a/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp b/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp index df1394d0d80..7623f9a2ea1 100644 --- a/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp +++ b/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp @@ -23,10 +23,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp b/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp index d0d74b670db..47f8b746ce4 100644 --- a/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp +++ b/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp @@ -49,19 +49,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp b/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp index 702c82ab020..e7962dac1a5 100644 --- a/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp +++ b/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp @@ -55,10 +55,10 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp b/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp index 920173ca475..905d39e7547 100644 --- a/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp +++ b/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp @@ -46,13 +46,13 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData { /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); }; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, diff --git a/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp b/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp index 8c5be42cf93..3940d072e13 100644 --- a/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp +++ b/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp @@ -41,10 +41,10 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp b/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp index ee01d9c0957..518ef55b6de 100644 --- a/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp +++ b/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp @@ -42,10 +42,10 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp b/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp index 4fc5d0a29fa..14995af7e0d 100644 --- a/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp +++ b/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp @@ -34,10 +34,10 @@ struct mDoExt_btkAnm { /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp b/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp index b59ebf6823e..87f6bd9a3d2 100644 --- a/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp +++ b/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp @@ -32,10 +32,10 @@ struct mDoExt_btkAnm { /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp index 994ed73f486..51c12de9e4d 100644 --- a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp +++ b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp @@ -21,10 +21,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); diff --git a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp index 4f98c83f725..fab11730d2f 100644 --- a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp +++ b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp @@ -22,10 +22,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); diff --git a/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.cpp b/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.cpp index 013d78c4f8e..d30ef603bd7 100644 --- a/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.cpp +++ b/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.cpp @@ -50,11 +50,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DAnmTransform {}; struct J3DModelData {}; -struct J3DAnmTransform {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, diff --git a/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp b/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp index 92c8ed0cb85..fcf36026cc6 100644 --- a/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp +++ b/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp @@ -21,10 +21,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp b/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp index 07ac3094192..40b65af0e43 100644 --- a/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp +++ b/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp @@ -92,10 +92,10 @@ struct dPa_followEcallBack { /* 80D3A6F4 */ void __defctor(); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp b/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp index 03477b0e443..96d861f0048 100644 --- a/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp +++ b/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp @@ -27,19 +27,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp b/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp index 7918dd8b7bb..03d50936173 100644 --- a/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp +++ b/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp @@ -41,16 +41,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp index 89c66bc7874..4651dcc3d61 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp @@ -21,10 +21,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp index f650700fec3..943f9f684b5 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp @@ -44,10 +44,10 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp index d61e7266c53..ca91b441d81 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp @@ -24,10 +24,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp index 794e4ef41dc..c4515977056 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp @@ -47,10 +47,10 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp b/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp index 331b9ffc700..d467e2adc16 100644 --- a/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp +++ b/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp @@ -26,10 +26,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp b/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp index 2ac4ef61972..37614d844d7 100644 --- a/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp +++ b/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp @@ -21,10 +21,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp b/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp index 2e8f74e1b10..adf747ab6e1 100644 --- a/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp +++ b/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp @@ -22,16 +22,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -110,14 +110,14 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/tag/d_a_tag_csw/d_a_tag_csw.cpp b/rel/d/a/tag/d_a_tag_csw/d_a_tag_csw.cpp index 945eb37e5d5..802a34c9c79 100644 --- a/rel/d/a/tag/d_a_tag_csw/d_a_tag_csw.cpp +++ b/rel/d/a/tag/d_a_tag_csw/d_a_tag_csw.cpp @@ -19,10 +19,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DMaterialTable {}; - struct J3DAnmTevRegKey {}; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); diff --git a/rel/d/a/tag/d_a_tag_firewall/d_a_tag_firewall.cpp b/rel/d/a/tag/d_a_tag_firewall/d_a_tag_firewall.cpp index a2353e26fc5..595b37dfe82 100644 --- a/rel/d/a/tag/d_a_tag_firewall/d_a_tag_firewall.cpp +++ b/rel/d/a/tag/d_a_tag_firewall/d_a_tag_firewall.cpp @@ -35,12 +35,12 @@ struct dVibration_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); diff --git a/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp b/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp index 1718ba06ee2..372923049cd 100644 --- a/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp +++ b/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp @@ -30,14 +30,14 @@ struct daTag_MynaLight_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp b/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp index c9b35276edc..b6fc52cb130 100644 --- a/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp +++ b/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp @@ -29,16 +29,16 @@ struct daTagSmkEmt_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/src/a/npc/d_a_npc_cd.cpp b/src/a/npc/d_a_npc_cd.cpp index 6010351b7dc..b3a677184b9 100644 --- a/src/a/npc/d_a_npc_cd.cpp +++ b/src/a/npc/d_a_npc_cd.cpp @@ -24,16 +24,16 @@ struct mDoHIO_entry_c { /* 8015791C */ ~mDoHIO_entry_c(); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -52,12 +52,12 @@ struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; -struct J3DJoint {}; - struct J3DAnmTransformKey {}; struct J3DModel {}; +struct J3DJoint {}; + struct daNpcCd_c { /* 8015605C */ void NpcCreate(int); /* 801561E8 */ void ObjCreate(int); diff --git a/src/a/npc/d_a_npc_cd2.cpp b/src/a/npc/d_a_npc_cd2.cpp index 6edfec3d1a8..b16588b7bf7 100644 --- a/src/a/npc/d_a_npc_cd2.cpp +++ b/src/a/npc/d_a_npc_cd2.cpp @@ -41,16 +41,16 @@ struct mDoExt_btpAnm { /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); }; +struct J3DAnmTransform {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct J3DModelData {}; struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature {}; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -67,12 +67,12 @@ struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; -struct J3DJoint {}; - struct J3DAnmTransformKey {}; struct J3DModel {}; +struct J3DJoint {}; + struct daNpcCd2_c { /* 80157D00 */ void NpcCreate(int); /* 80157F28 */ void ObjCreate(int); diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index b0b5c0b562f..6b144e1df16 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -71,10 +71,10 @@ struct mDoExt_blkAnm { /* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); @@ -512,11 +512,31 @@ struct daAlink_footData_c { /* 800CFCF4 */ daAlink_footData_c(); }; +struct dCcG_At_Spl {}; + struct dDemo_actor_c { /* 8003819C */ void getPrm_Morf(); /* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*); }; +struct daAlinkHIO_anm_c {}; + +struct JKRHeap { + /* 802CE5CC */ void freeAll(); +}; + +struct JKRExpHeap { + /* 802CEE2C */ void create(u32, JKRHeap*, bool); +}; + +struct J3DGXColorS10 { + /* 8000E460 */ J3DGXColorS10(); +}; + +struct dBgW_Base { + struct PushPullLabel {}; +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); @@ -532,22 +552,6 @@ struct dCcD_GObjInf { /* 800846B0 */ void ResetCoHit(); }; -struct dBgS_LinChk { - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dCcG_At_Spl {}; - -struct J3DAnmBase {}; - -struct daAlinkHIO_anm_c {}; - -struct dAttList_c { - /* 80073864 */ void getActor(); -}; - -struct JPABaseEmitter {}; - struct cM3dGPla { /* 8001DB90 */ ~cM3dGPla(); /* 801411F0 */ cM3dGPla(); @@ -555,8 +559,12 @@ struct cM3dGPla { /* 8026F408 */ void crossInfLin(cXyz const&, cXyz const&, cXyz&) const; }; -struct dBgW_Base { - struct PushPullLabel {}; +struct dAttList_c { + /* 80073864 */ void getActor(); +}; + +struct dBgS_LinChk { + /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); }; struct _GXColorS10 {}; @@ -566,17 +574,9 @@ struct J3DAnmTevRegKey { /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); }; -struct J3DGXColorS10 { - /* 8000E460 */ J3DGXColorS10(); -}; +struct JPABaseEmitter {}; -struct JKRHeap { - /* 802CE5CC */ void freeAll(); -}; - -struct JKRExpHeap { - /* 802CEE2C */ void create(u32, JKRHeap*, bool); -}; +struct J3DAnmBase {}; struct daAlink_c { struct daAlink_ANM {}; @@ -3074,13 +3074,6 @@ struct dPa_control_c { static u8 mParticleTracePCB[4 + 4 /* padding */]; }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80075F58 */ void SetWall(f32, f32); - /* 80077414 */ ~dBgS_AcchCir(); -}; - struct dBgS_RoofChk { /* 80078FF4 */ dBgS_RoofChk(); /* 80079090 */ ~dBgS_RoofChk(); @@ -3112,6 +3105,13 @@ struct dBgS { dBgW_Base::PushPullLabel); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F40 */ void SetWallR(f32); + /* 80075F58 */ void SetWall(f32, f32); + /* 80077414 */ ~dBgS_AcchCir(); +}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -3229,15 +3229,15 @@ struct dDlst_peekZ_c { /* 80056018 */ void newData(s16, s16, u32*); }; -struct J3DPacket; -struct J3DDrawBuffer { - /* 8032548C */ void entryImm(J3DPacket*, u16); -}; - +struct J3DDrawBuffer; struct J3DPacket { /* 80312750 */ bool entry(J3DDrawBuffer*); }; +struct J3DDrawBuffer { + /* 8032548C */ void entryImm(J3DPacket*, u16); +}; + struct dDlst_list_c { /* 800565EC */ void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&); }; @@ -3626,14 +3626,14 @@ struct J3DShape { static u8 sOldVcdVatCmd[4]; }; -struct J3DAnmTexPattern { - /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); -}; - struct J3DAnmTextureSRTKey { /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*); }; +struct J3DAnmTexPattern { + /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); +}; + struct J3DMaterialTable { /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); diff --git a/src/d/a/d_a_itembase.cpp b/src/d/a/d_a_itembase.cpp index 813f406afb3..2d5191c5a7c 100644 --- a/src/d/a/d_a_itembase.cpp +++ b/src/d/a/d_a_itembase.cpp @@ -43,10 +43,10 @@ struct mDoExt_bpkAnm { /* 8000D518 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp index 78fd11c81b9..e57751d103d 100644 --- a/src/d/a/d_a_npc.cpp +++ b/src/d/a/d_a_npc.cpp @@ -48,13 +48,13 @@ struct mDoExt_morf_c { /* 8000FB7C */ void setMorf(f32); }; -struct J3DAnmColor {}; - -struct J3DAnmTexPattern {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmColor {}; + +struct J3DAnmTexPattern {}; struct J3DMaterialTable { /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); @@ -83,10 +83,10 @@ struct mDoExt_bpkAnm { /* 8000D518 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); @@ -120,21 +120,21 @@ struct daNpcT_motionAnmData_c {}; struct daNpcT_faceMotionAnmData_c {}; -struct dCcD_GObjInf { - /* 80084460 */ void ChkTgHit(); -}; - -struct J3DModel {}; - -struct _GXColorS10 {}; - struct J3DFrameCtrl { /* 803283FC */ void init(s16); }; +struct J3DAnmTransformKey {}; + struct J3DJoint {}; -struct J3DAnmTransformKey {}; +struct dCcD_GObjInf { + /* 80084460 */ void ChkTgHit(); +}; + +struct _GXColorS10 {}; + +struct J3DModel {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); diff --git a/src/d/a/d_a_obj.cpp b/src/d/a/d_a_obj.cpp index 654b963f0d8..495a9199d4d 100644 --- a/src/d/a/d_a_obj.cpp +++ b/src/d/a/d_a_obj.cpp @@ -17,13 +17,13 @@ struct daPy_py_c { /* 8015F398 */ void checkMasterSwordEquip(); }; +struct Quaternion {}; + struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); /* 8008457C */ void GetTgHitObjSe(); }; -struct Quaternion {}; - struct Vec {}; struct cXyz { @@ -56,11 +56,11 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct dKy_tevstr_c {}; +struct JPABaseEmitter {}; struct J3DModelData {}; -struct JPABaseEmitter {}; +struct dKy_tevstr_c {}; struct dPa_modelEcallBack { /* 8004AC00 */ void setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8, void*, u8, diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp index 326d6eb412a..8f47745265e 100644 --- a/src/d/a/d_a_player.cpp +++ b/src/d/a/d_a_player.cpp @@ -378,7 +378,7 @@ asm void daPy_boomerangMove_c::initOffset(cXyz const* param_0) { #pragma pop /* ############################################################################################## */ -/* 80451018-8045101C 000518 0004+00 2/2 33/33 103/103 .sbss m_midnaActor__9daPy_py_c */ +/* 80451018-8045101C 000518 0004+00 2/2 33/32 103/103 .sbss m_midnaActor__9daPy_py_c */ u8 daPy_py_c::m_midnaActor[4]; /* 8045101C-80451020 -00001 0004+00 1/1 1/1 1/1 .sbss None */ diff --git a/src/d/bg/d_bg_s.cpp b/src/d/bg/d_bg_s.cpp index 0693c4c7170..b554cf1f89c 100644 --- a/src/d/bg/d_bg_s.cpp +++ b/src/d/bg/d_bg_s.cpp @@ -38,6 +38,8 @@ struct dBgS_Acch { /* 8007732C */ void CalcWallRR(); }; +struct csXyz {}; + struct cXyz {}; struct cBgS_PolyInfo { @@ -48,8 +50,6 @@ struct cBgS_PolyInfo { /* 802681AC */ void ChkBgIndex() const; }; -struct csXyz {}; - struct dBgS { /* 80030C50 */ ~dBgS(); /* 800748FC */ void Ct(); diff --git a/src/d/bg/d_bg_s_acch.cpp b/src/d/bg/d_bg_s_acch.cpp index 6eac516fdaf..45d372cf2ff 100644 --- a/src/d/bg/d_bg_s_acch.cpp +++ b/src/d/bg/d_bg_s_acch.cpp @@ -60,8 +60,7 @@ struct dBgS_AcchCir { /* 80077414 */ ~dBgS_AcchCir(); }; -struct Vec {}; - +struct dBgS_Acch; struct cBgS_PolyInfo { /* 80268074 */ cBgS_PolyInfo(); /* 802680B0 */ ~cBgS_PolyInfo(); @@ -70,7 +69,6 @@ struct cBgS_PolyInfo { /* 802681A4 */ void SetPolyIndex(int); }; -struct dBgS_Acch; struct csXyz {}; struct dBgS { @@ -82,6 +80,8 @@ struct dBgS { /* 80075B84 */ void RideCallBack(cBgS_PolyInfo const&, fopAc_ac_c*); }; +struct Vec {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); diff --git a/src/d/bg/d_bg_w.cpp b/src/d/bg/d_bg_w.cpp index e708e29d659..a346c00d788 100644 --- a/src/d/bg/d_bg_w.cpp +++ b/src/d/bg/d_bg_w.cpp @@ -23,21 +23,15 @@ struct dBgW_Base { /* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&); }; -struct dBgS_SphChk {}; +struct csXyz {}; -struct dBgS_SplGrpChk {}; - -struct cBgS_PolyPassChk {}; +struct cBgS_GrpPassChk {}; struct dBgS_CaptPoly {}; -struct cM3dGPla { - /* 8026F57C */ void getCrossY(cXyz const&, f32*) const; -}; +struct dBgS_RoofChk {}; -struct cBgS_PolyInfo { - /* 802681A4 */ void SetPolyIndex(int); -}; +struct dBgS_SplGrpChk {}; struct Vec {}; @@ -48,11 +42,17 @@ struct dBgS_Acch { /* 800772E8 */ void CalcMovePosWork(); }; -struct cBgS_GrpPassChk {}; +struct cBgS_PolyInfo { + /* 802681A4 */ void SetPolyIndex(int); +}; -struct dBgS_RoofChk {}; +struct cBgS_PolyPassChk {}; -struct csXyz {}; +struct dBgS_SphChk {}; + +struct cM3dGPla { + /* 8026F57C */ void getCrossY(cXyz const&, f32*) const; +}; struct dBgW { /* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&); @@ -174,14 +174,14 @@ struct cBgW_GrpElm { /* 8007A1E4 */ cBgW_GrpElm(); }; -struct cBgS_GndChk {}; - struct cBgD_t {}; struct cBgS_ShdwDraw {}; struct cBgS_LinChk {}; +struct cBgS_GndChk {}; + struct cBgW { /* 80079294 */ cBgW(); /* 8007933C */ ~cBgW(); diff --git a/src/d/bg/d_bg_w_kcol.cpp b/src/d/bg/d_bg_w_kcol.cpp index 53533d9d2b8..c293fd115b7 100644 --- a/src/d/bg/d_bg_w_kcol.cpp +++ b/src/d/bg/d_bg_w_kcol.cpp @@ -27,16 +27,22 @@ struct dBgW_Base { /* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&); }; -struct dBgS_CaptPoly {}; +struct cBgS_ShdwDraw {}; -struct cBgS_GndChk {}; +struct cBgS_GrpPassChk {}; -struct Vec {}; - -struct KC_PrismData {}; +struct cBgS_LinChk {}; struct dBgS_RoofChk {}; +struct dBgS_SplGrpChk {}; + +struct dBgPc { + /* 80074048 */ void setCode(sBgPc&); +}; + +struct Vec {}; + struct dBgS_Acch { /* 800771E4 */ void GetSpeedY(); /* 80077200 */ void GetWallAddY(Vec&); @@ -44,25 +50,19 @@ struct dBgS_Acch { /* 800772E8 */ void CalcMovePosWork(); }; -struct csXyz {}; - -struct dBgPc { - /* 80074048 */ void setCode(sBgPc&); -}; - -struct cBgS_PolyPassChk {}; - -struct dBgS_SplGrpChk {}; - struct cBgS_PolyInfo { /* 802681A4 */ void SetPolyIndex(int); }; -struct cBgS_LinChk {}; +struct cBgS_PolyPassChk {}; -struct cBgS_ShdwDraw {}; +struct KC_PrismData {}; -struct cBgS_GrpPassChk {}; +struct csXyz {}; + +struct dBgS_CaptPoly {}; + +struct cBgS_GndChk {}; struct dBgS_SphChk {}; diff --git a/src/d/bg/d_bg_w_sv.cpp b/src/d/bg/d_bg_w_sv.cpp index 09689feddd6..51e6df797d9 100644 --- a/src/d/bg/d_bg_w_sv.cpp +++ b/src/d/bg/d_bg_w_sv.cpp @@ -19,11 +19,11 @@ struct dBgW_Base { struct cBgS_PolyInfo {}; -struct cXyz {}; +struct cBgD_t {}; struct csXyz {}; -struct cBgD_t {}; +struct cXyz {}; struct dBgWSv { /* 80082F98 */ void Set(cBgD_t*, u32); @@ -36,19 +36,19 @@ struct dBgWSv { /* 800835DC */ ~dBgWSv(); }; -struct dBgS_SphChk {}; - -struct dBgS_SplGrpChk {}; - -struct cBgS_PolyPassChk {}; +struct cBgS_GrpPassChk {}; struct dBgS_CaptPoly {}; +struct dBgS_RoofChk {}; + +struct dBgS_SplGrpChk {}; + struct dBgS_Acch {}; -struct cBgS_GrpPassChk {}; +struct cBgS_PolyPassChk {}; -struct dBgS_RoofChk {}; +struct dBgS_SphChk {}; struct dBgW { /* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&); @@ -98,10 +98,10 @@ struct dBgW { struct cBgS_LinChk {}; -struct cBgS_GndChk {}; - struct cBgS_ShdwDraw {}; +struct cBgS_GndChk {}; + struct cBgW { /* 8007933C */ ~cBgW(); /* 80079564 */ void CalcPlane(); diff --git a/src/d/cc/d_cc_d.cpp b/src/d/cc/d_cc_d.cpp index 4843edd98e6..6a57c6863a3 100644 --- a/src/d/cc/d_cc_d.cpp +++ b/src/d/cc/d_cc_d.cpp @@ -157,10 +157,7 @@ struct cM3dGCps { /* 8026F03C */ void Set(cM3dGCpsS const&); }; -struct cCcD_AabAttr {}; - -struct cCcD_PntAttr {}; - +struct cCcD_TriAttr; struct cCcD_ShapeAttr { struct Shape {}; @@ -171,9 +168,12 @@ struct cCcD_ShapeAttr { static f32 m_virtual_center[3]; }; +struct cCcD_AabAttr {}; + struct cCcD_CpsAttr; -struct cCcD_TriAttr; struct cCcD_SphAttr; +struct cCcD_PntAttr {}; + struct cCcD_CylAttr { /* 80084CC0 */ void GetCoCP() const; /* 80037A4C */ void GetCoCP(); diff --git a/src/d/cc/d_cc_mass_s.cpp b/src/d/cc/d_cc_mass_s.cpp index 8ce1532a939..274fc195b20 100644 --- a/src/d/cc/d_cc_mass_s.cpp +++ b/src/d/cc/d_cc_mass_s.cpp @@ -13,10 +13,10 @@ struct fopAc_ac_c {}; -struct cCcD_Obj {}; - struct cXyz {}; +struct cCcD_Obj {}; + struct dCcMassS_Obj { /* 800300F4 */ ~dCcMassS_Obj(); /* 800852E0 */ void Set(cCcD_Obj*, u8, void (*)(fopAc_ac_c*, cXyz*, u32)); @@ -24,10 +24,6 @@ struct dCcMassS_Obj { /* 800855C8 */ dCcMassS_Obj(); }; -struct dCcMassS_HitInf { - /* 80085334 */ void ClearPointer(); -}; - struct Vec {}; struct cM3dGCps { @@ -36,6 +32,10 @@ struct cM3dGCps { /* 8026F080 */ void SetCps(cM3dGCps const&); }; +struct dCcMassS_HitInf { + /* 80085334 */ void ClearPointer(); +}; + struct dCcMassS_Mng { /* 80085350 */ dCcMassS_Mng(); /* 800855E4 */ void Ct(); diff --git a/src/d/cc/d_cc_s.cpp b/src/d/cc/d_cc_s.cpp index 41aca84bcae..1688d8381fa 100644 --- a/src/d/cc/d_cc_s.cpp +++ b/src/d/cc/d_cc_s.cpp @@ -33,19 +33,15 @@ struct dJntCol_c { /* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const; }; +struct dCcD_GStts {}; + struct cCcD_Stts { /* 80263934 */ void PlusCcMove(f32, f32, f32); /* 80263970 */ void PlusDmg(int); }; -struct dCcD_GObjInf { - /* 800843DC */ void ChkAtNoGuard(); -}; - struct cCcD_GStts {}; -struct dCcD_GStts {}; - struct cCcD_ShapeAttr { struct Shape {}; }; @@ -56,6 +52,10 @@ struct cCcD_Obj { struct cCcD_GObjInf {}; +struct dCcD_GObjInf { + /* 800843DC */ void ChkAtNoGuard(); +}; + struct dCcS { /* 8002FF40 */ ~dCcS(); /* 80085ED4 */ void Ct(); diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index c796fd5de4a..822b9a4f949 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -193,10 +193,10 @@ struct dStage_nextStage_c { /* 80023E28 */ void set(char const*, s8, s16, s8, s8, u8); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dSmplMdl_draw_c { /* 80048CB4 */ dSmplMdl_draw_c(); /* 80048E0C */ void draw(); diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index d6b8a008d3b..481e30e7200 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -38,10 +38,10 @@ struct mDoExt_bpkAnm { /* 8000D518 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); @@ -71,6 +71,12 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct Vec {}; + +struct cXyz { + /* 80266B34 */ void operator-(Vec const&) const; +}; + struct cSAngle { /* 80270F68 */ cSAngle(cSAngle const&); /* 80270F98 */ cSAngle(s16); @@ -78,12 +84,6 @@ struct cSAngle { /* 80271228 */ void operator-(s16) const; }; -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - struct dAttention_c { /* 80070198 */ dAttention_c(fopAc_ac_c*, u32); /* 80070774 */ ~dAttention_c(); diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index c6512cc0f7f..07e64e49d51 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -91,7 +91,7 @@ struct daPy_py_c { /* 80182A10 */ void checkGoronSideMove() const; /* 80182AAC */ void getRightFootPosP(); /* 80182AB4 */ void getLeftFootPosP(); - /* 80182ABC */ void getMidnaActor(); + /* 80182ABC */ u32 getMidnaActor(); /* 80182AC4 */ void checkCopyRodThrowAfter() const; /* 80182AD8 */ void checkRide() const; /* 80182B9C */ void getRightHandPos() const; @@ -208,8 +208,8 @@ struct dCcMassS_Mng { struct camera_class {}; -struct dCamMapToolData { - /* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8); +struct dBgS_LinChk { + /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); }; struct cSAngle { @@ -249,8 +249,8 @@ struct cSAngle { static u8 _270[2 + 6 /* padding */]; }; -struct dBgS_LinChk { - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); +struct dCamMapToolData { + /* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8); }; struct dCamera_c { @@ -852,7 +852,7 @@ extern "C" bool __lt__7cSAngleCFRC7cSAngle(); extern "C" bool __gt__7cSAngleCFRC7cSAngle(); extern "C" void getRightFootPosP__9daPy_py_cFv(); extern "C" void getLeftFootPosP__9daPy_py_cFv(); -extern "C" void getMidnaActor__9daPy_py_cFv(); +extern "C" u32 getMidnaActor__9daPy_py_cFv(); extern "C" void checkCopyRodThrowAfter__9daPy_py_cCFv(); extern "C" void keepLock__12dAttention_cFi(); extern "C" void checkRide__9daPy_py_cCFv(); @@ -4620,15 +4620,10 @@ asm void daPy_py_c::getLeftFootPosP() { } #pragma pop -/* 80182ABC-80182AC4 17D3FC 0008+00 2/2 0/0 0/0 .text getMidnaActor__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getMidnaActor() { - nofralloc -#include "asm/d/d_camera/getMidnaActor__9daPy_py_cFv.s" +/* 80182ABC-80182AC4 -00001 0008+00 0/0 0/0 0/0 .text getMidnaActor__9daPy_py_cFv */ +u32 daPy_py_c::getMidnaActor() { + return *(u32*)(&daPy_py_c::m_midnaActor); } -#pragma pop /* 80182AC4-80182AD0 17D404 000C+00 1/1 0/0 0/0 .text checkCopyRodThrowAfter__9daPy_py_cCFv */ #pragma push diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index d3a80f2e348..4728d670c4e 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -17,10 +17,10 @@ struct mDoGph_gInf_c { /* 80007FD8 */ void fadeOut(f32, _GXColor&); }; -struct Vec {}; - struct J3DAnmTransform {}; +struct Vec {}; + struct mDoExt_McaMorf { /* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*); /* 800105C8 */ void play(Vec*, u32, s8); @@ -54,10 +54,10 @@ struct cXyz { /* 80009184 */ ~cXyz(); }; -struct dKy_tevstr_c {}; - struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -110,10 +110,10 @@ struct JStage { /* 80280B88 */ void JSGGetColor() const; }; - struct TECameraProjection {}; - struct TECameraView {}; + struct TECameraProjection {}; + struct TCamera { /* 80280BA0 */ ~TCamera(); /* 80280C00 */ s32 JSGFGetType() const; diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index c3d307dca2a..1ec614760e0 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -80,10 +80,10 @@ struct dDlst_shadowRealPoly_c { /* 800569A8 */ s32 getTriMax(); }; -struct cBgD_Vtx_t {}; - struct cM3dGPla {}; +struct cBgD_Vtx_t {}; + struct dDlst_shadowPoly_c { /* 80054288 */ void set(cBgD_Vtx_t*, u16, u16, u16, cM3dGPla*); /* 800543B4 */ void draw(); @@ -109,6 +109,8 @@ struct dDlst_peekZ_c { /* 80056080 */ void peekData(); }; +struct dDlst_base_c {}; + struct J3DPacket {}; struct J3DDrawBuffer { @@ -120,8 +122,6 @@ struct J3DDrawBuffer { /* 803254AC */ void draw() const; }; -struct dDlst_base_c {}; - struct _GXColor {}; struct dDlst_list_c { diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp index 1de4bfea801..d3f8584e67c 100644 --- a/src/d/d_jnt_col.cpp +++ b/src/d/d_jnt_col.cpp @@ -37,14 +37,14 @@ struct mDoMtx_stack_c { struct fopAc_ac_c {}; -struct J3DModel {}; +struct dJntColData_c {}; struct cM3dGLin { /* 80036A5C */ ~cM3dGLin(); /* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&); }; -struct dJntColData_c {}; +struct J3DModel {}; struct dJntCol_c { /* 80035C8C */ dJntCol_c(); diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index 74b4939e7aa..e02f7800785 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -31,10 +31,10 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_bckAnm { /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D9CC */ void entry(J3DModelData*, f32); diff --git a/src/d/d_model.cpp b/src/d/d_model.cpp index fb8b968a2fb..0327aa04de5 100644 --- a/src/d/d_model.cpp +++ b/src/d/d_model.cpp @@ -17,10 +17,10 @@ struct dStage_roomControl_c { struct dMdl_obj_c {}; -struct dKy_tevstr_c {}; - struct J3DModelData {}; +struct dKy_tevstr_c {}; + struct dMdl_mng_c { /* 8009C6DC */ void search(J3DModelData*, u16, dKy_tevstr_c*); /* 8009C724 */ void entry(J3DModelData*, u16, dKy_tevstr_c*); diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index 1daa0009b30..6d1186295d8 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -15,10 +15,10 @@ struct mDoCPd_c { static u8 m_cpadInfo[256]; }; -struct JKRArchive {}; - struct J2DPane {}; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp index cb75de20f7c..1f955b0a303 100644 --- a/src/d/d_select_cursor.cpp +++ b/src/d/d_select_cursor.cpp @@ -19,15 +19,15 @@ struct dSelect_icon_c { /* 80195B70 */ void setPos(J2DPane*, f32, f32); }; -struct JKRArchive {}; - struct J2DAnmTextureSRTKey {}; +struct J2DAnmColor {}; + struct J2DAnmTransformKey { /* 801959C0 */ ~J2DAnmTransformKey(); }; -struct J2DAnmColor {}; +struct JKRArchive {}; struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index b8119371264..e94f6d674f3 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -101,31 +101,31 @@ struct dStage_startStage_c { /* 8002419C */ void set(char const*, s8, s16, s8); }; -struct dStage_Lbnk_c {}; - -struct dStage_DMap_c {}; - -struct dStage_FileList2_dt_c {}; - -struct dStage_FloorInfo_c {}; - -struct dStage_dPnt_c {}; - -struct dStage_Elst_c {}; - -struct dStage_dPath_c {}; - -struct dStage_SoundInfo_c {}; - -struct dStage_FileList_dt_c {}; - -struct dStage_MemoryMap_c {}; +struct dStage_Multi_c {}; struct dStage_MemoryConfig_c {}; struct dStage_MapEventInfo_c {}; -struct dStage_Multi_c {}; +struct dStage_SoundInfo_c {}; + +struct dStage_MemoryMap_c {}; + +struct dStage_DMap_c {}; + +struct dStage_dPnt_c {}; + +struct dStage_dPath_c {}; + +struct dStage_FloorInfo_c {}; + +struct dStage_Lbnk_c {}; + +struct dStage_Elst_c {}; + +struct dStage_FileList2_dt_c {}; + +struct dStage_FileList_dt_c {}; struct dStage_stageDt_c { /* 8002483C */ void getStagInfo() const; diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 4ba6f3e9374..d6a0174a69b 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -73,13 +73,13 @@ struct dDlst_list_c { /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); }; -struct JKRArchive {}; - struct J2DPane { /* 802F7AFC */ void getParentPane(); /* 802F7FCC */ void animationTransform(); }; +struct JKRArchive {}; + struct dDlst_TimerScrnDraw_c { /* 8025DB38 */ dDlst_TimerScrnDraw_c(); /* 8025DBE0 */ void setHIO(); diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp index a24fba16a71..ff05ff81635 100644 --- a/src/d/event/d_event_manager.cpp +++ b/src/d/event/d_event_manager.cpp @@ -43,8 +43,6 @@ struct dEvt_control_c { /* 800436F4 */ void setPtD(void*); }; -struct dEvDtData_c {}; - struct dEvDtStaff_c { /* 80044134 */ void init(); }; @@ -60,6 +58,8 @@ struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dEvDtData_c {}; + struct dEvent_manager_c { /* 800465E8 */ void getSubstance(dEvDtData_c*, int); /* 80046688 */ dEvent_manager_c(); diff --git a/src/d/file/d_file_sel_warning.cpp b/src/d/file/d_file_sel_warning.cpp index 8450da94d6f..f6352c5b37b 100644 --- a/src/d/file/d_file_sel_warning.cpp +++ b/src/d/file/d_file_sel_warning.cpp @@ -16,12 +16,12 @@ struct dMsgString_c { /* 80249D28 */ ~dMsgString_c(); }; -struct JKRArchive {}; - struct JUtility { struct TColor {}; }; +struct JKRArchive {}; + struct dFile_warning_c { /* 80191BAC */ dFile_warning_c(JKRArchive*, u8); /* 80191C18 */ ~dFile_warning_c(); diff --git a/src/d/file/d_file_select.cpp b/src/d/file/d_file_select.cpp index 65bed4b3508..27adf9a6a18 100644 --- a/src/d/file/d_file_select.cpp +++ b/src/d/file/d_file_select.cpp @@ -34,14 +34,14 @@ struct mDoGph_gInf_c { static u8 mFader[4]; }; -struct J3DMaterialTable {}; - struct J3DModelData {}; struct J3DAnmTevRegKey { /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); }; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); @@ -83,8 +83,6 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct JKRArchive {}; - struct J2DAnmTextureSRTKey { /* 80184274 */ ~J2DAnmTextureSRTKey(); }; @@ -103,6 +101,8 @@ struct J2DPane { /* 802F7FCC */ void animationTransform(); }; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 46b7f0cab44..e2d7ce60e5d 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -73,14 +73,6 @@ struct dStage_roomControl_c { static u8 mStatus[65792]; }; -struct _GXColorS10 {}; - -struct dKy_tevstr_c {}; - -struct J3DModelData { - /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); -}; - struct Vec {}; struct cXyz { @@ -90,6 +82,14 @@ struct cXyz { /* 80266B84 */ void operator*(f32) const; }; +struct J3DModelData { + /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); +}; + +struct _GXColorS10 {}; + +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 8019F2E8 */ dScnKy_env_light_c(); /* 8019F4FC */ void setDaytime(); diff --git a/src/d/kankyo/d_kankyo_rain.cpp b/src/d/kankyo/d_kankyo_rain.cpp index 7eb6ea461af..4e5546a9b40 100644 --- a/src/d/kankyo/d_kankyo_rain.cpp +++ b/src/d/kankyo/d_kankyo_rain.cpp @@ -44,6 +44,8 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct Vec {}; struct cXyz { @@ -51,15 +53,13 @@ struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - struct csXyz { /* 80018BD0 */ ~csXyz(); /* 802673F4 */ csXyz(s16, s16, s16); }; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp index c183dc94d66..2d416e6d510 100644 --- a/src/d/kankyo/d_kankyo_wether.cpp +++ b/src/d/kankyo/d_kankyo_wether.cpp @@ -27,6 +27,8 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct Vec {}; struct cXyz { @@ -40,12 +42,10 @@ struct cXyz { static f32 Zero[3]; }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/src/d/map/d_map.cpp b/src/d/map/d_map.cpp index 0811a4447a7..5486f66dd77 100644 --- a/src/d/map/d_map.cpp +++ b/src/d/map/d_map.cpp @@ -31,8 +31,6 @@ struct renderingPlusDoorAndCursor_c { /* 80040ADC */ void getIconPosition(dTres_c::typeGroupData_c*) const; }; -struct Vec {}; - struct dDrawPath_c { struct room_class {}; @@ -51,6 +49,8 @@ struct dDrawPath_c { /* 8003CCC4 */ void drawPath(); }; +struct Vec {}; + struct renderingDAmap_c { /* 8002B150 */ ~renderingDAmap_c(); /* 8003FCC8 */ void init(u8*, u16, u16, u16, u16); diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp index aac5c39b2c1..6cc5213640e 100644 --- a/src/d/map/d_map_path_dmap.cpp +++ b/src/d/map/d_map_path_dmap.cpp @@ -137,7 +137,7 @@ struct dMpath_n { }; struct dMpath_c { - /* 8003F758 */ void isExistMapPathData(); + /* 8003F758 */ u8 isExistMapPathData(); /* 8003F760 */ void getTopBottomFloorNo(s8*, s8*); /* 8003F7E8 */ void createWork(); /* 8003FA40 */ void setPointer(s8, void*, int); @@ -218,7 +218,7 @@ extern "C" void init__10dMapInfo_cFv(); extern "C" void reset__10dMapInfo_cFv(); extern "C" void create__10dMapInfo_cFv(); extern "C" void remove__10dMapInfo_cFv(); -extern "C" void isExistMapPathData__8dMpath_cFv(); +extern "C" u8 isExistMapPathData__8dMpath_cFv(); extern "C" void getTopBottomFloorNo__8dMpath_cFPScPSc(); extern "C" void createWork__8dMpath_cFv(); extern "C" void setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc(); @@ -629,18 +629,13 @@ f32 dMpath_c::mAllSizeX; /* 80450E84-80450E88 000384 0004+00 1/1 4/4 0/0 .sbss mAllSizeZ__8dMpath_c */ f32 dMpath_c::mAllSizeZ; -/* 80450E88-80450E90 000388 0008+00 4/4 0/0 0/0 .sbss None */ +/* 80450E88-80450E90 000388 0008+00 4/3 0/0 0/0 .sbss None */ static u8 data_80450E88[8]; -/* 8003F758-8003F760 03A098 0008+00 2/2 1/1 0/0 .text isExistMapPathData__8dMpath_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMpath_c::isExistMapPathData() { - nofralloc -#include "asm/d/map/d_map_path_dmap/isExistMapPathData__8dMpath_cFv.s" +/* 8003F758-8003F760 -00001 0008+00 0/0 0/0 0/0 .text isExistMapPathData__8dMpath_cFv */ +u8 dMpath_c::isExistMapPathData() { + return *(u8*)(&data_80450E88); } -#pragma pop /* ############################################################################################## */ /* 80450630-80450634 0000B0 0004+00 0/0 1/1 2/2 .sdata mNextRoomNo__10dMapInfo_c */ diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp index 5d392d5e8a8..c29e13594c9 100644 --- a/src/d/menu/d_menu_collect.cpp +++ b/src/d/menu/d_menu_collect.cpp @@ -19,14 +19,14 @@ struct mDoGph_gInf_c { static u8 mFader[4]; }; -struct J3DMaterialTable {}; - struct J3DModelData {}; struct J3DAnmTevRegKey { /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); }; +struct J3DMaterialTable {}; + struct mDoExt_brkAnm { /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); @@ -76,10 +76,10 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct JKRArchive {}; - struct J2DPane {}; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -120,6 +120,14 @@ struct dMenu_save_c { /* 801F69B8 */ void _draw(); }; +struct STControl { + /* 8003219C */ void checkTrigger(); + /* 8003242C */ void checkLeftTrigger(); + /* 800324A8 */ void checkRightTrigger(); + /* 80032524 */ void checkUpTrigger(); + /* 800325A0 */ void checkDownTrigger(); +}; + struct JKRHeap { /* 802CE5CC */ void freeAll(); /* 802CE784 */ void getTotalFreeSize(); @@ -131,14 +139,6 @@ struct JKRExpHeap { struct CSTControl {}; -struct STControl { - /* 8003219C */ void checkTrigger(); - /* 8003242C */ void checkLeftTrigger(); - /* 800324A8 */ void checkRightTrigger(); - /* 80032524 */ void checkUpTrigger(); - /* 800325A0 */ void checkDownTrigger(); -}; - struct dMenu_Skill_c { /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); /* 801F7718 */ void _move(); diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/menu/d_menu_dmap.cpp index 5898151ff97..8794862b3e9 100644 --- a/src/d/menu/d_menu_dmap.cpp +++ b/src/d/menu/d_menu_dmap.cpp @@ -50,8 +50,6 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct JKRArchive {}; - struct J2DBasePosition {}; struct J2DPane { @@ -59,6 +57,8 @@ struct J2DPane { /* 802F76F8 */ void setBasePosition(J2DBasePosition); }; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -95,8 +95,6 @@ struct dMeterHaihai_c { /* 8020BC20 */ void setScale(f32); }; -struct JMSMesgEntry_c {}; - struct ResTIMG {}; struct J2DPicture { @@ -105,6 +103,8 @@ struct J2DPicture { /* 802FC708 */ J2DPicture(ResTIMG const*); }; +struct JMSMesgEntry_c {}; + struct dMeter2Info_c { /* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*); /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); @@ -142,10 +142,6 @@ struct dMenu_StageMapCtrl_c { struct J2DOrthoGraph {}; -struct JKRExpHeap { - /* 802CEE2C */ void create(u32, JKRHeap*, bool); -}; - struct STControl { /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16); /* 8003219C */ void checkTrigger(); @@ -155,6 +151,10 @@ struct STControl { /* 800325A0 */ void checkDownTrigger(); }; +struct JKRExpHeap { + /* 802CEE2C */ void create(u32, JKRHeap*, bool); +}; + struct dMenu_ItemExplain_c { /* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool); /* 801DB470 */ void move(); @@ -162,6 +162,8 @@ struct dMenu_ItemExplain_c { /* 801DC3C8 */ void openExplainDmap(u8, u8, u8, bool, u8); }; +struct CSTControl {}; + struct JGeometry { template struct TBox2 {}; @@ -180,8 +182,6 @@ struct J2DScreen { /* 802F9690 */ void animation(); }; -struct CSTControl {}; - struct dMenu_Dmap_c { /* 801BB498 */ dMenu_Dmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8); /* 801BB634 */ void screenInit(); diff --git a/src/d/menu/d_menu_dmap_map.cpp b/src/d/menu/d_menu_dmap_map.cpp index f65337346c4..31879abfc8d 100644 --- a/src/d/menu/d_menu_dmap_map.cpp +++ b/src/d/menu/d_menu_dmap_map.cpp @@ -47,8 +47,6 @@ struct renderingDmap_c { /* 801C263C */ bool isRendIcon() const; }; -struct Vec {}; - struct dDrawPath_c { struct line_class {}; @@ -66,6 +64,8 @@ struct dDrawPath_c { /* 8003CCC4 */ void drawPath(); }; +struct Vec {}; + struct renderingDAmap_c { /* 8003FCC8 */ void init(u8*, u16, u16, u16, u16); /* 8003FD08 */ void entry(f32, f32, f32, int, s8); diff --git a/src/d/menu/d_menu_fishing.cpp b/src/d/menu/d_menu_fishing.cpp index 099ded02254..e8dd9d6ce5f 100644 --- a/src/d/menu/d_menu_fishing.cpp +++ b/src/d/menu/d_menu_fishing.cpp @@ -36,12 +36,12 @@ struct dMeter2Info_c { /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); }; +struct STControl {}; + struct JKRExpHeap {}; struct CSTControl {}; -struct STControl {}; - struct dMenu_Fishing_c { /* 801C4D54 */ dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*); /* 801C4D98 */ ~dMenu_Fishing_c(); diff --git a/src/d/menu/d_menu_fmap.cpp b/src/d/menu/d_menu_fmap.cpp index fe494569153..2ee88243413 100644 --- a/src/d/menu/d_menu_fmap.cpp +++ b/src/d/menu/d_menu_fmap.cpp @@ -100,16 +100,16 @@ struct dMenu_Fmap_world_data_c { struct dMenu_Fmap_stage_data_c {}; +struct STControl { + /* 8003219C */ void checkTrigger(); +}; + struct JKRExpHeap { /* 802CEE2C */ void create(u32, JKRHeap*, bool); }; struct CSTControl {}; -struct STControl { - /* 8003219C */ void checkTrigger(); -}; - struct dMenu_Fmap_c { /* 801C66E4 */ dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8); /* 801C6AC8 */ ~dMenu_Fmap_c(); diff --git a/src/d/menu/d_menu_fmap2D.cpp b/src/d/menu/d_menu_fmap2D.cpp index dc0fb640a5d..71063fdfc4a 100644 --- a/src/d/menu/d_menu_fmap2D.cpp +++ b/src/d/menu/d_menu_fmap2D.cpp @@ -34,10 +34,10 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct J2DOrthoGraph {}; - struct STControl {}; +struct J2DOrthoGraph {}; + struct dMsgScrnExplain_c { /* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8); /* 8023D918 */ void draw(J2DOrthoGraph*); @@ -56,7 +56,7 @@ struct dMeter2Info_c { struct J2DAnmTextureSRTKey {}; -struct JKRArchive {}; +struct JKRExpHeap {}; struct JGeometry { template @@ -69,6 +69,8 @@ struct J2DGrafContext { /* 802E90C0 */ void scissor(JGeometry::TBox2 const&); }; +struct JKRArchive {}; + struct J2DScreen { /* 802F8498 */ J2DScreen(); /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); @@ -76,8 +78,6 @@ struct J2DScreen { /* 802F9690 */ void animation(); }; -struct JKRExpHeap {}; - struct CPaneMgrAlpha { /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*); /* 80255608 */ void hide(); diff --git a/src/d/menu/d_menu_fmap_map.cpp b/src/d/menu/d_menu_fmap_map.cpp index b6006a58289..a0e05aa75c2 100644 --- a/src/d/menu/d_menu_fmap_map.cpp +++ b/src/d/menu/d_menu_fmap_map.cpp @@ -11,8 +11,6 @@ // Types: // -struct dMenu_Fmap_world_data_c {}; - struct dDrawPath_c { struct group_class {}; @@ -34,6 +32,8 @@ struct dMenu_Fmap_region_data_c { /* 8003DB70 */ void getPointStagePathInnerNo(f32, f32, int, int*, int*); }; +struct dMenu_Fmap_world_data_c {}; + struct renderingFmap_c { struct palette_e {}; diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp index f4c71d9a277..461221989d8 100644 --- a/src/d/menu/d_menu_insect.cpp +++ b/src/d/menu/d_menu_insect.cpp @@ -40,10 +40,10 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct JKRArchive {}; - struct J2DPane {}; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -90,10 +90,6 @@ struct dMeter2Info_c { J2DPicture*, void*, J2DPicture*, int); }; -struct JKRExpHeap {}; - -struct CSTControl {}; - struct STControl { /* 8003219C */ void checkTrigger(); /* 8003242C */ void checkLeftTrigger(); @@ -102,6 +98,10 @@ struct STControl { /* 800325A0 */ void checkDownTrigger(); }; +struct JKRExpHeap {}; + +struct CSTControl {}; + struct dMenu_Insect_c { /* 801D8114 */ dMenu_Insect_c(JKRExpHeap*, STControl*, CSTControl*, u8); /* 801D82F4 */ ~dMenu_Insect_c(); diff --git a/src/d/menu/d_menu_item_explain.cpp b/src/d/menu/d_menu_item_explain.cpp index 7eb06e996cc..04e152b9119 100644 --- a/src/d/menu/d_menu_item_explain.cpp +++ b/src/d/menu/d_menu_item_explain.cpp @@ -52,8 +52,6 @@ struct dMsgScrn3Select_c { /* 8023A97C */ void getCharSpace(); }; -struct ResTLUT {}; - struct JGeometry { template struct TBox2 {}; @@ -63,6 +61,8 @@ struct JGeometry { struct ResTIMG {}; +struct ResTLUT {}; + struct J2DPicture { /* 802FC708 */ J2DPicture(ResTIMG const*); /* 802FC800 */ J2DPicture(u64, JGeometry::TBox2 const&, ResTIMG const*, ResTLUT const*); @@ -81,16 +81,16 @@ struct dMeter2Info_c { struct J2DOrthoGraph {}; -struct JKRExpHeap {}; - -struct JKRArchive {}; - struct STControl { /* 8003219C */ void checkTrigger(); /* 80032524 */ void checkUpTrigger(); /* 800325A0 */ void checkDownTrigger(); }; +struct JKRExpHeap {}; + +struct JKRArchive {}; + struct dMenu_ItemExplain_c { /* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool); /* 801DAFF0 */ ~dMenu_ItemExplain_c(); diff --git a/src/d/menu/d_menu_letter.cpp b/src/d/menu/d_menu_letter.cpp index 90a0d08aab3..53f471e9230 100644 --- a/src/d/menu/d_menu_letter.cpp +++ b/src/d/menu/d_menu_letter.cpp @@ -31,12 +31,12 @@ struct dSv_letter_info_c { /* 8003449C */ void isLetterReadFlag(int) const; }; -struct JKRArchive {}; - struct J2DPane { /* 802F7100 */ void getBounds(); }; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -85,15 +85,15 @@ struct dMeter2Info_c { /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); }; -struct JKRExpHeap {}; - -struct CSTControl {}; - struct STControl { /* 80032524 */ void checkUpTrigger(); /* 800325A0 */ void checkDownTrigger(); }; +struct JKRExpHeap {}; + +struct CSTControl {}; + struct dMenu_Letter_c { /* 801DCDC0 */ dMenu_Letter_c(JKRExpHeap*, STControl*, CSTControl*); /* 801DCF34 */ ~dMenu_Letter_c(); diff --git a/src/d/menu/d_menu_option.cpp b/src/d/menu/d_menu_option.cpp index 41391643b8f..88db5dff878 100644 --- a/src/d/menu/d_menu_option.cpp +++ b/src/d/menu/d_menu_option.cpp @@ -32,8 +32,6 @@ struct dSv_player_config_c { /* 8003469C */ void setVibration(u8); }; -struct JKRArchive {}; - struct J2DBasePosition {}; struct J2DPane { @@ -42,6 +40,8 @@ struct J2DPane { /* 802F7FCC */ void animationTransform(); }; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); diff --git a/src/d/menu/d_menu_ring.cpp b/src/d/menu/d_menu_ring.cpp index 7a9a14724ef..97ebda585f6 100644 --- a/src/d/menu/d_menu_ring.cpp +++ b/src/d/menu/d_menu_ring.cpp @@ -69,12 +69,12 @@ struct dMeter2Draw_c { JUtility::TColor, JUtility::TColor, f32, u8); }; +struct STControl {}; + struct JKRExpHeap {}; struct CSTControl {}; -struct STControl {}; - struct dMenu_Ring_c { /* 801E9118 */ dMenu_Ring_c(JKRExpHeap*, STControl*, CSTControl*, u8); /* 801EA708 */ ~dMenu_Ring_c(); diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp index dcb486a0e85..0f404b81c13 100644 --- a/src/d/menu/d_menu_save.cpp +++ b/src/d/menu/d_menu_save.cpp @@ -62,12 +62,12 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct JKRArchive {}; - struct J2DPane { /* 802F7FCC */ void animationTransform(); }; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -80,8 +80,6 @@ struct dMsgString_c { /* 80249D28 */ ~dMsgString_c(); }; -struct J2DOrthoGraph {}; - struct STControl { /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16); /* 8003219C */ void checkTrigger(); @@ -91,6 +89,8 @@ struct STControl { /* 800325A0 */ void checkDownTrigger(); }; +struct J2DOrthoGraph {}; + struct dMsgScrnExplain_c { /* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8); /* 8023D7D8 */ void move(); diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp index 49fd7aaf801..0e4ff7cf1d8 100644 --- a/src/d/menu/d_menu_skill.cpp +++ b/src/d/menu/d_menu_skill.cpp @@ -33,10 +33,10 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct JKRArchive {}; - struct J2DPane {}; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -56,15 +56,15 @@ struct dMeter2Info_c { /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); }; -struct JKRExpHeap {}; - -struct CSTControl {}; - struct STControl { /* 80032524 */ void checkUpTrigger(); /* 800325A0 */ void checkDownTrigger(); }; +struct JKRExpHeap {}; + +struct CSTControl {}; + struct dMenu_Skill_c { /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); /* 801F7348 */ ~dMenu_Skill_c(); diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index db7c090de0c..900ec5a8f4b 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -162,16 +162,16 @@ struct dMenu_save_c { /* 801F69FC */ void _draw2(); }; -struct JKRExpHeap {}; - -struct CSTControl {}; - struct STControl { /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16); /* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16); /* 8003219C */ void checkTrigger(); }; +struct JKRExpHeap {}; + +struct CSTControl {}; + struct dMenu_Skill_c { /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); /* 801F7718 */ void _move(); diff --git a/src/d/meter/d_meter2_draw.cpp b/src/d/meter/d_meter2_draw.cpp index 8dbbd9d3943..c5566e2e0ce 100644 --- a/src/d/meter/d_meter2_draw.cpp +++ b/src/d/meter/d_meter2_draw.cpp @@ -29,10 +29,6 @@ struct dMsgObject_c { /* 8023822C */ void getStatus(); }; -struct JMSMesgEntry_c {}; - -struct ResTLUT {}; - struct JGeometry { template struct TBox2 {}; @@ -42,11 +38,15 @@ struct JGeometry { struct ResTIMG {}; +struct ResTLUT {}; + struct J2DPicture { /* 802FC708 */ J2DPicture(ResTIMG const*); /* 802FC800 */ J2DPicture(u64, JGeometry::TBox2 const&, ResTIMG const*, ResTLUT const*); }; +struct JMSMesgEntry_c {}; + struct dMeter2Info_c { /* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*); /* 8021C370 */ void getStringKana(u32, char*, JMSMesgEntry_c*); @@ -56,25 +56,6 @@ struct dMeter2Info_c { J2DPicture*, void*, J2DPicture*, int); }; -struct JKRExpHeap {}; - -struct JUtility { - struct TColor {}; -}; - -struct JKRArchive { - /* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*); -}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9690 */ void animation(); -}; - struct J2DRotateAxis {}; struct J2DBasePosition {}; @@ -87,6 +68,25 @@ struct J2DPane { /* 802F7FCC */ void animationTransform(); }; +struct JKRExpHeap {}; + +struct JUtility { + struct TColor {}; +}; + +struct J2DGrafContext {}; + +struct JKRArchive { + /* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*); +}; + +struct J2DScreen { + /* 802F8498 */ J2DScreen(); + /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); + /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); + /* 802F9690 */ void animation(); +}; + struct CPaneMgr { /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); /* 80254458 */ void setBlackWhite(JUtility::TColor, JUtility::TColor); @@ -94,6 +94,8 @@ struct CPaneMgr { /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); }; +struct J2DAnmColor {}; + struct CPaneMgrAlpha { /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*); /* 802555C8 */ void show(); @@ -103,8 +105,6 @@ struct CPaneMgrAlpha { /* 80255828 */ void getAlphaRate(); }; -struct J2DAnmColor {}; - struct dMeter2Draw_c { /* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*); /* 802102F8 */ ~dMeter2Draw_c(); diff --git a/src/d/meter/d_meter2_info.cpp b/src/d/meter/d_meter2_info.cpp index a1dbeb6f3ae..43dd5dc8fbb 100644 --- a/src/d/meter/d_meter2_info.cpp +++ b/src/d/meter/d_meter2_info.cpp @@ -64,18 +64,18 @@ struct dMeterMap_c { /* 8020D900 */ void isMapOpenCheck(); }; +struct cXyz {}; + +struct J2DPicture {}; + struct J2DTextBox { /* 8021C7F4 */ void getFont() const; }; -struct JUTFont {}; - -struct J2DPicture {}; - -struct cXyz {}; - struct JMSMesgEntry_c {}; +struct JUTFont {}; + struct dMeter2Info_c { /* 8021BDDC */ dMeter2Info_c(); /* 8021BE20 */ ~dMeter2Info_c(); diff --git a/src/d/meter/d_meter_button.cpp b/src/d/meter/d_meter_button.cpp index 09c0d45ab15..5234c24f121 100644 --- a/src/d/meter/d_meter_button.cpp +++ b/src/d/meter/d_meter_button.cpp @@ -54,22 +54,22 @@ struct dMsgObject_c { /* 80238258 */ void getScrnDrawPtr(); }; -struct JKRArchive {}; +struct J2DPane { + /* 802F7100 */ void getBounds(); +}; + +struct JKRExpHeap {}; struct J2DGrafContext {}; +struct JKRArchive {}; + struct J2DScreen { /* 802F8498 */ J2DScreen(); /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); }; -struct J2DPane { - /* 802F7100 */ void getBounds(); -}; - -struct JKRExpHeap {}; - struct CPaneMgr { /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); /* 80253930 */ CPaneMgr(); diff --git a/src/d/meter/d_meter_haihai.cpp b/src/d/meter/d_meter_haihai.cpp index f7c1b8cc03c..d2aa793f708 100644 --- a/src/d/meter/d_meter_haihai.cpp +++ b/src/d/meter/d_meter_haihai.cpp @@ -15,12 +15,12 @@ struct dMeterSub_c { /* 80194138 */ bool isDead(); }; -struct J2DAnmTransformKey {}; - struct J2DAnmTextureSRTKey {}; struct J2DAnmColor {}; +struct J2DAnmTransformKey {}; + struct dMeterHaihai_c { /* 8020AE8C */ dMeterHaihai_c(u8); /* 8020AEF0 */ ~dMeterHaihai_c(); diff --git a/src/d/meter/d_meter_map.cpp b/src/d/meter/d_meter_map.cpp index d538416aa93..2da1dcb8b9d 100644 --- a/src/d/meter/d_meter_map.cpp +++ b/src/d/meter/d_meter_map.cpp @@ -36,10 +36,6 @@ struct dMsgObject_c { /* 8023822C */ void getStatus(); }; -struct dMpath_c { - /* 8003F758 */ void isExistMapPathData(); -}; - struct J2DScreen {}; struct dMeterMap_c { diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp index 382576ac768..6e6f73717d6 100644 --- a/src/d/msg/d_msg_class.cpp +++ b/src/d/msg/d_msg_class.cpp @@ -19,6 +19,12 @@ struct jmessage_tControl { /* 802299EC */ jmessage_tControl(); }; +struct Vec {}; + +struct cXyz { + /* 80266B34 */ void operator-(Vec const&) const; +}; + struct jmessage_tReference { /* 80228B04 */ jmessage_tReference(); /* 80228CB4 */ ~jmessage_tReference(); @@ -51,12 +57,6 @@ struct jmessage_tReference { /* 80232A20 */ void getActorPos(); }; -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - struct jmessage_tSequenceProcessor { /* 8022B558 */ jmessage_tSequenceProcessor(jmessage_tReference const*, jmessage_tControl*); /* 8022B654 */ void do_reset(); diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp index b3685441f47..77e80f14169 100644 --- a/src/d/msg/d_msg_object.cpp +++ b/src/d/msg/d_msg_object.cpp @@ -13,14 +13,14 @@ struct msg_class {}; -struct JKRHeap { - /* 802CE784 */ void getTotalFreeSize(); -}; - struct JKRArchive { struct EMountMode {}; }; +struct JKRHeap { + /* 802CE784 */ void getTotalFreeSize(); +}; + struct mDoDvdThd_mountXArchive_c { /* 800161E0 */ void create(char const*, u8, JKRArchive::EMountMode, JKRHeap*); }; diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index d6d00e64cb6..b7ea6c41f58 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -68,16 +68,8 @@ struct dPa_wbPcallBack_c { /* 8004FECC */ ~dPa_wbPcallBack_c(); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; -struct JPAParticleCallBack { - /* 800183D4 */ void execute(JPABaseEmitter*, JPABaseParticle*); - /* 800183D8 */ void draw(JPABaseEmitter*, JPABaseParticle*); - /* 8027EFA4 */ ~JPAParticleCallBack(); -}; - struct JGeometry { template struct TVec3 {}; @@ -85,6 +77,8 @@ struct JGeometry { struct TVec3__template0 {}; }; +struct JPADrawInfo {}; + struct JPAEmitterCallBack { /* 80050368 */ void execute(JPABaseEmitter*); /* 8005036C */ void draw(JPABaseEmitter*); @@ -102,7 +96,11 @@ struct JPAResourceManager { /* 80273FCC */ void getResUserWork(u16) const; }; -struct JPADrawInfo {}; +struct JPAParticleCallBack { + /* 800183D4 */ void execute(JPABaseEmitter*, JPABaseParticle*); + /* 800183D8 */ void draw(JPABaseEmitter*, JPABaseParticle*); + /* 8027EFA4 */ ~JPAParticleCallBack(); +}; struct JPAEmitterManager { /* 8027DCA0 */ JPAEmitterManager(u32, u32, JKRHeap*, u8, u8); @@ -115,6 +113,8 @@ struct JPAEmitterManager { /* 8027E354 */ void clearResourceManager(u8); }; +struct dKy_tevstr_c {}; + struct dPa_simpleEcallBack { /* 8004ADF4 */ dPa_simpleEcallBack(); /* 8004AE1C */ void executeAfter(JPABaseEmitter*); @@ -385,14 +385,14 @@ struct J3DShape { static u8 sOldVcdVatCmd[4]; }; -struct J3DAnmTexPattern { - /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); -}; - struct J3DAnmTevRegKey { /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); }; +struct J3DAnmTexPattern { + /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); +}; + struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); diff --git a/src/d/particle/d_particle_copoly.cpp b/src/d/particle/d_particle_copoly.cpp index 11f9825b772..8527e08a5e2 100644 --- a/src/d/particle/d_particle_copoly.cpp +++ b/src/d/particle/d_particle_copoly.cpp @@ -11,10 +11,10 @@ // Types: // -struct dKy_tevstr_c {}; - struct cBgS_PolyInfo {}; +struct dKy_tevstr_c {}; + struct csXyz {}; struct cXyz {}; diff --git a/src/d/shop/d_shop_system.cpp b/src/d/shop/d_shop_system.cpp index 44681fd1962..7095149013d 100644 --- a/src/d/shop/d_shop_system.cpp +++ b/src/d/shop/d_shop_system.cpp @@ -23,7 +23,7 @@ struct daNpcT_motionAnmData_c {}; struct daNpcT_faceMotionAnmData_c {}; -struct J3DModel {}; +struct J3DJoint {}; struct Vec {}; @@ -31,7 +31,7 @@ struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; -struct J3DJoint {}; +struct J3DModel {}; struct daNpcT_c { /* 801490D4 */ void ctrlBtk(); diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index b568b9b9dd2..8caacf27cd4 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -63,12 +63,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct _GXColor {}; + struct cXyz { static f32 Zero[3]; }; -struct _GXColor {}; - struct csXyz { /* 80018BD0 */ ~csXyz(); }; diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 1deee3700b2..72ee869d957 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -93,18 +93,18 @@ struct dStage_roomControl_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; +struct _GXColor {}; struct cBgS_PolyInfo {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); static u8 Zero[4]; }; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index f318fc43b7c..593a4fb7ebd 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -15,14 +15,14 @@ struct layer_class {}; struct dPa_levelEcallBack {}; -struct cXyz {}; - -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct cXyz {}; + struct csXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/src/f_pc/f_pc_layer.cpp b/src/f_pc/f_pc_layer.cpp index 5b1f7e7df89..9c633e00e95 100644 --- a/src/f_pc/f_pc_layer.cpp +++ b/src/f_pc/f_pc_layer.cpp @@ -41,7 +41,7 @@ extern "C" void fpcLy_CreatingMesg__FP11layer_class(); extern "C" void fpcLy_CreatedMesg__FP11layer_class(); extern "C" void fpcLy_RootLayer__Fv(); extern "C" void fpcLy_SetCurrentLayer__FP11layer_class(); -extern "C" void fpcLy_CurrentLayer__Fv(); +extern "C" u32 fpcLy_CurrentLayer__Fv(); extern "C" static void fpcLy_Search__FUi(); extern "C" void fpcLy_Layer__FUi(); extern "C" static void fpcLy_Regist__FP11layer_class(); @@ -227,7 +227,7 @@ asm void fpcLy_RootLayer() { #pragma pop /* ############################################################################################## */ -/* 80450D18-80450D1C 000218 0004+00 2/2 0/0 0/0 .sbss l_fpcLy_CurrLayer_p */ +/* 80450D18-80450D1C 000218 0004+00 2/1 0/0 0/0 .sbss l_fpcLy_CurrLayer_p */ static u8 l_fpcLy_CurrLayer_p[4]; /* 800216EC-800216F4 01C02C 0008+00 1/1 13/13 0/0 .text fpcLy_SetCurrentLayer__FP11layer_class */ @@ -240,15 +240,10 @@ asm void fpcLy_SetCurrentLayer(layer_class* param_0) { } #pragma pop -/* 800216F4-800216FC 01C034 0008+00 1/1 21/21 0/0 .text fpcLy_CurrentLayer__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void fpcLy_CurrentLayer() { - nofralloc -#include "asm/f_pc/f_pc_layer/fpcLy_CurrentLayer__Fv.s" +/* 800216F4-800216FC -00001 0008+00 0/0 0/0 0/0 .text fpcLy_CurrentLayer__Fv */ +u32 fpcLy_CurrentLayer() { + return *(u32*)(&l_fpcLy_CurrLayer_p); } -#pragma pop /* 800216FC-8002174C 01C03C 0050+00 1/1 0/0 0/0 .text fpcLy_Search__FUi */ #pragma push diff --git a/src/init.cpp b/src/init.cpp index 13d1719409a..b135d31fb51 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -27,7 +27,7 @@ struct daBgObj_c { SECTION_INIT void __check_pad3(); SECTION_INIT void __set_debug_bba(); -SECTION_INIT void __get_debug_bba(); +SECTION_INIT u8 __get_debug_bba(); SECTION_INIT void __start(); SECTION_INIT void __init_registers(); SECTION_INIT void __init_data(); @@ -89,15 +89,10 @@ SECTION_INIT asm void __set_debug_bba() { } #pragma pop -/* 8000314C-80003154 00004C 0008+00 1/1 0/0 0/0 .init __get_debug_bba */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -SECTION_INIT asm void __get_debug_bba() { - nofralloc -#include "asm/init/__get_debug_bba.s" +/* 8000314C-80003154 -00001 0008+00 0/0 0/0 0/0 .init __get_debug_bba */ +SECTION_INIT u8 __get_debug_bba() { + return *(u8*)(&data_804516D0); } -#pragma pop /* 80003154-800032B0 000054 015C+00 0/0 1/0 0/0 .init __start */ #pragma push diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp index 5ebec41b356..74493fed814 100644 --- a/src/m_Do/m_Do_Reset.cpp +++ b/src/m_Do/m_Do_Reset.cpp @@ -12,7 +12,7 @@ // struct mDoRst { - /* 800157F4 */ void getResetData(); + /* 800157F4 */ u32 getResetData(); static u8 mResetData[4 + 4 /* padding */]; }; @@ -44,10 +44,6 @@ struct JASTaskThread { /* 8028FE88 */ void pause(bool); }; -struct JASDvd { - /* 8028FEFC */ void getThreadPointer(); -}; - // // Forward References: // @@ -56,7 +52,7 @@ extern "C" static void my_OSCancelAlarmAll__Fv(); extern "C" static void destroyVideo__Fv(); extern "C" void mDoRst_reset__FiUli(); extern "C" void mDoRst_resetCallBack__FiPv(); -extern "C" void getResetData__6mDoRstFv(); +extern "C" u32 getResetData__6mDoRstFv(); extern "C" extern char const* const m_Do_m_Do_Reset__stringBase0; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; extern "C" extern u8 struct_80450C80[8]; @@ -123,7 +119,7 @@ static asm void destroyVideo() { #pragma pop /* ############################################################################################## */ -/* 80450C78-80450C80 000178 0004+04 3/3 42/42 2/2 .sbss mResetData__6mDoRst */ +/* 80450C78-80450C80 000178 0004+04 3/2 42/42 2/2 .sbss mResetData__6mDoRst */ u8 mDoRst::mResetData[4 + 4 /* padding */]; /* 80015614-8001574C 00FF54 0138+00 0/0 3/3 0/0 .text mDoRst_reset__FiUli */ @@ -146,15 +142,10 @@ asm void mDoRst_resetCallBack(int param_0, void* param_1) { } #pragma pop -/* 800157F4-800157FC 010134 0008+00 1/1 0/0 0/0 .text getResetData__6mDoRstFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoRst::getResetData() { - nofralloc -#include "asm/m_Do/m_Do_Reset/getResetData__6mDoRstFv.s" +/* 800157F4-800157FC -00001 0008+00 0/0 0/0 0/0 .text getResetData__6mDoRstFv */ +u32 mDoRst::getResetData() { + return *(u32*)(&mDoRst::mResetData); } -#pragma pop /* ############################################################################################## */ /* 80450C80-80450C88 -00001 0008+00 0/0 6/6 0/0 .sbss None */ diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index 5c957e48902..d500c4660e3 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -58,17 +58,6 @@ struct Z2MultiSeMgr { /* 802AEB34 */ ~Z2MultiSeMgr(); }; -struct JAISoundHandle { - /* 80007838 */ ~JAISoundHandle(); - /* 802A2184 */ void releaseSound(); -}; - -struct JKRSolidHeap { - /* 802D0BF4 */ void adjustSize(); -}; - -struct JAISoundID {}; - struct JGeometry { template struct TVec3 {}; @@ -76,6 +65,17 @@ struct JGeometry { struct TVec3__template0 {}; }; +struct JAISoundID {}; + +struct JKRSolidHeap { + /* 802D0BF4 */ void adjustSize(); +}; + +struct JAISoundHandle { + /* 80007838 */ ~JAISoundHandle(); + /* 802A2184 */ void releaseSound(); +}; + struct Z2AudioMgr { /* 800073C8 */ ~Z2AudioMgr(); /* 802CD248 */ Z2AudioMgr(); diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp index 27e87f39cfe..bcb3df73816 100644 --- a/src/m_Do/m_Do_controller_pad.cpp +++ b/src/m_Do/m_Do_controller_pad.cpp @@ -15,6 +15,8 @@ struct mDoRst { static u8 mResetData[4 + 4 /* padding */]; }; +struct interface_of_controller_pad {}; + struct JUTGamePad { struct EPadPort {}; @@ -35,8 +37,6 @@ struct JUTGamePad { static u8 sAnalogMode[4]; }; -struct interface_of_controller_pad {}; - struct mDoCPd_c { /* 80007954 */ void create(); /* 80007A94 */ void read(); diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp index d16367ea628..27f392ba56c 100644 --- a/src/m_Do/m_Do_dvd_thread.cpp +++ b/src/m_Do/m_Do_dvd_thread.cpp @@ -105,10 +105,6 @@ struct JASTaskThread { /* 8028FB5C */ void sendCmdMsg(void (*)(void*), void const*, u32); }; -struct JASDvd { - /* 8028FEFC */ void getThreadPointer(); -}; - // // Forward References: // diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index e3cf8af0daa..b02ff44d279 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -54,20 +54,20 @@ struct mDoExt_invJntPacket { }; struct J3DMaterialTable; -struct J3DAnmColor { - /* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*); -}; - -struct J3DAnmTexPattern { - /* 8032B004 */ void searchUpdateMaterialID(J3DMaterialTable*); +struct J3DAnmTextureSRTKey { + /* 8032B0C0 */ void searchUpdateMaterialID(J3DMaterialTable*); }; struct J3DAnmTevRegKey { /* 8032B780 */ void searchUpdateMaterialID(J3DMaterialTable*); }; -struct J3DAnmTextureSRTKey { - /* 8032B0C0 */ void searchUpdateMaterialID(J3DMaterialTable*); +struct J3DAnmColor { + /* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*); +}; + +struct J3DAnmTexPattern { + /* 8032B004 */ void searchUpdateMaterialID(J3DMaterialTable*); }; struct J3DMaterialTable { @@ -136,12 +136,12 @@ struct mDoExt_MtxCalcAnmBlendTbl { /* 80014F3C */ ~mDoExt_MtxCalcAnmBlendTbl(); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfCallBack2_c {}; struct J3DTransformInfo {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C0628 */ void initAnime(void*, bool, f32, f32); /* 802C06D0 */ void updateAnime(f32, f32); @@ -214,10 +214,10 @@ struct mDoExt_3DlineMatSortPacket { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct ResTIMG {}; +struct _GXColor {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 800134F8 */ void setMaterial(); @@ -236,16 +236,16 @@ struct mDoExt_3DlineMat0_c { /* 80014E84 */ bool getMaterialID(); }; -struct J3DPacket; -struct J3DDrawBuffer { - /* 8032548C */ void entryImm(J3DPacket*, u16); -}; - +struct J3DDrawBuffer; struct J3DPacket { /* 8000E680 */ ~J3DPacket(); /* 80312750 */ bool entry(J3DDrawBuffer*); }; +struct J3DDrawBuffer { + /* 8032548C */ void entryImm(J3DPacket*, u16); +}; + struct dDlst_list_c { /* 800565EC */ void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&); }; @@ -374,10 +374,6 @@ struct J3DTevKColorAnm {}; struct J3DTevColorAnm {}; -struct J3DIndTevStage { - /* 8000E14C */ J3DIndTevStage(); -}; - struct J3DGXColorS10 { /* 8000E460 */ J3DGXColorS10(); }; @@ -386,6 +382,10 @@ struct J3DGXColor { /* 8000E538 */ J3DGXColor(); }; +struct J3DIndTevStage { + /* 8000E14C */ J3DIndTevStage(); +}; + struct J3DTevBlock { /* 8000DBC8 */ void patchTexNoAndTexCoordScale(); /* 8000DBD4 */ void patch(); @@ -664,21 +664,21 @@ extern "C" void entryDL__21mDoExt_invisibleModelFP4cXyz(); extern "C" void mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData(); extern "C" void mDoExt_setupStageTexture__FP12J3DModelData(); extern "C" void mDoExt_createAssertHeap__FP7JKRHeap(); -extern "C" void mDoExt_getAssertHeap__Fv(); +extern "C" u32 mDoExt_getAssertHeap__Fv(); extern "C" void mDoExt_createDbPrintHeap__FUlP7JKRHeap(); -extern "C" void mDoExt_getDbPrintHeap__Fv(); +extern "C" u32 mDoExt_getDbPrintHeap__Fv(); extern "C" void mDoExt_createGameHeap__FUlP7JKRHeap(); -extern "C" void mDoExt_getGameHeap__Fv(); +extern "C" u32 mDoExt_getGameHeap__Fv(); extern "C" void mDoExt_createZeldaHeap__FUlP7JKRHeap(); -extern "C" void mDoExt_getZeldaHeap__Fv(); +extern "C" u32 mDoExt_getZeldaHeap__Fv(); extern "C" void mDoExt_createCommandHeap__FUlP7JKRHeap(); -extern "C" void mDoExt_getCommandHeap__Fv(); +extern "C" u32 mDoExt_getCommandHeap__Fv(); extern "C" void mDoExt_createArchiveHeap__FUlP7JKRHeap(); -extern "C" void mDoExt_getArchiveHeap__Fv(); -extern "C" void mDoExt_getArchiveHeapPtr__Fv(); +extern "C" u32 mDoExt_getArchiveHeap__Fv(); +extern "C" u32 mDoExt_getArchiveHeapPtr__Fv(); extern "C" void mDoExt_createJ2dHeap__FUlP7JKRHeap(); -extern "C" void mDoExt_getJ2dHeap__Fv(); -extern "C" void mDoExt_getHostIOHeap__Fv(); +extern "C" u32 mDoExt_getJ2dHeap__Fv(); +extern "C" u32 mDoExt_getHostIOHeap__Fv(); extern "C" static void mDoExt_createSolidHeap__FUlP7JKRHeapUl(); extern "C" void mDoExt_createSolidHeapFromGame__FUlUl(); extern "C" void mDoExt_createSolidHeapFromSystem__FUlUl(); @@ -691,7 +691,7 @@ extern "C" void mDoExt_adjustSolidHeapToSystem__FP12JKRSolidHeap(); extern "C" void mDoExt_destroySolidHeap__FP12JKRSolidHeap(); extern "C" void mDoExt_destroyExpHeap__FP10JKRExpHeap(); extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); -extern "C" void mDoExt_getCurrentHeap__Fv(); +extern "C" u32 mDoExt_getCurrentHeap__Fv(); extern "C" void mDoExt_restoreCurrentHeap__Fv(); extern "C" void mDoExt_resIDToIndex__FP10JKRArchiveUs(); extern "C" void calc__25mDoExt_MtxCalcAnmBlendTblFv(); @@ -2506,7 +2506,7 @@ asm void mDoExt_setupStageTexture(J3DModelData* param_0) { #pragma pop /* ############################################################################################## */ -/* 80450C20-80450C24 000120 0004+00 2/2 0/0 0/0 .sbss AssertHeap */ +/* 80450C20-80450C24 000120 0004+00 2/1 0/0 0/0 .sbss AssertHeap */ static u8 AssertHeap[4]; /* 8000ECC0-8000ECE4 009600 0024+00 0/0 1/1 0/0 .text mDoExt_createAssertHeap__FP7JKRHeap @@ -2520,18 +2520,13 @@ asm void mDoExt_createAssertHeap(JKRHeap* param_0) { } #pragma pop -/* 8000ECE4-8000ECEC 009624 0008+00 0/0 3/3 0/0 .text mDoExt_getAssertHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getAssertHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getAssertHeap__Fv.s" +/* 8000ECE4-8000ECEC -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getAssertHeap__Fv */ +u32 mDoExt_getAssertHeap() { + return *(u32*)(&AssertHeap); } -#pragma pop /* ############################################################################################## */ -/* 80450C24-80450C28 000124 0004+00 2/2 0/0 0/0 .sbss DbPrintHeap */ +/* 80450C24-80450C28 000124 0004+00 2/1 0/0 0/0 .sbss DbPrintHeap */ static u8 DbPrintHeap[4]; /* 8000ECEC-8000ED14 00962C 0028+00 0/0 1/1 0/0 .text mDoExt_createDbPrintHeap__FUlP7JKRHeap */ @@ -2544,18 +2539,13 @@ asm void mDoExt_createDbPrintHeap(u32 param_0, JKRHeap* param_1) { } #pragma pop -/* 8000ED14-8000ED1C 009654 0008+00 0/0 1/1 0/0 .text mDoExt_getDbPrintHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getDbPrintHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getDbPrintHeap__Fv.s" +/* 8000ED14-8000ED1C -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getDbPrintHeap__Fv */ +u32 mDoExt_getDbPrintHeap() { + return *(u32*)(&DbPrintHeap); } -#pragma pop /* ############################################################################################## */ -/* 80450C28-80450C2C 000128 0004+00 2/2 3/3 0/0 .sbss gameHeap */ +/* 80450C28-80450C2C 000128 0004+00 2/1 3/3 0/0 .sbss gameHeap */ extern u8 gameHeap[4]; u8 gameHeap[4]; @@ -2570,18 +2560,13 @@ asm void mDoExt_createGameHeap(u32 param_0, JKRHeap* param_1) { } #pragma pop -/* 8000ED50-8000ED58 009690 0008+00 3/3 10/10 1/1 .text mDoExt_getGameHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getGameHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getGameHeap__Fv.s" +/* 8000ED50-8000ED58 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getGameHeap__Fv */ +u32 mDoExt_getGameHeap() { + return *(u32*)(&gameHeap); } -#pragma pop /* ############################################################################################## */ -/* 80450C2C-80450C30 00012C 0004+00 2/2 3/3 0/0 .sbss zeldaHeap */ +/* 80450C2C-80450C30 00012C 0004+00 2/1 3/3 0/0 .sbss zeldaHeap */ extern u8 zeldaHeap[4]; u8 zeldaHeap[4]; @@ -2595,18 +2580,13 @@ asm void mDoExt_createZeldaHeap(u32 param_0, JKRHeap* param_1) { } #pragma pop -/* 8000ED80-8000ED88 0096C0 0008+00 4/4 4/4 0/0 .text mDoExt_getZeldaHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getZeldaHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getZeldaHeap__Fv.s" +/* 8000ED80-8000ED88 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getZeldaHeap__Fv */ +u32 mDoExt_getZeldaHeap() { + return *(u32*)(&zeldaHeap); } -#pragma pop /* ############################################################################################## */ -/* 80450C30-80450C34 000130 0004+00 2/2 1/1 0/0 .sbss commandHeap */ +/* 80450C30-80450C34 000130 0004+00 2/1 1/1 0/0 .sbss commandHeap */ extern u8 commandHeap[4]; u8 commandHeap[4]; @@ -2620,18 +2600,13 @@ asm void mDoExt_createCommandHeap(u32 param_0, JKRHeap* param_1) { } #pragma pop -/* 8000EDB0-8000EDB8 0096F0 0008+00 0/0 6/6 0/0 .text mDoExt_getCommandHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getCommandHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getCommandHeap__Fv.s" +/* 8000EDB0-8000EDB8 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getCommandHeap__Fv */ +u32 mDoExt_getCommandHeap() { + return *(u32*)(&commandHeap); } -#pragma pop /* ############################################################################################## */ -/* 80450C34-80450C38 000134 0004+00 3/3 5/5 0/0 .sbss archiveHeap */ +/* 80450C34-80450C38 000134 0004+00 3/1 5/5 0/0 .sbss archiveHeap */ extern u8 archiveHeap[4]; u8 archiveHeap[4]; @@ -2645,28 +2620,18 @@ asm void mDoExt_createArchiveHeap(u32 param_0, JKRHeap* param_1) { } #pragma pop -/* 8000EDEC-8000EDF4 00972C 0008+00 0/0 18/18 1/1 .text mDoExt_getArchiveHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getArchiveHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getArchiveHeap__Fv.s" +/* 8000EDEC-8000EDF4 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getArchiveHeap__Fv */ +u32 mDoExt_getArchiveHeap() { + return *(u32*)(&archiveHeap); } -#pragma pop -/* 8000EDF4-8000EDFC 009734 0008+00 0/0 1/1 0/0 .text mDoExt_getArchiveHeapPtr__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getArchiveHeapPtr() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getArchiveHeapPtr__Fv.s" +/* 8000EDF4-8000EDFC -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getArchiveHeapPtr__Fv */ +u32 mDoExt_getArchiveHeapPtr() { + return *(u32*)(&archiveHeap); } -#pragma pop /* ############################################################################################## */ -/* 80450C38-80450C3C 000138 0004+00 2/2 0/0 0/0 .sbss j2dHeap */ +/* 80450C38-80450C3C 000138 0004+00 2/1 0/0 0/0 .sbss j2dHeap */ static u8 j2dHeap[4]; /* 8000EDFC-8000EE30 00973C 0034+00 0/0 1/1 0/0 .text mDoExt_createJ2dHeap__FUlP7JKRHeap @@ -2680,29 +2645,19 @@ asm void mDoExt_createJ2dHeap(u32 param_0, JKRHeap* param_1) { } #pragma pop -/* 8000EE30-8000EE38 009770 0008+00 0/0 7/7 0/0 .text mDoExt_getJ2dHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getJ2dHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getJ2dHeap__Fv.s" +/* 8000EE30-8000EE38 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getJ2dHeap__Fv */ +u32 mDoExt_getJ2dHeap() { + return *(u32*)(&j2dHeap); } -#pragma pop /* ############################################################################################## */ -/* 80450C3C-80450C40 00013C 0004+00 1/1 0/0 0/0 .sbss HostIOHeap */ +/* 80450C3C-80450C40 00013C 0004+00 1/0 0/0 0/0 .sbss HostIOHeap */ static u8 HostIOHeap[4]; -/* 8000EE38-8000EE40 009778 0008+00 0/0 1/1 0/0 .text mDoExt_getHostIOHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getHostIOHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getHostIOHeap__Fv.s" +/* 8000EE38-8000EE40 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getHostIOHeap__Fv */ +u32 mDoExt_getHostIOHeap() { + return *(u32*)(&HostIOHeap); } -#pragma pop /* 8000EE40-8000EED8 009780 0098+00 3/3 0/0 0/0 .text mDoExt_createSolidHeap__FUlP7JKRHeapUl */ #pragma push @@ -2837,15 +2792,10 @@ asm void mDoExt_setCurrentHeap(JKRHeap* param_0) { } #pragma pop -/* 8000F1EC-8000F1F4 009B2C 0008+00 0/0 4/4 0/0 .text mDoExt_getCurrentHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getCurrentHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getCurrentHeap__Fv.s" +/* 8000F1EC-8000F1F4 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getCurrentHeap__Fv */ +u32 mDoExt_getCurrentHeap() { + return *(u32*)(&JKRHeap::sCurrentHeap); } -#pragma pop /* 8000F1F4-8000F220 009B34 002C+00 1/1 9/9 0/0 .text mDoExt_restoreCurrentHeap__Fv */ #pragma push diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index f97a7d6eedd..d78cd2e86c2 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -76,10 +76,10 @@ struct dDlst_shadowControl_c { /* 80055A14 */ void draw(f32 (*)[4]); }; -struct J3DDrawBuffer {}; - struct dDlst_base_c {}; +struct J3DDrawBuffer {}; + struct dDlst_list_c { /* 80056390 */ void init(); /* 80056538 */ void reset(); diff --git a/src/msg/scrn/d_msg_scrn_3select.cpp b/src/msg/scrn/d_msg_scrn_3select.cpp index 13ba2d0cbdd..d53557e3c02 100644 --- a/src/msg/scrn/d_msg_scrn_3select.cpp +++ b/src/msg/scrn/d_msg_scrn_3select.cpp @@ -11,13 +11,13 @@ // Types: // -struct JKRArchive {}; - struct J2DPane { /* 802F7100 */ void getBounds(); /* 802F7FCC */ void animationTransform(); }; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); diff --git a/src/msg/scrn/d_msg_scrn_explain.cpp b/src/msg/scrn/d_msg_scrn_explain.cpp index 5118daa3813..94a13de27e7 100644 --- a/src/msg/scrn/d_msg_scrn_explain.cpp +++ b/src/msg/scrn/d_msg_scrn_explain.cpp @@ -20,14 +20,14 @@ struct dMsgString_c { /* 80249D28 */ ~dMsgString_c(); }; -struct J2DOrthoGraph {}; - struct STControl { /* 8003219C */ void checkTrigger(); /* 80032524 */ void checkUpTrigger(); /* 800325A0 */ void checkDownTrigger(); }; +struct J2DOrthoGraph {}; + struct dMsgScrnExplain_c { /* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8); /* 8023D538 */ ~dMsgScrnExplain_c(); diff --git a/src/msg/scrn/d_msg_scrn_item.cpp b/src/msg/scrn/d_msg_scrn_item.cpp index 11d7d096cfa..2f05a04af8a 100644 --- a/src/msg/scrn/d_msg_scrn_item.cpp +++ b/src/msg/scrn/d_msg_scrn_item.cpp @@ -18,10 +18,10 @@ struct dMsgScrnLight_c { struct J2DAnmTextureSRTKey {}; -struct JKRExpHeap {}; - struct J2DAnmColor {}; +struct JKRExpHeap {}; + struct dMsgScrnItem_c { /* 8023E79C */ dMsgScrnItem_c(u8, u8, JKRExpHeap*); /* 8023F51C */ ~dMsgScrnItem_c(); diff --git a/tools/libdol2asm/data/base.py b/tools/libdol2asm/data/base.py index 6ceada5eb99..6878ca1341f 100644 --- a/tools/libdol2asm/data/base.py +++ b/tools/libdol2asm/data/base.py @@ -84,6 +84,12 @@ class ArbitraryData(Symbol): self.size // self.element_size, self.padding // self.element_size) + def return_type(self): + array_type = self.array_type() + if isinstance(array_type, ArrayType) or isinstance(array_type, PaddingArrayType) or isinstance(array_type, ZeroArrayType): + return PointerType(array_type.base) + return array_type + def cpp_reference(self, accessor, addr): name = self.declaration_name(forward=False, c_export=False,full_qualified_name=True) if addr == self.addr: @@ -92,6 +98,14 @@ class ArbitraryData(Symbol): offset = addr - self.addr return f"(((char*)&{name})+0x{offset:X})" + def cpp_load(self, accessor, addr): + name = self.declaration_name(forward=False, c_export=False,full_qualified_name=True) + if addr == self.addr: + return f"{name}" + else: + offset = addr - self.addr + return f"*(((char*)&{name})+0x{offset:X})" + def declaration_name(self, forward: bool, c_export: bool, full_qualified_name: bool): diff --git a/tools/libdol2asm/data/function/ret.py b/tools/libdol2asm/data/function/ret.py index bf15e02e9b4..aed96c23154 100644 --- a/tools/libdol2asm/data/function/ret.py +++ b/tools/libdol2asm/data/function/ret.py @@ -6,16 +6,39 @@ from .base import * @dataclass(eq=False) class ReturnFunction(Function): - return_value: str = None - - def export_return_value(self): - return self.return_value + def export_return_value(self, symbol_table): + assert False async def export_function_body(self, exporter, builder: AsyncBuilder): - return_value = self.export_return_value() + return_value = self.export_return_value(exporter.gst) await builder.write(f" {{") if return_value: await builder.write(f"\treturn {return_value};") else: await builder.write(f"\t/* empty function */") await builder.write(f"}}") + +@dataclass(eq=False) +class CustomReturnFunction(ReturnFunction): + return_value: str = None + + def export_return_value(self, symbol_table): + return self.return_value + +@dataclass(eq=False) +class SymbolReturnFunction(ReturnFunction): + symbol_addr: int = 0 + load_or_reference: bool = True + + def gather_references(self, context, valid_range): + self.references = set([ self.symbol_addr ]) + + def export_return_value(self, symbol_table): + symbol = symbol_table[-1, self.symbol_addr] + assert symbol + name = symbol.cpp_reference(self, self.symbol_addr) + type = PointerType(self.return_type) + dereference = "" + if self.load_or_reference: + dereference = "*" + return f"{dereference}({type.type()})({name})" diff --git a/tools/libdol2asm/data/reference_array.py b/tools/libdol2asm/data/reference_array.py index 1b05b923423..d5d5fdf918d 100644 --- a/tools/libdol2asm/data/reference_array.py +++ b/tools/libdol2asm/data/reference_array.py @@ -33,6 +33,7 @@ class ReferenceArray(ArbitraryData): def values(self): return Integer.u32_from(self.data) + def gather_references(self, context, valid_range): self.references = [ addr for addr in self.values() if addr in valid_range ] diff --git a/tools/libdol2asm/data/symbol.py b/tools/libdol2asm/data/symbol.py index 5a708fb3611..9a75d16bb69 100644 --- a/tools/libdol2asm/data/symbol.py +++ b/tools/libdol2asm/data/symbol.py @@ -139,6 +139,12 @@ class Symbol: f"invalid reference addr 0x{addr:08X} for {type(self).__name__}\n{self}") return f"&{self.identifier.label}" + def cpp_load(self, accessor, addr): + if addr != self.addr: + raise Dol2ZelException( + f"invalid reference addr 0x{addr:08X} for {type(self).__name__}\n{self}") + return f"{self.identifier.label}" + def asm_reference(self, addr): if addr != self.addr: return None @@ -147,6 +153,9 @@ class Symbol: def gather_references(self, context, valid_range): pass + def get_reference_information(self, context, symbol_table): + pass + def types(self): return set() diff --git a/tools/libdol2asm/generate_functions.py b/tools/libdol2asm/generate_functions.py index 8df6a6c8e95..90fd2354e78 100644 --- a/tools/libdol2asm/generate_functions.py +++ b/tools/libdol2asm/generate_functions.py @@ -1,6 +1,10 @@ import struct +from capstone import * +from capstone.ppc import * + from . import linker_map +from . import disassemble from .types import * from .data import * @@ -159,6 +163,61 @@ def is_load_global_function(data: bytearray) -> Tuple[bool, int, str, int]: return False, None, None, None +# TODO: @!game move +R2_ADDR = 0x80459A00 +R13_ADDR = 0x80458580 + +RETURN_SYMBOL_LOAD_INSTS = { + PPC_INS_LWZ, + PPC_INS_LHZ, + PPC_INS_LBZ, +} + +RETURN_SYMBOL_TYPE = { + PPC_INS_LWZ: U32, + PPC_INS_LHZ: U16, + PPC_INS_LBZ: U8, +} + +def decompile_return_symbol_function(symbol, block, insts, symbol_table) -> Function: + if len(insts) != 2: + return None + + load = insts[0] + ret = insts[1] + + if ret.id != PPC_INS_BLR: + return None + if not load.id in RETURN_SYMBOL_LOAD_INSTS: + return None + + address = 0 + mem_base = load.operands[1].mem.base + mem_disp = load.operands[1].mem.disp + if mem_base == PPC_REG_R2: + address = R2_ADDR + disassemble.sign_extend_16(mem_disp) + elif mem_base == PPC_REG_R13: + address = R13_ADDR + disassemble.sign_extend_16(mem_disp) + else: + return None + + return_symbol = symbol_table[-1, address] + if not return_symbol: + return None + + # structure does not work :( + if isinstance(return_symbol, Structure): + return None + + return SymbolReturnFunction( + symbol.identifier, + addr=symbol.addr, + size=symbol.size, + padding=symbol.padding, + alignment=0, + return_type=RETURN_SYMBOL_TYPE[load.id], + symbol_addr=address) + def from_group(section: Section, group: List[linker_map.Symbol]) -> Function: """ @@ -169,35 +228,38 @@ def from_group(section: Section, group: List[linker_map.Symbol]) -> Function: if len(group) == 1: block = group[0] data = section.get_data(block.start, block.end) - if is_return_function(data): - return [ReturnFunction( - Identifier("func", block.start, block.name), - addr=block.addr, - size=block.size, - padding=block.padding, - alignment=0, - return_type=VOID)] + if len(data) >= 4 and len(data) < 16: + insts = list(disassemble.cs.disasm(data, block.start)) - if is_return_integer_function(data): - integer_value = get_short_value(data) - if integer_value == 0: - value = "false" - type = BOOL - elif integer_value == 1: - value = "true" - type = BOOL - else: - value = f"{integer_value}" - type = S32 + if is_return_function(data): + return [CustomReturnFunction( + Identifier("func", block.start, block.name), + addr=block.addr, + size=block.size, + padding=block.padding, + alignment=0, + return_type=VOID)] - return [ReturnFunction( - Identifier("func", block.start, block.name), - addr=block.addr, - size=block.size, - padding=block.padding, - alignment=0, - return_type=type, - return_value=value)] + if is_return_integer_function(data): + integer_value = get_short_value(data) + if integer_value == 0: + value = "false" + type = BOOL + elif integer_value == 1: + value = "true" + type = BOOL + else: + value = f"{integer_value}" + type = S32 + + return [CustomReturnFunction( + Identifier("func", block.start, block.name), + addr=block.addr, + size=block.size, + padding=block.padding, + alignment=0, + return_type=type, + return_value=value)] first = group[0] if first.size <= 0: @@ -208,3 +270,44 @@ def from_group(section: Section, group: List[linker_map.Symbol]) -> Function: # the function was not decompilable return [ASMFunction.create(section, group)] + +def decompile_symbol(context, section, symbol, symbol_table, add_list, remove_list): + if not isinstance(symbol, ASMFunction): + return symbol + if len(symbol.blocks) > 1: + return symbol + + block = symbol.blocks[0] + data = symbol.data[block.start-symbol.start:block.end-symbol.start] + if len(data) <= 0 or len(data) > 16: + return symbol + + insts = list(disassemble.cs.disasm(data, block.start)) + function = decompile_return_symbol_function(symbol, block, insts, symbol_table) + if function: + function.set_mlts(symbol._module, symbol._library, symbol._translation_unit, symbol._section) + assert function.addr == symbol.addr + assert function.size == symbol.size + add_list.add(function) + remove_list.discard(symbol) + return function + + #if symbol.size == 8: + # context.debug(f"{symbol.addr:08X} {symbol.name}") + + return symbol + +def decompile(context, libraries, symbol_table): + remove_list = set() + add_list = set() + for lib in libraries: + for tu in lib.translation_units.values(): + for section in tu.sections.values(): + if section.name != ".text" and section.name != ".init": + continue + symbols = [] + for symbol in section.symbols: + symbols.append(decompile_symbol(context, section, symbol, symbol_table, add_list, remove_list)) + section.symbols = symbols + return add_list, remove_list + \ No newline at end of file diff --git a/tools/libdol2asm/split_asm.py b/tools/libdol2asm/split_asm.py index 3b09ca3a9e0..48621034b50 100644 --- a/tools/libdol2asm/split_asm.py +++ b/tools/libdol2asm/split_asm.py @@ -300,6 +300,12 @@ class Dol2AsmSplitter: for symbol in add_list: self.symbol_table.add_symbol(symbol) + add_list, remove_list = generate_functions.decompile(self.context, libs, self.symbol_table) + for symbol in remove_list: + self.symbol_table.remove_symbol(symbol) + for symbol in add_list: + self.symbol_table.add_symbol(symbol) + def name_symbols(self): print(f"{self.step_count:2} Naming") self.step_count += 1 @@ -658,6 +664,7 @@ class Dol2AsmSplitter: self.search_binary(cache) + cache = True start_time = time.time() cache_path = Path("build/full_cache_xx.dump") if cache and cache_path.exists():