Applied some Attr defines

This commit is contained in:
dbalatoni13 2024-11-03 23:53:45 +01:00
parent 348cdffb0e
commit c9f46f9418
99 changed files with 15333 additions and 15096 deletions

File diff suppressed because it is too large Load diff

View file

@ -3,8 +3,10 @@
#include "game/hsfmotion.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/sprite.h"
#include "game/wipe.h"
#include "REL/m434Dll.h"
#include "ext_math.h"
#include "game/gamework_data.h"
@ -290,7 +292,7 @@ void fn_1_E44(omObjData *object)
switch (lbl_1_bss_8[0]) {
case 0:
if (--lbl_1_bss_8[1] == 0) {
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
lbl_1_bss_8[0] = 1;
}
for (temp_r30 = 0; temp_r30 < 2u; temp_r30++) {
@ -379,7 +381,8 @@ void fn_1_1150(omObjData *object)
break;
case 1:
temp_r31->unk6[temp_r30] = espEntry((temp_r29 == 0) ? DATA_MAKE_NUM(DATADIR_MGCONST, 0x1B) : DATA_MAKE_NUM(DATADIR_MGCONST, 0x1C), 1, 0);
temp_r31->unk6[temp_r30]
= espEntry((temp_r29 == 0) ? DATA_MAKE_NUM(DATADIR_MGCONST, 0x1B) : DATA_MAKE_NUM(DATADIR_MGCONST, 0x1C), 1, 0);
espPriSet(temp_r31->unk6[temp_r30], 256);
break;
@ -401,7 +404,7 @@ void fn_1_1150(omObjData *object)
}
espDispOff(temp_r31->unk6[temp_r30]);
espDrawNoSet(temp_r31->unk6[temp_r30], 0);
espAttrSet(temp_r31->unk6[temp_r30], 1);
espAttrSet(temp_r31->unk6[temp_r30], HUSPR_ATTR_NOANIM);
espPosSet(temp_r31->unk6[temp_r30], lbl_1_data_F0[temp_r29][0] + lbl_1_data_C0[temp_r30][0],
lbl_1_data_F0[temp_r29][1] + lbl_1_data_C0[temp_r30][1]);
}

View file

@ -177,7 +177,7 @@ void fn_1_1E64(omObjData *object)
temp_r26 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M434, 0x0B));
object->model[10] = Hu3DParticleCreate(temp_r26, 100);
Hu3DParticleHookSet(object->model[10], fn_1_443C);
Hu3DModelAttrSet(object->model[10], 1);
Hu3DModelAttrSet(object->model[10], HU3D_ATTR_DISPOFF);
Hu3DModelLayerSet(object->model[10], 4);
Hu3DModelCameraSet(object->model[10], 8);
object->func = fn_1_26A4;
@ -602,5 +602,5 @@ void fn_1_443C(ModelData *model, ParticleData *particle, Mtx matrix)
void fn_1_47EC(Vec *arg0)
{
Hu3DModelPosSet(lbl_1_bss_5868->model[10], arg0->x, arg0->y, arg0->z);
Hu3DModelAttrReset(lbl_1_bss_5868->model[10], 1);
Hu3DModelAttrReset(lbl_1_bss_5868->model[10], HU3D_ATTR_DISPOFF);
}

File diff suppressed because it is too large Load diff