Anchor Build 13

garrettjoecox · Dec 5, 2023 · 0e8121c · 0e8121c
1 parent 8d79572
commit 0e8121c
Show file tree

Hide file tree

Showing 54 changed files with 2,249 additions and 65 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ 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.3 LANGUAGES C CXX)
-set(PROJECT_BUILD_NAME "MacReady Delta" CACHE STRING "")
+set(PROJECT_BUILD_NAME "Anchor Build 13" CACHE STRING "")
 set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
 
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)

diff --git a/soh/include/functions.h b/soh/include/functions.h
@@ -1567,6 +1567,7 @@ s32 func_800C0808(PlayState* play, s16 camId, Player* player, s16 arg3);
 s32 Play_CameraChangeSetting(PlayState* play, s16 camId, s16 arg2);
 void func_800C08AC(PlayState* play, s16 camId, s16 arg2);
 void Play_SaveSceneFlags(PlayState* play);
+void Play_SetRespawnData(PlayState* play, s32 respawnMode, s16 entranceIndex, s32 roomIndex, s32 playerParams, Vec3f* pos, s16 yaw);
 void Play_SetupRespawnPoint(PlayState* play, s32 respawnMode, s32 playerParams);
 void Play_TriggerVoidOut(PlayState* play);
 void Play_TriggerRespawn(PlayState* play);

diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
@@ -131,12 +131,36 @@ std::map<uint32_t, ItemMapEntry> itemMapping = {
     ITEM_MAP_ENTRY(ITEM_WALLET_GIANT),
     ITEM_MAP_ENTRY(ITEM_SEEDS),
     ITEM_MAP_ENTRY(ITEM_FISHING_POLE),
+    ITEM_MAP_ENTRY(ITEM_SONG_MINUET),
+    ITEM_MAP_ENTRY(ITEM_SONG_BOLERO),
+    ITEM_MAP_ENTRY(ITEM_SONG_SERENADE),
+    ITEM_MAP_ENTRY(ITEM_SONG_REQUIEM),
+    ITEM_MAP_ENTRY(ITEM_SONG_NOCTURNE),
+    ITEM_MAP_ENTRY(ITEM_SONG_PRELUDE),
+    ITEM_MAP_ENTRY(ITEM_SONG_LULLABY),
+    ITEM_MAP_ENTRY(ITEM_SONG_EPONA),
+    ITEM_MAP_ENTRY(ITEM_SONG_SARIA),
+    ITEM_MAP_ENTRY(ITEM_SONG_SUN),
+    ITEM_MAP_ENTRY(ITEM_SONG_TIME),
+    ITEM_MAP_ENTRY(ITEM_SONG_STORMS),
+    ITEM_MAP_ENTRY(ITEM_MEDALLION_FOREST),
+    ITEM_MAP_ENTRY(ITEM_MEDALLION_FIRE),
+    ITEM_MAP_ENTRY(ITEM_MEDALLION_WATER),
+    ITEM_MAP_ENTRY(ITEM_MEDALLION_SPIRIT),
+    ITEM_MAP_ENTRY(ITEM_MEDALLION_SHADOW),
+    ITEM_MAP_ENTRY(ITEM_MEDALLION_LIGHT),
+    ITEM_MAP_ENTRY(ITEM_KOKIRI_EMERALD),
+    ITEM_MAP_ENTRY(ITEM_GORON_RUBY),
+    ITEM_MAP_ENTRY(ITEM_ZORA_SAPPHIRE),
+    ITEM_MAP_ENTRY(ITEM_STONE_OF_AGONY),
+    ITEM_MAP_ENTRY(ITEM_GERUDO_CARD),
+    ITEM_MAP_ENTRY(ITEM_SKULL_TOKEN),
+    ITEM_MAP_ENTRY(ITEM_HEART_CONTAINER),
+    ITEM_MAP_ENTRY(ITEM_HEART_PIECE),
     ITEM_MAP_ENTRY(ITEM_KEY_BOSS),
     ITEM_MAP_ENTRY(ITEM_COMPASS),
     ITEM_MAP_ENTRY(ITEM_DUNGEON_MAP),
     ITEM_MAP_ENTRY(ITEM_KEY_SMALL),
-    ITEM_MAP_ENTRY(ITEM_HEART_CONTAINER),
-    ITEM_MAP_ENTRY(ITEM_HEART_PIECE),
     ITEM_MAP_ENTRY(ITEM_MAGIC_SMALL),
     ITEM_MAP_ENTRY(ITEM_MAGIC_LARGE)
 };

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp
@@ -640,4 +640,17 @@ namespace GameInteractionEffect {
     void SlipperyFloor::_Remove() {
         GameInteractor::State::SlipperyFloorActive = 0;
     }
+
+    // MARK: - GiveItem
+    GameInteractionEffectQueryResult GiveItem::CanBeApplied() {
+        if (!GameInteractor::IsSaveLoaded()) {
+            return GameInteractionEffectQueryResult::NotPossible;
+        }
+
+        return GameInteractionEffectQueryResult::Possible;
+    }
+
+    void GiveItem::_Apply() {
+        GameInteractor::RawAction::GiveItem(parameters[0], parameters[1]);
+    }
 }
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.h b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.h
@@ -262,6 +262,11 @@ namespace GameInteractionEffect {
         void _Apply() override;
         void _Remove() override;
     };
+
+    class GiveItem: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+        GameInteractionEffectQueryResult CanBeApplied() override;
+        void _Apply() override;
+    };
 }
 
 #endif /* __cplusplus */

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -10,6 +10,7 @@
 typedef enum {
     GI_SCHEME_SAIL,
     GI_SCHEME_CROWD_CONTROL,
+    GI_SCHEME_ANCHOR,
 } GIScheme;
 
 typedef enum {
@@ -233,6 +234,7 @@ class GameInteractor {
         static void SetFlag(int16_t flagType, int16_t chestNum);
         static void UnsetFlag(int16_t flagType, int16_t chestNum);
         static void AddOrRemoveHealthContainers(int16_t amount);
+        static void GiveItem(uint16_t modId, uint16_t itemId);
         static void AddOrRemoveMagic(int8_t amount);
         static void HealOrDamagePlayer(int16_t hearts);
         static void SetPlayerHealth(int16_t hearts);