Improve beautify anm data (#2487)

This commit is contained in:
YunataSavior
2025-06-16 01:36:22 -07:00
committed by GitHub
parent 1a189d3d95
commit bb008ca9cf
6 changed files with 317 additions and 237 deletions
+201 -175
View File
File diff suppressed because it is too large Load Diff
+7 -5
View File
@@ -79,7 +79,8 @@ static void damage_check(e_yc_class* i_this) {
/* 807F01AC-807F06AC 0003CC 0500+00 2/1 0/0 0/0 .text e_yc_fly__FP10e_yc_class */
static void e_yc_fly(e_yc_class* i_this) {
e_rdy_class* rider = static_cast<e_rdy_class*>(fopAcM_SearchByID(i_this->mRiderID));
fopAc_ac_c* base_rdy = fopAcM_SearchByID(i_this->mRiderID);
e_rdy_class* rider = (e_rdy_class*) base_rdy;
int frame = i_this->mpMorf->getFrame();
f32 target_speed = 0.0f;
f32 accel = 1.0f;
@@ -144,7 +145,7 @@ static void e_yc_fly(e_yc_class* i_this) {
target_speed = 35.0f;
accel = 0.25f;
}
i_this->mTargetPos = rider->current.pos;
i_this->mTargetPos = base_rdy->current.pos;
i_this->mTargetPos.y += 150.0f;
break;
@@ -166,7 +167,7 @@ static void e_yc_fly(e_yc_class* i_this) {
case 6:
cLib_addCalc0(&i_this->field_0x694, 1.0f, 1.0f);
cLib_addCalc2(&i_this->current.pos.y, rider->home.pos.y + 400.0f, 0.05f, 3.0f);
cLib_addCalc2(&i_this->current.pos.y, base_rdy->home.pos.y + 400.0f, 0.05f, 3.0f);
break;
}
@@ -318,7 +319,8 @@ static void e_yc_hovering(e_yc_class* i_this) {
static void e_yc_attack(e_yc_class* i_this) {
fopAc_ac_c* player = dComIfGp_getPlayer(0);
cXyz delta;
e_rdy_class* rider = static_cast<e_rdy_class*>(fopAcM_SearchByID(i_this->mRiderID));
fopAc_ac_c* base_rdy = fopAcM_SearchByID(i_this->mRiderID);
e_rdy_class* rider = (e_rdy_class*) base_rdy;
f32 target_speed = 0.0f;
int frame = i_this->mpMorf->getFrame();
@@ -437,7 +439,7 @@ static void e_yc_attack(e_yc_class* i_this) {
static void e_yc_wolfbite(e_yc_class* i_this) {
fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
e_rdy_class* rider = static_cast<e_rdy_class*>(fopAcM_SearchByID(i_this->mRiderID));
e_rdy_class* rider = (e_rdy_class*) fopAcM_SearchByID(i_this->mRiderID);
int frame = i_this->mpMorf->getFrame();
i_this->mCcDisableTimer = 10;
+30 -27
View File
@@ -1236,49 +1236,52 @@ daNpc_Besu_c::~daNpc_Besu_c() {
/* ############################################################################################## */
/* 8053E754-8053E7E4 000000 0090+00 13/13 0/0 0/0 .rodata m__18daNpc_Besu_Param_c */
daNpc_Besu_Param_c::Data const daNpc_Besu_Param_c::m = {
0x43200000,
0xC0400000,
0x3F800000,
0x43C80000,
0x437F0000,
0x430C0000,
0x420C0000,
0x41F00000,
160.0f,
-3.0f,
1.0f,
400.0f,
255.0f,
140.0f,
35.0f,
30.0f,
0x00000000,
0x00000000,
0x41200000,
0xC1200000,
0x41F00000,
0xC1200000,
0x42340000,
0xC2340000,
0x3F19999A,
0x41400000,
10.0f,
-10.0f,
30.0f,
-10.0f,
45.0f,
-45.0f,
0.6f,
12.0f,
0x00030006,
0x00050006,
0x42DC0000,
110.0f,
0x00000000,
0x00000000,
0x00000000,
0x003C0008,
0x00000000,
0x00000000,
0x40800000,
0xC1700000,
4.0f,
-15.0f,
0x00000000,
0xC1700000,
0x41700000,
0x41F00000,
0x41700000,
0x428C0000,
0x3F800000,
-15.0f,
15.0f,
30.0f,
15.0f,
70.0f,
1.0f,
};
/* 8053701C-805372FC 0002BC 02E0+00 1/1 0/0 0/0 .text create__12daNpc_Besu_cFv */
void daNpc_Besu_c::create() {
static int const heapSize[19] = {
13760, 13760, 13584, 13776, 13776, 13776, 15808, 16064, 15824, 13760, 13760, 13776,
13760, 13760, 13776, 13760, 13760, 13760, 0,
0x35C0, 0x35C0, 0x3510, 0x35D0,
0x35D0, 0x35D0, 0x3DC0, 0x3EC0,
0x3DD0, 0x35C0, 0x35C0, 0x35D0,
0x35C0, 0x35C0, 0x35D0, 0x35C0,
0x35C0, 0x35C0, 0x0,
};
// NONMATCHING
}