Merge pull request #6 from HylianFreddy/dev

Fix Jim softlock and gold rupee model
Z3DR · Jan 23, 2024 · 3825e18 · 3825e18
2 parents 7613cc9 + 3e86dba
commit 3825e18
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/code/include/rnd/item_override.h b/code/include/rnd/item_override.h
@@ -249,10 +249,10 @@ namespace rnd {
     /* 0x0002 */ DI_SMALL_KEY,
     /* 0x0003 */ DI_KAMARO_MASK,
     /* 0x0004 */ DI_COUPLES_MASK,
-    /* 0x0005 */ DI_GOLD_RUPEE,
-    /* 0x0006 */ DI_GOLD_RUPEE_TWO,
-    /* 0x0007 */ DI_GOLD_RUPEE_THREE,
-    /* 0x0008 */ DI_GOLD_RUPEE_FOUR,
+    /* 0x0005 */ DI_BROKEN_RUPEE_ONE,
+    /* 0x0006 */ DI_BROKEN_RUPEE_TWO,
+    /* 0x0007 */ DI_BROKEN_RUPEE_THREE,
+    /* 0x0008 */ DI_BROKEN_RUPEE_FOUR,
     /* 0x0009 */ DI_RECOVERY_HEART,
     /* 0x000A */ DI_BOSS_KEY,
     /* 0x000B */ DI_COMPASS,
@@ -276,7 +276,7 @@ namespace rnd {
     /* 0x001D */ DI_SMALL_MAGIC_JAR,
     /* 0x001E */ DI_BIG_MAGIC_JAR,
     /* 0x001F */ DI_BOMB,
-    /* 0x0020 */ DI_GOLD_RUPEE_FIVE,
+    /* 0x0020 */ DI_BROKEN_RUPEE_FIVE,
     /* 0x0021 */ DI_ADULT_WALLET,
     /* 0x0022 */ DI_GIANT_WALLET,
     /* 0x0023 */ DI_DON_GERO_MASK,
@@ -300,8 +300,8 @@ namespace rnd {
     /* 0x0035 */ DI_MAGIC_BEAN,
     /* 0x0036 */ DI_BOTTLE_FISH,
     /* 0x0037 */ DI_MAMAS_LETTER,
-    /* 0x0038 */ DI_GOLD_RUPEE_SIX,
-    /* 0x0039 */ DI_GOLD_RUPEE_SEVEN,
+    /* 0x0038 */ DI_BROKEN_RUPEE_SIX,
+    /* 0x0039 */ DI_BROKEN_RUPEE_SEVEN,
     /* 0x003A */ DI_SUN_MASK,
     /* 0x003B */ DI_BLAST_MASK,
     /* 0x003C */ DI_BOTTLE_FAIRY,
@@ -311,17 +311,17 @@ namespace rnd {
     /* 0x0040 */ DI_MASK_OF_TRUTH,
     /* 0x0041 */ DI_SWAMP_TITLE_DEED,
     /* 0x0042 */ DI_MOUNTAIN_TITLE_DEED,
-    /* 0x0043 */ DI_GOLD_RUPEE_HOLLOW,
+    /* 0x0043 */ DI_GOLD_RUPEE,
     /* 0x0044 */ DI_OCEAN_TITLE_DEED,
     /* 0x0045 */ DI_GORON_MASK,
     /* 0x0046 */ DI_ZORA_MASK,
-    /* 0x0047 */ DI_GOLD_RUPEE_EIGHT,
+    /* 0x0047 */ DI_BROKEN_RUPEE_EIGHT,
     /* 0x0048 */ DI_FIRE_ARROW,
     /* 0x0049 */ DI_ICE_ARROW,
     /* 0x004A */ DI_LIGHT_ARROW,
     /* 0x004B */ DI_GOLD_SKULLTULA_BROKEN,
     /* 0x004C */ DI_BOTTLE_BUG,
-    /* 0x004D */ DI_GOLD_RUPEE_NINE,
+    /* 0x004D */ DI_BROKEN_RUPEE_NINE,
     /* 0x004E */ DI_BOTTLE_POE,
     /* 0x004F */ DI_BOTTLE_BIG_POE_PURPLE,
     /* 0x0050 */ DI_GREEN_RUPEE,
@@ -341,8 +341,8 @@ namespace rnd {
     /* 0x005E */ DI_POWDER_KEG,
     /* 0x005F */ DI_GOLD_DUST,
     /* 0x0060 */ DI_BOTTLE_GOLD_DUST,
-    /* 0x0061 */ DI_GOLD_RUPEE_TEN,
-    /* 0x0062 */ DI_GOLD_RUPEE_ELEVEN,
+    /* 0x0061 */ DI_BROKEN_RUPEE_TEN,
+    /* 0x0062 */ DI_BROKEN_RUPEE_ELEVEN,
     /* 0x0063 */ DI_BOTTLE_SEAHORSE,
     /* 0x0064 */ DI_GOHTS_REMAINS,
     /* 0x0065 */ DI_GYORGS_REMAINS,

diff --git a/code/mm.ld b/code/mm.ld
@@ -383,6 +383,10 @@ SECTIONS{
     *(.patch_IncomingGetItemID)
   }
 
+  .patch_RemoveJimWhenExitingHideout 0x4B6964 : {
+    *(.patch_RemoveJimWhenExitingHideout)
+  }
+
   .patch_ReadGamePad 0x59BA10 : {
     *(.patch_ReadGamePad)
   }

diff --git a/code/source/asm/patches.s b/code/source/asm/patches.s
@@ -420,6 +420,11 @@ patch_CouplesMaskGiveItem:
 patch_RemoveCouplesMaskMessage:
     b hook_AdjustCouplesMaskMessage
 
+.section .patch_RemoveJimWhenExitingHideout
+.global RemoveJimWhenExitingHideout_patch
+RemoveJimWhenExitingHideout_patch:
+    cmp r0,r0
+
 .section .patch_loader
 .global loader_patch
 loader_patch: