[Maintenance] [th02] Split ZUN_RES.COM into three translation units

Necessary to make string literals from the first one end up at their
correct positions in the data segment even after the upcoming
deduplication…

Part of P0076, funded by [Anonymous] and -Tom-.

Makefile.mak

@@ -56,7 +56,7 @@ bin\th01\fuuin.exe: bin\th01\fuuin.obj th01\fuuin_05.c th01\fuuin_06.c th01\fuui
 $**
 |
 
-bin\th02\zun_res.com: th02\zun_res1.c th02\zun_res2.c
+bin\th02\zun_res.com: th02\zun_res1.c th02\zun_res2.c th02\zun_res3.c
 	$(CC) $(CFLAGS) -mt -lt -Z -DGAME=2 -nbin\th02\ -eZUN_RES.COM @&&|
 $**
 | masters.lib

th02/zun_res1.c

@@ -1,7 +1,7 @@
 /* ReC98
  * -----
  * 1st part of ZUN_RES.COM. Initializes the resident structure and
- * configuration file required in order to run TH02, and verifies HUUHI.DAT.
+ * configuration file required in order to run TH02.
  */
 
 #pragma inline
@@ -114,65 +114,3 @@ error_ret:
 }
 
 #pragma codestring "\x00"
-
-#pragma option -O- -k-
-
-extern char rank;
-scoredat_section_t hi;
-
-void pascal scoredat_recreate(void);
-void pascal near scoredat_load(void);
-
-unsigned char unused_1 = 0;
-const char *SCOREDAT_FN = "huuhi.dat";
-unsigned char g_name_first_sum = 0;
-unsigned char stage_sum = 0;
-unsigned char unused_2 = 0;
-long points_sum = 0;
-long score_sum = 0;
-
-int pascal scoredat_verify(void)
-{
-	if(!file_exist(SCOREDAT_FN)) {
-		scoredat_recreate();
-	} else {
-		for(rank = 0; rank < RANK_COUNT; rank++) {
-			register int unused;
-			register int i;
-
-			scoredat_load();
-			_AL = 0;
-			g_name_first_sum = _AL;
-			stage_sum = _AL;
-			_AX = 0;
-			asm {
-				mov word ptr points_sum + 0, ax
-				mov word ptr points_sum + 2, ax
-				mov word ptr score_sum + 0, ax
-				mov word ptr score_sum + 2, ax
-			}
-			for(i = 0; i < sizeof(hi.score); i++) {
-				score_sum += *((unsigned char*)(&hi.score) + i);
-			}
-			for(i = 0; i < SCOREDAT_PLACES; i++) {
-				points_sum += hi.score.points[i];
-				g_name_first_sum += hi.score.g_name[i][0];
-				stage_sum += hi.score.stage[i];
-			}
-			if(
-				points_sum != hi.score.points_sum
-				|| g_name_first_sum != hi.score.g_name_first_sum
-				|| stage_sum != hi.score.stage_sum
-				|| score_sum != hi.score_sum
-			) {
-				goto delete;
-			}
-		}
-	}
-	return 0;
-delete:
-	file_delete(SCOREDAT_FN);
-	return 1;
-}
-
-#pragma codestring "\x90"

th02/zun_res2.c

@@ -1,75 +1,68 @@
 /* ReC98
  * -----
- * 2nd part of ZUN_RES.COM. Initializes the high score lists.
+ * 2nd part of ZUN_RES.COM. Verifies HUUHI.DAT.
  */
 
+#include <stddef.h>
 #include "th02/th02.h"
 
-extern scoredat_section_t hi;
+#pragma option -O- -k- -a1
-extern const char *SCOREDAT_FN;
 
-char rank;
+extern char rank;
+scoredat_section_t hi;
 
-// Slightly differs from the same function in MAINE.EXE!
+void pascal scoredat_recreate(void);
-// And seriously, I wasted half a week trying to figure out how to get these
+void pascal near scoredat_load(void);
-// exact same instructions out of the compiler, and it just didn't work.
+
-void pascal scoredat_defaults_set(void)
+const char *SCOREDAT_FN = "huuhi.dat";
+unsigned char g_name_first_sum = 0;
+unsigned char stage_sum = 0;
+unsigned char unused_2 = 0;
+long points_sum = 0;
+long score_sum = 0;
+
+int pascal scoredat_verify(void)
 {
-	_SI = 0;
+	if(!file_exist(SCOREDAT_FN)) {
-	_DI = 1000 * SCOREDAT_PLACES;
+		scoredat_recreate();
-	goto place_loop;
+	} else {
+		for(rank = 0; rank < RANK_COUNT; rank++) {
+			register int unused;
+			register int i;
 
-place_set:
+			scoredat_load();
-	hi.score.cleared = 0;
+			_AL = 0;
-	hi.score.points[_SI] = _DI;
+			g_name_first_sum = _AL;
-	_DI -= 1000;
+			stage_sum = _AL;
-	hi.score.stage[_SI] = 5 - ((int)_SI >> 1);
+			_AX = 0;
-	_BX = _SI;
+			asm {
-	asm {
+				mov word ptr points_sum + 0, ax
-		imul bx, bx, 7
+				mov word ptr points_sum + 2, ax
-		mov cx, 6
+				mov word ptr score_sum + 0, ax
-
+				mov word ptr score_sum + 2, ax
-name_loop:
+			}
-		mov byte ptr hi.(scoredat_section_t)score.g_name[bx], gs_BULLET
+			for(i = 0; i < sizeof(hi.score); i++) {
-		inc bx
+				score_sum += *((unsigned char*)(&hi.score) + i);
-		loop name_loop
+			}
-		mov byte ptr hi.(scoredat_section_t)score.g_name[bx], 0
+			for(i = 0; i < SCOREDAT_PLACES; i++) {
+				points_sum += hi.score.points[i];
+				g_name_first_sum += hi.score.g_name[i][0];
+				stage_sum += hi.score.stage[i];
+			}
+			if(
+				points_sum != hi.score.points_sum
+				|| g_name_first_sum != hi.score.g_name_first_sum
+				|| stage_sum != hi.score.stage_sum
+				|| score_sum != hi.score_sum
+			) {
+				goto delete;
+			}
+		}
 	}
-	_BX = _SI;
+	return 0;
-	_BX <<= 2;
+delete:
-	asm {
+	file_delete(SCOREDAT_FN);
-		mov word ptr hi.(scoredat_section_t)score.date[bx].da_year, 1900
+	return 1;
-		mov byte ptr hi.(scoredat_section_t)score.date[bx].da_day, 1
-		mov byte ptr hi.(scoredat_section_t)score.date[bx].da_mon, 1
-		mov byte ptr hi.(scoredat_section_t)score.shottype[si], 1
-		inc si
-
-place_loop:
-		cmp si, SCOREDAT_PLACES
-		jge end
-		jmp place_set
-	}
-end:
 }
 
-#include "th02/scoreenc.c"
+#pragma codestring "\x90"
-
-void pascal scoredat_create(void)
-{
-	SCOREDAT_ENCODE();
-	file_create(SCOREDAT_FN);
-	file_write(&hi, sizeof(hi));
-	file_write(&hi, sizeof(hi));
-	file_write(&hi, sizeof(hi));
-	file_write(&hi, sizeof(hi));
-	file_write(&hi, sizeof(hi));
-	file_close();
-}
-
-void pascal scoredat_recreate(void)
-{
-	scoredat_defaults_set();
-	scoredat_create();
-}
-
-#include "th02\scorelod.c"

th02/zun_res3.c

@@ -0,0 +1,75 @@
+/* ReC98
+ * -----
+ * 3rd part of ZUN_RES.COM. Initializes the high score lists.
+ */
+
+#include "th02/th02.h"
+
+extern scoredat_section_t hi;
+extern const char *SCOREDAT_FN;
+
+char rank;
+
+// Slightly differs from the same function in MAINE.EXE!
+// And seriously, I wasted half a week trying to figure out how to get these
+// exact same instructions out of the compiler, and it just didn't work.
+void pascal scoredat_defaults_set(void)
+{
+	_SI = 0;
+	_DI = 1000 * SCOREDAT_PLACES;
+	goto place_loop;
+
+place_set:
+	hi.score.cleared = 0;
+	hi.score.points[_SI] = _DI;
+	_DI -= 1000;
+	hi.score.stage[_SI] = 5 - ((int)_SI >> 1);
+	_BX = _SI;
+	asm {
+		imul bx, bx, 7
+		mov cx, 6
+
+name_loop:
+		mov byte ptr hi.(scoredat_section_t)score.g_name[bx], gs_BULLET
+		inc bx
+		loop name_loop
+		mov byte ptr hi.(scoredat_section_t)score.g_name[bx], 0
+	}
+	_BX = _SI;
+	_BX <<= 2;
+	asm {
+		mov word ptr hi.(scoredat_section_t)score.date[bx].da_year, 1900
+		mov byte ptr hi.(scoredat_section_t)score.date[bx].da_day, 1
+		mov byte ptr hi.(scoredat_section_t)score.date[bx].da_mon, 1
+		mov byte ptr hi.(scoredat_section_t)score.shottype[si], 1
+		inc si
+
+place_loop:
+		cmp si, SCOREDAT_PLACES
+		jge end
+		jmp place_set
+	}
+end:
+}
+
+#include "th02/scoreenc.c"
+
+void pascal scoredat_create(void)
+{
+	SCOREDAT_ENCODE();
+	file_create(SCOREDAT_FN);
+	file_write(&hi, sizeof(hi));
+	file_write(&hi, sizeof(hi));
+	file_write(&hi, sizeof(hi));
+	file_write(&hi, sizeof(hi));
+	file_write(&hi, sizeof(hi));
+	file_close();
+}
+
+void pascal scoredat_recreate(void)
+{
+	scoredat_defaults_set();
+	scoredat_create();
+}
+
+#include "th02\scorelod.c"