kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Applied some Attr defines

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
src/REL/present/common.c
View file

@ -65,7 +65,7 @@ omObjData *PresentGuideCreate(void)
Hu3DModelShadowSet(object->model[0]);
PresentGuideExecModeSet(object, PRESENT_GUIDE_MODE_NONE);
UpdateGuide(object);
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
return object;
}
@ -109,7 +109,7 @@ static void ExecGuideEnter(omObjData *object)
switch (object->unk10) {
case 0:
Hu3DModelAttrReset(object->model[0], 1);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
work->pos.x = -300.0f;
work->pos.z = -180.0f;
work->time = 0.0f;
@ -156,7 +156,7 @@ static void ExecGuideLeave(omObjData *object)
case 0:
work->time = 0.0f;
work->speed = 0.025f;
Hu3DModelAttrReset(object->model[0], 1);
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
object->unk10 = 1;
case 1:
weight = sind(90.0f * work->time);
@ -168,7 +168,7 @@ static void ExecGuideLeave(omObjData *object)
}
object->unk10 = 2;
case 2:
Hu3DModelAttrSet(object->model[0], 1);
Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
PresentGuideExecModeSet(object, PRESENT_GUIDE_MODE_NONE);
break;
default:

5
src/REL/present/init.c
View file

@ -1,5 +1,6 @@
#include "game/audio.h"
#include "game/esprite.h"
#include "game/hsfman.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/process.h"
@ -109,7 +110,7 @@ void FadeSpriteWithMultiplier(s16 model, BOOL inF, float tpMultiplier, s32 durat
work->tplvl = 1.0f;
}
Hu3DModelTPLvlSet(work->id, work->tplvl * work->tpMultiplier);
Hu3DModelAttrReset(work->id, 1);
Hu3DModelAttrReset(work->id, HU3D_ATTR_DISPOFF);
process = HuPrcChildCreate(FadeModel, 100, 5376, 0, HuPrcCurrentGet());
process->user_data = work;
}
@ -135,7 +136,7 @@ static void FadeModel(void)
}
Hu3DModelTPLvlSet(var_r31->id, var_r31->tplvl * var_r31->tpMultiplier);
if (var_r31->speed < 0.0f) {
Hu3DModelAttrSet(var_r31->id, 1);
Hu3DModelAttrSet(var_r31->id, HU3D_ATTR_DISPOFF);
}
HuMemDirectFree(var_r31);
HuPrcEnd();

28
src/REL/present/present.c
View file

@ -4,8 +4,8 @@
#include "game/hsfdraw.h"
#include "game/hsfex.h"
#include "game/hsfman.h"
#include "game/wipe.h"
#include "game/window.h"
#include "game/wipe.h"
#include "REL/present.h"
@ -392,7 +392,7 @@ omObjData *PresentCreate(void)
work->object[i] = omAddObjEx(presentObjMan, 1003, 1, 0, 1, NULL);
work->object[i]->model[0] = Hu3DModelCreateFile(presentMdlTbl[i]);
Hu3DModelLayerSet(work->object[i]->model[0], 0);
Hu3DModelAttrSet(work->object[i]->model[0], 1);
Hu3DModelAttrSet(work->object[i]->model[0], HU3D_ATTR_DISPOFF);
}
for (j = 0; j < 8; j++) {
@ -886,39 +886,39 @@ static void ShowHidePresents(omObjData *object)
s32 character;
s32 i;
Hu3DModelAttrReset(work->object[0]->model[0], 1);
Hu3DModelAttrReset(work->object[0]->model[0], HU3D_ATTR_DISPOFF);
for (character = 0; character < NUM_CHARACTERS; character++) {
s32 j;
if (UnlockedPresents(object, roomIdxTbl2[character]) > 0) {
Hu3DModelAttrReset(work->object[character + 109]->model[0], 1);
Hu3DModelAttrReset(work->object[character + 109]->model[0], HU3D_ATTR_DISPOFF);
}
for (j = 0, i = 0; i < PRESENT_COUNT_CHAR_ROOM; i++) {
if (PresentUnlocked(object, roomIdxTbl2[character], i)) {
Hu3DModelAttrReset(work->object[character * PRESENT_COUNT_CHAR_ROOM * 2 + 2 + i]->model[0], 1);
Hu3DModelAttrReset(work->object[character * PRESENT_COUNT_CHAR_ROOM * 2 + 8 + i]->model[0], 1);
Hu3DModelAttrReset(work->object[character * PRESENT_COUNT_CHAR_ROOM * 2 + 2 + i]->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(work->object[character * PRESENT_COUNT_CHAR_ROOM * 2 + 8 + i]->model[0], HU3D_ATTR_DISPOFF);
j++;
}
}
if (j >= 6) {
Hu3DModelAttrReset(work->object[character + 118]->model[0], 1);
Hu3DModelAttrReset(work->object[character + 118]->model[0], HU3D_ATTR_DISPOFF);
}
}
if (UnlockedPresents(object, ROOM_MG) > 0) {
Hu3DModelAttrReset(work->object[117]->model[0], 1);
Hu3DModelAttrReset(work->object[117]->model[0], HU3D_ATTR_DISPOFF);
}
for (i = 0; i < PRESENT_COUNT_MG_ROOM; i++) {
if (PresentUnlocked(object, ROOM_MG, i)) {
Hu3DModelAttrReset(work->object[i + 98]->model[0], 1);
Hu3DModelAttrReset(work->object[i + 98]->model[0], HU3D_ATTR_DISPOFF);
}
}
if (PresentUnlocked(object, ROOM_TROPHY, 0)) {
Hu3DModelAttrReset(work->object[1]->model[0], 1);
Hu3DModelAttrReset(work->object[1]->model[0], HU3D_ATTR_DISPOFF);
}
for (i = 0; i < NUM_CHARACTERS; i++) {
if (PresentUnlocked(object, roomIdxTbl2[i], PRESENT_CONSTELLATION)) {
Hu3DModelAttrReset(work->object[i + 126]->model[0], 1);
Hu3DModelAttrReset(work->object[i + 126]->model[0], HU3D_ATTR_DISPOFF);
}
}
}
@ -1075,9 +1075,9 @@ static void ExecPresentGet(omObjData *object)
rot = 36.0f * work->room;
SetCameraRot(object, rot, 1);
RotateCamera(object);
Hu3DModelAttrSet(work->object[work->idxInRoom + lbl_1_rodata_B18[work->room]]->model[0], 1);
Hu3DModelAttrSet(work->object[roofIdxTbl[work->room]]->model[0], 1);
Hu3DModelAttrSet(work->object[constellationIdxTbl[work->room]]->model[0], 1);
Hu3DModelAttrSet(work->object[work->idxInRoom + lbl_1_rodata_B18[work->room]]->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(work->object[roofIdxTbl[work->room]]->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(work->object[constellationIdxTbl[work->room]]->model[0], HU3D_ATTR_DISPOFF);
work->presentFallingTime = 0.0f;
work->presentFallingSpeed = 1.0f / 360.0f;
object->unk10 = 1;