mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-22 05:49:01 -04:00
d_a_b_ds and d_a_e_vt equivalent (#2424)
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "d/d_s_play.h"
|
||||
#include "d/d_camera.h"
|
||||
UNK_REL_DATA;
|
||||
#include "f_op/f_op_actor_enemy.h"
|
||||
|
||||
#define WL_CUT_TYPE_SMALL 1
|
||||
@@ -74,21 +75,6 @@ enum daE_VA_JOINT {
|
||||
JNT_TAIL_CLOTH_04,
|
||||
};
|
||||
|
||||
/* 807CEF08-807CEF14 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */
|
||||
static u8 cNullVec__6Z2Calc[12] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
|
||||
/* 807CEF14-807CEF28 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
|
||||
static u32 lit_1787[1 + 4 /* padding */] = {
|
||||
0x02000201,
|
||||
/* padding */
|
||||
0x40080000,
|
||||
0x00000000,
|
||||
0x3FE00000,
|
||||
0x00000000,
|
||||
};
|
||||
|
||||
namespace
|
||||
{
|
||||
|
||||
@@ -1900,7 +1886,6 @@ void daE_VA_c::executeClearWait() {
|
||||
}
|
||||
|
||||
/* 807C7640-807C783C 005140 01FC+00 1/1 0/0 0/0 .text executeClearChase__8daE_VA_cFv */
|
||||
// NONMATCHING load order
|
||||
void daE_VA_c::executeClearChase() {
|
||||
cLib_addCalc(¤t.pos.y, 0.0f, 0.1f, 10.0f, 1.0f);
|
||||
|
||||
@@ -1926,7 +1911,7 @@ void daE_VA_c::executeClearChase() {
|
||||
}
|
||||
}
|
||||
|
||||
if (speedF != 0.0f) {
|
||||
if (speedF) {
|
||||
if (!checkBck(ANM_INVI_WALK_e)) {
|
||||
setBck(ANM_INVI_WALK_e, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
|
||||
}
|
||||
@@ -3817,7 +3802,6 @@ static int daE_VA_Delete(daE_VA_c* i_this) {
|
||||
}
|
||||
|
||||
/* 807CD048-807CD600 00AB48 05B8+00 1/1 0/0 0/0 .text CreateHeap__8daE_VA_cFv */
|
||||
// NONMATCHING weird data issue / reg alloc (probably related)
|
||||
int daE_VA_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x33);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
@@ -3898,9 +3882,8 @@ int daE_VA_c::CreateHeap() {
|
||||
}
|
||||
|
||||
f32* size_p = field_0x139c.getSize(0);
|
||||
for (int i = 0; i < 5; i++) {
|
||||
for (int i = 0; i < 5; i++, size_p++) {
|
||||
*size_p = 5.0f;
|
||||
size_p++;
|
||||
}
|
||||
|
||||
if (!mRope.init(11, 10, (ResTIMG*)dComIfG_getObjectRes("E_VA", 0x3E), 1)) {
|
||||
@@ -3910,15 +3893,12 @@ int daE_VA_c::CreateHeap() {
|
||||
for (int i = 0; i < 11; i++) {
|
||||
f32* size_p = mRope.getSize(i);
|
||||
|
||||
for (int j = 0; j < 10; j++) {
|
||||
*size_p = 5.0f;
|
||||
size_p++;
|
||||
for (int j = 0; j < 10; ++j, size_p++) {
|
||||
*size_p = 2.0f;
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < 40; i++) {
|
||||
J3DModelData* modelData;
|
||||
|
||||
switch (va_tag_set_size[i]) {
|
||||
case 0:
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x34);
|
||||
|
||||
Reference in New Issue
Block a user