diff --git a/src/BreathOfTheWild/Cheats/MasterModeTweaks/patch_MasterModeTweaks.asm b/src/BreathOfTheWild/Cheats/MasterModeOptions/patch_MasterModeOptions.asm similarity index 65% rename from src/BreathOfTheWild/Cheats/MasterModeTweaks/patch_MasterModeTweaks.asm rename to src/BreathOfTheWild/Cheats/MasterModeOptions/patch_MasterModeOptions.asm index 68f27ad9..39bad1c1 100644 --- a/src/BreathOfTheWild/Cheats/MasterModeTweaks/patch_MasterModeTweaks.asm +++ b/src/BreathOfTheWild/Cheats/MasterModeOptions/patch_MasterModeOptions.asm @@ -1,4 +1,4 @@ -[BotwMasterModeTweaksV208] +[BotwMasterModeOptionsV208] moduleMatches = 0x6267BFD0 # Constants @@ -16,3 +16,8 @@ merge0xd0 = $bit4 + $bit6 + $bit7 0x031696B8 = ori r9, r0, merge0x129 0x031696C4 = ori r0, r9, merge0xd0 +0x02AF94FC = .int ((($mmdamage == 0) * 0x4182000C) + (($mmdamage == 1) * 0x48000005)) +;This last patch is a clever hack from Crementif. Essentially, it sends the instruction in hex rather than in regular text form. +; +;When $mmdamage is 0, it sends 0x02AF94FC = beq 0x02AF9508 (the vanilla instruction). +;When $mmdamage is 1, it sends 0x02AF94FC = bl 0x02AF9500. diff --git a/src/BreathOfTheWild/Cheats/MasterModeTweaks/rules.txt b/src/BreathOfTheWild/Cheats/MasterModeOptions/rules.txt similarity index 89% rename from src/BreathOfTheWild/Cheats/MasterModeTweaks/rules.txt rename to src/BreathOfTheWild/Cheats/MasterModeOptions/rules.txt index bbef8254..712c2769 100644 --- a/src/BreathOfTheWild/Cheats/MasterModeTweaks/rules.txt +++ b/src/BreathOfTheWild/Cheats/MasterModeOptions/rules.txt @@ -1,8 +1,8 @@ [Definition] titleIds = 00050000101C9300,00050000101C9400,00050000101C9500 -name = "Master Mode Tweaks" -path = "The Legend of Zelda: Breath of the Wild/Cheats/Master Mode Tweaks" -description = Allows you to pick and choose which of Nintendo's tweaks are applied to Master Mode (Does nothing in Normal Mode). A reboot is required to apply changes made while the game is running. ||By Torphedo and Fleevoid, with lots of help from Exzap and leoetlino. +name = "Master Mode Options" +path = "The Legend of Zelda: Breath of the Wild/Cheats/Master Mode Options" +description = Allows you to pick and choose which of Nintendo's changes are applied to Master Mode (Does nothing in Normal Mode). A reboot is required to apply changes made while the game is running. ||By Torphedo and Fleevoid, with lots of help from Exzap and leoetlino. version = 7 [Default]