Redesign TX_SYMBOL constants

2 files changed, 65 insertions, 59 deletions

diff --git a/src/constants/hardware_constants.asm b/src/constants/hardware_constants.asm
index 098b569..a93e250 100644
--- a/src/constants/hardware_constants.asm
+++ b/src/constants/hardware_constants.asm
@@ -1,7 +1,9 @@
-; From http://nocash.emubase.de/pandocs.htm.
+; From http://bgb.bircd.org/pandocs.htm
 
 GBC EQU $11
 
+LY_VBLANK EQU 145
+
 ; MBC3
 MBC3SRamEnable EQU $0000
 MBC3RomBank    EQU $2000
@@ -30,8 +32,6 @@ TIMER    EQU 2
 SERIAL   EQU 3
 JOYPAD   EQU 4
 
-LY_VBLANK EQU 145
-
 ; OAM attribute flags
 OAM_PALETTE   EQU %111
 OAM_TILE_BANK EQU 3
@@ -44,18 +44,18 @@ OAM_PRIORITY  EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3)
 rJOYP       EQU $ff00 ; Joypad (R/W)
 rSB         EQU $ff01 ; Serial transfer data (R/W)
 rSC         EQU $ff02 ; Serial Transfer Control (R/W)
-rSC_ON    EQU 7
-rSC_CGB   EQU 1
-rSC_CLOCK EQU 0
+SC_ON    EQU 7
+SC_CGB   EQU 1
+SC_CLOCK EQU 0
 rDIV        EQU $ff04 ; Divider Register (R/W)
 rTIMA       EQU $ff05 ; Timer counter (R/W)
 rTMA        EQU $ff06 ; Timer Modulo (R/W)
 rTAC        EQU $ff07 ; Timer Control (R/W)
-rTAC_ON        EQU 2
-rTAC_4096_HZ   EQU 0
-rTAC_262144_HZ EQU 1
-rTAC_65536_HZ  EQU 2
-rTAC_16384_HZ  EQU 3
+TAC_ON        EQU 2
+TAC_4096_HZ   EQU 0
+TAC_262144_HZ EQU 1
+TAC_65536_HZ  EQU 2
+TAC_16384_HZ  EQU 3
 rIF         EQU $ff0f ; Interrupt Flag (R/W)
 rNR10       EQU $ff10 ; Channel 1 Sweep register (R/W)
 rNR11       EQU $ff11 ; Channel 1 Sound length/Wave pattern duty (R/W)
@@ -79,8 +79,7 @@ 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)
-rLCDC_ENABLE EQU 7
-rLCDC_ENABLE_MASK EQU 1 << rLCDC_ENABLE
+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)
diff --git a/src/constants/text_constants.asm b/src/constants/text_constants.asm
index 38f4e9b..92554af 100644
--- a/src/constants/text_constants.asm
+++ b/src/constants/text_constants.asm
@@ -17,49 +17,56 @@ done EQUS "db TX_END"
 
 ; TX_SYMBOL (full-tile icons/symbols loaded at the beginning of v0Tiles2)
 ; TODO: Use symbols in menus (cursor tile number, tile behind cursor), draw text boxes, WriteByteToBGMap0, etc
-	charmap "<",     TX_SYMBOL
-	charmap " >",          $00
-	charmap "FIRE>",       $01
-	charmap "GRASS>",      $02
-	charmap "LIGHTNING>",  $03
-	charmap "WATER>",      $04
-	charmap "FIGHTING>",   $05
-	charmap "PSYCHIC>",    $06
-	charmap "COLORLESS>",  $07
-	charmap "POISONED>",   $08
-	charmap "ASLEEP>",     $09
-	charmap "CONFUSED>",   $0a
-	charmap "PARALYZED>",  $0b
-	charmap "△>",          $0c
-	charmap "PKMN_ICON>",  $0d ; icon displayed along with no. of Pkmn in duel screen
-;	charmap                $0e
-	charmap "▷>",          $0f
-	charmap "HP>",         $10
-	charmap "Lv>",         $11
-	charmap "E>",          $12
-	charmap "No>",         $13
-	charmap "PLUSPOWER>",  $14
-	charmap "DEFENDER>",   $15
-	charmap "🌕>",          $16 ; HP tile
-	charmap "🌑>",          $17 ; HP tile with damage counter
-	charmap "╔>",          $18
-	charmap "╗>",          $19
-	charmap "╚>",          $1a
-	charmap "╝>",          $1b
-	charmap "TOP ═>",      $1c
-	charmap "BOTTOM ═>",   $1d
-	charmap "LEFT ║>",     $1e
-	charmap "RIGHT ║>",    $1f
-	charmap "0>",          $20
-	charmap "1>",          $21
-	charmap "2>",          $22
-	charmap "3>",          $23
-	charmap "4>",          $24
-	charmap "5>",          $25
-	charmap "6>",          $26
-	charmap "7>",          $27
-	charmap "8>",          $28
-	charmap "9>",          $29
-	charmap "+>",          $2b
-	charmap "▽>",          $2f
-	charmap "PRIZE_ICON>", $30 ; icon displayed along with no. of prizes in duel screen
+;       If user-defined functions ever become a thing a symbol(*) syntax would probably be preferred over SYM_*
+
+	charmap "<", TX_SYMBOL
+	const_def
+	txsymbol SPACE
+	txsymbol FIRE
+	txsymbol GRASS
+	txsymbol LIGHTNING
+	txsymbol WATER
+	txsymbol FIGHTING
+	txsymbol PSYCHIC
+	txsymbol COLORLESS
+	txsymbol POISONED
+	txsymbol ASLEEP
+	txsymbol CONFUSED
+	txsymbol PARALYZED
+	txsymbol CURSOR_U
+	txsymbol POKEMON
+	txsymbol UNKNOWN_0E
+	txsymbol CURSOR_R
+	txsymbol HP
+	txsymbol Lv
+	txsymbol E
+	txsymbol No
+	txsymbol PLUSPOWER
+	txsymbol DEFENDER
+	txsymbol HP_OK
+	txsymbol HP_NOK
+	txsymbol BOX_TOP_L
+	txsymbol BOX_TOP_R
+	txsymbol BOX_BTM_L
+	txsymbol BOX_BTM_R
+	txsymbol BOX_TOP
+	txsymbol BOX_BOTTOM
+	txsymbol BOX_LEFT
+	txsymbol BOX_RIGHT
+	txsymbol 0
+	txsymbol 1
+	txsymbol 2
+	txsymbol 3
+	txsymbol 4
+	txsymbol 5
+	txsymbol 6
+	txsymbol 7
+	txsymbol 8
+	txsymbol 9
+	txsymbol DOT
+	txsymbol PLUS
+	txsymbol MINUS
+	txsymbol x
+	txsymbol SLASH
+	txsymbol CURSOR_D
+	txsymbol PRIZE