no-wall-jump and no-wall-cling mods

nstbayless · Apr 21, 2023 · 18aab03 · 18aab03
1 parent 3657b9e
commit 18aab03
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
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.34"
+mmname = "MMagEdit v1.35"
 mmrepo = "https://github.com/nstbayless/mmagedit"
-mmfmt = 202303012232
+mmfmt = 202304211214
 
 # this function is used as a "hello world" by libmmagedit to verify library integrity
 def get_version_and_date():
@@ -86,6 +86,10 @@ def emucredits():
 ram_mod_no_relic_3_replacement = [[0xEA, 0xEA, 0xEA]]
 ram_mod_no_relic_4 = [0xBCBE]
 ram_mod_no_relic_4_replacement = [[0xEA, 0xEA, 0xEA]]
+ram_mod_no_wall_cling = 0xA933
+ram_mod_no_wall_cling_replacement = [0xF0]
+ram_mod_no_wall_jump = [0xD3BC, 0xD3AA]
+ram_mod_no_wall_jump_replacement = [[0xA9, 0x00, 0xEA], [0xA9, 0x00, 0xEA]]
 
 ram_intro_update = 0xA6CC
 ram_gamestart = 0xB8F0

diff --git a/src/mmdata.py b/src/mmdata.py
@@ -1657,6 +1657,8 @@ def read(self, file):
             # read special mods
             self.mods = dict()
             self.mods["no_bounce"] = self.read_byte(self.ram_to_rom(constants.ram_mod_bounce)) == constants.ram_mod_bounce_replacement[0]
+            self.mods["no_wall_cling"] = self.read_byte(self.ram_to_rom(constants.ram_mod_no_wall_cling)) == constants.ram_mod_no_wall_cling_replacement[0]
+            self.mods["no_wall_jump"] = self.read_byte(self.ram_to_rom(constants.ram_mod_no_wall_jump[0])) == constants.ram_mod_no_wall_jump_replacement[0][0]
             self.mods["no_auto_scroll"] = self.read_byte(self.ram_to_rom(constants.ram_mod_no_auto_scroll[0])) == constants.ram_mod_no_auto_scroll_replacement[0][0]
             self.mods["extended_objects"] = False
             self.mods["no_relic_1"] = False
@@ -2037,6 +2039,17 @@ def commit(self):
                 self.ram_to_rom(constants.ram_mod_bounce),
                 constants.ram_mod_bounce_replacement
             )
+        if self.mods["no_wall_cling"]:
+            self.write_patch(
+                self.ram_to_rom(constants.ram_mod_no_wall_cling),
+                constants.ram_mod_no_wall_cling_replacement
+            )
+        if self.mods["no_wall_jump"]:
+            for addr, replacement in zip(constants.ram_mod_no_wall_jump, constants.ram_mod_no_wall_jump_replacement):
+                self.write_patch(
+                    self.ram_to_rom(addr),
+                    replacement
+                )
         if self.mods["no_auto_scroll"]:
             for i in range(len(constants.ram_mod_no_auto_scroll)):
                 self.write_patch(