From 2df2596b4878e663e293469c370e8f9433dabeb7 Mon Sep 17 00:00:00 2001 From: Ry Date: Fri, 11 Mar 2022 17:13:18 -0800 Subject: [PATCH] fox32+fox32rom: Remove the concept of "fast" and "shared" memory Instead of having two banks of RAM, just have one bank. This requires the use of some cursed code, but it's fine :P Co-authored-by: Lua --- background.asm | 2 +- main.asm | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/background.asm b/background.asm index a3fad85..f5822b0 100644 --- a/background.asm +++ b/background.asm @@ -1,6 +1,6 @@ ; background routines -const BACKGROUND_FRAMEBUFFER: 0x80000000 ; pointer to background framebuffer +const BACKGROUND_FRAMEBUFFER: 0x02000000 ; pointer to background framebuffer ; fill the whole background with a color ; inputs: diff --git a/main.asm b/main.asm index 0efee60..ea5d504 100644 --- a/main.asm +++ b/main.asm @@ -224,23 +224,23 @@ overlay_31_width: data.16 8 overlay_31_height: data.16 12 overlay_31_position_x: data.16 0 overlay_31_position_y: data.16 0 -overlay_31_framebuffer_ptr: data.32 0x8012D000 +overlay_31_framebuffer_ptr: data.32 0x0212D000 ; menu bar overlay struct: overlay_30_width: data.16 640 overlay_30_height: data.16 16 overlay_30_position_x: data.16 0 overlay_30_position_y: data.16 0 -overlay_30_framebuffer_ptr: data.32 0x8012D180 +overlay_30_framebuffer_ptr: data.32 0x0212D180 ; menu overlay struct: -; this struct must be writable, so these are hard-coded addresses in shared memory -const OVERLAY_29_WIDTH: 0x80137180 ; 2 bytes -const OVERLAY_29_HEIGHT: 0x80137182 ; 2 bytes -const OVERLAY_29_POSITION_X: 0x80137184 ; 2 bytes -const OVERLAY_29_POSITION_Y: 0x80137186 ; 2 bytes -const OVERLAY_29_FRAMEBUFFER_PTR: 0x8013718A ; 4 bytes -const OVERLAY_29_FRAMEBUFFER: 0x8013718E +; this struct must be writable, so these are hard-coded addresses in ram +const OVERLAY_29_WIDTH: 0x02137180 ; 2 bytes +const OVERLAY_29_HEIGHT: 0x02137182 ; 2 bytes +const OVERLAY_29_POSITION_X: 0x02137184 ; 2 bytes +const OVERLAY_29_POSITION_Y: 0x02137186 ; 2 bytes +const OVERLAY_29_FRAMEBUFFER_PTR: 0x0213718A ; 4 bytes +const OVERLAY_29_FRAMEBUFFER: 0x0213718E startup_str: data.str "fox32 - ROM version %u.%u.%u - insert boot disk" data.8 0