From 8e851fbe12f7e552ccfaedcf5e012b8b773b006c Mon Sep 17 00:00:00 2001 From: GSKirox <65768236+GSKirox@users.noreply.github.com> Date: Mon, 22 Apr 2024 21:46:15 +0200 Subject: [PATCH] Fix cosmetic version increment --- ASM/src/config.asm | 2 +- Cosmetics.py | 8 ++++---- data/generated/rom_patch.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ASM/src/config.asm b/ASM/src/config.asm index 1fef20382..34977818f 100644 --- 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 index c170d1099..0dd50e40b 100644 --- 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 index 3676a2fb1..ce0bd90ce 100644 --- a/data/generated/rom_patch.txt +++ b/data/generated/rom_patch.txt @@ -2102,7 +2102,7 @@ fec1fc,9000000 3480828,dfdfdfdf 348082c,dfdfdfdf 3480830,dfdfdfdf -3480c3c,1f073fe1 +3480c3c,1f073fe2 3480c40,c8 3480c44,ff 3480c48,460032