Merge pull request #52 from BrianPugh/disable-triple-boot

Hide RIGHT+GAME triple boot behind option --triple-boot

Core/Src/main.c

@@ -93,10 +93,12 @@ gamepad_t read_buttons() {
     gamepad = stock_read_buttons();
 
 
+#if TRIPLE_BOOT
     if((gamepad & GAMEPAD_RIGHT) && (gamepad & GAMEPAD_GAME)){
         set_bootloader(BANK_1_STACK_2_ADDRESS);
         NVIC_SystemReset();
     }
+#endif
 #if CLOCK_ONLY
     if(gamepad & GAMEPAD_GAME){
 #else

Makefile

@@ -81,6 +81,10 @@ ifneq (,$(findstring --debug, $(PATCH_PARAMS)))
 	C_DEFS += -DDEBUG
 endif
 
+ifneq (,$(findstring --triple-boot, $(PATCH_PARAMS)))
+	C_DEFS += -DTRIPLE_BOOT
+endif
+
 ADAPTER ?= stlink
 
 LARGE_FLASH ?= 0

docs/zelda.md

@@ -40,7 +40,7 @@ Run the following in this repo:
 
 ```bash
 make clean
-make PATCH_PARAMS="--device=zelda --no-la --no-sleep-images" flash
+make PATCH_PARAMS="--device=zelda --no-la --no-sleep-images --triple-boot" flash
 ```
 
 This will setup storage in the following way:
@@ -62,10 +62,5 @@ make -j8 INTFLASH_ADDRESS=0x08020000 EXTFLASH_SIZE=794624 EXTFLASH_OFFSET=330137
 In the Zelda3 repo, after copying `zelda3.sfc` to `zelda3/tables/zelda3.sfc`, run the following commands:
 
 ```bash
-cd zelda3
-make tables/zelda3_assets.dat
-cd ..
-python3 ./scripts/bundle_all_assets.py
-python3 ./scripts/update_all_assets.py
 make -j8 INTFLASH_BANK=2 EXTFLASH_SIZE=1703936 EXTFLASH_OFFSET=868352 ADAPTER=stlink GNW_TARGET=zelda flash
 ```

patch.py

@@ -73,6 +73,11 @@ def main():
         action="store_true",
         help="Enable OTFDEC for the main extflash binary.",
     )
+    parser.add_argument(
+        "--triple-boot",
+        action="store_true",
+        help="Enable RIGHT+GAME to launch 0x08020000.",
+    )
     parser.add_argument(
         "--compression-ratio",
         type=float,