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

More demo work, fix some fakematches in retail

Browse Source
This commit is contained in:
LagoLunatic
2025-05-25 19:20:08 -04:00
parent 0ee416c538
commit c484eb490d
15 changed files with 416 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_am.h
+3
View File
@@ -39,6 +39,9 @@ public:
/* 0x0324 */ cXyz mSpawnPos;
/* 0x0330 */ csXyz mEyeRot;
/* 0x0336 */ csXyz mTargetEyeRot;
#if VERSION == VERSION_DEMO
/* 0x033C */ JPABaseEmitter* m033C_demo;
#endif
/* 0x033C */ JPABaseEmitter* m033C;
/* 0x0340 */ JPABaseEmitter* m0340;
/* 0x0344 */ dPa_smokeEcallBack mSmokeCbs[4];
include/d/actor/d_a_player_main.h
+9 -1
View File
@@ -209,7 +209,7 @@ public:
~daPy_dmEcallBack_c() {}
daPy_dmEcallBack_c() {}
static int getTimer() { return m_timer; }
static s16 getTimer() { return m_timer; }
static void setTimer(s16 timer) { m_timer = timer; }
static void decTimer() { m_timer--; }
@@ -1237,7 +1237,9 @@ public:
BOOL dProcOpenTreasure_init();
BOOL dProcOpenTreasure();
void setGetItemSound(u16, int);
#if VERSION > VERSION_DEMO
BOOL setGetDemo();
#endif
BOOL dProcGetItem_init();
BOOL dProcGetItem();
BOOL dProcUnequip_init();
@@ -1677,8 +1679,12 @@ public:
BOOL procFoodSet();
void setSwordModel(BOOL);
void setLightSaver();
#if VERSION == VERSION_DEMO
BOOL checkLastDemoSwordNoDraw(int);
#else
BOOL checkDemoShieldNoDraw();
BOOL checkDemoSwordNoDraw(BOOL);
#endif
BOOL checkChanceMode();
BOOL checkCutRollChange() const;
int getSwordBlurColor();
@@ -2204,7 +2210,9 @@ public:
/* 0x362C */ fpc_ProcID mTactZevPartnerId;
/* 0x3630 */ fpc_ProcID m3630;
/* 0x3634 */ fpc_ProcID mWhirlId;
#if VERSION > VERSION_DEMO
/* 0x3638 */ fpc_ProcID mMsgId;
#endif
/* 0x363C */ J3DFrameCtrl* mpSeAnmFrameCtrl;
/* 0x3640 */ s16 m3640;
/* 0x3644 */ f32 m3644;
include/d/d_bg_s_acch.h
+1 -1
View File
@@ -91,7 +91,7 @@ public:
cXyz* speed = NULL, csXyz* angle = NULL, csXyz* shape_angle = NULL);
void GroundCheckInit(dBgS&);
void GroundCheck(dBgS&);
f32 GroundRoofProc(dBgS&);
void GroundRoofProc(dBgS&);
void LineCheck(dBgS&);
void CrrPos(dBgS&);
f32 GetWallAllR();
include/d/d_drawlist.h
+4
View File
@@ -413,7 +413,11 @@ public:
class dDlst_mirrorPacket : public J3DPacket {
public:
void init(ResTIMG*);
#if VERSION == VERSION_DEMO
void update(Mtx, u8);
#else
void update(Mtx, u8, f32);
#endif
virtual void draw();
/* 0x0010 */ u8 field_0x0010[0x0040 - 0x0010];
include/f_op/f_op_actor_mng.h
+2 -3
View File
@@ -430,15 +430,14 @@ inline f32 fopAcM_searchActorDistanceY(fopAc_ac_c* actorA, fopAc_ac_c* actorB) {
return actorB->current.pos.y - actorA->current.pos.y;
}
inline u16 fopAcM_GetSetId(fopAc_ac_c* p_actor) {
inline int fopAcM_GetSetId(fopAc_ac_c* p_actor) {
return p_actor->setID;
}
inline void dComIfGs_onActor(int bitNo, int roomNo);
inline void fopAcM_onActor(fopAc_ac_c* p_actor) {
int setId = fopAcM_GetSetId(p_actor);
dComIfGs_onActor(setId, fopAcM_GetHomeRoomNo(p_actor));
dComIfGs_onActor(fopAcM_GetSetId(p_actor), fopAcM_GetHomeRoomNo(p_actor));
}
inline bool fopAcM_IsFirstCreating(void* i_actor) {