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

Merge pull request #779 from LagoLunatic/d44j01

Browse Source 
Demo work, d_a_kytag02 and d_a_ff OK
This commit is contained in:
LagoLunatic
2025-06-01 17:50:57 -04:00
committed by GitHub
parent 7eb543eb50 cdfaa05635
commit 3771f5f6ee
68 changed files with 953 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JAudio/JAIAnimation.h
+1 -1
View File
@@ -31,7 +31,7 @@ struct JAIAnimeSoundData {
/* 0x02 */ u16 field_0x02;
/* 0x04 */ void* field_0x04;
/* 0x08 */ JAIAnimeFrameSoundData mAfsData[];
}; // Size: 0x20
};
struct JAIAnimeSound__Slot {
/* 0x0 */ u8 mbIsPlaying;
include/SSystem/SComponent/c_bg_s.h
+7
View File
@@ -45,6 +45,13 @@ public:
cM3dGPla* GetTriPla(cBgS_PolyInfo& polyInfo) const {
return GetTriPla(polyInfo.GetBgIndex(), polyInfo.GetPolyIndex());
}
s32 GetTriGrp(cBgS_PolyInfo& polyInfo) const {
return GetTriGrp(polyInfo.GetBgIndex(), polyInfo.GetPolyIndex());
}
fopAc_ac_c* GetActorPointer(cBgS_PolyInfo& i_poly) const {
return GetActorPointer(i_poly.GetBgIndex());
}
bool Regist(cBgW*, fpc_ProcID, void*);
bool Release(cBgW*);
bool LineCross(cBgS_LinChk*);
include/SSystem/SComponent/c_cc_d.h
+8
View File
@@ -340,7 +340,15 @@ public:
virtual cCcD_GStts* GetGStts();
void Init(int, int, void*, fpc_ProcID);
virtual void Ct();
#if VERSION == VERSION_DEMO
void PlusCcMove(f32 x, f32 y, f32 z) {
m_cc_move.x += x;
m_cc_move.y += y;
m_cc_move.z += z;
}
#else
void PlusCcMove(f32, f32, f32);
#endif
void ClrCcMove() {
m_cc_move.x = m_cc_move.y = m_cc_move.z = 0.0f;
}
include/SSystem/SComponent/c_cc_s.h
+6 -6
View File
@@ -51,15 +51,15 @@ public:
void Move();
void DrawClear();
virtual void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*,
cCcD_GStts*, cCcD_GStts*);
cCcD_GStts*, cCcD_GStts*) {}
virtual void SetAtTgGObjInf(bool, bool, cCcD_Obj*, cCcD_Obj*, cCcD_GObjInf*, cCcD_GObjInf*,
cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*, cXyz*);
virtual bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_GStts*, cCcD_GStts*);
cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*, cXyz*) {}
virtual bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_GStts*, cCcD_GStts*) { return false; }
virtual bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*, cCcD_GObjInf const*,
cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*);
virtual bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*);
cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*) { return false; }
virtual bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*) { return false; }
virtual ~cCcS() {}
virtual void MoveAfterCheck();
virtual void MoveAfterCheck() {}
virtual void SetCoGCorrectProc(cCcD_Obj*, cCcD_Obj*);
}; // Size = 0x2850
include/d/actor/d_a_ff.h
+1 -1
View File
@@ -31,7 +31,7 @@ public:
/* 0x306 */ s16 mTargetRotY;
/* 0x308 */ s16 mTimers[5];
/* 0x312 */ s16 mLiveTimer;
/* 0x314 */ u8 mState;
/* 0x314 */ s8 mMode;
/* 0x315 */ u8 m315[0x317 - 0x315];
/* 0x317 */ u8 mbNotVisibleZ;
/* 0x318 */ dCcD_Stts mStts;
include/d/actor/d_a_player_main.h
+1 -1
View File
@@ -1835,7 +1835,7 @@ public:
BOOL allTrigger() const { return mItemTrigger & (BTN_A | BTN_B | BTN_X | BTN_Y | BTN_Z); }
void otherWeaponTrigger() const {}
BOOL checkPlayerDemoMode() const { return mDemo.getDemoType(); }
BOOL checkPlayerDemoMode() const { return mDemo.getDemoType() != 0; }
void checkSpecialDemoMode() const {}
void checkAttentionLock() {}
include/d/actor/d_a_swc00.h
+3 -3
View File
@@ -6,8 +6,8 @@
class swc00_class : public fopAc_ac_c {};
static inline s32 daSwc00_getSw1No(swc00_class* i_this) { return fopAcM_GetParam(i_this) & 0xFF; }
static inline s32 daSwc00_getSw2No(swc00_class* i_this) { return (fopAcM_GetParam(i_this) >> 8) & 0xFF; }
static inline s32 daSwc00_getType(swc00_class* i_this) { return (fopAcM_GetParam(i_this) >> 0x10) & 0x3; }
static inline int daSwc00_getSw1No(swc00_class* i_this) { return fopAcM_GetParam(i_this) & 0xFF; }
static inline int daSwc00_getSw2No(swc00_class* i_this) { return (fopAcM_GetParam(i_this) >> 8) & 0xFF; }
static inline int daSwc00_getType(swc00_class* i_this) { return (fopAcM_GetParam(i_this) >> 0x10) & 0x3; }
#endif /* D_A_SWC00_H */
include/d/d_bg_s.h
+16 -2
View File
@@ -65,6 +65,22 @@ public:
dBgS() {}
virtual ~dBgS() {}
bool WaterChk(dBgS_SplGrpChk* chk) { return SplGrpChk(chk); }
fopAc_ac_c* GetActorPointer(cBgS_PolyInfo& i_poly) const {
return cBgS::GetActorPointer(i_poly);
}
// void CaptPoly(dBgS_CaptPoly&) {}
// void ChkDeleteActorRegist(fopAc_ac_c*) {}
// void DebugDrawPoly(dBgW&) {}
// void Draw() {}
// void DrawPoly(cBgS_PolyInfo&, _GXColor&) {}
// void GetBgWPointer(cBgS_PolyInfo&) {}
// void GetPolyCamId(cBgS_PolyInfo&) {}
// void GroundCross(cBgS_GndChk*) {}
// void LineCross(cBgS_LinChk*) {}
// void ShdwDraw(cBgS_ShdwDraw*) {}
virtual void Ct();
virtual void Dt();
virtual void Move();
@@ -106,8 +122,6 @@ public:
void MoveBgMatrixCrrPos(cBgS_PolyInfo&, bool, cXyz*, csXyz*, csXyz*);
void RideCallBack(cBgS_PolyInfo&, fopAc_ac_c*);
fopAc_ac_c* PushPullCallBack(cBgS_PolyInfo&, fopAc_ac_c*, short, dBgW::PushPullLabel);
bool WaterChk(dBgS_SplGrpChk* chk) { return SplGrpChk(chk); }
}; // Size: 0x1404
class dBgS_CrrPos : public cBgS_PolyInfo, public dBgS_Chk, public cBgS_Chk {
include/d/d_com_inf_game.h
+1 -1
View File
@@ -1618,7 +1618,7 @@ inline void dComIfGs_onVisitedRoom(int i_no) {
g_dComIfG_gameInfo.save.getMemory().getBit().onVisitedRoom(i_no);
}
inline bool dComIfGs_isVisitedRoom(int i_no) {
inline BOOL dComIfGs_isVisitedRoom(int i_no) {
return g_dComIfG_gameInfo.save.getMemory().getBit().isVisitedRoom(i_no);
}
include/d/d_stage.h
+1 -1
View File
@@ -935,7 +935,7 @@ public:
void set(const char*, s8, s16, s8);
const char* getName() const { return mName; }
s16 getPoint() const { return mPoint; }
int getRoomNo() const { return mRoomNo; }
s8 getRoomNo() const { return mRoomNo; }
s8 getLayer() const { return mLayer; }
void setLayer(s8 layer) { mLayer = layer; }
include/dolphin/gf/GF.h
+10
View File
@@ -0,0 +1,10 @@
#ifndef GF_H
#define GF_H
#include "dolphin/gf/GFGeometry.h" // IWYU pragma: export
#include "dolphin/gf/GFLight.h" // IWYU pragma: export
#include "dolphin/gf/GFPixel.h" // IWYU pragma: export
#include "dolphin/gf/GFTev.h" // IWYU pragma: export
#include "dolphin/gf/GFTransform.h" // IWYU pragma: export
#endif /* GF_H */
include/dolphin/gf/GFPixel.h
+1
View File
@@ -6,5 +6,6 @@
void GFSetFog(GXFogType type, f32 startZ, f32 endZ, f32 nearZ, f32 farZ, GXColor color);
void GFSetBlendModeEtc(GXBlendMode, GXBlendFactor, GXBlendFactor, GXLogicOp, u8, u8, u8);
void GFSetDstAlpha(u8, u8);
#endif /* GFPIXEL_H */
include/f_op/f_op_actor_mng.h
+6 -1
View File
@@ -401,18 +401,23 @@ inline BOOL fopAcM_isItem(fopAc_ac_c* item, int bitNo) {
return dComIfGs_isItem(bitNo, fopAcM_GetHomeRoomNo(item));
}
inline BOOL dComIfGs_isVisitedRoom(int i_no);
inline BOOL dComIfGs_isSaveSwitch(int i_stageNo, int i_no);
inline BOOL fopAcM_isItemForIb(int itemBitNo, u8 itemNo, s8 roomNo) {
if (itemNo == dItem_BLUE_JELLY_e) {
#if VERSION == VERSION_DEMO
return dComIfGs_isVisitedRoom(itemBitNo);
#else
// Blue Chu Jelly uses itemBitNo as if it was a switch in stageNo 0xE.
return dComIfGs_isSaveSwitch(dSv_save_c::STAGE_BLUE_CHU_JELLY, itemBitNo);
#endif
} else {
return dComIfGs_isItem(itemBitNo, roomNo);
}
}
inline void dComIfGs_onSaveSwitch(int i_stageNo, int i_no);
inline void dComIfGs_onVisitedRoom(int i_no);
inline void dComIfGs_onSaveSwitch(int i_stageNo, int i_no);
inline void fopAcM_onItemForIb(int itemBitNo, u8 itemNo, s8 roomNo) {
if (itemNo == dItem_BLUE_JELLY_e) {
#if VERSION == VERSION_DEMO
include/f_op/f_op_overlap.h
+5
View File
@@ -3,7 +3,12 @@
#define F_F_OP_OVERLAP_H_
#include "f_pc/f_pc_leaf.h"
#include "f_pc/f_pc_manager.h"
extern leafdraw_method_class g_fopOvlp_Method;
inline s16 fopOvlpM_GetName(void* ovlp) {
return fpcM_GetName(ovlp);
}
#endif
include/global.h
+1 -2
View File
@@ -41,12 +41,11 @@
#define WEAKFUNC
#endif
#ifndef __MWERKS__
// Intrinsics
extern int __cntlzw(uint);
extern int __rlwimi(int, int, int, int, int);
extern void __dcbz(void*, int);
extern void __sync();
#endif
#define VERSION_DEMO 0
#define VERSION_JPN 1
include/m_Do/m_Do_mtx.h
+4
View File
@@ -361,6 +361,10 @@ inline MtxP mDoMtx_getIdentity() {
return g_mDoMtx_identity;
}
inline MtxP cMtx_getIdentity() {
return mDoMtx_getIdentity();
}
class mDoMtx_quatStack_c {
public:
mDoMtx_quatStack_c() {