summaryrefslogtreecommitdiff
path: root/src/constants
diff options
context:
space:
mode:
Diffstat (limited to 'src/constants')
-rw-r--r--src/constants/charmaps.asm2
-rw-r--r--src/constants/hardware_constants.asm5
-rw-r--r--src/constants/text_constants.asm2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/constants/charmaps.asm b/src/constants/charmaps.asm
index e4229bb..5bd21be 100644
--- a/src/constants/charmaps.asm
+++ b/src/constants/charmaps.asm
@@ -308,6 +308,8 @@
fwcharmap 0, "·", $77
fwcharmap 0, "-(2)", $78 ; duplicate
+FW_SPACE EQU $70
+
; TX_SYMBOL
; TODO: If user-defined functions ever become a thing a symbol(*) syntax
; would probably be preferred over SYM_*
diff --git a/src/constants/hardware_constants.asm b/src/constants/hardware_constants.asm
index a93e250..fe2731f 100644
--- a/src/constants/hardware_constants.asm
+++ b/src/constants/hardware_constants.asm
@@ -2,8 +2,6 @@
GBC EQU $11
-LY_VBLANK EQU 145
-
; MBC3
MBC3SRamEnable EQU $0000
MBC3RomBank EQU $2000
@@ -79,11 +77,12 @@ rNR50 EQU $ff24 ; Channel control / ON-OFF / Volume (R/W)
rNR51 EQU $ff25 ; Selection of Sound output terminal (R/W)
rNR52 EQU $ff26 ; Sound on/off
rLCDC EQU $ff40 ; LCD Control (R/W)
-LCDC_ON EQU 7
+LCDC_ON EQU 7
rSTAT EQU $ff41 ; LCDC Status (R/W)
rSCY EQU $ff42 ; Scroll Y (R/W)
rSCX EQU $ff43 ; Scroll X (R/W)
rLY EQU $ff44 ; LCDC Y-Coordinate (R)
+LY_VBLANK EQU 145
rLYC EQU $ff45 ; LY Compare (R/W)
rDMA EQU $ff46 ; DMA Transfer and Start Address (W)
rBGP EQU $ff47 ; BG Palette Data (R/W) - Non CGB Mode Only
diff --git a/src/constants/text_constants.asm b/src/constants/text_constants.asm
index fbef11a..3a50b59 100644
--- a/src/constants/text_constants.asm
+++ b/src/constants/text_constants.asm
@@ -10,7 +10,7 @@ TX_FULLWIDTH3 EQU $03
; source: gfx/fonts/full_width/4.1bpp
TX_FULLWIDTH4 EQU $04
-TX_CTRL_BEGIN EQU $05
+TX_CTRL_START EQU $05
; usage: TX_SYMBOL, char1, TX_SYMBOL, char2, ...
; source: gfx/fonts/symbols.2bpp