pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Use a FIRST_UNOWN_CHAR constant for the Unown font

Browse Source
This commit is contained in:
Rangi 2020-05-06 10:34:51 -04:00
parent b69526a908
commit 905833ef8c
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
constants/text_constants.asm
View File

@ -44,3 +44,6 @@ PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F
; character sets (see charmap.asm) ; character sets (see charmap.asm)
FIRST_REGULAR_TEXT_CHAR EQU $60 FIRST_REGULAR_TEXT_CHAR EQU $60
FIRST_HIRAGANA_DAKUTEN_CHAR EQU $20 FIRST_HIRAGANA_DAKUTEN_CHAR EQU $20
; gfx/font/unown_font.png
FIRST_UNOWN_CHAR EQU $40

2
data/pokemon/unown_words.asm
View File

@ -1,7 +1,7 @@
unownword: MACRO unownword: MACRO
x = 1 x = 1
rept STRLEN(\1) rept STRLEN(\1)
db STRSUB(\1, x, 1) - "A" + $40 db STRSUB(\1, x, 1) - "A" + FIRST_UNOWN_CHAR
x = x + 1 x = x + 1
endr endr
db -1 db -1

6
engine/pokedex/pokedex.asm
View File

@ -887,7 +887,7 @@ Pokedex_UnownModeEraseCursor:
Pokedex_UnownModePlaceCursor: Pokedex_UnownModePlaceCursor:
ld a, [wDexCurUnownIndex] ld a, [wDexCurUnownIndex]
ld c, $5a ; diamond cursor ld c, FIRST_UNOWN_CHAR + NUM_UNOWN ; diamond cursor
Pokedex_UnownModeUpdateCursorGfx: Pokedex_UnownModeUpdateCursorGfx:
ld e, a ld e, a
@ -1333,7 +1333,7 @@ endr
ld h, [hl] ld h, [hl]
ld l, a ld l, a
pop af pop af
add $40 - 1 ; Unown A add FIRST_UNOWN_CHAR - 1 ; Unown A
ld [hl], a ld [hl], a
inc de inc de
inc b inc b
@ -2489,7 +2489,7 @@ Pokedex_LoadUnownFont:
ld bc, (NUM_UNOWN + 1) tiles ld bc, (NUM_UNOWN + 1) tiles
call Pokedex_InvertTiles call Pokedex_InvertTiles
ld de, sScratch + $188 ld de, sScratch + $188
ld hl, vTiles2 tile $40 ld hl, vTiles2 tile FIRST_UNOWN_CHAR
lb bc, BANK(Pokedex_LoadUnownFont), NUM_UNOWN + 1 lb bc, BANK(Pokedex_LoadUnownFont), NUM_UNOWN + 1
call Request2bpp call Request2bpp
call CloseSRAM call CloseSRAM