From b46269b66254d7230a23e91dfd0b7add5f40ef57 Mon Sep 17 00:00:00 2001
From: Thomas Backmark <total@viskos.org>
Date: Thu, 20 Jan 2022 22:24:52 +0100
Subject: [PATCH] Moved the new text renderer behind a feature flag

---
 LTTP_RND_GeneralBugfixes.asm | 19 +++++++++-----
 hooks.asm                    | 50 +++++++++++++++++++-----------------
 2 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 5ec7c31..d7f0a14 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -105,6 +105,9 @@ dw !ROM_VERSION_HIGH
 
 function hexto555(h) = ((((h&$FF)/8)<<10)|(((h>>8&$FF)/8)<<5)|(((h>>16&$FF)/8)<<0))
 
+; Feature flags, run asar with -DFEATURE_X=1 to enable
+!FEATURE_NEW_TEXT ?= 0
+
 ;================================================================================
 
 incsrc hooks.asm
@@ -218,7 +221,9 @@ incsrc darkroomitems.asm
 incsrc fastcredits.asm
 incsrc msu.asm
 incsrc dungeonmap.asm
-incsrc textrenderer.asm
+if !FEATURE_NEW_TEXT
+    incsrc textrenderer.asm
+endif
 warnpc $A58000
 
 ;org $228000 ; contrib area
@@ -306,11 +311,13 @@ org $339600
 BossMapIconGFX:
 incbin bossicons.4bpp
 
-org $339C00
-NewFont:
-incbin newfont.bin
-NewFontInverted:
-incbin newfont_inverted.bin
+if !FEATURE_NEW_TEXT
+    org $339C00
+    NewFont:
+    incbin newfont.bin
+    NewFontInverted:
+    incbin newfont_inverted.bin
+endif
 
 org $328000
 Extra_Text_Table:
diff --git a/hooks.asm b/hooks.asm
index e2af74e..11e0f75 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -2746,30 +2746,32 @@ org $01C65F : JSL FixJingleGlitch
 ;================================================================================
 ; Text Renderer
 ;--------------------------------------------------------------------------------
-org $0EF51B
-    JML RenderCharExtended
-org $0EF520
-    RenderCharExtended_returnOriginal:
-org $0EF567
-    RenderCharExtended_returnUncompressed:
+if !FEATURE_NEW_TEXT
+    org $0EF51B
+        JML RenderCharExtended
+    org $0EF520
+        RenderCharExtended_returnOriginal:
+    org $0EF567
+        RenderCharExtended_returnUncompressed:
 
-org $0EF356
-    JSL RenderCharLookupWidth
-org $0EF3BA
-    JSL RenderCharLookupWidth
-org $0EF48E
-    JML RenderCharLookupWidthDraw
-org $0EF499
-    RenderCharLookupWidthDraw_return:
+    org $0EF356
+        JSL RenderCharLookupWidth
+    org $0EF3BA
+        JSL RenderCharLookupWidth
+    org $0EF48E
+        JML RenderCharLookupWidthDraw
+    org $0EF499
+        RenderCharLookupWidthDraw_return:
 
-org $0EF6AA
-    JML RenderCharToMapExtended
-org $0EF6C2
-    RenderCharToMapExtended_return:
+    org $0EF6AA
+        JML RenderCharToMapExtended
+    org $0EF6C2
+        RenderCharToMapExtended_return:
 
-org $0EFA50
-    JSL RenderCharSetColorExtended
-org $0EEE5D
-    JSL RenderCharSetColorExtended_init
-org $0EF285
-    JSL RenderCharSetColorExtended_close : NOP
+    org $0EFA50
+        JSL RenderCharSetColorExtended
+    org $0EEE5D
+        JSL RenderCharSetColorExtended_init
+    org $0EF285
+        JSL RenderCharSetColorExtended_close : NOP
+endif
\ No newline at end of file