From a247a0ae01ae02f81f81e9f3366134db21166d24 Mon Sep 17 00:00:00 2001
From: spannerisms <32842036+spannerisms@users.noreply.github.com>
Date: Wed, 26 Jan 2022 08:22:44 -0500
Subject: [PATCH] tinker tinker

---
 bsodfont.1bpp | Bin 360 -> 360 bytes
 failure.asm   |  43 +++++++++++++------------------------------
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/bsodfont.1bpp b/bsodfont.1bpp
index d4d63ab135f1e3945a843cb48521aa6b8993ea12..2c8e2f8fc22e35a393381a327ea6587428950414 100644
GIT binary patch
literal 360
zcmX|6u@S>C2xJ70pu%IM;4*<mpiJozC{;27rAm*W5mKgPgp@Axa7n~T&p(flh<;1#
zZ3YsC0E((gaVs9WH1*I>1s;0Z0dx;{Anc`Y+h$Vw`s)EcUULqhJ<pmWX63`Q>JvNd
zfqKr*cN{8PBxfuj?ByS$_Xa-ZygJaGYYwn{(YW3T)fshO%mG|qeKiEQdb9?_zlw{l
n@}s}*Vcg58i%a>Cl4AD@LA38gw|j~dc{H@uKawE%=cLI$9qMUU

literal 360
zcmYLEp%KF{4Ezx?f<eY8@O6TWU|5(D1PwKUprJ?b2!Vwfp)jy7C%wM!Ed5Jw$-s@G
zA5{fhUDbi2B3gnI<Ss7qi!$q7cfice43G(6A;M=i{yKg2-CC`H9!Kw-Q{r9r#Wa!0
zyS^@NtnX5mg+9*#`tJT(>$WAnS6e%`n3HqNr<@XXPdUe)6j@>%w3CmNralt0!F{>-
q?3ard8MB`v4dKt1->gLcgz(-@9$;O8$8)M4ci7?|fr!5xSN;Wee0lEx

diff --git a/failure.asm b/failure.asm
index 8ee53ee..bf50ee6 100644
--- a/failure.asm
+++ b/failure.asm
@@ -11,6 +11,7 @@ table "bsodencode.txt"
 
 DontUseZSNES:
 	SEP #$35 ; sets carry and I flag too
+
 	LDA.b #$00
 	STA.l $4200 ; disable NMI and IRQ
 	STA.l $420C ; disable HDMA
@@ -20,8 +21,6 @@ DontUseZSNES:
 	STA.l $2115
 
 	; Empty VRAM
-	SEP #$20
-
 	LDA.b #AllZeros>>16 : STA.l $4304
 
 	REP #$20
@@ -57,7 +56,7 @@ DontUseZSNES:
 
 ZSNESMessage:
 .line1
-	db "It has been detected that you are attempting to play", $FF
+	db "It has been detected that you are attempting to load", $FF
 
 .line2
 	db "this ROM on a low-quality emulator.", $FF
@@ -69,7 +68,7 @@ ZSNESMessage:
 	db "which this application cannot emulate properly;", $FF
 
 .line5
-	db "As such, this ROM file refuses to boot.", $FF
+	db "as such, this ROM file refuses to boot.", $FF
 
 .line6
 	db "Please upgrade to a more accurate emulator such as", $FF
@@ -95,6 +94,7 @@ Crashed:
 ;===================================================================================================
 ;===================================================================================================
 	SEP #$35 ; sets carry and I flag too
+
 	LDA.b #$00
 	STA.l $4200 ; disable NMI and IRQ
 	STA.l $420C ; disable HDMA
@@ -104,11 +104,9 @@ Crashed:
 	STA.l $2115
 
 	; Empty VRAM
-	SEP #$20
-
 	LDA.b #AllZeros>>16 : STA.l $4304
 
-	REP #$20
+	REP #$38
 
 	LDA.w #AllZeros
 	STA.l $4302
@@ -125,8 +123,6 @@ Crashed:
 ;===================================================================================================
 
 	; Create report
-	REP #$30
-
 	LDA.w #$2100
 	TCD
 
@@ -234,6 +230,7 @@ Crashed:
 
 .done_row
 	CLC
+
 	LDA.l $7F0004
 	ADC.w #32
 	BRA .next_row
@@ -243,20 +240,18 @@ Crashed:
 ;===================================================================================================
 	; once the stack is reported, we can start doing stuff that mucks with it
 .skip_stack
-	REP #$30
-	SEP #$10
-
 	LDA.w #$0000
 	TCD
-	TSC
 
-	STA.b $80 ; remember stack for later messages
+;	TSC
+;	STA.b $80 ; remember stack for later messages
 
 	JSR ConfigurePPUForFailureReport
 	JSR ConfigureBSODVWF
 	JSR LoadBSODFont
 
 	STZ.b VWFR
+
 	LDA.w #BSODMessage_line1 : JSR DrawVWFLine
 	LDA.w #BSODMessage_line2 : JSR DrawVWFLine
 	LDA.w #BSODMessage_line3 : JSR DrawVWFLine
@@ -265,7 +260,6 @@ Crashed:
 	LDA.w #BSODMessage_line6 : JSR DrawVWFLine
 	LDA.w #BSODMessage_line7 : JSR DrawVWFLine
 
-
 	LDA.w #$0F0F
 	STA.w $2100
 
@@ -293,7 +287,7 @@ BSODMessage:
 	db "and share it in the #bug-reports channel of the official", $FF
 
 .line6
-	db "ALTTPR discord, along with a detailed description of", $FF
+	db "ALTTPR discord along with a detailed description of", $FF
 
 .line7
 	db "what you were doing, including video if available.", $FF
@@ -340,9 +334,6 @@ DrawVWFLine:
 	LDA.b #$01
 	STA.w $420B
 
-	LDA.b #$80
-	STA.w $2115
-
 	REP #$20
 
 	JMP ResetVFW
@@ -370,10 +361,6 @@ VWFR = $4A
 ;===================================================================================================
 
 DrawFailureVWFChar:
-	REP #$30
-	PHY
-	PHX
-
 	AND.w #$00FF
 	STA.b VWFL
 
@@ -393,6 +380,7 @@ DrawFailureVWFChar:
 	AND.w #$0007
 	STA.w VWFS
 
+	; carry set on purpose to add letter spacing
 	SEC
 	LDA.w BSODCharWidths,X
 	AND.w #$00FF
@@ -429,10 +417,6 @@ DrawFailureVWFChar:
 	CPY.w #$0008
 	BCC .next_row
 
-	REP #$30
-	PLX
-	PLY
-
 	RTS
 
 ;===================================================================================================
@@ -498,7 +482,6 @@ ConfigureBSODVWF:
 
 	REP #$20
 
-
 	PEA.w $0001
 
 	LDA.w #8
@@ -537,6 +520,7 @@ ConfigureBSODVWF:
 
 ResetVFW:
 	REP #$30
+
 	LDX.w #$0400
 
 --	STZ.w $1000,X
@@ -570,7 +554,6 @@ ConfigurePPUForFailureReport:
 	STZ.w $2131
 	STZ.w $2133
 
-
 	LDA.b #$01
 	STA.w $210B
 	STA.w $212C
@@ -591,7 +574,7 @@ BSODCharWidths:
 	db 3
 
 	;  A  B  C  D  E  F  G  H  I  J  K  L  M  N  O  P  Q  R  S  T  U  V  W  X  Y  Z
-	db 4, 4, 4, 4, 3, 3, 4, 3, 1, 4, 3, 3, 5, 4, 4, 4, 5, 4, 4, 3, 4, 5, 5, 3, 5, 3
+	db 4, 4, 3, 4, 3, 3, 4, 3, 1, 4, 3, 3, 5, 4, 4, 4, 5, 4, 4, 3, 4, 5, 5, 3, 3, 3
 
 	;  0  1  2  3  4  5  6  7  8  9  .  #  ?  -  /  ,  '
 	db 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 5, 8, 3, 3, 2, 1