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

Fix some version differences (#852)

Browse Source 
* Fix some version differences

* Found real inline name for checkBowMiniGame
This commit is contained in:
LagoLunatic
2025-08-12 16:30:44 -04:00
committed by GitHub
parent c5878bf068
commit 2eaf012e4f
40 changed files with 515 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_barrel2.cpp
+14 -14
View File
@@ -61,7 +61,7 @@ const daObjBarrel2::Attr_c daObjBarrel2::Act_c::M_attr[] = {
/* m10 */ 800.0f,
/* m14 */ 100.0f,
/* m18 */ 50.0f,
/* m1C */ 0.0099999998f,
/* m1C */ 0.01f,
/* m20 */ 4.0f,
/* m24 */ 1.0f,
/* m28 */ 3.0f,
@@ -79,8 +79,8 @@ const daObjBarrel2::Attr_c daObjBarrel2::Act_c::M_attr[] = {
/* m58 */ 0x3E8,
/* m5C */ 0.3f,
/* m60 */ 0.02f,
/* m64 */ 0.039999999f,
/* m68 */ 0.34999999f,
/* m64 */ 0.04f,
/* m68 */ 0.35f,
/* m6C */ 1.0f,
/* m70 */ 1.0f,
},
@@ -93,7 +93,7 @@ const daObjBarrel2::Attr_c daObjBarrel2::Act_c::M_attr[] = {
/* m10 */ 300.0f,
/* m14 */ 100.0f,
/* m18 */ 50.0f,
/* m1C */ 0.0099999998f,
/* m1C */ 0.01f,
/* m20 */ 4.0f,
/* m24 */ 1.0f,
/* m28 */ 3.0f,
@@ -111,8 +111,8 @@ const daObjBarrel2::Attr_c daObjBarrel2::Act_c::M_attr[] = {
/* m58 */ 0x3E8,
/* m5C */ 0.3f,
/* m60 */ 0.02f,
/* m64 */ 0.039999999f,
/* m68 */ 0.34999999f,
/* m64 */ 0.04f,
/* m68 */ 0.35f,
/* m6C */ 1.0f,
/* m70 */ 1.0f,
},
@@ -125,7 +125,7 @@ const daObjBarrel2::Attr_c daObjBarrel2::Act_c::M_attr[] = {
/* m10 */ 4500.0f,
/* m14 */ 100.0f,
/* m18 */ 50.0f,
/* m1C */ 0.0099999998f,
/* m1C */ 0.01f,
/* m20 */ 5.76f,
/* m24 */ 1.0f,
/* m28 */ 3.0f,
@@ -143,8 +143,8 @@ const daObjBarrel2::Attr_c daObjBarrel2::Act_c::M_attr[] = {
/* m58 */ 0x3E8,
/* m5C */ 0.3f,
/* m60 */ 0.02f,
/* m64 */ 0.039999999f,
/* m68 */ 0.34999999f,
/* m64 */ 0.04f,
/* m68 */ 0.35f,
/* m6C */ 5.0f,
/* m70 */ 1.0f,
},
@@ -152,13 +152,13 @@ const daObjBarrel2::Attr_c daObjBarrel2::Act_c::M_attr[] = {
{
/* m00 */ 0x5,
/* m02 */ 0x9,
/* m04 */ 0x520,
/* m04 */ DEMO_SELECT(0x12A0, 0x520),
/* m08 */ 288.0f,
/* m0C */ 576.0f,
/* m10 */ 800.0f,
/* m14 */ 100.0f,
/* m18 */ 50.0f,
/* m1C */ 0.0099999998f,
/* m1C */ 0.01f,
/* m20 */ 5.76f,
/* m24 */ 1.0f,
/* m28 */ 3.0f,
@@ -176,8 +176,8 @@ const daObjBarrel2::Attr_c daObjBarrel2::Act_c::M_attr[] = {
/* m58 */ 0x3E8,
/* m5C */ 0.3f,
/* m60 */ 0.02f,
/* m64 */ 0.039999999f,
/* m68 */ 0.34999999f,
/* m64 */ 0.04f,
/* m68 */ 0.35f,
/* m6C */ 1.0f,
/* m70 */ 1.0f,
},
@@ -1080,7 +1080,7 @@ bool daObjBarrel2::Act_c::_execute() {
item_connect_check();
s32 uVar2 = 0;
if (m46A != 1 && dComIfGp_event_runCheck() != 0) {
if (m46A != 1 && dComIfGp_event_runCheck() != FALSE) {
uVar2 = 1;
}
m46C = uVar2;