dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

standardize "grey" to "gray"

Browse Source
This commit is contained in:
Kurausukun
2021-04-09 22:34:08 -04:00
parent 52c25bac8e
commit 4b182affb6
35 changed files with 201 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
berry_fix/charmap.txt
+2 -2
View File
@@ -434,8 +434,8 @@ RESUME_MUSIC = FC 18
TRANSPARENT = 00 TRANSPARENT = 00
WHITE = 01 WHITE = 01
DARK_GREY = 02 DARK_GRAY = 02
LIGHT_GREY = 03 LIGHT_GRAY = 03
RED = 04 RED = 04
LIGHT_RED = 05 LIGHT_RED = 05
GREEN = 06 GREEN = 06
berry_fix/payload/charmap.txt
+2 -2
View File
@@ -434,8 +434,8 @@ RESUME_MUSIC = FC 18
TRANSPARENT = 00 TRANSPARENT = 00
WHITE = 01 WHITE = 01
DARK_GREY = 02 DARK_GRAY = 02
LIGHT_GREY = 03 LIGHT_GRAY = 03
RED = 04 RED = 04
LIGHT_RED = 05 LIGHT_RED = 05
GREEN = 06 GREEN = 06
charmap.txt
+2 -2
View File
@@ -451,8 +451,8 @@ BIG = FC 06 04
TRANSPARENT = 00 TRANSPARENT = 00
WHITE = 01 WHITE = 01
DARK_GREY = 02 DARK_GRAY = 02
LIGHT_GREY = 03 LIGHT_GRAY = 03
RED = 04 RED = 04
LIGHT_RED = 05 LIGHT_RED = 05
GREEN = 06 GREEN = 06
data/text/fame_checker.inc
+112 -112
View File
@@ -1,28 +1,28 @@
gFameCheckerFlavorText_ProfOak0:: @ 0x81AD106 gFameCheckerFlavorText_ProfOak0:: @ 0x81AD106
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}OAK POKéMON RESEARCH LAB$" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}OAK POKéMON RESEARCH LAB$"
gFameCheckerFlavorText_ProfOak1:: @ 0x81AD145 gFameCheckerFlavorText_ProfOak1:: @ 0x81AD145
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}To make a complete guide on all\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}To make a complete guide on all\n"
.string "the POKéMON in the world…\p" .string "the POKéMON in the world…\p"
.string "That was my dream!$" .string "That was my dream!$"
gFameCheckerFlavorText_ProfOak2:: @ 0x81AD1BB gFameCheckerFlavorText_ProfOak2:: @ 0x81AD1BB
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}PROF. OAK may not look like much,\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK may not look like much,\n"
.string "but he's the authority on POKéMON.\p" .string "but he's the authority on POKéMON.\p"
.string "Many POKéMON TRAINERS hold him in\n" .string "Many POKéMON TRAINERS hold him in\n"
.string "high regard.$" .string "high regard.$"
gFameCheckerFlavorText_ProfOak3:: @ 0x81AD258 gFameCheckerFlavorText_ProfOak3:: @ 0x81AD258
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}PROF. OAK reportedly lives with his\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK reportedly lives with his\n"
.string "grandchildren, DAISY and {RIVAL}.$" .string "grandchildren, DAISY and {RIVAL}.$"
gFameCheckerFlavorText_ProfOak4:: @ 0x81AD2B9 gFameCheckerFlavorText_ProfOak4:: @ 0x81AD2B9
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I hear OAK's taken a lot of\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear OAK's taken a lot of\n"
.string "interest in you, child.\p" .string "interest in you, child.\p"
.string "That old duff was once tough and\n" .string "That old duff was once tough and\n"
.string "handsome.\p" .string "handsome.\p"
@@ -31,57 +31,57 @@ gFameCheckerFlavorText_ProfOak4:: @ 0x81AD2B9
gFameCheckerFlavorText_ProfOak5:: @ 0x81AD377 gFameCheckerFlavorText_ProfOak5:: @ 0x81AD377
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}PROF. OAK is going to have his own\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK is going to have his own\n"
.string "radio show soon.\p" .string "radio show soon.\p"
.string "The program will be called PROF.\n" .string "The program will be called PROF.\n"
.string "OAK'S POKéMON SEMINAR.$" .string "OAK'S POKéMON SEMINAR.$"
gFameCheckerFlavorText_Daisy0:: @ 0x81AD40C gFameCheckerFlavorText_Daisy0:: @ 0x81AD40C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}If you show DAISY your POKéMON,\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}If you show DAISY your POKéMON,\n"
.string "she can tell how much it likes you.\p" .string "she can tell how much it likes you.\p"
.string "Occasionally, she will even groom\n" .string "Occasionally, she will even groom\n"
.string "a POKéMON for you.$" .string "a POKéMON for you.$"
gFameCheckerFlavorText_Daisy1:: @ 0x81AD4AE gFameCheckerFlavorText_Daisy1:: @ 0x81AD4AE
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}But the person who is most liked by\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}But the person who is most liked by\n"
.string "POKéMON is DAISY, I think.$" .string "POKéMON is DAISY, I think.$"
gFameCheckerFlavorText_Daisy2:: @ 0x81AD516 gFameCheckerFlavorText_Daisy2:: @ 0x81AD516
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}She was gently grooming POKéMON…\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}She was gently grooming POKéMON…\n"
.string "She was a little angel.\p" .string "She was a little angel.\p"
.string "That little girl's name…\n" .string "That little girl's name…\n"
.string "I think it was DAISY.$" .string "I think it was DAISY.$"
gFameCheckerFlavorText_Daisy3:: @ 0x81AD5A7 gFameCheckerFlavorText_Daisy3:: @ 0x81AD5A7
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}PROF. OAK reportedly lives with his\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK reportedly lives with his\n"
.string "grandchildren, DAISY and {RIVAL}.$" .string "grandchildren, DAISY and {RIVAL}.$"
gFameCheckerFlavorText_Daisy4:: @ 0x81AD608 gFameCheckerFlavorText_Daisy4:: @ 0x81AD608
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}A girl from PALLET TOWN, DAISY,\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}A girl from PALLET TOWN, DAISY,\n"
.string "she enjoys TEA every day.\p" .string "she enjoys TEA every day.\p"
.string "She visits the CELADON DEPT. STORE\n" .string "She visits the CELADON DEPT. STORE\n"
.string "to buy some TEA.$" .string "to buy some TEA.$"
gFameCheckerFlavorText_Daisy5:: @ 0x81AD69F gFameCheckerFlavorText_Daisy5:: @ 0x81AD69F
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}The Spring POKéMON CONTEST's\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The Spring POKéMON CONTEST's\n"
.string "Grand Champion is DAISY OAK of\l" .string "Grand Champion is DAISY OAK of\l"
.string "PALLET TOWN!$" .string "PALLET TOWN!$"
gFameCheckerFlavorText_Brock0:: @ 0x81AD705 gFameCheckerFlavorText_Brock0:: @ 0x81AD705
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}PEWTER CITY POKéMON GYM\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PEWTER CITY POKéMON GYM\n"
.string "LEADER: BROCK\l" .string "LEADER: BROCK\l"
.string "The Rock-Solid POKéMON TRAINER!$" .string "The Rock-Solid POKéMON TRAINER!$"
gFameCheckerFlavorText_Brock1:: @ 0x81AD771 gFameCheckerFlavorText_Brock1:: @ 0x81AD771
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}My rock-hard willpower is evident\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My rock-hard willpower is evident\n"
.string "in even my POKéMON.\p" .string "in even my POKéMON.\p"
.string "My POKéMON are all rock hard and\n" .string "My POKéMON are all rock hard and\n"
.string "have true-grit determination.\p" .string "have true-grit determination.\p"
@@ -90,7 +90,7 @@ gFameCheckerFlavorText_Brock1:: @ 0x81AD771
gFameCheckerFlavorText_Brock2:: @ 0x81AD840 gFameCheckerFlavorText_Brock2:: @ 0x81AD840
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}There aren't many serious POKéMON\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}There aren't many serious POKéMON\n"
.string "TRAINERS here.\p" .string "TRAINERS here.\p"
.string "They're all like BUG CATCHERS,\n" .string "They're all like BUG CATCHERS,\n"
.string "you know, just hobbyists.\p" .string "you know, just hobbyists.\p"
@@ -99,163 +99,163 @@ gFameCheckerFlavorText_Brock2:: @ 0x81AD840
gFameCheckerFlavorText_Brock3:: @ 0x81AD908 gFameCheckerFlavorText_Brock3:: @ 0x81AD908
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}BROCK is cool. He's not just tough.\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BROCK is cool. He's not just tough.\n"
.string "People like and respect him.\p" .string "People like and respect him.\p"
.string "I want to become a GYM LEADER\n" .string "I want to become a GYM LEADER\n"
.string "like him.$" .string "like him.$"
gFameCheckerFlavorText_Brock4:: @ 0x81AD99A gFameCheckerFlavorText_Brock4:: @ 0x81AD99A
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Hi, I'm excavating for fossils here\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hi, I'm excavating for fossils here\n"
.string "under MT. MOON.\p" .string "under MT. MOON.\p"
.string "Sometimes, BROCK of PEWTER GYM\n" .string "Sometimes, BROCK of PEWTER GYM\n"
.string "lends me a hand.$" .string "lends me a hand.$"
gFameCheckerFlavorText_Brock5:: @ 0x81ADA27 gFameCheckerFlavorText_Brock5:: @ 0x81ADA27
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}BROCK rarely laughs, but is said to\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BROCK rarely laughs, but is said to\n"
.string "be unable to stop if he starts.$" .string "be unable to stop if he starts.$"
gFameCheckerFlavorText_Misty0:: @ 0x81ADA91 gFameCheckerFlavorText_Misty0:: @ 0x81ADA91
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}CERULEAN CITY POKéMON GYM\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}CERULEAN CITY POKéMON GYM\n"
.string "LEADER: MISTY\l" .string "LEADER: MISTY\l"
.string "The Tomboyish Mermaid!$" .string "The Tomboyish Mermaid!$"
gFameCheckerFlavorText_Misty1:: @ 0x81ADAF6 gFameCheckerFlavorText_Misty1:: @ 0x81ADAF6
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}My policy is an all-out offensive\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My policy is an all-out offensive\n"
.string "with WATER-type POKéMON!$" .string "with WATER-type POKéMON!$"
gFameCheckerFlavorText_Misty2:: @ 0x81ADB5A gFameCheckerFlavorText_Misty2:: @ 0x81ADB5A
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}MISTY is a TRAINER who's going to\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}MISTY is a TRAINER who's going to\n"
.string "keep improving.\p" .string "keep improving.\p"
.string "She won't lose to someone like you!$" .string "She won't lose to someone like you!$"
gFameCheckerFlavorText_Misty3:: @ 0x81ADBD9 gFameCheckerFlavorText_Misty3:: @ 0x81ADBD9
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Strong TRAINERS and WATER POKéMON\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Strong TRAINERS and WATER POKéMON\n"
.string "are common sights in these parts.\p" .string "are common sights in these parts.\p"
.string "They say that MISTY of the\n" .string "They say that MISTY of the\n"
.string "CERULEAN GYM trains here.$" .string "CERULEAN GYM trains here.$"
gFameCheckerFlavorText_Misty4:: @ 0x81ADC72 gFameCheckerFlavorText_Misty4:: @ 0x81ADC72
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}This cape is a famous date spot.\p" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}This cape is a famous date spot.\p"
.string "MISTY, the GYM LEADER, has high\n" .string "MISTY, the GYM LEADER, has high\n"
.string "hopes about this place.$" .string "hopes about this place.$"
gFameCheckerFlavorText_Misty5:: @ 0x81ADCEB gFameCheckerFlavorText_Misty5:: @ 0x81ADCEB
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}MISTY is said to worship LORELEI\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}MISTY is said to worship LORELEI\n"
.string "of the ELITE FOUR.$" .string "of the ELITE FOUR.$"
gFameCheckerFlavorText_LtSurge0:: @ 0x81ADD3C gFameCheckerFlavorText_LtSurge0:: @ 0x81ADD3C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}VERMILION CITY POKéMON GYM\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}VERMILION CITY POKéMON GYM\n"
.string "LEADER: LT. SURGE\l" .string "LEADER: LT. SURGE\l"
.string "The Lightning American!$" .string "The Lightning American!$"
gFameCheckerFlavorText_LtSurge1:: @ 0x81ADDA7 gFameCheckerFlavorText_LtSurge1:: @ 0x81ADDA7
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I tell you, kid, electric POKéMON\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I tell you, kid, electric POKéMON\n"
.string "saved me during the war!$" .string "saved me during the war!$"
gFameCheckerFlavorText_LtSurge2:: @ 0x81ADE0B gFameCheckerFlavorText_LtSurge2:: @ 0x81ADE0B
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}When I was in the Army, LT. SURGE\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}When I was in the Army, LT. SURGE\n"
.string "was my strict CO.\p" .string "was my strict CO.\p"
.string "He was a hard taskmaster.$" .string "He was a hard taskmaster.$"
gFameCheckerFlavorText_LtSurge3:: @ 0x81ADE82 gFameCheckerFlavorText_LtSurge3:: @ 0x81ADE82
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}LT. SURGE was always famous for\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LT. SURGE was always famous for\n"
.string "his cautious nature in the Army.$" .string "his cautious nature in the Army.$"
gFameCheckerFlavorText_LtSurge4:: @ 0x81ADEEC gFameCheckerFlavorText_LtSurge4:: @ 0x81ADEEC
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}LT. SURGE installed the traps in\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LT. SURGE installed the traps in\n"
.string "the GYM himself.\p" .string "the GYM himself.\p"
.string "He set up double locks everywhere.$" .string "He set up double locks everywhere.$"
gFameCheckerFlavorText_LtSurge5:: @ 0x81ADF6A gFameCheckerFlavorText_LtSurge5:: @ 0x81ADF6A
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}LT. SURGE is rumored to have been\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LT. SURGE is rumored to have been\n"
.string "a pilot while home in America.\p" .string "a pilot while home in America.\p"
.string "He used the electricity generated\n" .string "He used the electricity generated\n"
.string "by POKéMON to power his plane.$" .string "by POKéMON to power his plane.$"
gFameCheckerFlavorText_Erika0:: @ 0x81AE009 gFameCheckerFlavorText_Erika0:: @ 0x81AE009
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}CELADON CITY POKéMON GYM\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}CELADON CITY POKéMON GYM\n"
.string "LEADER: ERIKA\l" .string "LEADER: ERIKA\l"
.string "The Nature-Loving Princess!$" .string "The Nature-Loving Princess!$"
gFameCheckerFlavorText_Erika1:: @ 0x81AE072 gFameCheckerFlavorText_Erika1:: @ 0x81AE072
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I am a student of the art of\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am a student of the art of\n"
.string "flower arranging.\p" .string "flower arranging.\p"
.string "My POKéMON are solely of the\n" .string "My POKéMON are solely of the\n"
.string "GRASS type.$" .string "GRASS type.$"
gFameCheckerFlavorText_Erika2:: @ 0x81AE0F3 gFameCheckerFlavorText_Erika2:: @ 0x81AE0F3
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Our LEADER ERIKA might be quiet,\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Our LEADER ERIKA might be quiet,\n"
.string "but she's famous around here.$" .string "but she's famous around here.$"
gFameCheckerFlavorText_Erika3:: @ 0x81AE15B gFameCheckerFlavorText_Erika3:: @ 0x81AE15B
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}We only use GRASS-type POKéMON at\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We only use GRASS-type POKéMON at\n"
.string "our GYM.\p" .string "our GYM.\p"
.string "Why? We also use them for making\n" .string "Why? We also use them for making\n"
.string "flower arrangements!$" .string "flower arrangements!$"
gFameCheckerFlavorText_Erika4:: @ 0x81AE1E5 gFameCheckerFlavorText_Erika4:: @ 0x81AE1E5
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I would never collect POKéMON if\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I would never collect POKéMON if\n"
.string "they were unattractive.$" .string "they were unattractive.$"
gFameCheckerFlavorText_Erika5:: @ 0x81AE247 gFameCheckerFlavorText_Erika5:: @ 0x81AE247
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Rumor has it that if you peek into\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Rumor has it that if you peek into\n"
.string "CELADON GYM, you can often\l" .string "CELADON GYM, you can often\l"
.string "see ERIKA snoozing.$" .string "see ERIKA snoozing.$"
gFameCheckerFlavorText_Koga0:: @ 0x81AE2B6 gFameCheckerFlavorText_Koga0:: @ 0x81AE2B6
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}FUCHSIA CITY POKéMON GYM\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}FUCHSIA CITY POKéMON GYM\n"
.string "LEADER: KOGA\l" .string "LEADER: KOGA\l"
.string "The Poisonous Ninja Master$" .string "The Poisonous Ninja Master$"
gFameCheckerFlavorText_Koga1:: @ 0x81AE31D gFameCheckerFlavorText_Koga1:: @ 0x81AE31D
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Despair to the creeping horror of\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Despair to the creeping horror of\n"
.string "POISON-type POKéMON!$" .string "POISON-type POKéMON!$"
gFameCheckerFlavorText_Koga2:: @ 0x81AE37D gFameCheckerFlavorText_Koga2:: @ 0x81AE37D
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Even though I've lost, I will keep\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Even though I've lost, I will keep\n"
.string "training according to the teachings\l" .string "training according to the teachings\l"
.string "of KOGA, my ninja master.$" .string "of KOGA, my ninja master.$"
gFameCheckerFlavorText_Koga3:: @ 0x81AE407 gFameCheckerFlavorText_Koga3:: @ 0x81AE407
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}My father is the GYM LEADER of\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My father is the GYM LEADER of\n"
.string "this town.\p" .string "this town.\p"
.string "I'm training to use POISON POKéMON\n" .string "I'm training to use POISON POKéMON\n"
.string "as well as my father.$" .string "as well as my father.$"
gFameCheckerFlavorText_Koga4:: @ 0x81AE48D gFameCheckerFlavorText_Koga4:: @ 0x81AE48D
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}KOGA is said to have a thorough\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}KOGA is said to have a thorough\n"
.string "knowledge of medicine.\p" .string "knowledge of medicine.\p"
.string "He even concocts medicine to nurse\n" .string "He even concocts medicine to nurse\n"
.string "his POKéMON to health.$" .string "his POKéMON to health.$"
gFameCheckerFlavorText_Koga5:: @ 0x81AE51B gFameCheckerFlavorText_Koga5:: @ 0x81AE51B
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}The SAFARI ZONE's huge, wouldn't\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The SAFARI ZONE's huge, wouldn't\n"
.string "you say?\p" .string "you say?\p"
.string "FUCHSIA's GYM LEADER, KOGA, \n" .string "FUCHSIA's GYM LEADER, KOGA, \n"
.string "patrols the grounds every so often.\p" .string "patrols the grounds every so often.\p"
@@ -264,55 +264,55 @@ gFameCheckerFlavorText_Koga5:: @ 0x81AE51B
gFameCheckerFlavorText_Sabrina0:: @ 0x81AE5E8 gFameCheckerFlavorText_Sabrina0:: @ 0x81AE5E8
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}SAFFRON CITY POKéMON GYM\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}SAFFRON CITY POKéMON GYM\n"
.string "LEADER: SABRINA\l" .string "LEADER: SABRINA\l"
.string "The Master of PSYCHIC POKéMON!$" .string "The Master of PSYCHIC POKéMON!$"
gFameCheckerFlavorText_Sabrina1:: @ 0x81AE656 gFameCheckerFlavorText_Sabrina1:: @ 0x81AE656
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}You know about a girl GYM LEADER\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You know about a girl GYM LEADER\n"
.string "in SAFFRON CITY?\p" .string "in SAFFRON CITY?\p"
.string "She uses PSYCHIC-type POKéMON,\n" .string "She uses PSYCHIC-type POKéMON,\n"
.string "right?$" .string "right?$"
gFameCheckerFlavorText_Sabrina2:: @ 0x81AE6D7 gFameCheckerFlavorText_Sabrina2:: @ 0x81AE6D7
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I have had psychic powers since\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I have had psychic powers since\n"
.string "I was a child.\p" .string "I was a child.\p"
.string "It started when a spoon I\n" .string "It started when a spoon I\n"
.string "carelessly tossed, bent.$" .string "carelessly tossed, bent.$"
gFameCheckerFlavorText_Sabrina3:: @ 0x81AE762 gFameCheckerFlavorText_Sabrina3:: @ 0x81AE762
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I dislike battling, but if you wish,\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I dislike battling, but if you wish,\n"
.string "I will show you my powers!$" .string "I will show you my powers!$"
gFameCheckerFlavorText_Sabrina4:: @ 0x81AE7CB gFameCheckerFlavorText_Sabrina4:: @ 0x81AE7CB
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}People say that SABRINA can\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}People say that SABRINA can\n"
.string "communicate with her POKéMON\l" .string "communicate with her POKéMON\l"
.string "during battle without speaking.$" .string "during battle without speaking.$"
gFameCheckerFlavorText_Sabrina5:: @ 0x81AE841 gFameCheckerFlavorText_Sabrina5:: @ 0x81AE841
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}SABRINA just wiped out the KARATE\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}SABRINA just wiped out the KARATE\n"
.string "MASTER next door.$" .string "MASTER next door.$"
gFameCheckerFlavorText_Blaine0:: @ 0x81AE89E gFameCheckerFlavorText_Blaine0:: @ 0x81AE89E
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}CINNABAR ISLAND POKéMON GYM\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}CINNABAR ISLAND POKéMON GYM\n"
.string "LEADER: BLAINE\l" .string "LEADER: BLAINE\l"
.string "The Hotheaded Quiz Master!$" .string "The Hotheaded Quiz Master!$"
gFameCheckerFlavorText_Blaine1:: @ 0x81AE90A gFameCheckerFlavorText_Blaine1:: @ 0x81AE90A
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}My fiery POKéMON are all rough\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My fiery POKéMON are all rough\n"
.string "and ready with intense heat!\p" .string "and ready with intense heat!\p"
.string "They incinerate all challengers!$" .string "They incinerate all challengers!$"
gFameCheckerFlavorText_Blaine2:: @ 0x81AE990 gFameCheckerFlavorText_Blaine2:: @ 0x81AE990
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Our LEADER, BLAINE, became lost\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Our LEADER, BLAINE, became lost\n"
.string "in the mountains but good.\p" .string "in the mountains but good.\p"
.string "Night fell when a fiery bird\n" .string "Night fell when a fiery bird\n"
.string "POKéMON appeared.\p" .string "POKéMON appeared.\p"
@@ -321,56 +321,56 @@ gFameCheckerFlavorText_Blaine2:: @ 0x81AE990
gFameCheckerFlavorText_Blaine3:: @ 0x81AEA59 gFameCheckerFlavorText_Blaine3:: @ 0x81AEA59
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}CINNABAR GYM's BLAINE is quite the\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}CINNABAR GYM's BLAINE is quite the\n"
.string "odd fellow.\p" .string "odd fellow.\p"
.string "He's lived on the island since way\n" .string "He's lived on the island since way\n"
.string "before the LAB was built.$" .string "before the LAB was built.$"
gFameCheckerFlavorText_Blaine4:: @ 0x81AEAEE gFameCheckerFlavorText_Blaine4:: @ 0x81AEAEE
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}It's a photo of BLAINE and\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}It's a photo of BLAINE and\n"
.string "MR. FUJI.\p" .string "MR. FUJI.\p"
.string "They're standing shoulder to\n" .string "They're standing shoulder to\n"
.string "shoulder with big grins.$" .string "shoulder with big grins.$"
gFameCheckerFlavorText_Blaine5:: @ 0x81AEB69 gFameCheckerFlavorText_Blaine5:: @ 0x81AEB69
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}BLAINE is said to remove his dark\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BLAINE is said to remove his dark\n"
.string "shades only when he is thinking up\l" .string "shades only when he is thinking up\l"
.string "new quiz questions.$" .string "new quiz questions.$"
gFameCheckerFlavorText_Lorelei0:: @ 0x81AEBDF gFameCheckerFlavorText_Lorelei0:: @ 0x81AEBDF
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I am LORELEI of the ELITE FOUR.$" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am LORELEI of the ELITE FOUR.$"
gFameCheckerFlavorText_Lorelei1:: @ 0x81AEC28 gFameCheckerFlavorText_Lorelei1:: @ 0x81AEC28
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}No one can best me when it comes\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}No one can best me when it comes\n"
.string "to icy POKéMON.$" .string "to icy POKéMON.$"
gFameCheckerFlavorText_Lorelei2:: @ 0x81AEC82 gFameCheckerFlavorText_Lorelei2:: @ 0x81AEC82
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Where was this person born?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Where was this person born?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}We've had a great and powerful\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We've had a great and powerful\n"
.string "TRAINER grow up on this island.\p" .string "TRAINER grow up on this island.\p"
.string "I bet even you'd know her.\n" .string "I bet even you'd know her.\n"
.string "It's LORELEI of the ELITE FOUR!$" .string "It's LORELEI of the ELITE FOUR!$"
gFameCheckerFlavorText_Lorelei3:: @ 0x81AED27 gFameCheckerFlavorText_Lorelei3:: @ 0x81AED27
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Known for her logical, calculated,\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Known for her logical, calculated,\n"
.string "and cool battling style, LORELEI\l" .string "and cool battling style, LORELEI\l"
.string "has a surprising secret!$" .string "has a surprising secret!$"
gFameCheckerFlavorText_Lorelei4:: @ 0x81AEDAA gFameCheckerFlavorText_Lorelei4:: @ 0x81AEDAA
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Did you know that LORELEI has lots\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Did you know that LORELEI has lots\n"
.string "and lots of stuffed dolls?\p" .string "and lots of stuffed dolls?\p"
.string "Every time she comes back to\n" .string "Every time she comes back to\n"
.string "FOUR ISLAND, her collection grows!$" .string "FOUR ISLAND, her collection grows!$"
gFameCheckerFlavorText_Lorelei5:: @ 0x81AEE51 gFameCheckerFlavorText_Lorelei5:: @ 0x81AEE51
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}The LAPRAS she has, I imagine it\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The LAPRAS she has, I imagine it\n"
.string "to be the one she met as a child.\p" .string "to be the one she met as a child.\p"
.string "I believe it was in ICEFALL CAVE\n" .string "I believe it was in ICEFALL CAVE\n"
.string "that she caught it.\p" .string "that she caught it.\p"
@@ -379,29 +379,29 @@ gFameCheckerFlavorText_Lorelei5:: @ 0x81AEE51
gFameCheckerFlavorText_Bruno0:: @ 0x81AEF25 gFameCheckerFlavorText_Bruno0:: @ 0x81AEF25
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I am BRUNO of the ELITE FOUR!$" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am BRUNO of the ELITE FOUR!$"
gFameCheckerFlavorText_Bruno1:: @ 0x81AEF6C gFameCheckerFlavorText_Bruno1:: @ 0x81AEF6C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I've lived and trained with my\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I've lived and trained with my\n"
.string "fighting POKéMON!$" .string "fighting POKéMON!$"
gFameCheckerFlavorText_Bruno2:: @ 0x81AEFC6 gFameCheckerFlavorText_Bruno2:: @ 0x81AEFC6
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}BRUNO apparently joined the ELITE\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BRUNO apparently joined the ELITE\n"
.string "FOUR out of his burning ambition to\l" .string "FOUR out of his burning ambition to\l"
.string "battle the best TRAINERS.$" .string "battle the best TRAINERS.$"
gFameCheckerFlavorText_Bruno3:: @ 0x81AF04C gFameCheckerFlavorText_Bruno3:: @ 0x81AF04C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}BRUNO, who's a senior ahead of me,\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BRUNO, who's a senior ahead of me,\n"
.string "visits the SPA on occasion.\p" .string "visits the SPA on occasion.\p"
.string "He comes to rehab injuries, both\n" .string "He comes to rehab injuries, both\n"
.string "his own and his POKéMON's.$" .string "his own and his POKéMON's.$"
gFameCheckerFlavorText_Bruno4:: @ 0x81AF0F0 gFameCheckerFlavorText_Bruno4:: @ 0x81AF0F0
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}He's one of the ELITE FOUR.\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's one of the ELITE FOUR.\n"
.string "His name is BRUNO.\p" .string "His name is BRUNO.\p"
.string "He went away disappointed when he\n" .string "He went away disappointed when he\n"
.string "found out that they were all sold\l" .string "found out that they were all sold\l"
@@ -409,35 +409,35 @@ gFameCheckerFlavorText_Bruno4:: @ 0x81AF0F0
gFameCheckerFlavorText_Bruno5:: @ 0x81AF19A gFameCheckerFlavorText_Bruno5:: @ 0x81AF19A
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Even BRUNO…\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Even BRUNO…\n"
.string "He trained with a fellow by the\l" .string "He trained with a fellow by the\l"
.string "name of BRAWLY before.$" .string "name of BRAWLY before.$"
gFameCheckerFlavorText_Agatha0:: @ 0x81AF200 gFameCheckerFlavorText_Agatha0:: @ 0x81AF200
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I am AGATHA of the ELITE FOUR.$" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am AGATHA of the ELITE FOUR.$"
gFameCheckerFlavorText_Agatha1:: @ 0x81AF248 gFameCheckerFlavorText_Agatha1:: @ 0x81AF248
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}AGATHA's GHOST-type POKéMON are\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}AGATHA's GHOST-type POKéMON are\n"
.string "horrifically terrifying in toughness.$" .string "horrifically terrifying in toughness.$"
gFameCheckerFlavorText_Agatha2:: @ 0x81AF2B7 gFameCheckerFlavorText_Agatha2:: @ 0x81AF2B7
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}That old lady's also got a really\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}That old lady's also got a really\n"
.string "short fuse, too.\p" .string "short fuse, too.\p"
.string "It doesn't take anything to get\n" .string "It doesn't take anything to get\n"
.string "that scary lady hollering.$" .string "that scary lady hollering.$"
gFameCheckerFlavorText_Agatha3:: @ 0x81AF34E gFameCheckerFlavorText_Agatha3:: @ 0x81AF34E
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}In her youth, AGATHA and PROF.\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}In her youth, AGATHA and PROF.\n"
.string "OAK were rivals who vied for\l" .string "OAK were rivals who vied for\l"
.string "supremacy as TRAINERS.$" .string "supremacy as TRAINERS.$"
gFameCheckerFlavorText_Agatha4:: @ 0x81AF3BE gFameCheckerFlavorText_Agatha4:: @ 0x81AF3BE
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I hear OAK's taken a lot of\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear OAK's taken a lot of\n"
.string "interest in you, child.\p" .string "interest in you, child.\p"
.string "That old duff was once tough and\n" .string "That old duff was once tough and\n"
.string "handsome.\p" .string "handsome.\p"
@@ -446,19 +446,19 @@ gFameCheckerFlavorText_Agatha4:: @ 0x81AF3BE
gFameCheckerFlavorText_Agatha5:: @ 0x81AF47C gFameCheckerFlavorText_Agatha5:: @ 0x81AF47C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Take AGATHA, for example.\p" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Take AGATHA, for example.\p"
.string "She set a record for being the\n" .string "She set a record for being the\n"
.string "oldest-ever ELITE FOUR member.$" .string "oldest-ever ELITE FOUR member.$"
gFameCheckerFlavorText_Lance0:: @ 0x81AF4FD gFameCheckerFlavorText_Lance0:: @ 0x81AF4FD
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I lead the ELITE FOUR.\p" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I lead the ELITE FOUR.\p"
.string "You can call me LANCE the dragon\n" .string "You can call me LANCE the dragon\n"
.string "TRAINER.$" .string "TRAINER.$"
gFameCheckerFlavorText_Lance1:: @ 0x81AF567 gFameCheckerFlavorText_Lance1:: @ 0x81AF567
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}You know that dragons are\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You know that dragons are\n"
.string "mythical POKéMON.\p" .string "mythical POKéMON.\p"
.string "They're hard to catch and raise,\n" .string "They're hard to catch and raise,\n"
.string "but their powers are superior.\p" .string "but their powers are superior.\p"
@@ -467,13 +467,13 @@ gFameCheckerFlavorText_Lance1:: @ 0x81AF567
gFameCheckerFlavorText_Lance2:: @ 0x81AF641 gFameCheckerFlavorText_Lance2:: @ 0x81AF641
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}He stands for justice!\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He stands for justice!\n"
.string "He's cool, and yet passionate!\l" .string "He's cool, and yet passionate!\l"
.string "He's the greatest, LANCE!$" .string "He's the greatest, LANCE!$"
gFameCheckerFlavorText_Lance3:: @ 0x81AF6BA gFameCheckerFlavorText_Lance3:: @ 0x81AF6BA
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}We have a customer, LANCE, who\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We have a customer, LANCE, who\n"
.string "occasionally comes.\p" .string "occasionally comes.\p"
.string "He always buys capes.\p" .string "He always buys capes.\p"
.string "I wonder… Does he have many\n" .string "I wonder… Does he have many\n"
@@ -481,62 +481,62 @@ gFameCheckerFlavorText_Lance3:: @ 0x81AF6BA
gFameCheckerFlavorText_Lance4:: @ 0x81AF758 gFameCheckerFlavorText_Lance4:: @ 0x81AF758
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}LANCE's grandfather is thought to\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LANCE's grandfather is thought to\n"
.string "be the elder of a famous clan of\l" .string "be the elder of a famous clan of\l"
.string "dragon masters.$" .string "dragon masters.$"
gFameCheckerFlavorText_Lance5:: @ 0x81AF7CB gFameCheckerFlavorText_Lance5:: @ 0x81AF7CB
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}From what I've heard, LANCE has\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}From what I've heard, LANCE has\n"
.string "a cousin who's a GYM LEADER\l" .string "a cousin who's a GYM LEADER\l"
.string "somewhere far away.$" .string "somewhere far away.$"
gFameCheckerFlavorText_Bill0:: @ 0x81AF83E gFameCheckerFlavorText_Bill0:: @ 0x81AF83E
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}After all, BILL's world-famous as a\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}After all, BILL's world-famous as a\n"
.string "POKéMANIAC.\p" .string "POKéMANIAC.\p"
.string "He invented the POKéMON Storage\n" .string "He invented the POKéMON Storage\n"
.string "System on PC, too.$" .string "System on PC, too.$"
gFameCheckerFlavorText_Bill1:: @ 0x81AF8CA gFameCheckerFlavorText_Bill1:: @ 0x81AF8CA
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}BILL has lots of POKéMON!\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL has lots of POKéMON!\n"
.string "He collects rare ones, too!$" .string "He collects rare ones, too!$"
gFameCheckerFlavorText_Bill2:: @ 0x81AF929 gFameCheckerFlavorText_Bill2:: @ 0x81AF929
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}He's my grandson!\p" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's my grandson!\p"
.string "He always liked collecting things,\n" .string "He always liked collecting things,\n"
.string "even as a child!$" .string "even as a child!$"
gFameCheckerFlavorText_Bill3:: @ 0x81AF998 gFameCheckerFlavorText_Bill3:: @ 0x81AF998
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}BILL is a POKéMANIAC, so he loves\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL is a POKéMANIAC, so he loves\n"
.string "every kind.\p" .string "every kind.\p"
.string "Apparently, the first one he caught\n" .string "Apparently, the first one he caught\n"
.string "was an ABRA.$" .string "was an ABRA.$"
gFameCheckerFlavorText_Bill4:: @ 0x81AFA20 gFameCheckerFlavorText_Bill4:: @ 0x81AFA20
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}BILL's hometown is GOLDENROD CITY,\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL's hometown is GOLDENROD CITY,\n"
.string "where his folks still live.\p" .string "where his folks still live.\p"
.string "I've heard that it's quite the\n" .string "I've heard that it's quite the\n"
.string "festive, bustling city.$" .string "festive, bustling city.$"
gFameCheckerFlavorText_Bill5:: @ 0x81AFAB9 gFameCheckerFlavorText_Bill5:: @ 0x81AFAB9
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Apparently, BILL simply can't\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Apparently, BILL simply can't\n"
.string "stomach milk at all.$" .string "stomach milk at all.$"
gFameCheckerFlavorText_MrFuji0:: @ 0x81AFB0C gFameCheckerFlavorText_MrFuji0:: @ 0x81AFB0C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}He's really kind.\p" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's really kind.\p"
.string "He looks after abandoned and\n" .string "He looks after abandoned and\n"
.string "orphaned POKéMON.$" .string "orphaned POKéMON.$"
gFameCheckerFlavorText_MrFuji1:: @ 0x81AFB76 gFameCheckerFlavorText_MrFuji1:: @ 0x81AFB76
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}This old guy marched right up to\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}This old guy marched right up to\n"
.string "our HIDEOUT.\p" .string "our HIDEOUT.\p"
.string "Then, he starts ranting about how\n" .string "Then, he starts ranting about how\n"
.string "TEAM ROCKET's abusing POKéMON.\p" .string "TEAM ROCKET's abusing POKéMON.\p"
@@ -545,7 +545,7 @@ gFameCheckerFlavorText_MrFuji1:: @ 0x81AFB76
gFameCheckerFlavorText_MrFuji2:: @ 0x81AFC38 gFameCheckerFlavorText_MrFuji2:: @ 0x81AFC38
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}POKéMON FAN MAGAZINE\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}POKéMON FAN MAGAZINE\n"
.string "Monthly Grand Prize Drawing!\p" .string "Monthly Grand Prize Drawing!\p"
.string "The application form is…\p" .string "The application form is…\p"
.string "Gone! It's been clipped out.\n" .string "Gone! It's been clipped out.\n"
@@ -553,26 +553,26 @@ gFameCheckerFlavorText_MrFuji2:: @ 0x81AFC38
gFameCheckerFlavorText_MrFuji3:: @ 0x81AFCE9 gFameCheckerFlavorText_MrFuji3:: @ 0x81AFCE9
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I hear that MR. FUJI's not from\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear that MR. FUJI's not from\n"
.string "these parts originally, either.$" .string "these parts originally, either.$"
gFameCheckerFlavorText_MrFuji4:: @ 0x81AFD49 gFameCheckerFlavorText_MrFuji4:: @ 0x81AFD49
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}It's a photo of BLAINE and\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}It's a photo of BLAINE and\n"
.string "MR. FUJI.\p" .string "MR. FUJI.\p"
.string "They're standing shoulder to\n" .string "They're standing shoulder to\n"
.string "shoulder with big grins.$" .string "shoulder with big grins.$"
gFameCheckerFlavorText_MrFuji5:: @ 0x81AFDC4 gFameCheckerFlavorText_MrFuji5:: @ 0x81AFDC4
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Editor: The shy MR. FUJI turned\n" .string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Editor: The shy MR. FUJI turned\n"
.string "down our interview requests.\p" .string "down our interview requests.\p"
.string "He is a kindly man who is adored\n" .string "He is a kindly man who is adored\n"
.string "and respected in LAVENDER TOWN.$" .string "and respected in LAVENDER TOWN.$"
gFameCheckerFlavorText_Giovanni0:: @ 0x81AFE68 gFameCheckerFlavorText_Giovanni0:: @ 0x81AFE68
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}TEAM ROCKET captures POKéMON from\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}TEAM ROCKET captures POKéMON from\n"
.string "around the world.\p" .string "around the world.\p"
.string "They're important tools for keeping\n" .string "They're important tools for keeping\n"
.string "our criminal enterprise going.\p" .string "our criminal enterprise going.\p"
@@ -580,32 +580,32 @@ gFameCheckerFlavorText_Giovanni0:: @ 0x81AFE68
gFameCheckerFlavorText_Giovanni1:: @ 0x81AFF23 gFameCheckerFlavorText_Giovanni1:: @ 0x81AFF23
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Those thugs that took over our\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Those thugs that took over our\n"
.string "building…\p" .string "building…\p"
.string "Their BOSS said he was looking for\n" .string "Their BOSS said he was looking for\n"
.string "strong POKéMON.$" .string "strong POKéMON.$"
gFameCheckerFlavorText_Giovanni2:: @ 0x81AFFA8 gFameCheckerFlavorText_Giovanni2:: @ 0x81AFFA8
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}TEAM ROCKET's BOSS is terribly\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}TEAM ROCKET's BOSS is terribly\n"
.string "cruel!\p" .string "cruel!\p"
.string "To him, POKéMON are just tools to\n" .string "To him, POKéMON are just tools to\n"
.string "be used.$" .string "be used.$"
gFameCheckerFlavorText_Giovanni3:: @ 0x81B0022 gFameCheckerFlavorText_Giovanni3:: @ 0x81B0022
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Welcome to my hideout!\p" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Welcome to my hideout!\p"
.string "It shall be so until I can restore\n" .string "It shall be so until I can restore\n"
.string "TEAM ROCKET to its former glory.$" .string "TEAM ROCKET to its former glory.$"
gFameCheckerFlavorText_Giovanni4:: @ 0x81B00A6 gFameCheckerFlavorText_Giovanni4:: @ 0x81B00A6
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Blow me away! GIOVANNI was the\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Blow me away! GIOVANNI was the\n"
.string "GYM LEADER of VIRIDIAN?$" .string "GYM LEADER of VIRIDIAN?$"
gFameCheckerFlavorText_Giovanni5:: @ 0x81B0106 gFameCheckerFlavorText_Giovanni5:: @ 0x81B0106
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}You… You're not GIOVANNI's kid,\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You… You're not GIOVANNI's kid,\n"
.string "are you?\p" .string "are you?\p"
.string "No, that can't be right.\n" .string "No, that can't be right.\n"
.string "GIOVANNI's kid has red hair.$" .string "GIOVANNI's kid has red hair.$"
@@ -617,7 +617,7 @@ gFameCheckerPersonName_ProfOak:: @ 0x81B0188
gFameCheckerPersonQuote_ProfOak:: @ 0x81B0198 gFameCheckerPersonQuote_ProfOak:: @ 0x81B0198
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: PROF. OAK\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: PROF. OAK\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Why do POKéMON compete and battle\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Why do POKéMON compete and battle\n"
.string "so hard for you?\p" .string "so hard for you?\p"
.string "They do so because they can see\n" .string "They do so because they can see\n"
.string "the love and trust you have\l" .string "the love and trust you have\l"
@@ -630,7 +630,7 @@ gFameCheckerPersonName_Daisy:: @ 0x81B0251
gFameCheckerPersonQuote_Daisy:: @ 0x81B025D gFameCheckerPersonQuote_Daisy:: @ 0x81B025D
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: DAISY\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: DAISY\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}While I was comfortably enjoying\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}While I was comfortably enjoying\n"
.string "my tea breaks, you've grown very\l" .string "my tea breaks, you've grown very\l"
.string "skilled and powerful.\p" .string "skilled and powerful.\p"
.string "I hope you'll remain a good rival\n" .string "I hope you'll remain a good rival\n"
@@ -642,7 +642,7 @@ gFameCheckerPersonName_Brock:: @ 0x81B030F
gFameCheckerPersonQuote_Brock:: @ 0x81B031B gFameCheckerPersonQuote_Brock:: @ 0x81B031B
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BROCK\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BROCK\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}In this big world of ours, there\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}In this big world of ours, there\n"
.string "must be many tough TRAINERS.\p" .string "must be many tough TRAINERS.\p"
.string "Let's both keep training and\n" .string "Let's both keep training and\n"
.string "making ourselves stronger!$" .string "making ourselves stronger!$"
@@ -653,7 +653,7 @@ gFameCheckerPersonName_Misty:: @ 0x81B03B3
gFameCheckerPersonQuote_Misty:: @ 0x81B03BF gFameCheckerPersonQuote_Misty:: @ 0x81B03BF
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MISTY\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MISTY\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I'm going to keep training here at\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I'm going to keep training here at\n"
.string "this GYM.\p" .string "this GYM.\p"
.string "When I get better, I'd love to hit\n" .string "When I get better, I'd love to hit\n"
.string "the road and travel.$" .string "the road and travel.$"
@@ -664,7 +664,7 @@ gFameCheckerPersonName_LtSurge:: @ 0x81B0446
gFameCheckerPersonQuote_LtSurge:: @ 0x81B0456 gFameCheckerPersonQuote_LtSurge:: @ 0x81B0456
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LT. SURGE\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LT. SURGE\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Hey, kid!\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hey, kid!\n"
.string "You electrified me in our battle!\p" .string "You electrified me in our battle!\p"
.string "I didn't know that there were\n" .string "I didn't know that there were\n"
.string "gutsy TRAINERS like you.\p" .string "gutsy TRAINERS like you.\p"
@@ -677,7 +677,7 @@ gFameCheckerPersonName_Erika:: @ 0x81B0504
gFameCheckerPersonQuote_Erika:: @ 0x81B0510 gFameCheckerPersonQuote_Erika:: @ 0x81B0510
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: ERIKA\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: ERIKA\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I am so glad that there are strong\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am so glad that there are strong\n"
.string "TRAINERS like you.\p" .string "TRAINERS like you.\p"
.string "That awareness alone inspires and\n" .string "That awareness alone inspires and\n"
.string "motivates me to try harder.\p" .string "motivates me to try harder.\p"
@@ -690,7 +690,7 @@ gFameCheckerPersonName_Koga:: @ 0x81B05C2
gFameCheckerPersonQuote_Koga:: @ 0x81B05CD gFameCheckerPersonQuote_Koga:: @ 0x81B05CD
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: KOGA\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: KOGA\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}You and I, we must both set our\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You and I, we must both set our\n"
.string "sights higher and work towards\l" .string "sights higher and work towards\l"
.string "meeting our challenges.\p" .string "meeting our challenges.\p"
.string "Now, I must go train my daughter.$" .string "Now, I must go train my daughter.$"
@@ -701,7 +701,7 @@ gFameCheckerPersonName_Sabrina:: @ 0x81B0667
gFameCheckerPersonQuote_Sabrina:: @ 0x81B0675 gFameCheckerPersonQuote_Sabrina:: @ 0x81B0675
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: SABRINA\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: SABRINA\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}The love you have towards your\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The love you have towards your\n"
.string "POKéMON…\p" .string "POKéMON…\p"
.string "It was a power that was never\n" .string "It was a power that was never\n"
.string "bested by my psychic power.$" .string "bested by my psychic power.$"
@@ -712,7 +712,7 @@ gFameCheckerPersonName_Blaine:: @ 0x81B06FB
gFameCheckerPersonQuote_Blaine:: @ 0x81B0708 gFameCheckerPersonQuote_Blaine:: @ 0x81B0708
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BLAINE\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BLAINE\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}My fire POKéMON!\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My fire POKéMON!\n"
.string "They'll become even more powerful!\p" .string "They'll become even more powerful!\p"
.string "And now, a quiz. How many kinds of\n" .string "And now, a quiz. How many kinds of\n"
.string "FIRE-type POKéMON are there?$" .string "FIRE-type POKéMON are there?$"
@@ -723,7 +723,7 @@ gFameCheckerPersonName_Lorelei:: @ 0x81B079F
gFameCheckerPersonQuote_Lorelei:: @ 0x81B07AD gFameCheckerPersonQuote_Lorelei:: @ 0x81B07AD
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LORELEI\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LORELEI\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I needed to thank you for your\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I needed to thank you for your\n"
.string "help.\p" .string "help.\p"
.string "But that has nothing to do with our\n" .string "But that has nothing to do with our\n"
.string "battles.\p" .string "battles.\p"
@@ -735,7 +735,7 @@ gFameCheckerPersonName_Bruno:: @ 0x81B0845
gFameCheckerPersonQuote_Bruno:: @ 0x81B0851 gFameCheckerPersonQuote_Bruno:: @ 0x81B0851
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BRUNO\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BRUNO\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}The super power of your POKéMON\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The super power of your POKéMON\n"
.string "and you I've experienced myself.\p" .string "and you I've experienced myself.\p"
.string "Next time, maybe I should show you\n" .string "Next time, maybe I should show you\n"
.string "how to train yourself.$" .string "how to train yourself.$"
@@ -746,7 +746,7 @@ gFameCheckerPersonName_Agatha:: @ 0x81B08EE
gFameCheckerPersonQuote_Agatha:: @ 0x81B08FB gFameCheckerPersonQuote_Agatha:: @ 0x81B08FB
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: AGATHA\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: AGATHA\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}When you grow older, don't you\n" .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}When you grow older, don't you\n"
.string "dare go soft like that coot OAK!\p" .string "dare go soft like that coot OAK!\p"
.string "Be like me and keep battling on!$" .string "Be like me and keep battling on!$"
@@ -756,7 +756,7 @@ gFameCheckerPersonName_Lance:: @ 0x81B097F
gFameCheckerPersonQuote_Lance:: @ 0x81B098B gFameCheckerPersonQuote_Lance:: @ 0x81B098B
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LANCE\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LANCE\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I'm considering going back to my\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I'm considering going back to my\n"
.string "hometown.\p" .string "hometown.\p"
.string "I want to retrain my DRAGON-type\n" .string "I want to retrain my DRAGON-type\n"
.string "POKéMON and strengthen them.\p" .string "POKéMON and strengthen them.\p"
@@ -769,7 +769,7 @@ gFameCheckerPersonName_Bill:: @ 0x81B0A45
gFameCheckerPersonQuote_Bill:: @ 0x81B0A50 gFameCheckerPersonQuote_Bill:: @ 0x81B0A50
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BILL\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BILL\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Hey, there! CELIO had nothing but\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hey, there! CELIO had nothing but\n"
.string "praise for you.\p" .string "praise for you.\p"
.string "Hearing that makes me happy.\p" .string "Hearing that makes me happy.\p"
.string "When you catch some rare POKéMON,\n" .string "When you catch some rare POKéMON,\n"
@@ -781,7 +781,7 @@ gFameCheckerPersonName_MrFuji:: @ 0x81B0AFF
gFameCheckerPersonQuote_MrFuji:: @ 0x81B0B0E gFameCheckerPersonQuote_MrFuji:: @ 0x81B0B0E
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MR. FUJI\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MR. FUJI\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Instead of hoping for the happiness\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Instead of hoping for the happiness\n"
.string "of just your POKéMON…\p" .string "of just your POKéMON…\p"
.string "…Can I get you to wish for the\n" .string "…Can I get you to wish for the\n"
.string "happiness of all POKéMON?$" .string "happiness of all POKéMON?$"
@@ -792,7 +792,7 @@ gFameCheckerPersonName_Giovanni:: @ 0x81B0BA6
gFameCheckerPersonQuote_Giovanni:: @ 0x81B0BB5 gFameCheckerPersonQuote_Giovanni:: @ 0x81B0BB5
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: GIOVANNI\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: GIOVANNI\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}There is nothing that I wish to say\n" .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}There is nothing that I wish to say\n"
.string "to you.\p" .string "to you.\p"
.string "I will concentrate solely on\n" .string "I will concentrate solely on\n"
.string "bettering myself, and none other.$" .string "bettering myself, and none other.$"
include/text.h
+2 -2
View File
@@ -95,8 +95,8 @@
#define TEXT_COLOR_TRANSPARENT 0x0 #define TEXT_COLOR_TRANSPARENT 0x0
#define TEXT_COLOR_WHITE 0x1 #define TEXT_COLOR_WHITE 0x1
#define TEXT_COLOR_DARK_GREY 0x2 #define TEXT_COLOR_DARK_GRAY 0x2
#define TEXT_COLOR_LIGHT_GREY 0x3 #define TEXT_COLOR_LIGHT_GRAY 0x3
#define TEXT_COLOR_RED 0x4 #define TEXT_COLOR_RED 0x4
#define TEXT_COLOR_LIGHT_RED 0x5 #define TEXT_COLOR_LIGHT_RED 0x5
#define TEXT_COLOR_GREEN 0x6 #define TEXT_COLOR_GREEN 0x6
src/battle_script_commands.c
+1 -1
View File
@@ -5637,7 +5637,7 @@ static void PutLevelAndGenderOnLvlUpBox(void)
printerTemplate.unk = 0; printerTemplate.unk = 0;
printerTemplate.fgColor = TEXT_COLOR_WHITE; printerTemplate.fgColor = TEXT_COLOR_WHITE;
printerTemplate.bgColor = TEXT_COLOR_TRANSPARENT; printerTemplate.bgColor = TEXT_COLOR_TRANSPARENT;
printerTemplate.shadowColor = TEXT_COLOR_DARK_GREY; printerTemplate.shadowColor = TEXT_COLOR_DARK_GRAY;
AddTextPrinter(&printerTemplate, 0xFF, NULL); AddTextPrinter(&printerTemplate, 0xFF, NULL);
txtPtr = gStringVar4; txtPtr = gStringVar4;
gStringVar4[0] = 0xF9; gStringVar4[0] = 0xF9;
src/berry_crush.c
+6 -6
View File
@@ -400,15 +400,15 @@ static const struct BgTemplate sBgTemplates[] = {
static const u8 sBerryCrushTextColorTable[][3] = { static const u8 sBerryCrushTextColorTable[][3] = {
{ {
TEXT_COLOR_WHITE, TEXT_COLOR_WHITE,
TEXT_COLOR_DARK_GREY, TEXT_COLOR_DARK_GRAY,
TEXT_COLOR_LIGHT_GREY TEXT_COLOR_LIGHT_GRAY
}, { }, {
TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT,
TEXT_COLOR_WHITE, TEXT_COLOR_WHITE,
TEXT_COLOR_DARK_GREY TEXT_COLOR_DARK_GRAY
}, { }, {
TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT,
TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_LIGHT_GRAY,
TEXT_COLOR_RED TEXT_COLOR_RED
}, { }, {
TEXT_COLOR_WHITE, TEXT_COLOR_WHITE,
@@ -1091,11 +1091,11 @@ static u32 BerryCrushCommand_PrintMessage(struct BerryCrushGame * game, u8 *para
if (params[1] & 2) if (params[1] & 2)
{ {
StringExpandPlaceholders(gStringVar4, sBerryCrushMessages[params[0]]); StringExpandPlaceholders(gStringVar4, sBerryCrushMessages[params[0]]);
AddTextPrinterParameterized2(0, 2, gStringVar4, game->textSpeed, 0, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gStringVar4, game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
else else
{ {
AddTextPrinterParameterized2(0, 2, sBerryCrushMessages[params[0]], game->textSpeed, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, sBerryCrushMessages[params[0]], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
CopyWindowToVram(0, COPYWIN_BOTH); CopyWindowToVram(0, COPYWIN_BOTH);
break; break;
src/clear_save_data_screen.c
+2 -2
View File
@@ -55,8 +55,8 @@ static const struct WindowTemplate sWindowTemplates[] = {
static const u8 sTextColor[] = { static const u8 sTextColor[] = {
TEXT_COLOR_WHITE, TEXT_COLOR_WHITE,
TEXT_COLOR_DARK_GREY, TEXT_COLOR_DARK_GRAY,
TEXT_COLOR_LIGHT_GREY TEXT_COLOR_LIGHT_GRAY
}; };
static void CB2_RunClearSaveDataScreen(void) static void CB2_RunClearSaveDataScreen(void)
src/data/party_menu.h
+3 -3
View File
@@ -112,12 +112,12 @@ static const u32 sCancelButton_Tilemap[] = INCBIN_U32("graphics/interface/party_
static const u8 sFontColorTable[][3] = static const u8 sFontColorTable[][3] =
{ {
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_DARK_GREY}, // Default {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GRAY, TEXT_COLOR_DARK_GRAY}, // Default
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_GREEN}, // Unused {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_GREEN}, // Unused
{TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_2, TEXT_DYNAMIC_COLOR_3}, // Gender symbol {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_2, TEXT_DYNAMIC_COLOR_3}, // Gender symbol
{TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY}, // Selection actions {TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY}, // Selection actions
{TEXT_COLOR_WHITE, TEXT_COLOR_BLUE, TEXT_COLOR_LIGHT_BLUE}, // Field moves {TEXT_COLOR_WHITE, TEXT_COLOR_BLUE, TEXT_COLOR_LIGHT_BLUE}, // Field moves
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}, // Unused {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY}, // Unused
}; };
static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] =
src/diploma.c
+2 -2
View File
@@ -38,8 +38,8 @@ static const u8 gUnknown_841599D[] = _("{HIGHLIGHT TRANSPARENT}さま");
static const u8 gUnknown_84159A3[] = _("{HIGHLIGHT TRANSPARENT}ホウエン"); static const u8 gUnknown_84159A3[] = _("{HIGHLIGHT TRANSPARENT}ホウエン");
static const u8 gUnknown_84159AB[] = _("{HIGHLIGHT TRANSPARENT}ぜんこく"); static const u8 gUnknown_84159AB[] = _("{HIGHLIGHT TRANSPARENT}ぜんこく");
static const u8 gUnknown_84159B3[] = _("{HIGHLIGHT TRANSPARENT}　　　　　ポケモンずかんを\nみごと　かんせい　させた\nいだいなこうせきを　たたえ\nここに　しょうめい　します"); static const u8 gUnknown_84159B3[] = _("{HIGHLIGHT TRANSPARENT}　　　　　ポケモンずかんを\nみごと　かんせい　させた\nいだいなこうせきを　たたえ\nここに　しょうめい　します");
static const u8 gUnknown_84159ED[] = _("{COLOR DARK_GREY}{HIGHLIGHT TRANSPARENT}ゲームフリーク"); static const u8 gUnknown_84159ED[] = _("{COLOR DARK_GRAY}{HIGHLIGHT TRANSPARENT}ゲームフリーク");
static const u8 gUnknown_84159FB[] = _("{COLOR DARK_GREY}{HIGHLIGHT TRANSPARENT}"); static const u8 gUnknown_84159FB[] = _("{COLOR DARK_GRAY}{HIGHLIGHT TRANSPARENT}");
static const ALIGNED(4) u8 gUnknown_8415A04[3] = {0, 2, 3}; static const ALIGNED(4) u8 gUnknown_8415A04[3] = {0, 2, 3};
src/dodrio_berry_picking_2.c
+3 -3
View File
@@ -906,8 +906,8 @@ static const u8 sTextColorTable[][3] =
{ {
{ {
TEXT_COLOR_WHITE, TEXT_COLOR_WHITE,
TEXT_COLOR_DARK_GREY, TEXT_COLOR_DARK_GRAY,
TEXT_COLOR_LIGHT_GREY TEXT_COLOR_LIGHT_GRAY
}, { }, {
TEXT_COLOR_WHITE, TEXT_COLOR_WHITE,
TEXT_COLOR_RED, TEXT_COLOR_RED,
@@ -1421,7 +1421,7 @@ static void sub_8155A78(void)
{ {
case 0: case 0:
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
gUnknown_203F440->state++; gUnknown_203F440->state++;
break; break;
case 1: case 1:
src/easy_chat_3.c
+2 -2
View File
@@ -1321,7 +1321,7 @@ static void PrintTitleText(void)
xOffset = (128 - GetStringWidth(1, titleText, 0)) / 2u; xOffset = (128 - GetStringWidth(1, titleText, 0)) / 2u;
FillWindowPixelBuffer(0, PIXEL_FILL(0)); FillWindowPixelBuffer(0, PIXEL_FILL(0));
EC_AddTextPrinterParameterized2(0, 1, titleText, xOffset, 0, TEXT_SPEED_FF, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY); EC_AddTextPrinterParameterized2(0, 1, titleText, xOffset, 0, TEXT_SPEED_FF, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY);
PutWindowTilemap(0); PutWindowTilemap(0);
CopyWindowToVram(0, COPYWIN_BOTH); CopyWindowToVram(0, COPYWIN_BOTH);
} }
@@ -1439,7 +1439,7 @@ static void PrintECFields(void)
*str++ = 9; *str++ = 9;
} }
str = WriteColorChangeControlCode(str, 0, TEXT_COLOR_DARK_GREY); str = WriteColorChangeControlCode(str, 0, TEXT_COLOR_DARK_GRAY);
} }
str = StringAppend(str, sText_Clear17); str = StringAppend(str, sText_Clear17);
src/evolution_scene.c
+1 -1
View File
@@ -69,7 +69,7 @@ static const u16 sMovingBgPals[] = INCBIN_U16("graphics/evolution_scene/transiti
static const u8 sText_ShedinjaJapaneseName[] = _("ヌケニン"); static const u8 sText_ShedinjaJapaneseName[] = _("ヌケニン");
static const u8 unref_83F8445[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}"); static const u8 unref_83F8445[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}");
static const u8 unref_83F844F[][10] = { static const u8 unref_83F844F[][10] = {
_("▶\n "), _("▶\n "),
src/field_player_avatar.c
+3 -3
View File
@@ -1839,7 +1839,7 @@ static bool8 Fishing10(struct Task *task)
{ {
AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, gText_PokemonOnHook, 1, 0, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gText_PokemonOnHook, 1, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tStep++; task->tStep++;
task->tFrameCounter = 0; task->tFrameCounter = 0;
return FALSE; return FALSE;
@@ -1886,7 +1886,7 @@ static bool8 Fishing12(struct Task *task)
AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, gText_NotEvenANibble, 1, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gText_NotEvenANibble, 1, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tStep = FISHING_SHOW_RESULT; task->tStep = FISHING_SHOW_RESULT;
return TRUE; return TRUE;
} }
@@ -1896,7 +1896,7 @@ static bool8 Fishing13(struct Task *task)
{ {
AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
AddTextPrinterParameterized2(0, 2, gText_ItGotAway, 1, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gText_ItGotAway, 1, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tStep++; task->tStep++;
return TRUE; return TRUE;
} }
src/field_screen_effect.c
+1 -1
View File
@@ -29,7 +29,7 @@ static const struct WindowTemplate gUnknown_83C68E4 = {
.baseBlock = 1, .baseBlock = 1,
}; };
static const u8 gUnknown_83C68EC[] = { TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY }; static const u8 gUnknown_83C68EC[] = { TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY };
static void Task_EnableScriptAfterMusicFade(u8 taskId); static void Task_EnableScriptAfterMusicFade(u8 taskId);
static void Task_BarnDoorWipeChild(u8 taskId); static void Task_BarnDoorWipeChild(u8 taskId);
src/help_message.c
+1 -1
View File
@@ -89,7 +89,7 @@ static void sub_8112FD0(void)
sub_8112F18(sHelpMessageWindowId); sub_8112F18(sHelpMessageWindowId);
} }
static const u8 sHelpMessageTextColors[3] = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GREY}; static const u8 sHelpMessageTextColors[3] = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GRAY};
static void PrintHelpMessageText(const u8 *text) static void PrintHelpMessageText(const u8 *text)
{ {
src/item_menu.c
+1 -1
View File
@@ -289,7 +289,7 @@ static const struct YesNoFuncTable sYesNoMenu_Sell = {
Task_SellItem_No Task_SellItem_No
}; };
static const u8 sListItemTextColor_RegularItem[] = _("{COLOR_HIGHLIGHT_SHADOW DARK_GREY TRANSPARENT LIGHT_GREY}"); static const u8 sListItemTextColor_RegularItem[] = _("{COLOR_HIGHLIGHT_SHADOW DARK_GRAY TRANSPARENT LIGHT_GRAY}");
static const u8 sListItemTextColor_TmCase_BerryPouch[] = _("{COLOR_HIGHLIGHT_SHADOW BLUE TRANSPARENT LIGHT_BLUE}"); static const u8 sListItemTextColor_TmCase_BerryPouch[] = _("{COLOR_HIGHLIGHT_SHADOW BLUE TRANSPARENT LIGHT_BLUE}");
src/item_pc.c
+4 -4
View File
@@ -121,10 +121,10 @@ static const struct MenuAction sItemPcSubmenuOptions[] = {
}; };
static const u8 sTextColors[][3] = { static const u8 sTextColors[][3] = {
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}, {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY},
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY}, {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY},
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_DARK_GREY}, {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GRAY, TEXT_COLOR_DARK_GRAY},
{TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GREY} {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GRAY}
}; };
static const struct WindowTemplate sWindowTemplates[] = { static const struct WindowTemplate sWindowTemplates[] = {
src/map_preview_screen.c
+1 -1
View File
@@ -455,7 +455,7 @@ u16 MapPreview_CreateMapNameWindow(u8 mapsec)
PutWindowTilemap(windowId); PutWindowTilemap(windowId);
color[0] = TEXT_COLOR_WHITE; // Access violation color[0] = TEXT_COLOR_WHITE; // Access violation
color[1] = TEXT_COLOR_RED; // Access violation color[1] = TEXT_COLOR_RED; // Access violation
color[2] = TEXT_COLOR_LIGHT_GREY; // Access violation color[2] = TEXT_COLOR_LIGHT_GRAY; // Access violation
GetMapName(gStringVar4, mapsec, 0); GetMapName(gStringVar4, mapsec, 0);
xctr = 104 - GetStringWidth(2, gStringVar4, 0); xctr = 104 - GetStringWidth(2, gStringVar4, 0);
AddTextPrinterParameterized4(windowId, 2, xctr / 2, 2, 0, 0, color/* Access violation */, -1, gStringVar4); AddTextPrinterParameterized4(windowId, 2, xctr / 2, 2, 0, 0, color/* Access violation */, -1, gStringVar4);
src/naming_screen.c
+5 -5
View File
@@ -706,7 +706,7 @@ static void pokemon_transfer_to_pc_with_message(void)
StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]); StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]);
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
gTextFlags.canABSpeedUpPrint = TRUE; gTextFlags.canABSpeedUpPrint = TRUE;
AddTextPrinterParameterized2(0, 2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_BOTH); CopyWindowToVram(0, COPYWIN_BOTH);
} }
@@ -1814,9 +1814,9 @@ struct TextColor // Needed because of alignment
static const struct TextColor sTextColorStruct = { static const struct TextColor sTextColorStruct = {
{ {
{TEXT_DYNAMIC_COLOR_4, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}, {TEXT_DYNAMIC_COLOR_4, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY},
{TEXT_DYNAMIC_COLOR_5, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}, {TEXT_DYNAMIC_COLOR_5, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY},
{TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY} {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY}
} }
}; };
@@ -1880,7 +1880,7 @@ static void sub_809FA60(void)
static void sub_809FAE4(void) static void sub_809FAE4(void)
{ {
const u8 color[3] = { TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY }; const u8 color[3] = { TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY };
int strwidth = GetStringWidth(0, gText_MoveOkBack, 0); int strwidth = GetStringWidth(0, gText_MoveOkBack, 0);
FillWindowPixelBuffer(sNamingScreenData->windows[4], PIXEL_FILL(15)); FillWindowPixelBuffer(sNamingScreenData->windows[4], PIXEL_FILL(15));
src/option_menu.c
+1 -1
View File
@@ -176,7 +176,7 @@ static const u8 *const sButtonTypeOptions[] =
gText_ButtonTypeLEqualsA gText_ButtonTypeLEqualsA
}; };
static const u8 sOptionMenuPickSwitchCancelTextColor[] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; static const u8 sOptionMenuPickSwitchCancelTextColor[] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY};
static const u8 sOptionMenuTextColor[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_RED, TEXT_COLOR_RED}; static const u8 sOptionMenuTextColor[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_RED, TEXT_COLOR_RED};
// Functions // Functions
src/pokemon_jump_4.c
+3 -3
View File
@@ -667,7 +667,7 @@ static void sub_814A7D0(u16 left, u16 top, u8 cursorPos)
static void sub_814A84C(void) static void sub_814A84C(void)
{ {
u8 color[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY}; u8 color[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY};
PutWindowTilemap(0); PutWindowTilemap(0);
PutWindowTilemap(1); PutWindowTilemap(1);
@@ -867,7 +867,7 @@ static void sub_814AC30(bool32 arg0)
if (!arg0) if (!arg0)
{ {
for (i = 0; i < playersCount; i++) for (i = 0; i < playersCount; i++)
sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY); sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY);
} }
else else
{ {
@@ -875,7 +875,7 @@ static void sub_814AC30(bool32 arg0)
for (i = 0; i < playersCount; i++) for (i = 0; i < playersCount; i++)
{ {
if (var != i) if (var != i)
sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY); sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY);
else else
sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED); sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED);
} }
src/pokemon_special_anim_scene.c
+2 -2
View File
@@ -610,13 +610,13 @@ bool8 PSA_LevelUpVerticalSpritesTaskIsRunning(void)
UNUSED void PSA_DrawLevelUpWindowPg1(u16 *statsBefore, u16 *statsAfter) UNUSED void PSA_DrawLevelUpWindowPg1(u16 *statsBefore, u16 *statsAfter)
{ {
DrawTextBorderOuter(1, 0x001, 0xE); DrawTextBorderOuter(1, 0x001, 0xE);
DrawLevelUpWindowPg1(1, statsBefore, statsAfter, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY); DrawLevelUpWindowPg1(1, statsBefore, statsAfter, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY);
PutWindowTilemap(1); PutWindowTilemap(1);
CopyWindowToVram(1, COPYWIN_BOTH); CopyWindowToVram(1, COPYWIN_BOTH);
} }
UNUSED void PSA_DrawLevelUpWindowPg2(u16 *currStats) UNUSED void PSA_DrawLevelUpWindowPg2(u16 *currStats)
{ {
DrawLevelUpWindowPg2(1, currStats, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY); DrawLevelUpWindowPg2(1, currStats, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(1, COPYWIN_GFX); CopyWindowToVram(1, COPYWIN_GFX);
} }
src/pokemon_storage_system_2.c
+7 -7
View File
@@ -245,7 +245,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
LoadStdWindowFrameGfx(); LoadStdWindowFrameGfx();
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, TEXT_SPEED_FF, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, TEXT_SPEED_FF, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_BOTH); CopyWindowToVram(0, COPYWIN_BOTH);
CopyWindowToVram(task->data[15], COPYWIN_BOTH); CopyWindowToVram(task->data[15], COPYWIN_BOTH);
task->data[0]++; task->data[0]++;
@@ -271,7 +271,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
{ {
task->data[1] = task->data[3]; task->data[1] = task->data[3];
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
break; break;
case MENU_B_PRESSED: case MENU_B_PRESSED:
@@ -286,13 +286,13 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
if (task->data[2] == 0 && CountPartyMons() == PARTY_SIZE) if (task->data[2] == 0 && CountPartyMons() == PARTY_SIZE)
{ {
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, gText_PartyFull, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gText_PartyFull, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->data[0] = 3; task->data[0] = 3;
} }
else if (task->data[2] == 1 && CountPartyMons() == 1) else if (task->data[2] == 1 && CountPartyMons() == 1)
{ {
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, gText_JustOnePkmn, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gText_JustOnePkmn, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->data[0] = 3; task->data[0] = 3;
} }
else else
@@ -307,7 +307,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
if (JOY_NEW(A_BUTTON | B_BUTTON)) if (JOY_NEW(A_BUTTON | B_BUTTON))
{ {
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->data[0] = 2; task->data[0] = 2;
} }
else if (JOY_NEW(DPAD_UP)) else if (JOY_NEW(DPAD_UP))
@@ -317,7 +317,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
Menu_MoveCursor(-1); Menu_MoveCursor(-1);
task->data[1] = Menu_GetCursorPos(); task->data[1] = Menu_GetCursorPos();
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->data[0] = 2; task->data[0] = 2;
} }
else if (JOY_NEW(DPAD_DOWN)) else if (JOY_NEW(DPAD_DOWN))
@@ -327,7 +327,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
Menu_MoveCursor(1); Menu_MoveCursor(1);
task->data[1] = Menu_GetCursorPos(); task->data[1] = Menu_GetCursorPos();
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->data[0] = 2; task->data[0] = 2;
} }
break; break;
src/pokemon_storage_system_5.c
+4 -4
View File
@@ -1114,18 +1114,18 @@ static void SetCursorMonData(void *pokemon, u8 mode)
*(txtPtr)++ = CHAR_FEMALE; *(txtPtr)++ = CHAR_FEMALE;
break; break;
default: default:
*(txtPtr)++ = TEXT_COLOR_DARK_GREY; *(txtPtr)++ = TEXT_COLOR_DARK_GRAY;
*(txtPtr)++ = TEXT_COLOR_WHITE; *(txtPtr)++ = TEXT_COLOR_WHITE;
*(txtPtr)++ = TEXT_COLOR_LIGHT_GREY; *(txtPtr)++ = TEXT_COLOR_LIGHT_GRAY;
*(txtPtr)++ = CHAR_SPACE; *(txtPtr)++ = CHAR_SPACE;
break; break;
} }
*(txtPtr++) = EXT_CTRL_CODE_BEGIN; *(txtPtr++) = EXT_CTRL_CODE_BEGIN;
*(txtPtr++) = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW; *(txtPtr++) = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW;
*(txtPtr++) = TEXT_COLOR_DARK_GREY; *(txtPtr++) = TEXT_COLOR_DARK_GRAY;
*(txtPtr++) = TEXT_COLOR_WHITE; *(txtPtr++) = TEXT_COLOR_WHITE;
*(txtPtr++) = TEXT_COLOR_LIGHT_GREY; *(txtPtr++) = TEXT_COLOR_LIGHT_GRAY;
*(txtPtr++) = CHAR_SPACE; *(txtPtr++) = CHAR_SPACE;
*(txtPtr++) = CHAR_EXTRA_EMOJI; *(txtPtr++) = CHAR_EXTRA_EMOJI;
*(txtPtr++) = 5; // LV_2 *(txtPtr++) = 5; // LV_2
src/region_map.c
+4 -4
View File
@@ -511,9 +511,9 @@ static const struct WindowTemplate sRegionMapWindowTemplates[] = {
}, DUMMY_WIN_TEMPLATE }, DUMMY_WIN_TEMPLATE
}; };
ALIGNED(4) const u8 sTextColor_White[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; ALIGNED(4) const u8 sTextColor_White[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY};
ALIGNED(4) const u8 sTextColor_Green[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREEN, TEXT_COLOR_DARK_GREY}; ALIGNED(4) const u8 sTextColor_Green[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREEN, TEXT_COLOR_DARK_GRAY};
ALIGNED(4) const u8 sTextColor_Red[] = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GREY}; ALIGNED(4) const u8 sTextColor_Red[] = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GRAY};
static const u8 *const sTextColorTable[] = { static const u8 *const sTextColorTable[] = {
[MAPSECTYPE_VISITED - 2] = sTextColor_Green, [MAPSECTYPE_VISITED - 2] = sTextColor_Green,
@@ -812,7 +812,7 @@ static const u8 sWinRegs[][2] = {
{REG_OFFSET_WIN1V, REG_OFFSET_WIN1H} {REG_OFFSET_WIN1V, REG_OFFSET_WIN1H}
}; };
static const u8 sTextColors[] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; static const u8 sTextColors[] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY};
static const u8 *const sMapNames[] = { static const u8 *const sMapNames[] = {
[MAPSEC_PALLET_TOWN - MAPSECS_KANTO] = gMapSecName_PalletTown, [MAPSEC_PALLET_TOWN - MAPSECS_KANTO] = gMapSecName_PalletTown,
src/save_failed_screen.c
+1 -1
View File
@@ -153,7 +153,7 @@ static void ClearMapBuffer(void)
static void PrintTextOnSaveFailedScreen(const u8 *str) static void PrintTextOnSaveFailedScreen(const u8 *str)
{ {
GenerateFontHalfRowLookupTable(TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); GenerateFontHalfRowLookupTable(TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CpuFill16(PIXEL_FILL(1) | (PIXEL_FILL(1) << 8), gDecompressionBuffer + 0x20, 0x2300); CpuFill16(PIXEL_FILL(1) | (PIXEL_FILL(1) << 8), gDecompressionBuffer + 0x20, 0x2300);
HelpSystemRenderText(2, gDecompressionBuffer + 0x20, str, 2, 2, 28, 10); HelpSystemRenderText(2, gDecompressionBuffer + 0x20, str, 2, 2, 28, 10);
RequestDmaCopyFromCharBuffer(); RequestDmaCopyFromCharBuffer();
src/slot_machine.c
+1 -1
View File
@@ -1991,7 +1991,7 @@ static bool8 SlotsTask_GraphicsInit(u8 * state, struct SlotMachineSetupTaskData
x = 236 - GetStringWidth(0, gString_SlotMachineControls, 0); x = 236 - GetStringWidth(0, gString_SlotMachineControls, 0);
textColor[0] = TEXT_DYNAMIC_COLOR_6; textColor[0] = TEXT_DYNAMIC_COLOR_6;
textColor[1] = TEXT_COLOR_WHITE; textColor[1] = TEXT_COLOR_WHITE;
textColor[2] = TEXT_COLOR_DARK_GREY; textColor[2] = TEXT_COLOR_DARK_GRAY;
AddTextPrinterParameterized3(1, 0, x, 0, textColor, 0, gString_SlotMachineControls); AddTextPrinterParameterized3(1, 0, x, 0, textColor, 0, gString_SlotMachineControls);
CopyBgTilemapBufferToVram(0); CopyBgTilemapBufferToVram(0);
src/strings.c
+7 -7
View File
@@ -760,9 +760,9 @@ const u8 gUnknown_8418C62[] = _("なにも かわらなかった!");
const u8 gUnknown_8418C6F[] = _("もう これいじょう たべない みたい‥"); const u8 gUnknown_8418C6F[] = _("もう これいじょう たべない みたい‥");
const u8 gText_SaveFailedScreen_CheckingBackupMemory[] = _("Save failed.\nChecking the backup memory‥\nPlease wait.\n“Time required:\nabout 1 minute”"); const u8 gText_SaveFailedScreen_CheckingBackupMemory[] = _("Save failed.\nChecking the backup memory‥\nPlease wait.\n“Time required:\nabout 1 minute”");
const u8 gText_SaveFailedScreen_BackupMemoryDamaged[] = _("The backup memory is damaged or\nthe game's battery has run dry.\nThe game can be played, but its\nprogress cannot be saved.\n“Please press the A Button.”"); const u8 gText_SaveFailedScreen_BackupMemoryDamaged[] = _("The backup memory is damaged or\nthe game's battery has run dry.\nThe game can be played, but its\nprogress cannot be saved.\n“Please press the A Button.”");
const u8 gUnknown_8418D70[] = _("{COLOR DARK_GREY}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”"); const u8 gUnknown_8418D70[] = _("{COLOR DARK_GRAY}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”");
const u8 gUnknown_8418D99[] = _("けんさが しゅうりょうしました!\nもういちど レポ-トを かきこみます\nしばらくおまちください"); const u8 gUnknown_8418D99[] = _("けんさが しゅうりょうしました!\nもういちど レポ-トを かきこみます\nしばらくおまちください");
const u8 gUnknown_8418DC9[] = _("レポ-トの かきこみは しゅうりょうしました\n{COLOR DARK_GREY}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”"); const u8 gUnknown_8418DC9[] = _("レポ-トの かきこみは しゅうりょうしました\n{COLOR DARK_GRAY}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”");
const u8 gText_SaveFailedScreen_SaveCompleted[] = _("Save completed.\n“Please press the A Button.”"); const u8 gText_SaveFailedScreen_SaveCompleted[] = _("Save completed.\n“Please press the A Button.”");
const u8 gUnknown_8418E36[] = _("れんらくせん"); const u8 gUnknown_8418E36[] = _("れんらくせん");
const u8 gUnknown_8418E3D[] = _("ひみつきち"); const u8 gUnknown_8418E3D[] = _("ひみつきち");
@@ -1214,10 +1214,10 @@ const u8 gTradeText_CancelTrade[] = _("Cancel trade?");
const u8 gTradeText_PressBButtonToExit[] = _("Press the B Button to exit."); const u8 gTradeText_PressBButtonToExit[] = _("Press the B Button to exit.");
const u8 gUnknown_841E10A[] = _("SUMMARY"); const u8 gUnknown_841E10A[] = _("SUMMARY");
const u8 gUnknown_841E112[] = _("TRADE"); const u8 gUnknown_841E112[] = _("TRADE");
const u8 gUnknown_841E118[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Communication standby…\nPlease wait."); const u8 gUnknown_841E118[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}Communication standby…\nPlease wait.");
const u8 gUnknown_841E145[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}The trade has been canceled."); const u8 gUnknown_841E145[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}The trade has been canceled.");
const u8 gUnknown_841E16B[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}That's your only POKéMON\nfor battle."); const u8 gUnknown_841E16B[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}That's your only POKéMON\nfor battle.");
const u8 gUnknown_841E199[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Waiting for your friend\nto finish…"); const u8 gUnknown_841E199[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}Waiting for your friend\nto finish…");
const u8 gUnknown_841E1C5[] = _("Your friend wants\nto trade POKéMON."); const u8 gUnknown_841E1C5[] = _("Your friend wants\nto trade POKéMON.");
const u8 gText_XWillBeSentToY[] = _("{STR_VAR_2} will be\nsent to {STR_VAR_1}."); const u8 gText_XWillBeSentToY[] = _("{STR_VAR_2} will be\nsent to {STR_VAR_1}.");
const u8 gText_ByeByeVar1[] = _("Bye-bye, {STR_VAR_2}!"); const u8 gText_ByeByeVar1[] = _("Bye-bye, {STR_VAR_2}!");
@@ -1246,7 +1246,7 @@ const u8 gUnknown_841E2C9[] = _("{DYNAMIC 0x02} players");
const u8 gUnknown_841E2D4[] = _("{DYNAMIC 0x03} players"); const u8 gUnknown_841E2D4[] = _("{DYNAMIC 0x03} players");
const u8 gUnknown_841E2DF[] = _("{DPAD_ANY}えらぶ:{A_BUTTON}けってい"); const u8 gUnknown_841E2DF[] = _("{DPAD_ANY}えらぶ:{A_BUTTON}けってい");
const u8 gUnknown_841E2EC[] = _("{B_BUTTON}CANCEL"); const u8 gUnknown_841E2EC[] = _("{B_BUTTON}CANCEL");
const u8 gUnknown_841E2F5[] = _("{COLOR RED}{SHADOW LIGHT_RED} たいせんの くみあわせ\n{COLOR DARK_GREY}{SHADOW LIGHT_GREY}じぶんの ばしょをきめて ください"); const u8 gUnknown_841E2F5[] = _("{COLOR RED}{SHADOW LIGHT_RED} たいせんの くみあわせ\n{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}じぶんの ばしょをきめて ください");
const u8 gUnknown_841E322[] = _("{ID}"); const u8 gUnknown_841E322[] = _("{ID}");
const u8 gText_CommunicationStandby5[] = _("Communication standby…"); const u8 gText_CommunicationStandby5[] = _("Communication standby…");
const u8 gDaycareText_GetAlongVeryWell[] = _("The two seem to get along\nvery well."); const u8 gDaycareText_GetAlongVeryWell[] = _("The two seem to get along\nvery well.");
src/trade.c
+2 -2
View File
@@ -411,7 +411,7 @@ static const u8 gUnknown_8261E92[] = {
}; };
const u8 sText_Dummy[] = _(""); const u8 sText_Dummy[] = _("");
const u8 sText_ClrWhtHltTranspShdwDrkGry[] = _("{COLOR WHITE}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}"); const u8 sText_ClrWhtHltTranspShdwDrkGry[] = _("{COLOR WHITE}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GRAY}");
const u8 gText_MaleSymbol4[] = _("♂"); const u8 gText_MaleSymbol4[] = _("♂");
const u8 gText_FemaleSymbol4[] = _("♀"); const u8 gText_FemaleSymbol4[] = _("♀");
const u8 gText_GenderlessSymbol[] = _(""); const u8 gText_GenderlessSymbol[] = _("");
@@ -455,7 +455,7 @@ static const u8 *const sTradeErrorOrStatusMessagePtrs[] = {
gText_OtherTrainersPkmnCantBeTraded // The other TRAINER's POKéMON can't be traded now gText_OtherTrainersPkmnCantBeTraded // The other TRAINER's POKéMON can't be traded now
}; };
static const u8 sTextColor_PartyMonNickname[] = { TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY }; static const u8 sTextColor_PartyMonNickname[] = { TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY };
static const struct BgTemplate sBgTemplates[] = { static const struct BgTemplate sBgTemplates[] = {
{ {
src/trainer_card.c
+1 -1
View File
@@ -271,7 +271,7 @@ static const u16 *const sKantoTrainerCardStarPals[] =
sKantoTrainerCard4Stars_Pals sKantoTrainerCard4Stars_Pals
}; };
static const u8 sTrainerCardTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY}; static const u8 sTrainerCardTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY};
static const u8 sTrainerCardStatColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED}; static const u8 sTrainerCardStatColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED};
static const u8 sTimeColonInvisibleTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT}; static const u8 sTimeColonInvisibleTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT};
static const u8 sTrainerCardFontIds[] = {0, 2, 0}; static const u8 sTrainerCardFontIds[] = {0, 2, 0};
src/trainer_tower.c
+1 -1
View File
@@ -316,7 +316,7 @@ static const struct WindowTemplate sTimeBoardWindowTemplate[] = {
static const u32 sUnused_847A228 = 0x70; static const u32 sUnused_847A228 = 0x70;
static const u8 sTextColors[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY}; static const u8 sTextColors[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY};
static void (*const sTrainerTowerFunctions[])(void) = { static void (*const sTrainerTowerFunctions[])(void) = {
[TRAINER_TOWER_FUNC_INIT_FLOOR] = InitTrainerTowerFloor, [TRAINER_TOWER_FUNC_INIT_FLOOR] = InitTrainerTowerFloor,
src/union_room.c
+5 -5
View File
@@ -3993,9 +3993,9 @@ static void UR_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str
case UR_COLOR_DKE_WHT_LTE: case UR_COLOR_DKE_WHT_LTE:
printerTemplate.letterSpacing = 0; printerTemplate.letterSpacing = 0;
printerTemplate.lineSpacing = 0; printerTemplate.lineSpacing = 0;
printerTemplate.fgColor = TEXT_COLOR_DARK_GREY; printerTemplate.fgColor = TEXT_COLOR_DARK_GRAY;
printerTemplate.bgColor = TEXT_COLOR_WHITE; printerTemplate.bgColor = TEXT_COLOR_WHITE;
printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GREY; printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GRAY;
break; break;
case UR_COLOR_RED_WHT_LTR: case UR_COLOR_RED_WHT_LTR:
printerTemplate.letterSpacing = 0; printerTemplate.letterSpacing = 0;
@@ -4016,14 +4016,14 @@ static void UR_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str
printerTemplate.lineSpacing = 0; printerTemplate.lineSpacing = 0;
printerTemplate.fgColor = TEXT_COLOR_WHITE; printerTemplate.fgColor = TEXT_COLOR_WHITE;
printerTemplate.bgColor = TEXT_COLOR_WHITE; printerTemplate.bgColor = TEXT_COLOR_WHITE;
printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GREY; printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GRAY;
break; break;
case UR_COLOR_WHT_DKE_LTE: case UR_COLOR_WHT_DKE_LTE:
printerTemplate.letterSpacing = 0; printerTemplate.letterSpacing = 0;
printerTemplate.lineSpacing = 0; printerTemplate.lineSpacing = 0;
printerTemplate.fgColor = TEXT_COLOR_WHITE; printerTemplate.fgColor = TEXT_COLOR_WHITE;
printerTemplate.bgColor = TEXT_COLOR_DARK_GREY; printerTemplate.bgColor = TEXT_COLOR_DARK_GRAY;
printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GREY; printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GRAY;
break; break;
case UR_COLOR_GRN_DN6_LTB: case UR_COLOR_GRN_DN6_LTB:
printerTemplate.letterSpacing = 0; printerTemplate.letterSpacing = 0;
src/union_room_chat_display.c
+2 -2
View File
@@ -600,7 +600,7 @@ static bool32 DisplaySubtask_UpdateMessageBuffer(u8 *state)
UnionRoomChat_GetBufferSelectionRegion(&start, &length); UnionRoomChat_GetBufferSelectionRegion(&start, &length);
FillWin1Rect(start, length, PIXEL_FILL(0)); FillWin1Rect(start, length, PIXEL_FILL(0));
str = UnionRoomChat_GetMessageEntryBuffer(); str = UnionRoomChat_GetMessageEntryBuffer();
PrintOnWin1Parameterized(0, str, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY); PrintOnWin1Parameterized(0, str, TEXT_COLOR_LIGHT_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY);
CopyWindowToVram(1, COPYWIN_GFX); CopyWindowToVram(1, COPYWIN_GFX);
break; break;
case 1: case 1:
@@ -670,7 +670,7 @@ static bool32 DisplaySubtask_CancelRegister(u8 *state)
str = UnionRoomChat_GetEndOfMessageEntryBuffer(); str = UnionRoomChat_GetEndOfMessageEntryBuffer();
length = StringLength_Multibyte(str); length = StringLength_Multibyte(str);
FillWin1Rect(x, length, PIXEL_FILL(0)); FillWin1Rect(x, length, PIXEL_FILL(0));
PrintOnWin1Parameterized(x, str, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY); PrintOnWin1Parameterized(x, str, TEXT_COLOR_LIGHT_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY);
CopyWindowToVram(1, COPYWIN_GFX); CopyWindowToVram(1, COPYWIN_GFX);
break; break;
case 1: case 1:
src/wireless_communication_status_screen.c
+4 -4
View File
@@ -323,13 +323,13 @@ static void WCSS_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *
{ {
case 0: case 0:
textColor[0] = TEXT_COLOR_TRANSPARENT; textColor[0] = TEXT_COLOR_TRANSPARENT;
textColor[1] = TEXT_COLOR_DARK_GREY; textColor[1] = TEXT_COLOR_DARK_GRAY;
textColor[2] = TEXT_COLOR_LIGHT_GREY; textColor[2] = TEXT_COLOR_LIGHT_GRAY;
break; break;
case 1: case 1:
textColor[0] = TEXT_COLOR_TRANSPARENT; textColor[0] = TEXT_COLOR_TRANSPARENT;
textColor[1] = TEXT_COLOR_WHITE; textColor[1] = TEXT_COLOR_WHITE;
textColor[2] = TEXT_COLOR_LIGHT_GREY; textColor[2] = TEXT_COLOR_LIGHT_GRAY;
break; break;
case 2: case 2:
textColor[0] = TEXT_COLOR_TRANSPARENT; textColor[0] = TEXT_COLOR_TRANSPARENT;
@@ -344,7 +344,7 @@ static void WCSS_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *
case 4: case 4:
textColor[0] = TEXT_COLOR_TRANSPARENT; textColor[0] = TEXT_COLOR_TRANSPARENT;
textColor[1] = TEXT_COLOR_WHITE; textColor[1] = TEXT_COLOR_WHITE;
textColor[2] = TEXT_COLOR_DARK_GREY; textColor[2] = TEXT_COLOR_DARK_GRAY;
break; break;
// default: UB // default: UB
} }