Work on d_a_mirror

This commit is contained in:
Tal Hayon
2023-06-30 19:29:50 +03:00
parent 7150d8e25d
commit bf7e686ef7
35 changed files with 497 additions and 784 deletions
+1 -4
View File
@@ -35,6 +35,7 @@
#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h"
#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h"
#include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h"
#include "rel/d/a/d_a_mirror/d_a_mirror.h"
//
// Types:
@@ -66,10 +67,6 @@ struct daNpcT_ActorMngr_c {
/* 80145708 */ void getActorP();
};
struct daMirror_c {
/* 8003194C */ static void entry(J3DModel*);
};
struct dPaPoF_c {
/* 800512E8 */ void setEffectFour(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*,
cXyz const*, cXyz const*, cXyz const*, cXyz const*,
+1 -12
View File
@@ -14,6 +14,7 @@
#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h"
#include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h"
#include "rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h"
#include "rel/d/a/d_a_mirror/d_a_mirror.h"
//
// Types:
@@ -41,18 +42,6 @@ struct daObjMovebox {
};
};
struct dMirror_packet_c {
};
struct daMirror_c: fopAc_ac_c {
/* 8003194C */ static int entry(J3DModel*);
/* 80031990 */ static int remove();
typedef int (daMirror_c::*entryModelFunc)(J3DModel*);
static entryModelFunc m_entryModel;
static daMirror_c* m_myObj;
};
struct dFlower_packet_c {
typedef void (dFlower_packet_c::*DeleteRoomFunc)(int);
static DeleteRoomFunc m_deleteRoom;
+4 -4
View File
@@ -1646,8 +1646,8 @@ bool J3DIndBlock::getIndTexOrder(u32 param_0) {
/* 8000DF7C-8000DF84 0088BC 0008+00 0/0 2/0 0/0 .text getIndTexStageNum__11J3DIndBlockCFv
*/
bool J3DIndBlock::getIndTexStageNum() const {
return false;
u8 J3DIndBlock::getIndTexStageNum() const {
return 0;
}
/* 8000DF84-8000DF8C 0088C4 0008+00 0/0 2/0 0/0 .text getIndTevStage__11J3DTevBlockFUl */
@@ -1740,8 +1740,8 @@ GXColor* J3DColorBlock::getMatColor(u32 param_0) {
/* 8000E008-8000E010 008948 0008+00 0/0 2/0 0/0 .text getColorChanNum__13J3DColorBlockCFv
*/
bool J3DColorBlock::getColorChanNum() const {
return false;
u8 J3DColorBlock::getColorChanNum() const {
return 0;
}
/* 8000E010-8000E014 008950 0004+00 0/0 5/0 0/0 .text setZCompLoc__10J3DPEBlockFUc */