minor bugfixes

nstbayless · Apr 22, 2023 · 0ac9bf6 · 0ac9bf6
1 parent 75caac4
commit 0ac9bf6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/asm/patch.asm b/src/asm/patch.asm
@@ -79,9 +79,9 @@ stage_name:
     LDX #$0
     STX $FFF0
     
+skip:
     ; 'Tower ' text coordinates
     ldx #$56
-skip:
     clc
     RTS
 endif

diff --git a/src/asmpy/patches_unitile.py b/src/asmpy/patches_unitile.py
@@ -8,7 +8,7 @@
     (0x5644, bytearray.fromhex("20 36 DB")),
 
     (0x5b46, bytearray.fromhex("""
-        A2 20 A9 CC 20 09 E9 AD F9 FF F0 1B A8 AD F8 FF
+        A2 20 A9 CC 20 09 E9 AD F9 FF F0 19 A8 AD F8 FF
         A6 BC 8E 82 05 A2 01 8E E8 FF 20 24 E9 20 45 E9
         A2 00 8E F0 FF A2 56 18 60 25 30 85 30 A5 CE 85
         0B A5 31 38 E5 18 C5 CD B0 02 E6 0B A9 F8 25 31

diff --git a/src/constants.py b/src/constants.py
@@ -1,9 +1,9 @@
 from src.util import *
 from src import emulaunch
 
-mmname = "MMagEdit v1.37"
+mmname = "MMagEdit v1.38"
 mmrepo = "https://github.com/nstbayless/mmagedit"
-mmfmt = 202304221036
+mmfmt = 202304221055
 
 # this function is used as a "hello world" by libmmagedit to verify library integrity
 def get_version_and_date():

diff --git a/src/mmdata.py b/src/mmdata.py
@@ -1691,7 +1691,7 @@ def read(self, file):
             self.mods["no_relic_2"] = False
             self.mods["no_relic_3"] = False
             self.mods["no_relic_4"] = False
-            self.mods["no_relic_display"] = self.read_byte(self.ram_to_rom(constants.ram_mod_no_relic_ui[0])) == constants.ram_mod_no_relic_ui_replacement[0][0]
+            #self.mods["no_relic_display"] = self.read_byte(self.ram_to_rom(constants.ram_mod_no_relic_ui[0])) == constants.ram_mod_no_relic_ui_replacement[0][0]
             self.mapper_extension = False
 
             self.pause_text = [self.read_byte(self.ram_to_rom(constants.ram_range_uncompressed_text[0] + i)) for i in range(5)]
@@ -2131,7 +2131,7 @@ def commit(self):
                     self.ram_to_rom(addr),
                     replacement
                 )
-        if self.mods["no_relic_display"]:
+        if False and self.mods["no_relic_display"]:
             for addr, replacement in zip(constants.ram_mod_no_relic_ui, constants.ram_mod_no_relic_ui_replacement):
                 self.write_patch(
                     self.ram_to_rom(addr),