Merge branch 'master' into sram_rework

LTTP_RND_GeneralBugfixes.asm

@@ -73,6 +73,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
@@ -186,6 +189,9 @@ incsrc darkroomitems.asm
 incsrc fastcredits.asm
 incsrc msu.asm
 incsrc dungeonmap.asm
+if !FEATURE_NEW_TEXT
+    incsrc textrenderer.asm
+endif
 warnpc $A58000
 
 ;org $228000 ; contrib area
@@ -273,6 +279,14 @@ org $339600
 BossMapIconGFX:
 incbin bossicons.4bpp
 
+if !FEATURE_NEW_TEXT
+    org $339C00
+    NewFont:
+    incbin newfont.bin
+    NewFontInverted:
+    incbin newfont_inverted.bin
+endif
+
 org $328000
 Extra_Text_Table:
 incsrc itemtext.asm