From f9a1bab1fddc99aeb872ca7c15dac71197c86ac7 Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Tue, 24 Aug 2021 22:02:31 +0200
Subject: [PATCH] fixed mistake in the hypervisor init

---
 bin/mega65.rom                                | Bin 131072 -> 131072 bytes
 bin/mega65_orfont.rom                         | Bin 131072 -> 131072 bytes
 .../board_m65/mega65_hypervisor_reset.s       |   5 +++--
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/mega65.rom b/bin/mega65.rom
index a089f01f30dd61e4317865fbc3b33749f0cef1c5..431601ba7c496c4ef66c13e48b3ac5751c89872e 100644
GIT binary patch
delta 51
zcmZo@;Am*zm>|YzvQgZ9KcmU!`2A_BK<e0&-<-UjZx(6viCs`w^H<^iyXJH6wx4^)
HXe0;#6#o|u

delta 51
zcmZo@;Am*zm>|YzyiweJKcn&H`2A_BK<e0&-<-V8Zx(6viCs`w^H;(1P4l^T+t0mY
HG!g^=4T=_Q

diff --git a/bin/mega65_orfont.rom b/bin/mega65_orfont.rom
index d516675ed1d256b5e97a4d4bcbaeba1cd867cc2f..9b80a79ecf89c307334e99ce6ee75533d24721f5 100644
GIT binary patch
delta 51
zcmZo@;Am*zm>|YzvQgZ9KcmU!`2A_BK<e0&-<-UjZx(6viCs`w^H<^iyXJH6wx4^)
HXe0;#6#o|u

delta 51
zcmZo@;Am*zm>|YzyiweJKcn&H`2A_BK<e0&-<-V8Zx(6viCs`w^H;(1P4l^T+t0mY
HG!g^=4T=_Q

diff --git a/src/kernal/board_m65/mega65_hypervisor_reset.s b/src/kernal/board_m65/mega65_hypervisor_reset.s
index 6c93d1e6..f0ee75fa 100644
--- a/src/kernal/board_m65/mega65_hypervisor_reset.s
+++ b/src/kernal/board_m65/mega65_hypervisor_reset.s
@@ -16,12 +16,13 @@ m65_hypervisor_reset:
 
 	; Do not reset the stack (see, ldx #$FF, txs) - we need to know where to return
 	
-	jsr m65_reset_part                 ; init MEGA65 specific hardware, shutdown VIC-IV, clear native mode mark
+	jsr m65_reset_part_skip_palette    ; init MEGA65 specific hardware, shutdown VIC-IV, clear native mode mark
+	                                   ; but do not override the palette, it would have broken the logo
 	ldx #$28                           ; 40 columns, screen disabled for now
 	stx VIC_SCROLX
 
 	jsr IOINIT_skip_DOS                ; better not to initialize DOS under hypervisor, risk of incompatibility
-	jsr m65_reset_part_skip_palette    ; also skip palette setting, but do RAMTAS, RESTOR, CINT
+	jsr m65_reset_common               ; RAMTAS, RESTOR, CINT
 
 	; Restore hypervisor memory mapping and quit