mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-02 03:40:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

misc cleanup

Browse Source
This commit is contained in:
LagoLunatic
2023-11-19 03:23:36 -05:00
parent 98da19dfac
commit a3ac23c265
8 changed files with 140 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1286,7 +1286,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_tenmado"),
ActorRel(NonMatching, "d_a_obj_tide"),
ActorRel(NonMatching, "d_a_obj_timer"),
ActorRel(NonMatching, "d_a_obj_toripost"),
ActorRel(NonMatching, "d_a_obj_toripost", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(NonMatching, "d_a_obj_tousekiki"),
ActorRel(NonMatching, "d_a_obj_warpt"),
ActorRel(NonMatching, "d_a_obj_wood"),
include/d/actor/d_a_arrow.h
+11 -11
View File
@@ -59,17 +59,17 @@ public:
static void setKeepType(u8 type);
// TODO inlines
// setAtHitPosBuff__9daArrow_cFP4cXyz
// setAtHitNormal__9daArrow_cFv
// setAtHitNormalActor__9daArrow_cFP10fopAc_ac_c
// clrAtHitNormal__9daArrow_cFv
// isSetByZelda__9daArrow_cFv
// clrAtHitPosBuff__9daArrow_cFP4cXyz
// getAtHitPosBuffP__9daArrow_cFv
// getAtHitNormalActor__9daArrow_cFv
// chkAtHitNormal__9daArrow_cFv
// isLinkReflect__9daArrow_cFv
// ArrowAtOff__9daArrow_cFv
void ArrowAtOff() {}
void chkAtHitNormal() {}
void clrAtHitNormal() {}
void clrAtHitPosBuff(cXyz*) {}
void getAtHitNormalActor() {}
void getAtHitPosBuffP() {}
void isLinkReflect() {}
void isSetByZelda() {}
void setAtHitNormal() {}
void setAtHitNormalActor(fopAc_ac_c*) {}
void setAtHitPosBuff(cXyz*) {}
public:
/* 0x290 */ bool mbShotByZelda;
include/d/actor/d_a_item.h
+8 -2
View File
@@ -70,11 +70,17 @@ public:
BOOL releaseLock();
BOOL checkActionNow();
u32 getItemNo() { return m_itemNo; }
void setItemTimerForIball(short param_1, short param_2) {
u32 getItemNo() const { return m_itemNo; }
void setItemTimerForIball(s16 param_1, s16 param_2) {
mDisappearTimer = param_1;
field_0x65a = param_2;
}
// TODO
void setFlag(u8) {}
void clrFlag(u8) {}
void checkFlag(u8) {}
void setStatus(u8) {}
void printStatus() {}
static dCcD_SrcCyl m_cyl_src;
static s32 m_timer_max;
include/d/actor/d_a_obj_toripost.h
+110
View File
@@ -0,0 +1,110 @@
#ifndef D_A_OBJ_TORIPOST_H
#define D_A_OBJ_TORIPOST_H
#include "d/d_npc.h"
#include "SSystem/SComponent/c_phase.h"
struct daObjTpost_c__letter_data {
/* 0x00 */ bool field_0x00;
/* 0x04 */ u32 mMsgId;
/* 0x08 */ u8 mItemId;
/* 0x0A */ u16 mEventReg;
};
class daObjTpost_c : public fopNpc_npc_c {
public:
enum Proc_e {
PROC_INIT = 0,
PROC_EXEC = 1
};
BOOL _createHeap();
void cutProc();
void cutPresentStart(int staffIdx);
void cutPresentProc(int staffIdx);
void cutSetAnmStart(int staffIdx);
void cutSetAnmProc(int staffIdx);
void cutDispLetterStart(int staffIdx);
void cutDispLetterProc(int staffIdx);
void deliverLetter();
s16 getReceiveLetterNum();
s32 getReadableLetterNum();
u8 checkSendPrice();
int getMsgXY();
int getMsgNormal();
u32 getMsg();
u16 next_msgStatus(u32* msgId);
bool checkTalk();
void eventOrder();
void checkOrder();
void setAttention();
void setAnm(s8 param_1, bool param_2);
void setMtx();
void modeWaitInit();
void modeWait();
void modeTalkInit();
void modeTalk();
void modeTalkXYInit();
void modeTalkXY();
void modeReceiveInit();
void modeReceive();
void modeReceiveDemoInit();
void modeReceiveDemo();
void modeProc(Proc_e proc, int newMode);
bool _execute();
void debugDraw();
bool _draw();
void createInit();
void getArg();
int _create();
bool _delete();
inline s32 getSendPrice() { return m_send_price[mPayType]; }
static const char m_arc_name[];
static const daObjTpost_c__letter_data m_letter[];
static const dCcD_SrcCyl m_cyl_src;
private:
static const s32 m_send_price[];
/* 0x6C4 */ u32 mCurMode;
/* 0x6C8 */ s8 field_0x6C8;
/* 0x6C9 */ s8 field_0x6C9;
/* 0x6CA */ s8 field_0x6CA;
/* 0x6CC */ request_of_phase_process_class mPhs;
/* 0x6D4 */ mDoExt_McaMorf* mMorf;
/* 0x6D8 */ dBgS_ObjAcch mAcch;
/* 0x89C */ dBgS_AcchCir mAcchCir;
/* 0x8DC */ int field_0x8DC;
/* 0x8E0 */ int field_0x8E0;
/* 0x8E4 */ int field_0x8E4;
/* 0x8E8 */ u8 mPayType;
/* 0x8E9 */ u8 field_0x8E9;
/* 0x8EA */ u8 field_0x8EA;
/* 0x8EB */ u8 field_0x8EB;
/* 0x8EC */ s32 mNumReadable;
/* 0x8F0 */ u32 field_0x8F0;
/* 0x8F4 */ u8 field_0x8F4;
/* 0x8F5 */ u8 field_0x8F5;
/* 0x8F6 */ u8 field_0x8F6;
/* 0x8F7 */ s8 field_0x8F7;
};
class daObjTpost_HIO_c {
public:
daObjTpost_HIO_c();
virtual ~daObjTpost_HIO_c() {}
/* 0x04 */ s8 field_0x04;
/* 0x05 */ bool debug_draw;
/* 0x06 */ s8 field_0x06;
/* 0x07 */ u8 field_0x07;
/* 0x08 */ f32 attn_pos_offset;
/* 0x0C */ f32 eye_pos_offset;
/* 0x10 */ f32 talk_distance;
/* 0x14 */ s16 field_0x14;
/* 0x16 */ s16 field_0x16;
};
#endif /* D_A_OBJ_TORIPOST_H */
src/d/actor/d_a_kaji.cpp
+3
View File
@@ -20,6 +20,9 @@ public:
inline BOOL _delete();
inline BOOL _execute();
inline bool _draw();
void setAnm(int, f32) {}
void set_mtx() {}
public:
/* 0x290 */ request_of_phase_process_class mPhs;
src/d/actor/d_a_obj_toripost.cpp
+5 -108
View File
@@ -3,13 +3,13 @@
// Translation Unit: d_a_obj_toripost.cpp
//
#include "d/actor/d_a_obj_toripost.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "f_op/f_op_actor_mng.h"
#include "d/actor/d_a_player.h"
#include "d/d_com_inf_game.h"
#include "d/d_lib.h"
#include "d/d_npc.h"
#include "d/d_letter.h"
#include "d/d_item_data.h"
#include "d/d_s_play.h"
@@ -20,93 +20,6 @@
extern dScnPly_reg_HIO_c g_regHIO;
struct daObjTpost_c__letter_data {
/* 0x00 */ bool field_0x00;
/* 0x04 */ u32 mMsgId;
/* 0x08 */ u8 mItemId;
/* 0x0A */ u16 mEventReg;
};
class daObjTpost_c : public fopNpc_npc_c {
public:
enum Proc_e {
PROC_INIT = 0,
PROC_EXEC = 1
};
bool _createHeap();
bool cutProc();
void cutPresentStart(int staffIdx);
void cutPresentProc(int staffIdx);
void cutSetAnmStart(int staffIdx);
void cutSetAnmProc(int staffIdx);
void cutDispLetterStart(int staffIdx);
void cutDispLetterProc(int staffIdx);
void deliverLetter();
s16 getReceiveLetterNum();
s32 getReadableLetterNum();
u8 checkSendPrice();
int getMsgXY();
int getMsgNormal();
u32 getMsg();
u16 next_msgStatus(u32* msgId);
bool checkTalk();
void eventOrder();
void checkOrder();
void setAttention();
void setAnm(s8 param_1, bool param_2);
void setMtx();
void modeWaitInit();
void modeWait();
void modeTalkInit();
void modeTalk();
void modeTalkXYInit();
void modeTalkXY();
void modeReceiveInit();
void modeReceive();
void modeReceiveDemoInit();
void modeReceiveDemo();
void modeProc(Proc_e proc, int newMode);
bool _execute();
void debugDraw();
bool _draw();
void createInit();
void getArg();
int _create();
bool _delete();
inline s32 getSendPrice() { return m_send_price[mPayType]; }
static const char m_arc_name[];
static const daObjTpost_c__letter_data m_letter[];
static const dCcD_SrcCyl m_cyl_src;
private:
static const s32 m_send_price[];
/* 0x6C4 */ u32 mCurMode;
/* 0x6C8 */ s8 field_0x6C8;
/* 0x6C9 */ s8 field_0x6C9;
/* 0x6CA */ s8 field_0x6CA;
/* 0x6CC */ request_of_phase_process_class mPhs;
/* 0x6D4 */ mDoExt_McaMorf* mMorf;
/* 0x6D8 */ dBgS_ObjAcch mAcch;
/* 0x89C */ dBgS_AcchCir mAcchCir;
/* 0x8DC */ int field_0x8DC;
/* 0x8E0 */ int field_0x8E0;
/* 0x8E4 */ int field_0x8E4;
/* 0x8E8 */ u8 mPayType;
/* 0x8E9 */ u8 field_0x8E9;
/* 0x8EA */ u8 field_0x8EA;
/* 0x8EB */ u8 field_0x8EB;
/* 0x8EC */ s32 mNumReadable;
/* 0x8F0 */ u32 field_0x8F0;
/* 0x8F4 */ u8 field_0x8F4;
/* 0x8F5 */ u8 field_0x8F5;
/* 0x8F6 */ u8 field_0x8F6;
/* 0x8F7 */ s8 field_0x8F7;
};
const char daObjTpost_c::m_arc_name[] = "Toripost";
const daObjTpost_c__letter_data daObjTpost_c::m_letter[] = {
{false, 0x1AAF, 0x07, 0xAC03},
@@ -158,22 +71,6 @@ const s32 daObjTpost_c::m_send_price[] = {
0x14
};
class daObjTpost_HIO_c {
public:
daObjTpost_HIO_c();
virtual ~daObjTpost_HIO_c() {}
/* 0x04 */ s8 field_0x04;
/* 0x05 */ bool debug_draw;
/* 0x06 */ s8 field_0x06;
/* 0x07 */ u8 field_0x07;
/* 0x08 */ f32 attn_pos_offset;
/* 0x0C */ f32 eye_pos_offset;
/* 0x10 */ f32 talk_distance;
/* 0x14 */ s16 field_0x14;
/* 0x16 */ s16 field_0x16;
};
static daObjTpost_HIO_c l_HIO;
// need to figure out what's putting this data in front of a bunch of rels with the compiler-generated symbol names
@@ -206,10 +103,10 @@ static u8 dummy3[] = {
};
static int createHeap_CB(fopAc_ac_c* i_this) {
static_cast<daObjTpost_c*>(i_this)->_createHeap();
return static_cast<daObjTpost_c*>(i_this)->_createHeap();
}
bool daObjTpost_c::_createHeap() {
BOOL daObjTpost_c::_createHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, 9);
JUT_ASSERT(132, modelData != 0);
@@ -237,8 +134,8 @@ daObjTpost_HIO_c::daObjTpost_HIO_c() {
field_0x16 = 30;
}
bool daObjTpost_c::cutProc() {
static const char* action_table[3] = {
void daObjTpost_c::cutProc() {
static char* action_table[3] = {
"PRESENT",
"SET_ANM",
"DISP_LETTER"
src/d/actor/d_a_swhit0.cpp
+1 -1
View File
@@ -222,7 +222,7 @@ s32 daSwhit0_c::DemoProc() {
if (dComIfGp_evmng_getIsAddvance(mStaffId))
{
switch(dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 2, 0, 0)) {
switch(dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), 0, 0)) {
case 1:
dComIfGs_onSwitch(getSwNo(), fopAcM_GetRoomNo(this));
onFlag(0x01);
src/d/actor/d_a_tbox.cpp
+1 -1
View File
@@ -991,7 +991,7 @@ s32 daTbox_c::demoProc() {
"OPEN_SHORT"
};
s32 actionIdx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 4, 0, 0);
s32 actionIdx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), 0, 0);
bool bIsAdvance = dComIfGp_evmng_getIsAddvance(mStaffId);
if (bIsAdvance) {