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

Applied DATA_MAKE_NUM and MAKE_MESSID macros

Browse source
This commit is contained in:
kabiskac 2024-08-09 01:37:36 +02:00
parent c1c506360c
commit a0ebc7588d
116 changed files with 38174 additions and 37156 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/REL/option/guide.c
View file

@ -68,7 +68,7 @@ omObjData *OptionGuideCreate(void)
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 12));
Hu3DModelLayerSet(object->model[0], 1);
for (i = 0; i < 3; i++) {
object->motion[i] = Hu3DJointMotion(object->model[0], HuDataSelHeapReadNum(guideMotTbl[i], MEMORY_DEFAULT_NUM, HEAP_DATA));
object->motion[i] = Hu3DJointMotionFile(object->model[0], guideMotTbl[i]);
}
work->unk_5C = CharModelEffectNpcInit(object->model[0], object->motion[2], 1, 0xC);
work->unk_60 = CharModelEffectNpcInit(object->model[0], object->motion[1], 0, 0xC);
@ -217,7 +217,7 @@ static void UpdateGuide(omObjData *object)
static float LerpAngle(float start, float end, float time)
{
float angle;
float delta = fmod(end - start, 360.0);
if (0.0f > delta) {
delta += 360.0f;