summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--charmap.txt32
-rw-r--r--data/text/fame_checker.inc480
-rw-r--r--include/strings.h2
-rw-r--r--src/berry_crush.c2
-rw-r--r--src/bg.c18
-rw-r--r--src/diploma.c4
-rw-r--r--src/evolution_scene.c2
-rw-r--r--src/item_menu.c4
-rw-r--r--src/librfu_rfu.c20
-rw-r--r--src/strings.c28
-rw-r--r--src/trade.c2
-rw-r--r--src/trainer_tower.c13
12 files changed, 300 insertions, 307 deletions
diff --git a/charmap.txt b/charmap.txt
index a3e698e91..c494e0a87 100644
--- a/charmap.txt
+++ b/charmap.txt
@@ -450,21 +450,23 @@ BIG = FC 06 04
@ colors
TRANSPARENT = 00
-DARK_GREY = 01
-RED = 02
-GREEN = 03
-BLUE = 04
-YELLOW = 05
-CYAN = 06
-MAGENTA = 07
-LIGHT_GRAY = 08
-BLACK = 09
-BLACK2 = 0A @ duplicate of black?
-SILVER = 0B
-WHITE = 0C
-SKY_BLUE = 0D
-LIGHT_BLUE = 0E
-WHITE2 = 0F @ duplicate of white?
+WHITE = 01
+DARK_GREY = 02
+LIGHT_GREY = 03
+RED = 04
+LIGHT_RED = 05
+GREEN = 06
+LIGHT_GREEN = 07
+BLUE = 08
+LIGHT_BLUE = 09
+@ these next colors can be set to anything arbitrary at runtime
+@ usually though they'll have the textbox border colors as described below
+DYNAMIC_COLOR1 = 0A @ white
+DYNAMIC_COLOR2 = 0B @ white with a tinge of green
+DYNAMIC_COLOR3 = 0C @ white 2
+DYNAMIC_COLOR4 = 0D @ aquamarine
+DYNAMIC_COLOR5 = 0E @ blue-green
+DYNAMIC_COLOR6 = 0F @ cerulean
@ sound
diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc
index 9fbe05652..6f3d5eabc 100644
--- a/data/text/fame_checker.inc
+++ b/data/text/fame_checker.inc
@@ -1,28 +1,28 @@
gFameCheckerFlavorText_ProfOak0:: @ 0x81AD106
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{COLOR RED}{SHADOW GREEN}OAK POKéMON RESEARCH LAB$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
+ .string "{COLOR DARK_GREY}{SHADOW LIGHT_GREY}OAK POKéMON RESEARCH LAB$"
gFameCheckerFlavorText_ProfOak1:: @ 0x81AD145
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}To make a complete guide on all\n"
+ .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 "the POKéMON in the world…\p"
.string "That was my dream!$"
gFameCheckerFlavorText_ProfOak2:: @ 0x81AD1BB
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}PROF. OAK may not look like much,\n"
+ .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 "but he's the authority on POKéMON.\p"
.string "Many POKéMON TRAINERS hold him in\n"
.string "high regard.$"
gFameCheckerFlavorText_ProfOak3:: @ 0x81AD258
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
- .string "{COLOR RED}{SHADOW GREEN}PROF. OAK reportedly lives with his\n"
+ .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 "grandchildren, DAISY and {RIVAL}.$"
gFameCheckerFlavorText_ProfOak4:: @ 0x81AD2B9
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I hear OAK's taken a lot of\n"
+ .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 "interest in you, child.\p"
.string "That old duff was once tough and\n"
.string "handsome.\p"
@@ -30,58 +30,58 @@ gFameCheckerFlavorText_ProfOak4:: @ 0x81AD2B9
.string "He's a shadow of his former self.$"
gFameCheckerFlavorText_ProfOak5:: @ 0x81AD377
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}PROF. OAK is going to have his own\n"
+ .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 "radio show soon.\p"
.string "The program will be called PROF.\n"
.string "OAK'S POKéMON SEMINAR.$"
gFameCheckerFlavorText_Daisy0:: @ 0x81AD40C
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}If you show DAISY your POKéMON,\n"
+ .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 "she can tell how much it likes you.\p"
.string "Occasionally, she will even groom\n"
.string "a POKéMON for you.$"
gFameCheckerFlavorText_Daisy1:: @ 0x81AD4AE
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}But the person who is most liked by\n"
+ .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 "POKéMON is DAISY, I think.$"
gFameCheckerFlavorText_Daisy2:: @ 0x81AD516
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}She was gently grooming POKéMON…\n"
+ .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 "She was a little angel.\p"
.string "That little girl's name…\n"
.string "I think it was DAISY.$"
gFameCheckerFlavorText_Daisy3:: @ 0x81AD5A7
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
- .string "{COLOR RED}{SHADOW GREEN}PROF. OAK reportedly lives with his\n"
+ .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 "grandchildren, DAISY and {RIVAL}.$"
gFameCheckerFlavorText_Daisy4:: @ 0x81AD608
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}A girl from PALLET TOWN, DAISY,\n"
+ .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 "she enjoys TEA every day.\p"
.string "She visits the CELADON DEPT. STORE\n"
.string "to buy some TEA.$"
gFameCheckerFlavorText_Daisy5:: @ 0x81AD69F
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
- .string "{COLOR RED}{SHADOW GREEN}The Spring POKéMON CONTEST's\n"
+ .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 "Grand Champion is DAISY OAK of\l"
.string "PALLET TOWN!$"
gFameCheckerFlavorText_Brock0:: @ 0x81AD705
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{COLOR RED}{SHADOW GREEN}PEWTER CITY POKéMON GYM\n"
+ .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 "LEADER: BROCK\l"
.string "The Rock-Solid POKéMON TRAINER!$"
gFameCheckerFlavorText_Brock1:: @ 0x81AD771
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}My rock-hard willpower is evident\n"
+ .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 "in even my POKéMON.\p"
.string "My POKéMON are all rock hard and\n"
.string "have true-grit determination.\p"
@@ -89,8 +89,8 @@ gFameCheckerFlavorText_Brock1:: @ 0x81AD771
.string "the ROCK type!$"
gFameCheckerFlavorText_Brock2:: @ 0x81AD840
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}There aren't many serious POKéMON\n"
+ .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 "TRAINERS here.\p"
.string "They're all like BUG CATCHERS,\n"
.string "you know, just hobbyists.\p"
@@ -98,164 +98,164 @@ gFameCheckerFlavorText_Brock2:: @ 0x81AD840
.string "that, not one bit.$"
gFameCheckerFlavorText_Brock3:: @ 0x81AD908
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BROCK is cool. He's not just tough.\n"
+ .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 "People like and respect him.\p"
.string "I want to become a GYM LEADER\n"
.string "like him.$"
gFameCheckerFlavorText_Brock4:: @ 0x81AD99A
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Hi, I'm excavating for fossils here\n"
+ .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 "under MT. MOON.\p"
.string "Sometimes, BROCK of PEWTER GYM\n"
.string "lends me a hand.$"
gFameCheckerFlavorText_Brock5:: @ 0x81ADA27
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{COLOR RED}{SHADOW GREEN}BROCK rarely laughs, but is said to\n"
+ .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 "be unable to stop if he starts.$"
gFameCheckerFlavorText_Misty0:: @ 0x81ADA91
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{COLOR RED}{SHADOW GREEN}CERULEAN CITY POKéMON GYM\n"
+ .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 "LEADER: MISTY\l"
.string "The Tomboyish Mermaid!$"
gFameCheckerFlavorText_Misty1:: @ 0x81ADAF6
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}My policy is an all-out offensive\n"
+ .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 "with WATER-type POKéMON!$"
gFameCheckerFlavorText_Misty2:: @ 0x81ADB5A
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}MISTY is a TRAINER who's going to\n"
+ .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 "keep improving.\p"
.string "She won't lose to someone like you!$"
gFameCheckerFlavorText_Misty3:: @ 0x81ADBD9
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Strong TRAINERS and WATER POKéMON\n"
+ .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 "are common sights in these parts.\p"
.string "They say that MISTY of the\n"
.string "CERULEAN GYM trains here.$"
gFameCheckerFlavorText_Misty4:: @ 0x81ADC72
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}This cape is a famous date spot.\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 "MISTY, the GYM LEADER, has high\n"
.string "hopes about this place.$"
gFameCheckerFlavorText_Misty5:: @ 0x81ADCEB
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
- .string "{COLOR RED}{SHADOW GREEN}MISTY is said to worship LORELEI\n"
+ .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 "of the ELITE FOUR.$"
gFameCheckerFlavorText_LtSurge0:: @ 0x81ADD3C
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{COLOR RED}{SHADOW GREEN}VERMILION CITY POKéMON GYM\n"
+ .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 "LEADER: LT. SURGE\l"
.string "The Lightning American!$"
gFameCheckerFlavorText_LtSurge1:: @ 0x81ADDA7
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I tell you, kid, electric POKéMON\n"
+ .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 "saved me during the war!$"
gFameCheckerFlavorText_LtSurge2:: @ 0x81ADE0B
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}When I was in the Army, LT. SURGE\n"
+ .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 "was my strict CO.\p"
.string "He was a hard taskmaster.$"
gFameCheckerFlavorText_LtSurge3:: @ 0x81ADE82
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}LT. SURGE was always famous for\n"
+ .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 "his cautious nature in the Army.$"
gFameCheckerFlavorText_LtSurge4:: @ 0x81ADEEC
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}LT. SURGE installed the traps in\n"
+ .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 "the GYM himself.\p"
.string "He set up double locks everywhere.$"
gFameCheckerFlavorText_LtSurge5:: @ 0x81ADF6A
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
- .string "{COLOR RED}{SHADOW GREEN}LT. SURGE is rumored to have been\n"
+ .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 "a pilot while home in America.\p"
.string "He used the electricity generated\n"
.string "by POKéMON to power his plane.$"
gFameCheckerFlavorText_Erika0:: @ 0x81AE009
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{COLOR RED}{SHADOW GREEN}CELADON CITY POKéMON GYM\n"
+ .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 "LEADER: ERIKA\l"
.string "The Nature-Loving Princess!$"
gFameCheckerFlavorText_Erika1:: @ 0x81AE072
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I am a student of the art of\n"
+ .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 "flower arranging.\p"
.string "My POKéMON are solely of the\n"
.string "GRASS type.$"
gFameCheckerFlavorText_Erika2:: @ 0x81AE0F3
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}Our LEADER ERIKA might be quiet,\n"
+ .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 "but she's famous around here.$"
gFameCheckerFlavorText_Erika3:: @ 0x81AE15B
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}We only use GRASS-type POKéMON at\n"
+ .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 "our GYM.\p"
.string "Why? We also use them for making\n"
.string "flower arrangements!$"
gFameCheckerFlavorText_Erika4:: @ 0x81AE1E5
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I would never collect POKéMON if\n"
+ .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 "they were unattractive.$"
gFameCheckerFlavorText_Erika5:: @ 0x81AE247
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
- .string "{COLOR RED}{SHADOW GREEN}Rumor has it that if you peek into\n"
+ .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 "CELADON GYM, you can often\l"
.string "see ERIKA snoozing.$"
gFameCheckerFlavorText_Koga0:: @ 0x81AE2B6
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{COLOR RED}{SHADOW GREEN}FUCHSIA CITY POKéMON GYM\n"
+ .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 "LEADER: KOGA\l"
.string "The Poisonous Ninja Master$"
gFameCheckerFlavorText_Koga1:: @ 0x81AE31D
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Despair to the creeping horror of\n"
+ .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 "POISON-type POKéMON!$"
gFameCheckerFlavorText_Koga2:: @ 0x81AE37D
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Even though I've lost, I will keep\n"
+ .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 "training according to the teachings\l"
.string "of KOGA, my ninja master.$"
gFameCheckerFlavorText_Koga3:: @ 0x81AE407
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}My father is the GYM LEADER of\n"
+ .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 "this town.\p"
.string "I'm training to use POISON POKéMON\n"
.string "as well as my father.$"
gFameCheckerFlavorText_Koga4:: @ 0x81AE48D
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
- .string "{COLOR RED}{SHADOW GREEN}KOGA is said to have a thorough\n"
+ .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 "knowledge of medicine.\p"
.string "He even concocts medicine to nurse\n"
.string "his POKéMON to health.$"
gFameCheckerFlavorText_Koga5:: @ 0x81AE51B
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}The SAFARI ZONE's huge, wouldn't\n"
+ .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 "you say?\p"
.string "FUCHSIA's GYM LEADER, KOGA, \n"
.string "patrols the grounds every so often.\p"
@@ -263,56 +263,56 @@ gFameCheckerFlavorText_Koga5:: @ 0x81AE51B
.string "knowing that we're safe.$"
gFameCheckerFlavorText_Sabrina0:: @ 0x81AE5E8
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{COLOR RED}{SHADOW GREEN}SAFFRON CITY POKéMON GYM\n"
+ .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 "LEADER: SABRINA\l"
.string "The Master of PSYCHIC POKéMON!$"
gFameCheckerFlavorText_Sabrina1:: @ 0x81AE656
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}You know about a girl GYM LEADER\n"
+ .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 "in SAFFRON CITY?\p"
.string "She uses PSYCHIC-type POKéMON,\n"
.string "right?$"
gFameCheckerFlavorText_Sabrina2:: @ 0x81AE6D7
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I have had psychic powers since\n"
+ .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 "I was a child.\p"
.string "It started when a spoon I\n"
.string "carelessly tossed, bent.$"
gFameCheckerFlavorText_Sabrina3:: @ 0x81AE762
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I dislike battling, but if you wish,\n"
+ .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 "I will show you my powers!$"
gFameCheckerFlavorText_Sabrina4:: @ 0x81AE7CB
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
- .string "{COLOR RED}{SHADOW GREEN}People say that SABRINA can\n"
+ .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 "communicate with her POKéMON\l"
.string "during battle without speaking.$"
gFameCheckerFlavorText_Sabrina5:: @ 0x81AE841
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}SABRINA just wiped out the KARATE\n"
+ .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 "MASTER next door.$"
gFameCheckerFlavorText_Blaine0:: @ 0x81AE89E
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{COLOR RED}{SHADOW GREEN}CINNABAR ISLAND POKéMON GYM\n"
+ .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 "LEADER: BLAINE\l"
.string "The Hotheaded Quiz Master!$"
gFameCheckerFlavorText_Blaine1:: @ 0x81AE90A
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}My fiery POKéMON are all rough\n"
+ .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 "and ready with intense heat!\p"
.string "They incinerate all challengers!$"
gFameCheckerFlavorText_Blaine2:: @ 0x81AE990
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Our LEADER, BLAINE, became lost\n"
+ .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 "in the mountains but good.\p"
.string "Night fell when a fiery bird\n"
.string "POKéMON appeared.\p"
@@ -320,57 +320,57 @@ gFameCheckerFlavorText_Blaine2:: @ 0x81AE990
.string "his way down safely.$"
gFameCheckerFlavorText_Blaine3:: @ 0x81AEA59
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}CINNABAR GYM's BLAINE is quite the\n"
+ .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 "odd fellow.\p"
.string "He's lived on the island since way\n"
.string "before the LAB was built.$"
gFameCheckerFlavorText_Blaine4:: @ 0x81AEAEE
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
- .string "{COLOR RED}{SHADOW GREEN}It's a photo of BLAINE and\n"
+ .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 "MR. FUJI.\p"
.string "They're standing shoulder to\n"
.string "shoulder with big grins.$"
gFameCheckerFlavorText_Blaine5:: @ 0x81AEB69
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
- .string "{COLOR RED}{SHADOW GREEN}BLAINE is said to remove his dark\n"
+ .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 "shades only when he is thinking up\l"
.string "new quiz questions.$"
gFameCheckerFlavorText_Lorelei0:: @ 0x81AEBDF
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I am LORELEI of the ELITE FOUR.$"
+ .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.$"
gFameCheckerFlavorText_Lorelei1:: @ 0x81AEC28
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}No one can best me when it comes\n"
+ .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 "to icy POKéMON.$"
gFameCheckerFlavorText_Lorelei2:: @ 0x81AEC82
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Where was this person born?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}We've had a great and powerful\n"
+ .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 "TRAINER grow up on this island.\p"
.string "I bet even you'd know her.\n"
.string "It's LORELEI of the ELITE FOUR!$"
gFameCheckerFlavorText_Lorelei3:: @ 0x81AED27
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{COLOR RED}{SHADOW GREEN}Known for her logical, calculated,\n"
+ .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 "and cool battling style, LORELEI\l"
.string "has a surprising secret!$"
gFameCheckerFlavorText_Lorelei4:: @ 0x81AEDAA
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}Did you know that LORELEI has lots\n"
+ .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 "and lots of stuffed dolls?\p"
.string "Every time she comes back to\n"
.string "FOUR ISLAND, her collection grows!$"
gFameCheckerFlavorText_Lorelei5:: @ 0x81AEE51
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}The LAPRAS she has, I imagine it\n"
+ .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 "to be the one she met as a child.\p"
.string "I believe it was in ICEFALL CAVE\n"
.string "that she caught it.\p"
@@ -378,66 +378,66 @@ gFameCheckerFlavorText_Lorelei5:: @ 0x81AEE51
.string "her ever since.$"
gFameCheckerFlavorText_Bruno0:: @ 0x81AEF25
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I am BRUNO of the ELITE FOUR!$"
+ .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!$"
gFameCheckerFlavorText_Bruno1:: @ 0x81AEF6C
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I've lived and trained with my\n"
+ .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 "fighting POKéMON!$"
gFameCheckerFlavorText_Bruno2:: @ 0x81AEFC6
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{COLOR RED}{SHADOW GREEN}BRUNO apparently joined the ELITE\n"
+ .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 "FOUR out of his burning ambition to\l"
.string "battle the best TRAINERS.$"
gFameCheckerFlavorText_Bruno3:: @ 0x81AF04C
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BRUNO, who's a senior ahead of me,\n"
+ .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 "visits the SPA on occasion.\p"
.string "He comes to rehab injuries, both\n"
.string "his own and his POKéMON's.$"
gFameCheckerFlavorText_Bruno4:: @ 0x81AF0F0
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}He's one of the ELITE FOUR.\n"
+ .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 "His name is BRUNO.\p"
.string "He went away disappointed when he\n"
.string "found out that they were all sold\l"
.string "out of Rage Candybars.$"
gFameCheckerFlavorText_Bruno5:: @ 0x81AF19A
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Even BRUNO…\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
+ .string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Even BRUNO…\n"
.string "He trained with a fellow by the\l"
.string "name of BRAWLY before.$"
gFameCheckerFlavorText_Agatha0:: @ 0x81AF200
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I am AGATHA of the ELITE FOUR.$"
+ .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.$"
gFameCheckerFlavorText_Agatha1:: @ 0x81AF248
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}AGATHA's GHOST-type POKéMON are\n"
+ .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 "horrifically terrifying in toughness.$"
gFameCheckerFlavorText_Agatha2:: @ 0x81AF2B7
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}That old lady's also got a really\n"
+ .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 "short fuse, too.\p"
.string "It doesn't take anything to get\n"
.string "that scary lady hollering.$"
gFameCheckerFlavorText_Agatha3:: @ 0x81AF34E
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
- .string "{COLOR RED}{SHADOW GREEN}In her youth, AGATHA and PROF.\n"
+ .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 "OAK were rivals who vied for\l"
.string "supremacy as TRAINERS.$"
gFameCheckerFlavorText_Agatha4:: @ 0x81AF3BE
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I hear OAK's taken a lot of\n"
+ .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 "interest in you, child.\p"
.string "That old duff was once tough and\n"
.string "handsome.\p"
@@ -445,20 +445,20 @@ gFameCheckerFlavorText_Agatha4:: @ 0x81AF3BE
.string "He's a shadow of his former self.$"
gFameCheckerFlavorText_Agatha5:: @ 0x81AF47C
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}Take AGATHA, for example.\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 "She set a record for being the\n"
.string "oldest-ever ELITE FOUR member.$"
gFameCheckerFlavorText_Lance0:: @ 0x81AF4FD
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I lead the ELITE FOUR.\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 "You can call me LANCE the dragon\n"
.string "TRAINER.$"
gFameCheckerFlavorText_Lance1:: @ 0x81AF567
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}You know that dragons are\n"
+ .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 "mythical POKéMON.\p"
.string "They're hard to catch and raise,\n"
.string "but their powers are superior.\p"
@@ -466,77 +466,77 @@ gFameCheckerFlavorText_Lance1:: @ 0x81AF567
.string "There's no being clever with them.$"
gFameCheckerFlavorText_Lance2:: @ 0x81AF641
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}He stands for justice!\n"
+ .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 "He's cool, and yet passionate!\l"
.string "He's the greatest, LANCE!$"
gFameCheckerFlavorText_Lance3:: @ 0x81AF6BA
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}We have a customer, LANCE, who\n"
+ .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 "occasionally comes.\p"
.string "He always buys capes.\p"
.string "I wonder… Does he have many\n"
.string "identical capes at home?$"
gFameCheckerFlavorText_Lance4:: @ 0x81AF758
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
- .string "{COLOR RED}{SHADOW GREEN}LANCE's grandfather is thought to\n"
+ .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 "be the elder of a famous clan of\l"
.string "dragon masters.$"
gFameCheckerFlavorText_Lance5:: @ 0x81AF7CB
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}From what I've heard, LANCE has\n"
+ .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 "a cousin who's a GYM LEADER\l"
.string "somewhere far away.$"
gFameCheckerFlavorText_Bill0:: @ 0x81AF83E
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}After all, BILL's world-famous as a\n"
+ .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 "POKéMANIAC.\p"
.string "He invented the POKéMON Storage\n"
.string "System on PC, too.$"
gFameCheckerFlavorText_Bill1:: @ 0x81AF8CA
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BILL has lots of POKéMON!\n"
+ .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 "He collects rare ones, too!$"
gFameCheckerFlavorText_Bill2:: @ 0x81AF929
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}He's my grandson!\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 "He always liked collecting things,\n"
.string "even as a child!$"
gFameCheckerFlavorText_Bill3:: @ 0x81AF998
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BILL is a POKéMANIAC, so he loves\n"
+ .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 "every kind.\p"
.string "Apparently, the first one he caught\n"
.string "was an ABRA.$"
gFameCheckerFlavorText_Bill4:: @ 0x81AFA20
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}BILL's hometown is GOLDENROD CITY,\n"
+ .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 "where his folks still live.\p"
.string "I've heard that it's quite the\n"
.string "festive, bustling city.$"
gFameCheckerFlavorText_Bill5:: @ 0x81AFAB9
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Apparently, BILL simply can't\n"
+ .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 "stomach milk at all.$"
gFameCheckerFlavorText_MrFuji0:: @ 0x81AFB0C
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}He's really kind.\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 "He looks after abandoned and\n"
.string "orphaned POKéMON.$"
gFameCheckerFlavorText_MrFuji1:: @ 0x81AFB76
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}This old guy marched right up to\n"
+ .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 "our HIDEOUT.\p"
.string "Then, he starts ranting about how\n"
.string "TEAM ROCKET's abusing POKéMON.\p"
@@ -544,80 +544,80 @@ gFameCheckerFlavorText_MrFuji1:: @ 0x81AFB76
.string "adults.$"
gFameCheckerFlavorText_MrFuji2:: @ 0x81AFC38
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{COLOR RED}{SHADOW GREEN}POKéMON FAN MAGAZINE\n"
+ .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 "Monthly Grand Prize Drawing!\p"
.string "The application form is…\p"
.string "Gone! It's been clipped out.\n"
.string "Someone must have applied already.$"
gFameCheckerFlavorText_MrFuji3:: @ 0x81AFCE9
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}There's a rumor…\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I hear that MR. FUJI's not from\n"
+ .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 "these parts originally, either.$"
gFameCheckerFlavorText_MrFuji4:: @ 0x81AFD49
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
- .string "{COLOR RED}{SHADOW GREEN}It's a photo of BLAINE and\n"
+ .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 "MR. FUJI.\p"
.string "They're standing shoulder to\n"
.string "shoulder with big grins.$"
gFameCheckerFlavorText_MrFuji5:: @ 0x81AFDC4
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{COLOR RED}{SHADOW GREEN}Editor: The shy MR. FUJI turned\n"
+ .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 "down our interview requests.\p"
.string "He is a kindly man who is adored\n"
.string "and respected in LAVENDER TOWN.$"
gFameCheckerFlavorText_Giovanni0:: @ 0x81AFE68
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}TEAM ROCKET captures POKéMON from\n"
+ .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 "around the world.\p"
.string "They're important tools for keeping\n"
.string "our criminal enterprise going.\p"
.string "I am the leader, GIOVANNI!$"
gFameCheckerFlavorText_Giovanni1:: @ 0x81AFF23
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Favorite kind of POKéMON?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Those thugs that took over our\n"
+ .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 "building…\p"
.string "Their BOSS said he was looking for\n"
.string "strong POKéMON.$"
gFameCheckerFlavorText_Giovanni2:: @ 0x81AFFA8
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What is this person like?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}TEAM ROCKET's BOSS is terribly\n"
+ .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 "cruel!\p"
.string "To him, POKéMON are just tools to\n"
.string "be used.$"
gFameCheckerFlavorText_Giovanni3:: @ 0x81B0022
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Welcome to my hideout!\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 "It shall be so until I can restore\n"
.string "TEAM ROCKET to its former glory.$"
gFameCheckerFlavorText_Giovanni4:: @ 0x81B00A6
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}What does this person do?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Blow me away! GIOVANNI was the\n"
+ .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 "GYM LEADER of VIRIDIAN?$"
gFameCheckerFlavorText_Giovanni5:: @ 0x81B0106
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}Family and friends?\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}You… You're not GIOVANNI's kid,\n"
+ .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 "are you?\p"
.string "No, that can't be right.\n"
.string "GIOVANNI's kid has red hair.$"
gFameCheckerPersonName_ProfOak:: @ 0x81B0188
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}PROF. OAK$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}PROF. OAK$"
gFameCheckerPersonQuote_ProfOak:: @ 0x81B0198
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: PROF. OAK\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: PROF. OAK\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Why do POKéMON compete and battle\n"
+ .string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Why do POKéMON compete and battle\n"
.string "so hard for you?\p"
.string "They do so because they can see\n"
.string "the love and trust you have\l"
@@ -625,46 +625,46 @@ gFameCheckerPersonQuote_ProfOak:: @ 0x81B0198
.string "Never forget that.$"
gFameCheckerPersonName_Daisy:: @ 0x81B0251
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}DAISY$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}DAISY$"
gFameCheckerPersonQuote_Daisy:: @ 0x81B025D
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: DAISY\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: DAISY\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}While I was comfortably enjoying\n"
+ .string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}While I was comfortably enjoying\n"
.string "my tea breaks, you've grown very\l"
.string "skilled and powerful.\p"
.string "I hope you'll remain a good rival\n"
.string "to my little brother.$"
gFameCheckerPersonName_Brock:: @ 0x81B030F
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}BROCK$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}BROCK$"
gFameCheckerPersonQuote_Brock:: @ 0x81B031B
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: BROCK\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BROCK\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}In this big world of ours, there\n"
+ .string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}In this big world of ours, there\n"
.string "must be many tough TRAINERS.\p"
.string "Let's both keep training and\n"
.string "making ourselves stronger!$"
gFameCheckerPersonName_Misty:: @ 0x81B03B3
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}MISTY$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}MISTY$"
gFameCheckerPersonQuote_Misty:: @ 0x81B03BF
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: MISTY\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MISTY\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I'm going to keep training here at\n"
+ .string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I'm going to keep training here at\n"
.string "this GYM.\p"
.string "When I get better, I'd love to hit\n"
.string "the road and travel.$"
gFameCheckerPersonName_LtSurge:: @ 0x81B0446
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}LT. SURGE$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}LT. SURGE$"
gFameCheckerPersonQuote_LtSurge:: @ 0x81B0456
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: LT. SURGE\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LT. SURGE\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Hey, kid!\n"
+ .string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Hey, kid!\n"
.string "You electrified me in our battle!\p"
.string "I didn't know that there were\n"
.string "gutsy TRAINERS like you.\p"
@@ -672,12 +672,12 @@ gFameCheckerPersonQuote_LtSurge:: @ 0x81B0456
.string "you!$"
gFameCheckerPersonName_Erika:: @ 0x81B0504
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}ERIKA$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}ERIKA$"
gFameCheckerPersonQuote_Erika:: @ 0x81B0510
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: ERIKA\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: ERIKA\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I am so glad that there are strong\n"
+ .string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I am so glad that there are strong\n"
.string "TRAINERS like you.\p"
.string "That awareness alone inspires and\n"
.string "motivates me to try harder.\p"
@@ -685,78 +685,78 @@ gFameCheckerPersonQuote_Erika:: @ 0x81B0510
.string "Zzz…$"
gFameCheckerPersonName_Koga:: @ 0x81B05C2
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}KOGA$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}KOGA$"
gFameCheckerPersonQuote_Koga:: @ 0x81B05CD
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: KOGA\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: KOGA\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}You and I, we must both set our\n"
+ .string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}You and I, we must both set our\n"
.string "sights higher and work towards\l"
.string "meeting our challenges.\p"
.string "Now, I must go train my daughter.$"
gFameCheckerPersonName_Sabrina:: @ 0x81B0667
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}SABRINA$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}SABRINA$"
gFameCheckerPersonQuote_Sabrina:: @ 0x81B0675
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: SABRINA\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: SABRINA\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}The love you have towards your\n"
+ .string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}The love you have towards your\n"
.string "POKéMON…\p"
.string "It was a power that was never\n"
.string "bested by my psychic power.$"
gFameCheckerPersonName_Blaine:: @ 0x81B06FB
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}BLAINE$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}BLAINE$"
gFameCheckerPersonQuote_Blaine:: @ 0x81B0708
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: BLAINE\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BLAINE\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}My fire POKéMON!\n"
+ .string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}My fire POKéMON!\n"
.string "They'll become even more powerful!\p"
.string "And now, a quiz. How many kinds of\n"
.string "FIRE-type POKéMON are there?$"
gFameCheckerPersonName_Lorelei:: @ 0x81B079F
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}LORELEI$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}LORELEI$"
gFameCheckerPersonQuote_Lorelei:: @ 0x81B07AD
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: LORELEI\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LORELEI\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}I needed to thank you for your\n"
+ .string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I needed to thank you for your\n"
.string "help.\p"
.string "But that has nothing to do with our\n"
.string "battles.\p"
.string "You'd better watch out next time!$"
gFameCheckerPersonName_Bruno:: @ 0x81B0845
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}BRUNO$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}BRUNO$"
gFameCheckerPersonQuote_Bruno:: @ 0x81B0851
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: BRUNO\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BRUNO\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}The super power of your POKéMON\n"
+ .string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}The super power of your POKéMON\n"
.string "and you I've experienced myself.\p"
.string "Next time, maybe I should show you\n"
.string "how to train yourself.$"
gFameCheckerPersonName_Agatha:: @ 0x81B08EE
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}AGATHA$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}AGATHA$"
gFameCheckerPersonQuote_Agatha:: @ 0x81B08FB
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: AGATHA\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: AGATHA\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 05}{COLOR RED}{SHADOW GREEN}When you grow older, don't you\n"
+ .string "{SIZE 05}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}When you grow older, don't you\n"
.string "dare go soft like that coot OAK!\p"
.string "Be like me and keep battling on!$"
gFameCheckerPersonName_Lance:: @ 0x81B097F
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}LANCE$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}LANCE$"
gFameCheckerPersonQuote_Lance:: @ 0x81B098B
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: LANCE\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LANCE\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}I'm considering going back to my\n"
+ .string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}I'm considering going back to my\n"
.string "hometown.\p"
.string "I want to retrain my DRAGON-type\n"
.string "POKéMON and strengthen them.\p"
@@ -764,35 +764,35 @@ gFameCheckerPersonQuote_Lance:: @ 0x81B098B
.string "hometown one day.$"
gFameCheckerPersonName_Bill:: @ 0x81B0A45
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}BILL$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}BILL$"
gFameCheckerPersonQuote_Bill:: @ 0x81B0A50
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: BILL\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BILL\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Hey, there! CELIO had nothing but\n"
+ .string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Hey, there! CELIO had nothing but\n"
.string "praise for you.\p"
.string "Hearing that makes me happy.\p"
.string "When you catch some rare POKéMON,\n"
.string "come show me, okay? Promise!$"
gFameCheckerPersonName_MrFuji:: @ 0x81B0AFF
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}MR. FUJI$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}MR. FUJI$"
gFameCheckerPersonQuote_MrFuji:: @ 0x81B0B0E
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: MR. FUJI\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MR. FUJI\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}Instead of hoping for the happiness\n"
+ .string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}Instead of hoping for the happiness\n"
.string "of just your POKéMON…\p"
.string "…Can I get you to wish for the\n"
.string "happiness of all POKéMON?$"
gFameCheckerPersonName_Giovanni:: @ 0x81B0BA6
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}GIOVANNI$"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}GIOVANNI$"
gFameCheckerPersonQuote_Giovanni:: @ 0x81B0BB5
- .string "{COLOR LIGHT_GRAY}{SHADOW BLACK}From: GIOVANNI\n"
+ .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: GIOVANNI\n"
.string "To: {PLAYER}\p"
- .string "{SIZE 04}{COLOR RED}{SHADOW GREEN}There is nothing that I wish to say\n"
+ .string "{SIZE 04}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}There is nothing that I wish to say\n"
.string "to you.\p"
.string "I will concentrate solely on\n"
.string "bettering myself, and none other.$"
diff --git a/include/strings.h b/include/strings.h
index 5ff490fcf..2eb246751 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1190,7 +1190,7 @@ extern const u8 gText_BerryCrush_NoBerries[];
extern const u8 gText_BerryCrush_MemberDroppedOut[];
extern const u8 gText_BerryCrush_TimeUp[];
extern const u8 gText_BerryCrush_CommunicationStandby[];
-extern const u8 gText_1_ClrLtGryShdwBlk_Dynamic0[];
+extern const u8 gText_1_ClrBluShdwLtBlu_Dynamic0[];
extern const u8 gText_1_Dynamic0[];
extern const u8 gText_SpaceTimes[];
extern const u8 gText_XDotY[];
diff --git a/src/berry_crush.c b/src/berry_crush.c
index 87888756e..e7a370265 100644
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -2695,7 +2695,7 @@ static void PrintBerryCrushResultWindow(struct BerryCrushGame * game, u8 command
break;
}
if (linkPlayerId == game->localId)
- StringCopy(gStringVar3, gText_1_ClrLtGryShdwBlk_Dynamic0);
+ StringCopy(gStringVar3, gText_1_ClrBluShdwLtBlu_Dynamic0);
else
StringCopy(gStringVar3, gText_1_Dynamic0);
gStringVar3[0] = linkIdToPrint + CHAR_1;
diff --git a/src/bg.c b/src/bg.c
index 5db690332..b20186029 100644
--- a/src/bg.c
+++ b/src/bg.c
@@ -910,7 +910,7 @@ void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u
CopyRectToBgTilemapBufferRect(bg, src, 0, 0, rectWidth, rectHeight, destX, destY, rectWidth, rectHeight, palette, 0, 0);
}
-void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 unused, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, s16 palette1, s16 tileOffset)
+void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, s16 tileOffset, s16 palette2)
{
u16 screenWidth, screenHeight, screenSize;
u16 var;
@@ -926,28 +926,28 @@ void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8
{
case 0:
srcPtr = src + ((srcY * srcWidth) + srcX) * 2;
- for (i = destX; i < (destX + rectWidth); i++)
+ for (i = destY; i < (destY + rectHeight); i++)
{
- for (j = srcHeight; j < (srcHeight + destY); j++)
+ for (j = destX; j < (destX + rectWidth); j++)
{
u16 index = GetTileMapIndexFromCoords(j, i, screenSize, screenWidth, screenHeight);
- CopyTileMapEntry(srcPtr, sGpuBgConfigs2[bg].tilemap + (index * 2), rectHeight, palette1, tileOffset);
+ CopyTileMapEntry(srcPtr, sGpuBgConfigs2[bg].tilemap + (index * 2), palette1, tileOffset, palette2);
srcPtr += 2;
}
- srcPtr += (srcWidth - destY) * 2;
+ srcPtr += (srcWidth - rectWidth) * 2;
}
break;
case 1:
srcPtr = src + ((srcY * srcWidth) + srcX);
var = GetBgMetricAffineMode(bg, 0x1);
- for (i = destX; i < (destX + rectWidth); i++)
+ for (i = destY; i < (destY + rectHeight); i++)
{
- for (j = srcHeight; j < (srcHeight + destY); j++)
+ for (j = destX; j < (destX + rectWidth); j++)
{
- *(u8*)(sGpuBgConfigs2[bg].tilemap + ((var * i) + j)) = *(u8*)(srcPtr) + palette1;
+ *(u8*)(sGpuBgConfigs2[bg].tilemap + ((var * i) + j)) = *(u8*)(srcPtr) + tileOffset;
srcPtr++;
}
- srcPtr += (srcWidth - destY);
+ srcPtr += (srcWidth - rectWidth);
}
break;
}
diff --git a/src/diploma.c b/src/diploma.c
index c43eff105..d2d643fe0 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -38,8 +38,8 @@ static const u8 gUnknown_841599D[] = _("{HIGHLIGHT TRANSPARENT}さま");
static const u8 gUnknown_84159A3[] = _("{HIGHLIGHT TRANSPARENT}ホウエン");
static const u8 gUnknown_84159AB[] = _("{HIGHLIGHT TRANSPARENT}ぜんこく");
static const u8 gUnknown_84159B3[] = _("{HIGHLIGHT TRANSPARENT}　　　　　ポケモンずかんを\nみごと　かんせい　させた\nいだいなこうせきを　たたえ\nここに　しょうめい　します");
-static const u8 gUnknown_84159ED[] = _("{COLOR RED}{HIGHLIGHT TRANSPARENT}ゲームフリーク");
-static const u8 gUnknown_84159FB[] = _("{COLOR RED}{HIGHLIGHT TRANSPARENT}");
+static const u8 gUnknown_84159ED[] = _("{COLOR DARK_GREY}{HIGHLIGHT TRANSPARENT}ゲームフリーク");
+static const u8 gUnknown_84159FB[] = _("{COLOR DARK_GREY}{HIGHLIGHT TRANSPARENT}");
static const ALIGNED(4) u8 gUnknown_8415A04[3] = {0, 2, 3};
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 4b85e6e67..31c633604 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -69,7 +69,7 @@ static const u16 sMovingBgPals[] = INCBIN_U16("graphics/evolution_scene/transiti
static const u8 sText_ShedinjaJapaneseName[] = _("ヌケニン");
-static const u8 unref_83F8445[] = _("{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}");
+static const u8 unref_83F8445[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}");
static const u8 unref_83F844F[][10] = {
_("▶\n "),
diff --git a/src/item_menu.c b/src/item_menu.c
index 3abecc1f5..4e4bfcc19 100644
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -289,9 +289,9 @@ static const struct YesNoFuncTable sYesNoMenu_Sell = {
Task_SellItem_No
};
-static const u8 sListItemTextColor_RegularItem[] = _("{COLOR_HIGHLIGHT_SHADOW RED TRANSPARENT GREEN}");
+static const u8 sListItemTextColor_RegularItem[] = _("{COLOR_HIGHLIGHT_SHADOW DARK_GREY TRANSPARENT LIGHT_GREY}");
-static const u8 sListItemTextColor_TmCase_BerryPouch[] = _("{COLOR_HIGHLIGHT_SHADOW LIGHT_GRAY TRANSPARENT BLACK}");
+static const u8 sListItemTextColor_TmCase_BerryPouch[] = _("{COLOR_HIGHLIGHT_SHADOW BLUE TRANSPARENT LIGHT_BLUE}");
static const struct ScrollArrowsTemplate sPocketSwitchArrowPairTemplate = {
.firstArrowType = SCROLL_ARROW_LEFT,
diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c
index 3f5bd8b69..e82c8ed7b 100644
--- a/src/librfu_rfu.c
+++ b/src/librfu_rfu.c
@@ -1425,35 +1425,35 @@ static u16 rfu_STC_setSendData_org(u8 ni_or_uni, u8 bmSendSlot, u8 subFrameSize,
sending = ni_or_uni & 0x20;
if (sending || ni_or_uni == 0x40)
{
- u8 *dataType_p; // a hack to swap instructions
-
slotStatus_NI = gRfuSlotStatusNI[bm_slot_id];
slotStatus_UNI = NULL;
slotStatus_NI->send.errorCode = 0;
- *slotStatus_NI->send.now_p = dataType_p = &slotStatus_NI->send.dataType;
+ slotStatus_NI->send.now_p[0] = &slotStatus_NI->send.dataType;
slotStatus_NI->send.remainSize = 7;
slotStatus_NI->send.bmSlotOrg = bmSendSlot;
slotStatus_NI->send.bmSlot = bmSendSlot;
slotStatus_NI->send.payloadSize = subFrameSize - frameSize;
if (sending != 0)
- *dataType_p = 0;
+ slotStatus_NI->send.dataType = 0;
else
- *dataType_p = 1;
+ slotStatus_NI->send.dataType = 1;
slotStatus_NI->send.dataSize = dataSize;
slotStatus_NI->send.src = src;
slotStatus_NI->send.ack = 0;
slotStatus_NI->send.phase = 0;
- #ifndef NONMATCHING // to fix r2, r3, r4, r5 register roulette
- asm("":::"r2");
- #endif
for (i = 0; i < WINDOW_COUNT; ++i)
{
slotStatus_NI->send.recvAckFlag[i] = 0;
slotStatus_NI->send.n[i] = 1;
}
for (bm_slot_id = 0; bm_slot_id < RFU_CHILD_MAX; ++bm_slot_id)
- if ((bmSendSlot >> bm_slot_id) & 1)
- gRfuSlotStatusNI[bm_slot_id]->send.failCounter = 0;
+ {
+ do
+ {
+ if ((bmSendSlot >> bm_slot_id) & 1)
+ gRfuSlotStatusNI[bm_slot_id]->send.failCounter = 0;
+ } while (0);
+ }
gRfuLinkStatus->sendSlotNIFlag |= bmSendSlot;
*llFrameSize_p -= subFrameSize;
slotStatus_NI->send.state = SLOT_STATE_SEND_START;
diff --git a/src/strings.c b/src/strings.c
index e183e5167..d2134c6bb 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -58,7 +58,7 @@ const u8 gText_Seen[] = _("Seen:");
const u8 gText_Owned[] = _("Owned:");
const u8 gText_Kanto[] = _("KANTO");
const u8 gText_National[] = _("NATIONAL");
-const u8 gText_PokemonHabitats[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}POKéMON HABITATS");
+const u8 gText_PokemonHabitats[] = _("{COLOR DYNAMIC_COLOR6}{SHADOW DYNAMIC_COLOR5}POKéMON HABITATS");
const u8 gText_DexCategory_GrasslandPkmn[] = _("Grassland POKéMON");
const u8 gText_DexCategory_ForestPkmn[] = _("Forest POKéMON");
const u8 gText_DexCategory_WatersEdgePkmn[] = _("Water's-edge POKéMON");
@@ -68,16 +68,16 @@ const u8 gText_DexCategory_MountainPkmn[] = _("Mountain POKéMON");
const u8 gText_DexCategory_RoughTerrainPkmn[] = _("Rough-terrain POKéMON");
const u8 gText_DexCategory_UrbanPkmn[] = _("Urban POKéMON");
const u8 gText_DexCategory_RarePkmn[] = _("Rare POKéMON");
-const u8 gText_Search[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}SEARCH");
+const u8 gText_Search[] = _("{COLOR DYNAMIC_COLOR6}{SHADOW DYNAMIC_COLOR5}SEARCH");
const u8 gText_NumericalMode[] = _("NUMERICAL MODE");
const u8 gText_AToZMode[] = _("A TO Z MODE");
-const u8 gText_PokedexOther[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}OTHER");
+const u8 gText_PokedexOther[] = _("{COLOR DYNAMIC_COLOR6}{SHADOW DYNAMIC_COLOR5}OTHER");
const u8 gTextJP_HowToUsePokedex[] = _("ずかんの つかいかた");
const u8 gText_ClosePokedex[] = _("CLOSE POKéDEX");
const u8 gText_TypeMode[] = _("TYPE MODE");
const u8 gText_LightestMode[] = _("LIGHTEST MODE");
const u8 gText_SmallestMode[] = _("SMALLEST MODE");
-const u8 gText_PokemonList[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}POKéMON LIST");
+const u8 gText_PokemonList[] = _("{COLOR DYNAMIC_COLOR6}{SHADOW DYNAMIC_COLOR5}POKéMON LIST");
const u8 gText_NumericalModeKanto[] = _("NUMERICAL MODE: KANTO");
const u8 gText_NumericalModeNational[] = _("NUMERICAL MODE: NATIONAL");
const u8 gText_PokemonListNoColor[] = _("POKéMON LIST");
@@ -110,8 +110,8 @@ ALIGNED(4) const u8 gText_Number[] = _("No. ");
ALIGNED(4) const u8 gText_Level[] = _("Lv. ");
ALIGNED(4) const u8 gText_Name[] = _("NAME");
ALIGNED(4) const u8 gText_IDNumber[] = _("IDNo.");
-const u8 gUnknown_841610A[] = _("{HIGHLIGHT WHITE2}{COLOR DARK_GREY}オダマキはかせが ピンチだ!\nポケモンを だして たすけてあげよう!");
-const u8 gUnknown_8416133[] = _("{HIGHLIGHT WHITE2}{COLOR DARK_GREY}このポケモンにしますか?");
+const u8 gUnknown_841610A[] = _("{HIGHLIGHT DYNAMIC_COLOR6}{COLOR WHITE}オダマキはかせが ピンチだ!\nポケモンを だして たすけてあげよう!");
+const u8 gUnknown_8416133[] = _("{HIGHLIGHT DYNAMIC_COLOR6}{COLOR WHITE}このポケモンにしますか?");
const u8 gUnknown_8416146[] = _("ポケモン");
const u8 gText_SaveError_PleaseExchangeBackupMemory[] = _("Save error.\pPlease exchange the\nbackup memory.");
const u8 gSaveStatName_Player[] = _("PLAYER");
@@ -760,9 +760,9 @@ const u8 gUnknown_8418C62[] = _("なにも かわらなかった!");
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_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 RED}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”");
+const u8 gUnknown_8418D70[] = _("{COLOR DARK_GREY}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”");
const u8 gUnknown_8418D99[] = _("けんさが しゅうりょうしました!\nもういちど レポ-トを かきこみます\nしばらくおまちください");
-const u8 gUnknown_8418DC9[] = _("レポ-トの かきこみは しゅうりょうしました\n{COLOR RED}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”");
+const u8 gUnknown_8418DC9[] = _("レポ-トの かきこみは しゅうりょうしました\n{COLOR DARK_GREY}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”");
const u8 gText_SaveFailedScreen_SaveCompleted[] = _("Save completed.\n“Please press the A Button.”");
const u8 gUnknown_8418E36[] = _("れんらくせん");
const u8 gUnknown_8418E3D[] = _("ひみつきち");
@@ -1032,7 +1032,7 @@ ALIGNED(4) const u8 gText_BerryCrush_NoBerries[] = _("You have no BERRIES.\nThe
ALIGNED(4) const u8 gText_BerryCrush_MemberDroppedOut[] = _("A member dropped out.\nThe game will be canceled.");
ALIGNED(4) const u8 gText_BerryCrush_TimeUp[] = _("Time's up.\pGood BERRY POWDER could not be\nmade…\p");
ALIGNED(4) const u8 gText_BerryCrush_CommunicationStandby[] = _("Communication standby…");
-ALIGNED(4) const u8 gText_1_ClrLtGryShdwBlk_Dynamic0[] = _("1. {COLOR LIGHT_GRAY}{SHADOW BLACK}{DYNAMIC 0x00}");
+ALIGNED(4) const u8 gText_1_ClrBluShdwLtBlu_Dynamic0[] = _("1. {COLOR BLUE}{SHADOW LIGHT_BLUE}{DYNAMIC 0x00}");
const u8 gText_1_Dynamic0[] = _("1. {DYNAMIC 0x00}");
ALIGNED(4) const u8 gText_SpaceTimes[] = _(" times");
ALIGNED(4) const u8 gText_XDotY[] = _("{STR_VAR_1}.{STR_VAR_2}");
@@ -1214,10 +1214,10 @@ const u8 gTradeText_CancelTrade[] = _("Cancel trade?");
const u8 gTradeText_PressBButtonToExit[] = _("Press the B Button to exit.");
const u8 gUnknown_841E10A[] = _("SUMMARY");
const u8 gUnknown_841E112[] = _("TRADE");
-const u8 gUnknown_841E118[] = _("{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}Communication standby…\nPlease wait.");
-const u8 gUnknown_841E145[] = _("{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}The trade has been canceled.");
-const u8 gUnknown_841E16B[] = _("{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}That's your only POKéMON\nfor battle.");
-const u8 gUnknown_841E199[] = _("{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}Waiting for your friend\nto finish…");
+const u8 gUnknown_841E118[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Communication standby…\nPlease wait.");
+const u8 gUnknown_841E145[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}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_841E199[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Waiting for your friend\nto finish…");
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_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_841E2DF[] = _("{DPAD_ANY}えらぶ:{A_BUTTON}けってい");
const u8 gUnknown_841E2EC[] = _("{B_BUTTON}CANCEL");
-const u8 gUnknown_841E2F5[] = _("{COLOR BLUE}{SHADOW YELLOW} たいせんの くみあわせ\n{COLOR RED}{SHADOW GREEN}じぶんの ばしょをきめて ください");
+const u8 gUnknown_841E2F5[] = _("{COLOR RED}{SHADOW LIGHT_RED} たいせんの くみあわせ\n{COLOR DARK_GREY}{SHADOW LIGHT_GREY}じぶんの ばしょをきめて ください");
const u8 gUnknown_841E322[] = _("{ID}");
const u8 gText_CommunicationStandby5[] = _("Communication standby…");
const u8 gDaycareText_GetAlongVeryWell[] = _("The two seem to get along\nvery well.");
diff --git a/src/trade.c b/src/trade.c
index f1010f5ff..e44849ff5 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -411,7 +411,7 @@ static const u8 gUnknown_8261E92[] = {
};
const u8 sText_Dummy[] = _("");
-const u8 sText_ClrDkGryHltTranspShdwRed[] = _("{COLOR DARK_GREY}{HIGHLIGHT TRANSPARENT}{SHADOW RED}");
+const u8 sText_ClrWhtHltTranspShdwDrkGry[] = _("{COLOR WHITE}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}");
const u8 gText_MaleSymbol4[] = _("♂");
const u8 gText_FemaleSymbol4[] = _("♀");
const u8 gText_GenderlessSymbol[] = _("");
diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index fd10e33b2..cda4a3a74 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -501,7 +501,7 @@ void GetTrainerTowerOpponentLoseText(u8 *dest, u8 opponentIdx)
TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechLose2, dest);
}
-static void SetUpTrainerTowerDataStruct(void) // fakematching
+static void SetUpTrainerTowerDataStruct(void)
{
u32 challengeType = gSaveBlock1Ptr->towerChallengeId;
s32 r4;
@@ -519,16 +519,7 @@ static void SetUpTrainerTowerDataStruct(void) // fakematching
r7 = gUnknown_84827B4[challengeType];
for (r4 = 0; r4 < MAX_TRAINER_TOWER_FLOORS; r4++)
{
- #ifndef NONMATCHING
- void * r5;
- register void * r0 asm("r0") = sTrainerTowerState;
- r5 = (void *)(r4 * sizeof(struct TrainerTowerFloor));
- r0 = r5 + (uintptr_t)r0;
- r0 += offsetof(struct UnkStruct_203F458, unk_0004.floors);
- memcpy(r0, r7[r4], sizeof(struct TrainerTowerFloor));
- #else
- memcpy(&sTrainerTowerState->unk_0004.floors[r4], r7[r4], sizeof(struct TrainerTowerFloor));
- #endif
+ *(sTrainerTowerState->unk_0004.floors + r4) = *(r7[r4]); // manual pointer arithmetic needed to match
}
sTrainerTowerState->unk_0004.checksum = CalcByteArraySum((void *)sTrainerTowerState->unk_0004.floors, sizeof(sTrainerTowerState->unk_0004.floors));
ValidateOrResetCurTrainerTowerRecord();
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 12:21:52 +0000