ref: 905833ef8c4ffeffffdafb3a23628521279e87e0
parent: b69526a90818e0ac103274c6d8d3f424f49f207c
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Wed May 6 06:34:51 EDT 2020
Use a FIRST_UNOWN_CHAR constant for the Unown font
--- a/constants/text_constants.asm
+++ b/constants/text_constants.asm
@@ -44,3 +44,6 @@
; character sets (see charmap.asm)
FIRST_REGULAR_TEXT_CHAR EQU $60
FIRST_HIRAGANA_DAKUTEN_CHAR EQU $20
+
+; gfx/font/unown_font.png
+FIRST_UNOWN_CHAR EQU $40
--- a/data/pokemon/unown_words.asm
+++ b/data/pokemon/unown_words.asm
@@ -1,7 +1,7 @@
unownword: MACRO
x = 1
rept STRLEN(\1)
- db STRSUB(\1, x, 1) - "A" + $40
+ db STRSUB(\1, x, 1) - "A" + FIRST_UNOWN_CHAR
x = x + 1
endr
db -1
--- a/engine/pokedex/pokedex.asm
+++ b/engine/pokedex/pokedex.asm
@@ -887,7 +887,7 @@
Pokedex_UnownModePlaceCursor:
ld a, [wDexCurUnownIndex]
- ld c, $5a ; diamond cursor
+ ld c, FIRST_UNOWN_CHAR + NUM_UNOWN ; diamond cursor
Pokedex_UnownModeUpdateCursorGfx:
ld e, a
@@ -1333,7 +1333,7 @@
ld h, [hl]
ld l, a
pop af
- add $40 - 1 ; Unown A
+ add FIRST_UNOWN_CHAR - 1 ; Unown A
ld [hl], a
inc de
inc b
@@ -2489,7 +2489,7 @@
ld bc, (NUM_UNOWN + 1) tiles
call Pokedex_InvertTiles
ld de, sScratch + $188
- ld hl, vTiles2 tile $40
+ ld hl, vTiles2 tile FIRST_UNOWN_CHAR
lb bc, BANK(Pokedex_LoadUnownFont), NUM_UNOWN + 1
call Request2bpp
call CloseSRAM