Merged in Upstream ER changes

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
+
 ;================================================================================
 
 !MULTIWORLD_ITEM = "$7EF4D2"
@@ -240,6 +243,9 @@ incsrc msu.asm
 incsrc dungeonmap.asm
 incsrc multiworld.asm
 incsrc terrorpin.asm
+if !FEATURE_NEW_TEXT
+    incsrc textrenderer.asm
+endif
 warnpc $A58000
 
 ;org $228000 ; contrib area
@@ -332,6 +338,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
@@ -377,7 +391,8 @@ warnpc $B08000
 ;$3B reserved for downstream use
 ;$3F reserved for internal debugging
 ;================================================================================
-;RAM 
+;RAM
+;$7E021B[0x1]: Used by race game instead of $0ABF to avoid witch item conflict
 ;$7EC900[0x1F00]: BIGRAM buffer
 ;$7EF000[0x500]: SRAM mirror First 0x500 bytes of SRAM
 ;$7F5000[0x800]: Rando's main free ram region