add --sd-bootloader option. fix --no-smb2 deadlock.

Author: BrianPugh

.gitignore

@@ -12,3 +12,4 @@ captures/
 .gdbinit
 *.ips
 ips/
+.venv

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ repos:
       - id: black
 
   - repo: https://github.com/pycqa/flake8
-    rev: 3.9.2
+    rev: 7.1.2
     hooks:
       - id: flake8
 

Core/Src/main.c

@@ -13,6 +13,8 @@
 
 #define BANK_1_STACK_2_ADDRESS 0x08020000
 #define BANK_2_ADDRESS 0x08100000
+#define SD_BOOTLOADER_ADDRESS 0x08032000
+
 #define BOOTLOADER_MAGIC 0x544F4F42  // "BOOT"
 #define BOOTLOADER_MAGIC_ADDRESS ((uint32_t *)0x2001FFF8)
 #define BOOTLOADER_JUMP_ADDRESS ((uint32_t **)0x2001FFFC)
@@ -104,7 +106,11 @@ gamepad_t read_buttons() {
 #else
     if((gamepad & GAMEPAD_LEFT) && (gamepad & GAMEPAD_GAME)){
 #endif
+#if SD_BOOTLOADER
+        set_bootloader(SD_BOOTLOADER_ADDRESS);
+#else
         set_bootloader(BANK_2_ADDRESS);
+#endif
         NVIC_SystemReset();
     }
 

Makefile

@@ -86,6 +86,10 @@ ifneq (,$(findstring --triple-boot, $(PATCH_PARAMS)))
 	C_DEFS += -DTRIPLE_BOOT
 endif
 
+ifneq (,$(findstring --sd-bootloader, $(PATCH_PARAMS)))
+	C_DEFS += -DSD_BOOTLOADER
+endif
+
 
 #######################################
 # CFLAGS

patch.py

@@ -78,6 +78,11 @@ def main():
         action="store_true",
         help="Enable RIGHT+GAME to launch 0x08020000.",
     )
+    parser.add_argument(
+        "--sd-bootloader",
+        action="store_true",
+        help="Change target dual boot to 0x08032000.",
+    )
     parser.add_argument(
         "--compression-ratio",
         type=float,
@@ -139,7 +144,9 @@ def main():
     device.internal[novel_code_start:] = patch[novel_code_start:]
     del patch
 
-    if args.extended:
+    if args.sd_bootloader:
+        device.internal.extend(b"\x00" * 0x12000)
+    elif args.extended:
         device.internal.extend(b"\x00" * 0x20000)
 
     print(Fore.BLUE)

patches/mario.py

@@ -182,6 +182,8 @@ def argparse(self, parser):
             self.args.slim = True
             self.args.extended = True
             self.args.no_save = True
+            if self.args.sd_bootloader:
+                self.args.no_smb2 = True
 
         if self.args.clock_only:
             self.args.slim = True
@@ -508,6 +510,11 @@ def patch(self):
                 b"\x00" * smb2_size,
             )
             self.ext_offset -= smb2_size
+
+            # Replace conditional-branch with unconditional
+            # TODO: this prevents hardlocking when selecting SMB2 from the menu,
+            # but it's not quite right and is glitchy.
+            self.internal.b(0x69FC, 0x6A8C)
         else:
             printe("Compressing and moving SMB2 ROM.")
             compressed_len = self.external.compress(smb2_addr, smb2_size)