From 5f0b046badbf62c9f028329d90e9d6c118b75480 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Sat, 29 Sep 2018 07:07:44 +0200 Subject: [PATCH] only include decomp test when settings are right --- inc/main.inc | 2 ++ main.asm | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/inc/main.inc b/inc/main.inc index 0470be9..a87d324 100644 --- a/inc/main.inc +++ b/inc/main.inc @@ -3,6 +3,8 @@ constant K_DEBUG(0) // slows down interrupt handling to enable debug routines constant HIRES(1) constant HICOLOR(1) +constant MAIN_DECOMP_IMAGE(HIRES & HICOLOR) + constant MAIN_BASE(0x800E) constant MAIN_COUNTS(0x0010) constant MAIN_SP_TASK(0x0040) diff --git a/main.asm b/main.asm index 505809b..1587313 100644 --- a/main.asm +++ b/main.asm @@ -24,7 +24,7 @@ include "kernel.asm" Main: -if 0 { +if MAIN_DECOMP_IMAGE { DecompImage: lui s0, MAIN_BASE @@ -170,12 +170,15 @@ Die: j Die nop -include "lzss.baku.unsafe.asm" + +if MAIN_DECOMP_IMAGE { + include "lzss.baku.unsafe.asm" + align(16); insert LZ_BAKU, "res/Image.baku.lzss" +} include "dlist.asm" include "task.asm" //align(16); insert FONT, "res/dwarf.1bpp" -//align(16); insert LZ_BAKU, "res/Image.baku.lzss" if pc() > (MAIN_BASE << 16) { error "ran out of memory for code and data"