Fix force blank using the wrong color

Hydr8gon · Dec 21, 2024 · 849f035 · 849f035
1 parent 3603e79
commit 849f035
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -45,7 +45,7 @@ N64_ASFLAGS = -mtune=vr4300 -march=vr4300 -Wa,--fatal-warnings
 N64_RSPASFLAGS = -march=mips1 -mabi=32 -Wa,--fatal-warnings
 N64_LDFLAGS = -L$(N64_LIBDIR) -Tn64.ld --gc-sections
 N64_TOOLFLAGS = --title $(N64_ROM_TITLE)
-N64_ED64ROMCONFIGFLAGS = --savetype $(N64_ROM_SAVETYPE)
+N64_ED64ROMCONFIGFLAGS = --savetype $(N64_ROM_SAVETYPE) --regionfree
 
 COMMA := ,
 

diff --git a/src/main.S b/src/main.S
@@ -156,6 +156,7 @@ pi_wait1:
     la a1, rsp_main_data_start
     jal rsp_upload
     li a0, 0x0000 // DMEM address
+    sw zero, 0xA4080000 // SP_PC
 
     // Enable VI interrupts and start execution
     li t0, 0x00000595 // Set VI mask

diff --git a/src/rsp_main.S b/src/rsp_main.S
@@ -384,12 +384,12 @@ oam_skip:
     lbu t4, STAT_FLAGS
     andi t4, t4, 0x80
     beqz t4, not_blank
-    li s0, 0
+    lhu s0, SUB_COLOR
     b fill_backdrop
+    li s0, 0
 
 not_blank:
     // Check if the sub screen color should be applied to backdrop pixels
-    lhu s0, SUB_COLOR
     lbu t0, CGADSUB
     beqz s0, fill_main
     andi t0, t0, 0x20 // Backdrop math