dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1513 from GriffinRichards/fix-keyboarchars

Browse Source 
Convert sKeyboardChars to 3D array
This commit is contained in:
GriffinR
2021-10-11 11:47:30 -04:00
committed by GitHub
parent e26f9d10d7 a556856ce9
commit f55a8cb688
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/naming_screen.c
+21 -14
View File
@@ -286,19 +286,26 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] =
// This handles what characters get inserted when a key is pressed // This handles what characters get inserted when a key is pressed
// The keys shown on the keyboard are handled separately by sNamingScreenKeyboardText // The keys shown on the keyboard are handled separately by sNamingScreenKeyboardText
static const u8 sKeyboardChars[KBPAGE_COUNT * KBROW_COUNT * KBCOL_COUNT] = __( static const u8 sKeyboardChars[KBPAGE_COUNT][KBROW_COUNT][KBCOL_COUNT] = {
"abcdef ." [KEYBOARD_LETTERS_LOWER] = {
"ghijkl ," __("abcdef ."),
"mnopqrs " __("ghijkl ,"),
"tuvwxyz " __("mnopqrs "),
"ABCDEF ." __("tuvwxyz "),
"GHIJKL ," },
"MNOPQRS " [KEYBOARD_LETTERS_UPPER] = {
"TUVWXYZ " __("ABCDEF ."),
"01234 " __("GHIJKL ,"),
"56789 " __("MNOPQRS "),
"!?♂♀/- " __("TUVWXYZ "),
"…“”‘' "); },
[KEYBOARD_SYMBOLS] = {
__("01234 "),
__("56789 "),
__("!?♂♀/- "),
__("…“”‘' "),
}
};
static const u8 sPageColumnCounts[KBPAGE_COUNT] = { static const u8 sPageColumnCounts[KBPAGE_COUNT] = {
[KEYBOARD_LETTERS_LOWER] = KBCOL_COUNT, [KEYBOARD_LETTERS_LOWER] = KBCOL_COUNT,
@@ -1780,7 +1787,7 @@ static void DrawGenderIcon(void)
static u8 GetCharAtKeyboardPos(s16 x, s16 y) static u8 GetCharAtKeyboardPos(s16 x, s16 y)
{ {
return sKeyboardChars[x + y * KBCOL_COUNT + CurrentPageToKeyboardId() * KBCOL_COUNT * KBROW_COUNT]; return sKeyboardChars[CurrentPageToKeyboardId()][y][x];
} }