From 62bd4b0ba79f455a9c28f94f3a39448a6cef5f74 Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Sun, 2 Apr 2023 14:18:21 -0400 Subject: [PATCH 1/2] remove rando allowing grave pulling during day (#2660) --- soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index f7b38fa92..99fa79186 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -69,7 +69,7 @@ void func_8087B7E8(BgHaka* this, PlayState* play) { Player* player = GET_PLAYER(play); if (this->dyna.unk_150 != 0.0f) { - if (play->sceneNum == SCENE_SPOT02 && !LINK_IS_ADULT && IS_DAY && !gSaveContext.n64ddFlag && !CVarGetInteger("gDayGravePull", 0)) { + if (play->sceneNum == SCENE_SPOT02 && !LINK_IS_ADULT && IS_DAY && !CVarGetInteger("gDayGravePull", 0)) { this->dyna.unk_150 = 0.0f; player->stateFlags2 &= ~0x10; if (!Play_InCsMode(play)) { From 5f708251a63b160cb52c9e69cc2b141ba7f99427 Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Sun, 2 Apr 2023 15:41:01 -0400 Subject: [PATCH 2/2] bump version (#2665) --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ff8cd1f0..16185fe02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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" FORCE) -project(Ship VERSION 6.1.1 LANGUAGES C CXX) -set(PROJECT_BUILD_NAME "KHAN BRAVO" CACHE STRING "") +project(Ship VERSION 6.1.2 LANGUAGES C CXX) +set(PROJECT_BUILD_NAME "KHAN CHARLIE" CACHE STRING "") set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "") set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)