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
parent
64413586b9
commit
afa9c0a4b5
82 changed files with 968 additions and 968 deletions
|
|
@ -211,10 +211,10 @@ static void fn_1_20EC(void) {
|
|||
while (fn_1_1130(lbl_1_bss_FA, atan2d(sp14.x - sp20.x, sp14.z - sp20.z), 2.0f) == 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
PSVECSubtract(&sp14, &sp20, &sp8);
|
||||
PSVECScale(&sp8, &sp8, 0.022222223f);
|
||||
VECSubtract(&sp14, &sp20, &sp8);
|
||||
VECScale(&sp8, &sp8, 0.022222223f);
|
||||
for (i = 0; i < 45; i++) {
|
||||
PSVECAdd(&sp20, &sp8, &sp20);
|
||||
VECAdd(&sp20, &sp8, &sp20);
|
||||
BoardModelPosSetV(lbl_1_bss_FA, &sp20);
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
|
@ -293,12 +293,12 @@ static void fn_1_28BC(void) {
|
|||
BoardModelPosGet(lbl_1_bss_FA, &sp14);
|
||||
temp_f30 = atan2d(sp20.x - sp14.x, sp20.z - sp14.z);
|
||||
BoardModelRotYSet(lbl_1_bss_FA, temp_f30);
|
||||
PSVECSubtract(&sp20, &sp14, &sp8);
|
||||
PSVECScale(&sp8, &sp8, 0.022222223f);
|
||||
VECSubtract(&sp20, &sp14, &sp8);
|
||||
VECScale(&sp8, &sp8, 0.022222223f);
|
||||
*var_r26 = temp_f30 - 180.0f;
|
||||
fn_1_2EE8(3);
|
||||
for (i = 0; i < 45; i++) {
|
||||
PSVECAdd(&sp8, &sp14, &sp14);
|
||||
VECAdd(&sp8, &sp14, &sp14);
|
||||
BoardModelPosSetV(lbl_1_bss_FA, &sp14);
|
||||
fn_1_5018();
|
||||
if (var_r29 != 0) {
|
||||
|
|
@ -473,10 +473,10 @@ static void fn_1_30A4(void) {
|
|||
while (fn_1_1130(temp_r31->unk04, temp_f31, 5.0f) == 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
PSVECSubtract(&temp_r31->unk20, &sp20, &sp14);
|
||||
PSVECScale(&sp14, &sp14, 0.016666668f);
|
||||
VECSubtract(&temp_r31->unk20, &sp20, &sp14);
|
||||
VECScale(&sp14, &sp14, 0.016666668f);
|
||||
for (i = 0; i < 60; i++) {
|
||||
PSVECAdd(&sp14, &sp20, &sp20);
|
||||
VECAdd(&sp14, &sp20, &sp20);
|
||||
BoardModelPosSetV(temp_r31->unk04, &sp20);
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
|
@ -533,8 +533,8 @@ static void fn_1_30A4(void) {
|
|||
if (temp_r31->unk08 != -1) {
|
||||
BoardPlayerRotYSet(temp_r31->unk08, temp_f31);
|
||||
}
|
||||
PSVECSubtract(&temp_r31->unk20, &sp20, &sp14);
|
||||
PSVECScale(&sp14, &sp14, 0.022222223f);
|
||||
VECSubtract(&temp_r31->unk20, &sp20, &sp14);
|
||||
VECScale(&sp14, &sp14, 0.022222223f);
|
||||
if (temp_r31->unk0C > 0) {
|
||||
var_r28 = BoardSpaceGet(0, temp_r31->unk0C);
|
||||
if (var_r28->flag & 1) {
|
||||
|
|
@ -547,7 +547,7 @@ static void fn_1_30A4(void) {
|
|||
}
|
||||
}
|
||||
for (i = 0; i < 45; i++) {
|
||||
PSVECAdd(&sp20, &sp14, &sp20);
|
||||
VECAdd(&sp20, &sp14, &sp20);
|
||||
BoardModelPosSetV(temp_r31->unk04, &sp20);
|
||||
if (temp_r31->unk08 != -1) {
|
||||
BoardPlayerPosSetV(temp_r31->unk08, &sp20);
|
||||
|
|
@ -610,14 +610,14 @@ static void fn_1_38D8(void) {
|
|||
BoardPlayerPosGet(temp_r31, &sp24);
|
||||
var_f28 = atan2d(sp18.x - sp24.x, sp18.z - sp24.z);
|
||||
BoardPlayerRotYSet(temp_r31, var_f28);
|
||||
PSVECSubtract(&sp18, &sp24, &spC);
|
||||
PSVECScale(&spC, &spC, 0.025f);
|
||||
VECSubtract(&sp18, &sp24, &spC);
|
||||
VECScale(&spC, &spC, 0.025f);
|
||||
temp_f26 = 12.0f;
|
||||
var_f29 = 0.0f;
|
||||
while (TRUE) {
|
||||
spC.y = temp_f26 - var_f29 * var_f29 * 0.25f * 0.075f;
|
||||
var_f29 += 1.0f;
|
||||
PSVECAdd(&spC, &sp24, &sp24);
|
||||
VECAdd(&spC, &sp24, &sp24);
|
||||
if (sp24.y <= sp18.y) {
|
||||
sp24.y = sp18.y;
|
||||
break;
|
||||
|
|
@ -696,16 +696,16 @@ static s32 fn_1_3C9C(void) {
|
|||
for (i = 0; i < var_r29; i++) {
|
||||
BoardSpacePosGet(0, sp20[i], &sp44);
|
||||
sp50.y = sp44.y;
|
||||
PSVECSubtract(&sp44, &sp50, &sp38);
|
||||
VECSubtract(&sp44, &sp50, &sp38);
|
||||
var_f31 = atan2d(sp38.x, sp38.z);
|
||||
if (var_f31 < 0.0f) {
|
||||
var_f31 += 360.0f;
|
||||
}
|
||||
sp28[i] = var_f31;
|
||||
PSVECNormalize(&sp38, &sp44);
|
||||
PSVECScale(&sp44, &sp44, 110.0f);
|
||||
VECNormalize(&sp38, &sp44);
|
||||
VECScale(&sp44, &sp44, 110.0f);
|
||||
sp44.y += 200.0f;
|
||||
PSVECAdd(&sp50, &sp44, &sp44);
|
||||
VECAdd(&sp50, &sp44, &sp44);
|
||||
BoardModelPosSetV(lbl_1_bss_F4[i], &sp44);
|
||||
BoardModelRotYSet(lbl_1_bss_F4[i], var_f31);
|
||||
BoardModelVisibilitySet(lbl_1_bss_F4[i], 1);
|
||||
|
|
|
|||
|
|
@ -262,8 +262,8 @@ static void fn_1_1E60(void) {
|
|||
while (TRUE) {
|
||||
BoardSpacePosGet(0, var_r29, &sp14);
|
||||
BoardSpacePosGet(0, var_r28, &sp8);
|
||||
PSVECSubtract(&sp8, &sp14, &sp20);
|
||||
PSVECScale(&sp20, &sp20, 0.008333334f);
|
||||
VECSubtract(&sp8, &sp14, &sp20);
|
||||
VECScale(&sp20, &sp20, 0.008333334f);
|
||||
temp_f31 = atan2d(sp8.x - sp14.x, sp8.z - sp14.z);
|
||||
BoardModelPosGet(temp_r31[1], &sp14);
|
||||
while (fn_1_1130(temp_r31[1], temp_f31, 2.5f) == 0) {
|
||||
|
|
@ -280,7 +280,7 @@ static void fn_1_1E60(void) {
|
|||
} else {
|
||||
BoardModelAlphaSet(temp_r31[1], 0);
|
||||
}
|
||||
PSVECAdd(&sp14, &sp20, &sp14);
|
||||
VECAdd(&sp14, &sp20, &sp14);
|
||||
BoardModelPosSetV(temp_r31[1], &sp14);
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -137,11 +137,11 @@ void fn_1_C7D4(void) {
|
|||
BoardModelPosGet(lbl_1_bss_14[9], &sp8);
|
||||
sp14 = sp8;
|
||||
sp14.x = sp2C.x;
|
||||
PSVECSubtract(&sp14, &sp8, &sp38);
|
||||
PSVECScale(&sp38, &sp38, 0.022727273f);
|
||||
VECSubtract(&sp14, &sp8, &sp38);
|
||||
VECScale(&sp38, &sp38, 0.022727273f);
|
||||
for (i = 0; i < 44; i++) {
|
||||
BoardModelPosGet(lbl_1_bss_14[9], &sp8);
|
||||
PSVECAdd(&sp8, &sp38, &sp8);
|
||||
VECAdd(&sp8, &sp38, &sp8);
|
||||
BoardModelPosSetV(lbl_1_bss_14[9], &sp8);
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
|
@ -159,17 +159,17 @@ void fn_1_C7D4(void) {
|
|||
BoardPlayerMotionShiftSet(lbl_1_bss_324, 4, 0.0f, 5.0f, 0);
|
||||
var_f31 = 0.0f;
|
||||
temp_f30 = 8.0f;
|
||||
PSVECSubtract(&sp2C, &sp20, &sp38);
|
||||
PSVECScale(&sp38, &sp38, 0.05f);
|
||||
VECSubtract(&sp2C, &sp20, &sp38);
|
||||
VECScale(&sp38, &sp38, 0.05f);
|
||||
while (TRUE) {
|
||||
BoardPlayerPosGet(lbl_1_bss_324, &sp20);
|
||||
sp38.y = temp_f30 - var_f31 * var_f31 * 0.25f * 0.075f;
|
||||
var_f31 += 1.0f;
|
||||
PSVECAdd(&sp38, &sp20, &sp20);
|
||||
VECAdd(&sp38, &sp20, &sp20);
|
||||
sp14 = sp2C;
|
||||
sp14.y = sp20.y;
|
||||
PSVECSubtract(&sp14, &sp20, &sp14);
|
||||
var_f29 = PSVECMag(&sp14);
|
||||
VECSubtract(&sp14, &sp20, &sp14);
|
||||
var_f29 = VECMag(&sp14);
|
||||
if (var_f29 <= 1.0f) {
|
||||
sp38.x = sp38.z = 0.0f;
|
||||
sp20.x = sp2C.x;
|
||||
|
|
@ -429,17 +429,17 @@ static void fn_1_D770(void) {
|
|||
temp_f29 = 8.0f;
|
||||
lbl_1_bss_308.z = sp18.z + 100.0f;
|
||||
lbl_1_bss_308.x = sp18.x + 50.0f;
|
||||
PSVECSubtract(&lbl_1_bss_308, &sp18, &spC);
|
||||
PSVECScale(&spC, &spC, 0.04f);
|
||||
VECSubtract(&lbl_1_bss_308, &sp18, &spC);
|
||||
VECScale(&spC, &spC, 0.04f);
|
||||
while (TRUE) {
|
||||
BoardPlayerPosGet(lbl_1_bss_324, &sp18);
|
||||
spC.y = temp_f29 - var_f30 * var_f30 * 0.25f * 0.075f;
|
||||
var_f30 += 1.0f;
|
||||
PSVECAdd(&spC, &sp18, &sp18);
|
||||
VECAdd(&spC, &sp18, &sp18);
|
||||
sp114[0] = lbl_1_bss_308;
|
||||
sp114[0].y = sp18.y;
|
||||
PSVECSubtract(&sp114[0], &sp18, &sp114[0]);
|
||||
var_f31 = PSVECMag(&sp114[0]);
|
||||
VECSubtract(&sp114[0], &sp18, &sp114[0]);
|
||||
var_f31 = VECMag(&sp114[0]);
|
||||
if (var_f31 <= 1.0f) {
|
||||
spC.x = spC.z = 0.0f;
|
||||
sp18.x = lbl_1_bss_308.x;
|
||||
|
|
@ -472,11 +472,11 @@ static void fn_1_E004(void) {
|
|||
HuPrcVSleep();
|
||||
}
|
||||
BoardModelPosGet(lbl_1_bss_14[9], &sp14);
|
||||
PSVECSubtract(&lbl_1_bss_2FC, &sp14, &sp8);
|
||||
PSVECScale(&sp8, &sp8, 0.1f);
|
||||
VECSubtract(&lbl_1_bss_2FC, &sp14, &sp8);
|
||||
VECScale(&sp8, &sp8, 0.1f);
|
||||
for (i = 0; i < 10; i++) {
|
||||
BoardModelPosGet(lbl_1_bss_14[9], &sp14);
|
||||
PSVECAdd(&sp14, &sp8, &sp14);
|
||||
VECAdd(&sp14, &sp8, &sp14);
|
||||
BoardModelPosSetV(lbl_1_bss_14[9], &sp14);
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
|
@ -540,8 +540,8 @@ static void fn_1_E374(omObjData *arg0) {
|
|||
if (temp_r3 >= 30 && temp_r3 <= 39) {
|
||||
Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_bss_14[7]), lbl_1_data_5BC[arg0->work[1]], &sp14);
|
||||
BoardPlayerPosGet(lbl_1_bss_324, &sp20);
|
||||
PSVECSubtract(&sp14, &sp20, &sp8);
|
||||
PSVECScale(&sp8, &sp8, 0.04f);
|
||||
VECSubtract(&sp14, &sp20, &sp8);
|
||||
VECScale(&sp8, &sp8, 0.04f);
|
||||
arg0->trans.x = sp8.x;
|
||||
arg0->trans.z = sp8.z;
|
||||
arg0->trans.y = 5.0f;
|
||||
|
|
@ -569,11 +569,11 @@ static void fn_1_E4C0(omObjData *arg0) {
|
|||
sp20.z = arg0->trans.z;
|
||||
sp20.y = arg0->trans.y - arg0->rot.x * arg0->rot.x * 0.25f * 0.075f;
|
||||
arg0->rot.x += 1.0f;
|
||||
PSVECAdd(&sp2C, &sp20, &sp2C);
|
||||
VECAdd(&sp2C, &sp20, &sp2C);
|
||||
sp8 = sp2C;
|
||||
sp8.y = sp14.y;
|
||||
PSVECSubtract(&sp14, &sp8, &sp8);
|
||||
var_f31 = PSVECMag(&sp8);
|
||||
VECSubtract(&sp14, &sp8, &sp8);
|
||||
var_f31 = VECMag(&sp8);
|
||||
if (var_f31 <= 1.0f) {
|
||||
arg0->trans.x = arg0->trans.z = 0.0f;
|
||||
sp2C.x = sp14.x;
|
||||
|
|
|
|||
|
|
@ -304,13 +304,13 @@ static void fn_1_A7E8(void) {
|
|||
var_f29 = 12.0f;
|
||||
sp3C = sp54[var_r30];
|
||||
BoardPlayerPosGet(lbl_1_bss_2AC, &sp30);
|
||||
PSVECSubtract(&sp3C, &sp30, &sp3C);
|
||||
PSVECScale(&sp3C, &sp3C, 0.05f);
|
||||
VECSubtract(&sp3C, &sp30, &sp3C);
|
||||
VECScale(&sp3C, &sp3C, 0.05f);
|
||||
while (TRUE) {
|
||||
BoardPlayerPosGet(lbl_1_bss_2AC, &sp30);
|
||||
sp3C.y = var_f29 - var_f30 * var_f30 * 0.25f * 0.075f;
|
||||
var_f30 += 1.0f;
|
||||
PSVECAdd(&sp3C, &sp30, &sp30);
|
||||
VECAdd(&sp3C, &sp30, &sp30);
|
||||
if (sp30.y <= sp54[var_r30].y - 40.0f && sp3C.y < 0.0f) {
|
||||
sp30.y = sp54[var_r30].y - 40.0f;
|
||||
break;
|
||||
|
|
@ -318,8 +318,8 @@ static void fn_1_A7E8(void) {
|
|||
BoardPlayerPosSetV(lbl_1_bss_2AC, &sp30);
|
||||
sp48 = sp54[var_r30];
|
||||
sp48.y = sp30.y = 0.0f;
|
||||
PSVECSubtract(&sp48, &sp30, &sp30);
|
||||
var_f31 = PSVECMag(&sp30);
|
||||
VECSubtract(&sp48, &sp30, &sp30);
|
||||
var_f31 = VECMag(&sp30);
|
||||
if (var_f31 <= 1.0f) {
|
||||
sp3C.x = sp3C.z = 0.0f;
|
||||
}
|
||||
|
|
@ -379,13 +379,13 @@ static void fn_1_A7E8(void) {
|
|||
var_f30 = 0.0f;
|
||||
var_f29 = 12.0f;
|
||||
BoardPlayerPosGet(lbl_1_bss_2AC, &sp30);
|
||||
PSVECSubtract(&sp18, &sp30, &sp3C);
|
||||
PSVECScale(&sp3C, &sp3C, 0.05f);
|
||||
VECSubtract(&sp18, &sp30, &sp3C);
|
||||
VECScale(&sp3C, &sp3C, 0.05f);
|
||||
while (TRUE) {
|
||||
BoardPlayerPosGet(lbl_1_bss_2AC, &sp30);
|
||||
sp3C.y = var_f29 - var_f30 * var_f30 * 0.25f * 0.075f;
|
||||
var_f30 += 1.0f;
|
||||
PSVECAdd(&sp3C, &sp30, &sp30);
|
||||
VECAdd(&sp3C, &sp30, &sp30);
|
||||
if (sp30.y < sp18.y) {
|
||||
sp30.y = sp18.y;
|
||||
break;
|
||||
|
|
@ -393,8 +393,8 @@ static void fn_1_A7E8(void) {
|
|||
BoardPlayerPosSetV(lbl_1_bss_2AC, &sp30);
|
||||
sp48 = sp18;
|
||||
sp48.y = sp30.y = 0.0f;
|
||||
PSVECSubtract(&sp48, &sp30, &sp30);
|
||||
var_f31 = PSVECMag(&sp30);
|
||||
VECSubtract(&sp48, &sp30, &sp30);
|
||||
var_f31 = VECMag(&sp30);
|
||||
if (var_f31 <= 1.0f) {
|
||||
sp3C.x = sp3C.z = 0.0f;
|
||||
}
|
||||
|
|
@ -406,11 +406,11 @@ static void fn_1_A7E8(void) {
|
|||
BoardModelPosGet(lbl_1_bss_298[temp_r29], &sp24);
|
||||
sp3C = sp24;
|
||||
sp3C.z += 100.0f;
|
||||
PSVECSubtract(&sp3C, &sp24, &sp3C);
|
||||
PSVECScale(&sp3C, &sp3C, 0.033333335f);
|
||||
VECSubtract(&sp3C, &sp24, &sp3C);
|
||||
VECScale(&sp3C, &sp3C, 0.033333335f);
|
||||
for (i = 0; i < 30; i++) {
|
||||
BoardModelPosGet(lbl_1_bss_298[temp_r29], &sp24);
|
||||
PSVECAdd(&sp24, &sp3C, &sp24);
|
||||
VECAdd(&sp24, &sp3C, &sp24);
|
||||
BoardModelPosSetV(lbl_1_bss_298[temp_r29], &sp24);
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
|
@ -538,8 +538,8 @@ void fn_1_BB00(s16 *arg0) {
|
|||
BoardModelPosGet(lbl_1_bss_14[10], &sp24);
|
||||
BoardModelPosSetV(lbl_1_bss_298[i], &sp24);
|
||||
BoardModelScaleSetV(lbl_1_bss_298[i], &sp18);
|
||||
PSVECSubtract(&sp54[i], &sp24, &sp30[i]);
|
||||
PSVECNormalize(&sp30[i], &sp30[i]);
|
||||
VECSubtract(&sp54[i], &sp24, &sp30[i]);
|
||||
VECNormalize(&sp30[i], &sp30[i]);
|
||||
spC[i] = 0.0f;
|
||||
}
|
||||
sp30[0].y = 16.0f;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue