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

src/Z2AudioLib/Z2WolfHowlMgr.cpp

@@ -115,7 +115,14 @@ static Z2WolfHowlLine sNewSong3[9] = {
     {HOWL_LINE_MID, 45},
 };
 
-static Z2WolfHowlData sGuideData[9] = {
+#if TARGET_PC
+static Z2WolfHowlLine sHowlTimeSong[6] = {
+    {HOWL_LINE_MID, 20}, {HOWL_LINE_LOW, 20}, {HOWL_LINE_HIGH, 40},
+    {HOWL_LINE_MID, 20}, {HOWL_LINE_LOW, 20}, {HOWL_LINE_HIGH, 40},
+};
+#endif
+
+static Z2WolfHowlData sGuideData[9 IF_DUSK(+1)] = {
     {ARRAY_SIZE(sHowlTobikusa), sHowlTobikusa},
     {ARRAY_SIZE(sHowlUmakusa), sHowlUmakusa},
     {ARRAY_SIZE(sHowlZeldaSong), sHowlZeldaSong},
@@ -125,6 +132,9 @@ static Z2WolfHowlData sGuideData[9] = {
     {ARRAY_SIZE(sNewSong1), sNewSong1},
     {ARRAY_SIZE(sNewSong2), sNewSong2},
     {ARRAY_SIZE(sNewSong3), sNewSong3},
+    #if TARGET_PC
+    {ARRAY_SIZE(sHowlTimeSong), sHowlTimeSong},
+    #endif
 };
 
 Z2WolfHowlMgr::Z2WolfHowlMgr() : JASGlobalInstance(true) {
@@ -356,6 +366,13 @@ void Z2WolfHowlMgr::setCorrectData(s8 curveID, Z2WolfHowlData* data) {
         cPitchCenter = 0.94387f;
         cPitchDown = 0.74915f;
         break;
+    #if TARGET_PC
+    case Z2WOLFHOWL_TIMESONG:
+        cPitchUp = 1.259906f;
+        cPitchCenter = 0.94387f;
+        cPitchDown = 0.840885f;
+        break;
+    #endif
     default:
         cPitchUp = 1.1892f;
         cPitchCenter = 1.0f;
@@ -400,7 +417,7 @@ u8 Z2WolfHowlMgr::getCorrectLineNum() {
     return 0;
 }
 
-static JAISoundID sCorrectPhrase[9] = {
+static JAISoundID sCorrectPhrase[9 IF_DUSK(+1)] = {
     Z2BGM_HOWL_TOBIKUSA,
     Z2BGM_HOWL_UMAKUSA,
     Z2BGM_HOWL_ZELDASONG,
@@ -410,9 +427,12 @@ static JAISoundID sCorrectPhrase[9] = {
     Z2BGM_NEW_01_HOWL,
     Z2BGM_NEW_02_HOWL,
     Z2BGM_NEW_03_HOWL,
+    #if TARGET_PC
+    0xFFFFFFFF,
+    #endif
 };
 
-static JAISoundID sWindStoneSound[9] = {
+static JAISoundID sWindStoneSound[9 IF_DUSK(+1)] = {
     0xFFFFFFFF,
     0xFFFFFFFF,
     Z2BGM_STONE_ZELDASONG,
@@ -422,9 +442,12 @@ static JAISoundID sWindStoneSound[9] = {
     Z2BGM_NEW_01_STONE,
     Z2BGM_NEW_02_STONE,
     Z2BGM_NEW_03_STONE,
+    #if TARGET_PC
+    0xFFFFFFFF,
+    #endif
 };
 
-static JAISoundID sCorrectDuo[9] = {
+static JAISoundID sCorrectDuo[9 IF_DUSK(+1)] = {
     0xFFFFFFFF,
     0xFFFFFFFF,
     0xFFFFFFFF,
@@ -434,6 +457,9 @@ static JAISoundID sCorrectDuo[9] = {
     Z2BGM_NEW_01_DUO,
     Z2BGM_NEW_02_DUO,
     Z2BGM_NEW_03_DUO,
+    #if TARGET_PC
+    0xFFFFFFFF,
+    #endif
 };
 
 s8 Z2WolfHowlMgr::checkLine() {

src/d/actor/d_a_alink_dusk.cpp

@@ -4,6 +4,65 @@
 #include "d/d_meter2_draw.h"
 #include "d/d_meter2_info.h"
 
+void daAlink_c::handleWolfHowl() {
+    if (checkWolf()) {
+        if (!dusk::getSettings().game.sunsSong) {
+            return;
+        }
+
+        // Check to see if Link has the ability to transform.
+        if (!dComIfGs_isEventBit(dSv_event_flag_c::M_077)) {
+            return;
+        }
+
+        // Ensure there is a proper pointer to the mMeterClass and mpMeterDraw structs in
+        // g_meter2_info.
+        const auto meterClassPtr = g_meter2_info.getMeterClass();
+        if (!meterClassPtr) {
+            return;
+        }
+
+        const auto meterDrawPtr = meterClassPtr->getMeterDrawPtr();
+        if (!meterDrawPtr) {
+            return;
+        }
+
+        // Ensure that link is not in a cutscene.
+        if (checkEventRun()) {
+            Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
+            return;
+        }
+
+        mDoCPd_c::getCpadInfo(PAD_1).mPressedButtonFlags = 0;
+
+        // Ensure that the Z Button is not dimmed
+        if (meterDrawPtr->getButtonZAlpha() != 1.f) {
+            Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
+            return;
+        }
+
+        bool canTransform = false;
+
+        if (mLinkAcch.ChkGroundHit() && !checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn()) {
+            if (!checkForestOldCentury()) {
+                if (checkMidnaRide()) {
+                    if ((checkWolf() &&
+                         (checkModeFlg(MODE_UNK_1000) || dComIfGp_checkPlayerStatus0(0, 0x10))) ||
+                        (!checkWolf() &&
+                         (checkEventRun() || getMidnaActor()->checkMetamorphoseEnable()) &&
+                         (checkModeFlg(4) || dComIfGp_checkPlayerStatus0(0, 0x10))))
+                    {
+                        canTransform = true;
+                    }
+                }
+            }
+        }
+
+        getWolfHowlMgrP()->setCorrectCurve(9);
+        procWolfHowlDemoInit();
+    }
+}
+
 void daAlink_c::handleQuickTransform() {
     if (!dusk::getSettings().game.enableQuickTransform) {
         return;

src/d/actor/d_a_alink_wolf.inc

@@ -3954,7 +3954,13 @@ int daAlink_c::procWolfHowlDemoInit() {
             mZ2WolfHowlMgr.setCorrectCurve(-1);
         }
     } else {
+        #if TARGET_PC
+        if (mZ2WolfHowlMgr.getCorrectCurveID() != 9) {
+            mZ2WolfHowlMgr.setCorrectCurve(-1);
+        }
+        #else
         mZ2WolfHowlMgr.setCorrectCurve(-1);
+        #endif
     }
 
     mNormalSpeed = 0.0f;
@@ -4095,6 +4101,19 @@ int daAlink_c::procWolfHowlDemo() {
                         dStage_changeScene(mProcVar0.mHowlExitID, 0.0f, 0, fopAcM_GetRoomNo(this),
                                            shape_angle.y, -1);
                     } else {
+                        #if TARGET_PC
+                        if (daAlink_getAlinkActorClass()->getCorrectCurveID() == 9) {
+                            if (dComIfGp_roomControl_getTimePass()) {
+                                g_env_light.time_change_rate = 1.0f;
+                                dComIfGp_event_reset();
+                                dCam_getBody()->EndEventCamera(fopAcM_GetID(this));
+                            } else {
+                                setWolfHowlNotHappen(isSkipEdge);
+                            }
+                            return 1;
+                        }
+                        #endif
+
                         fopAc_ac_c* actor_p = NULL;
                         if (gwolf_p == NULL) {
                             fopAcIt_Executor((fopAcIt_ExecutorFunc)daAlink_searchWolfHowl,

src/d/d_drawlist.cpp

@@ -1459,7 +1459,7 @@ void dDlst_shadowControl_c::init() {
 #else
         u32 buffer_size = GXGetTexBufferSize(size, size, 5, GX_DISABLE, 0);
 #endif
-        delete mShadowTexData[i];
+        JKR_DELETE_ARRAY(mShadowTexData[i]);
         mShadowTexData[i] = JKR_NEW_ARRAY_ARGS(u8, buffer_size, 0x20);
 
         mShadowTexObj[i].reset();

src/d/d_kankyo.cpp

@@ -1540,8 +1540,21 @@ void dScnKy_env_light_c::setDaytime() {
                     }
 
                     if (dComIfGp_roomControl_getTimePass() && !field_0x130a && temp_r29) {
+                        #if TARGET_PC
+                        f32 prev = daytime;
+                        #endif
+
                         daytime += time_change_rate;
 
+                        #if TARGET_PC
+                        if (time_change_rate == 1.0f &&
+                            (std::fmod(daytime - 90.0f + 360.0f, 360.0f) < std::fmod(prev - 90.0f + 360.0f, 360.0f) ||
+                             std::fmod(daytime - 285.0f + 360.0f, 360.0f) < std::fmod(prev - 285.0f + 360.0f, 360.0f)))
+                        {
+                            g_env_light.time_change_rate = 0.012f;
+                        }
+                        #endif
+
                         // Stage is Fishing Pond or Hena's Hut
                         if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") ||
                             !strcmp(dComIfGp_getStartStageName(), "R_SP127"))

src/dusk/extras.c

@@ -54,7 +54,7 @@ void *_memcpy(void* dest, void const* src, int n) {
 }
 
 void DCZeroRange(void* addr, uint32_t nBytes) {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || TARGET_ANDROID
     memset(addr, 0, nBytes);
 #else
     bzero(addr, nBytes);

src/dusk/imgui/ImGuiFirstRunPreset.cpp

@@ -39,6 +39,7 @@ static void ApplyPresetDusk() {
     s.game.instantSaves.setValue(true);
     s.game.midnasLamentNonStop.setValue(true);
     s.game.enableFrameInterpolation.setValue(true);
+    s.game.sunsSong.setValue(true);
     s.game.bloomMode.setValue(BloomMode::Dusk);
 }
 

src/dusk/imgui/ImGuiMenuEnhancements.cpp

@@ -11,6 +11,15 @@ namespace dusk {
         if (ImGui::BeginMenu("Enhancements")) {
             if (ImGui::BeginMenu("Quality of Life")) {
                 config::ImGuiCheckbox("Quick Transform (R+Y)", getSettings().game.enableQuickTransform);
+                if (ImGui::IsItemHovered()) {
+                    ImGui::SetTooltip("Allows you to quickly transform between forms\n"
+                                      "without having to talk to Midna.");
+                }
+
+                config::ImGuiCheckbox("Sun's Song (R+X)", getSettings().game.sunsSong);
+                if (ImGui::IsItemHovered()) {
+                    ImGui::SetTooltip("Allows Wolf Link to howl and change the time of day.");
+                }
 
                 config::ImGuiCheckbox("Bigger Wallets", getSettings().game.biggerWallets);
                 if (ImGui::IsItemHovered()) {

src/dusk/imgui/ImGuiMenuGame.cpp

@@ -16,6 +16,7 @@
 #include "m_Do/m_Do_graphic.h"
 
 #include <aurora/gfx.h>
+#include <SDL3/SDL_gamepad.h>
 
 #include "dusk/main.h"
 
@@ -174,6 +175,122 @@ namespace dusk {
         ImGui::EndChild();
     }
 
+    struct SpecificButtonName {
+        SDL_GamepadType Type;
+        const char* Name;
+    };
+
+    struct ButtonNames {
+        SDL_GamepadButton Button;
+        std::vector<SpecificButtonName> Names;
+    };
+
+// clang-format off
+    static const std::vector<ButtonNames> GamepadButtonNames = {
+        { SDL_GAMEPAD_BUTTON_LEFT_STICK, {
+           {SDL_GAMEPAD_TYPE_PS3, "L3"},
+           {SDL_GAMEPAD_TYPE_PS4, "L3"},
+           {SDL_GAMEPAD_TYPE_PS5, "L3"},
+           {SDL_GAMEPAD_TYPE_XBOX360, "Left Stick"},
+           {SDL_GAMEPAD_TYPE_XBOXONE, "Left Stick"},
+           {SDL_GAMEPAD_TYPE_GAMECUBE, "Control Stick"},
+        }},
+        { SDL_GAMEPAD_BUTTON_RIGHT_STICK, {
+           {SDL_GAMEPAD_TYPE_PS3, "R3"},
+           {SDL_GAMEPAD_TYPE_PS4, "R3"},
+           {SDL_GAMEPAD_TYPE_PS5, "R3"},
+           {SDL_GAMEPAD_TYPE_XBOX360, "Right Stick"},
+           {SDL_GAMEPAD_TYPE_XBOXONE, "Right Stick"},
+           {SDL_GAMEPAD_TYPE_GAMECUBE, "C Stick"},
+        }},
+        { SDL_GAMEPAD_BUTTON_LEFT_SHOULDER, {
+           {SDL_GAMEPAD_TYPE_PS3, "L1"},
+           {SDL_GAMEPAD_TYPE_PS4, "L1"},
+           {SDL_GAMEPAD_TYPE_PS5, "L1"},
+           {SDL_GAMEPAD_TYPE_XBOX360, "LB"},
+           {SDL_GAMEPAD_TYPE_XBOXONE, "LB"},
+        }},
+        { SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER, {
+           {SDL_GAMEPAD_TYPE_PS3, "R1"},
+           {SDL_GAMEPAD_TYPE_PS4, "R1"},
+           {SDL_GAMEPAD_TYPE_PS5, "R1"},
+           {SDL_GAMEPAD_TYPE_XBOX360, "RB"},
+           {SDL_GAMEPAD_TYPE_XBOXONE, "RB"},
+           {SDL_GAMEPAD_TYPE_GAMECUBE, "Z"},
+        }},
+        { SDL_GAMEPAD_BUTTON_BACK, {
+           {SDL_GAMEPAD_TYPE_PS3, "Select"},
+           {SDL_GAMEPAD_TYPE_PS4, "Share"},
+           {SDL_GAMEPAD_TYPE_PS5, "Create"},
+           {SDL_GAMEPAD_TYPE_XBOX360, "Back"},
+           {SDL_GAMEPAD_TYPE_XBOXONE, "View"},
+        }},
+        { SDL_GAMEPAD_BUTTON_START, {
+           {SDL_GAMEPAD_TYPE_PS3, "Start"},
+           {SDL_GAMEPAD_TYPE_PS4, "Options"},
+           {SDL_GAMEPAD_TYPE_PS5, "Options"},
+           {SDL_GAMEPAD_TYPE_XBOX360, "Start"},
+           {SDL_GAMEPAD_TYPE_XBOXONE, "Menu"},
+           {SDL_GAMEPAD_TYPE_GAMECUBE, "Start/Pause"},
+        }},
+    };
+// clang-format on
+
+    static const char* GetNameForGamepadButton(SDL_Gamepad* gamepad, u32 buttonUntyped) {
+        if (buttonUntyped == PAD_NATIVE_BUTTON_INVALID) {
+            return "Not bound";
+        }
+
+        auto button = static_cast<SDL_GamepadButton>(buttonUntyped);
+        auto label = SDL_GetGamepadButtonLabel(gamepad, button);
+
+        switch (label) {
+        case SDL_GAMEPAD_BUTTON_LABEL_A:
+            return "A";
+        case SDL_GAMEPAD_BUTTON_LABEL_B:
+            return "B";
+        case SDL_GAMEPAD_BUTTON_LABEL_X:
+            return "X";
+        case SDL_GAMEPAD_BUTTON_LABEL_Y:
+            return "Y";
+        case SDL_GAMEPAD_BUTTON_LABEL_CROSS:
+            return "Cross";
+        case SDL_GAMEPAD_BUTTON_LABEL_CIRCLE:
+            return "Circle";
+        case SDL_GAMEPAD_BUTTON_LABEL_TRIANGLE:
+            return "Triangle";
+        case SDL_GAMEPAD_BUTTON_LABEL_SQUARE:
+            return "Square";
+        default:; // Fall through
+        }
+
+        auto padType = SDL_GetGamepadType(gamepad);
+        for (const auto& buttonNames : GamepadButtonNames) {
+            if (buttonNames.Button != button) {
+                continue;
+            }
+
+            for (const auto& name : buttonNames.Names) {
+                if (name.Type == padType) {
+                    return name.Name;
+                }
+            }
+        }
+
+        switch (button) {
+        case SDL_GAMEPAD_BUTTON_DPAD_LEFT:
+            return "D-pad left";
+        case SDL_GAMEPAD_BUTTON_DPAD_RIGHT:
+            return "D-pad right";
+        case SDL_GAMEPAD_BUTTON_DPAD_UP:
+            return "D-pad up";
+        case SDL_GAMEPAD_BUTTON_DPAD_DOWN:
+            return "D-pad down";
+        default:
+            return PADGetNativeButtonName(buttonUntyped);
+        }
+    }
+
     void ImGuiMenuGame::windowControllerConfig() {
         if (!m_showControllerConfig) {
             return;
@@ -303,6 +420,7 @@ namespace dusk {
 
         ImGuiBeginGroupPanel("Buttons", ImVec2(150 * scale, 20 * scale));
 
+        SDL_Gamepad* gamepad = PADGetSDLGamepadForIndex(PADGetIndexForPort(m_controllerConfig.m_selectedPort));
         u32 buttonCount;
         PADButtonMapping* btnMappingList = PADGetButtonMappings(m_controllerConfig.m_selectedPort, &buttonCount);
         if (btnMappingList != nullptr) {
@@ -322,7 +440,7 @@ namespace dusk {
                 if (m_controllerConfig.m_isReading && m_controllerConfig.m_pendingButtonMapping == &btnMappingList[i]) {
                     dispName = fmt::format("Press a Key...##{}", btnName);
                 } else {
-                    const char* nativeName = PADGetNativeButtonName(btnMappingList[i].nativeButton);
+                    const char* nativeName = GetNameForGamepadButton(gamepad, btnMappingList[i].nativeButton);
                     if (nativeName == nullptr) {
                         nativeName = "[unbound]";
                     }

src/dusk/imgui/ImGuiPreLaunchWindow.cpp

@@ -47,7 +47,11 @@ void fileDialogCallback(void* userdata, const char* const* filelist, [[maybe_unu
 ImGuiPreLaunchWindow::ImGuiPreLaunchWindow() = default;
 
 bool ImGuiPreLaunchWindow::isSelectedPathValid() const {
+#if TARGET_ANDROID
+    return !m_selectedIsoPath.empty(); // unsure why SDL_GetPathInfo doesnt work here
+#else
     return !m_selectedIsoPath.empty() && SDL_GetPathInfo(m_selectedIsoPath.c_str(), nullptr);
+#endif
 }
 
 void ImGuiPreLaunchWindow::draw() {
@@ -106,7 +110,7 @@ void ImGuiPreLaunchWindow::drawMainMenu() {
 
     ImGui::PushFont(ImGuiEngine::fontLarge);
 
-    if (m_selectedIsoPath.empty() || !SDL_GetPathInfo(m_selectedIsoPath.c_str(), nullptr)) {
+    if (!isSelectedPathValid()) {
         if (ImGuiButtonCenter("Select disc image...")) {
             SDL_ShowOpenFileDialog(&fileDialogCallback, this, aurora::window::get_sdl_window(),
                                    skGameDiscFileFilters.data(), int(skGameDiscFileFilters.size()),

src/dusk/logging.cpp

@@ -9,6 +9,12 @@
 
 #include "tracy/Tracy.hpp"
 
+#if TARGET_ANDROID
+#include "android/log.h"
+#include <vector>
+#include <sstream>
+#endif
+
 bool StubLogEnabled = true;
 
 using namespace std::literals::string_view_literals;
@@ -91,6 +97,45 @@ static bool IsForStubLog(const char* message) {
     return false;
 }
 
+#if TARGET_ANDROID
+void aurora_log_callback(AuroraLogLevel level, const char* module, const char* message,
+                         unsigned int len) {
+    ZoneScoped;
+    if (StubLogEnabled && level != LOG_FATAL && IsForStubLog(message)) {
+        dusk::SendToStubLog(level, module, message);
+        return;
+    }
+
+    int android_log_level = 0;
+    switch (level) {
+    case LOG_DEBUG:
+        android_log_level = ANDROID_LOG_DEBUG;
+        break;
+    case LOG_INFO:
+        android_log_level = ANDROID_LOG_INFO;
+        break;
+    case LOG_WARNING:
+        android_log_level = ANDROID_LOG_WARN;
+        break;
+    case LOG_ERROR:
+        android_log_level = ANDROID_LOG_ERROR;
+        break;
+    case LOG_FATAL:
+        android_log_level = ANDROID_LOG_FATAL;
+        break;
+    }
+
+    std::stringstream msgStream(message);
+    std::string segment;
+    while(std::getline(msgStream, segment)) {
+        __android_log_print(android_log_level, module, "%s\n", segment.c_str());
+    }
+
+    if (level == LOG_FATAL) {
+        abort();
+    }
+}
+#else
 void aurora_log_callback(AuroraLogLevel level, const char* module, const char* message,
                          unsigned int len) {
     ZoneScoped;
@@ -118,6 +163,8 @@ void aurora_log_callback(AuroraLogLevel level, const char* module, const char* m
         abort();
     }
 }
+#endif
+
 
 aurora::Module DuskLog("dusk");
 

src/dusk/settings.cpp

@@ -35,6 +35,7 @@ UserSettings g_userSettings = {
         .noMissClimbing {"game.noMissClimbing", false},
         .fastTears {"game.fastTears", false},
         .instantSaves {"game.instantSaves", false},
+        .sunsSong {"game.sunsSong", false},
 
         // Preferences
         .enableMirrorMode {"game.enableMirrorMode", false},
@@ -113,6 +114,7 @@ void registerSettings() {
     Register(g_userSettings.game.fastClimbing);
     Register(g_userSettings.game.fastTears);
     Register(g_userSettings.game.instantSaves);
+    Register(g_userSettings.game.sunsSong);
     Register(g_userSettings.game.enableMirrorMode);
     Register(g_userSettings.game.invertCameraXAxis);
     Register(g_userSettings.game.bloomMode);

src/f_ap/f_ap_game.cpp

@@ -748,6 +748,12 @@ void fapGm_Execute() {
     #endif
 
 #if TARGET_PC
+    if (mDoCPd_c::getHoldR(PAD_1) && mDoCPd_c::getTrigX(PAD_1)) {
+        if (const auto link = g_dComIfG_gameInfo.play.getPlayer(0)) {
+            dynamic_cast<daAlink_c*>(link)->handleWolfHowl();
+        }
+    }
+
     if (mDoCPd_c::getHoldR(PAD_1) && mDoCPd_c::getTrigY(PAD_1)) {
         if (const auto link = g_dComIfG_gameInfo.play.getPlayer(0)) {
             dynamic_cast<daAlink_c*>(link)->handleQuickTransform();