mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-28 16:32:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_kamakiri matching (#2501)

Browse Source
This commit is contained in:
Max Roncace
2025-06-26 16:23:48 -04:00
committed by GitHub
parent 5bdf8bb50e
commit 028c07d47d
15 changed files with 922 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_ari.cpp
+2 -2
View File
@@ -256,7 +256,7 @@ void daObjARI_c::Action() {
/* 80BA33F8-80BA3408 000E58 0010+00 1/0 0/0 0/0 .text Insect_Release__10daObjARI_cFv */
void daObjARI_c::Insect_Release() {
field_0x56C = 1;
field_0x56c = 1;
mAction = 1;
}
@@ -637,7 +637,7 @@ cPhs__Step daObjARI_c::create() {
if (step == cPhs_COMPLEATE_e) {
mLocation = fopAcM_GetParam(this) & 0xf;
if (mLocation == LOC_UNK_2) {
field_0x56C = 0;
field_0x56c = 0;
shape_angle.x -= 0x2000;
fopAcM_OnStatus(this, 0x4000);
} else {
src/d/actor/d_a_obj_cho.cpp
+2 -2
View File
@@ -287,7 +287,7 @@ void daObjCHO_c::checkGroundPos() {
/* 80BCB310-80BCB320 0010F0 0010+00 1/0 0/0 0/0 .text Insect_Release__10daObjCHO_cFv */
void daObjCHO_c::Insect_Release() {
field_0x56C = 1;
field_0x56c = 1;
mAction = ACT_MOVE;
}
@@ -560,7 +560,7 @@ cPhs__Step daObjCHO_c::create() {
if (step == cPhs_COMPLEATE_e) {
mLocation = fopAcM_GetParam(this) & 0xf;
if (mLocation == LOC_UNK_2) {
field_0x56C = 0;
field_0x56c = 0;
shape_angle.x -= 0x2000;
fopAcM_OnStatus(this, 0x4000);
mTargetSpeedY = -2.0f;
src/d/actor/d_a_obj_dan.cpp
+2 -2
View File
@@ -269,7 +269,7 @@ void daObjDAN_c::checkGroundPos() {
/* 80BDB0D8-80BDB0E8 000C38 0010+00 1/0 0/0 0/0 .text Insect_Release__10daObjDAN_cFv */
void daObjDAN_c::Insect_Release() {
field_0x56C = 1;
field_0x56c = 1;
mAction = ACT_MOVE;
}
@@ -535,7 +535,7 @@ cPhs__Step daObjDAN_c::create() {
if (step == cPhs_COMPLEATE_e) {
mLocation = fopAcM_GetParam(this) & 0xf;
if (mLocation == LOC_UNK_2) {
field_0x56C = 0;
field_0x56c = 0;
shape_angle.x -= 0x2000;
fopAcM_OnStatus(this, 0x4000);
} else {
src/d/actor/d_a_obj_kabuto.cpp
+2 -2
View File
@@ -506,7 +506,7 @@ void daObjKABUTO_c::ShopAction() {
/* 80C2CAC4-80C2CADC 001D44 0018+00 1/0 0/0 0/0 .text Insect_Release__13daObjKABUTO_cFv
*/
void daObjKABUTO_c::Insect_Release() {
field_0x56C = 1;
field_0x56c = 1;
mAction = ACT_MOVE;
mMode = 0;
}
@@ -757,7 +757,7 @@ cPhs__Step daObjKABUTO_c::create() {
if (step == cPhs_COMPLEATE_e) {
mLocation = fopAcM_GetParam(this) & 0xf;
if (mLocation == LOC_UNK_2) {
field_0x56C = 0;
field_0x56c = 0;
shape_angle.x -= 0x2000;
fopAcM_OnStatus(this, 0x4000);
} else {
src/d/actor/d_a_obj_kamakiri.cpp
+824 -640
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_obj_nan.cpp
+2 -2
View File
@@ -321,7 +321,7 @@ void daObjNAN_c::bin_wait() {
fopAcM_OnStatus(this, 0x4000);
mDraw = false;
field_0x7d0++;
} else if (field_0x7d0 != -1 && field_0x56C != 0) {
} else if (field_0x7d0 != -1 && field_0x56c != 0) {
current.angle.y = daPy_getPlayerActorClass()->current.angle.y - 0x4000;
if (strcmp("R_SP160", dComIfGp_getStartStageName()) == 0 &&
dComIfGp_getStartStageRoomNo() == 3)
@@ -558,7 +558,7 @@ static u8 const l_nan_itemno[2] = {
/* 80CA276C-80CA2904 0022AC 0198+00 1/1 0/0 0/0 .text execute__10daObjNAN_cFv */
int daObjNAN_c::execute() {
if (ChkGetDemo()) {
field_0x57C = field_0x578 + 10000.0f;
field_0x57c = field_0x578 + 10000.0f;
mCreatureSound.startCreatureSoundLevel(Z2SE_INSCT_KIRA, 0, -1);
Insect_GetDemoMain();
nan_setParticle();
src/d/actor/d_a_obj_ten.cpp
+2 -2
View File
@@ -453,7 +453,7 @@ void daObjTEN_c::checkGroundPos() {
/* 80D0A13C-80D0A154 001A5C 0018+00 1/0 0/0 0/0 .text Insect_Release__10daObjTEN_cFv */
void daObjTEN_c::Insect_Release() {
field_0x56C = 1;
field_0x56c = 1;
field_0x624 = 2;
mAction = ACTION_MOVE;
}
@@ -729,7 +729,7 @@ int daObjTEN_c::create() {
if (rv == cPhs_COMPLEATE_e) {
field_0x624 = fopAcM_GetParam(this) & 0xf;
if (field_0x624 == 2) {
field_0x56C = 0;
field_0x56c = 0;
shape_angle.x -= 0x2000;
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
} else {
src/d/d_insect.cpp
+2 -2
View File
@@ -30,7 +30,7 @@ SECTION_DATA extern void* __vt__8daItem_c__HACK[] = {
/* 8015E010-8015E078 158950 0068+00 0/0 0/0 13/13 .text __ct__9dInsect_cFv */
dInsect_c::dInsect_c() {
m_itemId = -1;
field_0x56C = 0;
field_0x56c = 0;
mDraw = true;
m_mode = 0;
m_itemNo = fpcNm_ITEM_M_MAYFLY;
@@ -127,7 +127,7 @@ void dInsect_c::CalcZBuffer(f32 param_0) {
pos_projected.z = -10.0f;
}
field_0x57C =
field_0x57c =
(((view_near + ((view_far * view_near) / pos_projected.z)) / (view_far - view_near)) +
1.0f) *
16777215.0f;
src/d/d_menu_insect.cpp
+1 -1
View File
@@ -633,7 +633,7 @@ bool dMenu_Insect_c::isGiveInsect(u8 i_insectID) {
/* 801D9F3C-801D9F8C 1D487C 0050+00 0/0 1/1 12/12 .text isCatchNotGiveInsect__14dMenu_Insect_cFUc
*/
u8 dMenu_Insect_c::isCatchNotGiveInsect(u8 param_0) {
bool dMenu_Insect_c::isCatchNotGiveInsect(u8 param_0) {
if (isCatchInsect(param_0) != 0 && isGiveInsect(param_0) == 0) {
return 1;
}