From 568630b072749f9e87b2db8bdf71a567df91e07d Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Thu, 29 Feb 2024 20:00:41 -0500 Subject: [PATCH] get more d_ TUs to compile --- include/d/actor/d_a_npc_mk_static.h | 28 +++++++++++++++ include/d/d_2dnumber.h | 56 +++++++++++++++++++++++++++++ include/d/d_spline_path.h | 16 +++++++++ include/d/d_water_mark.h | 12 +++++++ include/d/d_wind_arrow.h | 13 +++++++ include/d/d_wpillar.h | 15 ++++++++ include/d/d_wpot_water.h | 17 +++++++++ src/d/d_2dnumber.cpp | 33 +++++------------ src/d/d_a_npc_mk_static.cpp | 17 +++++---- src/d/d_spline_path.cpp | 7 ++-- src/d/d_water_mark.cpp | 5 ++- src/d/d_wind_arrow.cpp | 5 ++- src/d/d_wpillar.cpp | 7 ++-- src/d/d_wpot_water.cpp | 20 ++--------- 14 files changed, 186 insertions(+), 65 deletions(-) create mode 100644 include/d/actor/d_a_npc_mk_static.h create mode 100644 include/d/d_2dnumber.h create mode 100644 include/d/d_spline_path.h create mode 100644 include/d/d_water_mark.h create mode 100644 include/d/d_wind_arrow.h create mode 100644 include/d/d_wpillar.h create mode 100644 include/d/d_wpot_water.h diff --git a/include/d/actor/d_a_npc_mk_static.h b/include/d/actor/d_a_npc_mk_static.h new file mode 100644 index 000000000..7c0632865 --- /dev/null +++ b/include/d/actor/d_a_npc_mk_static.h @@ -0,0 +1,28 @@ +#ifndef D_A_NPC_MK_STATIC_H +#define D_A_NPC_MK_STATIC_H + +#include "dolphin/types.h" + +class fopAc_ac_c; +class dNpc_PathRun_c; +class dCcD_Cyl; +class cXyz; + +class daNpc_Mk_Static_c { +public: + void aroundWalk(fopAc_ac_c*, fopAc_ac_c*, u8); + void turnPath(fopAc_ac_c*, dNpc_PathRun_c*, u8); + void chkPath(fopAc_ac_c*, dNpc_PathRun_c*, u8); + void walkPath(fopAc_ac_c*, dNpc_PathRun_c*, u8); + void getSpeedF(f32, f32); + void init(u8, u16); + void goFarLink_3(fopAc_ac_c*, dNpc_PathRun_c*); + void goFarLink_2(fopAc_ac_c*, dNpc_PathRun_c*); + void runaway_com2(dNpc_PathRun_c*, u8); + void runAwayProc(fopAc_ac_c*, dNpc_PathRun_c*, dCcD_Cyl*, s16*); + void chkGameSet(); + void setRndPathPos(fopAc_ac_c*, dNpc_PathRun_c*); + void chkPointPass(cXyz*, cXyz*, cXyz*); +}; + +#endif /* D_A_NPC_MK_STATIC_H */ diff --git a/include/d/d_2dnumber.h b/include/d/d_2dnumber.h new file mode 100644 index 000000000..4aa697661 --- /dev/null +++ b/include/d/d_2dnumber.h @@ -0,0 +1,56 @@ +#ifndef D_2DNUMBER_H +#define D_2DNUMBER_H + +#include "dolphin/types.h" + +struct ResTIMG; +class JUTFont; +class fopMsgM_pane_class; + +class dDlst_2DNumber_c { +public: + dDlst_2DNumber_c(); + ~dDlst_2DNumber_c(); + void init(int, s16, s16, s16, s16, u8); + void draw(); +}; + +class dDlst_2DMinigame_c { +public: + void init(ResTIMG*, ResTIMG*); + void draw(); +}; + +class dDlst_2DBattery_c { +public: + void init(ResTIMG*, ResTIMG*, ResTIMG*, ResTIMG*); + void setRotate(float); + void draw(); +}; + +class dDlst_2DObject_c { +public: + void init(ResTIMG*, ResTIMG*); + void draw(); +}; + +class dDlst_2DOutFont_c { +public: + void initial(); + void setPane(JUTFont*, fopMsgM_pane_class*, fopMsgM_pane_class*, fopMsgM_pane_class*, fopMsgM_pane_class*); + void setPaneEx(JUTFont*, fopMsgM_pane_class*, fopMsgM_pane_class*, fopMsgM_pane_class*, fopMsgM_pane_class*, char*); + void setRuby(JUTFont*, fopMsgM_pane_class*); + void setRubyEx(JUTFont*, fopMsgM_pane_class*, char*); + void charWidth(int); + void rubyCharWidth(int); + void iconset(int, char**); + void messageSet(u32); + void outFontStickAnime1(u8); + void outFontStickAnime2(u8, u8); + void outFontStickAnime3(u8, u8); + void outFontStickAnimePiece(u8, u8); + void move(); + void setAlpha(u8); +}; + +#endif /* D_2DNUMBER_H */ diff --git a/include/d/d_spline_path.h b/include/d/d_spline_path.h new file mode 100644 index 000000000..e7a8927bb --- /dev/null +++ b/include/d/d_spline_path.h @@ -0,0 +1,16 @@ +#ifndef D_SPLINE_PATH_H +#define D_SPLINE_PATH_H + +#include "dolphin/types.h" + +class cXyz; + +class d2DBSplinePath { +public: + void Init(s32, s32); + void Step(); + void Calc(cXyz*); + void Calc(f32*); +}; + +#endif /* D_SPLINE_PATH_H */ diff --git a/include/d/d_water_mark.h b/include/d/d_water_mark.h new file mode 100644 index 000000000..46948833e --- /dev/null +++ b/include/d/d_water_mark.h @@ -0,0 +1,12 @@ +#ifndef D_WATER_MARK_H +#define D_WATER_MARK_H + +#include "dolphin/types.h" + +class dWaterMark_c { +public: + void setMatrix(); + void create(); +}; + +#endif /* D_WATER_MARK_H */ diff --git a/include/d/d_wind_arrow.h b/include/d/d_wind_arrow.h new file mode 100644 index 000000000..67f97ab37 --- /dev/null +++ b/include/d/d_wind_arrow.h @@ -0,0 +1,13 @@ +#ifndef D_WIND_ARROW_H +#define D_WIND_ARROW_H + +#include "dolphin/types.h" + +class dWindArrow_c { +public: + void createHeap(); + void adjustHeap(); + void draw(); +}; + +#endif /* D_WIND_ARROW_H */ diff --git a/include/d/d_wpillar.h b/include/d/d_wpillar.h new file mode 100644 index 000000000..29af7544c --- /dev/null +++ b/include/d/d_wpillar.h @@ -0,0 +1,15 @@ +#ifndef D_WPILLAR_H +#define D_WPILLAR_H + +#include "dolphin/types.h" + +class dWpillar_c { +public: + void jointCallBack(int); + void draw(); + void execute(); + void wp_delete(); + void create(); +}; + +#endif /* D_WPILLAR_H */ diff --git a/include/d/d_wpot_water.h b/include/d/d_wpot_water.h new file mode 100644 index 000000000..68879a116 --- /dev/null +++ b/include/d/d_wpot_water.h @@ -0,0 +1,17 @@ +#ifndef D_WPOT_WATER_H +#define D_WPOT_WATER_H + +#include "dolphin/types.h" +#include "d/d_particle.h" + +class dWpotWater_c { +public: + +}; + +class dWpotWater_EcallBack { +public: + void draw(JPABaseEmitter*); +}; + +#endif /* D_WPOT_WATER_H */ diff --git a/src/d/d_2dnumber.cpp b/src/d/d_2dnumber.cpp index a067faab8..620caa05c 100644 --- a/src/d/d_2dnumber.cpp +++ b/src/d/d_2dnumber.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_2dnumber.cpp // -#include "d_2dnumber.h" +#include "d/d_2dnumber.h" #include "dolphin/types.h" /* 800C8498-800C84B4 .text __ct__16dDlst_2DNumber_cFv */ @@ -17,8 +17,7 @@ dDlst_2DNumber_c::~dDlst_2DNumber_c() { } /* 800C8510-800C8644 .text init__16dDlst_2DNumber_cFissssUc */ -void dDlst_2DNumber_c::init(int, short, short, short, short, unsigned char) { - /* Nonmatching */ +void dDlst_2DNumber_c::init(int, s16, s16, s16, s16, u8) { /* Nonmatching */ } /* 800C8644-800C874C .text draw__16dDlst_2DNumber_cFv */ @@ -102,27 +101,27 @@ void dDlst_2DOutFont_c::iconset(int, char**) { } /* 800C9D5C-800CA8A8 .text messageSet__17dDlst_2DOutFont_cFUl */ -void dDlst_2DOutFont_c::messageSet(unsigned long) { +void dDlst_2DOutFont_c::messageSet(u32) { /* Nonmatching */ } /* 800CA8A8-800CAB5C .text outFontStickAnime1__17dDlst_2DOutFont_cFUc */ -void dDlst_2DOutFont_c::outFontStickAnime1(unsigned char) { +void dDlst_2DOutFont_c::outFontStickAnime1(u8) { /* Nonmatching */ } /* 800CAB5C-800CADEC .text outFontStickAnime2__17dDlst_2DOutFont_cFUcUc */ -void dDlst_2DOutFont_c::outFontStickAnime2(unsigned char, unsigned char) { +void dDlst_2DOutFont_c::outFontStickAnime2(u8, u8) { /* Nonmatching */ } /* 800CADEC-800CB0C0 .text outFontStickAnime3__17dDlst_2DOutFont_cFUcUc */ -void dDlst_2DOutFont_c::outFontStickAnime3(unsigned char, unsigned char) { +void dDlst_2DOutFont_c::outFontStickAnime3(u8, u8) { /* Nonmatching */ } /* 800CB0C0-800CB2E0 .text outFontStickAnimePiece__17dDlst_2DOutFont_cFUcUc */ -void dDlst_2DOutFont_c::outFontStickAnimePiece(unsigned char, unsigned char) { +void dDlst_2DOutFont_c::outFontStickAnimePiece(u8, u8) { /* Nonmatching */ } @@ -132,22 +131,6 @@ void dDlst_2DOutFont_c::move() { } /* 800CB474-800CB4B0 .text setAlpha__17dDlst_2DOutFont_cFUc */ -void dDlst_2DOutFont_c::setAlpha(unsigned char) { +void dDlst_2DOutFont_c::setAlpha(u8) { /* Nonmatching */ } - -/* 800CB4B0-800CB50C .text __dt__16dDlst_2DObject_cFv */ -dDlst_2DObject_c::~dDlst_2DObject_c() { - /* Nonmatching */ -} - -/* 800CB50C-800CB568 .text __dt__17dDlst_2DBattery_cFv */ -dDlst_2DBattery_c::~dDlst_2DBattery_c() { - /* Nonmatching */ -} - -/* 800CB568-800CB5C4 .text __dt__18dDlst_2DMinigame_cFv */ -dDlst_2DMinigame_c::~dDlst_2DMinigame_c() { - /* Nonmatching */ -} - diff --git a/src/d/d_a_npc_mk_static.cpp b/src/d/d_a_npc_mk_static.cpp index d63259afe..a3d0df9c1 100644 --- a/src/d/d_a_npc_mk_static.cpp +++ b/src/d/d_a_npc_mk_static.cpp @@ -7,32 +7,32 @@ #include "dolphin/types.h" /* 800CB5CC-800CB778 .text aroundWalk__17daNpc_Mk_Static_cFP10fopAc_ac_cP10fopAc_ac_cUc */ -void daNpc_Mk_Static_c::aroundWalk(fopAc_ac_c*, fopAc_ac_c*, unsigned char) { +void daNpc_Mk_Static_c::aroundWalk(fopAc_ac_c*, fopAc_ac_c*, u8) { /* Nonmatching */ } /* 800CB778-800CB88C .text turnPath__17daNpc_Mk_Static_cFP10fopAc_ac_cP14dNpc_PathRun_cUc */ -void daNpc_Mk_Static_c::turnPath(fopAc_ac_c*, dNpc_PathRun_c*, unsigned char) { +void daNpc_Mk_Static_c::turnPath(fopAc_ac_c*, dNpc_PathRun_c*, u8) { /* Nonmatching */ } /* 800CB88C-800CB934 .text chkPath__17daNpc_Mk_Static_cFP10fopAc_ac_cP14dNpc_PathRun_cUc */ -void daNpc_Mk_Static_c::chkPath(fopAc_ac_c*, dNpc_PathRun_c*, unsigned char) { +void daNpc_Mk_Static_c::chkPath(fopAc_ac_c*, dNpc_PathRun_c*, u8) { /* Nonmatching */ } /* 800CB934-800CB990 .text walkPath__17daNpc_Mk_Static_cFP10fopAc_ac_cP14dNpc_PathRun_cUc */ -void daNpc_Mk_Static_c::walkPath(fopAc_ac_c*, dNpc_PathRun_c*, unsigned char) { +void daNpc_Mk_Static_c::walkPath(fopAc_ac_c*, dNpc_PathRun_c*, u8) { /* Nonmatching */ } /* 800CB990-800CBA18 .text getSpeedF__17daNpc_Mk_Static_cFff */ -void daNpc_Mk_Static_c::getSpeedF(float, float) { +void daNpc_Mk_Static_c::getSpeedF(f32, f32) { /* Nonmatching */ } /* 800CBA18-800CBA3C .text init__17daNpc_Mk_Static_cFUcUs */ -void daNpc_Mk_Static_c::init(unsigned char, unsigned short) { +void daNpc_Mk_Static_c::init(u8, u16) { /* Nonmatching */ } @@ -47,12 +47,12 @@ void daNpc_Mk_Static_c::goFarLink_2(fopAc_ac_c*, dNpc_PathRun_c*) { } /* 800CBE7C-800CBEE0 .text runaway_com2__17daNpc_Mk_Static_cFP14dNpc_PathRun_cUc */ -void daNpc_Mk_Static_c::runaway_com2(dNpc_PathRun_c*, unsigned char) { +void daNpc_Mk_Static_c::runaway_com2(dNpc_PathRun_c*, u8) { /* Nonmatching */ } /* 800CBEE0-800CC374 .text runAwayProc__17daNpc_Mk_Static_cFP10fopAc_ac_cP14dNpc_PathRun_cP8dCcD_CylPs */ -void daNpc_Mk_Static_c::runAwayProc(fopAc_ac_c*, dNpc_PathRun_c*, dCcD_Cyl*, short*) { +void daNpc_Mk_Static_c::runAwayProc(fopAc_ac_c*, dNpc_PathRun_c*, dCcD_Cyl*, s16*) { /* Nonmatching */ } @@ -70,4 +70,3 @@ void daNpc_Mk_Static_c::setRndPathPos(fopAc_ac_c*, dNpc_PathRun_c*) { void daNpc_Mk_Static_c::chkPointPass(cXyz*, cXyz*, cXyz*) { /* Nonmatching */ } - diff --git a/src/d/d_spline_path.cpp b/src/d/d_spline_path.cpp index 90f54921d..2dbaf8702 100644 --- a/src/d/d_spline_path.cpp +++ b/src/d/d_spline_path.cpp @@ -3,11 +3,11 @@ // Translation Unit: d_spline_path.cpp // -#include "d_spline_path.h" +#include "d/d_spline_path.h" #include "dolphin/types.h" /* 800C239C-800C2430 .text Init__14d2DBSplinePathFll */ -void d2DBSplinePath::Init(long, long) { +void d2DBSplinePath::Init(s32, s32) { /* Nonmatching */ } @@ -22,7 +22,6 @@ void d2DBSplinePath::Calc(cXyz*) { } /* 800C268C-800C26D4 .text Calc__14d2DBSplinePathFPf */ -void d2DBSplinePath::Calc(float*) { +void d2DBSplinePath::Calc(f32*) { /* Nonmatching */ } - diff --git a/src/d/d_water_mark.cpp b/src/d/d_water_mark.cpp index f0e668299..35b24811c 100644 --- a/src/d/d_water_mark.cpp +++ b/src/d/d_water_mark.cpp @@ -3,8 +3,8 @@ // Translation Unit: d_water_mark.cpp // -#include "d_water_mark.h" -#include "dolphin/types.h" +#include "d/d_water_mark.h" +#include "f_op/f_op_kankyo.h" /* 8023DB48-8023DBF8 .text dWaterMark_Draw__FP12dWaterMark_c */ void dWaterMark_Draw(dWaterMark_c*) { @@ -40,4 +40,3 @@ void dWaterMark_Create(kankyo_class*) { void dWaterMark_c::create() { /* Nonmatching */ } - diff --git a/src/d/d_wind_arrow.cpp b/src/d/d_wind_arrow.cpp index 9cc22db27..a090e0372 100644 --- a/src/d/d_wind_arrow.cpp +++ b/src/d/d_wind_arrow.cpp @@ -3,8 +3,8 @@ // Translation Unit: d_wind_arrow.cpp // -#include "d_wind_arrow.h" -#include "dolphin/types.h" +#include "d/d_wind_arrow.h" +#include "f_op/f_op_kankyo.h" /* 8023E3C4-8023E420 .text createHeap__12dWindArrow_cFv */ void dWindArrow_c::createHeap() { @@ -45,4 +45,3 @@ void dWindArrow_Delete(dWindArrow_c*) { void dWindArrow_Create(kankyo_class*) { /* Nonmatching */ } - diff --git a/src/d/d_wpillar.cpp b/src/d/d_wpillar.cpp index 564a325b1..e94312281 100644 --- a/src/d/d_wpillar.cpp +++ b/src/d/d_wpillar.cpp @@ -3,8 +3,10 @@ // Translation Unit: d_wpillar.cpp // -#include "d_wpillar.h" -#include "dolphin/types.h" +#include "d/d_wpillar.h" +#include "f_op/f_op_kankyo.h" + +class J3DNode; /* 8023E968-8023E9E4 .text jointCallBack__10dWpillar_cFi */ void dWpillar_c::jointCallBack(int) { @@ -60,4 +62,3 @@ void dWpillar_c::create() { void dWpillar_Create(kankyo_class*) { /* Nonmatching */ } - diff --git a/src/d/d_wpot_water.cpp b/src/d/d_wpot_water.cpp index e9e94401d..af95c8aee 100644 --- a/src/d/d_wpot_water.cpp +++ b/src/d/d_wpot_water.cpp @@ -3,8 +3,8 @@ // Translation Unit: d_wpot_water.cpp // -#include "d_wpot_water.h" -#include "dolphin/types.h" +#include "d/d_wpot_water.h" +#include "f_op/f_op_kankyo.h" /* 8023F5D0-8023F64C .text draw__20dWpotWater_EcallBackFP14JPABaseEmitter */ void dWpotWater_EcallBack::draw(JPABaseEmitter*) { @@ -35,19 +35,3 @@ void dWpotWater_Delete(dWpotWater_c*) { void dWpotWater_Create(kankyo_class*) { /* Nonmatching */ } - -/* 8023FFCC-80240038 .text __dt__20dWpotWater_EcallBackFv */ -dWpotWater_EcallBack::~dWpotWater_EcallBack() { - /* Nonmatching */ -} - -/* 80240038-8024003C .text execute__20dWpotWater_EcallBackFP14JPABaseEmitter */ -void dWpotWater_EcallBack::execute(JPABaseEmitter*) { - /* Nonmatching */ -} - -/* 8024003C-80240040 .text setup__20dWpotWater_EcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */ -void dWpotWater_EcallBack::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) { - /* Nonmatching */ -} -