e_ym / obj_volcball wip. obj_mgate done (#318)

* e_ym / obj_volcball wip. obj_mgate done

* remove asm

---------

Co-authored-by: root <root@DESKTOP-BTVP2BC>
This commit is contained in:
TakaRikka
2023-04-21 07:18:49 -07:00
committed by GitHub
parent f5fc527d39
commit e1a0f636e5
80 changed files with 2121 additions and 3466 deletions
+1 -1
View File
@@ -651,7 +651,7 @@ f32 daPy_py_c::getAttentionOffsetY() {
/* 8015F424-8015F438 159D64 0014+00 0/0 17/17 33/33 .text checkNowWolfEyeUp__9daPy_py_cFv
*/
s16 daPy_py_c::checkNowWolfEyeUp() {
int daPy_py_c::checkNowWolfEyeUp() {
return daAlink_getAlinkActorClass()->checkWolfEyeUp();
}
+1 -1
View File
@@ -336,7 +336,7 @@ asm void dLib_getEventSwitchNo(int param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz const* param_2,
asm BOOL dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz const* param_2,
cXyz const* param_3) {
nofralloc
#include "asm/d/d_lib/dLib_checkActorInRectangle__FP10fopAc_ac_cP10fopAc_ac_cPC4cXyzPC4cXyz.s"
+2 -6
View File
@@ -205,12 +205,8 @@ void dVibration_c::Kill() {
}
/* 8006FE5C-8006FE84 06A79C 0028+00 0/0 0/0 10/10 .text CheckQuake__12dVibration_cFv */
int dVibration_c::CheckQuake() {
int ret = 0;
if (field_0x0.mQuake.field_0x4 != -1 || field_0x70 != -1) {
ret = 1;
}
return ret;
bool dVibration_c::CheckQuake() {
return field_0x0.mQuake.field_0x4 != -1 || field_0x70 != -1;
}
/* 8006FE84-8006FF04 06A7C4 0080+00 2/2 0/0 0/0 .text setDefault__12dVibration_cFv */
-2
View File
@@ -24,8 +24,6 @@ struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct fopAc_ac_c {};
struct dTres_c {
/* 8009C27C */ void getBossIconFloorNo(int*);
};