OoS: Fixed wrong text showing for dungeon items in shops

Dinopony · Jul 19, 2024 · 28a7007 · 28a7007
1 parent 7a5df32
commit 28a7007
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/worlds/tloz_oos/patching/asm/progressives.yaml b/worlds/tloz_oos/patching/asm/progressives.yaml
@@ -189,8 +189,7 @@
     ld a,e
     cp $ff
     ret z
-    ld b,$00
-    ld c,e
+    call checkCustomTreasureTextId
     call showText
     xor a
     ret

diff --git a/worlds/tloz_oos/patching/asm/shops_handling.yaml b/worlds/tloz_oos/patching/asm/shops_handling.yaml
@@ -29,7 +29,7 @@
     db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
 
 # remove generic text from shopItemTextTable so that replacement text can be displayed.
-08/0d46/: db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
+08/0d46/: db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
 
 # Remove all "you are already full" checks for shop slots that usually carry hearts, bombs or a shield
 08/0a66/: |

diff --git a/worlds/tloz_oos/patching/asm/text.yaml b/worlds/tloz_oos/patching/asm/text.yaml
@@ -290,7 +290,7 @@
 # entries without rebuilding the whole textbanks. We inject this small function
 # to check for text IDs > 0x80, in which case we unset the 7th bit and redirect
 # to our custom textbank.
-09//checkCustomTreasureTextId: |
+00//checkCustomTreasureTextId: |
     bit 7,a
     jr nz,@customText
     
@@ -305,4 +305,4 @@
     ld c,a
     ld b,$56  ; CUSTOM_TEXT_GROUP_ID
     ret
-09/02f6/: call checkCustomTreasureTextId
+09/02f6/: call checkCustomTreasureTextId
-Original file line number
+Diff line change
@@ Expand Up / @@ -189,8 +189,7 @@ @@
         ld a,e
         cp $ff
         ret z
-        ld b,$00
-        ld c,e
+        call checkCustomTreasureTextId
         call showText
         xor a
         ret
@@ Expand Down @@