mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-23 06:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Random Work

Browse Source
This commit is contained in:
SuperDude88
2024-05-18 20:55:58 -04:00
parent 29a9b56c6d
commit 4fe8a9bd46
9 changed files with 111 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_bomb.h
+1 -1
View File
@@ -7,7 +7,6 @@
#include "d/d_bg_s_acch.h"
#include "d/d_cc_d.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_ext.h"
class daBomb_fuseSmokeEcallBack : public dPa_levelEcallBack {
public:
@@ -99,6 +98,7 @@ public:
bool procWait();
bool waitState_cannon();
void waitState_bomtyu();
bool procSink_init();
bool procSink();
BOOL execute();
void set_wind_vec();
include/d/d_a_obj.h
+1 -1
View File
@@ -16,7 +16,7 @@ namespace daObj {
void make_land_effect(fopAc_ac_c*, dBgS_GndChk*, float);
void get_wind_spd(fopAc_ac_c*, float);
void get_path_spd(cBgS_PolyInfo&, float);
cXyz& get_path_spd(cBgS_PolyInfo&, float);
void posMoveF_stream(fopAc_ac_c*, const cXyz*, const cXyz*, float, float);
void posMoveF_grade(fopAc_ac_c*, const cXyz*, const cXyz*, float, float, const cXyz*, float, float, const cXyz*);
void quat_rotBaseY(Quaternion*, const cXyz&);
include/d/d_kankyo_wether.h
+1
View File
@@ -362,6 +362,7 @@ cXyz * dKyw_get_wind_vec();
void squal_proc();
void dKyw_pntwind_set(WIND_INFLUENCE*);
void dKyw_pntwind_cut(WIND_INFLUENCE*);
void dKyw_pntwind_get_info(cXyz* param_0, cXyz* i_dir, f32* i_power);
void dKyw_pwind_cylinder_set(WIND_INFLUENCE*);
cXyz dKyw_pntwind_get_vecpow(cXyz* pPos);
void dKyw_evt_wind_set(s16 i_windX, s16 i_windY);
include/d/d_path.h
+1 -1
View File
@@ -25,6 +25,6 @@ struct dPath {
dPath__Point* dPath_GetPnt(dPath*, int);
dPath* dPath_GetRoomPath(int, int);
dPath* dPath_GetNextRoomPath(dPath*, int);
int dPath_GetPolyRoomPathVec(cBgS_PolyInfo&, cXyz*, int*);
bool dPath_GetPolyRoomPathVec(cBgS_PolyInfo&, cXyz*, int*);
#endif /* D_PATH_H */
src/d/actor/d_a_bomb3.inc
+8 -4
View File
@@ -61,7 +61,7 @@ namespace {
const daBomb_c::Attr_c daBomb_c::m_attrType[] = {
{"Link", 0x8E0},
{"VbakH", 0x800},
{"VbakH", 0x8000},
{"Link", 0x8E0},
};
@@ -1034,6 +1034,13 @@ void daBomb_c::waitState_bomtyu() {
}
}
// assuming this was here and got stripped, given the leftover ptmf in .data and the other proc/proc_init pairs
bool daBomb_c::procSink_init() {
mFunc = &daBomb_c::procSink;
return true;
}
/* 800DBC4C-800DBC5C .text procSink__8daBomb_cFv */
bool daBomb_c::procSink() {
field_0x781 = 1;
@@ -1356,9 +1363,6 @@ static int daBomb_Create(fopAc_ac_c* i_this) {
return static_cast<daBomb_c*>(i_this)->create();
}
// TODO: not sure why this appears in data
daBomb_c::procFunc dummy_5390 = &daBomb_c::procSink;
static dCcD_SrcSph l_sph_src = {
// dCcD_SrcGObjInf
{
src/d/d_a_obj.cpp
+96 -11
View File
@@ -7,6 +7,8 @@
#include "d/d_bg_s_gnd_chk.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_kankyo_wether.h"
#include "d/d_path.h"
#include "m_Do/m_Do_mtx.h"
#include "JSystem/JParticle/JPAEmitter.h"
@@ -59,35 +61,118 @@ namespace daObj {
}
/* 800668BC-800669E8 .text get_wind_spd__5daObjFP10fopAc_ac_cf */
void get_wind_spd(fopAc_ac_c*, f32) {
/* Nonmatching */
void get_wind_spd(fopAc_ac_c* param_1, f32 param_2) {
static cXyz total_spd(cXyz::Zero);
cXyz wind = *dKyw_get_wind_vec() * dKyw_get_wind_pow();
cXyz pntVec;
f32 pntPow;
dKyw_pntwind_get_info(&param_1->current.pos, &pntVec, &pntPow);
pntVec *= pntPow;
total_spd = (wind + pntVec) * (param_2 * 0.5f);
}
/* 800669E8-80066B0C .text get_path_spd__5daObjFR13cBgS_PolyInfof */
void get_path_spd(cBgS_PolyInfo&, f32) {
/* Nonmatching */
cXyz& get_path_spd(cBgS_PolyInfo& param_1, f32 param_2) {
static cXyz path_spd(cXyz::Zero);
int temp;
if(dPath_GetPolyRoomPathVec(param_1, &path_spd, &temp)) {
if(path_spd.normalizeRS()) {
path_spd *= param_2 * temp * (1.0f / 255.0f);
}
else {
path_spd = cXyz::Zero;
}
}
return path_spd;
}
/* 80066B0C-80066B3C .text posMoveF_stream__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff */
void posMoveF_stream(fopAc_ac_c*, const cXyz*, const cXyz*, f32, f32) {
/* Nonmatching */
void posMoveF_stream(fopAc_ac_c* param_1, const cXyz* param_2, const cXyz* param_3, f32 param_4, f32 param_5) {
posMoveF_grade(param_1, param_2, param_3, param_4, param_5, 0, 0.0f, 0.0f, 0);
}
namespace {
/* 80066B3C-80066C38 .text posMoveF_resist_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzff */
void posMoveF_resist_acc(cXyz*, const fopAc_ac_c*, const cXyz*, f32, f32) {
/* Nonmatching */
void posMoveF_resist_acc(cXyz* pDst, const fopAc_ac_c* pActor, const cXyz* pStreamSpd, f32 param_4, f32 param_5) {
cXyz delta = pActor->speed - *pStreamSpd;
f32 dx = delta.x;
f32 dy = delta.y;
f32 dz = delta.z;
cXyz result(dx * param_4, dy * param_4, dz * param_4);
result.x += fabsf(dx) * dx * param_5;
result.y += fabsf(dy) * dy * param_5;
result.z += fabsf(dz) * dz * param_5;
result *= -1.0f;
*pDst = result;
}
/* 80066C38-80066D6C .text posMoveF_grade_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzffPC4cXyzPC4cXyz */
void posMoveF_grade_acc(cXyz*, const fopAc_ac_c*, const cXyz*, f32, f32, const cXyz*, const cXyz*) {
/* Nonmatching */
void posMoveF_grade_acc(cXyz* pDst, const fopAc_ac_c* pActor, const cXyz* pNorm, f32 friction, f32 noGradeCos, const cXyz* pAccel0, const cXyz* pAccel1) {
*pDst = cXyz::Zero;
if(pNorm) {
cXyz accel = *pAccel0;
accel.y = pAccel0->y + pActor->gravity;
if(pAccel1) {
accel += *pAccel1;
}
if(accel.getDotProduct(*pNorm) < 0.0f) {
if(pNorm->y <= noGradeCos) {
cXyz temp;
cM3d_CrawVec(*pNorm, accel, &temp);
*pDst += temp;
}
cXyz temp;
cM3d_CrawVec(*pNorm, pActor->speed, &temp);
*pDst -= temp * friction;
}
}
}
}
/* 80066D6C-8006700C .text posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz */
void posMoveF_grade(fopAc_ac_c*, const cXyz*, const cXyz*, f32, f32, const cXyz*, f32, f32, const cXyz*) {
void posMoveF_grade(fopAc_ac_c* pActor, const cXyz* pAddVel, const cXyz* stream_spd, f32 param_4, f32 param_5, const cXyz* pNorm, f32 friction, f32 no_grade_cos, const cXyz* pAddAccel) {
/* Nonmatching */
JUT_ASSERT(0x118, stream_spd != 0)
cXyz resist_accel;
posMoveF_resist_acc(&resist_accel, pActor, stream_spd, param_4, param_5);
JUT_ASSERT(0x121, (friction >= 0.0f) && (friction < 1.0f) && (no_grade_cos >= 0.0f) && (no_grade_cos <= 1.0f))
cXyz vel;
posMoveF_grade_acc(&vel, pActor, pNorm, param_5, param_4, &resist_accel, pAddAccel);
f32 spf = pActor->speedF;
f32 grav = pActor->gravity;
f32 x = spf * cM_ssin(pActor->current.angle.y) + resist_accel.x + vel.x;
f32 y = pActor->speed.y + grav + resist_accel.y + vel.y;
f32 z = spf * cM_scos(pActor->current.angle.y) + resist_accel.z + vel.z;
if(pAddAccel) {
x += pAddAccel->x;
y += pAddAccel->y;
z += pAddAccel->z;
}
if(y < pActor->maxFallSpeed) {
y = pActor->maxFallSpeed;
}
pActor->speed.set(x, y, z);
pActor->speedF = sqrtf(x * x + z * z);
pActor->current.angle.y = cM_atan2s(spf, grav);
fopAcM_posMove(pActor, pAddVel);
}
/* 8006700C-800671D4 .text quat_rotBaseY__5daObjFP10QuaternionRC4cXyz */
src/d/d_path.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ dPath* dPath_GetNextRoomPath(dPath* path, int room_no) {
}
/* 80080340-800804A4 .text dPath_GetPolyRoomPathVec__FR13cBgS_PolyInfoP4cXyzPi */
int dPath_GetPolyRoomPathVec(cBgS_PolyInfo& polyInfo, cXyz* pDstPos, int* pDstArg0) {
bool dPath_GetPolyRoomPathVec(cBgS_PolyInfo& polyInfo, cXyz* pDstPos, int* pDstArg0) {
int room_no = dComIfG_Bgsp()->GetRoomId(polyInfo);
int path_index = dComIfG_Bgsp()->GetRoomPathId(polyInfo);
src/d/d_save.cpp
+1 -5
View File
@@ -9,6 +9,7 @@
#include "d/d_item_data.h"
#include "d/d_stage.h"
#include "d/d_s_play.h"
#include "d/actor/d_a_npc_sarace.h"
#include "m_Do/m_Do_audio.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JUtility/JUTGamePad.h"
@@ -17,11 +18,6 @@
#include "string.h"
#include "stdio.h"
struct daNpc_Sarace_c {
static int ship_race_rupee;
static int ship_race_result;
};
/* 800589A8-80058B54 .text init__21dSv_player_status_a_cFv */
void dSv_player_status_a_c::init() {
mMaxLife = 12;
src/d/d_save_init.cpp
+1 -5
View File
@@ -5,11 +5,7 @@
#include "d/d_save_init.h"
#include "d/d_com_inf_game.h"
// move later
struct daNpc_Kg1_c {
static u8 m_highscore;
};
#include "d/actor/d_a_npc_kg1.h"
/* 8005EF88-8005EFDC .text setInitEventBit__Fv */
void setInitEventBit() {