From 021280b25c2c2e5106219fb48317b40338e0d953 Mon Sep 17 00:00:00 2001 From: nmlgc Date: Fri, 24 Apr 2020 20:30:24 +0200 Subject: [PATCH] [Maintenance] Don't modify master.h to #undef grcg_off() for TH02 Because TH04 and TH05 actually do use this macro. Part of P0089, funded by [Anonymous] and Blue Bolt. --- libs/master.lib/master.h | 4 +--- th02/th02.h | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/master.lib/master.h b/libs/master.lib/master.h index 7d1317ab..337890f9 100644 --- a/libs/master.lib/master.h +++ b/libs/master.lib/master.h @@ -2391,9 +2391,7 @@ void MASTER_RET grcg_and( int mode, int color ); void MASTER_RET grcg_or( int mode, int color ); void MASTER_RET grcg_off(void); # define grcg_setmode(mode) OUTB(0x7c,mode) -# if GAME < 2 -# define grcg_off() OUTB(0x7c,0) -# endif +# define grcg_off() OUTB(0x7c,0) /* EGC */ void MASTER_RET egc_on(void); diff --git a/th02/th02.h b/th02/th02.h index 6bc679d7..1e8bae00 100644 --- a/th02/th02.h +++ b/th02/th02.h @@ -6,6 +6,8 @@ #include "ReC98.h" #include "th01/ranks.h" +#undef grcg_off + // Formats // ------- typedef struct {