From 0c47cd6fc3723bffce2d36c41ab601eab8831626 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 24 Jan 2018 00:18:10 -0600 Subject: Renamed link_strings and fixed warning in fldeff_cut.s --- data/fldeff_cut.s | 2 +- data/link_strings.s | 96 ---------------------------- data/naming_screen_strings.s | 54 ---------------- data/text_input_strings.s | 146 +++++++++++++++++++++++++++++++++++++++++++ ld_script.txt | 3 +- src/naming_screen.c | 4 +- 6 files changed, 150 insertions(+), 155 deletions(-) delete mode 100644 data/link_strings.s delete mode 100644 data/naming_screen_strings.s create mode 100644 data/text_input_strings.s diff --git a/data/fldeff_cut.s b/data/fldeff_cut.s index 9fea73f9a..ee5a09c37 100644 --- a/data/fldeff_cut.s +++ b/data/fldeff_cut.s @@ -6,7 +6,7 @@ gUnknown_0857C608:: @ 857C608 .byte 0xfe, 0xfe, 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00 - .byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, + .byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00 gUnknown_0857C648:: @ 857C648 .2byte 0 diff --git a/data/link_strings.s b/data/link_strings.s deleted file mode 100644 index f03c0895d..000000000 --- a/data/link_strings.s +++ /dev/null @@ -1,96 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_0862B9F9:: @ 862B9F9 - .string "ABCDE$" - -gUnknown_0862B9FF:: @ 862B9FF - .string "FGHIJ$" - -gUnknown_0862BA05:: @ 862BA05 - .string "KLMNO$" - -gUnknown_0862BA0B:: @ 862BA0B - .string "PQRST$" - -gUnknown_0862BA11:: @ 862BA11 - .string "UVWXY$" - -gUnknown_0862BA17:: @ 862BA17 - .string "Z $" - -gUnknown_0862BA1D:: @ 862BA1D - .string "01234$" - -gUnknown_0862BA23:: @ 862BA23 - .string "56789$" - -gUnknown_0862BA29:: @ 862BA29 - .string ".,!? $" - -gUnknown_0862BA2F:: @ 862BA2F - .string "-/&… $" - -gUnknown_0862BA35:: @ 862BA35 - .string "abcde$" - -gUnknown_0862BA3B:: @ 862BA3B - .string "fghij$" - -gUnknown_0862BA41:: @ 862BA41 - .string "klmno$" - -gUnknown_0862BA47:: @ 862BA47 - .string "pqrst$" - -gUnknown_0862BA4D:: @ 862BA4D - .string "uvwxy$" - -gUnknown_0862BA53:: @ 862BA53 - .string "z $" - -gUnknown_0862BA59:: @ 862BA59 - .string "01234$" - -gUnknown_0862BA5F:: @ 862BA5F - .string "56789$" - -gUnknown_0862BA65:: @ 862BA65 - .string ".,!? $" - -gUnknown_0862BA6B:: @ 862BA6B - .string "-/&… $" - - .string "$$$$$$$$" - -gUnknown_0862BA79:: @ 862BA79 - .string "{UNK_CTRL_F9 245}{UNK_CTRL_F9 246}{UNK_CTRL_F9 247}{UNK_CTRL_F9 248}{UNK_CTRL_F9 254}$" - -gUnknown_0862BA84:: @ 862BA84 - .string "{UNK_CTRL_F9 249}{UNK_CTRL_F9 250}{UNK_CTRL_F9 252}{UNK_CTRL_F9 251}{UNK_CTRL_F9 253}$" - -gUnknown_0862BA8F:: @ 862BA8F - .string "{UNK_CTRL_F9 236}{UNK_CTRL_F9 237}{UNK_CTRL_F9 238}{UNK_CTRL_F9 235}{UNK_CTRL_F9 234}$" - -gUnknown_0862BA9A:: @ 862BA9A - .string "♂♀{UNK_CTRL_F9 212}{UNK_CTRL_F9 213}{UNK_CTRL_F9 211}$" - -gUnknown_0862BAA3:: @ 862BAA3 - .string "{UNK_CTRL_F9 216}{UNK_CTRL_F9 217}{UNK_CTRL_F9 242}{UNK_CTRL_F9 243}{UNK_CTRL_F9 244}$" - -gUnknown_0862BAAE:: @ 862BAAE - .string "{UNK_CTRL_F9 218}{UNK_CTRL_F9 241}{UNK_CTRL_F9 224}{UNK_CTRL_F9 226}{UNK_CTRL_F9 227}$" - -gUnknown_0862BAB9:: @ 862BAB9 - .string "{UNK_CTRL_F9 240}{UNK_CTRL_F9 239}{UNK_CTRL_F9 225}{UNK_CTRL_F9 214}{UNK_CTRL_F9 215}$" - -gUnknown_0862BAC4:: @ 862BAC4 - .string "{UNK_CTRL_F9 228}{UNK_CTRL_F9 229}{UNK_CTRL_F9 230}{UNK_CTRL_F9 231}{UNK_CTRL_F9 232}$" - -gUnknown_0862BACF:: @ 862BACF - .string "{UNK_CTRL_F9 233}{UNK_CTRL_F9 220}{UNK_CTRL_F9 221}{UNK_CTRL_F9 222}{UNK_CTRL_F9 209}$" - -gUnknown_0862BADA:: @ 862BADA - .string "{UNK_CTRL_F9 210}{UNK_CTRL_F9 208}ょ: $" diff --git a/data/naming_screen_strings.s b/data/naming_screen_strings.s deleted file mode 100644 index b2ee9767b..000000000 --- a/data/naming_screen_strings.s +++ /dev/null @@ -1,54 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 - -gUnknown_862B810:: @ 862B810 - .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$" - -gUnknown_862B832:: @ 862B832 - .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$" - -gUnknown_862B84B:: @ 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} $" - -gUnknown_862B86C:: @ 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} $" - -gUnknown_0862B88D:: @ 862B88D - .string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$" - -gUnknown_0862B8AE:: @ 862B8AE - .string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},$" - -gUnknown_0862B8CF:: @ 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} $" - -gUnknown_0862B8F0:: @ 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} $" - -gUnknown_0862B911:: @ 862B911 - .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}.$" - -gUnknown_0862B932:: @ 862B932 - .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},$" - -gUnknown_0862B953:: @ 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} $" - -gUnknown_0862B974:: @ 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} $" - -gUnknown_0862B995:: @ 862B995 - .string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $" - -gUnknown_0862B9AE:: @ 862B9AE - .string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $" - -gUnknown_0862B9C7:: @ 862B9C7 - .string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$" - -gUnknown_0862B9E0:: @ 862B9E0 - .string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 19}’{CLEAR 18} $" diff --git a/data/text_input_strings.s b/data/text_input_strings.s new file mode 100644 index 000000000..7219051a7 --- /dev/null +++ b/data/text_input_strings.s @@ -0,0 +1,146 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 + +gUnknown_862B810:: @ 862B810 + .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$" + +gUnknown_862B832:: @ 862B832 + .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$" + +gUnknown_862B84B:: @ 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} $" + +gUnknown_862B86C:: @ 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} $" + +gUnknown_0862B88D:: @ 862B88D + .string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$" + +gUnknown_0862B8AE:: @ 862B8AE + .string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},$" + +gUnknown_0862B8CF:: @ 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} $" + +gUnknown_0862B8F0:: @ 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} $" + +gUnknown_0862B911:: @ 862B911 + .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}.$" + +gUnknown_0862B932:: @ 862B932 + .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},$" + +gUnknown_0862B953:: @ 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} $" + +gUnknown_0862B974:: @ 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} $" + +gUnknown_0862B995:: @ 862B995 + .string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $" + +gUnknown_0862B9AE:: @ 862B9AE + .string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $" + +gUnknown_0862B9C7:: @ 862B9C7 + .string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$" + +gUnknown_0862B9E0:: @ 862B9E0 + .string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 19}’{CLEAR 18} $" + +gUnknown_0862B9F9:: @ 862B9F9 + .string "ABCDE$" + +gUnknown_0862B9FF:: @ 862B9FF + .string "FGHIJ$" + +gUnknown_0862BA05:: @ 862BA05 + .string "KLMNO$" + +gUnknown_0862BA0B:: @ 862BA0B + .string "PQRST$" + +gUnknown_0862BA11:: @ 862BA11 + .string "UVWXY$" + +gUnknown_0862BA17:: @ 862BA17 + .string "Z $" + +gUnknown_0862BA1D:: @ 862BA1D + .string "01234$" + +gUnknown_0862BA23:: @ 862BA23 + .string "56789$" + +gUnknown_0862BA29:: @ 862BA29 + .string ".,!? $" + +gUnknown_0862BA2F:: @ 862BA2F + .string "-/&… $" + +gUnknown_0862BA35:: @ 862BA35 + .string "abcde$" + +gUnknown_0862BA3B:: @ 862BA3B + .string "fghij$" + +gUnknown_0862BA41:: @ 862BA41 + .string "klmno$" + +gUnknown_0862BA47:: @ 862BA47 + .string "pqrst$" + +gUnknown_0862BA4D:: @ 862BA4D + .string "uvwxy$" + +gUnknown_0862BA53:: @ 862BA53 + .string "z $" + +gUnknown_0862BA59:: @ 862BA59 + .string "01234$" + +gUnknown_0862BA5F:: @ 862BA5F + .string "56789$" + +gUnknown_0862BA65:: @ 862BA65 + .string ".,!? $" + +gUnknown_0862BA6B:: @ 862BA6B + .string "-/&… $" + + .string "$$$$$$$$" + +gUnknown_0862BA79:: @ 862BA79 + .string "{UNK_CTRL_F9 245}{UNK_CTRL_F9 246}{UNK_CTRL_F9 247}{UNK_CTRL_F9 248}{UNK_CTRL_F9 254}$" + +gUnknown_0862BA84:: @ 862BA84 + .string "{UNK_CTRL_F9 249}{UNK_CTRL_F9 250}{UNK_CTRL_F9 252}{UNK_CTRL_F9 251}{UNK_CTRL_F9 253}$" + +gUnknown_0862BA8F:: @ 862BA8F + .string "{UNK_CTRL_F9 236}{UNK_CTRL_F9 237}{UNK_CTRL_F9 238}{UNK_CTRL_F9 235}{UNK_CTRL_F9 234}$" + +gUnknown_0862BA9A:: @ 862BA9A + .string "♂♀{UNK_CTRL_F9 212}{UNK_CTRL_F9 213}{UNK_CTRL_F9 211}$" + +gUnknown_0862BAA3:: @ 862BAA3 + .string "{UNK_CTRL_F9 216}{UNK_CTRL_F9 217}{UNK_CTRL_F9 242}{UNK_CTRL_F9 243}{UNK_CTRL_F9 244}$" + +gUnknown_0862BAAE:: @ 862BAAE + .string "{UNK_CTRL_F9 218}{UNK_CTRL_F9 241}{UNK_CTRL_F9 224}{UNK_CTRL_F9 226}{UNK_CTRL_F9 227}$" + +gUnknown_0862BAB9:: @ 862BAB9 + .string "{UNK_CTRL_F9 240}{UNK_CTRL_F9 239}{UNK_CTRL_F9 225}{UNK_CTRL_F9 214}{UNK_CTRL_F9 215}$" + +gUnknown_0862BAC4:: @ 862BAC4 + .string "{UNK_CTRL_F9 228}{UNK_CTRL_F9 229}{UNK_CTRL_F9 230}{UNK_CTRL_F9 231}{UNK_CTRL_F9 232}$" + +gUnknown_0862BACF:: @ 862BACF + .string "{UNK_CTRL_F9 233}{UNK_CTRL_F9 220}{UNK_CTRL_F9 221}{UNK_CTRL_F9 222}{UNK_CTRL_F9 209}$" + +gUnknown_0862BADA:: @ 862BADA + .string "{UNK_CTRL_F9 210}{UNK_CTRL_F9 208}ょ: $" diff --git a/ld_script.txt b/ld_script.txt index fff1b32ef..f2a9d8196 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -540,8 +540,7 @@ SECTIONS { data/trainer_rematch.o(.rodata); data/unk_transition.o(.rodata); src/unk_transition.o(.rodata); - data/naming_screen_strings.o(.rodata); - data/link_strings.o(.rodata); + data/text_input_strings.o(.rodata); data/fonts.o(.rodata); src/mystery_event_msg.o(.rodata); data/mystery_event_msg.o(.rodata); diff --git a/src/naming_screen.c b/src/naming_screen.c index 889956560..54b6f0bb9 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1738,10 +1738,10 @@ static void sub_80E4E5C(void) static void sub_80E4EF0(void) { - const u8 arr[] = { 15, 1, 2 }; + const struct TextColor color[] = { 15, 1, 2 }; FillWindowPixelBuffer(gNamingScreenData->windows[4], 0xFF); - box_print(gNamingScreenData->windows[4], 0, 2, 1, arr, 0, gText_MoveOkBack); + box_print(gNamingScreenData->windows[4], 0, 2, 1, color, 0, gText_MoveOkBack); PutWindowTilemap(gNamingScreenData->windows[4]); CopyWindowToVram(gNamingScreenData->windows[4], 3); } -- cgit v1.2.3