Merge branch 'main' of https://github.com/TakaRikka/dusk

include/d/d_menu_collect.h

@@ -50,7 +50,11 @@ public:
     void changeShield();
     void changeClothe();
     void setArrowMaxNum(u8);
+#if TARGET_PC
+    void setWalletSizeNum(u16);
+#else
     void setWalletMaxNum(u16);
+#endif
     void setSmellType();
     void setHeartPiece();
     void setPohMaxNum(u8);

include/dusk/audio/DuskAudioSystem.h

@@ -8,6 +8,8 @@ namespace dusk::audio {
      */
     void Initialize();
 
+    void SetEnableReverb(bool value);
+
     void SetMasterVolume(f32 value);
 
     u32 GetResetCount(int channelIdx);

include/dusk/dusk.h

@@ -3,7 +3,21 @@
 
 #include <aurora/aurora.h>
 
+#include "aurora/gfx.h"
+
 extern AuroraInfo auroraInfo;
 extern const char* configPath;
 
+namespace dusk {
+    extern AuroraStats lastFrameAuroraStats;
+}
+
+constexpr u32 defaultWindowWidth = 608;
+constexpr u32 defaultWindowHeight = 448;
+
+constexpr u32 defaultAspectRatioW = 19;
+constexpr u32 defaultAspectRatioH = 14;
+
+static_assert(defaultWindowWidth / defaultAspectRatioW == defaultWindowHeight / defaultAspectRatioH);
+
 #endif  // DUSK_DUSK_H

include/dusk/settings.h

@@ -16,6 +16,7 @@ struct UserSettings {
         // Video
         ConfigVar<bool> enableFullscreen;
         ConfigVar<bool> enableVsync;
+        ConfigVar<bool> lockAspectRatio;
     } video;
 
     struct {

include/m_Do/m_Do_machine.h

@@ -15,6 +15,9 @@ void my_SysPrintHeap(char const*, void*, u32);
 void mDoMch_HeapCheckAll();
 void mDoMch_HeapFreeFillAll();
 int mDoMch_Create();
+#if TARGET_PC
+void mDoMch_Destroy();
+#endif
 
 extern GXRenderModeObj g_ntscZeldaProg;