mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-11 21:21:57 -04:00
project cleanup (#2895)
* some wii OS fixes * remove old dol2asm comments * remove dol2asm.h * remove function address comments * normalize ATTRIBUTE_ALIGN usage * DECL_WEAK macro * fix gcc attribute weak macro * wrap more mwcc specific things in ifdefs * fixes * fix revo sdk version flags * fixes
This commit is contained in:
@@ -1,15 +1,8 @@
|
||||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: d/d_simple_model
|
||||
//
|
||||
|
||||
#include "d/dolzel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/d_simple_model.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
|
||||
/* 80048C54-80048CB4 043594 0060+00 1/1 0/0 0/0 .text dSmplMdl_modelUpdateDL__FP8J3DModel
|
||||
*/
|
||||
static void dSmplMdl_modelUpdateDL(J3DModel* i_model) {
|
||||
JUT_ASSERT(61, i_model != NULL);
|
||||
J3DModelData* modelData = i_model->getModelData();
|
||||
@@ -22,7 +15,6 @@ static void dSmplMdl_modelUpdateDL(J3DModel* i_model) {
|
||||
i_model->viewCalc();
|
||||
}
|
||||
|
||||
/* 80048CB4-80048D60 0435F4 00AC+00 0/0 1/1 0/0 .text __ct__15dSmplMdl_draw_cFv */
|
||||
dSmplMdl_draw_c::dSmplMdl_draw_c() {
|
||||
for (int i = 0; i < 8; i++) {
|
||||
mModel[i].init();
|
||||
@@ -35,7 +27,6 @@ dSmplMdl_draw_c::dSmplMdl_draw_c() {
|
||||
mListCount = 0;
|
||||
}
|
||||
|
||||
/* 80048D60-80048D80 0436A0 0020+00 1/1 0/0 0/0 .text __ct__12diff_model_cFv */
|
||||
diff_model_c::diff_model_c() {
|
||||
mpHeap = NULL;
|
||||
mpModel = NULL;
|
||||
@@ -44,7 +35,6 @@ diff_model_c::diff_model_c() {
|
||||
mRoomNo = 63;
|
||||
}
|
||||
|
||||
/* 80048D80-80048E0C 0436C0 008C+00 1/0 0/0 0/0 .text __dt__15dSmplMdl_draw_cFv */
|
||||
dSmplMdl_draw_c::~dSmplMdl_draw_c() {
|
||||
for (int i = 0; i < 8; i++) {
|
||||
if (mModel[i].getModel() != NULL) {
|
||||
@@ -55,7 +45,6 @@ dSmplMdl_draw_c::~dSmplMdl_draw_c() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 80048E0C-80048EBC 04374C 00B0+00 0/0 1/1 0/0 .text draw__15dSmplMdl_draw_cFv */
|
||||
void dSmplMdl_draw_c::draw() {
|
||||
for (int i = 0; i < 8; i++) {
|
||||
if (mModel[i].getModel() != NULL) {
|
||||
@@ -73,7 +62,6 @@ void dSmplMdl_draw_c::draw() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 80048EBC-80048F70 0437FC 00B4+00 0/0 1/1 0/0 .text entry__15dSmplMdl_draw_cFP8J3DModeli */
|
||||
void dSmplMdl_draw_c::entry(J3DModel* i_model, int roomNo) {
|
||||
if (i_model != NULL && mListCount < 500) {
|
||||
mList[mListCount].set(i_model);
|
||||
@@ -90,8 +78,6 @@ void dSmplMdl_draw_c::entry(J3DModel* i_model, int roomNo) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 80048F70-80049058 0438B0 00E8+00 0/0 1/1 0/0 .text
|
||||
* addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc */
|
||||
BOOL dSmplMdl_draw_c::addModel(J3DModelData* i_modelData, int roomNo, u8 drawBG) {
|
||||
JUT_ASSERT(307, i_modelData != NULL);
|
||||
if (roomNo == -1) {
|
||||
@@ -122,8 +108,6 @@ BOOL dSmplMdl_draw_c::addModel(J3DModelData* i_modelData, int roomNo, u8 drawBG)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* 80049058-800490EC 043998 0094+00 0/0 1/1 0/0 .text
|
||||
* removeModel__15dSmplMdl_draw_cFP12J3DModelDatai */
|
||||
int dSmplMdl_draw_c::removeModel(J3DModelData* i_modelData, int roomNo) {
|
||||
if (i_modelData == NULL) {
|
||||
return 0;
|
||||
@@ -140,7 +124,6 @@ int dSmplMdl_draw_c::removeModel(J3DModelData* i_modelData, int roomNo) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* 800490EC-800491F4 043A2C 0108+00 1/1 0/0 0/0 .text create__12diff_model_cFP12J3DModelDataiUc */
|
||||
BOOL diff_model_c::create(J3DModelData* i_modelData, int roomNo, u8 drawBG) {
|
||||
JUT_ASSERT(397, i_modelData != NULL);
|
||||
if (mpHeap == NULL) {
|
||||
@@ -175,7 +158,6 @@ BOOL diff_model_c::create(J3DModelData* i_modelData, int roomNo, u8 drawBG) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* 800491F4-80049210 043B34 001C+00 2/2 0/0 0/0 .text getModelData__12diff_model_cFv */
|
||||
J3DModelData* diff_model_c::getModelData() {
|
||||
if (mpModel != NULL) {
|
||||
return mpModel->getModelData();
|
||||
@@ -183,7 +165,6 @@ J3DModelData* diff_model_c::getModelData() {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* 80049210-80049270 043B50 0060+00 3/3 0/0 0/0 .text remove__12diff_model_cFi */
|
||||
void diff_model_c::remove(int param_0) {
|
||||
mCreateNum--;
|
||||
|
||||
@@ -201,7 +182,6 @@ void diff_model_c::remove(int param_0) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 80049270-80049368 043BB0 00F8+00 1/1 0/0 0/0 .text draw__12diff_model_cFv */
|
||||
void diff_model_c::draw() {
|
||||
modelList_c* list = mpList;
|
||||
if (list != NULL && dComIfGp_roomControl_checkStatusFlag(getRoomNo(), 0x10)) {
|
||||
@@ -226,7 +206,6 @@ void diff_model_c::draw() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 80049368-80049388 043CA8 0020+00 2/2 0/0 0/0 .text init__12diff_model_cFv */
|
||||
void diff_model_c::init() {
|
||||
mpModel = NULL;
|
||||
mpHeap = NULL;
|
||||
@@ -235,7 +214,6 @@ void diff_model_c::init() {
|
||||
mRoomNo = 63;
|
||||
}
|
||||
|
||||
/* 80049388-800493FC 043CC8 0074+00 3/3 0/0 0/0 .text isSame__12diff_model_cFP12J3DModelDatai */
|
||||
BOOL diff_model_c::isSame(J3DModelData* i_modelData, int roomNo) {
|
||||
if (mpModel != NULL) {
|
||||
return getModelData() == i_modelData && roomNo == getRoomNo();
|
||||
@@ -244,12 +222,10 @@ BOOL diff_model_c::isSame(J3DModelData* i_modelData, int roomNo) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* 800493FC-80049408 043D3C 000C+00 2/2 0/0 0/0 .text getRoomNo__12diff_model_cFv */
|
||||
s32 diff_model_c::getRoomNo() {
|
||||
return mRoomNo;
|
||||
}
|
||||
|
||||
/* 80049408-80049420 043D48 0018+00 2/2 0/0 0/0 .text insert__12diff_model_cFP11modelList_c */
|
||||
void diff_model_c::insert(modelList_c* list) {
|
||||
modelList_c* prev = mpList;
|
||||
mpList = list;
|
||||
|
||||
Reference in New Issue
Block a user