diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-05-06 10:34:51 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-05-06 10:34:51 -0400 |
| commit | 905833ef8c4ffeffffdafb3a23628521279e87e0 (patch) | |
| tree | fa3c85265811598e4f0162f055fbfcfbf64c30c9 | |
| parent | b69526a90818e0ac103274c6d8d3f424f49f207c (diff) | |
Use a FIRST_UNOWN_CHAR constant for the Unown font
| -rw-r--r-- | constants/text_constants.asm | 3 | ||||
| -rw-r--r-- | data/pokemon/unown_words.asm | 2 | ||||
| -rw-r--r-- | engine/pokedex/pokedex.asm | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/constants/text_constants.asm b/constants/text_constants.asm index f1c3a0bf7..dbe06a36b 100644 --- a/constants/text_constants.asm +++ b/constants/text_constants.asm @@ -44,3 +44,6 @@ PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F ; 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 diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm index 444c48d88..6ddd0f466 100644 --- 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 diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 6f500bc37..e60ba1450 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -887,7 +887,7 @@ Pokedex_UnownModeEraseCursor: 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 @@ endr 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 @@ Pokedex_LoadUnownFont: 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 |