mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-21 13:36:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/zeldaret/tp

Browse Source
This commit is contained in:
TakaRikka
2026-03-17 04:08:44 -07:00
parent 851452bca6 3aec45d6d7
commit 266c4317d9
32 changed files with 3777 additions and 1319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_brg.cpp
+3 -2
View File
@@ -20,7 +20,8 @@ static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rid
obj_brg_class* a_this = (obj_brg_class*)i_bgActor;
cXyz sp74 = a_this->mBr[0].field_0x0bc - i_rideActor->current.pos;
int var_r27 = JMAFastSqrt(sp74.x * sp74.x + sp74.z * sp74.z) / (a_this->field_0xaedc * 51.0f) - -0.5f;
f32 var_f28 = JMAFastSqrt(sp74.x * sp74.x + sp74.z * sp74.z);
int var_r27 = var_f28 / (a_this->field_0xaedc * 51.0f) - -0.5f;
if (var_r27 > a_this->field_0xb1ea - 1) {
var_r27 = a_this->field_0xb1ea - 1;
@@ -37,7 +38,7 @@ static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rid
if (a_this->mType & 5) {
var_f30 = 0.85f;
} else if (a_this->field_0xb1ed == 2) {
var_f30 = KREG_F(7) + 0.1f;
var_f30 = KREG_F(4) + 0.1f;
} else {
var_f30 = 1.0f;
}
src/d/actor/d_a_obj_ladder.cpp
+4 -1
View File
@@ -380,7 +380,10 @@ int Act_c::Draw() {
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mModel);
dComIfGd_setList();
dComIfG_Bgsp().DebugDrawPoly(mpBgW);
#if DEBUG
dComIfG_Bgsp().DebugDrawPoly(*mpBgW);
#endif
return 1;
}
src/d/actor/d_a_obj_swpush.cpp
+1 -1
View File
@@ -240,7 +240,7 @@ cPhs_Step daObjSwpush::Act_c::Mthd_Create() {
mDoMtx_stack_c::scaleM(field_0x5f8);
MTXCopy(mDoMtx_stack_c::get(), mMtx);
mpBgW->ClrNoCalcVtx();
mpBgW->SetBaseMtxP(mMtx);
mpBgW->SetBaseMtxP(&mMtx);
mpBgW->GlobalVtx();
mpBgW->SetBaseMtxP(NULL);
mpBgW->SetNoCalcVtx();
src/d/actor/d_a_passer_mng.cpp
+27 -20
View File
@@ -38,33 +38,40 @@ int daPasserMng_c::execute() {
return 1;
}
static u8 const groupA[32] = {
0x07, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x04, 0x50, 0x00, 0x00, 0x06, 0x01, 0x00, 0x00, 0x07,
0x01, 0x00, 0x00, 0x05, 0x01, 0x00, 0x00, 0x1B, 0x01, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x1D,
// this is based off of daPasserMng_c::Group, any changes here should also be changed there
template <int N>
struct SizedGroup {
u8 field_0x00;
int field_0x04[N];
};
static u8 const groupB[36] = {
0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x11,
0x11, 0x00, 0x00, 0x12, 0x10, 0x00, 0x00, 0x13, 0x40, 0x00, 0x00, 0x09,
0x40, 0x00, 0x00, 0x08, 0x50, 0x00, 0x00, 0x0A, 0x01, 0x00, 0x00, 0x0B,
static SizedGroup<7> const groupA = {
7,
{0x11000004, 0x50000006, 0x01000007, 0x01000005, 0x0100001B, 0x0100001C, 0x0000001D},
};
static u8 const groupC[36] = {
0x08, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x01,
0x50, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x03, 0x21, 0x00, 0x00, 0x17,
0x10, 0x00, 0x00, 0x18, 0x01, 0x00, 0x00, 0x19, 0x10, 0x00, 0x00, 0x1A,
static SizedGroup<8> const groupB = {
8,
{0x01000010, 0x10000011, 0x11000012, 0x10000013, 0x40000009, 0x40000008, 0x5000000A,
0x0100000B},
};
static u8 const groupD[32] = {
0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x14, 0x21, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x16,
0x11, 0x00, 0x00, 0x0C, 0x50, 0x00, 0x00, 0x0E, 0x40, 0x00, 0x00, 0x0F, 0x01, 0x00, 0x00, 0x0D,
static SizedGroup<8> const groupC = {
8,
{0x11000000, 0x11000001, 0x50000002, 0x01000003, 0x21000017, 0x10000018, 0x01000019,
0x1000001A},
};
daPasserMng_c::Group* daPasserMng_c::mGroupTbl[4] = {
(Group*)groupA,
(Group*)groupB,
(Group*)groupC,
(Group*)groupD,
static SizedGroup<7> const groupD = {
7,
{0x01000014, 0x21000015, 0x00000016, 0x1100000C, 0x5000000E, 0x4000000F, 0x0100000D},
};
const daPasserMng_c::Group* daPasserMng_c::mGroupTbl[4] = {
(const Group*)&groupA,
(const Group*)&groupB,
(const Group*)&groupC,
(const Group*)&groupD,
};
int daPasserMng_c::getPasserParam() {
@@ -84,7 +91,7 @@ int daPasserMng_c::getPasserParam() {
} else {
groupInd = 0;
}
Group* pGroup = mGroupTbl[groupInd];
const Group* pGroup = mGroupTbl[groupInd];
int iVar5;
do {
iVar5 = cLib_getRndValue(0, (int)pGroup->field_0x00);