weirdshot

inspectredc · inspectredc · commit 2cb76a13dbca · 2025-08-30T15:39:43.000+01:00
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h b/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
@@ -51,6 +51,7 @@ DEFINE_HOOK(OnLinkAnimEnd, (SkelAnime* skelAnime));
 DEFINE_HOOK(OnQPADamage, (uint32_t* dmgFlags));
 DEFINE_HOOK(OnESS, ());
 DEFINE_HOOK(OnWaitForPutaway, ());
+DEFINE_HOOK(OnAnimationSetLoadFrame, (LinkAnimationHeader* animation, int32_t* frame));
 
 DEFINE_HOOK(OnDialogMessage, ());
 DEFINE_HOOK(OnPresentTitleCard, ());
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
@@ -113,6 +113,10 @@ void GameInteractor_ExecuteOnWaitForPutaway() {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnWaitForPutaway>();
 }
 
+void GameInteractor_ExecuteOnAnimationSetLoadFrame(LinkAnimationHeader* animation, int32_t* frame) {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnAnimationSetLoadFrame>(animation, frame);
+}
+
 void GameInteractor_ExecuteOnShopSlotChangeHooks(uint8_t cursorIndex, int16_t price) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnShopSlotChange>(cursorIndex, price);
 }
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
@@ -32,6 +32,7 @@ void GameInteractor_ExecuteOnLinkAnimEnd(SkelAnime* skelAnime);
 void GameInteractor_ExecuteOnQPADamage(uint32_t* dmgFlags);
 void GameInteractor_ExecuteOnESS();
 void GameInteractor_ExecuteOnWaitForPutaway();
+void GameInteractor_ExecuteOnAnimationSetLoadFrame(LinkAnimationHeader* animation, int32_t* frame);
 void GameInteractor_ExecuteOnActorInit(void* actor);
 void GameInteractor_ExecuteOnActorSpawn(void* actor);
 void GameInteractor_ExecuteOnActorUpdate(void* actor);
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
@@ -2197,6 +2197,14 @@ void StaticData::HintTable_Init_Item() {
                                                }, {
                                                CustomMessage("a beginner's trick", /*german*/"Ground Jump", /*french*/"Ground Jump")});
                                                 // /*spanish*/Ground Jump
+    hintTextTable[RHT_ABILITY_WEIRDSHOT] = HintText(CustomMessage("Weirdshot", /*german*/"Weirdshot", /*french*/"Weirdshot"),
+                                               // /*spanish*/Weirdshot
+                                               {
+                                               CustomMessage("a weird shot", /*german*/"Weirdshot", /*french*/"Weirdshot")
+                                                // /*spanish*/Weirdshot
+                                               }, {
+                                               CustomMessage("a mangled animation", /*german*/"Weirdshot", /*french*/"Weirdshot")});
+                                                // /*spanish*/Weirdshot
 
     //What is this used for?
     hintTextTable[RHT_HINT_MYSTERIOUS] = HintText(CustomMessage("something mysterious", /*german*/"etwas Mysteriöses", /*french*/"un sacré mystère"));
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -615,6 +615,9 @@ void GenerateItemPool() {
     if (ctx->GetOption(RSK_SHUFFLE_GROUND_JUMP)) {
         AddItemToMainPool(RG_ABILITY_GROUND_JUMP);
     }
+    if (ctx->GetOption(RSK_SHUFFLE_WEIRDSHOT)) {
+        AddItemToMainPool(RG_ABILITY_WEIRDSHOT);
+    }
 
     if (ctx->GetOption(RSK_SHUFFLE_BEEHIVES)) {
         // 32 total beehive locations
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -2415,6 +2415,24 @@ void RandomizerOnKaleidoMoveCursorFromSpecialPos(PauseContext* pauseCtx, uint16_
     }
 }
 
+void RandomizerOnAnimationSetLoadFrame(LinkAnimationHeader* animation, int32_t* frame) {
+    if (!Flags_GetRandomizerInf(RAND_INF_CAN_WEIRDSHOT)) {
+        std::optional<const char*> animationName;
+
+        if (ResourceMgr_OTRSigCheck(reinterpret_cast<char*>(animation)) != 0) {
+            animationName = reinterpret_cast<const char*>(animation);
+            animation = reinterpret_cast<LinkAnimationHeader*>(ResourceMgr_LoadAnimByName(*animationName));
+        }
+
+        const auto playerAnimHeader =
+            static_cast<LinkAnimationHeader*>(SEGMENTED_TO_VIRTUAL(static_cast<void*>(animation)));
+
+        if (*frame < 0 || *frame >= playerAnimHeader->common.frameCount) {
+            *frame = 0;
+        }
+    }
+}
+
 void RandomizerRegisterHooks() {
     static uint32_t onFlagSetHook = 0;
     static uint32_t onSceneFlagSetHook = 0;
@@ -2439,6 +2457,7 @@ void RandomizerRegisterHooks() {
     static uint32_t onESSHook = 0;
     static uint32_t onWaitForPutawayHook = 0;
     static uint32_t onKaleidoMoveCursorFromSpecialPosHook = 0;
+    static uint32_t onAnimationSetLoadFrameHook = 0;
 
     static uint32_t fishsanityOnActorInitHook = 0;
     static uint32_t fishsanityOnActorUpdateHook = 0;
@@ -2476,6 +2495,7 @@ void RandomizerRegisterHooks() {
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnESS>(onESSHook);
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnWaitForPutaway>(onWaitForPutawayHook);
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnKaleidoMoveCursorFromSpecialPos>(onKaleidoMoveCursorFromSpecialPosHook);
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnAnimationSetLoadFrame>(onAnimationSetLoadFrameHook);
 
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorInit>(fishsanityOnActorInitHook);
         GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(fishsanityOnActorUpdateHook);
@@ -2566,6 +2586,8 @@ void RandomizerRegisterHooks() {
             onWaitForPutawayHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnWaitForPutaway>(RandomizerOnWaitForPutaway);
         onKaleidoMoveCursorFromSpecialPosHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnKaleidoMoveCursorFromSpecialPos>(
             [](PauseContext* pauseCtx, uint16_t* cursorItem) { RandomizerOnKaleidoMoveCursorFromSpecialPos(pauseCtx, cursorItem); });
+        onAnimationSetLoadFrameHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnAnimationSetLoadFrame>(
+            [](LinkAnimationHeader* animation, int32_t* frame) { RandomizerOnAnimationSetLoadFrame(animation, frame); });
 
         COND_VB_SHOULD(VB_SKIP_FORCE_PLAY_OCARINA, true, { RandomizerShouldSkipForcePlayOcarina(should); });
 
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -366,8 +366,10 @@ void Rando::StaticData::InitItemTable() {
     itemTable[RG_ABILITY_HOVER].SetCustomDrawFunc(Randomizer_DrawMysteryItem);
     itemTable[RG_ABILITY_EQUIP_SWAP] =                  Item(RG_ABILITY_EQUIP_SWAP,               Text{ "Equip Swap", "Equip Swap", "Equip Swap" },                                                                                    ITEMTYPE_ITEM,              GI_NONE,              true,  LOGIC_NONE,                         RHT_ABILITY_EQUIP_SWAP,                RG_ABILITY_EQUIP_SWAP,                OBJECT_GI_COIN,         GID_NCOIN_YELLOW,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_ABILITY_EQUIP_SWAP].SetCustomDrawFunc(Randomizer_DrawMysteryItem);
-    itemTable[RG_ABILITY_GROUND_JUMP] =                  Item(RG_ABILITY_GROUND_JUMP,             Text{ "Ground Jump", "Ground Jump", "Ground Jump" },                                                                                 ITEMTYPE_ITEM,              GI_NONE,              true,  LOGIC_NONE,                         RHT_ABILITY_GROUND_JUMP,               RG_ABILITY_GROUND_JUMP,               OBJECT_GI_COIN,         GID_NCOIN_YELLOW,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_ABILITY_GROUND_JUMP] =                 Item(RG_ABILITY_GROUND_JUMP,              Text{ "Ground Jump", "Ground Jump", "Ground Jump" },                                                                                 ITEMTYPE_ITEM,              GI_NONE,              true,  LOGIC_NONE,                         RHT_ABILITY_GROUND_JUMP,               RG_ABILITY_GROUND_JUMP,               OBJECT_GI_COIN,         GID_NCOIN_YELLOW,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
     itemTable[RG_ABILITY_GROUND_JUMP].SetCustomDrawFunc(Randomizer_DrawMysteryItem);
+    itemTable[RG_ABILITY_WEIRDSHOT] =                   Item(RG_ABILITY_WEIRDSHOT,                Text{ "Weirdshot", "Weirdshot", "Weirdshot" },                                                                                       ITEMTYPE_ITEM,              GI_NONE,              true,  LOGIC_NONE,                         RHT_ABILITY_WEIRDSHOT,                 RG_ABILITY_WEIRDSHOT,                 OBJECT_GI_COIN,         GID_NCOIN_YELLOW,     TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,  MOD_RANDOMIZER);
+    itemTable[RG_ABILITY_WEIRDSHOT].SetCustomDrawFunc(Randomizer_DrawMysteryItem);
 
     itemTable[RG_BOMBCHU_BAG] =                         Item(RG_BOMBCHU_BAG,                      Text{ "Bombchu Bag", "Sac de Missiles Teigneux", "Krabbelminentasche" },                                                             ITEMTYPE_ITEM,              RG_BOMBCHU_BAG,       true,  LOGIC_BOMBCHUS,                     RHT_BOMBCHU_BAG,                       RG_BOMBCHU_BAG,                       OBJECT_GI_BOMB_2,       GID_BOMBCHU,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
     itemTable[RG_BOMBCHU_BAG].SetCustomDrawFunc(Randomizer_DrawBombchuBag);
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -1827,6 +1827,9 @@ void Logic::ApplyItemEffect(Item& item, bool state) {
                 case RG_ABILITY_GROUND_JUMP:
                     SetRandoInf(RAND_INF_CAN_GROUND_JUMP, state);
                     break;
+                case RG_ABILITY_WEIRDSHOT:
+                    SetRandoInf(RAND_INF_CAN_WEIRDSHOT, state);
+                    break;
                 default:
                     break;
             }
@@ -2375,6 +2378,9 @@ void Logic::Reset(bool resetSaveContext /*= true*/) {
         if (ctx->GetOption(RSK_SHUFFLE_GROUND_JUMP).Is(false)) {
             SetRandoInf(RAND_INF_CAN_GROUND_JUMP, true);
         }
+        if (ctx->GetOption(RSK_SHUFFLE_WEIRDSHOT).Is(false)) {
+            SetRandoInf(RAND_INF_CAN_WEIRDSHOT, true);
+        }
 
         // If we're not shuffling child's wallet, we start with it
         if (ctx->GetOption(RSK_SHUFFLE_CHILD_WALLET).Is(false)) {
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -777,5 +777,7 @@ void Settings::CreateOptionDescriptions() {
         "Shuffles the ability to equip swap into the item pool.";
     mOptionDescriptions[RSK_SHUFFLE_GROUND_JUMP] =
         "Shuffles the ability to ground jump into the item pool.";
+    mOptionDescriptions[RSK_SHUFFLE_WEIRDSHOT] =
+        "Shuffles the ability to weirdshot into the item pool.";
 }
 } // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -5394,7 +5394,7 @@ CustomMessage Randomizer::GetGoronMessage(u16 index) {
 void Randomizer::CreateCustomMessages() {
     // RANDTODO: Translate into french and german and replace GIMESSAGE_UNTRANSLATED
     // with GIMESSAGE(getItemID, itemID, english, german, french).
-    const std::array<GetItemMessage, 118> getItemMessages = { {
+    const std::array<GetItemMessage, 120> getItemMessages = { {
         GIMESSAGE(RG_GREG_RUPEE, ITEM_MASK_GORON, "You found %gGreg%w!", "%gGreg%w! Du hast ihn&wirklich gefunden!",
                   "Félicitation! Vous avez trouvé %gGreg%w!"),
         GIMESSAGE(RG_MASTER_SWORD, ITEM_SWORD_MASTER, "You found the %gMaster Sword%w!",
@@ -5740,9 +5740,12 @@ void Randomizer::CreateCustomMessages() {
         GIMESSAGE(RG_ABILITY_EQUIP_SWAP, ITEM_DINS_FIRE, "You got %rEquip Swap%w!",
                   "Du hast %rEquip Swap%w&erhalten!",
                   "Vous obtenez %rEquip Swap%w!"),
-        GIMESSAGE(RG_ABILITY_GROUND_JUMP, ITEM_DINS_FIRE, "You got %rGround Jump%w!",
+        GIMESSAGE(RG_ABILITY_GROUND_JUMP, ITEM_SHIELD_HYLIAN, "You got %rGround Jump%w!",
                   "Du hast %rGround Jump%w&erhalten!",
                   "Vous obtenez %rGround Jump%w!"),
+        GIMESSAGE(RG_ABILITY_WEIRDSHOT, ITEM_HOOKSHOT, "You got %rWeirdshot%w!",
+                  "Du hast %rWeirdshot%w&erhalten!",
+                  "Vous obtenez %rWeirdshot%w!"),
                   
         GIMESSAGE(RG_FISHING_POLE, ITEM_FISHING_POLE, "You found a lost %rFishing Pole%w!&Time to hit the pond!",
                   "Du hast eine verlorene %rAngelrute%w&gefunden!&Zeit, im Teich&zu angeln!",
@@ -5945,6 +5948,7 @@ std::map<RandomizerGet, RandomizerInf> randomizerGetToRandInf = {
     { RG_ABILITY_HOVER, RAND_INF_CAN_HOVER },
     { RG_ABILITY_EQUIP_SWAP, RAND_INF_CAN_EQUIP_SWAP },
     { RG_ABILITY_GROUND_JUMP, RAND_INF_CAN_GROUND_JUMP },
+    { RG_ABILITY_WEIRDSHOT, RAND_INF_CAN_WEIRDSHOT },
 };
 
 extern "C" u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -4064,6 +4064,7 @@ typedef enum {
     RG_ABILITY_HOVER,
     RG_ABILITY_EQUIP_SWAP,
     RG_ABILITY_GROUND_JUMP,
+    RG_ABILITY_WEIRDSHOT,
 
     // Logic Only
     RG_DISTANT_SCARECROW,
@@ -5669,6 +5670,7 @@ typedef enum {
     RHT_ABILITY_HOVER,
     RHT_ABILITY_EQUIP_SWAP,
     RHT_ABILITY_GROUND_JUMP,
+    RHT_ABILITY_WEIRDSHOT,
     // MAX
     RHT_MAX,
 } RandomizerHintTextKey;
@@ -5971,6 +5973,7 @@ typedef enum {
     RSK_SHUFFLE_HOVER,
     RSK_SHUFFLE_EQUIP_SWAP,
     RSK_SHUFFLE_GROUND_JUMP,
+    RSK_SHUFFLE_WEIRDSHOT,
     RSK_MAX
 } RandomizerSettingKey;
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h
@@ -1012,6 +1012,7 @@ DEFINE_RAND_INF(RAND_INF_CAN_SUPERSLIDE)
 DEFINE_RAND_INF(RAND_INF_CAN_HOVER)
 DEFINE_RAND_INF(RAND_INF_CAN_EQUIP_SWAP)
 DEFINE_RAND_INF(RAND_INF_CAN_GROUND_JUMP)
+DEFINE_RAND_INF(RAND_INF_CAN_WEIRDSHOT)
 
 DEFINE_RAND_INF(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_LEFT)
 DEFINE_RAND_INF(RAND_INF_BEEHIVE_KF_STORMS_GROTTO_RIGHT)
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -282,6 +282,9 @@ extern "C" void Randomizer_InitSaveFile() {
     if (Randomizer_GetSettingValue(RSK_SHUFFLE_GROUND_JUMP) == RO_GENERIC_OFF) {
         Flags_SetRandomizerInf(RAND_INF_CAN_GROUND_JUMP);
     }
+    if (Randomizer_GetSettingValue(RSK_SHUFFLE_WEIRDSHOT) == RO_GENERIC_OFF) {
+        Flags_SetRandomizerInf(RAND_INF_CAN_WEIRDSHOT);
+    }
 
     if (Randomizer_GetSettingValue(RSK_SHUFFLE_CHILD_WALLET) == RO_GENERIC_OFF) {
         Flags_SetRandomizerInf(RAND_INF_HAS_WALLET);
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -222,6 +222,7 @@ void Settings::CreateOptions() {
     OPT_BOOL(RSK_SHUFFLE_HOVER, "Shuffle Hovering", CVAR_RANDOMIZER_SETTING("ShuffleHover"), mOptionDescriptions[RSK_SHUFFLE_HOVER]);
     OPT_BOOL(RSK_SHUFFLE_EQUIP_SWAP, "Shuffle Equip Swap", CVAR_RANDOMIZER_SETTING("ShuffleEquipSwap"), mOptionDescriptions[RSK_SHUFFLE_EQUIP_SWAP]);
     OPT_BOOL(RSK_SHUFFLE_GROUND_JUMP, "Shuffle Ground Jump", CVAR_RANDOMIZER_SETTING("ShuffleGroundJump"), mOptionDescriptions[RSK_SHUFFLE_GROUND_JUMP]);
+    OPT_BOOL(RSK_SHUFFLE_WEIRDSHOT, "Shuffle Weirdshot", CVAR_RANDOMIZER_SETTING("ShuffleWeirdshot"), mOptionDescriptions[RSK_SHUFFLE_WEIRDSHOT]);
     OPT_U8(RSK_SHUFFLE_POTS, "Shuffle Pots", {"Off", "Dungeons", "Overworld", "All Pots"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShufflePots"), mOptionDescriptions[RSK_SHUFFLE_POTS], WidgetType::Combobox, RO_SHUFFLE_POTS_OFF);
     OPT_U8(RSK_SHUFFLE_GRASS, "Shuffle Grass", {"Off", "Dungeons", "Overworld", "All Grass/Bushes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleGrass"), mOptionDescriptions[RSK_SHUFFLE_GRASS], WidgetType::Combobox, RO_SHUFFLE_GRASS_OFF);
     OPT_U8(RSK_SHUFFLE_CRATES, "Shuffle Crates", {"Off", "Dungeons", "Overworld", "All Crates"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleCrates"), mOptionDescriptions[RSK_SHUFFLE_CRATES], WidgetType::Combobox, RO_SHUFFLE_CRATES_OFF);
@@ -1263,6 +1264,7 @@ void Settings::CreateOptions() {
                                                                        &mOptions[RSK_SHUFFLE_HOVER],
                                                                        &mOptions[RSK_SHUFFLE_EQUIP_SWAP],
                                                                        &mOptions[RSK_SHUFFLE_GROUND_JUMP],
+                                                                       &mOptions[RSK_SHUFFLE_WEIRDSHOT],
                                                                    },
                                                                    WidgetContainerType::COLUMN);
     mOptionGroups[RSG_SHUFFLE_NPCS_IMGUI] =
@@ -1565,6 +1567,7 @@ void Settings::CreateOptions() {
                                             &mOptions[RSK_SHUFFLE_HOVER],
                                             &mOptions[RSK_SHUFFLE_EQUIP_SWAP],
                                             &mOptions[RSK_SHUFFLE_GROUND_JUMP],
+                                            &mOptions[RSK_SHUFFLE_WEIRDSHOT],
                                         });
     mOptionGroups[RSG_SHUFFLE_DUNGEON_ITEMS] =
         OptionGroup("Shuffle Dungeon Items", {
diff --git a/soh/src/code/z_skelanime.c b/soh/src/code/z_skelanime.c
@@ -889,6 +889,8 @@ void AnimationContext_SetLoadFrame(PlayState* play, LinkAnimationHeader* animati
                                    Vec3s* frameTable) {
     AnimationEntry* entry = AnimationContext_AddEntry(&play->animationCtx, ANIMENTRY_LOADFRAME);
 
+    GameInteractor_ExecuteOnAnimationSetLoadFrame(animation, &frame);
+    
     if (GameInteractor_Should(VB_LOAD_PLAYER_ANIMATION_FRAME, entry != NULL, entry, animation, frame, limbCount,
                               frameTable)) {
         if (ResourceMgr_OTRSigCheck(animation) != 0)

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,10 @@ void GameInteractor_ExecuteOnWaitForPutaway() {`
`113`	`113`	`GameInteractor::Instance->ExecuteHooks<GameInteractor::OnWaitForPutaway>();`
`114`	`114`	`}`
`115`	`115`
	`116`	`+void GameInteractor_ExecuteOnAnimationSetLoadFrame(LinkAnimationHeader* animation, int32_t* frame) {`
	`117`	`+ GameInteractor::Instance->ExecuteHooks<GameInteractor::OnAnimationSetLoadFrame>(animation, frame);`
	`118`	`+}`
	`119`	`+`
`116`	`120`	`void GameInteractor_ExecuteOnShopSlotChangeHooks(uint8_t cursorIndex, int16_t price) {`
`117`	`121`	`GameInteractor::Instance->ExecuteHooks<GameInteractor::OnShopSlotChange>(cursorIndex, price);`
`118`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -615,6 +615,9 @@ void GenerateItemPool() {`
`615`	`615`	`if (ctx->GetOption(RSK_SHUFFLE_GROUND_JUMP)) {`
`616`	`616`	`AddItemToMainPool(RG_ABILITY_GROUND_JUMP);`
`617`	`617`	`}`
	`618`	`+ if (ctx->GetOption(RSK_SHUFFLE_WEIRDSHOT)) {`
	`619`	`+ AddItemToMainPool(RG_ABILITY_WEIRDSHOT);`
	`620`	`+ }`
`618`	`621`
`619`	`622`	`if (ctx->GetOption(RSK_SHUFFLE_BEEHIVES)) {`
`620`	`623`	`// 32 total beehive locations`
Original file line number	Diff line number	Diff line change
`@@ -777,5 +777,7 @@ void Settings::CreateOptionDescriptions() {`
`777`	`777`	`"Shuffles the ability to equip swap into the item pool.";`
`778`	`778`	`mOptionDescriptions[RSK_SHUFFLE_GROUND_JUMP] =`
`779`	`779`	`"Shuffles the ability to ground jump into the item pool.";`
	`780`	`+ mOptionDescriptions[RSK_SHUFFLE_WEIRDSHOT] =`
	`781`	`+ "Shuffles the ability to weirdshot into the item pool.";`
`780`	`782`	`}`
`781`	`783`	`} // namespace Rando`