rename PSVEC to VEC

This is the correct name for the Vec functions for Dolphin. This also applies to PSMTX...
This commit is contained in:
CreateSource 2024-08-09 23:53:58 -04:00
parent 64413586b9
commit afa9c0a4b5
82 changed files with 968 additions and 968 deletions

View file

@ -137,7 +137,7 @@ void fn_1_4034(s32 arg0)
HuPrcSleep(8);
lbl_1_bss_64 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x26), lbl_1_data_244, 0);
Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_data_118), lbl_1_data_22C[arg0], &sp40);
PSVECAdd(&sp40, &lbl_1_data_2A4[arg0], &sp40);
VECAdd(&sp40, &lbl_1_data_2A4[arg0], &sp40);
BoardModelMotionStart(lbl_1_bss_64, 4, 0);
sp40.y = -50.0f;
BoardModelPosSetV(lbl_1_bss_64, &sp40);
@ -188,9 +188,9 @@ void fn_1_4034(s32 arg0)
BoardPlayerPosGet(lbl_1_bss_68, &sp28);
var_f27 = sqrtf(((sp40.x - sp28.x) * (sp40.x - sp28.x)) + ((sp40.z - sp28.z) * (sp40.z - sp28.z)));
PSVECSubtract(&sp40, &sp28, &sp1C);
PSVECNormalize(&sp1C, &sp1C);
PSVECScale(&sp1C, &sp1C, var_f27 / 50.0f);
VECSubtract(&sp40, &sp28, &sp1C);
VECNormalize(&sp1C, &sp1C);
VECScale(&sp1C, &sp1C, var_f27 / 50.0f);
BoardPlayerMotionStart(lbl_1_bss_68, 4, 0);
var_f26 = 0.0f;
temp_f22 = 15.0f;
@ -198,7 +198,7 @@ void fn_1_4034(s32 arg0)
loop_37:
sp1C.y = temp_f22 - (0.075f * (0.25f * (var_f26 * var_f26)));
var_f26++;
PSVECAdd(&sp28, &sp1C, &sp28);
VECAdd(&sp28, &sp1C, &sp28);
var_f27 = sqrtf(((sp40.x - sp28.x) * (sp40.x - sp28.x)) + ((sp40.z - sp28.z) * (sp40.z - sp28.z)));
if (var_f27 < 5.0f) {
sp1C.x = sp1C.z = 0.0f;
@ -319,9 +319,9 @@ void fn_1_4EB4(s32 arg1, s32 arg2, Vec *arg3)
temp_f23 = 10.0f;
BoardModelPosGet(lbl_1_bss_64, &sp3C);
arg3->y = sp3C.y;
PSVECSubtract(arg3, &sp3C, &sp24);
PSVECNormalize(&sp24, &sp24);
PSVECScale(&sp24, &sp24, temp_f23);
VECSubtract(arg3, &sp3C, &sp24);
VECNormalize(&sp24, &sp24);
VECScale(&sp24, &sp24, temp_f23);
temp_r28 = HuAudFXPlay(0x47F);
BoardModelPosGet(lbl_1_bss_64, &sp18);
temp_r30 = fn_1_66C0(4, &sp18);
@ -338,7 +338,7 @@ void fn_1_4EB4(s32 arg1, s32 arg2, Vec *arg3)
break;
}
else {
PSVECAdd(&sp3C, &sp24, &sp3C);
VECAdd(&sp3C, &sp24, &sp3C);
BoardModelPosSetV(lbl_1_bss_64, &sp3C);
sp30 = sp3C;
sp30.y += 20.0f;
@ -361,9 +361,9 @@ void fn_1_4EB4(s32 arg1, s32 arg2, Vec *arg3)
BoardPlayerPosGet(lbl_1_bss_68, &sp30);
var_f28 = sqrtf(((sp3C.x - sp30.x) * (sp3C.x - sp30.x)) + ((sp3C.z - sp30.z) * (sp3C.z - sp30.z)));
PSVECSubtract(&sp3C, &sp30, &sp24);
PSVECNormalize(&sp24, &sp24);
PSVECScale(&sp24, &sp24, var_f28 / 45.0f);
VECSubtract(&sp3C, &sp30, &sp24);
VECNormalize(&sp24, &sp24);
VECScale(&sp24, &sp24, var_f28 / 45.0f);
BoardPlayerMotionStart(lbl_1_bss_68, 4, 0);
var_f24 = 0.0f;
@ -372,7 +372,7 @@ void fn_1_4EB4(s32 arg1, s32 arg2, Vec *arg3)
while (1) {
sp24.y = temp_f19 - (0.075f * (0.25f * (var_f24 * var_f24)));
var_f24++;
PSVECAdd(&sp30, &sp24, &sp30);
VECAdd(&sp30, &sp24, &sp30);
var_f28 = sqrtf(((sp3C.x - sp30.x) * (sp3C.x - sp30.x)) + ((sp3C.z - sp30.z) * (sp3C.z - sp30.z)));
if (var_f28 < 5.0f) {
sp24.x = sp24.z = 0.0f;
@ -449,9 +449,9 @@ void fn_1_5794(s32 arg0, s32 arg1, Vec *arg2)
fn_1_62AC(arg0, arg2);
temp_f22 = 10.0f;
arg2->y = sp58.y;
PSVECSubtract(arg2, &sp58, &sp40);
PSVECNormalize(&sp40, &sp40);
PSVECScale(&sp40, &sp40, temp_f22);
VECSubtract(arg2, &sp58, &sp40);
VECNormalize(&sp40, &sp40);
VECScale(&sp40, &sp40, temp_f22);
if (arg0 == 5) {
var_r29 = 0x96;
}
@ -483,7 +483,7 @@ void fn_1_5794(s32 arg0, s32 arg1, Vec *arg2)
break;
}
else {
PSVECAdd(&sp58, &sp40, &sp58);
VECAdd(&sp58, &sp40, &sp58);
sp64 = sp58;
if (var_r29 == 0) {
sp58.y += 250.0 * sin((M_PI * var_f28) / 180.0);
@ -548,16 +548,16 @@ void fn_1_5794(s32 arg0, s32 arg1, Vec *arg2)
}
BoardPlayerPosGet(lbl_1_bss_68, &sp4C);
var_f27 = sqrtf(((sp58.x - sp4C.x) * (sp58.x - sp4C.x)) + ((sp58.z - sp4C.z) * (sp58.z - sp4C.z)));
PSVECSubtract(&sp58, &sp4C, &sp40);
PSVECNormalize(&sp40, &sp40);
PSVECScale(&sp40, &sp40, var_f27 / 45.0f);
VECSubtract(&sp58, &sp4C, &sp40);
VECNormalize(&sp40, &sp40);
VECScale(&sp40, &sp40, var_f27 / 45.0f);
BoardPlayerMotionStart(lbl_1_bss_68, 4, 0);
var_f23 = 0.0f;
temp_f18 = 15.0f;
while (1) {
sp40.y = temp_f18 - (0.075f * (0.25f * (var_f23 * var_f23)));
var_f23++;
PSVECAdd(&sp4C, &sp40, &sp4C);
VECAdd(&sp4C, &sp40, &sp4C);
var_f27 = sqrtf(((sp58.x - sp4C.x) * (sp58.x - sp4C.x)) + ((sp58.z - sp4C.z) * (sp58.z - sp4C.z)));
if (var_f27 < 5.0f) {
sp40.x = sp40.z = 0.0f;
@ -591,19 +591,19 @@ void fn_1_62AC(s32 arg0, Vec *arg1)
BoardModelPosGet(lbl_1_bss_64, &sp34);
arg0 -= 4;
arg1->y = sp34.y;
PSVECSubtract(arg1, &sp34, &sp28);
PSVECNormalize(&sp28, &sp28);
VECSubtract(arg1, &sp34, &sp28);
VECNormalize(&sp28, &sp28);
var_f31 = 45.0f;
var_r31 = 0;
while (var_r31 < 3) {
sp1C = sp28;
sp10 = sp28;
PSVECScale(&sp1C, &sp1C, sp8[arg0]);
VECScale(&sp1C, &sp1C, sp8[arg0]);
sp1C.y += (250.0 * sin((M_PI * var_f31) / 180.0));
var_f30 = (250.0 * -cos((M_PI * var_f31) / 180.0));
PSVECScale(&sp10, &sp10, var_f30);
PSVECAdd(&sp10, &sp1C, &sp1C);
PSVECAdd(&sp1C, &sp34, &sp1C);
VECScale(&sp10, &sp10, var_f30);
VECAdd(&sp10, &sp1C, &sp1C);
VECAdd(&sp1C, &sp34, &sp1C);
BoardModelPosSetV(lbl_1_bss_6C[var_r31], &sp1C);
BoardModelVisibilitySet(lbl_1_bss_6C[var_r31], 1);
var_f31 += 45.0f;
@ -623,8 +623,8 @@ void fn_1_64BC(void)
for (var_r31 = 0; var_r31 < 3; var_r31++) {
if (BoardModelVisibilityGet(lbl_1_bss_6C[var_r31]) != 0) {
BoardModelPosGet(lbl_1_bss_6C[var_r31], &sp14);
PSVECSubtract(&sp14, &sp20, &sp8);
var_f31 = PSVECMag(&sp8);
VECSubtract(&sp14, &sp20, &sp8);
var_f31 = VECMag(&sp8);
if (var_f31 < 60.0f) {
CharModelCoinEffectCreate(1, &sp14);
BoardModelVisibilitySet(lbl_1_bss_6C[var_r31], 0);

View file

@ -94,11 +94,11 @@ void fn_1_155C(void) {
BoardModelRotYSet(lbl_1_bss_14[4], -90.0f);
}
BoardModelMotionStart(lbl_1_bss_14[4], temp_r28, 0x40000001);
PSVECSubtract(&sp28, &sp40, &sp34);
PSVECScale(&sp34, &sp34, 0.018518519f);
VECSubtract(&sp28, &sp40, &sp34);
VECScale(&sp34, &sp34, 0.018518519f);
for (var_r31 = 0; var_r31 < 0x36; var_r31++) {
PSVECAdd(&sp40, &sp34, &sp40);
VECAdd(&sp40, &sp34, &sp40);
BoardModelPosSetV(lbl_1_bss_14[4], &sp40);
HuPrcVSleep();
}
@ -175,11 +175,11 @@ void fn_1_155C(void) {
BoardModelRotYSet(lbl_1_bss_14[4], 90.0f);
}
BoardModelMotionStart(lbl_1_bss_14[4], temp_r28, 0x40000001);
PSVECSubtract(&sp28, &sp40, &sp34);
PSVECScale(&sp34, &sp34, 0.033333335f);
VECSubtract(&sp28, &sp40, &sp34);
VECScale(&sp34, &sp34, 0.033333335f);
for (var_r31 = 0; var_r31 < 0x1E; var_r31++) {
PSVECAdd(&sp40, &sp34, &sp40);
VECAdd(&sp40, &sp34, &sp40);
BoardModelPosSetV(lbl_1_bss_14[4], &sp40);
HuPrcVSleep();
}
@ -257,11 +257,11 @@ void fn_1_1E44(void) {
BoardModelRotYSet(lbl_1_bss_14[4], -90.0f);
}
BoardModelMotionStart(lbl_1_bss_14[4], sp8[0], 0x40000001);
PSVECSubtract(&sp2C, &sp5C, &sp44);
PSVECScale(&sp44, &sp44, 0.018518519f);
VECSubtract(&sp2C, &sp5C, &sp44);
VECScale(&sp44, &sp44, 0.018518519f);
for (var_r31 = 0; var_r31 < 0x36U; var_r31++) {
PSVECAdd(&sp5C, &sp44, &sp5C);
VECAdd(&sp5C, &sp44, &sp5C);
BoardModelPosSetV(lbl_1_bss_14[4], &sp5C);
HuPrcVSleep();
}
@ -400,11 +400,11 @@ void fn_1_1E44(void) {
BoardModelRotYSet(lbl_1_bss_14[4], 90.0f);
}
BoardModelMotionStart(lbl_1_bss_14[4], sp8[0], 0x40000001U);
PSVECSubtract(&sp38, &sp5C, &sp44);
PSVECScale(&sp44, &sp44, 0.055555556);
VECSubtract(&sp38, &sp5C, &sp44);
VECScale(&sp44, &sp44, 0.055555556);
for (var_r31 = 0; var_r31 < 0x12U; var_r31++) {
PSVECAdd(&sp5C, &sp44, &sp5C);
VECAdd(&sp5C, &sp44, &sp5C);
BoardModelPosSetV(lbl_1_bss_14[4], &sp5C);
HuPrcVSleep();
}

View file

@ -321,11 +321,11 @@ void fn_1_A5B0(omObjData *arg0)
Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_bss_14[1]), "fish", &sp14);
BoardModelPosGet(lbl_1_bss_FE, &sp8);
sp14.y = sp8.y;
PSVECSubtract(&sp14, &sp8, temp_r31);
var_f31 = PSVECMag(temp_r31);
PSVECNormalize(temp_r31, temp_r31);
VECSubtract(&sp14, &sp8, temp_r31);
var_f31 = VECMag(temp_r31);
VECNormalize(temp_r31, temp_r31);
var_f31 /= 38.0f;
PSVECScale(temp_r31, temp_r31, var_f31);
VECScale(temp_r31, temp_r31, var_f31);
temp_r31->y = 25.0f;
temp_r29->trans.x = var_f31;
BoardPlayerMotionStart(lbl_1_bss_C0, lbl_1_bss_102[2], 0);
@ -536,10 +536,10 @@ void fn_1_B3C4(omObjData *arg0)
sp8.y = 180.0f;
sp8.z = 0.0f;
BoardModelRotSetV(lbl_1_bss_FE, &sp8);
PSVECAdd(&sp20, &sp2C, &sp20);
VECAdd(&sp20, &sp2C, &sp20);
sp14.y = sp20.y;
PSVECSubtract(&sp14, &sp20, &sp14);
temp_f29 = PSVECMag(&sp14);
VECSubtract(&sp14, &sp20, &sp14);
temp_f29 = VECMag(&sp14);
Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_bss_14[1]), "fish", &sp14);
if (temp_f29 <= arg0->trans.x) {
sp20.x = sp14.x;

View file

@ -85,7 +85,7 @@ void fn_1_6B7C(void)
BoardModelHookSet(BoardPlayerModelGet(lbl_1_bss_B6), "a-itemhook-r", lbl_1_bss_A2);
Hu3DModelObjPosGet(BoardModelIDGet(*lbl_1_bss_14), "chara1", &sp10);
Hu3DModelObjPosGet(BoardModelIDGet(BoardPlayerModelGet(lbl_1_bss_B6)), "a-itemhook-r", &sp1C);
PSVECAdd(&sp1C, &sp10, &sp1C);
VECAdd(&sp1C, &sp10, &sp1C);
sp1C.y += 25.0f;
CharModelLayerSetAll(7);
CharModelEffectCreate(-1, &sp1C);
@ -292,13 +292,13 @@ void fn_1_799C(void)
temp_r31 = temp_r30->work[0];
BoardModelPosGet(lbl_1_bss_A4[temp_r31], &sp20);
sp2C.y = sp20.y = 0.0f;
PSVECSubtract(&sp2C, &sp20, &sp14);
temp_f30 = PSVECMag(&sp14);
PSVECScale(&sp14, &sp14, 0.016666668);
VECSubtract(&sp2C, &sp20, &sp14);
temp_f30 = VECMag(&sp14);
VECScale(&sp14, &sp14, 0.016666668);
for (var_r29 = 0; var_r29 < 0x3C; var_r29++) {
BoardModelPosGet(lbl_1_bss_A4[temp_r31], &sp20);
PSVECAdd(&sp20, &sp14, &sp20);
VECAdd(&sp20, &sp14, &sp20);
BoardModelPosSetV(lbl_1_bss_A4[temp_r31], &sp20);
HuPrcVSleep();
}
@ -505,7 +505,7 @@ void fn_1_850C(omObjData *arg0)
BoardPlayerMotionStart(lbl_1_bss_B6, lbl_1_bss_9E[0], 0x40000001);
Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_bss_14[0]), "chara1", &sp8);
Hu3DModelObjPosGet(BoardModelIDGet(BoardPlayerModelGet(lbl_1_bss_B6)), "a-itemhook-r", &sp14);
PSVECAdd(&sp14, &sp8, &sp14);
VECAdd(&sp14, &sp8, &sp14);
sp14.y += 25.0f;
CharModelLayerSetAll(7);
CharModelEffectCreate(-1, &sp14);

View file

@ -110,25 +110,25 @@ void fn_1_3044(void) {
HuPrcSleep(0x88);
Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_bss_4A), lbl_1_data_1C4[lbl_1_bss_48], &sp20);
Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_bss_4E[lbl_1_bss_48]), "bakawa1", &sp14);
PSVECAdd(&sp20, &sp14, &sp14);
VECAdd(&sp20, &sp14, &sp14);
BoardModelPosSetV(lbl_1_bss_44[0], &sp14);
BoardModelVisibilitySet(lbl_1_bss_44[0], 1);
BoardModelMotionTimeSet(lbl_1_bss_44[0], 0.0f);
HuAudFXPlay(0x48C);
PSVECSubtract(&lbl_1_bss_38, &sp14, &sp8);
VECSubtract(&lbl_1_bss_38, &sp14, &sp8);
sp8.y = 0.0f;
PSVECNormalize(&sp8, &sp8);
PSVECScale(&sp8, &sp8, 8.0f);
VECNormalize(&sp8, &sp8);
VECScale(&sp8, &sp8, 8.0f);
temp_f30 = 11.0f;
var_f31 = 0.0f;
while (1) {
sp8.y = (temp_f30 - (0.075 * (0.25f * (var_f31 * var_f31))));
var_f31 += 1.0f;
PSVECAdd(&sp14, &sp8, &sp14);
PSVECSubtract(&lbl_1_bss_38, &sp14, &sp20);
VECAdd(&sp14, &sp8, &sp14);
VECSubtract(&lbl_1_bss_38, &sp14, &sp20);
sp20.y = 0.0f;
var_f29 = PSVECMag(&sp20);
var_f29 = VECMag(&sp20);
if (var_f29 <= 8.0f) {
sp14.x = lbl_1_bss_38.x;
sp14.z = lbl_1_bss_38.z;
@ -179,19 +179,19 @@ void fn_1_3514(void) {
BoardPlayerPosGet(lbl_1_bss_4C, &sp2C);
BoardPlayerMotionShiftSet(lbl_1_bss_4C, 4, 0.0f, 5.0f, 0);
PSVECSubtract(&lbl_1_bss_38, &sp2C, &sp20);
VECSubtract(&lbl_1_bss_38, &sp2C, &sp20);
sp20.y = 0.0f;
PSVECNormalize(&sp20, &sp20);
PSVECScale(&sp20, &sp20, 7.2f);
VECNormalize(&sp20, &sp20);
VECScale(&sp20, &sp20, 7.2f);
var_f30 = 10.0f;
var_f31 = 0.0f;
while (1) {
sp20.y = (var_f30 - (0.075f * (0.25f * (var_f31 * var_f31))));
var_f31 += 1.0f;
PSVECAdd(&sp2C, &sp20, &sp2C);
PSVECSubtract(&lbl_1_bss_38, &sp2C, &sp14);
VECAdd(&sp2C, &sp20, &sp2C);
VECSubtract(&lbl_1_bss_38, &sp2C, &sp14);
sp14.y = 0.0f;
var_f29 = PSVECMag(&sp14);
var_f29 = VECMag(&sp14);
if (var_f29 <= 7.2f) {
sp2C.x = lbl_1_bss_38.x;
sp2C.z = lbl_1_bss_38.z;
@ -218,19 +218,19 @@ void fn_1_3514(void) {
var_r31 = BoardSpaceLinkFlagSearch(0, var_r31, 0x400);
}
BoardSpacePosGet(0, var_r31, &sp8);
PSVECSubtract(&sp8, &sp2C, &sp20);
VECSubtract(&sp8, &sp2C, &sp20);
sp20.y = 0.0f;
PSVECNormalize(&sp20, &sp20);
PSVECScale(&sp20, &sp20, 10.0f);
VECNormalize(&sp20, &sp20);
VECScale(&sp20, &sp20, 10.0f);
var_f30 = 9.0f;
var_f31 = 0.0f;
while (1) {
sp20.y = var_f30 - (0.075f * (0.25f * (var_f31 * var_f31)));
var_f31 += 1.0f;
PSVECAdd(&sp2C, &sp20, &sp2C);
PSVECSubtract(&sp8, &sp2C, &sp14);
VECAdd(&sp2C, &sp20, &sp2C);
VECSubtract(&sp8, &sp2C, &sp14);
sp14.y = 0.0f;
var_f29 = PSVECMag(&sp14);
var_f29 = VECMag(&sp14);
if (var_f29 <= 10.0f) {
sp2C.x = sp8.x;
sp2C.z = sp8.z;
@ -327,7 +327,7 @@ void fn_1_3E8C(void) {
sp8.x = 25.0f;
}
for (i = 0; i < 60; i++) {
PSVECAdd(&sp14, &sp8, &sp14);
VECAdd(&sp14, &sp8, &sp14);
sp8.y -= 0.625f;
BoardModelPosSetV(lbl_1_bss_44[1], &sp14);
HuPrcVSleep();