Fix small keys during init.

Fix swamp archery not giving the proper prize.
PhlexPlexico · Dec 22, 2023 · 2ce4cc5 · 2ce4cc5
1 parent 571362a
commit 2ce4cc5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/code/mm.ld b/code/mm.ld
@@ -292,7 +292,7 @@ SECTIONS{
   }
 
   .patch_OverrideQuiverArcherySwamp 0x3EA2B0 : {
-    *(.patch_OverrideQuiverArchery)
+    *(.patch_OverrideQuiverArcheryTwo)
   }
 
   .patch_OverrideFairyGiveItem 0x3BECAC : {

diff --git a/code/source/asm/patches.s b/code/source/asm/patches.s
@@ -248,6 +248,11 @@ patch_RemoveGoronMaskCheckDarmani:
 patch_OverrideQuiverArchery:
     mov r2,#0x47
 
+.section .patch_OverrideQuiverArcheryTwo
+.global patch_OverrideQuiverArcheryTwo
+patch_OverrideQuiverArcheryTwo:
+    mov r2,#0x47
+
 .section .patch_OverrideFairyGiveItem
 .global OverrideFairyItemID_patch
 OverrideFairyItemID_patch:

diff --git a/code/source/rnd/savefile.cpp b/code/source/rnd/savefile.cpp
@@ -369,6 +369,12 @@ namespace rnd {
       saveData.inventory.great_bay_temple_keys = 3;
       saveData.inventory.stone_tower_temple_keys = 4;
       // give starting spirit keys for vanilla key locations
+    } else {
+      // Init to 0 as the game inits to 255.
+      saveData.inventory.woodfall_temple_keys = 0;
+      saveData.inventory.snowhead_temple_keys = 0;
+      saveData.inventory.great_bay_temple_keys = 0;
+      saveData.inventory.stone_tower_temple_keys = 0;
     }
 
     // give boss keys