Preserve palette on DLOAD call under cpc #1035

spotlessmind1975 · Dec 17, 2024 · 9874209 · 9874209
1 parent e0507e8
commit 9874209
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/ugbc/src/hw/cpc.c b/ugbc/src/hw/cpc.c
@@ -425,6 +425,7 @@ void cpc_border_color( Environment * _environment, char * _border_color ) {
     outline0("LD BC,$7F10");
     outline0("OUT (C), C");
     outline1("LD A, (%s)", _border_color);
+    outline0("LD (PALETTEB), A");
     outline0("OR A, 0x40");
     outline0("OUT (C), A");
 

diff --git a/ugbc/src/hw/cpc/dload.asm b/ugbc/src/hw/cpc/dload.asm
@@ -87,5 +87,7 @@ CPCDLOADDONE:
 	EXX
 	EI
 
+    CALL RESETPALETTE
+
     RET
 
diff --git a/ugbc/src/hw/cpc/dsave.asm b/ugbc/src/hw/cpc/dsave.asm
@@ -127,5 +127,7 @@ CPCDSAVEDONE:
 	EXX
 	EI
 
+    CALL RESETPALETTE
+
     RET
 
diff --git a/ugbc/src/hw/cpc/startup.asm b/ugbc/src/hw/cpc/startup.asm
@@ -37,6 +37,8 @@
 
 @IF vestigialConfig.rchack_pick_the_star_1163
 
+PALETTEB:
+	DB      1
 PALETTE:    
     DB      4,  10,  19,  12 
     DB     11,  20,  21,  13
@@ -45,6 +47,9 @@ PALETTE:
 
 @ELSE
 
+PALETTEB:
+	DB      1
+
 @ENDIF
 
 PALETTEUNUSED:
@@ -66,6 +71,26 @@ SETHWPALETTE:
 	POP BC
     RET
 
+RESETPALETTE:
+	LD B, 0
+	LD HL, PALETTE
+RESETPALETTEL1:
+	LD IXH, B
+	LD A, (HL)
+	LD IXL, A
+	CALL SETHWPALETTE
+	INC HL
+	INC B
+	LD A, B
+	CP 16
+	JR NZ, RESETPALETTEL1
+	LD BC, $7F10
+    OUT (C), C
+    LD A, (PALETTEB)
+    OR A, 0x40
+    OUT (C), A
+	RET
+
 IRQTIMERVOID:
 	RET
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,5 +87,7 @@ CPCDLOADDONE: @@
     	EXX
     	EI
+        CALL RESETPALETTE
         RET