Moved the new text renderer behind a feature flag

This commit is contained in:
Thomas Backmark
2022-01-20 22:24:52 +01:00
parent b392eb7554
commit b46269b662
2 changed files with 39 additions and 30 deletions

View File

@@ -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
if !FEATURE_NEW_TEXT
incsrc textrenderer.asm
endif
warnpc $A58000
;org $228000 ; contrib area
@@ -306,11 +311,13 @@ 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:

View File

@@ -2746,6 +2746,7 @@ org $01C65F : JSL FixJingleGlitch
;================================================================================
; Text Renderer
;--------------------------------------------------------------------------------
if !FEATURE_NEW_TEXT
org $0EF51B
JML RenderCharExtended
org $0EF520
@@ -2773,3 +2774,4 @@ org $0EEE5D
JSL RenderCharSetColorExtended_init
org $0EF285
JSL RenderCharSetColorExtended_close : NOP
endif