From f158e393e82aa2f81bb39d2ae4c5f684402742c9 Mon Sep 17 00:00:00 2001
From: nmlgc <nmlgc@nmlgc.net>
Date: Mon, 8 Feb 2021 15:37:30 +0100
Subject: [PATCH] [Maintenance] Mirror recent pc98.h and master.hpp
 declarations in ASM land

Part of P0134, funded by [Anonymous].
---
 ReC98.inc   | 13 -------------
 pc98.inc    | 11 +++++++++++
 th04_op.asm |  4 ++--
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ReC98.inc b/ReC98.inc
index 671cbf06..c4c26c06 100644
--- a/ReC98.inc
+++ b/ReC98.inc
@@ -52,19 +52,6 @@ endm
 ; ---------------------
 ; super_roll_put_1plane() plane_put constants
 PLANE_PUT  = 0FF00h or GC_RMW
-
-; RGB color triple, used for the Palettes structure
-rgb_t struc
-	r db ?
-	g db ?
-	b db ?
-rgb_t ends
-
-PALETTE_COLORS = 16
-
-palette_t struc
-	colors	rgb_t PALETTE_COLORS dup(<?>)
-palette_t ends
 ; ---------------------
 
 ; Rank definitions
diff --git a/pc98.inc b/pc98.inc
index 5fe69928..34d243f9 100644
--- a/pc98.inc
+++ b/pc98.inc
@@ -18,6 +18,17 @@ RES_Y = 400
 ROW_SIZE = (RES_X / 8)
 PLANE_SIZE = (ROW_SIZE * RES_Y)
 COLOR_COUNT = 16
+
+; RGB color triple, used for the Palettes structure
+rgb_t struc
+	r db ?
+	g db ?
+	b db ?
+rgb_t ends
+
+palette_t struc
+	colors	rgb_t COLOR_COUNT dup(<?>)
+palette_t ends
 ; ========
 
 SEG_PLANE_B = 0A800h
diff --git a/th04_op.asm b/th04_op.asm
index e042203f..7c4a1449 100644
--- a/th04_op.asm
+++ b/th04_op.asm
@@ -2543,7 +2543,7 @@ loc_CE8B:
 		inc	si
 
 loc_CEAA:
-		cmp	si, PALETTE_COLORS
+		cmp	si, COLOR_COUNT
 		jl	short loc_CE8B
 		call	far ptr	palette_show
 		mov	PaletteTone, 100
@@ -2609,7 +2609,7 @@ loc_CF2D:
 		inc	di
 
 loc_CF34:
-		cmp	di, PALETTE_COLORS
+		cmp	di, COLOR_COUNT
 		jl	short loc_CEFA
 		call	far ptr	palette_show
 		push	1