Hotfix/2.0.1 (#207)

* Renamed output 3gx and elf to be the same name as the release 3gx file

* Fixed Address OrigValue Reading (Read32 probably was called too early?)

* Fixed Move Furniture Freezing Game, also improved IsIndoors Boolean

* Improved Move Furniture so Villagers appear in their house

* Removed Custom Seed Item Icons

* Set new version number

* Oops, forgot this

* Fixed Seed Items not appearing when picking up

* Fixed CI job - wrong 3gx name

Author: kwadukathole

.github/workflows/c-cpp.yml

@@ -47,7 +47,7 @@ jobs:
         
         for folder in 0004000000198e00 0004000000198d00 00040000004C5700 0004000000199000 0004000000086500 0004000000086400 0004000000086300 0004000000086200 0004000000198f00; do
             mkdir -p package/luma/plugins/$folder/snd
-            cp Vapecord-ACNL-Plugin.3gx package/luma/plugins/$folder/Vapecord_Public.3gx
+            cp Vapecord_Public.3gx package/luma/plugins/$folder/Vapecord_Public.3gx
             cp -r Files/snd/* package/luma/plugins/$folder/snd/
         done
 

Includes/Address/Addresses.hpp

@@ -4,7 +4,7 @@
 
 #define majorV 2
 #define minorV 0
-#define revisV 0
+#define revisV 1
 
 namespace CTRPluginFramework {
 	bool WriteLanguage(const std::string& langCode);

Includes/Config.hpp

@@ -9,7 +9,6 @@ namespace CTRPluginFramework {
             bool v_isTurbo = false;
             bool v_isFov = false;
             bool v_isSaveMenuDisabled = false;
-            bool v_isIndoors = false;
 
             RuntimeContext() = default;
             static RuntimeContext* instance;
@@ -22,7 +21,5 @@ namespace CTRPluginFramework {
             void setFov(bool value);
             bool isSaveMenuDisabled() const;
             void setSaveMenuDisabled(bool value);
-            bool isIndoors() const;
-            void setIndoors(bool value);
     };
 }

Includes/RuntimeContext.hpp

@@ -233,6 +233,7 @@ namespace CTRPluginFramework {
 	void DisableAllChecks(void);
 	void DisableAllPatches(void);
 
+	void SeedItemLegitimacyEntry(MenuEntry *entry);
 	void OnlineDropLagRemoverEntry(MenuEntry *entry);
     void ChangeRockbreakParticleEntry(MenuEntry *entry);
     void DropItemsEverywhereEntry(MenuEntry *entry);
@@ -258,7 +259,7 @@ namespace CTRPluginFramework {
     void SetDropRules(MenuEntry *entry);
     void SetPlantRules(MenuEntry *entry);
     void FixParticlesInPuzzleLeague(MenuEntry *entry);
-    void SetCustomSpritesForSeedItemsAndProDesigns(MenuEntry *entry);
+    void SetCustomSpritesForProDesigns(MenuEntry *entry);
 	void FruitStackingCheck(MenuEntry *entry);
 
 	void SetLanguageEntry(MenuEntry *entry);

Includes/cheats.hpp

@@ -11,7 +11,7 @@ include $(DEVKITARM)/3ds_rules
 
 CTRPFLIB	?=	$(DEVKITPRO)/libctrpf
 
-TARGET		:= 	$(notdir $(CURDIR))
+TARGET		:= 	Vapecord_Public
 
 BUILD		:= 	Build
 INCLUDES	:= 	Includes \

Makefile

@@ -326,7 +326,8 @@ namespace CTRPluginFramework {
         }
     }
 
-    void SetCustomSpritesForSeedItemsAndProDesigns(MenuEntry *entry) {
+    /*Not SeedItems*/
+    void SetCustomSpritesForProDesigns(MenuEntry *entry) {
         int res = OptionKeyboard();
         if(res < 0) {
             return;

Sources/Folders/DefaultCodes/DefaultChecks.cpp

@@ -20,6 +20,20 @@ namespace CTRPluginFramework {
 		fn(res == 0); // 0 = enable, 1 = disable
     }
 
+	void SeedItemLegitimacy(bool enable) {
+		static Address skipSeedItemCheck(0x6BAC8C);
+		static Address allItemsLegit = skipSeedItemCheck.MoveOffset(0x14C);
+
+		if(enable) {
+			skipSeedItemCheck.Patch(0xEA000006);
+			allItemsLegit.Patch(0xE3A00001);
+		}
+		else {
+			skipSeedItemCheck.Unpatch();
+			allItemsLegit.Unpatch();
+		}
+	}
+
     void OnlineDropLagRemover(bool enable) {
         static Address host1(0x5A1454);
 		static Address host2(0x5A12F4);
@@ -189,6 +203,7 @@ namespace CTRPluginFramework {
 	}
 
 	void EnableAllPatches() {
+		SeedItemLegitimacy(true);
 		OnlineDropLagRemover(true);
 		ChangeRockbreakParticle(true);
 		DropItemsEverywhere(true);
@@ -202,6 +217,7 @@ namespace CTRPluginFramework {
 	}
 
 	void DisableAllPatches() {
+		SeedItemLegitimacy(false);
 		OnlineDropLagRemover(false);
 		ChangeRockbreakParticle(false);
 		DropItemsEverywhere(false);
@@ -214,6 +230,10 @@ namespace CTRPluginFramework {
 		PatchDropFunction(false);
 	}
 
+	void SeedItemLegitimacyEntry(MenuEntry *entry) {
+		ToggleWithOptionKeyboard(SeedItemLegitimacy);
+	}
+
 	void OnlineDropLagRemoverEntry(MenuEntry *entry) {
 		ToggleWithOptionKeyboard(OnlineDropLagRemover);
 	}

Sources/Folders/DefaultCodes/DefaultPatches.cpp

@@ -263,7 +263,7 @@ namespace CTRPluginFramework {
 
         if(Camera::GetInstance() != 0) {
         //check if you're outside
-            if(!RuntimeContext::getInstance()->isIndoors()) {
+            if(!Player::IsIndoors()) {
                 if(Game::IsGameInRoom(1)) {
 					rotationAsm.Unpatch();
 					rotationAsm2.Unpatch();

Sources/Folders/FunCodes.cpp

@@ -8,24 +8,15 @@
 #include "Helpers/Dropper.hpp"
 #include "Helpers/Inventory.hpp"
 #include "Helpers/GameKeyboard.hpp"
+#include "Helpers/Player.hpp"
 #include "RuntimeContext.hpp"
 #include "Color.h"
 
-extern "C" void MoveFurn(void);
 extern "C" void PATCH_MoveFurnButton(void);
 extern "C" void PATCH_ToolAnim(void);
 
-extern "C" bool __IsIndoors(void) {
-	return CTRPluginFramework::RuntimeContext::getInstance()->isIndoors();
-}
-
 u8 toolTypeAnimID = 6;
 
-extern "C" bool __IsAnimID(u8 toolAnimID) {
-	static const u8 toolAnimIDArr[18] = { 0xB0, 0x49, 0x55, 0x6C, 0xA0, 0x98, 0x8F, 0x91, 0xC3, 0xCE, 0xCF, 0x8D, 0x8E, 0x91, 0xB1, 0xB1, 0x70, 0x9A };
-	return std::find(std::begin(toolAnimIDArr), std::end(toolAnimIDArr), toolAnimID) != std::end(toolAnimIDArr);
-}
-
 namespace CTRPluginFramework {
 //Change Tool Animation
 	void tooltype(MenuEntry *entry) {
@@ -224,32 +215,82 @@ namespace CTRPluginFramework {
 			fovlargeMod.Unpatch();
 		}
 	}
+
+	u32 MoveFurniturePatch(void) {
+		const HookContext &curr = HookContext::GetCurrent();
+		static Address func = Address::decodeARMBranch(curr.targetAddress, curr.overwrittenInstr);
+		func.Call<u32>();
+
+		return Player::IsIndoors();
+	}
+
+	u32 LightSwitchPatch(void) {
+		return Player::IsIndoors();
+	}
+
 //Move Furniture
 	void roomSeeder(MenuEntry *entry) {
-		static const Address movefurn(0x5B531C);
-		static const Address lightswitch(0x5B7558);
-		static const Address MoveFurnPatch(0x326B98);
-
-		static Hook hook1, hook2, hook3;
+		static const Address movingFurniture(0x4E1720);
+		static const Address pickingUpFurniture(0x678AC0);
+		static const Address placingFurniture1(0x76B880);
+		static const Address placingFurniture2(0x26FED8);
+		static const Address placingFurniture3(0x4E78A8);
+		static const Address lightswitchVisible(0x3279CC);
+		static const Address lightswitchFunction(0x3277E8);
+		static const Address moveFurnButton(0x326B98);
+
+		static Hook movingFurnitureHook;
+		static Hook pickingUpFurnitureHook;
+		static Hook placingFurnitureHook1;
+		static Hook placingFurnitureHook2;
+		static Hook placingFurnitureHook3;
+		static Hook lightSwitchVisibleHook;
+		static Hook lightSwitchFunctionHook;
+		static Hook moveFurnButtonHook;
 
 		if(entry->WasJustActivated()) {
-			hook1.Initialize(movefurn.addr, (u32)MoveFurn);
-		  	hook1.SetFlags(USE_LR_TO_RETURN);
-			hook1.Enable();	
+			movingFurnitureHook.Initialize(movingFurniture.addr, (u32)MoveFurniturePatch);
+		  	movingFurnitureHook.SetFlags(USE_LR_TO_RETURN);
+			movingFurnitureHook.Enable();
+
+			pickingUpFurnitureHook.Initialize(pickingUpFurniture.addr, (u32)MoveFurniturePatch);
+		  	pickingUpFurnitureHook.SetFlags(USE_LR_TO_RETURN);
+			pickingUpFurnitureHook.Enable();
+
+			placingFurnitureHook1.Initialize(placingFurniture1.addr, (u32)MoveFurniturePatch);
+		  	placingFurnitureHook1.SetFlags(USE_LR_TO_RETURN);
+			placingFurnitureHook1.Enable();
+
+			placingFurnitureHook2.Initialize(placingFurniture2.addr, (u32)MoveFurniturePatch);
+		  	placingFurnitureHook2.SetFlags(USE_LR_TO_RETURN);
+			placingFurnitureHook2.Enable();
+
+			placingFurnitureHook3.Initialize(placingFurniture3.addr, (u32)MoveFurniturePatch);
+		  	placingFurnitureHook3.SetFlags(USE_LR_TO_RETURN);
+			placingFurnitureHook3.Enable();
+
+			lightSwitchVisibleHook.Initialize(lightswitchVisible.addr, (u32)LightSwitchPatch);
+		  	lightSwitchVisibleHook.SetFlags(USE_LR_TO_RETURN);
+			lightSwitchVisibleHook.Enable();
 
-			hook2.Initialize(lightswitch.addr, (u32)MoveFurn);
-		  	hook2.SetFlags(USE_LR_TO_RETURN);
-			hook2.Enable();	
+			lightSwitchFunctionHook.Initialize(lightswitchFunction.addr, (u32)LightSwitchPatch);
+		  	lightSwitchFunctionHook.SetFlags(USE_LR_TO_RETURN);
+			lightSwitchFunctionHook.Enable();
 
-			hook3.Initialize(MoveFurnPatch.addr, (u32)PATCH_MoveFurnButton);
-			hook3.SetFlags(USE_LR_TO_RETURN);
-			hook3.Enable();	
+			moveFurnButtonHook.Initialize(moveFurnButton.addr, (u32)PATCH_MoveFurnButton);
+			moveFurnButtonHook.SetFlags(USE_LR_TO_RETURN);
+			moveFurnButtonHook.Enable();
 		}
 
 		else if(!entry->IsActivated()) {
-			hook1.Disable();
-			hook2.Disable();
-			hook3.Disable();
+			movingFurnitureHook.Disable();
+			pickingUpFurnitureHook.Disable();
+			placingFurnitureHook1.Disable();
+			placingFurnitureHook2.Disable();
+			placingFurnitureHook3.Disable();
+			lightSwitchVisibleHook.Disable();
+			lightSwitchFunctionHook.Disable();
+			moveFurnButtonHook.Disable();
 		}
     }
 //Can Walk When Talk /*Made by Jay*/