mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-14 03:52:13 -04:00
d_a_npc_len matching (#2748)
* d_a_npc_len matching * HIO * more work on len * d_a_midna work for PAL * mg_rod PAL work
This commit is contained in:
@@ -150,10 +150,8 @@ const daHorse_hio_c1 daHorse_hio_c0::m = {
|
||||
};
|
||||
|
||||
/* 80837F2C-8083836C 0000EC 0440+00 1/1 0/0 0/0 .text setReinPos__13daHorseRein_cFi */
|
||||
// NONMATCHING
|
||||
void daHorseRein_c::setReinPos(int param_0) {
|
||||
cXyz* var_r27 = &field_0x0[0][param_0];
|
||||
var_r27++;
|
||||
cXyz* var_r27 = &field_0x0[0][param_0] + 1;
|
||||
|
||||
cXyz spE0 = *field_0x0[0] - *var_r27;
|
||||
spE0.normalizeZP();
|
||||
|
||||
@@ -5720,6 +5720,12 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) {
|
||||
} else {
|
||||
data_804BBBD4 = 0;
|
||||
}
|
||||
#elif VERSION == VERSION_GCN_PAL
|
||||
if (dComIfGs_getPalLanguage() == 0) {
|
||||
data_804BBBD4 = 2;
|
||||
} else {
|
||||
data_804BBBD4 = 0;
|
||||
}
|
||||
#else
|
||||
data_804BBBD4 = 1;
|
||||
#endif
|
||||
@@ -6277,6 +6283,12 @@ static int dmg_rod_Create(fopAc_ac_c* i_this) {
|
||||
} else {
|
||||
data_804BBBD4 = 0;
|
||||
}
|
||||
#elif VERSION == VERSION_GCN_PAL
|
||||
if (dComIfGs_getPalLanguage() == 0) {
|
||||
data_804BBBD4 = 2;
|
||||
} else {
|
||||
data_804BBBD4 = 0;
|
||||
}
|
||||
#else
|
||||
data_804BBBD4 = 1;
|
||||
#endif
|
||||
|
||||
@@ -108,8 +108,10 @@ daMidna_hio_c0::param const daMidna_hio_c0::m = {
|
||||
25.0f,
|
||||
};
|
||||
|
||||
#if VERSION != VERSION_GCN_PAL
|
||||
bool daMidna_matAnm_c::sEyeMoveFlg;
|
||||
u8 daMidna_matAnm_c::sMorfFrame;
|
||||
#endif
|
||||
|
||||
/* 804BC218-804BC248 000078 0030+00 2/2 0/0 0/0 .text init__16daMidna_matAnm_cFv */
|
||||
void daMidna_matAnm_c::init() {
|
||||
|
||||
+1169
-1376
File diff suppressed because it is too large
Load Diff
@@ -1497,15 +1497,7 @@ bool dBgWKCol::WallCorrectSort(dBgS_Acch* pwi) {
|
||||
pwi->SetWallAngleY(cir_index_8c, sp_14);
|
||||
sp_10 = true;
|
||||
pwi->SetWallHit();
|
||||
} else {
|
||||
if (sp_30 > sp_3c) {
|
||||
break;
|
||||
}
|
||||
|
||||
if (fabsf(sp_30 - sp_3c) < 0.008f) {
|
||||
break;
|
||||
}
|
||||
|
||||
} else if (!(sp_30 > sp_3c || fabsf(sp_30 - sp_3c) < 0.008f)) {
|
||||
f32 sp_1c;
|
||||
f32 sp_18;
|
||||
JUT_ASSERT(0x7e2, !(fpclassify(cx1_58) == FP_QNAN));
|
||||
|
||||
Reference in New Issue
Block a user