mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-25 07:02:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/TwilitRealm/dusk into randomizer

Browse Source
This commit is contained in:
gymnast86
2026-04-11 13:27:33 -07:00
parent 2d4247f10e 6a91693752
commit 796a67f207
51 changed files with 280 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_e_fb.h
+6
View File
@@ -71,10 +71,16 @@ private:
/* 0xA30 */ dCcD_Sph mSphere2;
/* 0xB68 */ dCcD_Sph mAtSph;
/* 0xCA0 */ dCcU_AtInfo mAtInfo;
#if AVOID_UB
/* 0xCC4 */ u32 mKeys[8];
/* 0xCE4 */ u8 mHIOInit;
/* 0xCE5 */ u8 field_0xce5[0xCE8 - 0xCE5];
#else
// !@bug Seems that the orig developers didn't size mKeys correctly, as ideally it should be len=8, not len=7:
/* 0xCC4 */ u32 mKeys[7];
/* 0xCE0 */ u8 mHIOInit;
/* 0xCE1 */ u8 field_0xce1[0xCE8 - 0xCE1];
#endif
};
STATIC_ASSERT(sizeof(daE_FB_c) == 0xce8);
include/d/actor/d_a_e_tk2.h
+1 -2
View File
@@ -39,8 +39,7 @@ public:
/* 0x680 */ s16 mPlayerAngleY;
/* 0x684 */ f32 mPlayerDistanceLimit;
/* 0x688 */ u8 field24_0x688[2];
/* 0x68A */ s16 mActionTimer[3];
/* 0x690 */ s16 mExecuteState;
/* 0x68A */ s16 mActionTimer[4];
/* 0x692 */ s16 mInvincibilityTimer;
/* 0x694 */ s8 mAttentionOFF;
/* 0x695 */ s8 mTKBallSpawned;
include/d/actor/d_a_e_vt.h
+1 -2
View File
@@ -159,8 +159,7 @@ private:
/* 0x00958 */ mDoExt_3DlineMat1_c mRope;
/* 0x00994 */ cXyz field_0x994[100];
/* 0x00E44 */ csXyz field_0xe44[100];
/* 0x0109C */ u8 mRopeCutStatus[10];
/* 0x010A6 */ u8 field_0x10A6[0x01100 - 0x010A6];
/* 0x0109C */ u8 mRopeCutStatus[100];
/* 0x01100 */ u8 mDrawRopes;
/* 0x01101 */ u8 field_0x1101[0x01104 - 0x01101];
/* 0x01104 */ f32 field_0x1104[10];
include/d/actor/d_a_mg_rod.h
+6 -7
View File
@@ -128,10 +128,10 @@ public:
/* 0x0760 */ f32 field_0x760;
/* 0x0764 */ cXyz field_0x764;
/* 0x0770 */ mg_line_s mg_line; // below to mg_hook_s part of mg_line_s?
/* 0x0C20 */ f32 field_0xc20[98];
/* 0x0DA8 */ u8 field_0xDA8[0x0DB0 - 0x0DA8];
/* 0x0DB0 */ f32 field_0xdb0[98];
/* 0x0F38 */ u8 field_0xF38[0x0F40 - 0x0F38];
/* 0x0C20 */ f32 field_0xc20[99];
/* 0x0DA8 */ u8 field_0xDAC[0x0DB0 - 0x0DAC];
/* 0x0DB0 */ f32 field_0xdb0[99];
/* 0x0F3C */ u8 field_0xF38[0x0F40 - 0x0F3C];
/* 0x0F40 */ mDoExt_3DlineMat0_c linemat;
/* 0x0F5C */ f32 field_0xf5c;
/* 0x0F60 */ f32 field_0xf60;
@@ -183,9 +183,8 @@ public:
/* 0x102F */ u8 field_0x102f;
/* 0x1030 */ J3DModel* esa_model[2];
/* 0x1038 */ u8 field_0x1038[0x103C - 0x1038];
/* 0x103C */ s16 field_0x103c[8];
/* 0x104C */ u8 field_0x104C[0x104E - 0x104C];
/* 0x104E */ s16 field_0x104e[8];
/* 0x103C */ s16 field_0x103c[9];
/* 0x104E */ s16 field_0x104e[9];
/* 0x1060 */ cXyz hook_pos;
/* 0x106C */ cXyz field_0x106c;
/* 0x1078 */ cXyz field_0x1078;
include/d/actor/d_a_npc_coach.h
+1 -4
View File
@@ -25,10 +25,7 @@ public:
/* 0x1C */ f32 max_speed; // 最大速度 - Maximum Speed
/* 0x20 */ f32 spring_constant; // バネ係数 - Spring Constant
/* 0x24 */ f32 damp_coeff[1]; // 減衰係数 - Damp Coefficient
/* 0x28 */ f32 field_0x28[1];
/* 0x2C */ f32 field_0x2c;
/* 0x30 */ f32 field_0x30;
/* 0x34 */ f32 field_0x34;
/* 0x28 */ f32 field_0x28[4];
/* 0x38 */ f32 vert_swing_width; // 縦揺れ幅 - Vertical Swing Width
/* 0x3C */ f32 shake_dist; // 揺れ距離 - Shake Distance
/* 0x40 */ f32 jump_dist; // 跳ね距離 - Jump Distance
include/d/actor/d_a_npc_lf.h
+1 -2
View File
@@ -24,8 +24,7 @@ struct lf_s {
/* 0x44 */ f32 field_0x44;
/* 0x48 */ f32 field_0x48;
/* 0x4C */ s16 field_0x4c[2];
/* 0x50 */ s16 field_0x50[2];
/* 0x54 */ u8 field_0x54[4];
/* 0x50 */ s16 field_0x50[4];
/* 0x58 */ f32 field_0x58;
/* 0x5C */ f32 field_0x5c;
/* 0x60 */ f32 field_0x60;
include/d/actor/d_a_obj_maki.h
+1 -3
View File
@@ -28,11 +28,9 @@ public:
/* 0x580 */ s16 field_0x580[2];
/* 0x584*/ dCcD_Stts mStts;
/* 0x5c0 */ dCcD_Sph mSph;
/* 0x6f8 */ u32 field_0x6f8[4];
/* 0x6fc */ u8 field_0x6fc[0x70c - 0x708]; // Undefined
/* 0x6f8 */ u32 field_0x6f8[5];
/* 0x70c */ LIGHT_INFLUENCE mLightObj;
/* 0x72c */ u8 field_0x72c;
/* 0x72d */ u8 field_0x72d[0x730 - 0x72d]; //Undefined
};
STATIC_ASSERT(sizeof(obj_maki_class) == 0x730);
include/d/actor/d_a_obj_tombo.h
+1 -2
View File
@@ -55,8 +55,7 @@ private:
/* 0x710 */ bool mIsHitByBoomerang;
/* 0x711 */ u8 mAction;
/* 0x712 */ u8 field_0x712;
/* 0x714 */ s16 field_0x714[2];
/* 0x718 */ s16 field_0x718;
/* 0x714 */ s16 field_0x714[3];
/* 0x71C */ f32 field_0x71c;
/* 0x720 */ f32 field_0x720;
/* 0x724 */ s16 field_0x724;
include/d/d_meter_HIO.h
+3 -8
View File
@@ -104,12 +104,8 @@ public:
/* 0x18 */ f32 mWindowPosX;
/* 0x1C */ f32 mWindowPosY;
/* 0x20 */ f32 mWindowScale;
/* 0x24 */ f32 mOptionTypeBGPosX[4];
/* 0x34 */ f32 mTVsettingPosX;
/* 0x38 */ f32 mPointerCalibrationPosX;
/* 0x3C */ f32 mOptionTypeBGPosY[4];
/* 0x4C */ f32 mTVsettingPosY;
/* 0x50 */ f32 mPointerCalibrationPosY;
/* 0x24 */ f32 mOptionTypeBGPosX[6];
/* 0x3C */ f32 mOptionTypeBGPosY[6];
/* 0x54 */ f32 mBarScale[2]; // 0: mSelectBarScale | 1: mUnselectBarScale
/* 0x5C */ f32 mBackgroundPosY;
/* 0x60 */ f32 mArrowOffsetX;
@@ -547,8 +543,7 @@ public:
/* 0x1C */ f32 mVesselTalkPosY;
/* 0x20 */ f32 mVesselPosX_4x3;
/* 0x24 */ f32 mVesselPosY_4x3;
/* 0x28 */ f32 mVesselAlpha[3];
/* 0x34 */ f32 mDropAlpha;
/* 0x28 */ f32 mVesselAlpha[4];
/* 0x38 */ JUtility::TColor mDropOnColorWhite;
/* 0x3C */ JUtility::TColor mDropOnColorBlack;
/* 0x40 */ JUtility::TColor mDropOffColorWhite;
include/dusk/gx_helper.h
+3
View File
@@ -5,6 +5,7 @@
#include <dolphin/gx/GXAurora.h>
#include <dolphin/gx/GXExtra.h>
#include "tracy/Tracy.hpp"
#define GX_DEBUG_GROUP(name, ...) \
do { \
@@ -51,4 +52,6 @@ struct GXScopedDebugGroup {
}
};
#define GX_AND_TRACY_SCOPED(name) GXScopedDebugGroup scope(name); ZoneScopedN(name);
#endif // DUSK_GX_HELPER_H
include/m_Do/m_Do_graphic.h
+5 -3
View File
@@ -8,12 +8,14 @@
#include <aurora/aurora.h>
#endif
#define FB_WIDTH_BASE (608)
#define FB_HEIGHT_BASE (448)
#if WIDESCREEN_SUPPORT && !TARGET_PC
#define FB_WIDTH (640)
#define FB_HEIGHT (456)
#else
#define FB_WIDTH (608)
#define FB_HEIGHT (448)
#define FB_WIDTH FB_WIDTH_BASE
#define FB_HEIGHT FB_HEIGHT_BASE
#endif
int mDoGph_Create();
@@ -276,7 +278,7 @@ public:
#if TARGET_PC
static void onWide(f32 width, f32 height);
#else
#else
static void onWide();
#endif