mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 20:27:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

JASSeqReader, d_bg_s_movebg_actor ok (#332)

Browse Source 
match cc_at_check except data
This commit is contained in:
hatal175
2023-05-10 01:42:18 +03:00
committed by GitHub
parent 93057e5c87
commit ac269f04ba
7 changed files with 30 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/cc/d_cc_uty.cpp
+11 -9
View File
@@ -439,12 +439,14 @@ SECTION_SDATA2 static f32 lit_4218[1 + 1 /* padding */] = {
/* 80087C04-80088134 082544 0530+00 0/0 0/0 84/84 .text cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo
*/
// just float reg issues
// data padding issues (?)
#ifdef NONMATCHING
fopAc_ac_c* cc_at_check(fopAc_ac_c* p_enemy, dCcU_AtInfo* p_info) {
daPy_py_c* link = (daPy_py_c*)dComIfGp_getPlayer(0);
p_info->mpActor = at_power_check(p_info);
f32 x_diff;
f32 z_diff;
if (p_info->mpActor != NULL) {
cXyz tmp = p_info->mpActor->speed;
tmp.y = 0.0f;
@@ -454,12 +456,12 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* p_enemy, dCcU_AtInfo* p_info) {
p_info->mHitDirection = cM_atan2s(-x, -z) + (s16)cM_rndFX(4000.0f);
} else {
if (fopAcM_GetName(p_info->mpActor) == PROC_BOOMERANG) {
f32 x_diff = p_enemy->current.pos.x - link->current.pos.x;
f32 z_diff = p_enemy->current.pos.z - link->current.pos.z;
x_diff = p_enemy->current.pos.x - link->current.pos.x;
z_diff = p_enemy->current.pos.z - link->current.pos.z;
p_info->mHitDirection = cM_atan2s(-x_diff, -z_diff) + (s16)cM_rndFX(10000.0f);
} else {
f32 x_diff = p_enemy->current.pos.x - p_info->mpActor->current.pos.x;
f32 z_diff = p_enemy->current.pos.z - p_info->mpActor->current.pos.z;
x_diff = p_enemy->current.pos.x - p_info->mpActor->current.pos.x;
z_diff = p_enemy->current.pos.z - p_info->mpActor->current.pos.z;
p_info->mHitDirection = cM_atan2s(-x_diff, -z_diff);
}
}
@@ -500,13 +502,13 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* p_enemy, dCcU_AtInfo* p_info) {
}
if (p_info->mAttackPower != 0) {
p_enemy->field_0x562 -= p_info->mAttackPower;
p_enemy->mHealth -= p_info->mAttackPower;
}
s8 pause_time = 0;
if (p_info->mAttackPower != 0 && p_enemy->field_0x562 <= 0) {
if (p_info->mAttackPower != 0 && p_enemy->mHealth <= 0) {
p_info->mHitStatus = 2;
p_enemy->field_0x562 = 0;
p_enemy->mHealth = 0;
}
int uvar8;
@@ -539,7 +541,7 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* p_enemy, dCcU_AtInfo* p_info) {
((daPy_py_c*)dComIfGp_getPlayer(0))->checkHorseRide()) {
// actor is Bulblin or Horseback Ganon
if ((fopAcM_GetName(p_enemy) == PROC_E_RD &&
static_cast<e_rd_class*>(p_enemy)->field_0x129a != 0) ||
((s8*)p_enemy)[0x129a] != 0) ||
fopAcM_GetName(p_enemy) == PROC_B_GND) {
pause_time = 3;
} else {