Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-25 15:49:02 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Document Easy3DObject functions

Browse Source
This commit is contained in:
Fexty12573 2024-06-20 22:01:25 +02:00
parent 1cb54855b6
commit e25c7d3fd8
28 changed files with 654 additions and 647 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
include/easy3d_object.h
View File

@ -7,6 +7,13 @@
#include <nnsys.h>
#include <nitro/fx/fx.h>
enum RotationAxis {
ROTATION_AXIS_X = 0,
ROTATION_AXIS_Y,
ROTATION_AXIS_Z,
ROTATION_AXIS_COUNT
};
typedef struct Easy3DModel {
void *data;
NNSG3dResMdlSet *set;
@ -23,11 +30,11 @@ typedef struct Easy3DAnim {
} Easy3DAnim;
typedef struct Easy3DObject {
NNSG3dRenderObj unk_00;
VecFx32 unk_54;
VecFx32 unk_60;
BOOL unk_6C;
u16 unk_70[3];
NNSG3dRenderObj renderObj;
VecFx32 position;
VecFx32 scale;
BOOL visible;
u16 rotation[ROTATION_AXIS_COUNT];
u8 padding_76[2];
} Easy3DObject;
@ -44,18 +51,18 @@ void Easy3DAnim_SetFrame(Easy3DAnim *anim, fx32 frame);
fx32 Easy3DAnim_GetFrame(const Easy3DAnim *anim);
fx32 Easy3DAnim_GetFrameCount(const Easy3DAnim *anim);
void sub_02017258(Easy3DObject * param0, Easy3DModel * param1);
void sub_0201727C(Easy3DObject * param0, Easy3DAnim * param1);
void sub_02017288(Easy3DObject * param0, Easy3DAnim * param1);
void sub_02017294(Easy3DObject * param0);
void sub_02017330(Easy3DObject * param0, const MtxFx33 * param1);
void sub_02017348(Easy3DObject * param0, BOOL param1);
BOOL sub_0201734C(const Easy3DObject * param0);
void sub_02017350(Easy3DObject * param0, fx32 param1, fx32 param2, fx32 param3);
void sub_02017358(const Easy3DObject * param0, fx32 * param1, fx32 * param2, fx32 * param3);
void sub_0201736C(Easy3DObject * param0, fx32 param1, fx32 param2, fx32 param3);
void sub_02017374(const Easy3DObject * param0, fx32 * param1, fx32 * param2, fx32 * param3);
void sub_02017388(Easy3DObject * param0, u16 param1, u32 param2);
u16 sub_02017394(const Easy3DObject * param0, u32 param1);
void Easy3DObject_Init(Easy3DObject *obj, Easy3DModel *model);
void Easy3DObject_AddAnim(Easy3DObject *obj, Easy3DAnim *anim);
void Easy3DObject_RemoveAnim(Easy3DObject *obj, Easy3DAnim *anim);
void Easy3DObject_Draw(Easy3DObject *obj);
void Easy3DObject_DrawRotated(Easy3DObject *obj, const MtxFx33 *rotation);
void Easy3DObject_SetVisibility(Easy3DObject *obj, BOOL visible);
BOOL Easy3DObject_GetVisibility(const Easy3DObject *obj);
void Easy3DObject_SetPosition(Easy3DObject *obj, fx32 x, fx32 y, fx32 z);
void Easy3DObject_GetPosition(const Easy3DObject *obj, fx32 *outX, fx32 *outY, fx32 *outZ);
void Easy3DObject_SetScale(Easy3DObject *obj, fx32 x, fx32 y, fx32 z);
void Easy3DObject_GetScale(const Easy3DObject *obj, fx32 *outX, fx32 *outY, fx32 *outZ);
void Easy3DObject_SetRotation(Easy3DObject *obj, u16 angle, enum RotationAxis axis);
u16 Easy3DObject_GetRotation(const Easy3DObject *obj, enum RotationAxis axis);
#endif // POKEPLATINUM_EASY3D_OBJECT_H

14
src/dw_warp/dw_warp.c
View File

@ -257,14 +257,14 @@ static void DWWarp_InitModel (DistortionWorldWarp * warp)
Easy3DAnim_LoadFrom(&warp->animationAnimation2, &warp->animationModel, narc, 17, HEAP_ID_DISTORTION_WORLD_WARP, &warp->allocator);
Easy3DAnim_SetFrame(&warp->animationAnimation2, 0);
sub_02017258(&warp->animationObj, &warp->animationModel);
Easy3DObject_Init(&warp->animationObj, &warp->animationModel);
sub_02017350(&warp->animationObj, 0, 0, 0);
sub_0201736C(&warp->animationObj, FX32_ONE, FX32_ONE, FX32_ONE);
sub_02017348(&warp->animationObj, 1);
Easy3DObject_SetPosition(&warp->animationObj, 0, 0, 0);
Easy3DObject_SetScale(&warp->animationObj, FX32_ONE, FX32_ONE, FX32_ONE);
Easy3DObject_SetVisibility(&warp->animationObj, TRUE);
sub_0201727C(&warp->animationObj, &warp->animationAnimation);
sub_0201727C(&warp->animationObj, &warp->animationAnimation2);
Easy3DObject_AddAnim(&warp->animationObj, &warp->animationAnimation);
Easy3DObject_AddAnim(&warp->animationObj, &warp->animationAnimation2);
NARC_dtor(narc);
@ -314,7 +314,7 @@ static void Model3D_Update (DistortionWorldWarp * warp)
NNS_G3dGePushMtx();
sub_02017294(&warp->animationObj);
Easy3DObject_Draw(&warp->animationObj);
NNS_G3dGePopMtx(1);
}

100
src/easy3d_object.c
View File

@ -142,98 +142,98 @@ fx32 Easy3DAnim_GetFrameCount(const Easy3DAnim *anim)
return NNS_G3dAnmObjGetNumFrame(anim->animObj);
}
void sub_02017258 (Easy3DObject * param0, Easy3DModel * param1)
void Easy3DObject_Init(Easy3DObject *obj, Easy3DModel *model)
{
memset(param0, 0, sizeof(Easy3DObject));
NNS_G3dRenderObjInit(&param0->unk_00, param1->model);
memset(obj, 0, sizeof(Easy3DObject));
NNS_G3dRenderObjInit(&obj->renderObj, model->model);
param0->unk_6C = 1;
param0->unk_60.x = FX32_ONE;
param0->unk_60.y = FX32_ONE;
param0->unk_60.z = FX32_ONE;
obj->visible = TRUE;
obj->scale.x = FX32_ONE;
obj->scale.y = FX32_ONE;
obj->scale.z = FX32_ONE;
}
void sub_0201727C (Easy3DObject * param0, Easy3DAnim * param1)
void Easy3DObject_AddAnim(Easy3DObject *obj, Easy3DAnim *anim)
{
NNS_G3dRenderObjAddAnmObj(&param0->unk_00, param1->animObj);
NNS_G3dRenderObjAddAnmObj(&obj->renderObj, anim->animObj);
}
void sub_02017288 (Easy3DObject * param0, Easy3DAnim * param1)
void Easy3DObject_RemoveAnim(Easy3DObject *obj, Easy3DAnim *anim)
{
NNS_G3dRenderObjRemoveAnmObj(&param0->unk_00, param1->animObj);
NNS_G3dRenderObjRemoveAnmObj(&obj->renderObj, anim->animObj);
}
void sub_02017294 (Easy3DObject * param0)
void Easy3DObject_Draw(Easy3DObject *obj)
{
MtxFx33 v0;
MtxFx33 v1;
MtxFx33 rotation;
MtxFx33 temp;
if (param0->unk_6C) {
MTX_Identity33(&v0);
MTX_RotX33(&v1, FX_SinIdx(param0->unk_70[0]), FX_CosIdx(param0->unk_70[0]));
MTX_Concat33(&v1, &v0, &v0);
MTX_RotZ33(&v1, FX_SinIdx(param0->unk_70[2]), FX_CosIdx(param0->unk_70[2]));
MTX_Concat33(&v1, &v0, &v0);
MTX_RotY33(&v1, FX_SinIdx(param0->unk_70[1]), FX_CosIdx(param0->unk_70[1]));
MTX_Concat33(&v1, &v0, &v0);
if (obj->visible) {
MTX_Identity33(&rotation);
MTX_RotX33(&temp, FX_SinIdx(obj->rotation[ROTATION_AXIS_X]), FX_CosIdx(obj->rotation[ROTATION_AXIS_X]));
MTX_Concat33(&temp, &rotation, &rotation);
MTX_RotZ33(&temp, FX_SinIdx(obj->rotation[ROTATION_AXIS_Z]), FX_CosIdx(obj->rotation[ROTATION_AXIS_Z]));
MTX_Concat33(&temp, &rotation, &rotation);
MTX_RotY33(&temp, FX_SinIdx(obj->rotation[ROTATION_AXIS_Y]), FX_CosIdx(obj->rotation[ROTATION_AXIS_Y]));
MTX_Concat33(&temp, &rotation, &rotation);
Easy3D_DrawRenderObj(&param0->unk_00, &param0->unk_54, &v0, &param0->unk_60);
Easy3D_DrawRenderObj(&obj->renderObj, &obj->position, &rotation, &obj->scale);
}
}
void sub_02017330 (Easy3DObject * param0, const MtxFx33 * param1)
void Easy3DObject_DrawRotated(Easy3DObject *obj, const MtxFx33 *rotation)
{
if (param0->unk_6C) {
Easy3D_DrawRenderObj(&param0->unk_00, &param0->unk_54, (MtxFx33 *)param1, &param0->unk_60);
if (obj->visible) {
Easy3D_DrawRenderObj(&obj->renderObj, &obj->position, (MtxFx33 *)rotation, &obj->scale);
}
}
void sub_02017348 (Easy3DObject * param0, BOOL param1)
void Easy3DObject_SetVisibility(Easy3DObject *obj, BOOL visible)
{
param0->unk_6C = param1;
obj->visible = visible;
}
BOOL sub_0201734C (const Easy3DObject * param0)
BOOL Easy3DObject_GetVisibility(const Easy3DObject *obj)
{
return param0->unk_6C;
return obj->visible;
}
void sub_02017350 (Easy3DObject * param0, fx32 param1, fx32 param2, fx32 param3)
void Easy3DObject_SetPosition(Easy3DObject *obj, fx32 x, fx32 y, fx32 z)
{
param0->unk_54.x = param1;
param0->unk_54.y = param2;
param0->unk_54.z = param3;
obj->position.x = x;
obj->position.y = y;
obj->position.z = z;
}
void sub_02017358 (const Easy3DObject * param0, fx32 * param1, fx32 * param2, fx32 * param3)
void Easy3DObject_GetPosition(const Easy3DObject *obj, fx32 *outX, fx32 *outY, fx32 *outZ)
{
*param1 = param0->unk_54.x;
*param2 = param0->unk_54.y;
*param3 = param0->unk_54.z;
*outX = obj->position.x;
*outY = obj->position.y;
*outZ = obj->position.z;
}
void sub_0201736C (Easy3DObject * param0, fx32 param1, fx32 param2, fx32 param3)
void Easy3DObject_SetScale(Easy3DObject *obj, fx32 x, fx32 y, fx32 z)
{
param0->unk_60.x = param1;
param0->unk_60.y = param2;
param0->unk_60.z = param3;
obj->scale.x = x;
obj->scale.y = y;
obj->scale.z = z;
}
void sub_02017374 (const Easy3DObject * param0, fx32 * param1, fx32 * param2, fx32 * param3)
void Easy3DObject_GetScale(const Easy3DObject *obj, fx32 *outX, fx32 *outY, fx32 *outZ)
{
*param1 = param0->unk_60.x;
*param2 = param0->unk_60.y;
*param3 = param0->unk_60.z;
*outX = obj->scale.x;
*outY = obj->scale.y;
*outZ = obj->scale.z;
}
void sub_02017388 (Easy3DObject * param0, u16 param1, u32 param2)
void Easy3DObject_SetRotation(Easy3DObject *obj, u16 angle, enum RotationAxis axis)
{
param0->unk_70[param2] = param1;
obj->rotation[axis] = angle;
}
u16 sub_02017394 (const Easy3DObject * param0, u32 param1)
u16 Easy3DObject_GetRotation(const Easy3DObject *obj, enum RotationAxis axis)
{
return param0->unk_70[param1];
return obj->rotation[axis];
}
static void Easy3DAnim_LoadInternal(Easy3DAnim *anim, const Easy3DModel *model, void *data, NNSFndAllocator *allocator)

128
src/overlay006/ov6_0223E140.c
View File

@ -1056,13 +1056,13 @@ static void ov6_0223EA98 (UnkStruct_ov6_0223EA98 * param0)
v1 = v3[param0->unk_10][1];
Easy3DModel_LoadFrom(&param0->unk_9C, v2, v0, 4);
sub_02017258(&param0->unk_24, &param0->unk_9C);
sub_02017350(&param0->unk_24, 0, 0, 0);
sub_0201736C(&param0->unk_24, FX32_CONST(1.00f), FX32_CONST(1.00f), FX32_CONST(1.00f));
sub_02017348(&param0->unk_24, 1);
Easy3DObject_Init(&param0->unk_24, &param0->unk_9C);
Easy3DObject_SetPosition(&param0->unk_24, 0, 0, 0);
Easy3DObject_SetScale(&param0->unk_24, FX32_CONST(1.00f), FX32_CONST(1.00f), FX32_CONST(1.00f));
Easy3DObject_SetVisibility(&param0->unk_24, 1);
Easy3DAnim_LoadFrom(&param0->unk_AC, &param0->unk_9C, v2, v1, 4, &param0->unk_C0);
Easy3DAnim_SetFrame(&param0->unk_AC, 0);
sub_0201727C(&param0->unk_24, &param0->unk_AC);
Easy3DObject_AddAnim(&param0->unk_24, &param0->unk_AC);
NARC_dtor(v2);
}
@ -1117,17 +1117,17 @@ static BOOL ov6_0223EBDC (UnkStruct_ov6_0223EA98 * param0)
param0->unk_D0 = 0;
param0->unk_D4 = FX32_CONST(573);
param0->unk_D8 = FX32_CONST(330 + 30);
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
ov6_0223FD0C(&param0->unk_E4, v1, param0->unk_D4, 20);
ov6_0223FD0C(&param0->unk_F4, v3, param0->unk_D8, 20);
param0->unk_18++;
break;
case 1:
param0->unk_D0++;
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
v0[1] = ov6_0223FD18(&param0->unk_F4, param0->unk_D0);
sub_02017350(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
if (v0[0] && v0[1]) {
Sound_PlayPokemonCry(0, 480, 0, 100, 4, 0);
@ -1138,16 +1138,16 @@ static BOOL ov6_0223EBDC (UnkStruct_ov6_0223EA98 * param0)
param0->unk_D0 = 0;
param0->unk_D4 = FX32_CONST(444);
param0->unk_D8 = FX32_CONST(330 + 30);
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
ov6_0223FD0C(&param0->unk_E4, v1, param0->unk_D4, 20);
param0->unk_18++;
break;
case 3:
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
param0->unk_D8 += (sub_0201D264(param0->unk_D0 * (180 / 20)) * 3);
param0->unk_D0++;
sub_02017350(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_D8);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_D8);
if (v0[0]) {
param0->unk_18++;
@ -1157,16 +1157,16 @@ static BOOL ov6_0223EBDC (UnkStruct_ov6_0223EA98 * param0)
param0->unk_D0 = 0;
param0->unk_D4 = FX32_CONST(507);
param0->unk_D8 = FX32_CONST(330 + 30);
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
ov6_0223FD0C(&param0->unk_E4, v1, param0->unk_D4, 20);
param0->unk_18++;
break;
case 5:
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
param0->unk_D8 -= (sub_0201D264(param0->unk_D0 * (90 / 20)) * 3);
param0->unk_D0++;
sub_02017350(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_D8);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_D8);
if (v0[0]) {
param0->unk_18 = 99;
@ -1194,17 +1194,17 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0)
param0->unk_D4 = FX32_CONST(555);
param0->unk_D8 = FX32_CONST(317 + 30);
param0->unk_E0 = FX32_CONST(0);
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
ov6_0223FD0C(&param0->unk_E4, v1, param0->unk_D4, 32);
ov6_0223FD0C(&param0->unk_F4, v3, param0->unk_D8, 32);
param0->unk_18++;
break;
case 1:
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
v0[1] = ov6_0223FD18(&param0->unk_F4, param0->unk_D0);
param0->unk_D0++;
sub_02017350(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00 + param0->unk_E0);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00 + param0->unk_E0);
if (v0[0] && v0[1]) {
param0->unk_18++;
@ -1214,16 +1214,16 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0)
param0->unk_D0 = 0;
param0->unk_D4 = FX32_CONST(507);
param0->unk_D8 = FX32_CONST(317 + 30);
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
ov6_0223FD0C(&param0->unk_E4, v1, param0->unk_D4, 32);
param0->unk_18++;
break;
case 3:
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
param0->unk_D8 += (sub_0201D264(param0->unk_D0 * (180 / 32)) * 3);
param0->unk_D0++;
sub_02017350(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_D8);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_D8);
if (v0[0]) {
param0->unk_18++;
@ -1231,13 +1231,13 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0)
break;
case 4:
param0->unk_D0 = 0;
sub_02017358(&param0->unk_24, &v1, &v2, &param0->unk_D8);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &param0->unk_D8);
param0->unk_18++;
case 5:
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
param0->unk_D8 -= (sub_0201D264(param0->unk_D0 * (360 / 32)) * 2);
param0->unk_D0++;
sub_02017350(&param0->unk_24, v1, v2, param0->unk_D8);
Easy3DObject_SetPosition(&param0->unk_24, v1, v2, param0->unk_D8);
if (param0->unk_D0 >= (32 * 2)) {
param0->unk_D0 = 0;
@ -1249,18 +1249,18 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0)
param0->unk_D4 = FX32_CONST(465);
param0->unk_D8 = FX32_CONST(468 + 30);
param0->unk_DC = FX32_CONST(0);
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
ov6_0223FD0C(&param0->unk_E4, v1, param0->unk_D4, 32);
ov6_0223FD0C(&param0->unk_F4, v3, param0->unk_D8, 32);
param0->unk_18++;
break;
case 7:
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
v0[1] = ov6_0223FD18(&param0->unk_F4, param0->unk_D0);
param0->unk_D0++;
param0->unk_DC -= (sub_0201D264((param0->unk_D0 + 1) * (180 / 32)) * 4);
sub_02017350(&param0->unk_24, param0->unk_E4.unk_00 + param0->unk_DC, v2, param0->unk_F4.unk_00);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00 + param0->unk_DC, v2, param0->unk_F4.unk_00);
if (v0[0] && v0[1]) {
param0->unk_18++;
@ -1270,13 +1270,13 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0)
param0->unk_D0 = 0;
sub_0206296C(param0->unk_10C, 2);
LocalMapObj_SetAnimationCode(param0->unk_110, 0x2);
sub_02017358(&param0->unk_24, &v1, &v2, &param0->unk_D8);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &param0->unk_D8);
param0->unk_18++;
case 9:
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
param0->unk_D8 += (sub_0201D264(param0->unk_D0 * (360 / 32)) * 1);
param0->unk_D0++;
sub_02017350(&param0->unk_24, v1, v2, param0->unk_D8);
Easy3DObject_SetPosition(&param0->unk_24, v1, v2, param0->unk_D8);
if (param0->unk_D0 >= (32 * 1)) {
param0->unk_1C = 1;
@ -1289,18 +1289,18 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0)
param0->unk_D4 = FX32_CONST(503);
param0->unk_D8 = FX32_CONST(475 + 30);
param0->unk_E0 = FX32_CONST(0);
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
ov6_0223FD0C(&param0->unk_E4, v1, param0->unk_D4, 32);
ov6_0223FD0C(&param0->unk_F4, v3, param0->unk_D8, 32);
param0->unk_18++;
break;
case 11:
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
v0[1] = ov6_0223FD18(&param0->unk_F4, param0->unk_D0);
param0->unk_E0 += (sub_0201D264(param0->unk_D0 * (180 / 32)) * 2);
param0->unk_D0++;
sub_02017350(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00 + param0->unk_E0);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00 + param0->unk_E0);
if (v0[0] && v0[1]) {
param0->unk_18++;
@ -1310,13 +1310,13 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0)
param0->unk_D0 = 0;
param0->unk_D4 = FX32_CONST(503);
param0->unk_D8 = FX32_CONST(454 + 30);
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
ov6_0223FD0C(&param0->unk_E4, v1, param0->unk_D4, 32 / 4);
ov6_0223FD0C(&param0->unk_F4, v3, param0->unk_D8, 32 / 4);
param0->unk_18++;
break;
case 13:
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
v0[1] = ov6_0223FD18(&param0->unk_F4, param0->unk_D0);
param0->unk_D0++;
@ -1328,7 +1328,7 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0)
}
}
sub_02017350(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
if (v0[0] && v0[1]) {
param0->unk_18++;
@ -1342,7 +1342,7 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0)
}
MapObject_SetHidden(param0->unk_108, 0);
sub_02017348(&param0->unk_24, 0);
Easy3DObject_SetVisibility(&param0->unk_24, 0);
param0->unk_18++;
break;
case 15:
@ -1371,7 +1371,7 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0)
}
MapObject_SetHidden(param0->unk_108, 1);
sub_02017348(&param0->unk_24, 1);
Easy3DObject_SetVisibility(&param0->unk_24, 1);
param0->unk_18++;
case 18:
@ -1381,13 +1381,13 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0)
param0->unk_D0 = 0;
param0->unk_D8 = FX32_CONST(319 + 30);
param0->unk_DC = FX32_CONST(0);
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
param0->unk_D4 = v1;
ov6_0223FD0C(&param0->unk_F4, v3, param0->unk_D8, 32);
param0->unk_18++;
break;
case 20:
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_F4, param0->unk_D0);
param0->unk_D0++;
@ -1397,7 +1397,7 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0)
}
param0->unk_DC += (sub_0201D264((param0->unk_D0 + 1) * (180 / 32)) * 8);
sub_02017350(&param0->unk_24, param0->unk_D4 + param0->unk_DC, v2, param0->unk_F4.unk_00);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_D4 + param0->unk_DC, v2, param0->unk_F4.unk_00);
if (v0[0]) {
param0->unk_18 = 99;
@ -1407,17 +1407,17 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0)
param0->unk_D0 = 0;
param0->unk_D4 = FX32_CONST(Unk_ov6_02248EA8[param0->unk_10][0]);
param0->unk_D8 = FX32_CONST(Unk_ov6_02248EA8[param0->unk_10][1]);
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
ov6_0223FD0C(&param0->unk_E4, v1, param0->unk_D4, 20);
ov6_0223FD0C(&param0->unk_F4, v3, param0->unk_D8, 20);
param0->unk_18++;
break;
case 100:
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
v0[1] = ov6_0223FD18(&param0->unk_F4, param0->unk_D0);
param0->unk_D0++;
sub_02017350(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
if (v0[0] && v0[1]) {
param0->unk_18++;
@ -1461,17 +1461,17 @@ static BOOL ov6_0223F744 (UnkStruct_ov6_0223EA98 * param0)
param0->unk_D0 = 0;
param0->unk_D4 = FX32_CONST(606);
param0->unk_D8 = FX32_CONST(340 + 30);
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
ov6_0223FD0C(&param0->unk_E4, v1, param0->unk_D4, 8);
ov6_0223FD0C(&param0->unk_F4, v3, param0->unk_D8, 8);
param0->unk_18++;
break;
case 1:
param0->unk_D0++;
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
v0[1] = ov6_0223FD18(&param0->unk_F4, param0->unk_D0);
sub_02017350(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
if (v0[0] && v0[1]) {
param0->unk_18++;
@ -1481,17 +1481,17 @@ static BOOL ov6_0223F744 (UnkStruct_ov6_0223EA98 * param0)
param0->unk_D0 = 0;
param0->unk_D4 = FX32_CONST(438);
param0->unk_D8 = FX32_CONST(412 + 30);
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
ov6_0223FD0C(&param0->unk_E4, v1, param0->unk_D4, 8);
ov6_0223FD0C(&param0->unk_F4, v3, param0->unk_D8, 8);
param0->unk_18++;
break;
case 3:
param0->unk_D0++;
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
v0[1] = ov6_0223FD18(&param0->unk_F4, param0->unk_D0);
sub_02017350(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
if (v0[0] && v0[1]) {
Sound_PlayPokemonCry(0, 482, 0, 100, 4, 0);
@ -1503,17 +1503,17 @@ static BOOL ov6_0223F744 (UnkStruct_ov6_0223EA98 * param0)
param0->unk_D0 = 0;
param0->unk_D4 = FX32_CONST(504);
param0->unk_D8 = FX32_CONST(307 + 30);
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
ov6_0223FD0C(&param0->unk_E4, v1, param0->unk_D4, 8);
ov6_0223FD0C(&param0->unk_F4, v3, param0->unk_D8, 8);
param0->unk_18++;
break;
case 5:
param0->unk_D0++;
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
v0[1] = ov6_0223FD18(&param0->unk_F4, param0->unk_D0);
sub_02017350(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
if (v0[0] && v0[1]) {
param0->unk_18++;
@ -1563,7 +1563,7 @@ static BOOL ov6_0223F9F4 (UnkStruct_ov6_0223EA98 * param0)
param0->unk_D4 = FX32_CONST(504);
param0->unk_D8 = FX32_CONST(439);
param0->unk_D0 = 0;
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
ov6_0223FD0C(&param0->unk_E4, v1, param0->unk_D4, 6);
ov6_0223FD0C(&param0->unk_F4, v3, param0->unk_D8, 6);
param0->unk_14++;
@ -1571,13 +1571,13 @@ static BOOL ov6_0223F9F4 (UnkStruct_ov6_0223EA98 * param0)
break;
case 2:
{
sub_02017358(&param0->unk_24, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param0->unk_24, &v1, &v2, &v3);
v0[0] = ov6_0223FD18(&param0->unk_E4, param0->unk_D0);
v0[1] = ov6_0223FD18(&param0->unk_F4, param0->unk_D0);
param0->unk_D0++;
sub_02017350(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
if (v0[0] && v0[1]) {
param0->unk_14++;
@ -1618,7 +1618,7 @@ static void ov6_0223FAF8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy
504, 504, 435
};
sub_02017350(&v0->unk_24, FX32_CONST(v4[v0->unk_10]), FX32_CONST(99), FX32_CONST(290 + 30));
Easy3DObject_SetPosition(&v0->unk_24, FX32_CONST(v4[v0->unk_10]), FX32_CONST(99), FX32_CONST(290 + 30));
}
v0->unk_20 = 0;
@ -1682,7 +1682,7 @@ static void ov6_0223FAF8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy
G3_Identity();
Easy3DAnim_UpdateLooped(&v0->unk_AC, FX32_ONE);
NNS_G3dGePushMtx();
sub_02017294(&v0->unk_24);
Easy3DObject_Draw(&v0->unk_24);
NNS_G3dGePopMtx(1);
}
}
@ -1803,37 +1803,37 @@ static void ov6_0223FDA4 (Easy3DAnim * param0, fx32 param1)
static void ov6_0223FDAC (Easy3DObject * param0, Easy3DModel * param1)
{
sub_02017258(param0, param1);
Easy3DObject_Init(param0, param1);
}
static void ov6_0223FDB4 (Easy3DObject * param0, Easy3DAnim * param1)
{
sub_0201727C(param0, param1);
Easy3DObject_AddAnim(param0, param1);
}
static void ov6_0223FDBC (Easy3DObject * param0)
{
sub_02017294(param0);
Easy3DObject_Draw(param0);
}
static void ov6_0223FDC4 (Easy3DObject * param0, BOOL param1)
{
sub_02017348(param0, param1);
Easy3DObject_SetVisibility(param0, param1);
}
static void ov6_0223FDCC (Easy3DObject * param0, fx32 param1, fx32 param2, fx32 param3)
{
sub_02017350(param0, param1, param2, param3);
Easy3DObject_SetPosition(param0, param1, param2, param3);
}
static void ov6_0223FDD4 (Easy3DObject * param0, fx32 param1, fx32 param2, fx32 param3)
{
sub_0201736C(param0, param1, param2, param3);
Easy3DObject_SetScale(param0, param1, param2, param3);
}
static void ov6_0223FDDC (Easy3DObject * param0, u16 param1, u32 param2)
{
sub_02017388(param0, param1, param2);
Easy3DObject_SetRotation(param0, param1, param2);
}
UnkStruct_ov6_0223FDE4 * ov6_0223FDE4 (u32 param0)

36
src/overlay006/ov6_02248050.c
View File

@ -98,7 +98,7 @@ static void ov6_02248050 (MapObjectManager * param0, u32 param1, Easy3DObject *
break;
}
sub_02017350(param2, (((v1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1), v3.y, (((v2) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1));
Easy3DObject_SetPosition(param2, (((v1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1), v3.y, (((v2) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1));
}
static void ov6_022480BC (PlayerAvatar * const playerAvatar, Easy3DObject * param1)
@ -131,7 +131,7 @@ static void ov6_022480BC (PlayerAvatar * const playerAvatar, Easy3DObject * para
break;
}
sub_02017350(param1, (((v1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1), v3.y, (((v2) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1));
Easy3DObject_SetPosition(param1, (((v1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1), v3.y, (((v2) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1));
}
static void ov6_02248124 (PlayerAvatar * const playerAvatar, Easy3DObject * param1)
@ -139,7 +139,7 @@ static void ov6_02248124 (PlayerAvatar * const playerAvatar, Easy3DObject * para
VecFx32 v0;
PlayerAvatar_PosVectorOut(playerAvatar, &v0);
sub_02017350(param1, v0.x, v0.y, v0.z);
Easy3DObject_SetPosition(param1, v0.x, v0.y, v0.z);
}
static void ov6_02248140 (UnkStruct_ov6_02248140 * param0, NARC * param1, u32 param2, u32 param3, int param4, NNSFndAllocator * param5)
@ -149,13 +149,13 @@ static void ov6_02248140 (UnkStruct_ov6_02248140 * param0, NARC * param1, u32 pa
memset(param0, 0, sizeof(UnkStruct_ov6_02248140));
Easy3DModel_LoadFrom(&param0->unk_78, param1, param2, 4);
sub_02017258(&param0->unk_00, &param0->unk_78);
Easy3DObject_Init(&param0->unk_00, &param0->unk_78);
param0->unk_D8 = param4;
for (v0 = 0; v0 < param0->unk_D8; v0++) {
Easy3DAnim_LoadFrom(&param0->unk_88[v0], &param0->unk_78, param1, param3 + v0, 4, param5);
sub_0201727C(&param0->unk_00, &param0->unk_88[v0]);
Easy3DObject_AddAnim(&param0->unk_00, &param0->unk_88[v0]);
}
}
@ -195,7 +195,7 @@ static void ov6_02248224 (UnkStruct_ov6_02248140 * param0)
static void ov6_02248254 (UnkStruct_ov6_02248140 * param0)
{
sub_02017294(&param0->unk_00);
Easy3DObject_Draw(&param0->unk_00);
}
static void ov6_0224825C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2)
@ -235,7 +235,7 @@ static void ov6_022482CC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy
v2 = ov6_022481F0(&v0->unk_00);
if (v2 == 1) {
sub_02017348(&v0->unk_00.unk_00, 0);
Easy3DObject_SetVisibility(&v0->unk_00.unk_00, 0);
v0->unk_EC++;
}
break;
@ -336,7 +336,7 @@ static void ov6_02248410 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy
v2 = ov6_022481F0(&v0->unk_00);
if (v2 == 1) {
sub_02017348(&v0->unk_00.unk_00, 0);
Easy3DObject_SetVisibility(&v0->unk_00.unk_00, 0);
v0->unk_EC++;
}
break;
@ -443,15 +443,15 @@ static void ov6_02248520 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy
ov6_02248140(&v0->unk_00[1], v2, 11, 9, 2, &v0->unk_1B8);
NARC_dtor(v2);
ov6_02248124(fieldSystem->playerAvatar, &v0->unk_00[1].unk_00);
sub_02017348(&v0->unk_00[1].unk_00, 0);
Easy3DObject_SetVisibility(&v0->unk_00[1].unk_00, 0);
v0->unk_1C8++;
case 1:
v1 = ov6_022481F0(&v0->unk_00[0]);
ov6_02248124(fieldSystem->playerAvatar, &v0->unk_00[0].unk_00);
if (v1 == 1) {
sub_02017348(&v0->unk_00[1].unk_00, 1);
sub_02017348(&v0->unk_00[0].unk_00, 0);
Easy3DObject_SetVisibility(&v0->unk_00[1].unk_00, 1);
Easy3DObject_SetVisibility(&v0->unk_00[0].unk_00, 0);
ov6_02248124(fieldSystem->playerAvatar, &v0->unk_00[1].unk_00);
v0->unk_1C8++;
}
@ -504,7 +504,7 @@ static void ov6_02248610 (UnkStruct_ov6_022486B4 * param0, PlayerAvatar * const
GF_ASSERT(param0->unk_C8 == 0);
PlayerAvatar_PosVectorOut(playerAvatar, &v0);
sub_02017350(&param0->unk_00, v0.x, v0.y + param2, v0.z + param3);
Easy3DObject_SetPosition(&param0->unk_00, v0.x, v0.y + param2, v0.z + param3);
param0->unk_C8 = 1;
@ -512,7 +512,7 @@ static void ov6_02248610 (UnkStruct_ov6_022486B4 * param0, PlayerAvatar * const
Easy3DAnim_SetFrame(&param0->unk_78[v1], 0);
}
sub_02017348(&param0->unk_00, 1);
Easy3DObject_SetVisibility(&param0->unk_00, 1);
Sound_PlayEffect(1575);
}
@ -533,7 +533,7 @@ static void ov6_02248678 (UnkStruct_ov6_022486B4 * param0)
if (v1 == 1) {
param0->unk_C8 = 0;
sub_02017348(&param0->unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_00, 0);
}
}
@ -542,14 +542,14 @@ static void ov6_022486B4 (UnkStruct_ov6_022486B4 * param0, Easy3DModel * param1,
int v0;
memset(param0, 0, sizeof(UnkStruct_ov6_022486B4));
sub_02017258(&param0->unk_00, param1);
Easy3DObject_Init(&param0->unk_00, param1);
for (v0 = 0; v0 < 4; v0++) {
Easy3DAnim_LoadFromData(&param0->unk_78[v0], param1, param3[v0], param2);
sub_0201727C(&param0->unk_00, &param0->unk_78[v0]);
Easy3DObject_AddAnim(&param0->unk_00, &param0->unk_78[v0]);
}
sub_02017348(&param0->unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_00, 0);
}
static void ov6_02248700 (UnkStruct_ov6_022486B4 * param0, NNSFndAllocator * param1)
@ -675,7 +675,7 @@ static void ov6_02248914 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy
int v1;
for (v1 = 0; v1 < 16; v1++) {
sub_02017294(&v0->unk_10[v1].unk_00);
Easy3DObject_Draw(&v0->unk_10[v1].unk_00);
}
}

12
src/overlay066/ov66_022343A8.c
View File

@ -385,7 +385,7 @@ UnkStruct_ov66_02234798 * ov66_0223461C (UnkStruct_ov66_02234548 * param0, const
sub_02021444(v0->unk_08, ov66_02234D78, v0);
ov66_02234970(&param0->unk_18, &v0->unk_0C);
sub_02017350(&v0->unk_0C, v13.x + 0, ((FX32_CONST(0)) + FX32_CONST(2)), v13.z + (FX32_CONST(-8)));
Easy3DObject_SetPosition(&v0->unk_0C, v13.x + 0, ((FX32_CONST(0)) + FX32_CONST(2)), v13.z + (FX32_CONST(-8)));
}
v0->unk_00_0 = 1;
@ -429,7 +429,7 @@ void ov66_022347D4 (UnkStruct_ov66_02234798 * param0, const UnkStruct_ov63_0222C
void ov66_022347F8 (UnkStruct_ov66_02234798 * param0, const VecFx32 * param1)
{
sub_020212A8(param0->unk_08, param1);
sub_02017350(&param0->unk_0C, param1->x + 0, ((FX32_CONST(0)) + FX32_CONST(2)), param1->z + (FX32_CONST(-8)));
Easy3DObject_SetPosition(&param0->unk_0C, param1->x + 0, ((FX32_CONST(0)) + FX32_CONST(2)), param1->z + (FX32_CONST(-8)));
}
void ov66_0223481C (const UnkStruct_ov66_02234798 * param0, VecFx32 * param1)
@ -548,7 +548,7 @@ static u32 ov66_0223496C (const UnkStruct_ov66_02234958 * param0)
static void ov66_02234970 (UnkStruct_ov66_02234958 * param0, Easy3DObject * param1)
{
sub_02017258(param1, &param0->unk_00);
Easy3DObject_Init(param1, &param0->unk_00);
}
static UnkStruct_ov66_02234798 * ov66_02234980 (UnkStruct_ov66_02234548 * param0)
@ -581,7 +581,7 @@ static void ov66_022349C8 (UnkStruct_ov66_02234798 * param0)
static void ov66_022349D4 (UnkStruct_ov66_02234798 * param0)
{
sub_02017294(&param0->unk_0C);
Easy3DObject_Draw(&param0->unk_0C);
}
static void ov66_022349E0 (UnkStruct_ov66_02234798 * param0)
@ -818,10 +818,10 @@ static void ov66_02234D3C (UnkStruct_ov66_02234798 * param0)
{
if ((param0->unk_00_4 == 0) && (param0->unk_00_6 == 1)) {
sub_02021320(param0->unk_08, 1);
sub_02017348(&param0->unk_0C, 1);
Easy3DObject_SetVisibility(&param0->unk_0C, 1);
} else {
sub_02021320(param0->unk_08, 0);
sub_02017348(&param0->unk_0C, 0);
Easy3DObject_SetVisibility(&param0->unk_0C, 0);
}
}

20
src/overlay069/ov69_0225C700.c
View File

@ -1558,7 +1558,7 @@ static void ov69_0225D6D8 (UnkStruct_ov69_0225D71C * param0, UnkStruct_ov69_0225
{
Easy3DModel_LoadFrom(&param0->unk_9C, param1->unk_1A8, 3, param2);
sub_02017258(&param0->unk_24, &param0->unk_9C);
Easy3DObject_Init(&param0->unk_24, &param0->unk_9C);
}
}
@ -1575,10 +1575,10 @@ static void ov69_0225D728 (UnkStruct_ov69_0225D71C * param0)
ov69_0225D770(param0, &v0);
sub_02017350(&param0->unk_24, param0->unk_00.x, param0->unk_00.y, param0->unk_00.z);
sub_0201736C(&param0->unk_24, param0->unk_0C.x, param0->unk_0C.y, param0->unk_0C.z);
Easy3DObject_SetPosition(&param0->unk_24, param0->unk_00.x, param0->unk_00.y, param0->unk_00.z);
Easy3DObject_SetScale(&param0->unk_24, param0->unk_0C.x, param0->unk_0C.y, param0->unk_0C.z);
sub_02017330(&param0->unk_24, &v0);
Easy3DObject_DrawRotated(&param0->unk_24, &v0);
}
static void ov69_0225D760 (const UnkStruct_ov69_0225D71C * param0, VecFx32 * param1)
@ -1609,7 +1609,7 @@ static void ov69_0225D7A0 (UnkStruct_ov69_0225CA7C * param0, const UnkStruct_ov6
for (v0 = 0; v0 < 3; v0++) {
Easy3DModel_LoadFrom(&param0->unk_B978[v0], param2->unk_1A8, Unk_ov69_0225F028[v0], param4);
sub_02017258(&param0->unk_B810[v0], &param0->unk_B978[v0]);
Easy3DObject_Init(&param0->unk_B810[v0], &param0->unk_B978[v0]);
}
if (param3.unk_00_0 == 0) {
@ -1639,18 +1639,18 @@ static void ov69_0225D854 (UnkStruct_ov69_0225CA7C * param0, const UnkStruct_ov6
ov69_0225D770(param1, &v2);
for (v1 = 0; v1 < 3; v1++) {
sub_02017350(&param0->unk_B810[v1], v3.x, v3.y, v3.z);
Easy3DObject_SetPosition(&param0->unk_B810[v1], v3.x, v3.y, v3.z);
if (v1 == 2) {
sub_0201736C(&param0->unk_B810[v1], param0->unk_B804.x, param0->unk_B804.y, param0->unk_B804.z + (FX32_CONST(0.1)));
Easy3DObject_SetScale(&param0->unk_B810[v1], param0->unk_B804.x, param0->unk_B804.y, param0->unk_B804.z + (FX32_CONST(0.1)));
} else {
sub_0201736C(&param0->unk_B810[v1], param0->unk_B804.x, param0->unk_B804.y, param0->unk_B804.z);
Easy3DObject_SetScale(&param0->unk_B810[v1], param0->unk_B804.x, param0->unk_B804.y, param0->unk_B804.z);
}
}
{
MTX_Identity33(&v0);
sub_02017330(&param0->unk_B810[2], &v0);
Easy3DObject_DrawRotated(&param0->unk_B810[2], &v0);
}
{
@ -1658,7 +1658,7 @@ static void ov69_0225D854 (UnkStruct_ov69_0225CA7C * param0, const UnkStruct_ov6
MTX_Concat33(&param0->unk_00.unk_04[v1].unk_04, &v2, &v0);
if (param0->unk_00.unk_04[v1].unk_28 != 3) {
sub_02017330(&param0->unk_B810[param0->unk_00.unk_04[v1].unk_28], &v0);
Easy3DObject_DrawRotated(&param0->unk_B810[param0->unk_00.unk_04[v1].unk_28], &v0);
}
}
}

10
src/overlay070/ov70_0225C700.c
View File

@ -72,12 +72,12 @@ BOOL ov70_0225C7A0 (const Easy3DModel * param0, const Easy3DObject * param1)
u32 v5;
u32 v6;
sub_02017358(param1, &v0.x, &v0.y, &v0.z);
sub_02017374(param1, &v1.x, &v1.y, &v1.z);
Easy3DObject_GetPosition(param1, &v0.x, &v0.y, &v0.z);
Easy3DObject_GetScale(param1, &v1.x, &v1.y, &v1.z);
v4 = sub_02017394(param1, 0);
v5 = sub_02017394(param1, 1);
v6 = sub_02017394(param1, 2);
v4 = Easy3DObject_GetRotation(param1, 0);
v5 = Easy3DObject_GetRotation(param1, 1);
v6 = Easy3DObject_GetRotation(param1, 2);
MTX_Identity33(&v2);
MTX_RotX33(&v3, FX_SinIdx(v4), FX_CosIdx(v4));

60
src/overlay070/ov70_02260B44.c
View File

@ -228,7 +228,7 @@ void ov70_02260DC8 (UnkStruct_ov70_02260BB8 * param0)
if (param0->unk_12C.unk_84[4] == 1) {
if (param0->unk_00.unk_F4[4] == 0) {
param0->unk_00.unk_F4[4] = 1;
sub_0201727C(&param0->unk_00.unk_04[0], &param0->unk_12C.unk_20[4]);
Easy3DObject_AddAnim(&param0->unk_00.unk_04[0], &param0->unk_12C.unk_20[4]);
}
}
}
@ -237,7 +237,7 @@ void ov70_02260DF4 (UnkStruct_ov70_02260BB8 * param0)
{
if (param0->unk_12C.unk_84[4] == 1) {
if (param0->unk_00.unk_F4[4] == 1) {
sub_02017288(&param0->unk_00.unk_04[0], &param0->unk_12C.unk_20[4]);
Easy3DObject_RemoveAnim(&param0->unk_00.unk_04[0], &param0->unk_12C.unk_20[4]);
param0->unk_00.unk_F4[4] = 0;
}
}
@ -252,8 +252,8 @@ UnkStruct_ov70_02260E8C * ov70_02260E20 (UnkStruct_ov70_02260BB8 * param0, int p
v0 = ov70_02261718(param0);
sub_02017258(&v0->unk_04, &param0->unk_1C4.unk_00[param1]);
sub_02017348(&v0->unk_04, 1);
Easy3DObject_Init(&v0->unk_04, &param0->unk_1C4.unk_00[param1]);
Easy3DObject_SetVisibility(&v0->unk_04, 1);
ov70_02260EA0(v0, param3);
{
@ -275,7 +275,7 @@ UnkStruct_ov70_02260E8C * ov70_02260E20 (UnkStruct_ov70_02260BB8 * param0, int p
void ov70_02260E8C (UnkStruct_ov70_02260E8C * param0)
{
sub_02017348(&param0->unk_04, 0);
Easy3DObject_SetVisibility(&param0->unk_04, 0);
param0->unk_00 = 0;
}
@ -283,23 +283,23 @@ void ov70_02260E8C (UnkStruct_ov70_02260E8C * param0)
void ov70_02260EA0 (UnkStruct_ov70_02260E8C * param0, const VecFx32 * param1)
{
param0->unk_9C = *param1;
sub_02017350(&param0->unk_04, param0->unk_9C.x + param0->unk_A8.x, param0->unk_9C.y + param0->unk_A8.y, param0->unk_9C.z + param0->unk_A8.z);
Easy3DObject_SetPosition(&param0->unk_04, param0->unk_9C.x + param0->unk_A8.x, param0->unk_9C.y + param0->unk_A8.y, param0->unk_9C.z + param0->unk_A8.z);
}
void ov70_02260EE4 (UnkStruct_ov70_02260E8C * param0, const VecFx32 * param1)
{
param0->unk_A8 = *param1;
sub_02017350(&param0->unk_04, param0->unk_9C.x + param0->unk_A8.x, param0->unk_9C.y + param0->unk_A8.y, param0->unk_9C.z + param0->unk_A8.z);
Easy3DObject_SetPosition(&param0->unk_04, param0->unk_9C.x + param0->unk_A8.x, param0->unk_9C.y + param0->unk_A8.y, param0->unk_9C.z + param0->unk_A8.z);
}
void ov70_02260F28 (const UnkStruct_ov70_02260E8C * param0, VecFx32 * param1)
{
sub_02017358(&param0->unk_04, &param1->x, &param1->y, &param1->z);
Easy3DObject_GetPosition(&param0->unk_04, &param1->x, &param1->y, &param1->z);
}
void ov70_02260F38 (UnkStruct_ov70_02260E8C * param0, BOOL param1)
{
sub_02017348(&param0->unk_04, param1);
Easy3DObject_SetVisibility(&param0->unk_04, param1);
}
BOOL ov70_02260F44 (UnkStruct_ov70_02260E8C * param0)
@ -324,7 +324,7 @@ BOOL ov70_02260F5C (UnkStruct_ov70_02260E8C * param0)
void ov70_02260F74 (UnkStruct_ov70_02260E8C * param0, u16 param1)
{
sub_02017388(&param0->unk_04, param1, 0);
Easy3DObject_SetRotation(&param0->unk_04, param1, 0);
}
BOOL ov70_02260F80 (const UnkStruct_ov70_02260E8C * param0)
@ -344,7 +344,7 @@ UnkStruct_ov70_022610B8 * ov70_02260F90 (UnkStruct_ov70_02260BB8 * param0, int p
v0 = ov70_02261AF0(param0);
sub_02017258(&v0->unk_04, &param0->unk_29C.unk_00[param1]);
Easy3DObject_Init(&v0->unk_04, &param0->unk_29C.unk_00[param1]);
for (v1 = 0; v1 < 3; v1++) {
if (param0->unk_29C.unk_120[param1][v1] != NULL) {
@ -352,7 +352,7 @@ UnkStruct_ov70_022610B8 * ov70_02260F90 (UnkStruct_ov70_02260BB8 * param0, int p
}
}
sub_02017348(&v0->unk_04, 1);
Easy3DObject_SetVisibility(&v0->unk_04, 1);
{
UnkStruct_ov63_0222CC3C v2;
@ -378,7 +378,7 @@ void ov70_02261058 (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 *
{
int v0;
sub_02017348(&param1->unk_04, 0);
Easy3DObject_SetVisibility(&param1->unk_04, 0);
for (v0 = 0; v0 < 3; v0++) {
if (param0->unk_29C.unk_120[param1->unk_02][v0] != NULL) {
@ -399,7 +399,7 @@ void ov70_022610BC (UnkStruct_ov70_022610B8 * param0, UnkStruct_ov63_0222CC3C pa
VecFx32 v0;
ov70_0225C700(&param1, &v0);
sub_02017350(&param0->unk_04, v0.x, v0.y, v0.z);
Easy3DObject_SetPosition(&param0->unk_04, v0.x, v0.y, v0.z);
}
UnkStruct_ov63_0222CC3C ov70_022610E4 (const UnkStruct_ov70_022610B8 * param0)
@ -407,7 +407,7 @@ UnkStruct_ov63_0222CC3C ov70_022610E4 (const UnkStruct_ov70_022610B8 * param0)
VecFx32 v0;
UnkStruct_ov63_0222CC3C v1;
sub_02017358(&param0->unk_04, &v0.x, &v0.y, &v0.z);
Easy3DObject_GetPosition(&param0->unk_04, &v0.x, &v0.y, &v0.z);
ov70_0225C714(&v0, &v1);
return v1;
@ -426,7 +426,7 @@ void ov70_0226111C (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 *
if ((param0->unk_29C.unk_120[param1->unk_02][param2] != NULL)) {
if (param1->unk_B8[param2] == 0) {
sub_0201727C(&param1->unk_04, &param1->unk_7C[param2]);
Easy3DObject_AddAnim(&param1->unk_04, &param1->unk_7C[param2]);
}
param1->unk_B8[param2] = 1;
@ -464,7 +464,7 @@ void ov70_02261220 (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 *
GF_ASSERT(param1->unk_02 < 18);
if ((param0->unk_29C.unk_120[param1->unk_02][param2] != NULL) && (param1->unk_B8[param2] == 1)) {
sub_02017288(&param1->unk_04, &param1->unk_7C[param2]);
Easy3DObject_RemoveAnim(&param1->unk_04, &param1->unk_7C[param2]);
param1->unk_B8[param2] = 0;
param1->unk_C0[param2] = 0;
@ -527,7 +527,7 @@ fx32 ov70_02261368 (const UnkStruct_ov70_022610B8 * param0, int param1)
void ov70_0226138C (UnkStruct_ov70_022610B8 * param0, BOOL param1)
{
sub_02017348(&param0->unk_04, param1);
Easy3DObject_SetVisibility(&param0->unk_04, param1);
}
void ov70_02261398 (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1, u32 param2)
@ -555,7 +555,7 @@ void ov70_022613E0 (UnkStruct_ov70_022610B8 * param0)
void ov70_022613E8 (UnkStruct_ov70_022610B8 * param0, fx32 param1, fx32 param2, fx32 param3)
{
sub_0201736C(&param0->unk_04, param1, param2, param3);
Easy3DObject_SetScale(&param0->unk_04, param1, param2, param3);
}
static UnkStruct_ov70_02261418 * ov70_022613F4 (int param0, int param1, u32 param2)
@ -701,8 +701,8 @@ static void ov70_022615E8 (UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_0226
param0->unk_00 = 1;
for (v0 = 0; v0 < 2; v0++) {
sub_02017258(&param0->unk_04[v0], &param1->unk_00[v0]);
sub_02017348(&param0->unk_04[v0], 1);
Easy3DObject_Init(&param0->unk_04[v0], &param1->unk_00[v0]);
Easy3DObject_SetVisibility(&param0->unk_04[v0], 1);
}
for (v0 = 0; v0 < 5 - 1; v0++) {
@ -710,9 +710,9 @@ static void ov70_022615E8 (UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_0226
param0->unk_F4[v0] = 1;
if (v0 != 3) {
sub_0201727C(&param0->unk_04[0], &param1->unk_20[v0]);
Easy3DObject_AddAnim(&param0->unk_04[0], &param1->unk_20[v0]);
} else {
sub_0201727C(&param0->unk_04[1], &param1->unk_20[v0]);
Easy3DObject_AddAnim(&param0->unk_04[1], &param1->unk_20[v0]);
}
}
}
@ -727,9 +727,9 @@ static void ov70_02261664 (UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_0226
param0->unk_F4[v0] = 0;
if (v0 != 3) {
sub_02017288(&param0->unk_04[0], &param1->unk_20[v0]);
Easy3DObject_RemoveAnim(&param0->unk_04[0], &param1->unk_20[v0]);
} else {
sub_02017288(&param0->unk_04[1], &param1->unk_20[v0]);
Easy3DObject_RemoveAnim(&param0->unk_04[1], &param1->unk_20[v0]);
}
}
}
@ -755,7 +755,7 @@ static void ov70_022616FC (UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_0226
if (param0->unk_00) {
for (v0 = 0; v0 < 2; v0++) {
sub_02017294(&param0->unk_04[v0]);
Easy3DObject_Draw(&param0->unk_04[v0]);
}
}
}
@ -914,16 +914,16 @@ static void ov70_022619F4 (UnkStruct_ov70_02260E8C * param0, UnkStruct_ov70_0226
for (v1 = 0; v1 < 4; v1++) {
if (param0->unk_7C[v1]) {
sub_0201727C(&param0->unk_04, &param1->unk_38[param0->unk_02][v1]);
Easy3DObject_AddAnim(&param0->unk_04, &param1->unk_38[param0->unk_02][v1]);
Easy3DAnim_SetFrame(&param1->unk_38[param0->unk_02][v1], param0->unk_8C[v1]);
}
}
sub_02017294(&param0->unk_04);
Easy3DObject_Draw(&param0->unk_04);
for (v1 = 0; v1 < 4; v1++) {
if (param0->unk_7C[v1]) {
sub_02017288(&param0->unk_04, &param1->unk_38[param0->unk_02][v1]);
Easy3DObject_RemoveAnim(&param0->unk_04, &param1->unk_38[param0->unk_02][v1]);
}
}
@ -997,7 +997,7 @@ static void ov70_02261C04 (UnkStruct_ov70_02261BB4 * param0, UnkStruct_ov70_0226
NNS_G3dMdlSetMdlAlphaAll(param0->unk_00[param1->unk_02].model, param1->unk_E1);
}
sub_02017294(&param1->unk_04);
Easy3DObject_Draw(&param1->unk_04);
if (param1->unk_E0 == 1) {
NNS_G3dMdlSetMdlAlphaAll(param0->unk_00[param1->unk_02].model, param1->unk_E2);

216
src/overlay070/ov70_02269190.c
View File

@ -1034,7 +1034,7 @@ static void ov70_02269828 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
param1->unk_87C[param2] = param3;
sub_02017258(&param1->unk_0C[param2], &param0->unk_10550[param3->unk_00]);
Easy3DObject_Init(&param1->unk_0C[param2], &param0->unk_10550[param3->unk_00]);
}
static void ov70_02269878 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2)
@ -1047,7 +1047,7 @@ static void ov70_02269878 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
GF_ASSERT(param1->unk_87C[param2] != NULL);
if (sub_0201734C(&param1->unk_0C[param2]) == 0) {
if (Easy3DObject_GetVisibility(&param1->unk_0C[param2]) == 0) {
return;
}
@ -1063,7 +1063,7 @@ static void ov70_02269878 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
for (v4 = 0; v4 < 2; v4++) {
if (param1->unk_87C[param2]->unk_02[v4] != 17) {
v3 = &param0->unk_106DC[param1->unk_87C[param2]->unk_02[v4]];
sub_0201727C(&param1->unk_0C[param2], v3);
Easy3DObject_AddAnim(&param1->unk_0C[param2], v3);
Easy3DAnim_SetFrame(v3, param1->unk_8C4[param2][v4]);
} else {
break;
@ -1071,12 +1071,12 @@ static void ov70_02269878 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
}
NNS_G3dMdlSetMdlPolygonIDAll(v2->model, param1->unk_04);
sub_02017294(&param1->unk_0C[param2]);
Easy3DObject_Draw(&param1->unk_0C[param2]);
for (v4 = 0; v4 < 2; v4++) {
if (param1->unk_87C[param2]->unk_02[v4] != 17) {
v3 = &param0->unk_106DC[param1->unk_87C[param2]->unk_02[v4]];
sub_02017288(&param1->unk_0C[param2], v3);
Easy3DObject_RemoveAnim(&param1->unk_0C[param2], v3);
} else {
break;
}
@ -1200,8 +1200,8 @@ static void ov70_02269B58 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
v1.z += (FX32_CONST(0));
v1.y += (FX32_CONST(8)) + (FX_Mul(FX32_ONE * v0, (FX32_CONST(0))));
sub_02017350(&param1->unk_0C[v0], v1.x, v1.y, v1.z);
sub_02017348(&param1->unk_0C[v0], 0);
Easy3DObject_SetPosition(&param1->unk_0C[v0], v1.x, v1.y, v1.z);
Easy3DObject_SetVisibility(&param1->unk_0C[v0], 0);
}
param1->unk_954.val5.unk_00 = 0xff;
@ -1214,7 +1214,7 @@ static void ov70_02269BB8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
ov70_02269828(param0, param1, 1, &Unk_ov70_0226E5A4[9]);
ov70_02269828(param0, param1, 0, &Unk_ov70_0226E5A4[12]);
sub_02017348(&param1->unk_0C[1], 0);
Easy3DObject_SetVisibility(&param1->unk_0C[1], 0);
ov70_0225D054(param1->unk_08, &v0);
v0.y += (FX32_CONST(16));
@ -1230,31 +1230,31 @@ static void ov70_02269BB8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
case 0:
v0.z -= (FX32_CONST(28));
v1.z -= (FX32_CONST(14));
sub_02017388(&param1->unk_0C[1], ((270 * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[1], ((270 * 0xffff) / 360), 1);
break;
case 1:
v0.z += (FX32_CONST(24));
v1.z += (FX32_CONST(11));
sub_02017388(&param1->unk_0C[1], ((90 * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[1], ((90 * 0xffff) / 360), 1);
break;
case 2:
v0.x -= (FX32_CONST(23));
v1.x -= (FX32_CONST(7));
v1.z += (FX32_CONST(8));
sub_02017388(&param1->unk_0C[1], ((0 * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[1], ((0 * 0xffff) / 360), 1);
break;
case 3:
v0.x += (FX32_CONST(23));
v1.x += (FX32_CONST(7));
v1.z += (FX32_CONST(8));
sub_02017388(&param1->unk_0C[1], ((180 * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[1], ((180 * 0xffff) / 360), 1);
break;
default:
break;
}
sub_02017350(&param1->unk_0C[1], v0.x, v0.y, v0.z);
sub_02017350(&param1->unk_0C[0], v1.x, v1.y, v1.z);
Easy3DObject_SetPosition(&param1->unk_0C[1], v0.x, v0.y, v0.z);
Easy3DObject_SetPosition(&param1->unk_0C[0], v1.x, v1.y, v1.z);
}
static void ov70_02269CFC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1)
@ -1265,7 +1265,7 @@ static void ov70_02269CFC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
ov70_02269828(param0, param1, 1, &Unk_ov70_0226E5A4[9]);
ov70_02269828(param0, param1, 0, &Unk_ov70_0226E5A4[12]);
ov70_02269828(param0, param1, 2, &Unk_ov70_0226E5A4[10]);
sub_02017348(&param1->unk_0C[1], 0);
Easy3DObject_SetVisibility(&param1->unk_0C[1], 0);
ov70_0225D054(param1->unk_08, &v0);
v0.y += (FX32_CONST(16));
@ -1282,45 +1282,45 @@ static void ov70_02269CFC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
case 0:
v0.z -= (FX32_CONST(28));
v1.z -= (FX32_CONST(14));
sub_02017388(&param1->unk_0C[1], (((270 - 40) * 0xffff) / 360), 1);
sub_02017388(&param1->unk_0C[2], (((270 + 40) * 0xffff) / 360), 1);
sub_02017350(&param1->unk_0C[1], v0.x + (FX32_CONST(8)), v0.y, v0.z);
sub_02017350(&param1->unk_0C[2], v0.x - (FX32_CONST(8)), v0.y, v0.z);
Easy3DObject_SetRotation(&param1->unk_0C[1], (((270 - 40) * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[2], (((270 + 40) * 0xffff) / 360), 1);
Easy3DObject_SetPosition(&param1->unk_0C[1], v0.x + (FX32_CONST(8)), v0.y, v0.z);
Easy3DObject_SetPosition(&param1->unk_0C[2], v0.x - (FX32_CONST(8)), v0.y, v0.z);
break;
case 1:
v0.z += (FX32_CONST(24));
v1.z += (FX32_CONST(11));
sub_02017388(&param1->unk_0C[1], (((90 - 40) * 0xffff) / 360), 1);
sub_02017388(&param1->unk_0C[2], (((90 + 40) * 0xffff) / 360), 1);
sub_02017350(&param1->unk_0C[1], v0.x - (FX32_CONST(8)), v0.y, v0.z);
sub_02017350(&param1->unk_0C[2], v0.x + (FX32_CONST(8)), v0.y, v0.z);
Easy3DObject_SetRotation(&param1->unk_0C[1], (((90 - 40) * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[2], (((90 + 40) * 0xffff) / 360), 1);
Easy3DObject_SetPosition(&param1->unk_0C[1], v0.x - (FX32_CONST(8)), v0.y, v0.z);
Easy3DObject_SetPosition(&param1->unk_0C[2], v0.x + (FX32_CONST(8)), v0.y, v0.z);
break;
case 2:
v0.x -= (FX32_CONST(23));
v1.x -= (FX32_CONST(7));
v1.z += (FX32_CONST(8));
sub_02017388(&param1->unk_0C[1], (((0 - 40) * 0xffff) / 360), 1);
sub_02017388(&param1->unk_0C[2], (((0 + 40) * 0xffff) / 360), 1);
sub_02017350(&param1->unk_0C[1], v0.x, v0.y, v0.z - (FX32_CONST(8)));
sub_02017350(&param1->unk_0C[2], v0.x, v0.y, v0.z + (FX32_CONST(8)));
Easy3DObject_SetRotation(&param1->unk_0C[1], (((0 - 40) * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[2], (((0 + 40) * 0xffff) / 360), 1);
Easy3DObject_SetPosition(&param1->unk_0C[1], v0.x, v0.y, v0.z - (FX32_CONST(8)));
Easy3DObject_SetPosition(&param1->unk_0C[2], v0.x, v0.y, v0.z + (FX32_CONST(8)));
break;
case 3:
v0.x += (FX32_CONST(23));
v1.x += (FX32_CONST(7));
v1.z += (FX32_CONST(8));
sub_02017388(&param1->unk_0C[1], (((180 - 40) * 0xffff) / 360), 1);
sub_02017388(&param1->unk_0C[2], (((180 + 40) * 0xffff) / 360), 1);
sub_02017350(&param1->unk_0C[1], v0.x, v0.y, v0.z + (FX32_CONST(8)));
sub_02017350(&param1->unk_0C[2], v0.x, v0.y, v0.z - (FX32_CONST(8)));
Easy3DObject_SetRotation(&param1->unk_0C[1], (((180 - 40) * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[2], (((180 + 40) * 0xffff) / 360), 1);
Easy3DObject_SetPosition(&param1->unk_0C[1], v0.x, v0.y, v0.z + (FX32_CONST(8)));
Easy3DObject_SetPosition(&param1->unk_0C[2], v0.x, v0.y, v0.z - (FX32_CONST(8)));
break;
default:
break;
}
sub_02017350(&param1->unk_0C[0], v1.x, v1.y, v1.z);
Easy3DObject_SetPosition(&param1->unk_0C[0], v1.x, v1.y, v1.z);
}
static void ov70_02269F30 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1)
@ -1333,7 +1333,7 @@ static void ov70_02269F30 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
ov70_02269828(param0, param1, 2, &Unk_ov70_0226E5A4[10]);
ov70_02269828(param0, param1, 3, &Unk_ov70_0226E5A4[11]);
sub_02017348(&param1->unk_0C[1], 0);
Easy3DObject_SetVisibility(&param1->unk_0C[1], 0);
param1->unk_954.val2.unk_04[0] = 8;
param1->unk_954.val2.unk_04[1] = 8;
@ -1352,53 +1352,53 @@ static void ov70_02269F30 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
v0.z -= (FX32_CONST(28));
v1.z -= (FX32_CONST(14));
sub_02017388(&param1->unk_0C[1], (((270 - 40) * 0xffff) / 360), 1);
sub_02017388(&param1->unk_0C[2], (((270 + 40) * 0xffff) / 360), 1);
sub_02017388(&param1->unk_0C[3], ((270 * 0xffff) / 360), 1);
sub_02017350(&param1->unk_0C[1], v0.x + (FX32_CONST(8)), v0.y, v0.z);
sub_02017350(&param1->unk_0C[2], v0.x - (FX32_CONST(8)), v0.y, v0.z);
sub_02017350(&param1->unk_0C[3], v0.x, v0.y, v0.z);
Easy3DObject_SetRotation(&param1->unk_0C[1], (((270 - 40) * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[2], (((270 + 40) * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[3], ((270 * 0xffff) / 360), 1);
Easy3DObject_SetPosition(&param1->unk_0C[1], v0.x + (FX32_CONST(8)), v0.y, v0.z);
Easy3DObject_SetPosition(&param1->unk_0C[2], v0.x - (FX32_CONST(8)), v0.y, v0.z);
Easy3DObject_SetPosition(&param1->unk_0C[3], v0.x, v0.y, v0.z);
break;
case 1:
v0.z += (FX32_CONST(24));
v1.z += (FX32_CONST(11));
sub_02017388(&param1->unk_0C[1], (((90 - 40) * 0xffff) / 360), 1);
sub_02017388(&param1->unk_0C[2], (((90 + 40) * 0xffff) / 360), 1);
sub_02017388(&param1->unk_0C[3], ((90 * 0xffff) / 360), 1);
sub_02017350(&param1->unk_0C[1], v0.x - (FX32_CONST(8)), v0.y, v0.z);
sub_02017350(&param1->unk_0C[2], v0.x + (FX32_CONST(8)), v0.y, v0.z);
sub_02017350(&param1->unk_0C[3], v0.x, v0.y, v0.z);
Easy3DObject_SetRotation(&param1->unk_0C[1], (((90 - 40) * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[2], (((90 + 40) * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[3], ((90 * 0xffff) / 360), 1);
Easy3DObject_SetPosition(&param1->unk_0C[1], v0.x - (FX32_CONST(8)), v0.y, v0.z);
Easy3DObject_SetPosition(&param1->unk_0C[2], v0.x + (FX32_CONST(8)), v0.y, v0.z);
Easy3DObject_SetPosition(&param1->unk_0C[3], v0.x, v0.y, v0.z);
break;
case 2:
v0.x -= (FX32_CONST(23));
v1.x -= (FX32_CONST(7));
v1.z += (FX32_CONST(8));
sub_02017388(&param1->unk_0C[1], (((0 - 40) * 0xffff) / 360), 1);
sub_02017388(&param1->unk_0C[2], (((0 + 40) * 0xffff) / 360), 1);
sub_02017388(&param1->unk_0C[3], ((0 * 0xffff) / 360), 1);
sub_02017350(&param1->unk_0C[1], v0.x, v0.y, v0.z - (FX32_CONST(8)));
sub_02017350(&param1->unk_0C[2], v0.x, v0.y, v0.z + (FX32_CONST(8)));
sub_02017350(&param1->unk_0C[3], v0.x, v0.y, v0.z);
Easy3DObject_SetRotation(&param1->unk_0C[1], (((0 - 40) * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[2], (((0 + 40) * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[3], ((0 * 0xffff) / 360), 1);
Easy3DObject_SetPosition(&param1->unk_0C[1], v0.x, v0.y, v0.z - (FX32_CONST(8)));
Easy3DObject_SetPosition(&param1->unk_0C[2], v0.x, v0.y, v0.z + (FX32_CONST(8)));
Easy3DObject_SetPosition(&param1->unk_0C[3], v0.x, v0.y, v0.z);
break;
case 3:
v0.x += (FX32_CONST(23));
v1.x += (FX32_CONST(7));
v1.z += (FX32_CONST(8));
sub_02017388(&param1->unk_0C[1], (((180 - 40) * 0xffff) / 360), 1);
sub_02017388(&param1->unk_0C[2], (((180 + 40) * 0xffff) / 360), 1);
sub_02017388(&param1->unk_0C[3], ((180 * 0xffff) / 360), 1);
sub_02017350(&param1->unk_0C[1], v0.x, v0.y, v0.z + (FX32_CONST(8)));
sub_02017350(&param1->unk_0C[2], v0.x, v0.y, v0.z - (FX32_CONST(8)));
sub_02017350(&param1->unk_0C[3], v0.x, v0.y, v0.z);
Easy3DObject_SetRotation(&param1->unk_0C[1], (((180 - 40) * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[2], (((180 + 40) * 0xffff) / 360), 1);
Easy3DObject_SetRotation(&param1->unk_0C[3], ((180 * 0xffff) / 360), 1);
Easy3DObject_SetPosition(&param1->unk_0C[1], v0.x, v0.y, v0.z + (FX32_CONST(8)));
Easy3DObject_SetPosition(&param1->unk_0C[2], v0.x, v0.y, v0.z - (FX32_CONST(8)));
Easy3DObject_SetPosition(&param1->unk_0C[3], v0.x, v0.y, v0.z);
break;
default:
break;
}
sub_02017350(&param1->unk_0C[0], v1.x, v1.y, v1.z);
Easy3DObject_SetPosition(&param1->unk_0C[0], v1.x, v1.y, v1.z);
}
static void ov70_0226A1FC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1)
@ -1552,7 +1552,7 @@ static BOOL ov70_0226A520 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
v3 = v0 % 3;
if (v3 < param1->unk_954.val4.unk_00) {
sub_02017348(&param1->unk_0C[v3], 1);
Easy3DObject_SetVisibility(&param1->unk_0C[v3], 1);
}
}
@ -1561,11 +1561,11 @@ static BOOL ov70_0226A520 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
v1 = 1;
for (v0 = 0; v0 < param1->unk_954.val4.unk_00; v0++) {
if (sub_0201734C(&param1->unk_0C[v0]) == 1) {
if (Easy3DObject_GetVisibility(&param1->unk_0C[v0]) == 1) {
v1 = ov70_022699D0(param0, param1, v0, 0);
if (v1) {
sub_02017348(&param1->unk_0C[v0], 0);
Easy3DObject_SetVisibility(&param1->unk_0C[v0], 0);
ov70_02269A90(param0, param1, v0, 0, 0);
}
}
@ -1606,10 +1606,10 @@ static BOOL ov70_0226A614 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
if (param1->unk_954.val6.unk_02 > v0) {
if (v0 > 0) {
sub_02017348(&param1->unk_0C[v0 - 1], 0);
Easy3DObject_SetVisibility(&param1->unk_0C[v0 - 1], 0);
}
sub_02017348(&param1->unk_0C[v0], 1);
Easy3DObject_SetVisibility(&param1->unk_0C[v0], 1);
}
}
@ -1620,7 +1620,7 @@ static BOOL ov70_0226A614 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
v2 = 0;
for (v1 = 0; v1 < param1->unk_954.val6.unk_02; v1++) {
if (sub_0201734C(&param1->unk_0C[v1])) {
if (Easy3DObject_GetVisibility(&param1->unk_0C[v1])) {
if (v1 == param1->unk_954.val6.unk_02 - 1) {
v2 = ov70_022699D0(param0, param1, v1, 0);
} else {
@ -1642,11 +1642,11 @@ static BOOL ov70_0226A6C8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
if (param1->unk_954.val2.unk_00 > 0) {
param1->unk_954.val2.unk_00--;
sub_02017348(&param1->unk_0C[0], 0);
Easy3DObject_SetVisibility(&param1->unk_0C[0], 0);
} else {
if (param1->unk_02 < 3) {
if (ov70_02269810(param1, param1->unk_02 + 1) == 1) {
sub_02017348(&param1->unk_0C[0], 1);
Easy3DObject_SetVisibility(&param1->unk_0C[0], 1);
v0 = ov70_022699D0(param0, param1, 0, 0);
if (v0 == 1) {
@ -1656,7 +1656,7 @@ static BOOL ov70_0226A6C8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
if (param1->unk_02 < 3) {
ov70_02269A90(param0, param1, 0, 0, 0);
} else {
sub_02017348(&param1->unk_0C[0], 0);
Easy3DObject_SetVisibility(&param1->unk_0C[0], 0);
}
}
}
@ -1668,7 +1668,7 @@ static BOOL ov70_0226A6C8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
for (v2 = 1; v2 <= 3; v2++) {
if (ov70_02269810(param1, v2) == 1) {
if (param1->unk_02 > (v2 - 1)) {
sub_02017348(&param1->unk_0C[v2], 1);
Easy3DObject_SetVisibility(&param1->unk_0C[v2], 1);
v0 = ov70_02269A3C(param0, param1, v2, 0, FX32_CONST(2.50f));
if (v0 == 0) {
@ -1680,7 +1680,7 @@ static BOOL ov70_0226A6C8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
v4 = v2 - 1;
if (param1->unk_954.val2.unk_04[v4] == 0) {
sub_02017348(&param1->unk_0C[v2], 0);
Easy3DObject_SetVisibility(&param1->unk_0C[v2], 0);
NNS_G3dMdlSetMdlAlphaAll(param0->unk_10550[param1->unk_87C[v2]->unk_00].model, 31);
} else {
param1->unk_954.val2.unk_04[v4]--;
@ -1741,18 +1741,18 @@ static BOOL ov70_0226A858 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
v1 += param1->unk_954.val3.unk_01 * 4;
for (v2 = param1->unk_954.val3.unk_03; v2 < v1; v2++) {
sub_02017348(&param1->unk_0C[v2], 1);
Easy3DObject_SetVisibility(&param1->unk_0C[v2], 1);
}
param1->unk_954.val3.unk_03 = v1;
}
for (v2 = 0; v2 < param1->unk_954.val3.unk_03; v2++) {
if (sub_0201734C(&param1->unk_0C[v2]) == 1) {
if (Easy3DObject_GetVisibility(&param1->unk_0C[v2]) == 1) {
v0 = ov70_0226B8C4(param0, param1, v2);
if (v0 == 1) {
sub_02017348(&param1->unk_0C[v2], 0);
Easy3DObject_SetVisibility(&param1->unk_0C[v2], 0);
}
}
}
@ -2008,7 +2008,7 @@ static void ov70_0226ADBC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
param1->unk_954.val1.unk_00 = 0;
for (v2 = 0; v2 < param1->unk_954.val1.unk_01; v2++) {
sub_02017358(&param1->unk_0C[v2], &v0.x, &v0.y, &v0.z);
Easy3DObject_GetPosition(&param1->unk_0C[v2], &v0.x, &v0.y, &v0.z);
v3 = param1->unk_954.val1.unk_0C[v2];
switch (v3) {
@ -2159,13 +2159,13 @@ static BOOL ov70_0226AF7C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
if (v7 == 0) {
ov70_022694D0(&param1->unk_954.val1.unk_14[v0]);
sub_02017358(&param1->unk_0C[v0], &v8.x, &v8.y, &v8.z);
Easy3DObject_GetPosition(&param1->unk_0C[v0], &v8.x, &v8.y, &v8.z);
ov70_02269488(&param1->unk_954.val1.unk_38[v0], &v8.x, &v8.y, &v8.z);
ov70_02269508(&param1->unk_954.val1.unk_14[v0], &v9);
v8.x += v9;
sub_02017350(&param1->unk_0C[v0], v8.x, v8.y, v8.z);
Easy3DObject_SetPosition(&param1->unk_0C[v0], v8.x, v8.y, v8.z);
} else {
v10 = ov70_0226B714(param0, param1, v0, 4);
@ -2262,17 +2262,17 @@ static void ov70_0226B324 (UnkStruct_ov70_02269800 * param0)
switch (param0->unk_954.val1.unk_01) {
case 1:
sub_02017350(&param0->unk_0C[0], v0.x + FX32_CONST(Unk_ov70_0226E328[2].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E328[2].unk_02), v0.z + (FX32_CONST(1)));
Easy3DObject_SetPosition(&param0->unk_0C[0], v0.x + FX32_CONST(Unk_ov70_0226E328[2].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E328[2].unk_02), v0.z + (FX32_CONST(1)));
break;
case 2:
sub_02017350(&param0->unk_0C[0], v0.x + FX32_CONST(Unk_ov70_0226E328[0].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E328[0].unk_02), v0.z + (FX32_CONST(1)));
sub_02017350(&param0->unk_0C[1], v0.x + FX32_CONST(Unk_ov70_0226E328[1].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E328[1].unk_02), v0.z + (FX32_CONST(1)));
Easy3DObject_SetPosition(&param0->unk_0C[0], v0.x + FX32_CONST(Unk_ov70_0226E328[0].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E328[0].unk_02), v0.z + (FX32_CONST(1)));
Easy3DObject_SetPosition(&param0->unk_0C[1], v0.x + FX32_CONST(Unk_ov70_0226E328[1].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E328[1].unk_02), v0.z + (FX32_CONST(1)));
break;
default:
case 3:
sub_02017350(&param0->unk_0C[0], v0.x + FX32_CONST(Unk_ov70_0226E328[2].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E328[2].unk_02), v0.z + (FX32_CONST(1)));
sub_02017350(&param0->unk_0C[1], v0.x + FX32_CONST(Unk_ov70_0226E328[0].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E328[0].unk_02), v0.z + (FX32_CONST(1)));
sub_02017350(&param0->unk_0C[2], v0.x + FX32_CONST(Unk_ov70_0226E328[1].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E328[1].unk_02), v0.z + (FX32_CONST(1)));
Easy3DObject_SetPosition(&param0->unk_0C[0], v0.x + FX32_CONST(Unk_ov70_0226E328[2].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E328[2].unk_02), v0.z + (FX32_CONST(1)));
Easy3DObject_SetPosition(&param0->unk_0C[1], v0.x + FX32_CONST(Unk_ov70_0226E328[0].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E328[0].unk_02), v0.z + (FX32_CONST(1)));
Easy3DObject_SetPosition(&param0->unk_0C[2], v0.x + FX32_CONST(Unk_ov70_0226E328[1].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E328[1].unk_02), v0.z + (FX32_CONST(1)));
break;
}
}
@ -2285,17 +2285,17 @@ static void ov70_0226B51C (UnkStruct_ov70_02269800 * param0)
switch (param0->unk_954.val1.unk_01) {
case 1:
sub_02017350(&param0->unk_0C[0], v0.x + FX32_CONST(Unk_ov70_0226E340[2].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E340[2].unk_02), v0.z + (-FX32_CONST(8)));
Easy3DObject_SetPosition(&param0->unk_0C[0], v0.x + FX32_CONST(Unk_ov70_0226E340[2].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E340[2].unk_02), v0.z + (-FX32_CONST(8)));
break;
case 2:
sub_02017350(&param0->unk_0C[0], v0.x + FX32_CONST(Unk_ov70_0226E340[0].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E340[0].unk_02), v0.z + (-FX32_CONST(8)));
sub_02017350(&param0->unk_0C[1], v0.x + FX32_CONST(Unk_ov70_0226E340[1].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E340[1].unk_02), v0.z + (-FX32_CONST(8)));
Easy3DObject_SetPosition(&param0->unk_0C[0], v0.x + FX32_CONST(Unk_ov70_0226E340[0].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E340[0].unk_02), v0.z + (-FX32_CONST(8)));
Easy3DObject_SetPosition(&param0->unk_0C[1], v0.x + FX32_CONST(Unk_ov70_0226E340[1].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E340[1].unk_02), v0.z + (-FX32_CONST(8)));
break;
default:
case 3:
sub_02017350(&param0->unk_0C[0], v0.x + FX32_CONST(Unk_ov70_0226E340[2].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E340[2].unk_02), v0.z + (-FX32_CONST(8)));
sub_02017350(&param0->unk_0C[1], v0.x + FX32_CONST(Unk_ov70_0226E340[0].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E340[0].unk_02), v0.z + (-FX32_CONST(8)));
sub_02017350(&param0->unk_0C[2], v0.x + FX32_CONST(Unk_ov70_0226E340[1].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E340[1].unk_02), v0.z + (-FX32_CONST(8)));
Easy3DObject_SetPosition(&param0->unk_0C[0], v0.x + FX32_CONST(Unk_ov70_0226E340[2].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E340[2].unk_02), v0.z + (-FX32_CONST(8)));
Easy3DObject_SetPosition(&param0->unk_0C[1], v0.x + FX32_CONST(Unk_ov70_0226E340[0].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E340[0].unk_02), v0.z + (-FX32_CONST(8)));
Easy3DObject_SetPosition(&param0->unk_0C[2], v0.x + FX32_CONST(Unk_ov70_0226E340[1].unk_00), v0.y + FX32_CONST(Unk_ov70_0226E340[1].unk_02), v0.z + (-FX32_CONST(8)));
break;
}
}
@ -2328,7 +2328,7 @@ static void ov70_0226B744 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
if (v1 != 4) {
v0 = (v1 * (FX32_ONE * 2));
} else {
sub_02017348(&param1->unk_0C[param2], 0);
Easy3DObject_SetVisibility(&param1->unk_0C[param2], 0);
}
}
@ -2363,8 +2363,8 @@ static void ov70_0226B7B0 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
ov70_02269828(param0, param1, v5, &Unk_ov70_0226E5A4[v6]);
VEC_Add(&v2, &Unk_ov70_0226E370[v1], &v3);
VEC_Add(&v3, &Unk_ov70_0226E3A0[v1], &v4);
sub_02017350(&param1->unk_0C[v5], v3.x, v3.y, v3.z);
sub_02017348(&param1->unk_0C[v5], 0);
Easy3DObject_SetPosition(&param1->unk_0C[v5], v3.x, v3.y, v3.z);
Easy3DObject_SetVisibility(&param1->unk_0C[v5], 0);
param1->unk_954.val3.unk_04[v5] = 0;
ov70_022692B4(&param1->unk_954.val3.unk_14[v5], v3.x, v4.x, v3.y, v4.y, v3.z, v4.z, 14);
}
@ -2386,7 +2386,7 @@ static BOOL ov70_0226B8C4 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
v0 = ov70_022692DC(&param1->unk_954.val3.unk_14[param2], param1->unk_954.val3.unk_04[param2]);
ov70_02269488(&param1->unk_954.val3.unk_14[param2], &v1.x, &v1.y, &v1.z);
sub_02017350(&param1->unk_0C[param2], v1.x, v1.y, v1.z);
Easy3DObject_SetPosition(&param1->unk_0C[param2], v1.x, v1.y, v1.z);
ov70_022699BC(param0, param1, param2, 0);
return v0;
@ -2404,8 +2404,8 @@ static void ov70_0226B92C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
v1.y += (FX32_CONST(8));
v1.z += (FX32_CONST(6));
sub_02017350(&param1->unk_0C[v0], v1.x, v1.y, v1.z);
sub_02017348(&param1->unk_0C[v0], 0);
Easy3DObject_SetPosition(&param1->unk_0C[v0], v1.x, v1.y, v1.z);
Easy3DObject_SetVisibility(&param1->unk_0C[v0], 0);
}
param1->unk_954.val4.unk_00 = param2;
@ -2424,7 +2424,7 @@ static BOOL ov70_0226B998 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
if (v1 > 0) {
v2 = Unk_ov70_0226E514[param2][v1 - 1];
sub_02017348(&param1->unk_0C[v2.unk_00], 0);
Easy3DObject_SetVisibility(&param1->unk_0C[v2.unk_00], 0);
}
v2 = Unk_ov70_0226E514[param2][v1];
@ -2432,9 +2432,9 @@ static BOOL ov70_0226B998 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
if (0 != v2.unk_02) {
ov70_02269A90(param0, param1, v2.unk_00, 0, FX32_CONST(v2.unk_02));
ov70_02269A90(param0, param1, v2.unk_00, 1, FX32_CONST(v2.unk_02));
sub_02017348(&param1->unk_0C[v2.unk_00], 1);
Easy3DObject_SetVisibility(&param1->unk_0C[v2.unk_00], 1);
} else {
sub_02017348(&param1->unk_0C[v2.unk_00], 0);
Easy3DObject_SetVisibility(&param1->unk_0C[v2.unk_00], 0);
}
}
@ -2460,8 +2460,8 @@ static void ov70_0226BAC8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
v1.y += (FX32_CONST(8));
sub_02017350(&param1->unk_0C[v0], v1.x, v1.y, v1.z);
sub_02017348(&param1->unk_0C[v0], 0);
Easy3DObject_SetPosition(&param1->unk_0C[v0], v1.x, v1.y, v1.z);
Easy3DObject_SetVisibility(&param1->unk_0C[v0], 0);
}
param1->unk_954.val6.unk_00 = 0xff;
@ -2481,7 +2481,7 @@ static void ov70_0226BB34 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
for (v1 = 0; v1 < 2; v1++) {
ov70_02269828(param0, param1, 16 + v1, &Unk_ov70_0226E5A4[37 + v1]);
sub_02017350(&param1->unk_0C[v1 + 16], v0.x + (v1 * (FX32_CONST(24))), v0.y, v0.z);
Easy3DObject_SetPosition(&param1->unk_0C[v1 + 16], v0.x + (v1 * (FX32_CONST(24))), v0.y, v0.z);
}
}
@ -2493,7 +2493,7 @@ static void ov70_0226BBA8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
param1->unk_954.val7.unk_3BA = 0;
for (v0 = 0; v0 < 2; v0++) {
sub_02017348(&param1->unk_0C[v0 + 16], 1);
Easy3DObject_SetVisibility(&param1->unk_0C[v0 + 16], 1);
}
}
@ -2515,7 +2515,7 @@ static void ov70_0226BBDC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226
if (param1->unk_954.val7.unk_3BA < 13) {
ov70_022699BC(param0, param1, v0 + 16, 0);
} else {
sub_02017348(&param1->unk_0C[v0 + 16], 0);
Easy3DObject_SetVisibility(&param1->unk_0C[v0 + 16], 0);
}
}
}
@ -2590,7 +2590,7 @@ static void ov70_0226BDA0 (UnkStruct_ov70_0226BD64 * param0, u32 param1)
};
for (v0 = 0; v0 < param1; v0++) {
sub_02017348(param0->unk_D8[v0], 1);
Easy3DObject_SetVisibility(param0->unk_D8[v0], 1);
}
param0->unk_00 = 0;
@ -2619,7 +2619,7 @@ static BOOL ov70_0226BDE8 (UnkStruct_ov70_0226BD64 * param0)
if (v1 == 1) {
for (v0 = 0; v0 < param0->unk_04; v0++) {
sub_02017348(param0->unk_D8[v0], 0);
Easy3DObject_SetVisibility(param0->unk_D8[v0], 0);
}
param0->unk_06 = 0;
@ -2671,7 +2671,7 @@ static void ov70_0226BE3C (UnkStruct_ov70_0226BD64 * param0, const UnkStruct_ov7
ov70_022692B4(&param0->unk_08[v0], v1.x, v2.x, v1.y, v2.y, v1.z, v2.z, 18);
ov70_0226949C(&param0->unk_A8[v0], v3, (((18 * 0xffff) / 360)), (FX32_CONST(6)));
sub_02017350(param0->unk_D8[v0], v1.x, v1.y, v1.z);
Easy3DObject_SetPosition(param0->unk_D8[v0], v1.x, v1.y, v1.z);
}
}
@ -2692,7 +2692,7 @@ static BOOL ov70_0226BF5C (UnkStruct_ov70_0226BD64 * param0)
v2.x += v3;
sub_02017350(param0->unk_D8[v0], v2.x, v2.y, v2.z);
Easy3DObject_SetPosition(param0->unk_D8[v0], v2.x, v2.y, v2.z);
}
return v1;
@ -2767,7 +2767,7 @@ static BOOL ov70_0226C0D8 (UnkStruct_ov70_0226BD64 * param0)
v2.y += v3;
sub_02017350(param0->unk_D8[v0], v2.x, v2.y, v2.z);
Easy3DObject_SetPosition(param0->unk_D8[v0], v2.x, v2.y, v2.z);
}
if (param0->unk_00 >= (14 + 8)) {
@ -2804,7 +2804,7 @@ static BOOL ov70_0226C1DC (UnkStruct_ov70_0226BD64 * param0)
v1 = ov70_022692DC(&param0->unk_08[v0], param0->unk_00);
ov70_02269488(&param0->unk_08[v0], &v2.x, &v2.y, &v2.z);
sub_02017350(param0->unk_D8[v0], v2.x, v2.y, v2.z);
Easy3DObject_SetPosition(param0->unk_D8[v0], v2.x, v2.y, v2.z);
if (v1 == 1) {
if (param0->unk_07 == 0) {
@ -2855,5 +2855,5 @@ static void ov70_0226C2A4 (UnkStruct_ov70_0226BD64 * param0, u32 param1, const V
}
ov70_022692B4(&param0->unk_08[param1], param2->x, v0.x, param2->y, v0.y, param2->z, v0.z, param7);
sub_02017350(param0->unk_D8[param1], param2->x, param2->y, param2->z);
Easy3DObject_SetPosition(param0->unk_D8[param1], param2->x, param2->y, param2->z);
}

30
src/overlay077/ov77_021D0D80.c
View File

@ -458,14 +458,14 @@ static void ov77_021D1300 (UnkStruct_ov77_021D1208 * param0, int param1)
Easy3DAnim_LoadFrom(&param0->unk_13C, &param0->unk_150, v0, 20, param1, &param0->unk_70);
Easy3DAnim_SetFrame(&param0->unk_13C, 0);
sub_02017258(&param0->unk_B0, &param0->unk_150);
Easy3DObject_Init(&param0->unk_B0, &param0->unk_150);
sub_02017350(&param0->unk_B0, 0, 0, 0);
sub_0201736C(&param0->unk_B0, (FX32_ONE), (FX32_ONE), (FX32_ONE));
sub_02017348(&param0->unk_B0, 1);
Easy3DObject_SetPosition(&param0->unk_B0, 0, 0, 0);
Easy3DObject_SetScale(&param0->unk_B0, (FX32_ONE), (FX32_ONE), (FX32_ONE));
Easy3DObject_SetVisibility(&param0->unk_B0, 1);
sub_0201727C(&param0->unk_B0, &param0->unk_128);
sub_0201727C(&param0->unk_B0, &param0->unk_13C);
Easy3DObject_AddAnim(&param0->unk_B0, &param0->unk_128);
Easy3DObject_AddAnim(&param0->unk_B0, &param0->unk_13C);
}
{
@ -479,14 +479,14 @@ static void ov77_021D1300 (UnkStruct_ov77_021D1208 * param0, int param1)
Easy3DAnim_LoadFrom(&param0->unk_1EC, &param0->unk_200, v0, 17, param1, &param0->unk_70);
Easy3DAnim_SetFrame(&param0->unk_1EC, 0);
sub_02017258(&param0->unk_160, &param0->unk_200);
Easy3DObject_Init(&param0->unk_160, &param0->unk_200);
sub_02017350(&param0->unk_160, 0, 0, 0);
sub_0201736C(&param0->unk_160, (FX32_ONE), (FX32_ONE), (FX32_ONE));
sub_02017348(&param0->unk_160, 1);
Easy3DObject_SetPosition(&param0->unk_160, 0, 0, 0);
Easy3DObject_SetScale(&param0->unk_160, (FX32_ONE), (FX32_ONE), (FX32_ONE));
Easy3DObject_SetVisibility(&param0->unk_160, 1);
sub_0201727C(&param0->unk_160, &param0->unk_1D8);
sub_0201727C(&param0->unk_160, &param0->unk_1EC);
Easy3DObject_AddAnim(&param0->unk_160, &param0->unk_1D8);
Easy3DObject_AddAnim(&param0->unk_160, &param0->unk_1EC);
}
NARC_dtor(v0);
@ -618,12 +618,12 @@ static void ov77_021D1704 (UnkStruct_ov77_021D1208 * param0)
NNS_G3dGePushMtx();
{
sub_02017294(&param0->unk_160);
Easy3DObject_Draw(&param0->unk_160);
if ((param0->unk_224 != 2) || (param0->unk_225 != 2)) {
sub_02017294(&param0->unk_B0);
Easy3DObject_Draw(&param0->unk_B0);
} else {
sub_02017348(&param0->unk_B0, 0);
Easy3DObject_SetVisibility(&param0->unk_B0, 0);
}
}

2
src/overlay099/ov99_021D0D80.c
View File

@ -745,7 +745,7 @@ static void ov99_021D1720 (UnkStruct_ov99_021D2CB0 * param0)
for (v3 = 0; v3 < 2; v3++) {
for (v4 = 0; v4 < 16; v4++) {
sub_02017294(&param0->unk_6C[v3][v4]);
Easy3DObject_Draw(&param0->unk_6C[v3][v4]);
}
}
}

42
src/overlay099/ov99_021D1A54.c
View File

@ -562,17 +562,17 @@ static void ov99_021D1FD8 (UnkStruct_ov99_021D2CB0 * param0)
NNS_G3dMdlUseGlbEmi(param0->unk_2C[1].model);
for (v0 = 0; v0 < 16; v0++) {
sub_02017258(&param0->unk_6C[0][v0], &param0->unk_2C[0]);
sub_02017350(&param0->unk_6C[0][v0], 0, 0, 0);
sub_0201736C(&param0->unk_6C[0][v0], FX32_ONE, FX32_ONE, FX32_ONE);
sub_02017348(&param0->unk_6C[0][v0], 1);
Easy3DObject_Init(&param0->unk_6C[0][v0], &param0->unk_2C[0]);
Easy3DObject_SetPosition(&param0->unk_6C[0][v0], 0, 0, 0);
Easy3DObject_SetScale(&param0->unk_6C[0][v0], FX32_ONE, FX32_ONE, FX32_ONE);
Easy3DObject_SetVisibility(&param0->unk_6C[0][v0], 1);
}
for (v0 = 0; v0 < 16; v0++) {
sub_02017258(&param0->unk_6C[1][v0], &param0->unk_2C[1]);
sub_02017350(&param0->unk_6C[1][v0], 0, 0, 0);
sub_0201736C(&param0->unk_6C[1][v0], FX32_ONE, FX32_ONE, FX32_ONE);
sub_02017348(&param0->unk_6C[1][v0], 1);
Easy3DObject_Init(&param0->unk_6C[1][v0], &param0->unk_2C[1]);
Easy3DObject_SetPosition(&param0->unk_6C[1][v0], 0, 0, 0);
Easy3DObject_SetScale(&param0->unk_6C[1][v0], FX32_ONE, FX32_ONE, FX32_ONE);
Easy3DObject_SetVisibility(&param0->unk_6C[1][v0], 1);
}
param0->unk_1104 = 2;
@ -771,14 +771,14 @@ static void ov99_021D2410 (UnkStruct_ov99_021D2CB0 * param0)
NNS_G3dMdlUseGlbEmi(param0->unk_2C[0].model);
for (v0 = 0; v0 < 16; v0++) {
sub_02017258(&param0->unk_6C[0][v0], &param0->unk_2C[0]);
sub_02017350(&param0->unk_6C[0][v0], 0, 0, 0);
sub_0201736C(&param0->unk_6C[0][v0], FX32_ONE, FX32_ONE, FX32_ONE);
sub_02017348(&param0->unk_6C[0][v0], 1);
Easy3DObject_Init(&param0->unk_6C[0][v0], &param0->unk_2C[0]);
Easy3DObject_SetPosition(&param0->unk_6C[0][v0], 0, 0, 0);
Easy3DObject_SetScale(&param0->unk_6C[0][v0], FX32_ONE, FX32_ONE, FX32_ONE);
Easy3DObject_SetVisibility(&param0->unk_6C[0][v0], 1);
}
for (v0 = 0; v0 < 16; v0++) {
sub_02017348(&param0->unk_6C[1][v0], 0);
Easy3DObject_SetVisibility(&param0->unk_6C[1][v0], 0);
}
param0->unk_1104 = 1;
@ -955,19 +955,19 @@ static void ov99_021D28AC (UnkStruct_ov99_021D2CB0 * param0)
Easy3DModel_LoadFrom(&param0->unk_2C[3], param0->unk_10F8, 79, 75);
for (v0 = 0; v0 < 16; v0++) {
sub_02017258(&param0->unk_6C[0][v0], &param0->unk_2C[0]);
Easy3DObject_Init(&param0->unk_6C[0][v0], &param0->unk_2C[0]);
sub_02017350(&param0->unk_6C[0][v0], 0, 0, 0);
sub_0201736C(&param0->unk_6C[0][v0], FX32_ONE, FX32_ONE, FX32_ONE);
sub_02017348(&param0->unk_6C[0][v0], 1);
Easy3DObject_SetPosition(&param0->unk_6C[0][v0], 0, 0, 0);
Easy3DObject_SetScale(&param0->unk_6C[0][v0], FX32_ONE, FX32_ONE, FX32_ONE);
Easy3DObject_SetVisibility(&param0->unk_6C[0][v0], 1);
}
for (v0 = 0; v0 < 16; v0++) {
sub_02017258(&param0->unk_6C[1][v0], &param0->unk_2C[2]);
Easy3DObject_Init(&param0->unk_6C[1][v0], &param0->unk_2C[2]);
sub_02017350(&param0->unk_6C[1][v0], 0, 0, 0);
sub_0201736C(&param0->unk_6C[1][v0], FX32_ONE, FX32_ONE, FX32_ONE);
sub_02017348(&param0->unk_6C[1][v0], 1);
Easy3DObject_SetPosition(&param0->unk_6C[1][v0], 0, 0, 0);
Easy3DObject_SetScale(&param0->unk_6C[1][v0], FX32_ONE, FX32_ONE, FX32_ONE);
Easy3DObject_SetVisibility(&param0->unk_6C[1][v0], 1);
}
param0->unk_1104 = 2;

4
src/overlay099/ov99_021D340C.c
View File

@ -93,7 +93,7 @@ BOOL ov99_021D340C (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 *
int v2;
for (v2 = 0; v2 < 16; v2++) {
MI_CpuClear8(&param0->unk_6C[0][v2].unk_00, sizeof(NNSG3dRenderObj));
MI_CpuClear8(&param0->unk_6C[0][v2].renderObj, sizeof(NNSG3dRenderObj));
if (v2 % 8 == 0) {
v1 = 3;
@ -103,7 +103,7 @@ BOOL ov99_021D340C (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 *
v1 = Unk_ov99_021D4CAC[v2];
}
NNS_G3dRenderObjInit(&param0->unk_6C[0][v2].unk_00, param0->unk_2C[v1].model);
NNS_G3dRenderObjInit(&param0->unk_6C[0][v2].renderObj, param0->unk_2C[v1].model);
}
v0->unk_120 = 16;

24
src/overlay099/ov99_021D4134.c
View File

@ -100,15 +100,15 @@ void ov99_021D4170 (UnkStruct_ov99_021D2CB0 * param0)
GF_ASSERT(v2->unk_00 <= 16);
for (v0 = 0; v0 < v2->unk_00; v0++) {
sub_02017350(&param0->unk_6C[v1][v0], v2->unk_04 - v2->unk_08 * v0, v2->unk_0C - v2->unk_10 * v0, v2->unk_14 - v2->unk_18 * v0);
sub_0201736C(&param0->unk_6C[v1][v0], FX32_ONE, FX32_ONE, FX32_ONE);
sub_02017348(&param0->unk_6C[v1][v0], 1);
Easy3DObject_SetPosition(&param0->unk_6C[v1][v0], v2->unk_04 - v2->unk_08 * v0, v2->unk_0C - v2->unk_10 * v0, v2->unk_14 - v2->unk_18 * v0);
Easy3DObject_SetScale(&param0->unk_6C[v1][v0], FX32_ONE, FX32_ONE, FX32_ONE);
Easy3DObject_SetVisibility(&param0->unk_6C[v1][v0], 1);
}
for ( ; v0 < 16; v0++) {
sub_02017350(&param0->unk_6C[v1][v0], 0, (-64 * FX32_ONE), (-50 * FX32_ONE));
sub_0201736C(&param0->unk_6C[v1][v0], FX32_ONE, FX32_ONE, FX32_ONE);
sub_02017348(&param0->unk_6C[v1][v0], 0);
Easy3DObject_SetPosition(&param0->unk_6C[v1][v0], 0, (-64 * FX32_ONE), (-50 * FX32_ONE));
Easy3DObject_SetScale(&param0->unk_6C[v1][v0], FX32_ONE, FX32_ONE, FX32_ONE);
Easy3DObject_SetVisibility(&param0->unk_6C[v1][v0], 0);
}
}
}
@ -128,23 +128,23 @@ BOOL ov99_021D425C (UnkStruct_ov99_021D2CB0 * param0, s32 param1)
v2 = v8->unk_18 * v8->unk_00 / v8->unk_02;
for (v7 = 0; v7 < v8->unk_00; v7++) {
sub_02017358(&param0->unk_6C[v6][v7], &v3, &v4, &v5);
Easy3DObject_GetPosition(&param0->unk_6C[v6][v7], &v3, &v4, &v5);
if (v3 + v0 >= v8->unk_04) {
sub_02017350(&param0->unk_6C[v6][v7], v3 + v0 - v8->unk_08 * v8->unk_00, v4 + v1 - v8->unk_10 * v8->unk_00, v5 + v2 - v8->unk_18 * v8->unk_00);
Easy3DObject_SetPosition(&param0->unk_6C[v6][v7], v3 + v0 - v8->unk_08 * v8->unk_00, v4 + v1 - v8->unk_10 * v8->unk_00, v5 + v2 - v8->unk_18 * v8->unk_00);
if ((param1 != -1) && (v6 == 0)) {
MI_CpuClear8(&param0->unk_6C[v6][v7].unk_00, sizeof(NNSG3dRenderObj));
MI_CpuClear8(&param0->unk_6C[v6][v7].renderObj, sizeof(NNSG3dRenderObj));
NNS_G3dRenderObjInit(
&param0->unk_6C[v6][v7].unk_00, param0->unk_2C[param1].model);
&param0->unk_6C[v6][v7].renderObj, param0->unk_2C[param1].model);
}
v9 = 1;
} else {
sub_02017350(&param0->unk_6C[v6][v7], v3 + v0, v4 + v1, v5 + v2);
Easy3DObject_SetPosition(&param0->unk_6C[v6][v7], v3 + v0, v4 + v1, v5 + v2);
}
sub_02017348(&param0->unk_6C[v6][v7], 1);
Easy3DObject_SetVisibility(&param0->unk_6C[v6][v7], 1);
}
}

10
src/overlay100/ov100_021D13E4.c
View File

@ -111,7 +111,7 @@ BOOL ov100_021D14A8 (void * param0)
v0->unk_00 = 2;
break;
case 2:
sub_02017348(&v0->unk_1A4.unk_00[v0->unk_08].unk_00, 1);
Easy3DObject_SetVisibility(&v0->unk_1A4.unk_00[v0->unk_08].unk_00, 1);
v0->unk_1A4.unk_00[v0->unk_08].unk_160 = 1;
v0->unk_1A4.unk_00[v0->unk_08].unk_16C = 1;
v0->unk_00++;
@ -137,7 +137,7 @@ BOOL ov100_021D14A8 (void * param0)
G2_SetBlendBrightness((GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), v0->unk_7C4->unk_50.unk_03);
} else {
v0->unk_0C.unk_0C[v0->unk_08].unk_3C = 1;
sub_02017348(&v0->unk_1A4.unk_00[v0->unk_08].unk_00, 0);
Easy3DObject_SetVisibility(&v0->unk_1A4.unk_00[v0->unk_08].unk_00, 0);
v0->unk_00++;
v0->unk_08++;
@ -266,9 +266,9 @@ static void ov100_021D1808 (UnkStruct_ov100_021D1808 * param0)
ov100_021D4B4C(0, &param0->unk_1A4.unk_00[2], 15, param0->unk_7C4->unk_00, &param0->unk_7C4->unk_1C);
ov100_021D4B4C(1, &param0->unk_1A4.unk_00[2], 16, param0->unk_7C4->unk_00, &param0->unk_7C4->unk_1C);
sub_02017348(&param0->unk_1A4.unk_00[0].unk_00, 1);
sub_02017348(&param0->unk_1A4.unk_00[1].unk_00, 0);
sub_02017348(&param0->unk_1A4.unk_00[2].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_1A4.unk_00[0].unk_00, 1);
Easy3DObject_SetVisibility(&param0->unk_1A4.unk_00[1].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_1A4.unk_00[2].unk_00, 0);
}
static void ov100_021D1A24 (UnkStruct_ov100_021D1808 * param0)

92
src/overlay100/ov100_021D1C44.c
View File

@ -95,7 +95,7 @@ static void ov100_021D1C98 (UnkStruct_ov100_021D1C98 * param0)
for (v6 = 0; v6 < 4; v6++) {
ov100_021D4AC8(&param0->unk_1A0.unk_16FC[v6], 65, param0->unk_1EBC->unk_00);
sub_0201736C(&param0->unk_1A0.unk_16FC[v6].unk_00, FX32_CONST(1.2), FX32_CONST(1.0), FX32_CONST(1.2));
Easy3DObject_SetScale(&param0->unk_1A0.unk_16FC[v6].unk_00, FX32_CONST(1.2), FX32_CONST(1.0), FX32_CONST(1.2));
}
}
@ -112,7 +112,7 @@ static void ov100_021D1C98 (UnkStruct_ov100_021D1C98 * param0)
ov100_021D4B4C(1, &param0->unk_1A0.unk_18C, 56, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
ov100_021D4AC8(&param0->unk_1A0.unk_624[0], 66, param0->unk_1EBC->unk_00);
sub_02017350(&param0->unk_1A0.unk_624[0].unk_00, FX32_CONST(-50), FX32_CONST(+0), FX32_CONST(-50));
Easy3DObject_SetPosition(&param0->unk_1A0.unk_624[0].unk_00, FX32_CONST(-50), FX32_CONST(+0), FX32_CONST(-50));
ov100_021D4B4C(0, &param0->unk_1A0.unk_624[0], 67, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
param0->unk_1A0.unk_624[0].unk_160 = 1;
@ -120,7 +120,7 @@ static void ov100_021D1C98 (UnkStruct_ov100_021D1C98 * param0)
param0->unk_1A0.unk_624[0].unk_154 = FX32_HALF;
ov100_021D4AC8(&param0->unk_1A0.unk_624[1], 68, param0->unk_1EBC->unk_00);
sub_02017350(&param0->unk_1A0.unk_624[1].unk_00, FX32_CONST(+50), FX32_CONST(+0), FX32_CONST(-50));
Easy3DObject_SetPosition(&param0->unk_1A0.unk_624[1].unk_00, FX32_CONST(+50), FX32_CONST(+0), FX32_CONST(-50));
ov100_021D4B4C(0, &param0->unk_1A0.unk_624[1], 69, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
param0->unk_1A0.unk_624[1].unk_160 = 1;
@ -128,46 +128,46 @@ static void ov100_021D1C98 (UnkStruct_ov100_021D1C98 * param0)
param0->unk_1A0.unk_624[1].unk_154 = FX32_HALF;
ov100_021D4AC8(&param0->unk_1A0.unk_934[0], 26, param0->unk_1EBC->unk_00);
sub_02017350(&param0->unk_1A0.unk_934[0].unk_00, FX32_CONST(0), FX32_CONST(-90), FX32_CONST(0));
sub_02017348(&param0->unk_1A0.unk_934[0].unk_00, 0);
Easy3DObject_SetPosition(&param0->unk_1A0.unk_934[0].unk_00, FX32_CONST(0), FX32_CONST(-90), FX32_CONST(0));
Easy3DObject_SetVisibility(&param0->unk_1A0.unk_934[0].unk_00, 0);
ov100_021D4B4C(0, &param0->unk_1A0.unk_934[0], 25, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
ov100_021D4B4C(1, &param0->unk_1A0.unk_934[0], 27, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
param0->unk_1A0.unk_934[0].unk_168 = 1;
ov100_021D4AC8(&param0->unk_1A0.unk_934[1], 29, param0->unk_1EBC->unk_00);
sub_02017348(&param0->unk_1A0.unk_934[1].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_1A0.unk_934[1].unk_00, 0);
ov100_021D4B4C(0, &param0->unk_1A0.unk_934[1], 28, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
ov100_021D4B4C(1, &param0->unk_1A0.unk_934[1], 30, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
param0->unk_1A0.unk_934[1].unk_168 = 1;
ov100_021D4AC8(&param0->unk_1A0.unk_934[2], 32, param0->unk_1EBC->unk_00);
sub_02017348(&param0->unk_1A0.unk_934[2].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_1A0.unk_934[2].unk_00, 0);
ov100_021D4B4C(0, &param0->unk_1A0.unk_934[2], 31, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
ov100_021D4B4C(1, &param0->unk_1A0.unk_934[2], 33, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
param0->unk_1A0.unk_934[2].unk_168 = 1;
ov100_021D4AC8(&param0->unk_1A0.unk_934[3], 35, param0->unk_1EBC->unk_00);
sub_02017348(&param0->unk_1A0.unk_934[3].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_1A0.unk_934[3].unk_00, 0);
ov100_021D4B4C(0, &param0->unk_1A0.unk_934[3], 34, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
ov100_021D4B4C(1, &param0->unk_1A0.unk_934[3], 36, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
param0->unk_1A0.unk_934[3].unk_168 = 1;
ov100_021D4AC8(&param0->unk_1A0.unk_934[4], 38, param0->unk_1EBC->unk_00);
sub_02017348(&param0->unk_1A0.unk_934[4].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_1A0.unk_934[4].unk_00, 0);
ov100_021D4B4C(0, &param0->unk_1A0.unk_934[4], 37, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
ov100_021D4B4C(1, &param0->unk_1A0.unk_934[4], 39, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
param0->unk_1A0.unk_934[4].unk_168 = 1;
ov100_021D4AC8(&param0->unk_1A0.unk_10DC[0], 41, param0->unk_1EBC->unk_00);
sub_02017348(&param0->unk_1A0.unk_10DC[0].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_1A0.unk_10DC[0].unk_00, 0);
ov100_021D4B4C(0, &param0->unk_1A0.unk_10DC[0], 40, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
ov100_021D4AC8(&param0->unk_1A0.unk_10DC[1], 42, param0->unk_1EBC->unk_00);
sub_02017348(&param0->unk_1A0.unk_10DC[1].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_1A0.unk_10DC[1].unk_00, 0);
if (TrainerInfo_Gender(param0->unk_1EC0->unk_08) != 1) {
ov100_021D4AC8(&param0->unk_1A0.unk_13EC[0], 61, param0->unk_1EBC->unk_00);
@ -177,14 +177,14 @@ static void ov100_021D1C98 (UnkStruct_ov100_021D1C98 * param0)
ov100_021D4B4C(0, &param0->unk_1A0.unk_13EC[0], 64, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
}
sub_02017350(&param0->unk_1A0.unk_13EC[0].unk_00, FX32_CONST(1), FX32_CONST(+0), FX32_CONST(+140));
Easy3DObject_SetPosition(&param0->unk_1A0.unk_13EC[0].unk_00, FX32_CONST(1), FX32_CONST(+0), FX32_CONST(+140));
param0->unk_1A0.unk_13EC[0].unk_164 = 1;
param0->unk_1A0.unk_13EC[0].unk_154 = (FX32_HALF >> 1);
param0->unk_1A0.unk_13EC[0].unk_158 = 2;
ov100_021D4AC8(&param0->unk_1A0.unk_13EC[1], 13, param0->unk_1EBC->unk_00);
sub_02017350(&param0->unk_1A0.unk_13EC[1].unk_00, FX32_CONST(1), FX32_CONST(+0), FX32_CONST(+60));
Easy3DObject_SetPosition(&param0->unk_1A0.unk_13EC[1].unk_00, FX32_CONST(1), FX32_CONST(+0), FX32_CONST(+60));
ov100_021D4B4C(0, &param0->unk_1A0.unk_13EC[1], 14, param0->unk_1EBC->unk_00, &param0->unk_1EBC->unk_1C);
param0->unk_1A0.unk_13EC[1].unk_164 = 1;
@ -453,7 +453,7 @@ BOOL ov100_021D2428 (void * param0)
break;
case 11:
v0->unk_1A0.unk_10DC[0].unk_160 = 1;
sub_02017348(&v0->unk_1A0.unk_10DC[0].unk_00, 1);
Easy3DObject_SetVisibility(&v0->unk_1A0.unk_10DC[0].unk_00, 1);
Sound_PlayBGM(1214);
sub_02004550(63, 0, 0);
v0->unk_00++;
@ -469,9 +469,9 @@ BOOL ov100_021D2428 (void * param0)
}
if (v0->unk_1A0.unk_10DC[0].unk_160 == 0) {
sub_02017348(&v0->unk_1A0.unk_10DC[0].unk_00, 0);
sub_02017348(&v0->unk_1A0.unk_10DC[1].unk_00, 1);
sub_02017348(&v0->unk_1A0.unk_934[0].unk_00, 1);
Easy3DObject_SetVisibility(&v0->unk_1A0.unk_10DC[0].unk_00, 0);
Easy3DObject_SetVisibility(&v0->unk_1A0.unk_10DC[1].unk_00, 1);
Easy3DObject_SetVisibility(&v0->unk_1A0.unk_934[0].unk_00, 1);
v0->unk_1A0.unk_934[0].unk_160 = 1;
v0->unk_04 = 0;
@ -479,8 +479,8 @@ BOOL ov100_021D2428 (void * param0)
}
break;
case 13:
if (v0->unk_1A0.unk_934[0].unk_00.unk_54.y < FX32_CONST(-50)) {
v0->unk_1A0.unk_934[0].unk_00.unk_54.y += FX32_HALF;
if (v0->unk_1A0.unk_934[0].unk_00.position.y < FX32_CONST(-50)) {
v0->unk_1A0.unk_934[0].unk_00.position.y += FX32_HALF;
} else {
v0->unk_04 = 0;
v0->unk_00++;
@ -488,7 +488,7 @@ BOOL ov100_021D2428 (void * param0)
break;
case 14:
if (v0->unk_1A0.unk_934[0].unk_160 == 0) {
v0->unk_1A0.unk_934[1].unk_00.unk_54.y = v0->unk_1A0.unk_934[0].unk_00.unk_54.y;
v0->unk_1A0.unk_934[1].unk_00.position.y = v0->unk_1A0.unk_934[0].unk_00.position.y;
v0->unk_1A0.unk_934[1].unk_160 = 1;
v0->unk_1A0.unk_934[1].unk_164 = 1;
v0->unk_1A0.unk_314.unk_160 = 1;
@ -496,8 +496,8 @@ BOOL ov100_021D2428 (void * param0)
v0->unk_1A0.unk_18C.unk_160 = 1;
v0->unk_1A0.unk_18C.unk_168 = 1;
sub_02017348(&v0->unk_1A0.unk_934[0].unk_00, 0);
sub_02017348(&v0->unk_1A0.unk_934[1].unk_00, 1);
Easy3DObject_SetVisibility(&v0->unk_1A0.unk_934[0].unk_00, 0);
Easy3DObject_SetVisibility(&v0->unk_1A0.unk_934[1].unk_00, 1);
v0->unk_00++;
}
@ -522,21 +522,21 @@ BOOL ov100_021D2428 (void * param0)
}
if (v0->unk_04 < 15 + 25) {
v0->unk_1A0.unk_624[0].unk_00.unk_54.z -= FX32_HALF >> 1;
v0->unk_1A0.unk_624[0].unk_00.position.z -= FX32_HALF >> 1;
} else {
v0->unk_1A0.unk_624[0].unk_00.unk_54.z -= FX32_HALF;
v0->unk_1A0.unk_624[0].unk_00.position.z -= FX32_HALF;
}
if (v0->unk_04 < 40 + 25) {
v0->unk_1A0.unk_624[1].unk_00.unk_54.z -= FX32_HALF >> 1;
v0->unk_1A0.unk_624[1].unk_00.position.z -= FX32_HALF >> 1;
} else {
v0->unk_1A0.unk_624[1].unk_00.unk_54.z -= FX32_HALF;
v0->unk_1A0.unk_624[1].unk_00.position.z -= FX32_HALF;
}
if (v0->unk_1A0.unk_934[1].unk_00.unk_54.y < FX32_CONST(0)) {
v0->unk_1A0.unk_934[1].unk_00.unk_54.y += FX32_HALF;
if (v0->unk_1A0.unk_934[1].unk_00.position.y < FX32_CONST(0)) {
v0->unk_1A0.unk_934[1].unk_00.position.y += FX32_HALF;
} else {
v0->unk_1A0.unk_934[1].unk_00.unk_54.y = FX32_CONST(0);
v0->unk_1A0.unk_934[1].unk_00.position.y = FX32_CONST(0);
v0->unk_04 = 0;
ov100_021D46C8(v0->unk_1EBC, v0->unk_1EC0, 24);
v0->unk_00++;
@ -554,8 +554,8 @@ BOOL ov100_021D2428 (void * param0)
v0->unk_1A0.unk_49C.unk_16C = 1;
v0->unk_1A0.unk_934[2].unk_160 = 1;
sub_02017348(&v0->unk_1A0.unk_934[1].unk_00, 0);
sub_02017348(&v0->unk_1A0.unk_934[2].unk_00, 1);
Easy3DObject_SetVisibility(&v0->unk_1A0.unk_934[1].unk_00, 0);
Easy3DObject_SetVisibility(&v0->unk_1A0.unk_934[2].unk_00, 1);
Sound_PlayPokemonCry(2, 487, 0, 127, 111, 0);
v0->unk_04 = 0;
@ -569,9 +569,9 @@ BOOL ov100_021D2428 (void * param0)
v0->unk_1A0.unk_934[3].unk_164 = 1;
v0->unk_1A0.unk_49C.unk_160 = 0;
sub_02017348(&v0->unk_1A0.unk_49C.unk_00, 0);
sub_02017348(&v0->unk_1A0.unk_934[2].unk_00, 0);
sub_02017348(&v0->unk_1A0.unk_934[3].unk_00, 1);
Easy3DObject_SetVisibility(&v0->unk_1A0.unk_49C.unk_00, 0);
Easy3DObject_SetVisibility(&v0->unk_1A0.unk_934[2].unk_00, 0);
Easy3DObject_SetVisibility(&v0->unk_1A0.unk_934[3].unk_00, 1);
v0->unk_00++;
}
@ -589,8 +589,8 @@ BOOL ov100_021D2428 (void * param0)
v0->unk_1A0.unk_934[4].unk_160 = 1;
sub_02017348(&v0->unk_1A0.unk_934[3].unk_00, 0);
sub_02017348(&v0->unk_1A0.unk_934[4].unk_00, 1);
Easy3DObject_SetVisibility(&v0->unk_1A0.unk_934[3].unk_00, 0);
Easy3DObject_SetVisibility(&v0->unk_1A0.unk_934[4].unk_00, 1);
v0->unk_04 = 0;
v0->unk_00++;
break;
@ -663,16 +663,16 @@ BOOL ov100_021D2428 (void * param0)
break;
}
v0->unk_1A0.unk_16FC[0].unk_00.unk_54 = v0->unk_1A0.unk_624[0].unk_00.unk_54;
v0->unk_1A0.unk_16FC[1].unk_00.unk_54 = v0->unk_1A0.unk_624[1].unk_00.unk_54;
v0->unk_1A0.unk_16FC[2].unk_00.unk_54 = v0->unk_1A0.unk_13EC[0].unk_00.unk_54;
v0->unk_1A0.unk_16FC[3].unk_00.unk_54 = v0->unk_1A0.unk_13EC[1].unk_00.unk_54;
v0->unk_1A0.unk_16FC[0].unk_00.unk_54.z -= (FX32_ONE * 2);
v0->unk_1A0.unk_16FC[1].unk_00.unk_54.z -= (FX32_ONE * 2);
v0->unk_1A0.unk_16FC[2].unk_00.unk_54.z -= (FX32_ONE * 2);
v0->unk_1A0.unk_16FC[3].unk_00.unk_54.z -= (FX32_ONE * 2);
v0->unk_1A0.unk_16FC[2].unk_00.unk_54.x -= FX32_ONE;
v0->unk_1A0.unk_16FC[3].unk_00.unk_54.x -= FX32_ONE;
v0->unk_1A0.unk_16FC[0].unk_00.position = v0->unk_1A0.unk_624[0].unk_00.position;
v0->unk_1A0.unk_16FC[1].unk_00.position = v0->unk_1A0.unk_624[1].unk_00.position;
v0->unk_1A0.unk_16FC[2].unk_00.position = v0->unk_1A0.unk_13EC[0].unk_00.position;
v0->unk_1A0.unk_16FC[3].unk_00.position = v0->unk_1A0.unk_13EC[1].unk_00.position;
v0->unk_1A0.unk_16FC[0].unk_00.position.z -= (FX32_ONE * 2);
v0->unk_1A0.unk_16FC[1].unk_00.position.z -= (FX32_ONE * 2);
v0->unk_1A0.unk_16FC[2].unk_00.position.z -= (FX32_ONE * 2);
v0->unk_1A0.unk_16FC[3].unk_00.position.z -= (FX32_ONE * 2);
v0->unk_1A0.unk_16FC[2].unk_00.position.x -= FX32_ONE;
v0->unk_1A0.unk_16FC[3].unk_00.position.x -= FX32_ONE;
ov100_021D2E0C(v0);
ov100_021D4BF0(v0->unk_1EBC);

70
src/overlay100/ov100_021D2F0C.c
View File

@ -65,21 +65,21 @@ static void ov100_021D2F64 (UnkStruct_ov100_021D3084 * param0)
ov100_021D4AC8(&param0->unk_0C.unk_934[0], 84, param0->unk_1D28->unk_00);
ov100_021D4B4C(0, &param0->unk_0C.unk_934[0], 82, param0->unk_1D28->unk_00, &param0->unk_1D28->unk_1C);
ov100_021D4B4C(1, &param0->unk_0C.unk_934[0], 83, param0->unk_1D28->unk_00, &param0->unk_1D28->unk_1C);
sub_02017350(&param0->unk_0C.unk_934[0].unk_00, FX32_CONST(-48), FX32_CONST(-5), FX32_CONST(-70));
Easy3DObject_SetPosition(&param0->unk_0C.unk_934[0].unk_00, FX32_CONST(-48), FX32_CONST(-5), FX32_CONST(-70));
param0->unk_0C.unk_934[0].unk_160 = 0;
ov100_021D4B10(&param0->unk_0C.unk_934[0], &param0->unk_0C.unk_934[1], 84, param0->unk_1D28->unk_00);
ov100_021D4BA0(0, &param0->unk_0C.unk_934[0], &param0->unk_0C.unk_934[1], 82, param0->unk_1D28->unk_00, &param0->unk_1D28->unk_1C);
ov100_021D4BA0(1, &param0->unk_0C.unk_934[0], &param0->unk_0C.unk_934[1], 83, param0->unk_1D28->unk_00, &param0->unk_1D28->unk_1C);
sub_02017350(&param0->unk_0C.unk_934[1].unk_00, FX32_CONST(+48), FX32_CONST(-5), FX32_CONST(-70));
Easy3DObject_SetPosition(&param0->unk_0C.unk_934[1].unk_00, FX32_CONST(+48), FX32_CONST(-5), FX32_CONST(-70));
param0->unk_0C.unk_934[1].unk_160 = 0;
param0->unk_0C.unk_934[0].unk_150 = FX32_CONST(0.1);
param0->unk_0C.unk_934[1].unk_150 = FX32_CONST(0.1);
sub_0201736C(&param0->unk_0C.unk_934[0].unk_00, param0->unk_0C.unk_934[0].unk_150, FX32_CONST(1.0), param0->unk_0C.unk_934[0].unk_150);
sub_0201736C(&param0->unk_0C.unk_934[1].unk_00, param0->unk_0C.unk_934[1].unk_150, FX32_CONST(1.0), param0->unk_0C.unk_934[1].unk_150);
Easy3DObject_SetScale(&param0->unk_0C.unk_934[0].unk_00, param0->unk_0C.unk_934[0].unk_150, FX32_CONST(1.0), param0->unk_0C.unk_934[0].unk_150);
Easy3DObject_SetScale(&param0->unk_0C.unk_934[1].unk_00, param0->unk_0C.unk_934[1].unk_150, FX32_CONST(1.0), param0->unk_0C.unk_934[1].unk_150);
}
static void ov100_021D3084 (UnkStruct_ov100_021D3084 * param0)
@ -100,7 +100,7 @@ static void ov100_021D3084 (UnkStruct_ov100_021D3084 * param0)
ov100_021D4B4C(1, &param0->unk_0C.unk_10DC[0], 78, param0->unk_1D28->unk_00, &param0->unk_1D28->unk_1C);
ov100_021D4B4C(2, &param0->unk_0C.unk_10DC[0], 80, param0->unk_1D28->unk_00, &param0->unk_1D28->unk_1C);
ov100_021D4B4C(3, &param0->unk_0C.unk_10DC[0], 81, param0->unk_1D28->unk_00, &param0->unk_1D28->unk_1C);
sub_02017350(&param0->unk_0C.unk_10DC[0].unk_00, FX32_CONST(-48), FX32_CONST(-10), FX32_CONST(-70));
Easy3DObject_SetPosition(&param0->unk_0C.unk_10DC[0].unk_00, FX32_CONST(-48), FX32_CONST(-10), FX32_CONST(-70));
param0->unk_0C.unk_10DC[0].unk_160 = 0;
param0->unk_0C.unk_10DC[0].unk_170 = 0;
@ -110,7 +110,7 @@ static void ov100_021D3084 (UnkStruct_ov100_021D3084 * param0)
ov100_021D4B4C(1, &param0->unk_0C.unk_10DC[1], 78, param0->unk_1D28->unk_00, &param0->unk_1D28->unk_1C);
ov100_021D4B4C(2, &param0->unk_0C.unk_10DC[1], 80, param0->unk_1D28->unk_00, &param0->unk_1D28->unk_1C);
ov100_021D4B4C(3, &param0->unk_0C.unk_10DC[1], 81, param0->unk_1D28->unk_00, &param0->unk_1D28->unk_1C);
sub_02017350(&param0->unk_0C.unk_10DC[1].unk_00, FX32_CONST(+48), FX32_CONST(-10), FX32_CONST(-70));
Easy3DObject_SetPosition(&param0->unk_0C.unk_10DC[1].unk_00, FX32_CONST(+48), FX32_CONST(-10), FX32_CONST(-70));
param0->unk_0C.unk_10DC[1].unk_160 = 0;
param0->unk_0C.unk_10DC[1].unk_170 = 0;
@ -121,31 +121,31 @@ static void ov100_021D3084 (UnkStruct_ov100_021D3084 * param0)
for (v5 = 0; v5 < 4; v5++) {
ov100_021D4AC8(&param0->unk_0C.unk_16FC[v5], 65, param0->unk_1D28->unk_00);
sub_0201736C(&param0->unk_0C.unk_16FC[v5].unk_00, FX32_CONST(1.2), FX32_CONST(1.0), FX32_CONST(1.2));
Easy3DObject_SetScale(&param0->unk_0C.unk_16FC[v5].unk_00, FX32_CONST(1.2), FX32_CONST(1.0), FX32_CONST(1.2));
}
}
ov100_021D4AC8(&param0->unk_0C.unk_624[0], 66, param0->unk_1D28->unk_00);
sub_02017350(&param0->unk_0C.unk_624[0].unk_00, FX32_CONST(-50), FX32_CONST(+0), FX32_CONST(-50));
Easy3DObject_SetPosition(&param0->unk_0C.unk_624[0].unk_00, FX32_CONST(-50), FX32_CONST(+0), FX32_CONST(-50));
ov100_021D4B4C(0, &param0->unk_0C.unk_624[0], 67, param0->unk_1D28->unk_00, &param0->unk_1D28->unk_1C);
param0->unk_0C.unk_624[0].unk_160 = 1;
param0->unk_0C.unk_624[0].unk_164 = 1;
param0->unk_0C.unk_624[0].unk_154 = FX32_HALF;
sub_02017348(&param0->unk_0C.unk_624[0].unk_00, 0);
sub_02017348(&param0->unk_0C.unk_16FC[0].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_0C.unk_624[0].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_0C.unk_16FC[0].unk_00, 0);
ov100_021D4AC8(&param0->unk_0C.unk_624[1], 68, param0->unk_1D28->unk_00);
sub_02017350(&param0->unk_0C.unk_624[1].unk_00, FX32_CONST(+50), FX32_CONST(+0), FX32_CONST(-50));
Easy3DObject_SetPosition(&param0->unk_0C.unk_624[1].unk_00, FX32_CONST(+50), FX32_CONST(+0), FX32_CONST(-50));
ov100_021D4B4C(0, &param0->unk_0C.unk_624[1], 69, param0->unk_1D28->unk_00, &param0->unk_1D28->unk_1C);
param0->unk_0C.unk_624[1].unk_160 = 1;
param0->unk_0C.unk_624[1].unk_164 = 1;
param0->unk_0C.unk_624[1].unk_154 = FX32_HALF;
sub_02017348(&param0->unk_0C.unk_624[1].unk_00, 0);
sub_02017348(&param0->unk_0C.unk_16FC[1].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_0C.unk_624[1].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_0C.unk_16FC[1].unk_00, 0);
if (TrainerInfo_Gender(param0->unk_1D2C->unk_08) != 1) {
ov100_021D4AC8(&param0->unk_0C.unk_13EC[0], 61, param0->unk_1D28->unk_00);
@ -155,14 +155,14 @@ static void ov100_021D3084 (UnkStruct_ov100_021D3084 * param0)
ov100_021D4B4C(0, &param0->unk_0C.unk_13EC[0], 64, param0->unk_1D28->unk_00, &param0->unk_1D28->unk_1C);
}
sub_02017350(&param0->unk_0C.unk_13EC[0].unk_00, FX32_CONST(1), FX32_CONST(+0), FX32_CONST(+140));
Easy3DObject_SetPosition(&param0->unk_0C.unk_13EC[0].unk_00, FX32_CONST(1), FX32_CONST(+0), FX32_CONST(+140));
param0->unk_0C.unk_13EC[0].unk_164 = 1;
param0->unk_0C.unk_13EC[0].unk_154 = (FX32_HALF >> 1);
param0->unk_0C.unk_13EC[0].unk_158 = 2;
ov100_021D4AC8(&param0->unk_0C.unk_13EC[1], 13, param0->unk_1D28->unk_00);
sub_02017350(&param0->unk_0C.unk_13EC[1].unk_00, FX32_CONST(1), FX32_CONST(+0), FX32_CONST(+60));
Easy3DObject_SetPosition(&param0->unk_0C.unk_13EC[1].unk_00, FX32_CONST(1), FX32_CONST(+0), FX32_CONST(+60));
ov100_021D4B4C(0, &param0->unk_0C.unk_13EC[1], 14, param0->unk_1D28->unk_00, &param0->unk_1D28->unk_1C);
param0->unk_0C.unk_13EC[1].unk_164 = 1;
@ -357,13 +357,13 @@ static void ov100_021D37F4 (SysTask * param0, void * param1)
switch (v0->unk_00) {
case 0:
sub_0201736C(&v0->unk_10->unk_00, FX32_CONST(v1[v0->unk_04]), FX32_CONST(1.00f), FX32_CONST(1.00f));
sub_0201736C(&v0->unk_14->unk_00, FX32_CONST(v1[v0->unk_04]), FX32_CONST(1.00f), FX32_CONST(1.00f));
Easy3DObject_SetScale(&v0->unk_10->unk_00, FX32_CONST(v1[v0->unk_04]), FX32_CONST(1.00f), FX32_CONST(1.00f));
Easy3DObject_SetScale(&v0->unk_14->unk_00, FX32_CONST(v1[v0->unk_04]), FX32_CONST(1.00f), FX32_CONST(1.00f));
v0->unk_04++;
sub_02017348(&v0->unk_10->unk_00, 1);
sub_02017348(&v0->unk_14->unk_00, 1);
Easy3DObject_SetVisibility(&v0->unk_10->unk_00, 1);
Easy3DObject_SetVisibility(&v0->unk_14->unk_00, 1);
v0->unk_00++;
break;
@ -372,8 +372,8 @@ static void ov100_021D37F4 (SysTask * param0, void * param1)
Sound_PlayPokemonCry(0, v0->unk_08, v0->unk_0C, 80, 111, 0);
v0->unk_00++;
} else {
sub_0201736C(&v0->unk_10->unk_00, FX32_CONST(v1[v0->unk_04]), FX32_CONST(1.00f), FX32_CONST(1.00f));
sub_0201736C(&v0->unk_14->unk_00, FX32_CONST(v1[v0->unk_04]), FX32_CONST(1.00f), FX32_CONST(1.00f));
Easy3DObject_SetScale(&v0->unk_10->unk_00, FX32_CONST(v1[v0->unk_04]), FX32_CONST(1.00f), FX32_CONST(1.00f));
Easy3DObject_SetScale(&v0->unk_14->unk_00, FX32_CONST(v1[v0->unk_04]), FX32_CONST(1.00f), FX32_CONST(1.00f));
}
break;
default:
@ -615,8 +615,8 @@ BOOL ov100_021D39E4 (void * param0)
if (v0->unk_0C.unk_934[0].unk_150 < FX32_CONST(0.80)) {
v0->unk_0C.unk_934[0].unk_150 += FX32_CONST(0.02);
v0->unk_0C.unk_934[1].unk_150 += FX32_CONST(0.02);
sub_0201736C(&v0->unk_0C.unk_934[0].unk_00, v0->unk_0C.unk_934[0].unk_150, FX32_CONST(1.0), v0->unk_0C.unk_934[0].unk_150);
sub_0201736C(&v0->unk_0C.unk_934[1].unk_00, v0->unk_0C.unk_934[1].unk_150, FX32_CONST(1.0), v0->unk_0C.unk_934[1].unk_150);
Easy3DObject_SetScale(&v0->unk_0C.unk_934[0].unk_00, v0->unk_0C.unk_934[0].unk_150, FX32_CONST(1.0), v0->unk_0C.unk_934[0].unk_150);
Easy3DObject_SetScale(&v0->unk_0C.unk_934[1].unk_00, v0->unk_0C.unk_934[1].unk_150, FX32_CONST(1.0), v0->unk_0C.unk_934[1].unk_150);
} else {
ov100_021D46C8(v0->unk_1D28, v0->unk_1D2C, 18);
v0->unk_00++;
@ -640,8 +640,8 @@ BOOL ov100_021D39E4 (void * param0)
if (v0->unk_0C.unk_934[0].unk_150 > FX32_CONST(0.10)) {
v0->unk_0C.unk_934[0].unk_150 -= FX32_CONST(0.02);
v0->unk_0C.unk_934[1].unk_150 -= FX32_CONST(0.02);
sub_0201736C(&v0->unk_0C.unk_934[0].unk_00, v0->unk_0C.unk_934[0].unk_150, FX32_CONST(1.0), v0->unk_0C.unk_934[0].unk_150);
sub_0201736C(&v0->unk_0C.unk_934[1].unk_00, v0->unk_0C.unk_934[1].unk_150, FX32_CONST(1.0), v0->unk_0C.unk_934[1].unk_150);
Easy3DObject_SetScale(&v0->unk_0C.unk_934[0].unk_00, v0->unk_0C.unk_934[0].unk_150, FX32_CONST(1.0), v0->unk_0C.unk_934[0].unk_150);
Easy3DObject_SetScale(&v0->unk_0C.unk_934[1].unk_00, v0->unk_0C.unk_934[1].unk_150, FX32_CONST(1.0), v0->unk_0C.unk_934[1].unk_150);
} else {
sub_0200F174(0, 0, 0, 0x0, 6, 1, 111);
v0->unk_00++;
@ -662,18 +662,18 @@ BOOL ov100_021D39E4 (void * param0)
break;
}
v0->unk_0C.unk_16FC[0].unk_00.unk_54 = v0->unk_0C.unk_624[0].unk_00.unk_54;
v0->unk_0C.unk_16FC[1].unk_00.unk_54 = v0->unk_0C.unk_624[1].unk_00.unk_54;
v0->unk_0C.unk_16FC[2].unk_00.unk_54 = v0->unk_0C.unk_13EC[0].unk_00.unk_54;
v0->unk_0C.unk_16FC[3].unk_00.unk_54 = v0->unk_0C.unk_13EC[1].unk_00.unk_54;
v0->unk_0C.unk_16FC[0].unk_00.position = v0->unk_0C.unk_624[0].unk_00.position;
v0->unk_0C.unk_16FC[1].unk_00.position = v0->unk_0C.unk_624[1].unk_00.position;
v0->unk_0C.unk_16FC[2].unk_00.position = v0->unk_0C.unk_13EC[0].unk_00.position;
v0->unk_0C.unk_16FC[3].unk_00.position = v0->unk_0C.unk_13EC[1].unk_00.position;
v0->unk_0C.unk_16FC[0].unk_00.unk_54.z -= (FX32_ONE * 2);
v0->unk_0C.unk_16FC[1].unk_00.unk_54.z -= (FX32_ONE * 2);
v0->unk_0C.unk_16FC[2].unk_00.unk_54.z -= (FX32_ONE * 2);
v0->unk_0C.unk_16FC[3].unk_00.unk_54.z -= (FX32_ONE * 2);
v0->unk_0C.unk_16FC[0].unk_00.position.z -= (FX32_ONE * 2);
v0->unk_0C.unk_16FC[1].unk_00.position.z -= (FX32_ONE * 2);
v0->unk_0C.unk_16FC[2].unk_00.position.z -= (FX32_ONE * 2);
v0->unk_0C.unk_16FC[3].unk_00.position.z -= (FX32_ONE * 2);
v0->unk_0C.unk_16FC[2].unk_00.unk_54.x -= FX32_ONE;
v0->unk_0C.unk_16FC[3].unk_00.unk_54.x -= FX32_ONE;
v0->unk_0C.unk_16FC[2].unk_00.position.x -= FX32_ONE;
v0->unk_0C.unk_16FC[3].unk_00.position.x -= FX32_ONE;
ov100_021D3558(v0);

4
src/overlay100/ov100_021D44C0.c
View File

@ -110,11 +110,11 @@ void ov100_021D45A4 (UnkStruct_ov100_021D49B4 * param0)
case 1:
case 2:
case 9:
param0->unk_00.unk_54.z -= v1[param0->unk_180].unk_08;
param0->unk_00.position.z -= v1[param0->unk_180].unk_08;
break;
case 4:
case 3:
param0->unk_00.unk_54.x += v1[param0->unk_180].unk_08;
param0->unk_00.position.x += v1[param0->unk_180].unk_08;
break;
}
}

22
src/overlay100/ov100_021D46C8.c
View File

@ -190,7 +190,7 @@ void ov100_021D49B4 (UnkStruct_ov100_021D49B4 * param0)
}
NNS_G3dGePushMtx();
sub_02017294(&param0->unk_00);
Easy3DObject_Draw(&param0->unk_00);
NNS_G3dGePopMtx(1);
}
@ -218,20 +218,20 @@ void ov100_021D4AA4 (UnkStruct_ov100_021D49B4 * param0, NNSFndAllocator * param1
void ov100_021D4AC8 (UnkStruct_ov100_021D49B4 * param0, int param1, NARC * param2)
{
Easy3DModel_LoadFrom(&param0->unk_78, param2, param1, 111);
sub_02017258(&param0->unk_00, &param0->unk_78);
sub_02017350(&param0->unk_00, 0, 0, 0);
sub_0201736C(&param0->unk_00, FX32_CONST(1.00f), FX32_CONST(1.00f), FX32_CONST(1.00f));
sub_02017348(&param0->unk_00, 1);
Easy3DObject_Init(&param0->unk_00, &param0->unk_78);
Easy3DObject_SetPosition(&param0->unk_00, 0, 0, 0);
Easy3DObject_SetScale(&param0->unk_00, FX32_CONST(1.00f), FX32_CONST(1.00f), FX32_CONST(1.00f));
Easy3DObject_SetVisibility(&param0->unk_00, 1);
param0->unk_174 = 1;
}
void ov100_021D4B10 (UnkStruct_ov100_021D49B4 * param0, UnkStruct_ov100_021D49B4 * param1, int param2, NARC * param3)
{
sub_02017258(&param1->unk_00, &param0->unk_78);
sub_02017350(&param1->unk_00, 0, 0, 0);
sub_0201736C(&param1->unk_00, FX32_CONST(1.00f), FX32_CONST(1.00f), FX32_CONST(1.00f));
sub_02017348(&param1->unk_00, 1);
Easy3DObject_Init(&param1->unk_00, &param0->unk_78);
Easy3DObject_SetPosition(&param1->unk_00, 0, 0, 0);
Easy3DObject_SetScale(&param1->unk_00, FX32_CONST(1.00f), FX32_CONST(1.00f), FX32_CONST(1.00f));
Easy3DObject_SetVisibility(&param1->unk_00, 1);
param1->unk_174 = 1;
}
@ -240,7 +240,7 @@ void ov100_021D4B4C (int param0, UnkStruct_ov100_021D49B4 * param1, int param2,
{
Easy3DAnim_LoadFrom(&param1->unk_88[param0], &param1->unk_78, param3, param2, 111, param4);
Easy3DAnim_SetFrame(&param1->unk_88[param0], 0);
sub_0201727C(&param1->unk_00, &param1->unk_88[param0]);
Easy3DObject_AddAnim(&param1->unk_00, &param1->unk_88[param0]);
param1->unk_154 = FX32_CONST(1);
param1->unk_180 = 0xFF;
@ -251,7 +251,7 @@ void ov100_021D4BA0 (int param0, UnkStruct_ov100_021D49B4 * param1, UnkStruct_ov
{
Easy3DAnim_LoadFrom(&param2->unk_88[param0], &param1->unk_78, param4, param3, 111, param5);
Easy3DAnim_SetFrame(&param2->unk_88[param0], 0);
sub_0201727C(&param2->unk_00, &param2->unk_88[param0]);
Easy3DObject_AddAnim(&param2->unk_00, &param2->unk_88[param0]);
param2->unk_154 = FX32_CONST(1);
param2->unk_180 = 0xFF;

10
src/overlay113/ov113_0225C700.c
View File

@ -1207,10 +1207,10 @@ static void ov113_0225DAA8 (UnkStruct_ov113_0225DBCC * param0, NARC * param1)
}
Easy3DModel_LoadFrom(&param0->unk_D8.unk_00, param1, v0, 118);
sub_02017258(&param0->unk_D8.unk_10, &param0->unk_D8.unk_00);
sub_02017350(&param0->unk_D8.unk_10, (FX32_CONST(0)), (FX32_CONST(0)), (FX32_CONST(0)));
sub_0201736C(&param0->unk_D8.unk_10, (FX32_CONST(1.00f)), (FX32_CONST(1.00f)), (FX32_CONST(1.00f)));
sub_02017348(&param0->unk_D8.unk_10, 1);
Easy3DObject_Init(&param0->unk_D8.unk_10, &param0->unk_D8.unk_00);
Easy3DObject_SetPosition(&param0->unk_D8.unk_10, (FX32_CONST(0)), (FX32_CONST(0)), (FX32_CONST(0)));
Easy3DObject_SetScale(&param0->unk_D8.unk_10, (FX32_CONST(1.00f)), (FX32_CONST(1.00f)), (FX32_CONST(1.00f)));
Easy3DObject_SetVisibility(&param0->unk_D8.unk_10, 1);
}
static void ov113_0225DAFC (UnkStruct_ov113_0225DBCC * param0)
@ -1248,7 +1248,7 @@ static void ov113_0225DB08 (UnkStruct_ov113_0225DBCC * param0)
NNS_G3dGePushMtx();
{
sub_02017294(&param0->unk_D8.unk_10);
Easy3DObject_Draw(&param0->unk_D8.unk_10);
ov113_0225E4A0(&param0->unk_194);
}

158
src/overlay113/ov113_0225E368.c
View File

@ -446,7 +446,7 @@ void ov113_0225E4A0 (UnkStruct_ov113_0225EB20 * param0)
if (Unk_ov113_02260CAC[v1->unk_240_8].unk_04 != NULL) {
Unk_ov113_02260CAC[v1->unk_240_8].unk_04(param0, v1);
} else {
sub_02017294(&v1->unk_1C);
Easy3DObject_Draw(&v1->unk_1C);
}
}
}
@ -563,11 +563,11 @@ static UnkStruct_ov113_0225E6B8 * ov113_0225E6B8 (UnkStruct_ov113_0225DBCC * par
return NULL;
}
sub_02017258(&v0->unk_1C, &v0->unk_0C);
Easy3DObject_Init(&v0->unk_1C, &v0->unk_0C);
ov113_0225EB64(param0, param2->unk_09, param2->unk_0A, &v1, &v2);
sub_02017350(&v0->unk_1C, v1, v2, (FX32_ONE * 16));
sub_0201736C(&v0->unk_1C, (FX32_CONST(1.00f)), (FX32_CONST(1.00f)), (FX32_CONST(1.00f)));
sub_02017348(&v0->unk_1C, 0);
Easy3DObject_SetPosition(&v0->unk_1C, v1, v2, (FX32_ONE * 16));
Easy3DObject_SetScale(&v0->unk_1C, (FX32_CONST(1.00f)), (FX32_CONST(1.00f)), (FX32_CONST(1.00f)));
Easy3DObject_SetVisibility(&v0->unk_1C, 0);
return v0;
}
@ -920,7 +920,7 @@ static void ov113_0225ECA0 (Easy3DObject * param0, const UnkStruct_ov113_0226081
v6 = PokemonOverworldFootprintSize(param1->unk_02, param1->unk_08);
GF_ASSERT(v6 < NELEMS(Unk_ov113_02260C38));
sub_02017358(param0, &v0, &v1, &v2);
Easy3DObject_GetPosition(param0, &v0, &v1, &v2);
param2->unk_00 = v0 + Unk_ov113_02260C38[v6].unk_00;
param2->unk_04 = v0 + Unk_ov113_02260C38[v6].unk_04;
@ -928,7 +928,7 @@ static void ov113_0225ECA0 (Easy3DObject * param0, const UnkStruct_ov113_0226081
param2->unk_0C = v1 + Unk_ov113_02260C38[v6].unk_0C;
if (param3 == 1) {
sub_02017374(param0, &v3, &v4, &v5);
Easy3DObject_GetScale(param0, &v3, &v4, &v5);
v7 = ((fx64)v3) * 100 / FX32_ONE;
v9 = (param2->unk_04 - param2->unk_00) * v7 / 100 - (param2->unk_04 - param2->unk_00);
@ -1047,7 +1047,7 @@ static int ov113_0225EF0C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
if (v0->unk_00 == 2) {
ov113_0225ECA0(&param1->unk_1C, &param1->unk_00, &v0->unk_04, 0);
sub_02017348(&param1->unk_1C, 1);
Easy3DObject_SetVisibility(&param1->unk_1C, 1);
param1->unk_240_0 = 1;
}
@ -1078,13 +1078,13 @@ static int ov113_0225EF78 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
v0->unk_04 += 0xc0;
if (v0->unk_00 - 0xc0 < 0x100) {
sub_02017348(&param1->unk_1C, 0);
Easy3DObject_SetVisibility(&param1->unk_1C, 0);
v0->unk_08++;
break;
}
v0->unk_00 -= 0xc0;
sub_0201736C(&param1->unk_1C, v0->unk_04, v0->unk_04, FX32_ONE);
Easy3DObject_SetScale(&param1->unk_1C, v0->unk_04, v0->unk_04, FX32_ONE);
break;
default:
ov113_0225EC60(param0, v0->unk_09);
@ -1105,7 +1105,7 @@ static void ov113_0225EFFC (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0
NNS_G3dMdlUseGlbAlpha(param1->unk_0C.model);
}
sub_02017294(&param1->unk_1C);
Easy3DObject_Draw(&param1->unk_1C);
}
static BOOL ov113_0225F044 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2)
@ -1128,23 +1128,23 @@ static int ov113_0225F060 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
switch (v0->unk_16A) {
case 0:
sub_02017358(&param1->unk_1C, &v2, &v3, &v4);
Easy3DObject_GetPosition(&param1->unk_1C, &v2, &v3, &v4);
for (v1 = 0; v1 < 3; v1++) {
sub_02017258(&v0->unk_00[v1], &param1->unk_0C);
sub_02017350(&v0->unk_00[v1], v2, v3, v4);
Easy3DObject_Init(&v0->unk_00[v1], &param1->unk_0C);
Easy3DObject_SetPosition(&v0->unk_00[v1], v2, v3, v4);
}
v0->unk_16A++;
case 1:
sub_02017358(&param1->unk_1C, &v2, &v3, &v4);
sub_02017350(&param1->unk_1C, v2 - 0x2000, v3 - 0x2000, v4);
sub_02017358(&v0->unk_00[0], &v2, &v3, &v4);
sub_02017350(&v0->unk_00[0], v2 + 0x2000, v3 - 0x2000, v4);
sub_02017358(&v0->unk_00[1], &v2, &v3, &v4);
sub_02017350(&v0->unk_00[1], v2 - 0x2000, v3 + 0x2000, v4);
sub_02017358(&v0->unk_00[2], &v2, &v3, &v4);
sub_02017350(&v0->unk_00[2], v2 + 0x2000, v3 + 0x2000, v4);
Easy3DObject_GetPosition(&param1->unk_1C, &v2, &v3, &v4);
Easy3DObject_SetPosition(&param1->unk_1C, v2 - 0x2000, v3 - 0x2000, v4);
Easy3DObject_GetPosition(&v0->unk_00[0], &v2, &v3, &v4);
Easy3DObject_SetPosition(&v0->unk_00[0], v2 + 0x2000, v3 - 0x2000, v4);
Easy3DObject_GetPosition(&v0->unk_00[1], &v2, &v3, &v4);
Easy3DObject_SetPosition(&v0->unk_00[1], v2 - 0x2000, v3 + 0x2000, v4);
Easy3DObject_GetPosition(&v0->unk_00[2], &v2, &v3, &v4);
Easy3DObject_SetPosition(&v0->unk_00[2], v2 + 0x2000, v3 + 0x2000, v4);
v0->unk_168++;
@ -1168,10 +1168,10 @@ static void ov113_0225F194 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0
int v1;
for (v1 = 0; v1 < 3; v1++) {
sub_02017294(&v0->unk_00[v1]);
Easy3DObject_Draw(&v0->unk_00[v1]);
}
sub_02017294(&param1->unk_1C);
Easy3DObject_Draw(&param1->unk_1C);
}
static BOOL ov113_0225F1B8 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2)
@ -1197,7 +1197,7 @@ static int ov113_0225F1E4 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
switch (v0->unk_00) {
case 0:
v1 = sub_02017394(&param1->unk_1C, 2);
v1 = Easy3DObject_GetRotation(&param1->unk_1C, 2);
v1 -= 65536 / 4 / 6;
if (v1 <= 65536 / 8 * 7) {
@ -1208,12 +1208,12 @@ static int ov113_0225F1E4 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
v0->unk_00++;
}
sub_02017388(&param1->unk_1C, v1, 2);
Easy3DObject_SetRotation(&param1->unk_1C, v1, 2);
break;
case 1:
param1->unk_240_4 = 0;
v1 = sub_02017394(&param1->unk_1C, 2);
v1 = Easy3DObject_GetRotation(&param1->unk_1C, 2);
v1 -= 65536 / 4 / 6;
if (v1 >= 65536 / 4 * 3) {
@ -1221,7 +1221,7 @@ static int ov113_0225F1E4 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
v0->unk_00++;
}
sub_02017388(&param1->unk_1C, v1, 2);
Easy3DObject_SetRotation(&param1->unk_1C, v1, 2);
break;
case 2:
v0->unk_04++;
@ -1233,16 +1233,16 @@ static int ov113_0225F1E4 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
v0->unk_04 = 0;
v0->unk_00++;
case 3:
sub_02017358(&param1->unk_1C, &v3, &v4, &v5);
Easy3DObject_GetPosition(&param1->unk_1C, &v3, &v4, &v5);
if ((v3 < Unk_ov113_02260BBC.unk_00) || (v3 > Unk_ov113_02260BBC.unk_04) || (v4 > Unk_ov113_02260BBC.unk_08) || (v4 < Unk_ov113_02260BBC.unk_0C)) {
return 1;
}
if (v0->unk_08 < 5) {
sub_02017350(&param1->unk_1C, v3 + 0x3000, v4 - 0x3000, v5);
Easy3DObject_SetPosition(&param1->unk_1C, v3 + 0x3000, v4 - 0x3000, v5);
} else {
sub_02017350(&param1->unk_1C, v3 + 0x3000, v4 + 0x3000, v5);
Easy3DObject_SetPosition(&param1->unk_1C, v3 + 0x3000, v4 + 0x3000, v5);
}
v0->unk_08++;
@ -1279,7 +1279,7 @@ static int ov113_0225F368 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
switch (v0->unk_00) {
case 0:
v1 = sub_02017394(&param1->unk_1C, 2);
v1 = Easy3DObject_GetRotation(&param1->unk_1C, 2);
v1 += 65536 / 4 / 6;
if (v1 >= 65536 / 4 / 2) {
@ -1290,12 +1290,12 @@ static int ov113_0225F368 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
v0->unk_00++;
}
sub_02017388(&param1->unk_1C, v1, 2);
Easy3DObject_SetRotation(&param1->unk_1C, v1, 2);
break;
case 1:
param1->unk_240_4 = 0;
v1 = sub_02017394(&param1->unk_1C, 2);
v1 = Easy3DObject_GetRotation(&param1->unk_1C, 2);
v1 += 65536 / 4 / 6;
if ((v1 >= 0) && (v1 < 65536 / 4 * 1)) {
@ -1303,7 +1303,7 @@ static int ov113_0225F368 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
v0->unk_00++;
}
sub_02017388(&param1->unk_1C, v1, 2);
Easy3DObject_SetRotation(&param1->unk_1C, v1, 2);
break;
case 2:
v0->unk_08++;
@ -1312,13 +1312,13 @@ static int ov113_0225F368 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
break;
}
sub_02017358(&param1->unk_1C, &v2, &v3, &v4);
Easy3DObject_GetPosition(&param1->unk_1C, &v2, &v3, &v4);
v0->unk_0C = v3;
v0->unk_08 = 0;
v0->unk_00++;
case 3:
sub_02017358(&param1->unk_1C, &v2, &v3, &v4);
Easy3DObject_GetPosition(&param1->unk_1C, &v2, &v3, &v4);
if ((v2 < Unk_ov113_02260BBC.unk_00) || (v2 > Unk_ov113_02260BBC.unk_04) || (v3 > Unk_ov113_02260BBC.unk_08) || (v3 < Unk_ov113_02260BBC.unk_0C)) {
return 1;
@ -1331,7 +1331,7 @@ static int ov113_0225F368 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
}
v5 = FX_Mul(sub_0201D2B8(v0->unk_04), 0x8000);
sub_02017350(&param1->unk_1C, v2 - 0x1000, v0->unk_0C + v5, v4);
Easy3DObject_SetPosition(&param1->unk_1C, v2 - 0x1000, v0->unk_0C + v5, v4);
break;
}
@ -1361,33 +1361,33 @@ static int ov113_0225F51C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
case 0:
v0->unk_16C = ov113_0225EBFC(param0);
sub_02017358(&param1->unk_1C, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param1->unk_1C, &v1, &v2, &v3);
for (v4 = 0; v4 < 3; v4++) {
sub_02017258(&v0->unk_00[v4], &param1->unk_0C);
sub_02017350(&v0->unk_00[v4], v1, v2, v3);
sub_02017348(&v0->unk_00[v4], 0);
Easy3DObject_Init(&v0->unk_00[v4], &param1->unk_0C);
Easy3DObject_SetPosition(&v0->unk_00[v4], v1, v2, v3);
Easy3DObject_SetVisibility(&v0->unk_00[v4], 0);
}
v0->unk_16D++;
case 1:
sub_02017358(&param1->unk_1C, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param1->unk_1C, &v1, &v2, &v3);
if ((v1 < Unk_ov113_02260BBC.unk_00) || (v1 > Unk_ov113_02260BBC.unk_04) || (v2 > Unk_ov113_02260BBC.unk_08) || (v2 < Unk_ov113_02260BBC.unk_0C) || (v0->unk_16B == 1)) {
for (v4 = 0; v4 < 3; v4++) {
sub_02017348(&v0->unk_00[v4], 0);
Easy3DObject_SetVisibility(&v0->unk_00[v4], 0);
}
sub_02017348(&param1->unk_1C, 0);
Easy3DObject_SetVisibility(&param1->unk_1C, 0);
v0->unk_16D++;
break;
}
sub_02017350(&param1->unk_1C, v1, v2 + 0x2800, v3);
Easy3DObject_SetPosition(&param1->unk_1C, v1, v2 + 0x2800, v3);
if (v0->unk_168 % 3 == 0) {
sub_02017350(&v0->unk_00[v0->unk_16A], v1, v2 + 0x2800, v3);
sub_02017348(&v0->unk_00[v0->unk_16A], 1);
Easy3DObject_SetPosition(&v0->unk_00[v0->unk_16A], v1, v2 + 0x2800, v3);
Easy3DObject_SetVisibility(&v0->unk_00[v0->unk_16A], 1);
v0->unk_16A++;
@ -1419,7 +1419,7 @@ static void ov113_0225F680 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0
}
for (v1 = 0; v1 < 3; v1++) {
sub_02017294(&v0->unk_00[v1]);
Easy3DObject_Draw(&v0->unk_00[v1]);
}
if (v0->unk_16C != 0xff) {
@ -1428,7 +1428,7 @@ static void ov113_0225F680 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0
NNS_G3dMdlUseGlbAlpha(param1->unk_0C.model);
}
sub_02017294(&param1->unk_1C);
Easy3DObject_Draw(&param1->unk_1C);
}
static BOOL ov113_0225F70C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2)
@ -1452,12 +1452,12 @@ static int ov113_0225F728 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
switch (v0->unk_00) {
case 0:
sub_02017358(&param1->unk_1C, &v2, &v3, &v4);
Easy3DObject_GetPosition(&param1->unk_1C, &v2, &v3, &v4);
v0->unk_08 = v2;
v0->unk_00++;
case 1:
sub_02017358(&param1->unk_1C, &v2, &v3, &v4);
Easy3DObject_GetPosition(&param1->unk_1C, &v2, &v3, &v4);
if ((v2 < Unk_ov113_02260BBC.unk_00) || (v2 > Unk_ov113_02260BBC.unk_04) || (v3 > Unk_ov113_02260BBC.unk_08) || (v3 < Unk_ov113_02260BBC.unk_0C)) {
return 1;
@ -1470,7 +1470,7 @@ static int ov113_0225F728 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
}
v5 = FX_Mul(sub_0201D2B8(v0->unk_04), 0x8000);
sub_02017350(&param1->unk_1C, v0->unk_08 + v5, v3 - 0x1000, v4);
Easy3DObject_SetPosition(&param1->unk_1C, v0->unk_08 + v5, v3 - 0x1000, v4);
break;
}
@ -1506,7 +1506,7 @@ static int ov113_0225F818 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
}
v0->unk_00 += 0x300;
sub_0201736C(&param1->unk_1C, v0->unk_00, v0->unk_00, FX32_ONE);
Easy3DObject_SetScale(&param1->unk_1C, v0->unk_00, v0->unk_00, FX32_ONE);
break;
}
@ -1536,12 +1536,12 @@ static int ov113_0225F890 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
switch (v0->unk_F7) {
case 0:
v0->unk_F6 = ov113_0225EBFC(param0);
sub_02017358(&param1->unk_1C, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param1->unk_1C, &v1, &v2, &v3);
for (v5 = 0; v5 < 2; v5++) {
sub_02017258(&v0->unk_00[v5], &param1->unk_0C);
sub_02017350(&v0->unk_00[v5], v1, v2, v3);
sub_02017348(&v0->unk_00[v5], 1);
Easy3DObject_Init(&v0->unk_00[v5], &param1->unk_0C);
Easy3DObject_SetPosition(&v0->unk_00[v5], v1, v2, v3);
Easy3DObject_SetVisibility(&v0->unk_00[v5], 1);
}
v0->unk_F4 = 31 << 8;
@ -1549,10 +1549,10 @@ static int ov113_0225F890 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
case 1:
if (v0->unk_F4 - 0xa0 < 0x100) {
for (v5 = 0; v5 < 2; v5++) {
sub_02017348(&v0->unk_00[v5], 0);
Easy3DObject_SetVisibility(&v0->unk_00[v5], 0);
}
sub_02017348(&param1->unk_1C, 0);
Easy3DObject_SetVisibility(&param1->unk_1C, 0);
v0->unk_F7++;
break;
}
@ -1566,13 +1566,13 @@ static int ov113_0225F890 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
v4 = FX_Mul(sub_0201D2B8(v0->unk_F0), 0x10000);
sub_02017358(&param1->unk_1C, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param1->unk_1C, &v1, &v2, &v3);
for (v5 = 0; v5 < 2; v5++) {
if (v5 & 1) {
sub_02017350(&v0->unk_00[v5], v1 + v4, v2, v3);
Easy3DObject_SetPosition(&v0->unk_00[v5], v1 + v4, v2, v3);
} else {
sub_02017350(&v0->unk_00[v5], v1 - v4, v2, v3);
Easy3DObject_SetPosition(&v0->unk_00[v5], v1 - v4, v2, v3);
}
}
break;
@ -1602,10 +1602,10 @@ static void ov113_0225FA24 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0
}
for (v1 = 0; v1 < 2; v1++) {
sub_02017294(&v0->unk_00[v1]);
Easy3DObject_Draw(&v0->unk_00[v1]);
}
sub_02017294(&param1->unk_1C);
Easy3DObject_Draw(&param1->unk_1C);
}
static BOOL ov113_0225FA84 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2)
@ -1634,12 +1634,12 @@ static int ov113_0225FAB0 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
case 0:
v0->unk_F6 = ov113_0225EBFC(param0);
sub_02017358(&param1->unk_1C, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param1->unk_1C, &v1, &v2, &v3);
for (v5 = 0; v5 < 2; v5++) {
sub_02017258(&v0->unk_00[v5], &param1->unk_0C);
sub_02017350(&v0->unk_00[v5], v1, v2, v3);
sub_02017348(&v0->unk_00[v5], 1);
Easy3DObject_Init(&v0->unk_00[v5], &param1->unk_0C);
Easy3DObject_SetPosition(&v0->unk_00[v5], v1, v2, v3);
Easy3DObject_SetVisibility(&v0->unk_00[v5], 1);
}
v0->unk_F4 = 31 << 8;
@ -1647,10 +1647,10 @@ static int ov113_0225FAB0 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
case 1:
if (v0->unk_F4 - 0xa0 < 0x100) {
for (v5 = 0; v5 < 2; v5++) {
sub_02017348(&v0->unk_00[v5], 0);
Easy3DObject_SetVisibility(&v0->unk_00[v5], 0);
}
sub_02017348(&param1->unk_1C, 0);
Easy3DObject_SetVisibility(&param1->unk_1C, 0);
v0->unk_F7++;
break;
}
@ -1664,13 +1664,13 @@ static int ov113_0225FAB0 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
v4 = FX_Mul(sub_0201D2B8(v0->unk_F0), 0x10000);
sub_02017358(&param1->unk_1C, &v1, &v2, &v3);
Easy3DObject_GetPosition(&param1->unk_1C, &v1, &v2, &v3);
for (v5 = 0; v5 < 2; v5++) {
if (v5 & 1) {
sub_02017350(&v0->unk_00[v5], v1, v2 + v4, v3);
Easy3DObject_SetPosition(&v0->unk_00[v5], v1, v2 + v4, v3);
} else {
sub_02017350(&v0->unk_00[v5], v1, v2 - v4, v3);
Easy3DObject_SetPosition(&v0->unk_00[v5], v1, v2 - v4, v3);
}
}
break;
@ -1700,10 +1700,10 @@ static void ov113_0225FC44 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0
}
for (v1 = 0; v1 < 2; v1++) {
sub_02017294(&v0->unk_00[v1]);
Easy3DObject_Draw(&v0->unk_00[v1]);
}
sub_02017294(&param1->unk_1C);
Easy3DObject_Draw(&param1->unk_1C);
}
static BOOL ov113_0225FCA4 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2)
@ -1739,11 +1739,11 @@ static int ov113_0225FCD0 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02
}
v0->unk_00 += 0x180;
sub_0201736C(&param1->unk_1C, FX32_ONE, v0->unk_00, FX32_ONE);
Easy3DObject_SetScale(&param1->unk_1C, FX32_ONE, v0->unk_00, FX32_ONE);
v4 = -(FX32_ONE * 2 / 2 * (v0->unk_00 - FX32_ONE) / FX32_ONE);
sub_02017358(&param1->unk_1C, &v1, &v2, &v3);
sub_02017350(&param1->unk_1C, v1, v2 + v4, v3);
Easy3DObject_GetPosition(&param1->unk_1C, &v1, &v2, &v3);
Easy3DObject_SetPosition(&param1->unk_1C, v1, v2 + v4, v3);
break;
}

82
src/overlay115/ov115_02260CEC.c
View File

@ -3353,10 +3353,10 @@ static void ov115_02263DF8 (UnkStruct_ov115_02263DF8 * param0, NARC * param1, u3
for (v2 = 0; v2 < 3; v2++) {
Easy3DModel_LoadFrom(&param0->unk_168[v2], param1, v1[v2], param2);
sub_02017258(&param0->unk_00[v2], &param0->unk_168[v2]);
sub_02017348(&param0->unk_00[v2], 0);
sub_02017350(&param0->unk_00[v2], Unk_ov115_02265B20.x, Unk_ov115_02265B20.y + (-FX32_CONST(200)), Unk_ov115_02265B20.z);
sub_0201736C(&param0->unk_00[v2], (FX32_CONST(1.50f)), (FX32_CONST(1.50f)), (FX32_CONST(1.50f)));
Easy3DObject_Init(&param0->unk_00[v2], &param0->unk_168[v2]);
Easy3DObject_SetVisibility(&param0->unk_00[v2], 0);
Easy3DObject_SetPosition(&param0->unk_00[v2], Unk_ov115_02265B20.x, Unk_ov115_02265B20.y + (-FX32_CONST(200)), Unk_ov115_02265B20.z);
Easy3DObject_SetScale(&param0->unk_00[v2], (FX32_CONST(1.50f)), (FX32_CONST(1.50f)), (FX32_CONST(1.50f)));
}
for (v2 = 0; v2 < 6; v2++) {
@ -3382,7 +3382,7 @@ static void ov115_02263DF8 (UnkStruct_ov115_02263DF8 * param0, NARC * param1, u3
for (v2 = 0; v2 < 1; v2++) {
Easy3DAnim_LoadFrom(&param0->unk_214[v2], &param0->unk_168[Unk_ov115_02265AE0[v2]], param1, 32, param2, param3);
sub_0201727C(&param0->unk_00[Unk_ov115_02265AE0[v2]], &param0->unk_214[v2]);
Easy3DObject_AddAnim(&param0->unk_00[Unk_ov115_02265AE0[v2]], &param0->unk_214[v2]);
}
param0->unk_22C = 4;
@ -3390,9 +3390,9 @@ static void ov115_02263DF8 (UnkStruct_ov115_02263DF8 * param0, NARC * param1, u3
ov115_0226422C(param0, 0);
sub_0201727C(&param0->unk_00[1], &param0->unk_198[4]);
Easy3DObject_AddAnim(&param0->unk_00[1], &param0->unk_198[4]);
Easy3DAnim_SetFrame(&param0->unk_198[4], 0);
sub_02017348(&param0->unk_00[1], 1);
Easy3DObject_SetVisibility(&param0->unk_00[1], 1);
param0->unk_210 = 4;
}
@ -3448,7 +3448,7 @@ static void ov115_022640C0 (UnkStruct_ov115_02263DF8 * param0, const UnkStruct_o
int v0;
for (v0 = 0; v0 < 3; v0++) {
sub_02017350(&param0->unk_00[v0], param1->unk_D8.x, param1->unk_D8.y, param1->unk_D8.z);
Easy3DObject_SetPosition(&param0->unk_00[v0], param1->unk_D8.x, param1->unk_D8.y, param1->unk_D8.z);
}
}
@ -3461,7 +3461,7 @@ static void ov115_022640EC (UnkStruct_ov115_02263DF8 * param0, const UnkStruct_o
v2 = param1->unk_02 + (((0 * 0xffff) / 360));
for (v0 = 0; v0 < 3; v0++) {
sub_02017388(&param0->unk_00[v0], (u16)v2, 1);
Easy3DObject_SetRotation(&param0->unk_00[v0], (u16)v2, 1);
}
}
@ -3470,7 +3470,7 @@ static void ov115_02264110 (UnkStruct_ov115_02263DF8 * param0, const UnkStruct_o
int v0;
for (v0 = 0; v0 < 3; v0++) {
sub_0201736C(&param0->unk_00[v0], param1->unk_D4, param1->unk_D4, param1->unk_D4);
Easy3DObject_SetScale(&param0->unk_00[v0], param1->unk_D4, param1->unk_D4, param1->unk_D4);
}
}
@ -3479,7 +3479,7 @@ static void ov115_02264134 (UnkStruct_ov115_02263DF8 * param0, const UnkStruct_o
int v0;
for (v0 = 0; v0 < 3; v0++) {
sub_02017294(&param0->unk_00[v0]);
Easy3DObject_Draw(&param0->unk_00[v0]);
}
}
@ -3500,11 +3500,11 @@ static void ov115_02264190 (UnkStruct_ov115_02263DF8 * param0, u32 param1)
GF_ASSERT(param1 < 6);
if (param0->unk_210 != param1) {
sub_02017288(&param0->unk_00[Unk_ov115_02266644[param0->unk_210]], &param0->unk_198[param0->unk_210]);
sub_0201727C(&param0->unk_00[Unk_ov115_02266644[param1]], &param0->unk_198[param1]);
Easy3DObject_RemoveAnim(&param0->unk_00[Unk_ov115_02266644[param0->unk_210]], &param0->unk_198[param0->unk_210]);
Easy3DObject_AddAnim(&param0->unk_00[Unk_ov115_02266644[param1]], &param0->unk_198[param1]);
Easy3DAnim_SetFrame(&param0->unk_198[param1], 0);
sub_02017348(&param0->unk_00[Unk_ov115_02266644[param0->unk_210]], 0);
sub_02017348(&param0->unk_00[Unk_ov115_02266644[param1]], 1);
Easy3DObject_SetVisibility(&param0->unk_00[Unk_ov115_02266644[param0->unk_210]], 0);
Easy3DObject_SetVisibility(&param0->unk_00[Unk_ov115_02266644[param1]], 1);
param0->unk_210 = param1;
}
}
@ -3518,9 +3518,9 @@ static void ov115_0226422C (UnkStruct_ov115_02263DF8 * param0, BOOL param1)
{
if (param0->unk_212 != param1) {
if (param1 == 1) {
sub_0201727C(&param0->unk_00[Unk_ov115_02266644[0]], &param0->unk_198[0]);
Easy3DObject_AddAnim(&param0->unk_00[Unk_ov115_02266644[0]], &param0->unk_198[0]);
} else {
sub_02017288(&param0->unk_00[Unk_ov115_02266644[0]], &param0->unk_198[0]);
Easy3DObject_RemoveAnim(&param0->unk_00[Unk_ov115_02266644[0]], &param0->unk_198[0]);
}
param0->unk_212 = param1;
@ -3721,8 +3721,8 @@ static void ov115_022646BC (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
sub_02021CAC(param1->unk_00, 0);
}
sub_02017258(&param1->unk_7C, &param0->unk_760.unk_50);
sub_02017348(&param1->unk_7C, 0);
Easy3DObject_Init(&param1->unk_7C, &param0->unk_760.unk_50);
Easy3DObject_SetVisibility(&param1->unk_7C, 0);
}
static void ov115_02264728 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_022647A0 * param1)
@ -3774,12 +3774,12 @@ static void ov115_022647A0 (UnkStruct_ov115_022647A0 * param0, UnkStruct_ov115_0
}
ov115_02264A54(param0);
sub_02017350(&param0->unk_04, param0->unk_F8->unk_2C.x, param0->unk_F8->unk_2C.y, param0->unk_F8->unk_2C.z);
sub_02017294(&param0->unk_04);
Easy3DObject_SetPosition(&param0->unk_04, param0->unk_F8->unk_2C.x, param0->unk_F8->unk_2C.y, param0->unk_F8->unk_2C.z);
Easy3DObject_Draw(&param0->unk_04);
if (sub_0201734C(&param0->unk_7C) == 1) {
if (Easy3DObject_GetVisibility(&param0->unk_7C) == 1) {
ov115_02264848(param0);
sub_02017294(&param0->unk_7C);
Easy3DObject_Draw(&param0->unk_7C);
ov115_02264908(param0);
}
}
@ -3807,12 +3807,12 @@ static void ov115_02264848 (UnkStruct_ov115_022647A0 * param0)
}
}
sub_02017350(&param0->unk_7C, param0->unk_F8->unk_2C.x, v2, param0->unk_F8->unk_2C.z);
Easy3DObject_SetPosition(&param0->unk_7C, param0->unk_F8->unk_2C.x, v2, param0->unk_F8->unk_2C.z);
v1 = param0->unk_F8->unk_2C.y - v2;
v3 = FX32_ONE + (FX_Div(FX_Mul(v1, (FX32_CONST(1))), (FX32_CONST(300))));
sub_0201736C(&param0->unk_7C, v3, v3, v3);
Easy3DObject_SetScale(&param0->unk_7C, v3, v3, v3);
v4 = (FX_Div(FX_Mul(v1, FX32_CONST(16)), (FX32_CONST(300)))) >> FX32_SHIFT;
v4 = 8 + 16 - v4;
@ -3831,7 +3831,7 @@ static void ov115_02264924 (UnkStruct_ov115_022647A0 * param0)
param0->unk_F4 = 0;
sub_02021CAC(param0->unk_00, 0);
sub_02017348(&param0->unk_7C, 0);
Easy3DObject_SetVisibility(&param0->unk_7C, 0);
}
static UnkStruct_ov115_022647A0 * ov115_02264948 (UnkStruct_ov115_02261ADC * param0)
@ -3880,11 +3880,11 @@ static void ov115_022649F0 (UnkStruct_ov115_022647A0 * param0, UnkStruct_ov115_0
v0 = ov115_02264A40(param0->unk_F8, &param1->unk_760);
sub_02017258(&param0->unk_04, v0);
sub_02017348(&param0->unk_04, 1);
Easy3DObject_Init(&param0->unk_04, v0);
Easy3DObject_SetVisibility(&param0->unk_04, 1);
if (param0->unk_F8->unk_00 == 1) {
sub_02017348(&param0->unk_7C, 1);
Easy3DObject_SetVisibility(&param0->unk_7C, 1);
}
}
@ -3922,8 +3922,8 @@ static void ov115_02264A54 (UnkStruct_ov115_022647A0 * param0)
param0->unk_FC += param0->unk_100;
param0->unk_FE += param0->unk_102;
sub_02017388(&param0->unk_04, param0->unk_FC, 0);
sub_02017388(&param0->unk_04, param0->unk_FE, 2);
Easy3DObject_SetRotation(&param0->unk_04, param0->unk_FC, 0);
Easy3DObject_SetRotation(&param0->unk_04, param0->unk_FE, 2);
}
static void ov115_02264B40 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_02264BA0 * param1, u32 param2, u32 param3)
@ -4132,24 +4132,24 @@ static void ov115_02264E48 (UnkStruct_ov115_02264FA0 * param0, UnkStruct_ov115_0
}
Easy3DModel_LoadFrom(&param0->unk_168[v4], param2, v3, param5);
sub_02017258(&param0->unk_00[v4], &param0->unk_168[v4]);
sub_02017350(&param0->unk_00[v4], 0, ((FX32_CONST(-90)) - FX32_CONST(8)), 0);
sub_0201736C(&param0->unk_00[v4], (FX32_CONST(1.50f)), (FX32_CONST(1.50f)), (FX32_CONST(1.50f)));
Easy3DObject_Init(&param0->unk_00[v4], &param0->unk_168[v4]);
Easy3DObject_SetPosition(&param0->unk_00[v4], 0, ((FX32_CONST(-90)) - FX32_CONST(8)), 0);
Easy3DObject_SetScale(&param0->unk_00[v4], (FX32_CONST(1.50f)), (FX32_CONST(1.50f)), (FX32_CONST(1.50f)));
if (v4 == 1) {
sub_02017348(&param0->unk_00[v4], 0);
Easy3DObject_SetVisibility(&param0->unk_00[v4], 0);
}
if ((v4 == 0) || (v4 == 1)) {
sub_02017388(&param0->unk_00[v4], Unk_ov115_02265C5C[param3 - 1][param4], 1);
Easy3DObject_SetRotation(&param0->unk_00[v4], Unk_ov115_02265C5C[param3 - 1][param4], 1);
} else {
sub_02017388(&param0->unk_00[v4], (sub_0201D278(180)), 1);
Easy3DObject_SetRotation(&param0->unk_00[v4], (sub_0201D278(180)), 1);
}
}
for (v4 = 0; v4 < 3; v4++) {
Easy3DAnim_LoadFrom(&param0->unk_198[v4], &param0->unk_168[v2[v4]], param2, v1[v4], param5, param6);
sub_0201727C(&param0->unk_00[v2[v4]], &param0->unk_198[v4]);
Easy3DObject_AddAnim(&param0->unk_00[v2[v4]], &param0->unk_198[v4]);
}
param0->unk_1D4 = (FX32_CONST(1));
@ -4223,14 +4223,14 @@ static void ov115_02264FA0 (UnkStruct_ov115_02264FA0 * param0)
}
for (v0 = 0; v0 < 3; v0++) {
sub_02017294(&param0->unk_00[v0]);
Easy3DObject_Draw(&param0->unk_00[v0]);
}
}
static void ov115_022650C8 (UnkStruct_ov115_02264FA0 * param0)
{
sub_02017348(&param0->unk_00[0], 0);
sub_02017348(&param0->unk_00[1], 1);
Easy3DObject_SetVisibility(&param0->unk_00[0], 0);
Easy3DObject_SetVisibility(&param0->unk_00[1], 1);
param0->unk_1DC = 0;
param0->unk_1E0 = (FX32_CONST(1.0));

12
src/overlay116/ov116_022604C4.c
View File

@ -139,9 +139,9 @@ static void ov116_022604C4 (UnkStruct_ov116_0226139C * param0)
ov116_022618B4(&param0->unk_04->unk_B38[v4], param0->unk_14.unk_00);
Easy3DAnim_LoadFrom(&param0->unk_04->unk_B38[v4].unk_88[0], &param0->unk_04->unk_B38[v4].unk_78, param0->unk_48.unk_00, v5[v4][1], 106, &param0->unk_48.unk_24);
sub_0201727C(&param0->unk_04->unk_B38[v4].unk_00, &param0->unk_04->unk_B38[v4].unk_88[0]);
Easy3DObject_AddAnim(&param0->unk_04->unk_B38[v4].unk_00, &param0->unk_04->unk_B38[v4].unk_88[0]);
Easy3DAnim_SetFrame(&param0->unk_04->unk_B38[v4].unk_88[0], 0);
sub_02017348(&param0->unk_04->unk_B38[v4].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_04->unk_B38[v4].unk_00, 0);
{
int v6 = 5;
@ -167,7 +167,7 @@ static void ov116_022604C4 (UnkStruct_ov116_0226139C * param0)
ov116_022618A8(&param0->unk_04->unk_92C, param0->unk_48.unk_00, 71);
ov116_022618B4(&param0->unk_04->unk_92C, param0->unk_14.unk_00);
sub_02017348(&param0->unk_04->unk_92C.unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_04->unk_92C.unk_00, 0);
{
int v7[] = {
@ -196,7 +196,7 @@ static void ov116_022604C4 (UnkStruct_ov116_0226139C * param0)
v10 = 53;
Easy3DAnim_LoadFrom(&v9->unk_88[0], &v9->unk_78, param0->unk_48.unk_00, v10, 106, &param0->unk_48.unk_24);
sub_0201727C(&v9->unk_00, &v9->unk_88[0]);
Easy3DObject_AddAnim(&v9->unk_00, &v9->unk_88[0]);
Easy3DAnim_SetFrame(&v9->unk_88[0], 0);
v10 = 52;
@ -210,13 +210,13 @@ static void ov116_022604C4 (UnkStruct_ov116_0226139C * param0)
v9 = &param0->unk_04->unk_308[1];
v10 = 56;
Easy3DAnim_LoadFrom(&v9->unk_88[0], &v9->unk_78, param0->unk_48.unk_00, v10, 106, &param0->unk_48.unk_24);
sub_0201727C(&v9->unk_00, &v9->unk_88[0]);
Easy3DObject_AddAnim(&v9->unk_00, &v9->unk_88[0]);
Easy3DAnim_SetFrame(&v9->unk_88[0], 0);
v9 = &param0->unk_04->unk_308[2];
v10 = 54;
Easy3DAnim_LoadFrom(&v9->unk_88[0], &v9->unk_78, param0->unk_48.unk_00, v10, 106, &param0->unk_48.unk_24);
sub_0201727C(&v9->unk_00, &v9->unk_88[0]);
Easy3DObject_AddAnim(&v9->unk_00, &v9->unk_88[0]);
Easy3DAnim_SetFrame(&v9->unk_88[0], 0);
}
}

38
src/overlay116/ov116_02261870.c
View File

@ -44,12 +44,12 @@ void include_ov116_02261870(void);
void ov116_02261870 (Easy3DObject * param0, MtxFx43 * param1, VecFx32 * param2)
{
if (param0->unk_6C) {
if (param0->visible) {
NNS_G3dGlbFlush();
NNS_G3dGeTranslateVec(param2);
NNS_G3dGeMultMtx43(param1);
NNS_G3dGlbSetBaseScale(&param0->unk_60);
NNS_G3dDraw(&param0->unk_00);
NNS_G3dGlbSetBaseScale(&param0->scale);
NNS_G3dDraw(&param0->renderObj);
}
}
@ -86,16 +86,16 @@ void ov116_022618A8 (UnkStruct_ov116_0226501C * param0, NARC * param1, int param
void ov116_022618B4 (UnkStruct_ov116_0226501C * param0, int param1)
{
sub_02017258(&param0->unk_00, &param0->unk_78);
sub_02017350(&param0->unk_00, (0 * FX32_ONE), (-20 * FX32_ONE), (0 * FX32_ONE));
Easy3DObject_Init(&param0->unk_00, &param0->unk_78);
Easy3DObject_SetPosition(&param0->unk_00, (0 * FX32_ONE), (-20 * FX32_ONE), (0 * FX32_ONE));
if (param1 == 0) {
sub_0201736C(&param0->unk_00, FX32_CONST(1.00f), FX32_CONST(1.00f), FX32_CONST(1.00f));
Easy3DObject_SetScale(&param0->unk_00, FX32_CONST(1.00f), FX32_CONST(1.00f), FX32_CONST(1.00f));
} else {
sub_0201736C(&param0->unk_00, FX32_CONST(1.50f), FX32_CONST(1.50f), FX32_CONST(1.50f));
Easy3DObject_SetScale(&param0->unk_00, FX32_CONST(1.50f), FX32_CONST(1.50f), FX32_CONST(1.50f));
}
sub_02017348(&param0->unk_00, 1);
Easy3DObject_SetVisibility(&param0->unk_00, 1);
param0->unk_1E0.x = (0 * FX32_ONE);
param0->unk_1E0.y = (-20 * FX32_ONE);
@ -130,21 +130,21 @@ void ov116_02261940 (UnkStruct_ov116_0226139C * param0)
switch (param0->unk_04->unk_F8) {
case 0:
sub_02017348(&param0->unk_04->unk_308[0].unk_00, 1);
sub_02017348(&param0->unk_04->unk_308[1].unk_00, 0);
sub_02017348(&param0->unk_04->unk_308[2].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_04->unk_308[0].unk_00, 1);
Easy3DObject_SetVisibility(&param0->unk_04->unk_308[1].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_04->unk_308[2].unk_00, 0);
Easy3DAnim_UpdateLooped(&param0->unk_04->unk_308[0].unk_88[param0->unk_04->unk_308[0].unk_1F4], FX32_CONST(1));
break;
case 1:
sub_02017348(&param0->unk_04->unk_308[0].unk_00, 0);
sub_02017348(&param0->unk_04->unk_308[1].unk_00, 1);
sub_02017348(&param0->unk_04->unk_308[2].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_04->unk_308[0].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_04->unk_308[1].unk_00, 1);
Easy3DObject_SetVisibility(&param0->unk_04->unk_308[2].unk_00, 0);
Easy3DAnim_Update(&param0->unk_04->unk_308[1].unk_88[0], FX32_CONST(1));
break;
case 2:
sub_02017348(&param0->unk_04->unk_308[0].unk_00, 0);
sub_02017348(&param0->unk_04->unk_308[1].unk_00, 0);
sub_02017348(&param0->unk_04->unk_308[2].unk_00, 1);
Easy3DObject_SetVisibility(&param0->unk_04->unk_308[0].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_04->unk_308[1].unk_00, 0);
Easy3DObject_SetVisibility(&param0->unk_04->unk_308[2].unk_00, 1);
Easy3DAnim_Update(&param0->unk_04->unk_308[2].unk_88[0], FX32_CONST(1));
break;
}
@ -187,9 +187,9 @@ void ov116_02261C48 (UnkStruct_ov116_02262A8C * param0, int param1)
return;
}
sub_02017288(&param0->unk_308[0].unk_00, &param0->unk_308[0].unk_88[v0]);
Easy3DObject_RemoveAnim(&param0->unk_308[0].unk_00, &param0->unk_308[0].unk_88[v0]);
param0->unk_308[0].unk_1F4 = param1;
sub_0201727C(&param0->unk_308[0].unk_00, &param0->unk_308[0].unk_88[v1]);
Easy3DObject_AddAnim(&param0->unk_308[0].unk_00, &param0->unk_308[0].unk_88[v1]);
}
void ov116_02261C88 (UnkStruct_ov116_0226139C * param0)

20
src/overlay116/ov116_02262A8C.c
View File

@ -713,11 +713,11 @@ static void ov116_02263434 (SysTask * param0, void * param1)
case 1:
Easy3DAnim_LoadFrom(&v2->unk_88[0], &v2->unk_78, v1->unk_3C->unk_00, Unk_ov116_02267B9C[0][0], 106, &v1->unk_3C->unk_24);
Easy3DAnim_LoadFrom(&v2->unk_88[1], &v2->unk_78, v1->unk_3C->unk_00, Unk_ov116_02267B9C[0][1], 106, &v1->unk_3C->unk_24);
sub_0201727C(&v2->unk_00, &v2->unk_88[0]);
sub_0201727C(&v2->unk_00, &v2->unk_88[1]);
Easy3DObject_AddAnim(&v2->unk_00, &v2->unk_88[0]);
Easy3DObject_AddAnim(&v2->unk_00, &v2->unk_88[1]);
Easy3DAnim_SetFrame(&v2->unk_88[0], 0);
Easy3DAnim_SetFrame(&v2->unk_88[1], 0);
sub_02017348(&v2->unk_00, 0);
Easy3DObject_SetVisibility(&v2->unk_00, 0);
v2->unk_1EC = 0;
@ -737,11 +737,11 @@ static void ov116_02263434 (SysTask * param0, void * param1)
Easy3DAnim_LoadFrom(&v3->unk_88[0], &v3->unk_78, v1->unk_3C->unk_00, Unk_ov116_02267B9C[1][0], 106, &v1->unk_3C->unk_24);
Easy3DAnim_LoadFrom(&v3->unk_88[1], &v3->unk_78, v1->unk_3C->unk_00, Unk_ov116_02267B9C[1][1], 106, &v1->unk_3C->unk_24);
sub_0201727C(&v3->unk_00, &v3->unk_88[0]);
sub_0201727C(&v3->unk_00, &v3->unk_88[1]);
Easy3DObject_AddAnim(&v3->unk_00, &v3->unk_88[0]);
Easy3DObject_AddAnim(&v3->unk_00, &v3->unk_88[1]);
Easy3DAnim_SetFrame(&v3->unk_88[0], 0);
Easy3DAnim_SetFrame(&v3->unk_88[1], 0);
sub_02017348(&v3->unk_00, 1);
Easy3DObject_SetVisibility(&v3->unk_00, 1);
v3->unk_1EC = 1;
@ -751,8 +751,8 @@ static void ov116_02263434 (SysTask * param0, void * param1)
ov116_0226432C(v3, 0, 0, -5, -5, (0.80), 0);
if (v1->unk_40) {
sub_02017350(&v2->unk_00, 0, (-8 * FX32_ONE), 0);
sub_02017350(&v3->unk_00, 0, (-8 * FX32_ONE), 0);
Easy3DObject_SetPosition(&v2->unk_00, 0, (-8 * FX32_ONE), 0);
Easy3DObject_SetPosition(&v3->unk_00, 0, (-8 * FX32_ONE), 0);
v2->unk_1E0.y = (-8 * FX32_ONE);
v3->unk_1E0.y = (-8 * FX32_ONE);
}
@ -761,8 +761,8 @@ static void ov116_02263434 (SysTask * param0, void * param1)
break;
case 4:
if (v3->unk_1EC == 0) {
sub_02017348(&v2->unk_00, 1);
sub_02017348(&v3->unk_00, 0);
Easy3DObject_SetVisibility(&v2->unk_00, 1);
Easy3DObject_SetVisibility(&v3->unk_00, 0);
v2->unk_1EC = 1;
v1->unk_00++;
}

8
src/overlay116/ov116_0226432C.c
View File

@ -637,7 +637,7 @@ static void ov116_0226501C (UnkStruct_ov116_02265470 * param0)
break;
case 1:
sub_02017348(&v0->unk_00, 1);
Easy3DObject_SetVisibility(&v0->unk_00, 1);
param0->unk_28[0] = 0;
param0->unk_00++;
break;
@ -668,7 +668,7 @@ static void ov116_0226501C (UnkStruct_ov116_02265470 * param0)
param0->unk_04 = 0;
param0->unk_00 = 0;
sub_02017348(&v0->unk_00, 0);
Easy3DObject_SetVisibility(&v0->unk_00, 0);
break;
}
@ -770,7 +770,7 @@ static void ov116_02265260 (UnkStruct_ov116_02265470 * param0)
UnkStruct_ov116_0226501C * v1 = param0->unk_08[v0];
Easy3DAnim_SetFrame(&v1->unk_88[0], (v0 * 20) % 40);
sub_02017348(&v1->unk_00, 1);
Easy3DObject_SetVisibility(&v1->unk_00, 1);
}
param0->unk_28[9] = 0;
@ -787,7 +787,7 @@ static void ov116_02265260 (UnkStruct_ov116_02265470 * param0)
for (v0 = 0; v0 < 8; v0++) {
UnkStruct_ov116_0226501C * v2 = param0->unk_08[v0];
sub_02017348(&v2->unk_00, 0);
Easy3DObject_SetVisibility(&v2->unk_00, 0);
}
param0->unk_50[0] = 0;

34
src/overlay117/ov117_02260668.c
View File

@ -610,8 +610,8 @@ static void ov117_02260F7C (SysTask * param0, void * param1)
NNS_G3dGePushMtx();
{
sub_02017294(&v0->unk_13A0.unk_10);
sub_02017294(&v0->unk_D8.unk_10);
Easy3DObject_Draw(&v0->unk_13A0.unk_10);
Easy3DObject_Draw(&v0->unk_D8.unk_10);
ov117_02261FA4(v0);
}
@ -1352,10 +1352,10 @@ static void ov117_02261C2C (UnkStruct_ov117_02261280 * param0, NARC * param1)
v4 = ov117_0226235C(param0, CommSys_CurNetId());
Easy3DModel_LoadFrom(&v2->unk_00, param1, Unk_ov117_022669F0[v4].unk_00, 110);
sub_02017258(&v2->unk_10, &v2->unk_00);
sub_02017350(&v2->unk_10, (FX32_CONST(0)), (FX32_CONST(-25)), (FX32_CONST(0)));
sub_0201736C(&v2->unk_10, (FX32_CONST(1.00f)), (FX32_CONST(1.00f)), (FX32_CONST(1.00f)));
sub_02017348(&v2->unk_10, 1);
Easy3DObject_Init(&v2->unk_10, &v2->unk_00);
Easy3DObject_SetPosition(&v2->unk_10, (FX32_CONST(0)), (FX32_CONST(-25)), (FX32_CONST(0)));
Easy3DObject_SetScale(&v2->unk_10, (FX32_CONST(1.00f)), (FX32_CONST(1.00f)), (FX32_CONST(1.00f)));
Easy3DObject_SetVisibility(&v2->unk_10, 1);
Easy3DModel_LoadFrom(&v2->unk_88[0], param1, Unk_ov117_022669F0[v4].unk_04, 110);
Easy3DModel_LoadFrom(&v2->unk_88[1], param1, Unk_ov117_022669F0[v4].unk_08, 110);
Easy3DModel_LoadFrom(&v2->unk_88[2], param1, Unk_ov117_022669F0[v4].unk_0C, 110);
@ -1375,10 +1375,10 @@ static void ov117_02261C2C (UnkStruct_ov117_02261280 * param0, NARC * param1)
}
Easy3DModel_LoadFrom(&v3->unk_00, param1, 30, 110);
sub_02017258(&v3->unk_10, &v3->unk_00);
sub_02017350(&v3->unk_10, (FX32_CONST(0)), (FX32_CONST(-25)), (FX32_CONST(0)));
sub_0201736C(&v3->unk_10, (FX32_CONST(1.00f)), (FX32_CONST(1.00f)), (FX32_CONST(1.00f)));
sub_02017348(&v3->unk_10, 1);
Easy3DObject_Init(&v3->unk_10, &v3->unk_00);
Easy3DObject_SetPosition(&v3->unk_10, (FX32_CONST(0)), (FX32_CONST(-25)), (FX32_CONST(0)));
Easy3DObject_SetScale(&v3->unk_10, (FX32_CONST(1.00f)), (FX32_CONST(1.00f)), (FX32_CONST(1.00f)));
Easy3DObject_SetVisibility(&v3->unk_10, 1);
}
static void ov117_02261DD0 (UnkStruct_ov117_02261280 * param0)
@ -1421,12 +1421,12 @@ BOOL ov117_02261E38 (UnkStruct_ov117_02261280 * param0, int param1)
for (v2 = 0; v2 < 8; v2++) {
if (v0->unk_C8[v2][v3].unk_00 == 0) {
sub_02017258(&v0->unk_C8[v2][v3].unk_04, v1);
sub_02017350(&v0->unk_C8[v2][v3].unk_04, (FX32_CONST(0)), (FX32_CONST(-25)), (FX32_CONST(0)));
sub_0201736C(&v0->unk_C8[v2][v3].unk_04, (FX32_CONST(1.00f)), (FX32_CONST(1.00f)), (FX32_CONST(1.00f)));
sub_02017348(&v0->unk_C8[v2][v3].unk_04, 1);
Easy3DObject_Init(&v0->unk_C8[v2][v3].unk_04, v1);
Easy3DObject_SetPosition(&v0->unk_C8[v2][v3].unk_04, (FX32_CONST(0)), (FX32_CONST(-25)), (FX32_CONST(0)));
Easy3DObject_SetScale(&v0->unk_C8[v2][v3].unk_04, (FX32_CONST(1.00f)), (FX32_CONST(1.00f)), (FX32_CONST(1.00f)));
Easy3DObject_SetVisibility(&v0->unk_C8[v2][v3].unk_04, 1);
Easy3DAnim_SetFrame(&v0->unk_C8[v2][v3].unk_7C, 0);
sub_0201727C(&v0->unk_C8[v2][v3].unk_04, &v0->unk_C8[v2][v3].unk_7C);
Easy3DObject_AddAnim(&v0->unk_C8[v2][v3].unk_04, &v0->unk_C8[v2][v3].unk_7C);
v0->unk_C8[v2][v3].unk_00 = 1;
@ -1442,7 +1442,7 @@ void ov117_02261F08 (UnkStruct_ov117_02261280 * param0, int param1, int param2)
{
UnkStruct_ov117_02261F08 * v0 = &param0->unk_D8;
sub_02017288(&v0->unk_C8[param1][param2].unk_04, &v0->unk_C8[param1][param2].unk_7C);
Easy3DObject_RemoveAnim(&v0->unk_C8[param1][param2].unk_04, &v0->unk_C8[param1][param2].unk_7C);
v0->unk_C8[param1][param2].unk_00 = 0;
}
@ -1470,7 +1470,7 @@ void ov117_02261FA4 (UnkStruct_ov117_02261280 * param0)
for (v1 = 0; v1 < 8; v1++) {
for (v2 = 0; v2 < 4; v2++) {
if (v0->unk_C8[v1][v2].unk_00 == 1) {
sub_02017294(&v0->unk_C8[v1][v2].unk_04);
Easy3DObject_Draw(&v0->unk_C8[v1][v2].unk_04);
}
}
}