mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-10-11 14:18:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add some more inlines

Browse Source
This commit is contained in:
LagoLunatic
2026-09-25 14:03:54 -04:00
parent 624ab5f13c
commit 96bbf3e97e
15 changed files with 92 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_com_static.cpp
+18 -17
View File
@@ -379,23 +379,23 @@ const s16 daWindMill_c::m_max_rot_speed[] = {
const u8 daNpc_Kg1_c::m_highscore = 20;
/* 80056AD0-80056AFC .text kb_dig__13daTagKbItem_cFP10fopAc_ac_c */
void daTagKbItem_c::kb_dig(fopAc_ac_c* i_actor) {
field_0x299 = 1;
mpActor = i_actor;
void daTagKbItem_c::kb_dig(fopAc_ac_c* i_pigActor) {
field_0x299 = true;
mpActor = i_pigActor;
dig_main();
}
/* 80056AFC-80056CC0 .text dig_main__13daTagKbItem_cFv */
void daTagKbItem_c::dig_main() {
#if VERSION > VERSION_JPN
if (fopAcM_isSwitch(this, field_0x2a4)) {
if (fopAcM_isSwitch(this, mSwBitNo)) {
return;
}
#endif
if (field_0x299 == 0) {
if (!field_0x299) {
return;
}
if (field_0x298 != 0) {
if (field_0x298) {
return;
}
@@ -409,16 +409,17 @@ void daTagKbItem_c::dig_main() {
// Not a pig.
return;
}
if (
mItemNo != dItemNo_NONE_e
#if VERSION <= VERSION_JPN
if (field_0x2a0 != 0xFF && field_0x298 == 0) {
#else
if (field_0x2a0 != 0xFF) {
&& !field_0x298
#endif
) {
angle.y = cM_rndF((f32)0x7FFE);
s8 roomNo = current.roomNo;
daItem_c* item = (daItem_c*)fopAcM_fastCreateItem(
&mpActor->current.pos, field_0x2a0, roomNo, &angle,
&scale, cM_rndF(5.0f), 60.0f + cM_rndFX(5.0f), -6.0f, field_0x29c
&mpActor->current.pos, mItemNo, roomNo, &angle,
&scale, cM_rndF(5.0f), 60.0f + cM_rndFX(5.0f), -6.0f, mItemBitNo
);
if (item) {
fopAcM_OnStatus(item, fopAcStts_UNK4000_e);
@@ -426,8 +427,8 @@ void daTagKbItem_c::dig_main() {
#if VERSION <= VERSION_JPN
fopAcM_delete(this);
#else
if (field_0x2a4 != 0xFF) {
fopAcM_onSwitch(this, field_0x2a4);
if (mSwBitNo != 0xFF) {
fopAcM_onSwitch(this, mSwBitNo);
} else {
fopAcM_delete(this);
}
@@ -435,9 +436,9 @@ void daTagKbItem_c::dig_main() {
r30 = true;
}
if (field_0x2a1 != 0xFF) {
mpActor->home.angle.z = field_0x2a1;
fopAcM_onSwitch(this, field_0x2a4);
if (mEnemyKind != 0xFF) {
mpActor->home.angle.z = mEnemyKind;
fopAcM_onSwitch(this, mSwBitNo);
fopAcM_delete(this);
r30 = true;
}
@@ -445,7 +446,7 @@ void daTagKbItem_c::dig_main() {
if (r30) {
field_0x298 = r30;
}
field_0x299 = 0;
field_0x299 = false;
}
#if VERSION > VERSION_DEMO