From d234aa0bcdfb2e352b928e304a658c65ab547679 Mon Sep 17 00:00:00 2001 From: 4am Date: Wed, 27 Oct 2021 20:17:35 -0400 Subject: [PATCH] move font data out of LC2 --- src/4cade.a | 5 +---- src/4cade.init.a | 2 +- src/constants.a | 4 +++- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/4cade.a b/src/4cade.a index edbd412fe..2202a2293 100644 --- a/src/4cade.a +++ b/src/4cade.a @@ -184,15 +184,12 @@ COPYSRC = * !if LCRAM2_END >= DisableAccelerator { !error "code is too large: ends at ", LCRAM2_END } - FONTDST = (LCRAM2_END + 255) and -256 + FONTDST = $E000 } EvenLasterMover FONTSRC = * !pseudopc FONTDST { !source "src/ui.font.data.lc2.a" - !if * > $E000 { - !error "code is too large: ends at ", * - } } !if RELBASE = $2000 { !ifdef PASS2 { diff --git a/src/4cade.init.a b/src/4cade.init.a index 42494335a..a2dd573ce 100644 --- a/src/4cade.init.a +++ b/src/4cade.init.a @@ -181,7 +181,7 @@ ldy #4 @ELM lda FONTSRC,x - ; relocate font data to RAM bank 2 + ; relocate font data to $E000 sta FONTDST,x inx bne @ELM diff --git a/src/constants.a b/src/constants.a index 45625195f..df7f4214a 100644 --- a/src/constants.a +++ b/src/constants.a @@ -8,6 +8,8 @@ ; LC RAM BANK 1 ; D000..DFDE - persistent data structures (gGlobalPrefsStore, gGamesListStore) ; ...unused... +; E000..E3FF - HGR font data +; ...unused... ; EA23..FFEE - main program code ; FFEF..FFF9 - API functions and global constants available for main program ; code, prelaunchers, transition effects, &c. @@ -21,7 +23,7 @@ ; DB92..DB98 - backup of stack (during gameplay and self-running demos) ; ...unused... ; DBB4..DBFF - (de)acceleration function -; DC00..DFFF - HGR font data +; DC00..DFFF - unused ;------------------------------------------------------------------------------ !ifndef _CONSTANTS_ {