mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-01 17:29:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_com_static OK

Browse Source
This commit is contained in:
LagoLunatic
2024-04-13 15:16:15 -04:00
parent 282756e6e8
commit 133df570d9
20 changed files with 248 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_canon.h
+2
View File
@@ -36,6 +36,8 @@ public:
void PadMove();
void CreateHeap();
void GameInfo2DDraw();
static daCanon_c* canon_p;
public:
/* Place member variables here */
include/d/actor/d_a_dai.h
+2 -2
View File
@@ -30,8 +30,8 @@ public:
mNowDaizaNum = 0;
mNowItemNum = 0;
}
static void getMaxDaiza();
static void getDaizaSetItemNum();
static s8 getMaxDaiza();
static s8 getDaizaSetItemNum();
static s8 mNowDaizaNum;
static s8 mNowItemNum;
include/d/actor/d_a_dai_item.h
+1 -1
View File
@@ -12,7 +12,7 @@ class J3DNode;
class daStandItem_c : public fopAc_ac_c {
public:
void getItemNo() const {}
int getItemNo() const { return mItemNo; }
bool _delete();
void CreateHeap();
include/d/actor/d_a_lod_bg.h
+4
View File
@@ -6,6 +6,7 @@
class J3DModelData;
class mDoDvdThd_mountXArchive_c;
class JKRArchive;
class JKRExpHeap;
class daLodbg_c : public fopAc_ac_c {
public:
@@ -20,6 +21,9 @@ public:
void execCreateWait();
void execReadWait();
void execDeleteWait();
static s32 sObjectCount;
static JKRExpHeap* sLocalHeap;
public:
/* 0x290 */ int (daLodbg_c::*mExecFunc)();
include/d/actor/d_a_npc_bs1.h
+12 -7
View File
@@ -22,13 +22,14 @@ public:
s8 getBackboneJntNum() { return m_backbone_jnt_num; }
s16 getBackbone_x() { return mJntCtrl.getBackbone_x(); }
s16 getBackbone_y() { return mJntCtrl.getBackbone_y(); }
void getBuyItem() {}
void getBuyItemMax() {}
int getHeadJntNum() { return m_head_jnt_num; }
s16 getHead_x() { return mJntCtrl.getHead_x(); }
s16 getHead_y() { return mJntCtrl.getHead_y(); }
void getPayRupee() {}
void incAttnSetCount() {}
void incAttnSetCount() {
if (m72F != 0xFF) {
m72F += 1;
}
}
void setAction(ActionFunc func, void* arg) {
if (mCurrActionFunc != func) {
if (mCurrActionFunc) {
@@ -41,10 +42,14 @@ public:
}
}
void setAttentionBasePos(cXyz value) { m718 = value;}
void setBuyItem(u8) {}
void setBuyItemMax(u8) {}
void setEyePos(cXyz other) { eyePos = other; }
void setPayRupee(s16) {}
static u8 getBuyItemMax() { return m_tag_buy_item_max; }
static void setBuyItemMax(u8 count) { m_tag_buy_item_max = count; }
static u8 getBuyItem() { return m_tag_buy_item; }
static void setBuyItem(u8 count) { m_tag_buy_item = count; }
static s16 getPayRupee() { return m_tag_pay_rupee; }
static void setPayRupee(s16 count) { m_tag_pay_rupee = count; }
s16 XyEventCB(int);
BOOL initTexPatternAnm(bool);
include/d/actor/d_a_npc_kg1.h
+4 -2
View File
@@ -29,10 +29,12 @@ public:
void wait_action();
void clr_seq_flag();
void getMsg();
void next_msgStatus(unsigned long*);
void anmAtr(unsigned short);
void next_msgStatus(u32*);
void anmAtr(u16);
void setAnm();
static const u8 m_highscore;
public:
/* 0x6C4 */ J3DModel* m6C4;
/* 0x6C8 */ mDoExt_btpAnm mBtpAnm;
include/d/actor/d_a_npc_kg2.h
+7 -6
View File
@@ -7,21 +7,21 @@ class daNpc_Kg2_c : public fopAc_ac_c {
public:
void getAttentionBasePos() {}
void getEyePos() {}
void seStart(unsigned long) {}
void seStart(u32) {}
void setAction(int (daNpc_Kg2_c::*)(void*), void*) {}
void setCanonGameResult(unsigned char) {}
void setCanonGameResult(u8) {}
void set_mtx();
void initTexPatternAnm(bool);
void playTexPatternAnm();
void setAnm(signed char, float);
void setAnm(s8, f32);
void subAnm();
void chkAttention(cXyz, short);
void chkAttention(cXyz, s16);
void eventOrder();
void checkOrder();
void getMsg();
void next_msgStatus(unsigned long*);
void anmAtr(unsigned short);
void next_msgStatus(u32*);
void anmAtr(u16);
void setAttention();
void lookBack();
void CreateHeap();
@@ -48,6 +48,7 @@ public:
}
static s8 canon_game_result;
static daNpc_Kg2_c* l_kg2_pointer;
public:
/* Place member variables here */
include/d/actor/d_a_npc_sarace.h
+7 -4
View File
@@ -14,13 +14,13 @@ public:
void initTexPatternAnm(bool);
void playTexPatternAnm();
void setAnm(signed char, float);
void chkAttention(cXyz, short);
void setAnm(s8, f32);
void chkAttention(cXyz, s16);
void eventOrder();
void checkOrder();
void next_msgStatus(unsigned long*);
void next_msgStatus(u32*);
void getMsg();
void anmAtr(unsigned short);
void anmAtr(u16);
void CreateInit();
void setAttention();
void lookBack();
@@ -35,6 +35,9 @@ public:
BOOL _delete();
s32 _create();
void CreateHeap();
static s32 ship_race_rupee;
static s32 ship_race_result;
public:
/* Place member variables here */
include/d/actor/d_a_obj_light.h
+12 -7
View File
@@ -16,8 +16,8 @@ namespace daObjLight {
void draw_fire();
void exe_fire();
void delete_fire();
void now_event(short);
void set_event(short);
void now_event(s16);
void set_event(s16);
void exe_event();
void set_mtx();
void renew_angle();
@@ -26,11 +26,16 @@ namespace daObjLight {
BOOL _execute();
BOOL _draw();
static void renew_light_angle();
static void get_light_angle();
static void get_light_dif_angle();
static void set_light_dif_angle_LOD(short);
static void set_light_dif_angle_FRRS(short);
static BOOL renew_light_angle();
static s16 get_light_angle();
static s16 get_light_dif_angle();
static BOOL set_light_dif_angle_LOD(s16);
static BOOL set_light_dif_angle_FRRS(s16);
static s16 M_S_light_angle;
static u32 M_S_pre_set_frame_LOD;
static u32 M_S_pre_set_frame_FRRS;
static u8 M_S_lod_access;
public:
/* Place member variables here */
include/d/actor/d_a_obj_pirateship.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "f_op/f_op_actor.h"
namespace daObjPirateship {
static f32 getShipOffsetY(s16*, s16*, f32);
f32 getShipOffsetY(s16*, s16*, f32);
class Act_c : public fopAc_ac_c {
public:
include/d/actor/d_a_obj_roten.h
+1 -1
View File
@@ -14,7 +14,7 @@ public:
void CreateHeap();
void CreateInit();
static void getCreateCount();
static int getCreateCount();
public:
/* Place member variables here */
include/d/actor/d_a_salvage.h
+10 -10
View File
@@ -4,13 +4,13 @@
#include "f_op/f_op_actor.h"
#include "d/actor/d_a_oship.h"
class daSalvage_control_c;
class dSalvage_control_c;
class daSalvage_c : public fopAc_ac_c {
public:
void checkRegist(int) {}
void checkUsed(int) {}
void clrFlag(int, unsigned char) {}
void clrFlag(int, u8) {}
void debug_print() {}
void debug_print_reg() {}
void getAlphaP(int) {}
@@ -33,10 +33,10 @@ public:
void init_one(int) {}
void isValidSalvageId() {}
void setDrawMode(int, int) {}
void setFlag(int, unsigned char) {}
void setNowAlpha(int, unsigned char) {}
void setFlag(int, u8) {}
void setNowAlpha(int, u8) {}
void setPos(int, cXyz) {}
void setSRoomNo(signed char) {}
void setSRoomNo(s8) {}
void setSalvageId(int) {}
void CreateHeap();
@@ -57,7 +57,7 @@ public:
void end_salvage();
void checkDistance();
void checkXZDistance();
void getDistance(int, float*);
void getDistance(int, f32*);
void send_agb();
void debug_print2();
BOOL _draw();
@@ -65,7 +65,7 @@ public:
void isEffectKind(int);
void debugDraw();
static void init_room(signed char);
static void init_room(s8);
static void init() {
mNowRoomNo = -1;
@@ -73,10 +73,10 @@ public:
mSalvageId = -1;
}
static s8 mNowRoomNo;
static daSalvage_control_c* mTagData_p;
static s32 mSalvageId;
static const u16 m_savelabel[];
static dSalvage_control_c* mTagData_p;
static s8 mNowRoomNo;
static s32 mSalvageId;
public:
/* Place member variables here */
include/d/actor/d_a_tag_light.h
+10
View File
@@ -54,6 +54,16 @@ namespace daTagLight {
BOOL _execute();
void set_material(J3DMaterial*, unsigned char);
BOOL _draw();
static const f32 M_box_x_min;
static const f32 M_box_x_max;
static const f32 M_box_y_min;
static const f32 M_box_y_max;
static const f32 M_box_z_min;
static const f32 M_box_z_max;
static const f32 M_cone_lower;
static const f32 M_cone_upper;
static const f32 M_cone_r;
public:
/* Place member variables here */
include/d/actor/d_a_windmill.h
+2
View File
@@ -20,6 +20,8 @@ public:
void set_at();
void set_co();
BOOL _draw();
static const s16 m_max_rot_speed[];
public:
/* Place member variables here */
include/d/actor/d_a_ykgr.h
+5 -2
View File
@@ -3,6 +3,7 @@
#include "f_op/f_op_actor.h"
class dPath;
class JPABaseEmitter;
class JPABaseParticle;
@@ -21,11 +22,13 @@ public:
}
};
static JPABaseEmitter* m_emitter;
static u8 m_flag;
static u8 m_alpha_flag;
static u8 m_alpha;
static f32 m_aim_rate;
static dPath* m_path;
static JPABaseEmitter* m_emitter;
inline s32 _create();
inline BOOL _delete();
inline BOOL _draw();
include/d/d_shop.h
+1 -1
View File
@@ -120,7 +120,7 @@ public:
BOOL isHide() { return mbIsHide; }
s16 getItemDataIdx() { return mItemSetListGlobalIdx; }
void setItemDataIdx(s16 idx) { mItemSetListGlobalIdx = idx; }
void setItemSum(s16) {}
void setItemSum(s16 count) { mNumItems = count; }
void init() {}
void createItem(int, int);