alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Moved the new text renderer behind a feature flag

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

19
LTTP_RND_GeneralBugfixes.asm
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)) 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 incsrc hooks.asm
@@ -218,7 +221,9 @@ incsrc darkroomitems.asm
incsrc fastcredits.asm incsrc fastcredits.asm
incsrc msu.asm incsrc msu.asm
incsrc dungeonmap.asm incsrc dungeonmap.asm
incsrc textrenderer.asm if !FEATURE_NEW_TEXT
incsrc textrenderer.asm
endif
warnpc $A58000 warnpc $A58000
;org $228000 ; contrib area ;org $228000 ; contrib area
@@ -306,11 +311,13 @@ org $339600
BossMapIconGFX: BossMapIconGFX:
incbin bossicons.4bpp incbin bossicons.4bpp
org $339C00 if !FEATURE_NEW_TEXT
NewFont: org $339C00
incbin newfont.bin NewFont:
NewFontInverted: incbin newfont.bin
incbin newfont_inverted.bin NewFontInverted:
incbin newfont_inverted.bin
endif
org $328000 org $328000
Extra_Text_Table: Extra_Text_Table:

26
hooks.asm
View File

@@ -2746,30 +2746,32 @@ org $01C65F : JSL FixJingleGlitch
;================================================================================ ;================================================================================
; Text Renderer ; Text Renderer
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $0EF51B if !FEATURE_NEW_TEXT
org $0EF51B
JML RenderCharExtended JML RenderCharExtended
org $0EF520 org $0EF520
RenderCharExtended_returnOriginal: RenderCharExtended_returnOriginal:
org $0EF567 org $0EF567
RenderCharExtended_returnUncompressed: RenderCharExtended_returnUncompressed:
org $0EF356 org $0EF356
JSL RenderCharLookupWidth JSL RenderCharLookupWidth
org $0EF3BA org $0EF3BA
JSL RenderCharLookupWidth JSL RenderCharLookupWidth
org $0EF48E org $0EF48E
JML RenderCharLookupWidthDraw JML RenderCharLookupWidthDraw
org $0EF499 org $0EF499
RenderCharLookupWidthDraw_return: RenderCharLookupWidthDraw_return:
org $0EF6AA org $0EF6AA
JML RenderCharToMapExtended JML RenderCharToMapExtended
org $0EF6C2 org $0EF6C2
RenderCharToMapExtended_return: RenderCharToMapExtended_return:
org $0EFA50 org $0EFA50
JSL RenderCharSetColorExtended JSL RenderCharSetColorExtended
org $0EEE5D org $0EEE5D
JSL RenderCharSetColorExtended_init JSL RenderCharSetColorExtended_init
org $0EF285 org $0EF285
JSL RenderCharSetColorExtended_close : NOP JSL RenderCharSetColorExtended_close : NOP
endif