Skip to content

Commit

Permalink
Applying HU3D defines across the board (1/?)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrshigure
mrshigure committed Aug 26, 2024
1 parent dc3ada0 commit 27e67cb
Show file tree
Hide file tree
Showing 89 changed files with 634 additions and 635 deletions.
7 changes: 6 additions & 1 deletion include/REL/m437Dll.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#ifndef M437DLL_H
#define M437DLL_H

#include "game/object.h"

#include "dolphin.h"
Expand All @@ -21,7 +24,7 @@ typedef struct {
/* 0x00 */ void (*unk00)(void);
/* 0x04 */ void (*unk04)(void);
/* 0x08 */ float unk08;
/* 0x08 */ float unk0C;
/* 0x0C */ float unk0C;
/* 0x10 */ float unk10;
/* 0x14 */ float unk14;
/* 0x18 */ float unk18;
Expand Down Expand Up @@ -71,3 +74,5 @@ void fn_1_15CD0(StructFn15CD0* arg0, s32 arg1);
void fn_1_15DC8(StructFn15CD0* arg0);
void fn_1_164B0(Process* arg0, StructFn15CD0* arg1, s32 arg2, const char* arg3);
void fn_1_1660C(Process* arg0, StructFn15CD0* arg1, s32 arg2, s32 arg3);

#endif
1 change: 1 addition & 0 deletions include/game/hsfman.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#define HU3D_TEXANIM_MAX 256
#define HU3D_TEXSCROLL_MAX 16

#define HU3D_MOTATTR_NONE 0
#define HU3D_MOTATTR 0x40000000

#define HU3D_MOTATTR_LOOP 0x40000001
Expand Down
4 changes: 2 additions & 2 deletions src/REL/instDll/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ static void fn_1_17E4(void)
CharModelMotionSet(char_tbl[j], mot_tbl[j][2]);
}
if(time == 30) {
CharModelMotionShiftSet(char_tbl[j], mot_tbl[j][0], 0, 10, 0x40000001);
CharModelMotionShiftSet(char_tbl[j], mot_tbl[j][0], 0, 10, HU3D_MOTATTR_LOOP);
}
if(time <= 20) {
Hu3DModelPosSet(player_mdl[j], player_pos[j].x, player_pos[j].y+(1000.0*cos(M_PI*(time*4.5f)/180.0)), player_pos[j].z);
Expand Down Expand Up @@ -635,7 +635,7 @@ static void fn_1_220C(void)
Hu3DModelRotSet(model, 0.0f, 90-((i/10.0f)*70), 0);
HuPrcVSleep();
}
Hu3DMotionShiftSet(model, motion[0], 0, 10, 0x40000001);
Hu3DMotionShiftSet(model, motion[0], 0, 10, HU3D_MOTATTR_LOOP);
model_ptr = &Hu3DData[model];
while(1) {
fontcolor = FONT_COLOR_RED;
Expand Down
22 changes: 11 additions & 11 deletions src/REL/m401Dll/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1138,7 +1138,7 @@ void fn_2_3F28(omObjData *object)
case 0:
if (--temp_r31->unk6E == 0) {
temp_r31->unk0 = 1;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[4], 0, 20, 0);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[4], 0, 20, HU3D_MOTATTR_NONE);
temp_r31->unk58.x = 16;
temp_r31->unk58.y = 0;
}
Expand All @@ -1164,7 +1164,7 @@ void fn_2_3F28(omObjData *object)
temp_r27 = temp_r28->data;
temp_r27->unkC = object;
temp_r31->unk48 = temp_r28;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 80, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 80, HU3D_MOTATTR_LOOP);
temp_r31->unk30.x = object->trans.x;
temp_r31->unk30.y = object->trans.y;
temp_r31->unk30.z = object->trans.z;
Expand Down Expand Up @@ -1256,7 +1256,7 @@ void fn_2_48A0(omObjData *object)
switch (temp_r31->unk0) {
case 5:
if (temp_r31->unk6A == 1) {
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, HU3D_MOTATTR_LOOP);
temp_r31->unk6A = 0;
}
omSetRot(object, 0, 180, 0);
Expand Down Expand Up @@ -1284,7 +1284,7 @@ void fn_2_48A0(omObjData *object)
if (temp_r31->unk58.x <= 0.5f) {
temp_r31->unk0 = 7;
temp_r31->unk58.x = -0.5f;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[0], 0, 30, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[0], 0, 30, HU3D_MOTATTR_LOOP);
temp_r31->unk80 = 0;
temp_r31->unk6C = 0;
}
Expand Down Expand Up @@ -1426,7 +1426,7 @@ void fn_2_48A0(omObjData *object)
if (object->trans.y <= 1030.0f && temp_f29 < 0) {
temp_r31->unk0 = 12;
object->trans.y = 1030 + temp_r29->unk4;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[2], 0, 15, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[2], 0, 15, HU3D_MOTATTR_LOOP);
temp_r31->unk58.x = 0;
}
break;
Expand All @@ -1446,7 +1446,7 @@ void fn_2_48A0(omObjData *object)
temp_r31->unk58.x += 3.0f;
if (temp_r31->unk58.x > 90.0f) {
temp_r31->unk0 = 13;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[5], 0, 20, 0);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[5], 0, 20, HU3D_MOTATTR_NONE);
HuAudSStreamPlay(1);
lbl_2_bss_C0 = MGSeqWinCreate(lbl_2_bss_AA[0], -1, -1, -1);
lbl_2_bss_1A = 210;
Expand Down Expand Up @@ -1570,7 +1570,7 @@ void fn_2_5CC0(omObjData *object)
}
if (temp_r31->unk84) {
if (--temp_r31->unk84 == 0) {
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, HU3D_MOTATTR_LOOP);
temp_r31->unk6A = 0;
}
}
Expand All @@ -1579,7 +1579,7 @@ void fn_2_5CC0(omObjData *object)
temp_r31->unk84 = 0;
if (--temp_r31->unk7A == 0) {
sp10 = GWPlayerCfg[temp_r31->unk4].character;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, HU3D_MOTATTR_LOOP);
temp_r31->unk78 = 0;
temp_r31->unk6A = 0;
}
Expand All @@ -1606,12 +1606,12 @@ void fn_2_5CC0(omObjData *object)
if (temp_r31->unk58.z > 0 || temp_r31->unk8C >= 5) {
if (temp_r31->unk6A == 0) {
temp_r31->unk6A = 1;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[3], 0, 8, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[3], 0, 8, HU3D_MOTATTR_LOOP);
}
}
else {
if (temp_r31->unk6A == 1) {
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, 0x40000001);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[1], 0, 8, HU3D_MOTATTR_LOOP);
temp_r31->unk6A = 0;
}
}
Expand Down Expand Up @@ -2038,7 +2038,7 @@ void fn_2_7C3C(omObjData *object)
M401WorkPlayer *temp_r31 = object->data;
temp_r31->unk78 = 1;
temp_r31->unk7A = 120;
CharModelMotionShiftSet(temp_r31->unk86, object->motion[7], 0, 10, 0);
CharModelMotionShiftSet(temp_r31->unk86, object->motion[7], 0, 10, HU3D_MOTATTR_NONE);
fn_2_A914(temp_r31->unk4);
}

Expand Down
2 changes: 1 addition & 1 deletion src/REL/m401Dll/main_ex.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ void fn_2_113AC(omObjData *object)
}
dist = VECDistanceXYZ(&object->trans, &temp_r27->trans);
if (dist < 108.00001f) {
Hu3DMotionShiftSet(lbl_2_bss_118[temp_r29]->model[0], lbl_2_bss_118[temp_r29]->motion[6], 0, 10, 0);
Hu3DMotionShiftSet(lbl_2_bss_118[temp_r29]->model[0], lbl_2_bss_118[temp_r29]->motion[6], 0, 10, HU3D_MOTATTR_NONE);
HuAudFXPlay(1288);
if (temp_r30->unk18 == 0) {
HuAudFXPlay(9);
Expand Down
36 changes: 18 additions & 18 deletions src/REL/m402Dll/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ static void fn_1_2B30(UnkFn27A8Struct *arg0, omObjData *arg1, omObjData *arg2) {
Hu3DMotionTimeSet(lbl_1_bss_54[arg0->unk54]->model[0], 0.0f);
Hu3DMotionSpeedSet(arg1->model[0], 1.0f);
Hu3DModelAttrReset(arg1->model[0], 0x40000003);
Hu3DMotionShiftSet(arg1->model[0], arg1->motion[7], 0.0f, 8.0f, 0);
Hu3DMotionShiftSet(arg1->model[0], arg1->motion[7], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
fn_1_2970(arg0, arg2, 1);
HuAudCharVoicePlay(arg0->unk58, 0x123);
}
Expand Down Expand Up @@ -965,7 +965,7 @@ static void fn_1_3204(omObjData *arg0) {
temp_r31->unk20 = 0.0f;
temp_r31->unk24 = temp_r31->unk1C;
HuAudFXPlay(0x50E);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[5], 0.0f, 2.0f, 0x40000001);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[5], 0.0f, 2.0f, HU3D_MOTATTR_LOOP);
}
} else {
temp_r31->unk30 += 1.0f;
Expand All @@ -992,7 +992,7 @@ static void fn_1_3204(omObjData *arg0) {
temp_r31->unk60++;
if (temp_r31->unk60 == 3) {
Hu3DMotionSpeedSet(arg0->model[0], 0.83f);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[6], 0.0f, 4.0f, 0x40000001);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[6], 0.0f, 4.0f, HU3D_MOTATTR_LOOP);
}
if (temp_r31->unk60 == 9) {
Hu3DMotionSpeedSet(arg0->model[0], 1.0f);
Expand Down Expand Up @@ -1042,7 +1042,7 @@ static void fn_1_3204(omObjData *arg0) {
temp_r31->unk50 -= 1.0f;
if (temp_r31->unk50 == 32) {
Hu3DMotionSet(arg0->model[0], arg0->motion[9]);
Hu3DMotionShiftSet(temp_r29->model[0], temp_r29->motion[1], 0.0f, 20.0f, 0x40000002);
Hu3DMotionShiftSet(temp_r29->model[0], temp_r29->motion[1], 0.0f, 20.0f, HU3D_MOTATTR_PAUSE);
}
if (0.0f > temp_r31->unk50) {
fn_1_2880(temp_r31, arg0);
Expand Down Expand Up @@ -1102,7 +1102,7 @@ static void fn_1_43D8(omObjData *arg0) {
case 2000:
if (lbl_1_bss_58->work[0] == 1001) {
temp_r31->unk4C++;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
break;
case 2001:
Expand All @@ -1111,7 +1111,7 @@ static void fn_1_43D8(omObjData *arg0) {
temp_r31->unk4C++;
temp_r31->unk08 = 0.0f;
temp_r31->unk04 = 2000.0f;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
Hu3DMotionSet(temp_r30->model[0], temp_r30->motion[0]);
Hu3DModelAttrSet(temp_r30->model[0], 0x40000002);
Hu3DModelAttrReset(temp_r30->model[0], 0x40000001);
Expand All @@ -1130,7 +1130,7 @@ static void fn_1_43D8(omObjData *arg0) {
if (temp_r31->unk54 == 0) {
HuAudFXPlay(0x50D);
}
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[3], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[3], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
break;
case 2003:
Expand All @@ -1152,7 +1152,7 @@ static void fn_1_43D8(omObjData *arg0) {
temp_r31->unk50++;
if (70.0f < temp_r31->unk50) {
temp_r31->unk4C++;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[4], 0.0f, 10.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[4], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
break;
case 2005:
Expand All @@ -1171,8 +1171,8 @@ static void fn_1_43D8(omObjData *arg0) {
temp_r31->unk4C++;
temp_r31->unk50 = 0;
temp_r31->unk0C = 0.0f;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[5], 0.0f, 10.0f, 0x40000001);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[1], 0.0f, 10.0f, 0x40000002);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[5], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[1], 0.0f, 10.0f, HU3D_MOTATTR_PAUSE);
}
break;
case 2006:
Expand Down Expand Up @@ -1213,7 +1213,7 @@ static void fn_1_43D8(omObjData *arg0) {
temp_r31->unk50 -= 1.0f;
if (temp_r31->unk50 == 32) {
Hu3DMotionSet(arg0->model[0], arg0->motion[9]);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[1], 0.0f, 20.0f, 0x40000002);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[1], 0.0f, 20.0f, HU3D_MOTATTR_PAUSE);
}
if (0.0f > temp_r31->unk50) {
lbl_1_bss_58->work[0]++;
Expand All @@ -1227,9 +1227,9 @@ static void fn_1_43D8(omObjData *arg0) {
temp_r31->unk4C = 2012;
temp_r31->unk20 = 10.5f;
Hu3DModelAttrReset(arg0->model[0], 0x40000003);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[8], 0.0f, 20.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[8], 0.0f, 20.0f, HU3D_MOTATTR_NONE);
Hu3DModelAttrReset(temp_r30->model[0], 0x40000003);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[2], 20.0f, 20.0f, 0);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[2], 20.0f, 20.0f, HU3D_MOTATTR_NONE);
HuAudFXPlay(0x513);
fn_1_4190(temp_r31->unk18);
} else {
Expand All @@ -1250,7 +1250,7 @@ static void fn_1_43D8(omObjData *arg0) {
if (0.0f > temp_r31->unk20) {
temp_r31->unk4C++;
temp_r31->unk50 = 0;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[9], 0.0f, 20.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[9], 0.0f, 20.0f, HU3D_MOTATTR_NONE);
}
if (4.5f <= temp_r31->unk20) {
fn_1_4284(temp_r31->unk18);
Expand Down Expand Up @@ -1281,7 +1281,7 @@ static void fn_1_43D8(omObjData *arg0) {
temp_r31->unk50 -= 1.0f;
if (temp_r31->unk50 == 32) {
Hu3DMotionSet(arg0->model[0], arg0->motion[9]);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[1], 0.0f, 20.0f, 0x40000002);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[1], 0.0f, 20.0f, HU3D_MOTATTR_PAUSE);
}
if (0.0f > temp_r31->unk50) {
temp_r31->unk4C = 2011;
Expand Down Expand Up @@ -1415,7 +1415,7 @@ static void fn_1_6AB4(omObjData *arg0) {
temp_r31->unk0C = 360.0f * frandf();
temp_r31->unk10 = 10.0f;
HuAudFXPlay(0x512);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 20.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 20.0f, HU3D_MOTATTR_NONE);
}
break;
case 3001:
Expand All @@ -1435,7 +1435,7 @@ static void fn_1_6AB4(omObjData *arg0) {
temp_r31->unk18 = 3000;
temp_r31->unk14 = 20.0f;
temp_r31->unk04 = temp_r29->y;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 20.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 20.0f, HU3D_MOTATTR_NONE);
}
break;
}
Expand Down Expand Up @@ -1781,7 +1781,7 @@ static void fn_1_8218(omObjData *arg0) {
} else {
lbl_1_bss_1AA = MGSeqCreate(5, 3, GWPlayerCfg[lbl_1_bss_26].character, -1, -1, -1);
temp_r30 = lbl_1_bss_4C[lbl_1_bss_26];
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[10], 0.0f, 20.0f, 0);
Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[10], 0.0f, 20.0f, HU3D_MOTATTR_NONE);
HuAudSStreamPlay(1);
}
} else {
Expand Down
6 changes: 3 additions & 3 deletions src/REL/m404Dll/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@ void fn_1_44A0(omObjData *object)
}
if (var_r28 >= 0 && var_r28 != var_r31->unk_2C) {
var_r31->unk_2C = var_r28;
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_2C], 0.0f, 5.0f, 0x40000001);
CharModelMotionShiftSet(var_r31->unk_0C, object->motion[var_r31->unk_2C], 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
}
}
}
Expand All @@ -1120,7 +1120,7 @@ void fn_1_4C7C(omObjData *object)
object->trans.z = -450.0f + (300.0f * var_r30->unk_02);
object->rot.y = 0.0f;
var_r30->unk_2C = -1;
CharModelMotionShiftSet(var_r30->unk_0C, *object->motion, 0.0f, 5.0f, 0x40000001);
CharModelMotionShiftSet(var_r30->unk_0C, *object->motion, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
var_r30->unk_5A = 0;
var_r30->unk_5C = fn_1_F70(object, 1.0f);
var_r30->unk_5A = 0;
Expand Down Expand Up @@ -1155,7 +1155,7 @@ void fn_1_4F4C(omObjData *object)
else {
var_r30->unk_2C = 4;
}
CharModelMotionShiftSet(var_r30->unk_0C, object->motion[var_r30->unk_2C], 0.0f, 5.0f, 0);
CharModelMotionShiftSet(var_r30->unk_0C, object->motion[var_r30->unk_2C], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/REL/m405Dll/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1683,7 +1683,7 @@ void fn_1_6BFC(omObjData *arg0) {
temp_r31->unk100 = 2005;
temp_r31->unk104 = 0;
Hu3DModelAttrReset(arg0->model[0], 0x40000002);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[temp_r31->unk104], 0.0f, 8.0f, 0x40000001);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[temp_r31->unk104], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionSpeedSet(arg0->model[0], 1.0f);
for (i = 0; i < 5; i++) {
Hu3DParManAttrSet(temp_r31->unkF0[i], 1);
Expand Down Expand Up @@ -1802,7 +1802,7 @@ void fn_1_6BFC(omObjData *arg0) {
var_r27 = temp_r31->unk94 + 5;
temp_r31->unk104 = var_r27;
Hu3DModelAttrReset(arg0->model[0], 0x40000003);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[temp_r31->unk104], 0.0f, 8.0f, 0);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[temp_r31->unk104], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
temp_r31->unk94++;
if (temp_r31->unk94 > lbl_1_bss_78) {
lbl_1_bss_78 = temp_r31->unk94;
Expand Down Expand Up @@ -1833,7 +1833,7 @@ void fn_1_6BFC(omObjData *arg0) {
if (var_r27 != temp_r31->unk104) {
temp_r31->unk104 = var_r27;
Hu3DModelAttrReset(arg0->model[0], 0x40000002);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[temp_r31->unk104], 0.0f, 30.0f, 0x40000001);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[temp_r31->unk104], 0.0f, 30.0f, HU3D_MOTATTR_LOOP);
}
if (temp_r31->unk104 >= 2 && temp_r31->unk104 <= 4) {
temp_r31->unk60 = 0.5f * temp_r31->unk64;
Expand Down
Loading

0 comments on commit 27e67cb

Please sign in to comment.