mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 05:08:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some demo matches and fake inline fixes

Browse Source
This commit is contained in:
LagoLunatic
2026-07-14 17:06:45 -04:00
parent 0f8be7a620
commit c30c494a15
6 changed files with 73 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_himo2.cpp
+15 -15
View File
@@ -59,7 +59,7 @@ dr2_class* dr;
#endif
/* 800EB60C-800EBABC .text spin_draw__FP11himo2_class */
void spin_draw(himo2_class* i_this) {
static void spin_draw(himo2_class* i_this) {
fopAc_ac_c* actor = &i_this->actor;
int r27;
s16 r22;
@@ -179,7 +179,7 @@ void spin_draw(himo2_class* i_this) {
}
/* 800EBABC-800EBCD0 .text himo2_control__FP11himo2_classP7himo2_s */
void himo2_control(himo2_class* i_this, himo2_s* param_2) {
static void himo2_control(himo2_class* i_this, himo2_s* param_2) {
f32 fVar1;
f32 fVar2;
f32 dVar8;
@@ -218,7 +218,7 @@ void himo2_control(himo2_class* i_this, himo2_s* param_2) {
}
/* 800EBCD0-800EBFEC .text himo2_control2__FP11himo2_classP7himo2_s */
void himo2_control2(himo2_class* i_this, himo2_s* param_2) {
static void himo2_control2(himo2_class* i_this, himo2_s* param_2) {
cXyz local_a8;
cXyz local_b4;
f32 f30;
@@ -282,7 +282,7 @@ void himo2_control2(himo2_class* i_this, himo2_s* param_2) {
}
/* 800EBFEC-800EC1E4 .text himo2_draw__FP11himo2_classP7himo2_s */
void himo2_draw(himo2_class* i_this, himo2_s* param_2) {
static void himo2_draw(himo2_class* i_this, himo2_s* param_2) {
fopAc_ac_c* actor = &i_this->actor;
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
int r30;
@@ -331,17 +331,17 @@ void himo2_draw(himo2_class* i_this, himo2_s* param_2) {
}
#if VERSION == VERSION_DEMO
void himo_e_control(himo2_class* i_this, himo2_s*) {
static void himo_e_control(himo2_class* i_this, himo2_s*) {
/* Nonmatching*/
}
void himo_e_draw(himo2_class* i_this, himo2_s*) {
static void himo_e_draw(himo2_class* i_this, himo2_s*) {
/* Nonmatching*/
}
#endif
/* 800EC1E4-800EC300 .text himo_hang_draw__FP11himo2_class */
void himo_hang_draw(himo2_class* i_this) {
static void himo_hang_draw(himo2_class* i_this) {
cXyz* pcVar3 = i_this->m1F30.getPos(0);
pcVar3 += i_this->m1F6C;
cXyz local_38 = i_this->m02EC[0] - i_this->m2504;
@@ -356,7 +356,7 @@ void himo_hang_draw(himo2_class* i_this) {
}
/* 800EC300-800EC338 .text himo2_disp__FP11himo2_class */
void himo2_disp(himo2_class* i_this) {
static void himo2_disp(himo2_class* i_this) {
if (i_this->m02DC < 10) {
himo2_draw(i_this, &i_this->m0310[0]);
} else {
@@ -511,7 +511,7 @@ static BOOL daHimo2_Draw(himo2_class* i_this) {
}
/* 800ECBE8-800ECC54 .text s_a_d_sub__FPvPv */
void* s_a_d_sub(void* param_1, void* param_2) {
static void* s_a_d_sub(void* param_1, void* param_2) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KUI_e)) {
himo2_class* rope = (himo2_class*)param_2;
rope->m218C[rope->m24AC] = (fopAc_ac_c*)param_1;
@@ -521,7 +521,7 @@ void* s_a_d_sub(void* param_1, void* param_2) {
}
/* 800ECC54-800ED19C .text search_target__FP11himo2_class4cXyz */
fopAc_ac_c* search_target(himo2_class* i_this, cXyz param_2) {
static fopAc_ac_c* search_target(himo2_class* i_this, cXyz param_2) {
fopAc_ac_c* r28;
s16 r27;
s16 r26;
@@ -655,7 +655,7 @@ BOOL himo2_class::setTargetPos(cXyz* param_1, f32* param_2, f32* param_3) {
}
/* 800ED2E0-800ED32C .text dr_a_sub__FPvPv */
void* dr_a_sub(void* param_1, void* param_2) {
static void* dr_a_sub(void* param_1, void* param_2) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_DR2_e)) {
return param_1;
} else {
@@ -664,7 +664,7 @@ void* dr_a_sub(void* param_1, void* param_2) {
}
/* 800ED32C-800ED378 .text b_a_sub__FPvPv */
void* b_a_sub(void* param_1, void* param_2) {
static void* b_a_sub(void* param_1, void* param_2) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BTD_e)) {
return param_1;
} else {
@@ -673,7 +673,7 @@ void* b_a_sub(void* param_1, void* param_2) {
}
/* 800ED378-800ED688 .text himo2_bg_check__FP11himo2_class */
BOOL himo2_bg_check(himo2_class* i_this) {
static BOOL himo2_bg_check(himo2_class* i_this) {
fopAc_ac_c* actor = &i_this->actor;
u8 flag;
u32 uVar3;
@@ -739,14 +739,14 @@ BOOL himo2_bg_check(himo2_class* i_this) {
}
/* 800ED688-800ED6F4 .text pl_pos_add__FP11himo2_class */
void pl_pos_add(himo2_class* i_this) {
static void pl_pos_add(himo2_class* i_this) {
fopAc_ac_c* actor = &i_this->actor;
cXyz local_28 = daPy_getPlayerActorClass()->old.pos - daPy_getPlayerActorClass()->current.pos;
actor->current.pos += local_28;
}
/* 800ED6F4-800F0038 .text new_himo2_move__FP11himo2_class */
void new_himo2_move(himo2_class* i_this) {
static void new_himo2_move(himo2_class* i_this) {
/* Nonmatching - regalloc */
fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
fopAc_ac_c* player_actor;