Merge 'Fix cosmetic version increment for patch_song_names' (#2206)

OoTRandomizer · Apr 22, 2024 · cf98438 · cf98438
2 parents c249260 + 8e851fb
commit cf98438
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/ASM/src/config.asm b/ASM/src/config.asm
@@ -7,7 +7,7 @@
 COSMETIC_CONTEXT:
 
 COSMETIC_FORMAT_VERSION:
-.word 0x1F073FE1
+.word 0x1F073FE2
 CFG_MAGIC_COLOR:
 .halfword 0x0000, 0x00C8, 0x0000
 CFG_HEART_COLOR:

diff --git a/Cosmetics.py b/Cosmetics.py
@@ -1201,13 +1201,13 @@ def patch_song_names(rom: Rom, settings: Settings, log: CosmeticsLog, symbols: d
     }
 }
 
-# 8.1.16
-patch_sets[0x1F073FE1] = {
-    "patches": patch_sets[0x1F073FE0]["patches"] + [
+# 8.1.29
+patch_sets[0x1F073FE2] = {
+    "patches": patch_sets[0x1F073FE1]["patches"] + [
         patch_song_names,
     ],
     "symbols": {
-        **patch_sets[0x1F073FE0]["symbols"],
+        **patch_sets[0x1F073FE1]["symbols"],
         "CFG_SONG_NAME_POSITION": 0x006C,
         "CFG_SONG_NAMES": 0x006D,
     }

diff --git a/data/generated/rom_patch.txt b/data/generated/rom_patch.txt
diff --git a/version.py b/version.py
@@ -1,4 +1,4 @@
-__version__ = '8.1.28'
+__version__ = '8.1.29'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0