From bb5b3eca7a586e0379687f21b334580ba0195078 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Sat, 13 Jul 2024 11:48:13 +0100 Subject: [PATCH] Use LOAD for LCD functions --- src/engine/bank20.asm | 4 ++++ src/layout.link | 4 ++++ src/wram.asm | 10 +++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm index 905cf3a..329e927 100644 --- a/src/engine/bank20.asm +++ b/src/engine/bank20.asm @@ -5902,6 +5902,7 @@ UnreferencedLCD_82729: ret .func +LOAD UNION "LCD Function", WRAM0 push af push bc push de @@ -5920,6 +5921,7 @@ UnreferencedLCD_82729: pop bc pop af reti +ENDL .func_end ; unreferenced @@ -5931,7 +5933,9 @@ UnreferencedLCD_82754: ret .func +LOAD UNION "LCD Function", WRAM0 reti +ENDL .func_end HandleBottomBar: diff --git a/src/layout.link b/src/layout.link index 5cc43eb..5316a73 100644 --- a/src/layout.link +++ b/src/layout.link @@ -270,6 +270,10 @@ ROMX $7f "Wario OAM 2" WRAM0 "WRAM0" + "wVBlankFunc" + "wLCDFunc" + "LCD Function" + "Room Block Tiles" "Progress WRAM" "Level WRAM" org $cc00 diff --git a/src/wram.asm b/src/wram.asm index 2c06372..c55a263 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -369,13 +369,21 @@ wc1ca:: ds $35 +SECTION "wVBlankFunc", WRAM0 + ; function called on V-Blank wVBlankFunc:: ds $200 +SECTION "wLCDFunc", WRAM0 + ; function called on LCD wLCDFunc:: - ds $1ff +; "LCD Function" goes here + +SECTION "Room Block Tiles", WRAM0 + + ds $1e0 wROMBank:: db