diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-04-12 16:18:38 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-04-12 16:18:38 -0400 |
| commit | 03b4ea32a9af67e6afb954cc44ff0c2768b86091 (patch) | |
| tree | 0371bfddb0f099e447cd6cdb3a23192993162535 | |
| parent | c9632154babc05708d0f2c7ee1f20b2939762ea1 (diff) | |
| parent | b54bd2e387feb7ece4f34f50f17519e329419716 (diff) | |
Merge remote-tracking branch 'origin' into doc_pokesum
51 files changed, 415 insertions, 432 deletions
diff --git a/berry_fix/charmap.txt b/berry_fix/charmap.txt index a736b40f2..6f6bd1386 100644 --- a/berry_fix/charmap.txt +++ b/berry_fix/charmap.txt @@ -434,8 +434,8 @@ RESUME_MUSIC = FC 18 TRANSPARENT = 00 WHITE = 01 -DARK_GREY = 02 -LIGHT_GREY = 03 +DARK_GRAY = 02 +LIGHT_GRAY = 03 RED = 04 LIGHT_RED = 05 GREEN = 06 diff --git a/berry_fix/payload/charmap.txt b/berry_fix/payload/charmap.txt index a736b40f2..6f6bd1386 100644 --- a/berry_fix/payload/charmap.txt +++ b/berry_fix/payload/charmap.txt @@ -434,8 +434,8 @@ RESUME_MUSIC = FC 18 TRANSPARENT = 00 WHITE = 01 -DARK_GREY = 02 -LIGHT_GREY = 03 +DARK_GRAY = 02 +LIGHT_GRAY = 03 RED = 04 LIGHT_RED = 05 GREEN = 06 diff --git a/charmap.txt b/charmap.txt index a3e698e91..16e47a252 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_GRAY = 02 +LIGHT_GRAY = 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/event_scripts.s b/data/event_scripts.s index e9d49cc15..26fddad77 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -87,7 +87,7 @@ gStdScriptsEnd:: .include "data/maps/BattleColosseum_2P/scripts.inc" .include "data/maps/TradeCenter/scripts.inc" - .include "data/maps/RecordCenter/scripts.inc" + .include "data/maps/RecordCorner/scripts.inc" .include "data/maps/BattleColosseum_4P/scripts.inc" .include "data/maps/UnionRoom/scripts.inc" .include "data/maps/ViridianForest/scripts.inc" diff --git a/data/layouts/RecordCenter/border.bin b/data/layouts/RecordCorner/border.bin index efef023e6..efef023e6 100644 --- a/data/layouts/RecordCenter/border.bin +++ b/data/layouts/RecordCorner/border.bin diff --git a/data/layouts/RecordCenter/map.bin b/data/layouts/RecordCorner/map.bin index 08209eaca..08209eaca 100644 --- a/data/layouts/RecordCenter/map.bin +++ b/data/layouts/RecordCorner/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index a9911aed4..1083cd406 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -457,16 +457,16 @@ "blockdata_filepath": "data/layouts/TradeCenter/map.bin" }, { - "id": "LAYOUT_RECORD_CENTER", - "name": "RecordCenter_Layout", + "id": "LAYOUT_RECORD_CORNER", + "name": "RecordCorner_Layout", "width": 20, "height": 10, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_CableClub", - "border_filepath": "data/layouts/RecordCenter/border.bin", - "blockdata_filepath": "data/layouts/RecordCenter/map.bin" + "border_filepath": "data/layouts/RecordCorner/border.bin", + "blockdata_filepath": "data/layouts/RecordCorner/map.bin" }, { "id": "LAYOUT_BATTLE_COLOSSEUM_4P", diff --git a/data/maps/RecordCenter/scripts.inc b/data/maps/RecordCenter/scripts.inc deleted file mode 100644 index 873fc2826..000000000 --- a/data/maps/RecordCenter/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -RecordCenter_MapScripts:: @ 816047A - .byte 0 diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCorner/map.json index 710a91832..67d6be4a5 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCorner/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_RECORD_CENTER", - "name": "RecordCenter", - "layout": "LAYOUT_RECORD_CENTER", + "id": "MAP_RECORD_CORNER", + "name": "RecordCorner", + "layout": "LAYOUT_RECORD_CORNER", "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, @@ -25,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RecordCenter_EventScript_Attendant", + "script": "RecordCorner_EventScript_Attendant", "flag": "0" } ], @@ -67,7 +67,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot0" + "script": "RecordCorner_EventScript_Spot0" }, { "type": "trigger", @@ -76,7 +76,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot1" + "script": "RecordCorner_EventScript_Spot1" }, { "type": "trigger", @@ -85,7 +85,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot2" + "script": "RecordCorner_EventScript_Spot2" }, { "type": "trigger", @@ -94,7 +94,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot3" + "script": "RecordCorner_EventScript_Spot3" } ], "bg_events": [] diff --git a/data/maps/RecordCorner/scripts.inc b/data/maps/RecordCorner/scripts.inc new file mode 100644 index 000000000..979b17ac2 --- /dev/null +++ b/data/maps/RecordCorner/scripts.inc @@ -0,0 +1,2 @@ +RecordCorner_MapScripts:: @ 816047A + .byte 0 diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index a7a468351..e8a346f5a 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -47,7 +47,7 @@ "gMapGroup0": [ "BattleColosseum_2P", "TradeCenter", - "RecordCenter", + "RecordCorner", "BattleColosseum_4P", "UnionRoom" ], diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index f25409e05..66cf634e9 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -703,10 +703,10 @@ TradeCenter_EventScript_Chair3:: @ 81BB974 @ Nop in FRLG @ Separate labels to match GetDirectionForEventScript -RecordCenter_EventScript_Spot0:: @ 81BB980 -RecordCenter_EventScript_Spot1:: @ 81BB980 -RecordCenter_EventScript_Spot2:: @ 81BB980 -RecordCenter_EventScript_Spot3:: @ 81BB980 +RecordCorner_EventScript_Spot0:: @ 81BB980 +RecordCorner_EventScript_Spot1:: @ 81BB980 +RecordCorner_EventScript_Spot2:: @ 81BB980 +RecordCorner_EventScript_Spot3:: @ 81BB980 end CableClub_EventScript_ReadTrainerCard:: @ 81BB981 @@ -748,7 +748,7 @@ TradeCenter_EventScript_Attendant:: @ 81BB9C1 end @ Nop in FRLG -RecordCenter_EventScript_Attendant:: @ 81BB9D3 +RecordCorner_EventScript_Attendant:: @ 81BB9D3 end TradeCenter_ConfirmLeaveRoom:: @ 81BB9D4 diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index 9fbe05652..9ba1cf28d 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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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_GRAY}{SHADOW LIGHT_GRAY}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/constants/layouts.h b/include/constants/layouts.h index 01a452970..b64f29809 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -42,7 +42,7 @@ #define LAYOUT_RS_SAFARI_ZONE_ENTRANCE 46 #define LAYOUT_BATTLE_COLOSSEUM_2P 47 #define LAYOUT_TRADE_CENTER 48 -#define LAYOUT_RECORD_CENTER 49 +#define LAYOUT_RECORD_CORNER 49 #define LAYOUT_BATTLE_COLOSSEUM_4P 50 #define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 51 #define LAYOUT_RS_SAFARI_ZONE_NORTHEAST 52 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index b087b2c33..a219613aa 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -8,7 +8,7 @@ // Map Group 0 #define MAP_BATTLE_COLOSSEUM_2P (0 | (0 << 8)) #define MAP_TRADE_CENTER (1 | (0 << 8)) -#define MAP_RECORD_CENTER (2 | (0 << 8)) +#define MAP_RECORD_CORNER (2 | (0 << 8)) #define MAP_BATTLE_COLOSSEUM_4P (3 | (0 << 8)) #define MAP_UNION_ROOM (4 | (0 << 8)) diff --git a/include/event_scripts.h b/include/event_scripts.h index 437b6dcee..3a25a5fc9 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1270,10 +1270,10 @@ extern const u8 BattleColosseum_4P_EventScript_PlayerSpot0[]; extern const u8 BattleColosseum_4P_EventScript_PlayerSpot1[]; extern const u8 BattleColosseum_4P_EventScript_PlayerSpot2[]; extern const u8 BattleColosseum_4P_EventScript_PlayerSpot3[]; -extern const u8 RecordCenter_EventScript_Spot0[]; -extern const u8 RecordCenter_EventScript_Spot1[]; -extern const u8 RecordCenter_EventScript_Spot2[]; -extern const u8 RecordCenter_EventScript_Spot3[]; +extern const u8 RecordCorner_EventScript_Spot0[]; +extern const u8 RecordCorner_EventScript_Spot1[]; +extern const u8 RecordCorner_EventScript_Spot2[]; +extern const u8 RecordCorner_EventScript_Spot3[]; extern const u8 BattleColosseum_2P_EventScript_PlayerSpot0[]; extern const u8 BattleColosseum_2P_EventScript_PlayerSpot1[]; extern const u8 TradeCenter_EventScript_Chair0[]; diff --git a/include/strings.h b/include/strings.h index 8ec67ced5..57e30eb37 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/include/text.h b/include/text.h index f181c6d9c..f4236e995 100644 --- a/include/text.h +++ b/include/text.h @@ -95,8 +95,8 @@ #define TEXT_COLOR_TRANSPARENT 0x0 #define TEXT_COLOR_WHITE 0x1 -#define TEXT_COLOR_DARK_GREY 0x2 -#define TEXT_COLOR_LIGHT_GREY 0x3 +#define TEXT_COLOR_DARK_GRAY 0x2 +#define TEXT_COLOR_LIGHT_GRAY 0x3 #define TEXT_COLOR_RED 0x4 #define TEXT_COLOR_LIGHT_RED 0x5 #define TEXT_COLOR_GREEN 0x6 diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 30b8bda88..54452e3c1 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5637,7 +5637,7 @@ static void PutLevelAndGenderOnLvlUpBox(void) printerTemplate.unk = 0; printerTemplate.fgColor = TEXT_COLOR_WHITE; printerTemplate.bgColor = TEXT_COLOR_TRANSPARENT; - printerTemplate.shadowColor = TEXT_COLOR_DARK_GREY; + printerTemplate.shadowColor = TEXT_COLOR_DARK_GRAY; AddTextPrinter(&printerTemplate, 0xFF, NULL); txtPtr = gStringVar4; gStringVar4[0] = 0xF9; diff --git a/src/berry_crush.c b/src/berry_crush.c index 87888756e..05be05802 100644 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -400,15 +400,15 @@ static const struct BgTemplate sBgTemplates[] = { static const u8 sBerryCrushTextColorTable[][3] = { { TEXT_COLOR_WHITE, - TEXT_COLOR_DARK_GREY, - TEXT_COLOR_LIGHT_GREY + TEXT_COLOR_DARK_GRAY, + TEXT_COLOR_LIGHT_GRAY }, { TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, - TEXT_COLOR_DARK_GREY + TEXT_COLOR_DARK_GRAY }, { TEXT_COLOR_TRANSPARENT, - TEXT_COLOR_LIGHT_GREY, + TEXT_COLOR_LIGHT_GRAY, TEXT_COLOR_RED }, { TEXT_COLOR_WHITE, @@ -1091,11 +1091,11 @@ static u32 BerryCrushCommand_PrintMessage(struct BerryCrushGame * game, u8 *para if (params[1] & 2) { 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 { - 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); break; @@ -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; @@ -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/clear_save_data_screen.c b/src/clear_save_data_screen.c index b2f106594..74e48be00 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -55,8 +55,8 @@ static const struct WindowTemplate sWindowTemplates[] = { static const u8 sTextColor[] = { TEXT_COLOR_WHITE, - TEXT_COLOR_DARK_GREY, - TEXT_COLOR_LIGHT_GREY + TEXT_COLOR_DARK_GRAY, + TEXT_COLOR_LIGHT_GRAY }; static void CB2_RunClearSaveDataScreen(void) diff --git a/src/data/party_menu.h b/src/data/party_menu.h index e8151b810..084062b50 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -112,12 +112,12 @@ static const u32 sCancelButton_Tilemap[] = INCBIN_U32("graphics/interface/party_ 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_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_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[] = diff --git a/src/diploma.c b/src/diploma.c index c43eff105..50c3adf41 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_GRAY}{HIGHLIGHT TRANSPARENT}ゲームフリーク"); +static const u8 gUnknown_84159FB[] = _("{COLOR DARK_GRAY}{HIGHLIGHT TRANSPARENT}"); static const ALIGNED(4) u8 gUnknown_8415A04[3] = {0, 2, 3}; diff --git a/src/dodrio_berry_picking_2.c b/src/dodrio_berry_picking_2.c index ff44a70de..aa9f65042 100644 --- a/src/dodrio_berry_picking_2.c +++ b/src/dodrio_berry_picking_2.c @@ -906,8 +906,8 @@ static const u8 sTextColorTable[][3] = { { TEXT_COLOR_WHITE, - TEXT_COLOR_DARK_GREY, - TEXT_COLOR_LIGHT_GREY + TEXT_COLOR_DARK_GRAY, + TEXT_COLOR_LIGHT_GRAY }, { TEXT_COLOR_WHITE, TEXT_COLOR_RED, @@ -1421,7 +1421,7 @@ static void sub_8155A78(void) { case 0: 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++; break; case 1: diff --git a/src/easy_chat_3.c b/src/easy_chat_3.c index c904494bb..dc9fbed01 100644 --- a/src/easy_chat_3.c +++ b/src/easy_chat_3.c @@ -1321,7 +1321,7 @@ static void PrintTitleText(void) xOffset = (128 - GetStringWidth(1, titleText, 0)) / 2u; 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); CopyWindowToVram(0, COPYWIN_BOTH); } @@ -1439,7 +1439,7 @@ static void PrintECFields(void) *str++ = 9; } - str = WriteColorChangeControlCode(str, 0, TEXT_COLOR_DARK_GREY); + str = WriteColorChangeControlCode(str, 0, TEXT_COLOR_DARK_GRAY); } str = StringAppend(str, sText_Clear17); diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 4b85e6e67..1f8fd1cda 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_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}"); static const u8 unref_83F844F[][10] = { _("▶\n "), diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 2e1513358..2dab94e10 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1839,7 +1839,7 @@ static bool8 Fishing10(struct Task *task) { AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); 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->tFrameCounter = 0; return FALSE; @@ -1886,7 +1886,7 @@ static bool8 Fishing12(struct Task *task) AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); 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; return TRUE; } @@ -1896,7 +1896,7 @@ static bool8 Fishing13(struct Task *task) { AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); 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++; return TRUE; } diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index db5173651..8e0e76488 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -29,7 +29,7 @@ static const struct WindowTemplate gUnknown_83C68E4 = { .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_BarnDoorWipeChild(u8 taskId); diff --git a/src/help_message.c b/src/help_message.c index 82a10a5ab..d47642a85 100644 --- a/src/help_message.c +++ b/src/help_message.c @@ -89,7 +89,7 @@ static void sub_8112FD0(void) 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) { diff --git a/src/item_menu.c b/src/item_menu.c index 3abecc1f5..6b23482e5 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_GRAY TRANSPARENT LIGHT_GRAY}"); -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/item_pc.c b/src/item_pc.c index 8f25e90ad..4366997ba 100644 --- a/src/item_pc.c +++ b/src/item_pc.c @@ -121,10 +121,10 @@ static const struct MenuAction sItemPcSubmenuOptions[] = { }; static const u8 sTextColors[][3] = { - {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}, - {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY}, - {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_DARK_GREY}, - {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GREY} + {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY}, + {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY}, + {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GRAY, TEXT_COLOR_DARK_GRAY}, + {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GRAY} }; static const struct WindowTemplate sWindowTemplates[] = { 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/map_preview_screen.c b/src/map_preview_screen.c index 7666decd3..ec889a2f5 100644 --- a/src/map_preview_screen.c +++ b/src/map_preview_screen.c @@ -455,7 +455,7 @@ u16 MapPreview_CreateMapNameWindow(u8 mapsec) PutWindowTilemap(windowId); color[0] = TEXT_COLOR_WHITE; // 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); xctr = 104 - GetStringWidth(2, gStringVar4, 0); AddTextPrinterParameterized4(windowId, 2, xctr / 2, 2, 0, 0, color/* Access violation */, -1, gStringVar4); diff --git a/src/naming_screen.c b/src/naming_screen.c index 76c1a241e..2f40cf2aa 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -706,7 +706,7 @@ static void pokemon_transfer_to_pc_with_message(void) StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]); DrawDialogueFrame(0, FALSE); 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); } @@ -1814,9 +1814,9 @@ struct TextColor // Needed because of alignment static const struct TextColor sTextColorStruct = { { - {TEXT_DYNAMIC_COLOR_4, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}, - {TEXT_DYNAMIC_COLOR_5, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}, - {TEXT_DYNAMIC_COLOR_6, 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_GRAY}, + {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) { - 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); FillWindowPixelBuffer(sNamingScreenData->windows[4], PIXEL_FILL(15)); diff --git a/src/option_menu.c b/src/option_menu.c index f011bc1ec..0d7d22071 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -176,7 +176,7 @@ static const u8 *const sButtonTypeOptions[] = 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}; // Functions diff --git a/src/overworld.c b/src/overworld.c index 10a700e1f..2083b7578 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -3117,13 +3117,13 @@ static u16 GetDirectionForEventScript(const u8 *script) return FACING_FORCED_RIGHT; else if (script == BattleColosseum_4P_EventScript_PlayerSpot3) return FACING_FORCED_LEFT; - else if (script == RecordCenter_EventScript_Spot0) + else if (script == RecordCorner_EventScript_Spot0) return FACING_FORCED_RIGHT; - else if (script == RecordCenter_EventScript_Spot1) + else if (script == RecordCorner_EventScript_Spot1) return FACING_FORCED_LEFT; - else if (script == RecordCenter_EventScript_Spot2) + else if (script == RecordCorner_EventScript_Spot2) return FACING_FORCED_RIGHT; - else if (script == RecordCenter_EventScript_Spot3) + else if (script == RecordCorner_EventScript_Spot3) return FACING_FORCED_LEFT; else if (script == BattleColosseum_2P_EventScript_PlayerSpot0) return FACING_FORCED_RIGHT; diff --git a/src/pokemon_jump_4.c b/src/pokemon_jump_4.c index 64316f46e..b197ebeef 100644 --- a/src/pokemon_jump_4.c +++ b/src/pokemon_jump_4.c @@ -667,7 +667,7 @@ static void sub_814A7D0(u16 left, u16 top, u8 cursorPos) 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(1); @@ -867,7 +867,7 @@ static void sub_814AC30(bool32 arg0) if (!arg0) { 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 { @@ -875,7 +875,7 @@ static void sub_814AC30(bool32 arg0) for (i = 0; i < playersCount; 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 sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED); } diff --git a/src/pokemon_special_anim_scene.c b/src/pokemon_special_anim_scene.c index e7201ef52..5015e93a7 100644 --- a/src/pokemon_special_anim_scene.c +++ b/src/pokemon_special_anim_scene.c @@ -610,13 +610,13 @@ bool8 PSA_LevelUpVerticalSpritesTaskIsRunning(void) UNUSED void PSA_DrawLevelUpWindowPg1(u16 *statsBefore, u16 *statsAfter) { 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); CopyWindowToVram(1, COPYWIN_BOTH); } 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); } diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index 397bdda41..c13687cb0 100644 --- a/src/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c @@ -245,7 +245,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) LoadStdWindowFrameGfx(); DrawDialogueFrame(0, 0); 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(task->data[15], COPYWIN_BOTH); task->data[0]++; @@ -271,7 +271,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) { task->data[1] = task->data[3]; 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; case MENU_B_PRESSED: @@ -286,13 +286,13 @@ static void Task_PokemonStorageSystemPC(u8 taskId) if (task->data[2] == 0 && CountPartyMons() == PARTY_SIZE) { 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; } else if (task->data[2] == 1 && CountPartyMons() == 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; } else @@ -307,7 +307,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) if (JOY_NEW(A_BUTTON | B_BUTTON)) { 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; } else if (JOY_NEW(DPAD_UP)) @@ -317,7 +317,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) Menu_MoveCursor(-1); task->data[1] = Menu_GetCursorPos(); 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; } else if (JOY_NEW(DPAD_DOWN)) @@ -327,7 +327,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) Menu_MoveCursor(1); task->data[1] = Menu_GetCursorPos(); 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; } break; diff --git a/src/pokemon_storage_system_5.c b/src/pokemon_storage_system_5.c index 4067f6eed..96c7a4120 100644 --- a/src/pokemon_storage_system_5.c +++ b/src/pokemon_storage_system_5.c @@ -1114,18 +1114,18 @@ static void SetCursorMonData(void *pokemon, u8 mode) *(txtPtr)++ = CHAR_FEMALE; break; default: - *(txtPtr)++ = TEXT_COLOR_DARK_GREY; + *(txtPtr)++ = TEXT_COLOR_DARK_GRAY; *(txtPtr)++ = TEXT_COLOR_WHITE; - *(txtPtr)++ = TEXT_COLOR_LIGHT_GREY; + *(txtPtr)++ = TEXT_COLOR_LIGHT_GRAY; *(txtPtr)++ = CHAR_SPACE; break; } *(txtPtr++) = EXT_CTRL_CODE_BEGIN; *(txtPtr++) = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW; - *(txtPtr++) = TEXT_COLOR_DARK_GREY; + *(txtPtr++) = TEXT_COLOR_DARK_GRAY; *(txtPtr++) = TEXT_COLOR_WHITE; - *(txtPtr++) = TEXT_COLOR_LIGHT_GREY; + *(txtPtr++) = TEXT_COLOR_LIGHT_GRAY; *(txtPtr++) = CHAR_SPACE; *(txtPtr++) = CHAR_EXTRA_EMOJI; *(txtPtr++) = 5; // LV_2 diff --git a/src/region_map.c b/src/region_map.c index c964fcf5a..858c5754d 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -511,9 +511,9 @@ static const struct WindowTemplate sRegionMapWindowTemplates[] = { }, DUMMY_WIN_TEMPLATE }; -ALIGNED(4) const u8 sTextColor_White[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; -ALIGNED(4) const u8 sTextColor_Green[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREEN, TEXT_COLOR_DARK_GREY}; -ALIGNED(4) const u8 sTextColor_Red[] = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, 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_GRAY}; +ALIGNED(4) const u8 sTextColor_Red[] = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GRAY}; static const u8 *const sTextColorTable[] = { [MAPSECTYPE_VISITED - 2] = sTextColor_Green, @@ -812,7 +812,7 @@ static const u8 sWinRegs[][2] = { {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[] = { [MAPSEC_PALLET_TOWN - MAPSECS_KANTO] = gMapSecName_PalletTown, diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 9c29323ba..7fd2f0f9f 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -153,7 +153,7 @@ static void ClearMapBuffer(void) 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); HelpSystemRenderText(2, gDecompressionBuffer + 0x20, str, 2, 2, 28, 10); RequestDmaCopyFromCharBuffer(); diff --git a/src/slot_machine.c b/src/slot_machine.c index 2c2891c5c..96779258d 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -1991,7 +1991,7 @@ static bool8 SlotsTask_GraphicsInit(u8 * state, struct SlotMachineSetupTaskData x = 236 - GetStringWidth(0, gString_SlotMachineControls, 0); textColor[0] = TEXT_DYNAMIC_COLOR_6; 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); CopyBgTilemapBufferToVram(0); diff --git a/src/strings.c b/src/strings.c index 2851cca54..e515aa918 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_GRAY}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”"); const u8 gUnknown_8418D99[] = _("けんさが しゅうりょうしました!\nもういちど レポ-トを かきこみます\nしばらくおまちください"); -const u8 gUnknown_8418DC9[] = _("レポ-トの かきこみは しゅうりょうしました\n{COLOR RED}“このまま ぼうけんをつづけることは できません\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 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_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}Communication standby…\nPlease wait."); +const u8 gUnknown_841E145[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}The trade has been canceled."); +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_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 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_GRAY}{SHADOW LIGHT_GRAY}じぶんの ばしょをきめて ください"); 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 1f99db519..656cba37b 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_GRAY}"); const u8 gText_MaleSymbol4[] = _("♂"); const u8 gText_FemaleSymbol4[] = _("♀"); 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 }; -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[] = { { @@ -674,7 +674,7 @@ static const u8 gUnknown_8262055[][2] = { static void InitTradeMenuResources(void) { int i; - static vu16 dummy; + static u16 dummy; ResetSpriteData(); FreeAllSpritePalettes(); @@ -723,11 +723,6 @@ static void CB2_ReturnFromLinkTrade2(void) u8 id; s32 width; u32 xPos; -#ifndef NONMATCHING - register u32 r0 asm("r0"); -#else - u32 r0; -#endif u8 *name; switch (gMain.state) @@ -895,7 +890,8 @@ static void CB2_ReturnFromLinkTrade2(void) gMain.state++; break; case 12: - width = GetStringWidth(1, gSaveBlock2Ptr->playerName, 0); + name = gSaveBlock2Ptr->playerName; + width = GetStringWidth(1, name, 0); xPos = (56 - width) / 2; for (i = 0; i < 3; i++) { @@ -904,9 +900,8 @@ static void CB2_ReturnFromLinkTrade2(void) CreateSprite(&temp, xPos + sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][0] + (i * 32), sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][1], 1); } id = GetMultiplayerId(); - r0 = (id ^ 1) * sizeof(*gLinkPlayers); - name = gLinkPlayers->name; - width = GetStringWidth(1, name + r0, 0); + name = gLinkPlayers[id ^ 1].name; + width = GetStringWidth(1, name, 0); xPos = (56 - width) / 2; for (i = 0; i < 3; i++) { @@ -999,11 +994,6 @@ void CB2_ReturnToTradeMenuFromSummary(void) u8 id; s32 width; u32 xPos; -#ifndef NONMATCHING - register u32 r0 asm("r0"); -#else - u32 r0; -#endif u8 *name; switch (gMain.state) @@ -1095,7 +1085,8 @@ void CB2_ReturnToTradeMenuFromSummary(void) } break; case 12: - width = GetStringWidth(1, gSaveBlock2Ptr->playerName, 0); + name = gSaveBlock2Ptr->playerName; + width = GetStringWidth(1, name, 0); xPos = (56 - width) / 2; for (i = 0; i < 3; i++) { @@ -1104,9 +1095,8 @@ void CB2_ReturnToTradeMenuFromSummary(void) CreateSprite(&temp, xPos + sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][0] + (i * 32), sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][1], 1); } id = GetMultiplayerId(); - r0 = (id ^ 1) * sizeof(*gLinkPlayers); - name = gLinkPlayers->name; - width = GetStringWidth(1, name + r0, 0); + name = gLinkPlayers[id ^ 1].name; + width = GetStringWidth(1, name, 0); xPos = (56 - width) / 2; for (i = 0; i < 3; i++) { diff --git a/src/trainer_card.c b/src/trainer_card.c index d3578dfb7..beb209bf5 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -271,7 +271,7 @@ static const u16 *const sKantoTrainerCardStarPals[] = 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 sTimeColonInvisibleTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT}; static const u8 sTrainerCardFontIds[] = {0, 2, 0}; diff --git a/src/trainer_tower.c b/src/trainer_tower.c index fd10e33b2..b39782297 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -316,7 +316,7 @@ static const struct WindowTemplate sTimeBoardWindowTemplate[] = { 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) = { [TRAINER_TOWER_FUNC_INIT_FLOOR] = InitTrainerTowerFloor, @@ -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(); diff --git a/src/union_room.c b/src/union_room.c index 24b8a4d3e..f19eba38d 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -3993,9 +3993,9 @@ static void UR_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str case UR_COLOR_DKE_WHT_LTE: printerTemplate.letterSpacing = 0; printerTemplate.lineSpacing = 0; - printerTemplate.fgColor = TEXT_COLOR_DARK_GREY; + printerTemplate.fgColor = TEXT_COLOR_DARK_GRAY; printerTemplate.bgColor = TEXT_COLOR_WHITE; - printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GREY; + printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GRAY; break; case UR_COLOR_RED_WHT_LTR: printerTemplate.letterSpacing = 0; @@ -4016,14 +4016,14 @@ static void UR_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str printerTemplate.lineSpacing = 0; printerTemplate.fgColor = TEXT_COLOR_WHITE; printerTemplate.bgColor = TEXT_COLOR_WHITE; - printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GREY; + printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GRAY; break; case UR_COLOR_WHT_DKE_LTE: printerTemplate.letterSpacing = 0; printerTemplate.lineSpacing = 0; printerTemplate.fgColor = TEXT_COLOR_WHITE; - printerTemplate.bgColor = TEXT_COLOR_DARK_GREY; - printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GREY; + printerTemplate.bgColor = TEXT_COLOR_DARK_GRAY; + printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GRAY; break; case UR_COLOR_GRN_DN6_LTB: printerTemplate.letterSpacing = 0; diff --git a/src/union_room_chat_display.c b/src/union_room_chat_display.c index 27ce26a02..60c202dcd 100644 --- a/src/union_room_chat_display.c +++ b/src/union_room_chat_display.c @@ -600,7 +600,7 @@ static bool32 DisplaySubtask_UpdateMessageBuffer(u8 *state) UnionRoomChat_GetBufferSelectionRegion(&start, &length); FillWin1Rect(start, length, PIXEL_FILL(0)); 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); break; case 1: @@ -670,7 +670,7 @@ static bool32 DisplaySubtask_CancelRegister(u8 *state) str = UnionRoomChat_GetEndOfMessageEntryBuffer(); length = StringLength_Multibyte(str); 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); break; case 1: diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index f67da122f..936a1ed9f 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -323,13 +323,13 @@ static void WCSS_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 * { case 0: textColor[0] = TEXT_COLOR_TRANSPARENT; - textColor[1] = TEXT_COLOR_DARK_GREY; - textColor[2] = TEXT_COLOR_LIGHT_GREY; + textColor[1] = TEXT_COLOR_DARK_GRAY; + textColor[2] = TEXT_COLOR_LIGHT_GRAY; break; case 1: textColor[0] = TEXT_COLOR_TRANSPARENT; textColor[1] = TEXT_COLOR_WHITE; - textColor[2] = TEXT_COLOR_LIGHT_GREY; + textColor[2] = TEXT_COLOR_LIGHT_GRAY; break; case 2: textColor[0] = TEXT_COLOR_TRANSPARENT; @@ -344,7 +344,7 @@ static void WCSS_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 * case 4: textColor[0] = TEXT_COLOR_TRANSPARENT; textColor[1] = TEXT_COLOR_WHITE; - textColor[2] = TEXT_COLOR_DARK_GREY; + textColor[2] = TEXT_COLOR_DARK_GRAY; break; // default: UB } |