From d11cd5d217e1992229df23d13a50b0262dce4716 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 11 Feb 2020 03:11:39 -0500 Subject: [PATCH] Move text input strings to src --- data/text_input_strings.s | 146 -------------------------------------- ld_script.txt | 2 +- src/text_input_strings.c | 64 +++++++++++++++++ 3 files changed, 65 insertions(+), 147 deletions(-) delete mode 100644 data/text_input_strings.s create mode 100644 src/text_input_strings.c diff --git a/data/text_input_strings.s b/data/text_input_strings.s deleted file mode 100644 index bb4006a1f..000000000 --- a/data/text_input_strings.s +++ /dev/null @@ -1,146 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 - -gText_EasyChatKeyboard_ABCDEFothers:: @ 862B810 - .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$" - -gText_EasyChatKeyboard_GHIJKL:: @ 862B832 - .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$" - -gText_EasyChatKeyboard_MNOPQRS:: @ 862B84B - .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $" - -gText_EasyChatKeyboard_TUVWXYZ:: @ 862B86C - .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $" - -gText_NamingScreenKeyboard_abcdef:: @ 862B88D - .string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$" - -gText_NamingScreenKeyboard_ghijkl:: @ 862B8AE - .string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},$" - -gText_NamingScreenKeyboard_mnopqrs:: @ 862B8CF - .string "{CLEAR 11}m{CLEAR 6}n{CLEAR 6}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $" - -gText_NamingScreenKeyboard_tuvwxyz:: @ 862B8F0 - .string "{CLEAR 11}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $" - -gText_NamingScreenKeyboard_ABCDEF:: @ 862B911 - .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}.$" - -gText_NamingScreenKeyboard_GHIJKL:: @ 862B932 - .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},$" - -gText_NamingScreenKeyboard_MNOPQRS:: @ 862B953 - .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $" - -gText_NamingScreenKeyboard_TUVWXYZ:: @ 862B974 - .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $" - -gText_NamingScreenKeyboard_01234:: @ 862B995 - .string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $" - -gText_NamingScreenKeyboard_56789:: @ 862B9AE - .string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $" - -gText_NamingScreenKeyboard_Symbols1:: @ 862B9C7 - .string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$" - -gText_NamingScreenKeyboard_Symbols2:: @ 862B9E0 - .string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 19}'{CLEAR 18} $" - -gText_UnionRoomChatKeyboard_ABCDE:: @ 862B9F9 - .string "ABCDE$" - -gText_UnionRoomChatKeyboard_FGHIJ:: @ 862B9FF - .string "FGHIJ$" - -gText_UnionRoomChatKeyboard_KLMNO:: @ 862BA05 - .string "KLMNO$" - -gText_UnionRoomChatKeyboard_PQRST:: @ 862BA0B - .string "PQRST$" - -gText_UnionRoomChatKeyboard_UVWXY:: @ 862BA11 - .string "UVWXY$" - -gText_UnionRoomChatKeyboard_Z:: @ 862BA17 - .string "Z $" - -gText_UnionRoomChatKeyboard_01234Upper:: @ 862BA1D - .string "01234$" - -gText_UnionRoomChatKeyboard_56789Upper:: @ 862BA23 - .string "56789$" - -gText_UnionRoomChatKeyboard_PunctuationUpper:: @ 862BA29 - .string ".,!? $" - -gText_UnionRoomChatKeyboard_SymbolsUpper:: @ 862BA2F - .string "-/&… $" - -gText_UnionRoomChatKeyboard_abcde:: @ 862BA35 - .string "abcde$" - -gText_UnionRoomChatKeyboard_fghij:: @ 862BA3B - .string "fghij$" - -gText_UnionRoomChatKeyboard_klmno:: @ 862BA41 - .string "klmno$" - -gText_UnionRoomChatKeyboard_pqrst:: @ 862BA47 - .string "pqrst$" - -gText_UnionRoomChatKeyboard_uvwxy:: @ 862BA4D - .string "uvwxy$" - -gText_UnionRoomChatKeyboard_z:: @ 862BA53 - .string "z $" - -gText_UnionRoomChatKeyboard_01234Lower:: @ 862BA59 - .string "01234$" - -gText_UnionRoomChatKeyboard_56789Lower:: @ 862BA5F - .string "56789$" - -gText_UnionRoomChatKeyboard_PunctuationLower:: @ 862BA65 - .string ".,!? $" - -gText_UnionRoomChatKeyboard_SymbolsLower:: @ 862BA6B - .string "-/&… $" - - .string "$$$$$$$$" - -gText_UnionRoomChatKeyboard_Emoji1:: @ 862BA79 - .string "{EMOJI_MISCHIEVOUS}{EMOJI_HAPPY}{EMOJI_ANGRY}{EMOJI_SURPRISED}{EMOJI_BIGANGER}$" - -gText_UnionRoomChatKeyboard_Emoji2:: @ 862BA84 - .string "{EMOJI_BIGSMILE}{EMOJI_EVIL}{EMOJI_NEUTRAL}{EMOJI_TIRED}{EMOJI_SHOCKED}$" - -gText_UnionRoomChatKeyboard_Emoji3:: @ 862BA8F - .string "{EMOJI_LEAF}{EMOJI_FIRE}{EMOJI_WATER}{EMOJI_BOLT}{EMOJI_BALL}$" - -gText_UnionRoomChatKeyboard_Emoji4:: @ 862BA9A - .string "♂♀{EMOJI_LEFT_PAREN}{EMOJI_RIGHT_PAREN}{EMOJI_TILDE}$" - -gText_UnionRoomChatKeyboard_Emoji5:: @ 862BAA3 - .string "{EMOJI_LEFT_EYE}{EMOJI_RIGHT_EYE}{EMOJI_SMALLWHEEL}{EMOJI_SPHERE}{EMOJI_IRRITATED}$" - -gText_UnionRoomChatKeyboard_Emoji6:: @ 862BAAE - .string "{EMOJI_AT}{EMOJI_BIGWHEEL}{EMOJI_TONGUE}{EMOJI_ACUTE}{EMOJI_GRAVE}$" - -gText_UnionRoomChatKeyboard_Emoji7:: @ 862BAB9 - .string "{EMOJI_RIGHT_FIST}{EMOJI_LEFT_FIST}{EMOJI_TRIANGLE_OUTLINE}{EMOJI_UNION}{EMOJI_GREATER_THAN}$" - -gText_UnionRoomChatKeyboard_Emoji8:: @ 862BAC4 - .string "{EMOJI_CIRCLE}{EMOJI_TRIANGLE}{EMOJI_SQUARE}{EMOJI_HEART}{EMOJI_MOON}$" - -gText_UnionRoomChatKeyboard_Emoji9:: @ 862BACF - .string "{EMOJI_NOTE}{EMOJI_PLUS}{EMOJI_MINUS}{EMOJI_EQUALS}{EMOJI_PIPE}$" - -gText_UnionRoomChatKeyboard_Emoji10:: @ 862BADA - .string "{EMOJI_HIGHBAR}{EMOJI_UNDERSCORE};: $" diff --git a/ld_script.txt b/ld_script.txt index a2f9ba633..880b85b0a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -680,7 +680,7 @@ SECTIONS { src/walda_phrase.o(.rodata); src/gym_leader_rematch.o(.rodata); src/unk_transition.o(.rodata); - data/text_input_strings.o(.rodata); + src/text_input_strings.o(.rodata); data/fonts.o(.rodata); src/mystery_event_msg.o(.rodata); data/mystery_event.o(.rodata); diff --git a/src/text_input_strings.c b/src/text_input_strings.c new file mode 100644 index 000000000..0fdaa875e --- /dev/null +++ b/src/text_input_strings.c @@ -0,0 +1,64 @@ +#include "global.h" + +// Easy Chat keyboard +const u8 gText_EasyChatKeyboard_ABCDEFothers[] = _("{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others"); +const u8 gText_EasyChatKeyboard_GHIJKL[] = _("{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L"); +const u8 gText_EasyChatKeyboard_MNOPQRS[] = _("{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} "); +const u8 gText_EasyChatKeyboard_TUVWXYZ[] = _("{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} "); + +// Naming Screen keyboard +const u8 gText_NamingScreenKeyboard_abcdef[] = _("{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}."); +const u8 gText_NamingScreenKeyboard_ghijkl[] = _("{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},"); +const u8 gText_NamingScreenKeyboard_mnopqrs[] = _("{CLEAR 11}m{CLEAR 6}n{CLEAR 6}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} "); +const u8 gText_NamingScreenKeyboard_tuvwxyz[] = _("{CLEAR 11}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} "); +const u8 gText_NamingScreenKeyboard_ABCDEF[] = _("{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}."); +const u8 gText_NamingScreenKeyboard_GHIJKL[] = _("{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},"); +const u8 gText_NamingScreenKeyboard_MNOPQRS[] = _("{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} "); +const u8 gText_NamingScreenKeyboard_TUVWXYZ[] = _("{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} "); +const u8 gText_NamingScreenKeyboard_01234[] = _("{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} "); +const u8 gText_NamingScreenKeyboard_56789[] = _("{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} "); +const u8 gText_NamingScreenKeyboard_Symbols1[] = _("{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-"); +const u8 gText_NamingScreenKeyboard_Symbols2[] = _("{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 19}'{CLEAR 18} "); + +// Union Room Chat keyboard +const u8 gText_UnionRoomChatKeyboard_ABCDE[] = _("ABCDE"); +const u8 gText_UnionRoomChatKeyboard_FGHIJ[] = _("FGHIJ"); +const u8 gText_UnionRoomChatKeyboard_KLMNO[] = _("KLMNO"); +const u8 gText_UnionRoomChatKeyboard_PQRST[] = _("PQRST"); +const u8 gText_UnionRoomChatKeyboard_UVWXY[] = _("UVWXY"); +const u8 gText_UnionRoomChatKeyboard_Z[] = _("Z "); +const u8 gText_UnionRoomChatKeyboard_01234Upper[] = _("01234"); +const u8 gText_UnionRoomChatKeyboard_56789Upper[] = _("56789"); +const u8 gText_UnionRoomChatKeyboard_PunctuationUpper[] = _(".,!? "); +const u8 gText_UnionRoomChatKeyboard_SymbolsUpper[] = _("-/&… "); +const u8 gText_UnionRoomChatKeyboard_abcde[] = _("abcde"); +const u8 gText_UnionRoomChatKeyboard_fghij[] = _("fghij"); +const u8 gText_UnionRoomChatKeyboard_klmno[] = _("klmno"); +const u8 gText_UnionRoomChatKeyboard_pqrst[] = _("pqrst"); +const u8 gText_UnionRoomChatKeyboard_uvwxy[] = _("uvwxy"); +const u8 gText_UnionRoomChatKeyboard_z[] = _("z "); +const u8 gText_UnionRoomChatKeyboard_01234Lower[] = _("01234"); +const u8 gText_UnionRoomChatKeyboard_56789Lower[] = _("56789"); +const u8 gText_UnionRoomChatKeyboard_PunctuationLower[] = _(".,!? "); +const u8 gText_UnionRoomChatKeyboard_SymbolsLower[] = _("-/&… "); + +const u8 gText_EmptyTextInput1[] = _(""); +const u8 gText_EmptyTextInput2[] = _(""); +const u8 gText_EmptyTextInput3[] = _(""); +const u8 gText_EmptyTextInput4[] = _(""); +const u8 gText_EmptyTextInput5[] = _(""); +const u8 gText_EmptyTextInput6[] = _(""); +const u8 gText_EmptyTextInput7[] = _(""); +const u8 gText_EmptyTextInput8[] = _(""); + +// Union Room Chat keyboard emojis +const u8 gText_UnionRoomChatKeyboard_Emoji1[] = _("{EMOJI_MISCHIEVOUS}{EMOJI_HAPPY}{EMOJI_ANGRY}{EMOJI_SURPRISED}{EMOJI_BIGANGER}"); +const u8 gText_UnionRoomChatKeyboard_Emoji2[] = _("{EMOJI_BIGSMILE}{EMOJI_EVIL}{EMOJI_NEUTRAL}{EMOJI_TIRED}{EMOJI_SHOCKED}"); +const u8 gText_UnionRoomChatKeyboard_Emoji3[] = _("{EMOJI_LEAF}{EMOJI_FIRE}{EMOJI_WATER}{EMOJI_BOLT}{EMOJI_BALL}"); +const u8 gText_UnionRoomChatKeyboard_Emoji4[] = _("♂♀{EMOJI_LEFT_PAREN}{EMOJI_RIGHT_PAREN}{EMOJI_TILDE}"); +const u8 gText_UnionRoomChatKeyboard_Emoji5[] = _("{EMOJI_LEFT_EYE}{EMOJI_RIGHT_EYE}{EMOJI_SMALLWHEEL}{EMOJI_SPHERE}{EMOJI_IRRITATED}"); +const u8 gText_UnionRoomChatKeyboard_Emoji6[] = _("{EMOJI_AT}{EMOJI_BIGWHEEL}{EMOJI_TONGUE}{EMOJI_ACUTE}{EMOJI_GRAVE}"); +const u8 gText_UnionRoomChatKeyboard_Emoji7[] = _("{EMOJI_RIGHT_FIST}{EMOJI_LEFT_FIST}{EMOJI_TRIANGLE_OUTLINE}{EMOJI_UNION}{EMOJI_GREATER_THAN}"); +const u8 gText_UnionRoomChatKeyboard_Emoji8[] = _("{EMOJI_CIRCLE}{EMOJI_TRIANGLE}{EMOJI_SQUARE}{EMOJI_HEART}{EMOJI_MOON}"); +const u8 gText_UnionRoomChatKeyboard_Emoji9[] = _("{EMOJI_NOTE}{EMOJI_PLUS}{EMOJI_MINUS}{EMOJI_EQUALS}{EMOJI_PIPE}"); +const u8 gText_UnionRoomChatKeyboard_Emoji10[] = _("{EMOJI_HIGHBAR}{EMOJI_UNDERSCORE};: ");