mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-12 13:04:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_henna equivalent (#2473)

Browse Source
This commit is contained in:
Max Roncace
2025-06-03 16:31:22 -04:00
committed by GitHub
parent 47e6b51ec3
commit e9f99de027
17 changed files with 2890 additions and 2555 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/c/c_damagereaction.cpp
+2 -3
View File
@@ -19,7 +19,7 @@ u8 data_80450C9B;
u8 data_80450C9C;
u8 data_80450C9D;
u8 data_80450C9E;
u8 data_80450C9F;
u8 cDmr_FishingWeather;
/* 8001817C-800182A4 012ABC 0128+00 1/0 0/0 0/0 .text
* execute__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle */
@@ -67,8 +67,7 @@ BOOL cDmrNowMidnaTalk() {
}
/* 80450CA0-80450CA4 0001A0 0004+00 0/0 0/0 2/2 .sbss None */
extern u8 data_80450CA0[4];
u8 data_80450CA0[4];
u8 data_80450CA0;
/* 80450CA4-80450CA8 0001A4 0004+00 1/1 1/1 1/1 .sbss JPTracePCB4 */
JPTraceParticleCallBack4 JPTracePCB4;
src/d/actor/d_a_b_oh.cpp
+2 -2
View File
@@ -158,9 +158,9 @@ daB_OH_HIO_c::daB_OH_HIO_c() {
}
/* 8061B75C-8061B8B0 00011C 0154+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */
static int nodeCallBack(J3DJoint* param_0, int param_1) {
static int nodeCallBack(J3DJoint* i_joint, int param_1) {
if (param_1 == 0) {
int jnt_no = param_0->getJntNo();
int jnt_no = i_joint->getJntNo();
J3DModel* model_p = j3dSys.getModel();
b_oh_class* this_ = (b_oh_class*)model_p->getUserArea();
src/d/actor/d_a_mg_fshop.cpp
+9 -9
View File
@@ -1466,10 +1466,10 @@ static void rod_set(fshop_class* param_0) {
}
/* 8086CC6C-8086CD70 000CEC 0104+00 1/1 0/0 0/0 .text s_fish_sub__FPvPv */
static void* s_fish_sub(void* param_1, void* param_2) {
fopAc_ac_c* actor = (fopAc_ac_c*)param_1;
fs_weed_s* weed = (fs_weed_s*)param_2;
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_MG_FISH && actor->speedF > 0.1f) {
static void* s_fish_sub(void* param_0, void* param_1) {
fopAc_ac_c* actor = (fopAc_ac_c*)param_0;
fs_weed_s* weed = (fs_weed_s*)param_1;
if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_MG_FISH && actor->speedF > 0.1f) {
f32 dVar9 = actor->current.pos.x - weed->field_0x00[0].x;
f32 dVar8 = actor->current.pos.y - weed->field_0x00[0].y;
f32 dVar10 = actor->current.pos.z - weed->field_0x00[0].z;
@@ -1480,7 +1480,7 @@ static void* s_fish_sub(void* param_1, void* param_2) {
if (fabsf(dVar8) < 60.0f * weed->field_0xb4 &&
JMAFastSqrt(((dVar9 * dVar9) + (dVar10 * dVar10))) < dVar3 * 35.0f){
cLib_addCalc2(&weed->field_0xb8, dVar3, 0.1f, 0.05f);
return (fopAc_ac_c*)param_1;
return (fopAc_ac_c*)param_0;
}
}
@@ -1853,11 +1853,11 @@ static int daFshop_Execute(fshop_class* param_1) {
}
}
if (!bVar5) {
henna->health = 1;
henna->actor.health = 1;
} else if (param_1->field_0x567 == 1) {
henna->health = 0;
henna->actor.health = 0;
} else {
henna->health = 2;
henna->actor.health = 2;
}
henna->field_0x752 = 0x49;
@@ -1879,7 +1879,7 @@ static int daFshop_Execute(fshop_class* param_1) {
}
if (bVar5) {
henna->health = 3;
henna->actor.health = 3;
henna->field_0x752 = 0x49;
} else {
henna->field_0x752 = 0x4c;
src/d/actor/d_a_npc_henna.cpp
+2708 -2516
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_obj_dmelevator.cpp
+2 -2
View File
@@ -85,9 +85,9 @@ static int nodeCallBackForSw(J3DJoint* param_0, int param_1) {
}
/* 80BDDCA0-80BDDD38 000420 0098+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */
static int nodeCallBack(J3DJoint* param_0, int param_1) {
static int nodeCallBack(J3DJoint* i_joint, int param_1) {
if (param_1 == 0) {
int jnt_no = param_0->getJntNo();
int jnt_no = i_joint->getJntNo();
J3DModel* pmodel = j3dSys.getModel();
daObjDmElevator_c* puser_area = (daObjDmElevator_c*)pmodel->getUserArea();
src/d/d_save.cpp
+2 -2
View File
@@ -1310,13 +1310,13 @@ void dSv_event_c::offEventBit(u16 i_no) {
/* 800349BC-800349E0 02F2FC 0024+00 3/3 77/77 153/153 .text isEventBit__11dSv_event_cCFUs
*/
BOOL dSv_event_c::isEventBit(u16 i_no) const {
BOOL dSv_event_c::isEventBit(const u16 i_no) const {
return mEvent[i_no >> 8] & (i_no & 0xFF) ? TRUE : FALSE;
}
/* 800349E0-80034A04 02F320 0024+00 0/0 12/12 17/17 .text setEventReg__11dSv_event_cFUsUc
*/
void dSv_event_c::setEventReg(u16 i_reg, u8 i_no) {
void dSv_event_c::setEventReg(const u16 i_reg, u8 i_no) {
mEvent[i_reg >> 8] &= ~(u8)i_reg;
mEvent[i_reg >> 8] |= i_no;
}