mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-08 10:33:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some d_com_inf_game stuff

Browse Source
This commit is contained in:
TakaRikka
2023-09-10 04:50:27 -07:00
parent 5b7dc7986b
commit fe79d732bd
7 changed files with 242 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_com_inf_game.cpp
+92 -162
View File
@@ -3,17 +3,91 @@
// Translation Unit: d_com_inf_game.cpp
//
#include "d_com_inf_game.h"
#include "dolphin/types.h"
#include "d/d_com_inf_game.h"
#include "SSystem/SComponent/c_phase.h"
class J3DModel;
class dGrass_data_c {
public:
~dGrass_data_c();
dGrass_data_c();
};
class dGrass_packet_c {
public:
~dGrass_packet_c();
dGrass_packet_c();
void draw();
void calc();
void update();
void setData(dGrass_data_c*, int, cXyz*, int, u8);
void newData(cXyz*, int, u8);
void newAnm();
void setAnm(int, s16);
};
class dFlower_data_c {
public:
~dFlower_data_c();
dFlower_data_c();
};
class dFlower_packet_c {
public:
~dFlower_packet_c();
};
class dTree_data_c {
public:
~dTree_data_c();
dTree_data_c();
};
class dTree_packet_c {
public:
~dTree_packet_c();
};
class dTree_anm_c {
public:
~dTree_anm_c();
};
class scene_class;
dComIfG_inf_c g_dComIfG_gameInfo;
/* 80052134-800521A4 .text ct__14dComIfG_play_cFv */
void dComIfG_play_c::ct() {
/* Nonmatching */
field_0x4841 = 0;
mParticle = NULL;
mDemo = NULL;
mpMagmaPacket = NULL;
mpGrassPacket = NULL;
mpTreePacket = NULL;
mpWoodPacket = NULL;
mpFlowerPacket = NULL;
field_0x4A64[0] = 0xFF;
field_0x4A64[1] = 0xFF;
mLastSeaRoom = 0xFF;
field_0x4A67[0] = 0xFF;
mIkadaLinkPos.set(0.0f, 0.0f, 0.0f);
mLkDArcIdx = -1;
init();
}
/* 800521A4-800521D4 .text init__14dComIfG_play_cFv */
void dComIfG_play_c::init() {
/* Nonmatching */
for (int i = 0; i < 1; i++) {
mpPlayer[i] = NULL;
mCurCamera[i] = -1;
}
for (int i = 0; i < 3; i++) {
mpPlayerPtr[i] = NULL;
}
}
/* 800521D4-80052400 .text itemInit__14dComIfG_play_cFv */
@@ -43,7 +117,7 @@ void dComIfG_play_c::removeDemo() {
/* 800529B8-800529DC .text executeEvtManager__14dComIfG_play_cFv */
void dComIfG_play_c::executeEvtManager() {
/* Nonmatching */
mEventMgr.runProc();
}
/* 800529DC-80052A30 .text createMagma__14dComIfG_play_cFv */
@@ -183,11 +257,12 @@ void dComIfG_play_c::drawWood() {
/* 80053178-800531A8 .text ct__13dComIfG_inf_cFv */
void dComIfG_inf_c::ct() {
/* Nonmatching */
field_0x1d1c1 = 0xFF;
play.ct();
}
/* 800531A8-8005326C .text dComIfG_changeOpeningScene__FP11scene_classs */
void dComIfG_changeOpeningScene(scene_class*, short) {
void dComIfG_changeOpeningScene(scene_class*, s16) {
/* Nonmatching */
}
@@ -207,8 +282,8 @@ void phase_2(char*) {
}
/* 80053388-80053390 .text phase_3__FPc */
void phase_3(char*) {
/* Nonmatching */
int phase_3(char*) {
return cPhs_COMPLEATE_e;
}
/* 80053390-800533D0 .text dComIfG_resLoad__FP30request_of_phase_process_classPCc */
@@ -227,7 +302,7 @@ void dComIfGp_getReverb(int) {
}
/* 800534C4-800535B8 .text dComIfGd_setSimpleShadow2__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj */
void dComIfGd_setSimpleShadow2(cXyz*, float, float, cBgS_PolyInfo&, short, float, _GXTexObj*) {
void dComIfGd_setSimpleShadow2(cXyz*, f32, f32, cBgS_PolyInfo&, s16, f32, _GXTexObj*) {
/* Nonmatching */
}
@@ -237,7 +312,7 @@ void dComIfGp_getShip(int, int) {
}
/* 80053678-80053728 .text dComIfGp_getMapTrans__FiPfPfPs */
void dComIfGp_getMapTrans(int, float*, float*, short*) {
void dComIfGp_getMapTrans(int, f32*, f32*, s16*) {
/* Nonmatching */
}
@@ -252,7 +327,7 @@ void dComIfGp_getRoomArrow(int) {
}
/* 800537C8-8005388C .text dComIfGp_setNextStage__FPCcsScScfUliSc */
void dComIfGp_setNextStage(const char*, short, signed char, signed char, float, unsigned long, int, signed char) {
void dComIfGp_setNextStage(const char*, s16, s8, s8, f32, u32, int, s8) {
/* Nonmatching */
}
@@ -282,17 +357,17 @@ void dComIfGs_isStageLife(int) {
}
/* 80053B30-80053F70 .text dComIfGs_checkGetItem__FUc */
void dComIfGs_checkGetItem(unsigned char) {
void dComIfGs_checkGetItem(u8) {
/* Nonmatching */
}
/* 80053F70-80054578 .text dComIfGs_checkGetItemNum__FUc */
void dComIfGs_checkGetItemNum(unsigned char) {
void dComIfGs_checkGetItemNum(u8) {
/* Nonmatching */
}
/* 80054578-8005468C .text dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj */
void dComIfGd_setShadow(unsigned long, signed char, J3DModel*, cXyz*, float, float, float, float, cBgS_PolyInfo&, dKy_tevstr_c*, short, float, _GXTexObj*) {
void dComIfGd_setShadow(u32, s8, J3DModel*, cXyz*, f32, f32, f32, f32, cBgS_PolyInfo&, dKy_tevstr_c*, s16, f32, _GXTexObj*) {
/* Nonmatching */
}
@@ -307,7 +382,7 @@ void dComIfGd_getMeshSceneList(Vec&) {
}
/* 80054870-800548FC .text dComIfGs_checkSeaLandingEvent__FSc */
void dComIfGs_checkSeaLandingEvent(signed char) {
void dComIfGs_checkSeaLandingEvent(s8) {
/* Nonmatching */
}
@@ -342,152 +417,7 @@ void dComIfGs_exchangePlayerRecollectionData() {
}
/* 8005586C-800559E8 .text dComIfGs_setSelectEquip__FiUc */
void dComIfGs_setSelectEquip(int, unsigned char) {
/* Nonmatching */
}
/* 80055C08-80055C7C .text __dt__13dComIfG_inf_cFv */
dComIfG_inf_c::~dComIfG_inf_c() {
/* Nonmatching */
}
/* 80055C7C-80055DB8 .text __dt__14dComIfG_play_cFv */
dComIfG_play_c::~dComIfG_play_c() {
/* Nonmatching */
}
/* 80055DB8-80055DF4 .text __dt__12dEvt_order_cFv */
dEvt_order_c::~dEvt_order_c() {
/* Nonmatching */
}
/* 80055DF4-80055E30 .text __dt__25dComIfG_camera_info_classFv */
dComIfG_camera_info_class::~dComIfG_camera_info_class() {
/* Nonmatching */
}
/* 80055E30-80055E34 .text __ct__25dComIfG_camera_info_classFv */
dComIfG_camera_info_class::dComIfG_camera_info_class() {
/* Nonmatching */
}
/* 80055E34-80055E70 .text __dt__14dDlst_window_cFv */
dDlst_window_c::~dDlst_window_c() {
/* Nonmatching */
}
/* 80055E70-80055E74 .text __ct__14dDlst_window_cFv */
dDlst_window_c::dDlst_window_c() {
/* Nonmatching */
}
/* 80055E74-80055ED0 .text __dt__19dAttDraw_CallBack_cFv */
dAttDraw_CallBack_c::~dAttDraw_CallBack_c() {
/* Nonmatching */
}
/* 80055ED0-80055F18 .text __dt__25mDoExt_McaMorfCallBack1_cFv */
mDoExt_McaMorfCallBack1_c::~mDoExt_McaMorfCallBack1_c() {
/* Nonmatching */
}
/* 80055F18-80055FB8 .text __dt__4dCcSFv */
dCcS::~dCcS() {
/* Nonmatching */
}
/* 80055FB8-8005613C .text __dt__12dCcMassS_MngFv */
dCcMassS_Mng::~dCcMassS_Mng() {
/* Nonmatching */
}
/* 8005613C-8005619C .text __dt__12dCcMassS_ObjFv */
dCcMassS_Obj::~dCcMassS_Obj() {
/* Nonmatching */
}
/* 8005619C-80056210 .text __dt__4cCcSFv */
cCcS::~cCcS() {
/* Nonmatching */
}
/* 80056210-8005628C .text __dt__4dBgSFv */
dBgS::~dBgS() {
/* Nonmatching */
}
/* 8005628C-800562F8 .text __dt__4cBgSFv */
cBgS::~cBgS() {
/* Nonmatching */
}
/* 800562F8-80056340 .text __dt__11cBgS_ChkElmFv */
cBgS_ChkElm::~cBgS_ChkElm() {
/* Nonmatching */
}
/* 80056340-8005637C .text __ct__11cBgS_ChkElmFv */
cBgS_ChkElm::cBgS_ChkElm() {
/* Nonmatching */
}
/* 8005637C-80056388 .text __ct__10dSv_zone_cFv */
dSv_zone_c::dSv_zone_c() {
/* Nonmatching */
}
/* 80056388-800563B8 .text __ct__12dSv_memory_cFv */
dSv_memory_c::dSv_memory_c() {
/* Nonmatching */
}
/* 800563B8-80056400 .text __dt__8cM3dGCylFv */
cM3dGCyl::~cM3dGCyl() {
/* Nonmatching */
}
/* 80056400-8005645C .text __dt__14cCcD_ShapeAttrFv */
cCcD_ShapeAttr::~cCcD_ShapeAttr() {
/* Nonmatching */
}
/* 8005645C-80056464 .text CrossAtTg__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrP4cXyz */
void cCcD_ShapeAttr::CrossAtTg(const cCcD_ShapeAttr&, cXyz*) const {
/* Nonmatching */
}
/* 80056464-8005646C .text CrossCo__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrPf */
void cCcD_ShapeAttr::CrossCo(const cCcD_ShapeAttr&, float*) const {
/* Nonmatching */
}
/* 8005646C-80056478 .text GetCoCP__14cCcD_ShapeAttrFv */
void cCcD_ShapeAttr::GetCoCP() {
/* Nonmatching */
}
/* 80056478-80056484 .text GetCoCP__14cCcD_ShapeAttrCFv */
void cCcD_ShapeAttr::GetCoCP() const {
/* Nonmatching */
}
/* 80056484-800564E0 .text __dt__8cM3dGCpsFv */
cM3dGCps::~cM3dGCps() {
/* Nonmatching */
}
/* 800564E0-80056528 .text __dt__15cCcD_DivideInfoFv */
cCcD_DivideInfo::~cCcD_DivideInfo() {
/* Nonmatching */
}
/* 80056528-80056570 .text __dt__8cM3dGAabFv */
cM3dGAab::~cM3dGAab() {
/* Nonmatching */
}
/* 80056570-800565CC .text __dt__15cCcD_DivideAreaFv */
cCcD_DivideArea::~cCcD_DivideArea() {
void dComIfGs_setSelectEquip(int, u8) {
/* Nonmatching */
}