From f331ae15ce749bd302372fd19f77f0ae77db880b Mon Sep 17 00:00:00 2001
From: Artemio <aurbina@junkerhq.net>
Date: Thu, 25 Jul 2024 20:12:23 -0600
Subject: [PATCH] == N64 == - Added PLUGE - Added Gray Ramp - Fixed Scroll help
 - Text now has different spacing for special characters - Fixed help loading
 when buffer was not empty

---
 240psuite/N64/240pSuite.c                 |   6 ++
 240psuite/N64/Makefile                    |   5 +
 240psuite/N64/assets/PLUGEBorder.png      | Bin 0 -> 245 bytes
 240psuite/N64/assets/grayramp.png         | Bin 0 -> 695 bytes
 240psuite/N64/assets/pluge.png            | Bin 0 -> 363 bytes
 240psuite/N64/assets/plugePAL.png         | Bin 0 -> 340 bytes
 240psuite/N64/filesystem/help/dshadow.txt |  21 ++++
 240psuite/N64/filesystem/help/general.txt |   2 +-
 240psuite/N64/filesystem/help/gray.txt    |  22 +++++
 240psuite/N64/filesystem/help/pluge.txt   |  60 ++++++++++++
 240psuite/N64/filesystem/help/scroll.txt  |  23 +++++
 240psuite/N64/font.c                      |  38 +++++++-
 240psuite/N64/help.c                      |   2 +-
 240psuite/N64/help.h                      |   2 +-
 240psuite/N64/patterns.c                  | 114 ++++++++++++++++++++++
 240psuite/N64/patterns.h                  |   2 +
 240psuite/N64/tests.c                     |   6 +-
 17 files changed, 294 insertions(+), 9 deletions(-)
 create mode 100644 240psuite/N64/assets/PLUGEBorder.png
 create mode 100644 240psuite/N64/assets/grayramp.png
 create mode 100644 240psuite/N64/assets/pluge.png
 create mode 100644 240psuite/N64/assets/plugePAL.png
 create mode 100644 240psuite/N64/filesystem/help/dshadow.txt
 create mode 100644 240psuite/N64/filesystem/help/gray.txt
 create mode 100644 240psuite/N64/filesystem/help/pluge.txt
 create mode 100644 240psuite/N64/filesystem/help/scroll.txt

diff --git a/240psuite/N64/240pSuite.c b/240psuite/N64/240pSuite.c
index 966c833b..7085be20 100644
--- a/240psuite/N64/240pSuite.c
+++ b/240psuite/N64/240pSuite.c
@@ -251,6 +251,12 @@ void drawPatternsColorMenu(void) {
 			freeImage(&sd);
 			
 			switch(sel)	{
+				case 1:
+					drawPLUGE();
+					break;
+				case 7:
+					drawGrayramp();
+					break;
 				case 11:
 					exit = 1;
 					break;
diff --git a/240psuite/N64/Makefile b/240psuite/N64/Makefile
index 4b0f56d6..5dee937b 100644
--- a/240psuite/N64/Makefile
+++ b/240psuite/N64/Makefile
@@ -16,10 +16,15 @@ filesystem/%.sprite: assets/%.png
 	@$(N64_MKSPRITE) $(MKSPRITE_FLAGS) -o filesystem "$<"
 
 filesystem/240pSuite-font.sprite: MKSPRITE_FLAGS=--tiles 8,8
+filesystem/240pSuite-font480.sprite: MKSPRITE_FLAGS=--tiles 16,16
 filesystem/mainbg.sprite: MKSPRITE_FLAGS=--format CI4
 filesystem/sd.sprite: MKSPRITE_FLAGS=--format CI4
 filesystem/monoscopeFBX.sprite: MKSPRITE_FLAGS=--format CI4
 filesystem/monoscope.sprite: MKSPRITE_FLAGS=--format CI4
+filesystem/pluge.sprite: MKSPRITE_FLAGS=--format CI4
+filesystem/plugePAL.sprite: MKSPRITE_FLAGS=--format CI4
+filesystem/PLUGEBorder.sprite: MKSPRITE_FLAGS=--format CI4
+filesystem/grayramp.sprite: MKSPRITE_FLAGS=--format CI8
 filesystem/grid.sprite: MKSPRITE_FLAGS=--format CI4
 filesystem/grid-480.sprite: MKSPRITE_FLAGS=--format CI4
 filesystem/donna.sprite: MKSPRITE_FLAGS=--format RGBA16
diff --git a/240psuite/N64/assets/PLUGEBorder.png b/240psuite/N64/assets/PLUGEBorder.png
new file mode 100644
index 0000000000000000000000000000000000000000..a533b271d6d35a97446535f796d66ccdd18c440f
GIT binary patch
literal 245
zcmeAS@N?(olHy`uVBq!ia0vp^0zkZwgAGWYOSRt!q}Y<Y-CY>|gW!U_%O?XxI14-?
ziy0WWg+Z8+Vb&Z8pdfpRr>`sfJvJ^@235~XSEd7nWHUn|N}Tg^b5rw5fLsO!=c3fa
zlGGH1^30M91$R&1fE2w{cA$8qr;B4q#=W<<778A4;9+*GRXg$bde*D=ifWA2G0~0Z
z&iIJ!^$ZGqetO65=O>N8M&Tvw8FyKG7H#`~gggJKfb6SpPfvlAd%F6$taD0e0stBL
BLn;6O

literal 0
HcmV?d00001

diff --git a/240psuite/N64/assets/grayramp.png b/240psuite/N64/assets/grayramp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e25c827ec38b767ccf2f3d4ef59ba3a424f17a65
GIT binary patch
literal 695
zcmeAS@N?(olHy`uVBq!ia0y~yU~~YoKX5PuNw?3wkw7XTz$e5NNdN!;|Jt={`}XZ~
za&nTClq@MJ>FMct{`~pexpTF&w6<>D%E`(3{{8#t=;-9+<eHiqBO@bkZ|`&G&MjTK
z^#1+(!NI}V+1V{EEo;}VwX(7j6cn5~b*iGG;`i_0j~zSq>vP_GpdE}!-tI089jvk*
zKn`btM`SSr1Gg{;GcwGYBLNg-FY)wsWxvPDAuK9!nOB$_sOPSyi(^Q|t+$svgANA>
zxHwAk%yYMCe*63Wq}b4wa})AcPxw+_#y|Os*K8C2=U*n)U9zrS7P@PBaMY6hCf?h(
z_}_myt1NT2-pd)wUQXo8oH_5M_TOctQc?~L42(=H90Cf1n$gD)E&qLL-Lm=b-dDBA
zt#*I=v3hCT=5T%Y&QoEhK26(`{363@UEhY}w=1mwt#i4)WcB6JS6!uV83w=4fG#Xx
b`N7X^ug!nCGUyI4?ioB?{an^LB{Ts5zc;+*

literal 0
HcmV?d00001

diff --git a/240psuite/N64/assets/pluge.png b/240psuite/N64/assets/pluge.png
new file mode 100644
index 0000000000000000000000000000000000000000..6535ac4c15d422ade02558776366b7de406c90e9
GIT binary patch
literal 363
zcmeAS@N?(olHy`uVBq!ia0y~yU~~YoKd>+Z$!6vS5kQK)#M9T6{RO)egCd6|^U+eE
z5NCl$WHAE+*9Q=0bXsFF11M+^;1l8sq&YY^1Ox;mBqW@ioT{s<j~zSqA2-m{nHmYy
zbI#MnF{I+w+jAQQ9UMelFS;_9B!ncmaYtQf65FDGV}6HD^O2o5x&OWM^qiyuK`*Z^
z(|9Iu^v$BjXTxrNT+?;@md)!QtIlucJOOk7c2FU`V;UQFDUJ%>9aC`0as1FN(BlPq
p3LE&qa>I_xXL<w7U7q#X>}Co1kq=I}$pU@G;OXk;vd$@?2>>y|aD)H=

literal 0
HcmV?d00001

diff --git a/240psuite/N64/assets/plugePAL.png b/240psuite/N64/assets/plugePAL.png
new file mode 100644
index 0000000000000000000000000000000000000000..2310596957601c94dc8af21afea032607c96eb56
GIT binary patch
literal 340
zcmeAS@N?(olHy`uVBq!ia0y~yU~~YoKd>+Z$!6vS5kQK)#M9T6{RO)egQ8$;M($Ri
z5NCl$WHAE+*9Q=0bXsFF11M+^;1l8sq&YY^oSdAhtE-P4JNBOts5`pm7f{c3PZ!6K
zid%2b8S)-b5OEDGxDa)KNi2);f7mVqqncR`vkKmQTUH)4NyQU_qHf)lK3}MNi$~@A
zb8Z0~;DhmpPBx%xumKD9H5VBeae(hk-X;#%!2x+@Rj3;#`MqZKzQ8a|*3^9`&<hNn
Lu6{1-oD!M<0E}%;

literal 0
HcmV?d00001

diff --git a/240psuite/N64/filesystem/help/dshadow.txt b/240psuite/N64/filesystem/help/dshadow.txt
new file mode 100644
index 00000000..f50398ad
--- /dev/null
+++ b/240psuite/N64/filesystem/help/dshadow.txt
@@ -0,0 +1,21 @@
+       DROP SHADOW TEST 
+
+This is a crucial test for 240p
+upscan converters. It displays a
+simple sprite shadow against a
+background, but the shadow is
+shown only on each other frame.
+
+On a CRT this achieves a
+transparency effect, since you
+are watching a 30hz
+(25Hz) shadow on a 60hz (50hz)
+signal. No background detail
+should be lost and the shadow
+should be visible.
+
+The user can toggle the frame
+used to draw the shadow with
+button #GCL#G. Backgrounds can
+be switched with the #GA#G button
+and button #GCR#G toggles sprites.
\ No newline at end of file
diff --git a/240psuite/N64/filesystem/help/general.txt b/240psuite/N64/filesystem/help/general.txt
index f8e193ec..47f731f5 100644
--- a/240psuite/N64/filesystem/help/general.txt
+++ b/240psuite/N64/filesystem/help/general.txt
@@ -21,7 +21,7 @@ supports 240p, 288p, 576i and
 480i video modes.
 
 
-                   #C(cont...)#C
+                       #C(cont...)#C
            HELP (2/2)
 
 The #YNintendo 64#Y cuts out a
diff --git a/240psuite/N64/filesystem/help/gray.txt b/240psuite/N64/filesystem/help/gray.txt
new file mode 100644
index 00000000..bb792c1f
--- /dev/null
+++ b/240psuite/N64/filesystem/help/gray.txt
@@ -0,0 +1,22 @@
+           GRAY RAMP 
+
+This gray ramp pattern can be
+used to check color balance and
+to adjust the white level. 
+
+You should make sure the bars
+are gray, with no red or blue
+bias. This can be adjusted with
+the individual color settings,
+or the #Ytint#Y control in NTSC
+displays.
+
+In order to adjust white level,
+you need to use the #Ycontrast#Y
+control of your TV set. Raise the
+contrast to the point where the
+white bars on the sides are
+undistinguishable from each
+other, and then lower it to the
+point where you can clearly
+identify both.
\ No newline at end of file
diff --git a/240psuite/N64/filesystem/help/pluge.txt b/240psuite/N64/filesystem/help/pluge.txt
new file mode 100644
index 00000000..cd9d6e08
--- /dev/null
+++ b/240psuite/N64/filesystem/help/pluge.txt
@@ -0,0 +1,60 @@
+          PLUGE (1/3)
+
+The #Ypicture line-up generation
+equipment#Y (PLUGE) is a test
+pattern used to adjust the black
+level and contrast of a video
+signal.
+
+The pattern in this suite is
+mainly designed to adjust the
+black level. The control for
+setting this on your TV is
+usually named #YBrightness#Y.
+
+This adjustment ensures that
+anything intended to be black is
+actually black, and allows all
+detail to be seen on dark scenes.
+
+There are three bars at each
+side, you can highlight them
+with the #GCL#G button.
+
+                     #C(cont...)#C
+          PLUGE (2/3)
+
+The #GA#G button changes between
+#GNTSC#G and #GRGB Full Range#G [0-255]
+when in any NTSC mode.
+
+The values of the bars depend on
+your current video mode. Reduce
+the #YBrightness#Y until the desired
+bars are no longer visible, and
+then slowly raise it until they
+are #Gjust#G visible, and go back one
+notch where they blend with the
+background. 
+
+For games always use #GRGB Full
+Range#G. The 1 IRE bars are the ones
+you should calibrate against. The
+values of the bars are: 1, 2 and
+3.5 IRE.
+
+
+
+                     #C(cont...)#C
+          PLUGE (3/3)
+
+Values for the bars when in NTSC
+mode are: closest to the center
+3.5 IRE, central ones 7.5 IRE, and
+outer ones 11.5 IRE. 
+
+When calibrating for NTSC
+material, the 7.5 IRE bars should
+blend in the background. The 7.5
+IRE in NTSC is the black level,
+also known as setup.
diff --git a/240psuite/N64/filesystem/help/scroll.txt b/240psuite/N64/filesystem/help/scroll.txt
new file mode 100644
index 00000000..e4daf768
--- /dev/null
+++ b/240psuite/N64/filesystem/help/scroll.txt
@@ -0,0 +1,23 @@
+            SCROLL TEST
+
+This test shows a two layer
+background from #YSonic the
+Hedgehog#Y or a single one from
+#YKiki Kaikai#Y.
+
+The speed can be varied with the
+d-pad, and direction changed with
+button #GX#G.
+
+Vertical and horizntal patterns
+can be swapped with the #GY#G button,
+and #GA#G stops the scroll.
+
+This can be used to notice any
+drops in framerate when using
+a video processor.
+
+#YSonic The Hedgehog#Y is a trademark
+of #YSega Enterprises Ltd#Y.
+#YKiki Kaikai#Y is a trademark of
+#YNamco/Bandai#Y.
diff --git a/240psuite/N64/font.c b/240psuite/N64/font.c
index c65bfa23..9787dee0 100644
--- a/240psuite/N64/font.c
+++ b/240psuite/N64/font.c
@@ -150,9 +150,41 @@ void graphics_draw_text_suite( surface_t* disp, int x, int y, const char * const
 				}
 				graphics_set_color(f_color, 0x00000000);
 				break;
-            default:
-                graphics_draw_character( disp, tx, ty, *text );
-                tx += fw;
+            default: {
+					bool shown = false;
+					
+					// show ... as three dots with less spacing
+					if(*text == '.' && *(text + 1) != '\0') {
+						if(*(text + 1) == '.' && *(text + 1) == *(text + 2)) {
+							int stride = lh;
+							
+							tx -= fw/4;
+							for(int pos = 0; pos < 3; pos++) {
+								graphics_draw_character(disp, tx, ty, '.');
+								tx += stride;
+							}
+							tx += fw/4;
+							shown = true;
+							text += 2;
+						}
+					}
+					
+					// show some characters with less spacing
+					if(!shown) {
+						if(*text == '.' || *text == ',' || *text == ';' || 
+							*text == '\'') {
+							tx = tx - fw/2 + 1;
+							graphics_draw_character(disp, tx, ty, *text);
+							tx += fw/2 + 1;
+						} else if(*text == ':' || *text == '/') {
+							graphics_draw_character(disp, tx, ty, *text);
+							tx += lh;
+						} else {  // any regular character
+							graphics_draw_character(disp, tx, ty, *text);
+							tx += fw;
+						}
+					}
+				}
                 break;
         }
 
diff --git a/240psuite/N64/help.c b/240psuite/N64/help.c
index 367241da..04d05f01 100644
--- a/240psuite/N64/help.c
+++ b/240psuite/N64/help.c
@@ -54,7 +54,7 @@ char *loadHelpFile(char *filename, char ***pages, int *npages) {
 		return NULL;
 	}
 
-	memset(buffer, 0x20, size);
+	memset(buffer, 0x00, size);
 
 	if(dfs_read(buffer, 1, size, fp) < 0) {
 		dfs_close(fp);
diff --git a/240psuite/N64/help.h b/240psuite/N64/help.h
index c22cc9b1..13908047 100644
--- a/240psuite/N64/help.h
+++ b/240psuite/N64/help.h
@@ -41,7 +41,7 @@ extern char *helpData;
 #define DROPSHADOW		"/help/dshadow.txt"
 #define STRIPED			"/help/striped.txt"
 #define GRIDSCROLL		"/help/gridscroll.txt"
-#define SCROLL			"/help/scroll.txt"
+#define SCROLLHELP		"/help/scroll.txt"
 #define MANUALLAG		"/help/manuallag.txt"
 #define PASSIVELAG		"/help/passivelag.txt"
 #define SMPTECOLOR		"/help/SMPTEColor.txt"
diff --git a/240psuite/N64/patterns.c b/240psuite/N64/patterns.c
index f71718d9..a149d83e 100644
--- a/240psuite/N64/patterns.c
+++ b/240psuite/N64/patterns.c
@@ -22,6 +22,89 @@
 #include "patterns.h"
 #include "menu.h"
 
+void drawPLUGE() {
+	int end = 0, type = 0, showBorder = 0, showText = 0;
+	image *back = NULL, *pal = NULL, *borderGreen = NULL, *borderRed = NULL;
+	joypad_buttons_t keys;
+	char msg[50];
+	
+	back = loadImage("rom:/pluge.sprite");
+	if(!back)
+		return;
+	pal = loadImage("rom:/plugePAL.sprite");
+	if(!pal)
+		return;
+	borderGreen = loadImage("rom:/PLUGEBorder.sprite");
+	if(!borderGreen)
+		return;
+	borderRed = loadImage("rom:/PLUGEBorder.sprite");
+	if(!borderRed)
+		return;
+	borderGreen->palette[1] = graphics_make_color(0xff, 0x00, 0x00, 0xff);
+	data_cache_hit_writeback_invalidate(borderGreen->palette, sizeof(uint16_t)*borderGreen->palSize);
+	borderRed->palette[1] = graphics_make_color(0x00, 0xff, 0x00, 0xff);
+	data_cache_hit_writeback_invalidate(borderRed->palette, sizeof(uint16_t)*borderRed->palSize);
+		
+	while(!end) {
+		getDisplay();
+
+		rdpqStart();
+		
+		if(type)
+			rdpqDrawImage(back);
+		else
+			rdpqDrawImage(pal);
+		if(showBorder) {
+			rdpqDrawImageXY(borderRed, 14, 39);
+			rdpqDrawImageXY(borderRed, 44, 39);
+			rdpqDrawImageXY(borderGreen, 74, 39);
+			
+			rdpqDrawImageXY(borderGreen, 228, 39);
+			rdpqDrawImageXY(borderRed, 259, 39);
+			rdpqDrawImageXY(borderRed, 289, 39);
+		}
+		rdpqEnd();
+		
+		if(showBorder) {
+			drawString(10, 205, 0xff, 0x00, 0, type ? "11.5" : "3.5");
+			drawString(40, 205, 0xff, 0x00, 0, type ? "7.5" : "2");
+			drawString(70, 205, 0xff, 0x00, 0, type ? "3.5" : "1");
+			
+			drawString(224, 205, 0xff, 0x00, 0, type ? "3.5" : "1");
+			drawString(255, 205, 0xff, 0x00, 0, type ? "7.5" : "2");
+			drawString(285, 205, 0xff, 0x00, 0, type ? "11.5" : "3.5");
+			showBorder --;
+		}
+		
+		if(showText) {
+			drawString(200, 20, 0, 0xff, 0, msg);
+			showText --;
+		}
+		
+		checkMenu(PLUGEHELP, NULL);
+		waitVsync();
+		
+		joypad_poll();
+		keys = controllerButtonsHeld();
+		
+		checkStart(keys);
+		if(keys.a) {
+			type = !type;
+			sprintf(msg, type ? "NTSC 7.5 IRE" : "RGB Full Range");
+			showText = 60;
+		}
+		if(keys.c_left)
+			showBorder = 60;
+		if(keys.b)
+			end = 1;
+	}
+	
+	freeImage(&borderGreen);
+	freeImage(&borderRed);
+	freeImage(&pal);
+	freeImage(&back);
+}
+
 void drawMonoscope() {
 	int end = 0, pattern = 0;
 	image *back = NULL, *orig = NULL;
@@ -116,3 +199,34 @@ void drawGrid() {
 	
 	freeImage(&back);
 }
+
+
+void drawGrayramp() {
+	int end = 0;
+	image *back = NULL;
+	joypad_buttons_t keys;
+	
+	back = loadImage("rom:/grayramp.sprite");
+	if(!back)
+		return;
+	while(!end) {
+		getDisplay();
+
+		rdpqStart();
+		
+		rdpqDrawImage(back);
+		rdpqEnd();
+		
+		checkMenu(GRAYHELP, NULL);
+		waitVsync();
+		
+		joypad_poll();
+		keys = controllerButtonsHeld();
+		
+		checkStart(keys);
+		if(keys.b)
+			end = 1;
+	}
+	
+	freeImage(&back);
+}
diff --git a/240psuite/N64/patterns.h b/240psuite/N64/patterns.h
index b9e6dc8c..ea061c38 100644
--- a/240psuite/N64/patterns.h
+++ b/240psuite/N64/patterns.h
@@ -1,7 +1,9 @@
 #ifndef PATTERNS_H
 #define PATTERNS_H
 
+void drawPLUGE();
 void drawMonoscope();
 void drawGrid();
+void drawGrayramp();
 
 #endif
\ No newline at end of file
diff --git a/240psuite/N64/tests.c b/240psuite/N64/tests.c
index ce39bdc6..1000e344 100644
--- a/240psuite/N64/tests.c
+++ b/240psuite/N64/tests.c
@@ -199,11 +199,11 @@ void drawScroll() {
 		rdpqEnd();
 		
 #ifdef DEBUG_BENCHMARK
-		//printPalette(sonicFall, 20, 20);
-		//printPalette(sonicWater, 100, 20);
+		printPalette(sonicFall, 20, 20);
+		printPalette(sonicWater, 100, 20);
 #endif
 		
-		checkMenu(NULL, NULL);
+		checkMenu(SCROLLHELP, NULL);
 		waitVsync();
 		
 		joypad_poll();