Skip to content

Commit

Permalink
8.0.4 Update
Browse files Browse the repository at this point in the history
  • Loading branch information
Waterdish committed Dec 20, 2023
1 parent 3584fec commit aa1f345
Show file tree
Hide file tree
Showing 70 changed files with 1,142 additions and 392 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ android {
}
minSdkVersion 18
targetSdkVersion 31
versionCode 3
versionName "1.1.1"
versionCode 4
versionName "1.1.2"
externalNativeBuild {
//ndkBuild {
// arguments "APP_PLATFORM=android-23"
Expand Down
4 changes: 2 additions & 2 deletions app/jni/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20 ")

project(Game VERSION 8.0.2 LANGUAGES C CXX)
set(PROJECT_BUILD_NAME "MacReady Charlie" CACHE STRING "")
project(Game VERSION 8.0.4 LANGUAGES C CXX)
set(PROJECT_BUILD_NAME "MacReady Echo" CACHE STRING "")
set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")

add_subdirectory(src)
Expand Down
4 changes: 2 additions & 2 deletions app/jni/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")

set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")

project(Ship VERSION 8.0.2 LANGUAGES C CXX)
set(PROJECT_BUILD_NAME "MacReady Charlie" CACHE STRING "")
project(Ship VERSION 8.0.4 LANGUAGES C CXX)
set(PROJECT_BUILD_NAME "MacReady Echo" CACHE STRING "")
set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")

set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)
Expand Down
2 changes: 1 addition & 1 deletion app/jni/src/soh/assets/xml/GC_MQ_D/objects/object_mo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<Vtx/>
</Array>

<Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
<Array Name="gMorphaVtx_006A18" Count="286" Offset="0x006A18">
<Vtx/>
</Array>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Root>
<File Name="ovl_Boss_Dodongo" BaseAddress="0x808C1190" RangeStart="0x6238" RangeEnd="0x9238">
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x6238"/>
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x6238"/>
<Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x8238"/>
</File>
</Root>
8 changes: 4 additions & 4 deletions app/jni/src/soh/assets/xml/GC_MQ_PAL_F/objects/object_mo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- Morpha's Title Card -->
<Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
<Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x8870"/>

<!-- DLists for Morpha's Core -->
<DList Name="gMorphaCoreMembraneDL" Offset="0x6700"/>
<DList Name="gMorphaCoreNucleusDL" Offset="0x6838"/>
Expand Down Expand Up @@ -69,17 +69,17 @@
<!-- Unused content -->

<!-- This is the dlist for EnVbBall for some reason. -->
<DList Name="gMorphaDL_000550" Offset="0x550"/>
<DList Name="gMorphaDL_000550" Offset="0x550"/>

<DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
<DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
<DList Name="gMorphaDL_007BF8" Offset="0x7BF8"/>

<Array Name="gMorphaVtx_006938" Count="14" Offset="0x6938">
<Vtx/>
</Array>

<Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
<Array Name="gMorphaVtx_006A18" Count="286" Offset="0x006A18">
<Vtx/>
</Array>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Root>
<File Name="ovl_Boss_Dodongo" BaseAddress="0x808B7370" RangeStart="0x61E8" RangeEnd="0x9238">
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x61E8"/>
<File Name="ovl_Boss_Dodongo" BaseAddress="0x808B7370" RangeStart="0x61E8" RangeEnd="0x91E8">
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61E8"/>
<Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81E8"/>
</File>
</Root>
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Root>
<File Name="nes_message_data_static">
<Text Name="nes_message_data_static" CodeOffset="0xF6910"/>
<Text Name="nes_message_data_static" CodeOffset="0xF68F0"/>
</File>
<File Name="ger_message_data_static">
<Text Name="ger_message_data_static" CodeOffset="0xF6910" LangOffset="0xFAB38"/>
<Text Name="ger_message_data_static" CodeOffset="0xF68F0" LangOffset="0xFAB18"/>
</File>
<File Name="fra_message_data_static">
<Text Name="fra_message_data_static" CodeOffset="0xF6910" LangOffset="0xFCC48"/>
<Text Name="fra_message_data_static" CodeOffset="0xF68F0" LangOffset="0xFCC28"/>
</File>
<File Name="staff_message_data_static">
<Text Name="staff_message_data_static" CodeOffset="0xFED58"/>
<Text Name="staff_message_data_static" CodeOffset="0xFED38"/>
</File>
</Root>
8 changes: 4 additions & 4 deletions app/jni/src/soh/assets/xml/GC_NMQ_D/objects/object_mo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- Morpha's Title Card -->
<Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
<Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x8870"/>

<!-- DLists for Morpha's Core -->
<DList Name="gMorphaCoreMembraneDL" Offset="0x6700"/>
<DList Name="gMorphaCoreNucleusDL" Offset="0x6838"/>
Expand Down Expand Up @@ -69,17 +69,17 @@
<!-- Unused content -->

<!-- This is the dlist for EnVbBall for some reason. -->
<DList Name="gMorphaDL_000550" Offset="0x550"/>
<DList Name="gMorphaDL_000550" Offset="0x550"/>

<DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
<DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
<DList Name="gMorphaDL_007BF8" Offset="0x7BF8"/>

<Array Name="gMorphaVtx_006938" Count="14" Offset="0x6938">
<Vtx/>
</Array>

<Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
<Array Name="gMorphaVtx_006A18" Count="286" Offset="0x006A18">
<Vtx/>
</Array>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Root>
<File Name="ovl_Boss_Dodongo" BaseAddress="0x808C1210" RangeStart="0x6238" RangeEnd="0x9238">
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x6238"/>
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x6238"/>
<Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x8238"/>
</File>
</Root>
8 changes: 4 additions & 4 deletions app/jni/src/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- Morpha's Title Card -->
<Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
<Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x8870"/>

<!-- DLists for Morpha's Core -->
<DList Name="gMorphaCoreMembraneDL" Offset="0x6700"/>
<DList Name="gMorphaCoreNucleusDL" Offset="0x6838"/>
Expand Down Expand Up @@ -69,17 +69,17 @@
<!-- Unused content -->

<!-- This is the dlist for EnVbBall for some reason. -->
<DList Name="gMorphaDL_000550" Offset="0x550"/>
<DList Name="gMorphaDL_000550" Offset="0x550"/>

<DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
<DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
<DList Name="gMorphaDL_007BF8" Offset="0x7BF8"/>

<Array Name="gMorphaVtx_006938" Count="14" Offset="0x6938">
<Vtx/>
</Array>

<Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
<Array Name="gMorphaVtx_006A18" Count="286" Offset="0x006A18">
<Vtx/>
</Array>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Root>
<File Name="ovl_Boss_Dodongo" BaseAddress="0x808C1190" RangeStart="0x6238" RangeEnd="0x9238">
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x6238"/>
<Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x8238"/>
<File Name="ovl_Boss_Dodongo" BaseAddress="0x808C1190" RangeStart="0x61E8" RangeEnd="0x91E8">
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61E8"/>
<Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81E8"/>
</File>
</Root>
8 changes: 4 additions & 4 deletions app/jni/src/soh/assets/xml/N64_PAL_10/objects/object_mo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- Morpha's Title Card -->
<Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
<Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x8870"/>

<!-- DLists for Morpha's Core -->
<DList Name="gMorphaCoreMembraneDL" Offset="0x6700"/>
<DList Name="gMorphaCoreNucleusDL" Offset="0x6838"/>
Expand Down Expand Up @@ -69,17 +69,17 @@
<!-- Unused content -->

<!-- This is the dlist for EnVbBall for some reason. -->
<DList Name="gMorphaDL_000550" Offset="0x550"/>
<DList Name="gMorphaDL_000550" Offset="0x550"/>

<DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
<DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
<DList Name="gMorphaDL_007BF8" Offset="0x7BF8"/>

<Array Name="gMorphaVtx_006938" Count="14" Offset="0x6938">
<Vtx/>
</Array>

<Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
<Array Name="gMorphaVtx_006A18" Count="286" Offset="0x006A18">
<Vtx/>
</Array>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Root>
<File Name="ovl_Boss_Dodongo" BaseAddress="0x8089E470" RangeStart="0x61C8" RangeEnd="0x91C8">
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x61C8"/>
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61C8"/>
<Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81C8"/>
</File>
</Root>
8 changes: 4 additions & 4 deletions app/jni/src/soh/assets/xml/N64_PAL_11/objects/object_mo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- Morpha's Title Card -->
<Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
<Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x8870"/>

<!-- DLists for Morpha's Core -->
<DList Name="gMorphaCoreMembraneDL" Offset="0x6700"/>
<DList Name="gMorphaCoreNucleusDL" Offset="0x6838"/>
Expand Down Expand Up @@ -69,17 +69,17 @@
<!-- Unused content -->

<!-- This is the dlist for EnVbBall for some reason. -->
<DList Name="gMorphaDL_000550" Offset="0x550"/>
<DList Name="gMorphaDL_000550" Offset="0x550"/>

<DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
<DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
<DList Name="gMorphaDL_007BF8" Offset="0x7BF8"/>

<Array Name="gMorphaVtx_006938" Count="14" Offset="0x6938">
<Vtx/>
</Array>

<Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
<Array Name="gMorphaVtx_006A18" Count="286" Offset="0x006A18">
<Vtx/>
</Array>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Root>
<File Name="ovl_Boss_Dodongo" BaseAddress="0x808C1190" RangeStart="0x61C8" RangeEnd="0x91C8">
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x61C8"/>
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61C8"/>
<Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81C8"/>
</File>
</Root>
10 changes: 5 additions & 5 deletions app/jni/src/soh/properties.h
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

#define VER_FILEVERSION 8, 0, 2, 0
#define VER_FILEVERSION_STR "8.0.2\0"
#define VER_FILEVERSION 8, 0, 4, 0
#define VER_FILEVERSION_STR "8.0.4\0"

#define VER_PRODUCTVERSION 8, 0, 2, 0
#define VER_PRODUCTVERSION_str "8.0.2\0"
#define VER_PRODUCTVERSION 8, 0, 4, 0
#define VER_PRODUCTVERSION_str "8.0.4\0"

#define VER_COMPANYNAME_STR "github.com/harbourmasters\0"
#define VER_PRODUCTNAME_STR "Ship of Harkinian\0"

#define VER_INTERNALNAME_STR "soh\0"
#define VER_ORIGINALFILENAME_STR "soh.exe\0"

#define VER_FILEDESCRIPTION_STR "Ship of Harkinian - MacReady Charlie\0"
#define VER_FILEDESCRIPTION_STR "Ship of Harkinian - MacReady Echo\0"
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ namespace GameControlEditor {
DrawHelpIcon("Allows the cursor on the pause menu to be over any slot. Sometimes required in rando to select "
"certain items.");
UIWidgets::Spacer(0);
ImGui::BeginDisabled(CVarGetInteger("gDisableChangingSettings", 0));
UIWidgets::PaddedEnhancementCheckbox("Enable walk speed modifiers", "gEnableWalkModify", true, false);
DrawHelpIcon("Hold the assigned button to change the maximum walking speed\nTo change the assigned button, go into the Ports tabs above");
if (CVarGetInteger("gEnableWalkModify", 0)) {
Expand All @@ -323,6 +324,7 @@ namespace GameControlEditor {
UIWidgets::PaddedEnhancementSliderFloat("Modifier 2: %d %%", "##WalkMod2", "gWalkModifierTwo", 0.0f, 5.0f, "", 1.0f, true, true, false, true);
window->EndGroupPanelPublic(0);
}
ImGui::EndDisabled();
UIWidgets::Spacer(0);
UIWidgets::PaddedEnhancementCheckbox("Answer Navi Prompt with L Button", "gNaviOnL");
DrawHelpIcon("Speak to Navi with L but enter first-person camera with C-Up");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1485,6 +1485,7 @@ void Draw_Placements(){
}

void DrawSillyTab() {
ImGui::BeginDisabled(CVarGetInteger("gDisableChangingSettings", 0));
if (CVarGetInteger("gLetItSnow", 0)) {
if (UIWidgets::EnhancementCheckbox("Let It Snow", "gLetItSnow")) {
LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
Expand Down Expand Up @@ -1569,6 +1570,7 @@ void DrawSillyTab() {
CVarClear("gCosmetics.Kak_Windmill_Speed.Changed");
LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
}
ImGui::EndDisabled();
}

// Copies the RGB values from one cosmetic option to another, multiplied by the passed in amount, this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ typedef enum {
TEXT_WARP_NOCTURNE_OF_SHADOW = 0x891,
TEXT_WARP_PRELUDE_OF_LIGHT = 0x892,
TEXT_WARP_RANDOM_REPLACED_TEXT = 0x9200,
TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW = 0x9210,
TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN = 0x346, // 0x3yy for cuttable sign range
TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI = 0x1B3, // 0x1yy for Navi msg range
} TextIDs;
Expand Down
5 changes: 5 additions & 0 deletions app/jni/src/soh/soh/Enhancements/enhancementTypes.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#ifndef _ENHANCEMENT_TYPES_H_
#define _ENHANCEMENT_TYPES_H_

typedef enum {
WARP_MODE_OVERRIDE_OFF,
WARP_MODE_OVERRIDE_MQ_AS_VANILLA,
Expand Down Expand Up @@ -74,3 +77,5 @@ typedef enum {
DEKU_STICK_UNBREAKABLE,
DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE,
} DekuStickType;

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ void GameInteractor_SetTriforceHuntCreditsWarpActive(uint8_t state);

#include <vector>
#include <functional>
#include <string>

#define DEFINE_HOOK(name, type) \
struct name { \
Expand Down Expand Up @@ -193,6 +194,9 @@ class GameInteractor {

DEFINE_HOOK(OnSetGameLanguage, void());

DEFINE_HOOK(OnFileDropped, void(std::string filePath));
DEFINE_HOOK(OnAssetAltChange, void());

// Helpers
static bool IsSaveLoaded();
static bool IsGameplayPaused();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,9 @@ void GameInteractor_ExecuteOnUpdateFileNameSelection(int16_t charCode) {
void GameInteractor_ExecuteOnSetGameLanguage() {
GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSetGameLanguage>();
}

// MARK: - System

void GameInteractor_RegisterOnAssetAltChange(void (*fn)(void)) {
GameInteractor::Instance->RegisterGameHook<GameInteractor::OnAssetAltChange>(fn);
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ void GameInteractor_ExecuteOnUpdateFileNameSelection(int16_t charCode);

// MARK: - Game
void GameInteractor_ExecuteOnSetGameLanguage();

// MARK: - System
void GameInteractor_RegisterOnAssetAltChange(void (*fn)(void));

#ifdef __cplusplus
}
#endif
2 changes: 1 addition & 1 deletion app/jni/src/soh/soh/Enhancements/gameplaystats.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ void DrawGameplayStatsOptionsTab() {
}

void GameplayStatsWindow::DrawElement() {
ImGui::SetNextWindowSize(ImVec2(480, 550), ImGuiCond_Appearing);
ImGui::SetNextWindowSize(ImVec2(480, 550), ImGuiCond_FirstUseEver);
if (!ImGui::Begin("Gameplay Stats", &mIsVisible, ImGuiWindowFlags_NoFocusOnAppearing)) {
ImGui::End();
return;
Expand Down
Loading

0 comments on commit aa1f345

Please sign in to comment.