diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/diploma.c | 4 | ||||
| -rw-r--r-- | src/evolution_scene.c | 2 | ||||
| -rw-r--r-- | src/item_menu.c | 4 | ||||
| -rw-r--r-- | src/strings.c | 28 | ||||
| -rw-r--r-- | src/trade.c | 2 |
5 files changed, 20 insertions, 20 deletions
diff --git a/src/diploma.c b/src/diploma.c index c43eff105..d2d643fe0 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -38,8 +38,8 @@ static const u8 gUnknown_841599D[] = _("{HIGHLIGHT TRANSPARENT}さま"); static const u8 gUnknown_84159A3[] = _("{HIGHLIGHT TRANSPARENT}ホウエン"); static const u8 gUnknown_84159AB[] = _("{HIGHLIGHT TRANSPARENT}ぜんこく"); static const u8 gUnknown_84159B3[] = _("{HIGHLIGHT TRANSPARENT} ポケモンずかんを\nみごと かんせい させた\nいだいなこうせきを たたえ\nここに しょうめい します"); -static const u8 gUnknown_84159ED[] = _("{COLOR RED}{HIGHLIGHT TRANSPARENT}ゲームフリーク"); -static const u8 gUnknown_84159FB[] = _("{COLOR RED}{HIGHLIGHT TRANSPARENT}"); +static const u8 gUnknown_84159ED[] = _("{COLOR DARK_GREY}{HIGHLIGHT TRANSPARENT}ゲームフリーク"); +static const u8 gUnknown_84159FB[] = _("{COLOR DARK_GREY}{HIGHLIGHT TRANSPARENT}"); static const ALIGNED(4) u8 gUnknown_8415A04[3] = {0, 2, 3}; diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 4b85e6e67..31c633604 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -69,7 +69,7 @@ static const u16 sMovingBgPals[] = INCBIN_U16("graphics/evolution_scene/transiti static const u8 sText_ShedinjaJapaneseName[] = _("ヌケニン"); -static const u8 unref_83F8445[] = _("{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}"); +static const u8 unref_83F8445[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}"); static const u8 unref_83F844F[][10] = { _("▶\n "), diff --git a/src/item_menu.c b/src/item_menu.c index 3abecc1f5..4e4bfcc19 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -289,9 +289,9 @@ static const struct YesNoFuncTable sYesNoMenu_Sell = { Task_SellItem_No }; -static const u8 sListItemTextColor_RegularItem[] = _("{COLOR_HIGHLIGHT_SHADOW RED TRANSPARENT GREEN}"); +static const u8 sListItemTextColor_RegularItem[] = _("{COLOR_HIGHLIGHT_SHADOW DARK_GREY TRANSPARENT LIGHT_GREY}"); -static const u8 sListItemTextColor_TmCase_BerryPouch[] = _("{COLOR_HIGHLIGHT_SHADOW LIGHT_GRAY TRANSPARENT BLACK}"); +static const u8 sListItemTextColor_TmCase_BerryPouch[] = _("{COLOR_HIGHLIGHT_SHADOW BLUE TRANSPARENT LIGHT_BLUE}"); static const struct ScrollArrowsTemplate sPocketSwitchArrowPairTemplate = { .firstArrowType = SCROLL_ARROW_LEFT, diff --git a/src/strings.c b/src/strings.c index e183e5167..d36301692 100644 --- a/src/strings.c +++ b/src/strings.c @@ -58,7 +58,7 @@ const u8 gText_Seen[] = _("Seen:"); const u8 gText_Owned[] = _("Owned:"); const u8 gText_Kanto[] = _("KANTO"); const u8 gText_National[] = _("NATIONAL"); -const u8 gText_PokemonHabitats[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}POKéMON HABITATS"); +const u8 gText_PokemonHabitats[] = _("{COLOR DYNAMIC_COLOR6}{SHADOW DYNAMIC_COLOR5}POKéMON HABITATS"); const u8 gText_DexCategory_GrasslandPkmn[] = _("Grassland POKéMON"); const u8 gText_DexCategory_ForestPkmn[] = _("Forest POKéMON"); const u8 gText_DexCategory_WatersEdgePkmn[] = _("Water's-edge POKéMON"); @@ -68,16 +68,16 @@ const u8 gText_DexCategory_MountainPkmn[] = _("Mountain POKéMON"); const u8 gText_DexCategory_RoughTerrainPkmn[] = _("Rough-terrain POKéMON"); const u8 gText_DexCategory_UrbanPkmn[] = _("Urban POKéMON"); const u8 gText_DexCategory_RarePkmn[] = _("Rare POKéMON"); -const u8 gText_Search[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}SEARCH"); +const u8 gText_Search[] = _("{COLOR DYNAMIC_COLOR6}{SHADOW DYNAMIC_COLOR5}SEARCH"); const u8 gText_NumericalMode[] = _("NUMERICAL MODE"); const u8 gText_AToZMode[] = _("A TO Z MODE"); -const u8 gText_PokedexOther[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}OTHER"); +const u8 gText_PokedexOther[] = _("{COLOR DYNAMIC_COLOR6}{SHADOW DYNAMIC_COLOR5}OTHER"); const u8 gTextJP_HowToUsePokedex[] = _("ずかんの つかいかた"); const u8 gText_ClosePokedex[] = _("CLOSE POKéDEX"); const u8 gText_TypeMode[] = _("TYPE MODE"); const u8 gText_LightestMode[] = _("LIGHTEST MODE"); const u8 gText_SmallestMode[] = _("SMALLEST MODE"); -const u8 gText_PokemonList[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}POKéMON LIST"); +const u8 gText_PokemonList[] = _("{COLOR DYNAMIC_COLOR6}{SHADOW DYNAMIC_COLOR5}POKéMON LIST"); const u8 gText_NumericalModeKanto[] = _("NUMERICAL MODE: KANTO"); const u8 gText_NumericalModeNational[] = _("NUMERICAL MODE: NATIONAL"); const u8 gText_PokemonListNoColor[] = _("POKéMON LIST"); @@ -110,8 +110,8 @@ ALIGNED(4) const u8 gText_Number[] = _("No. "); ALIGNED(4) const u8 gText_Level[] = _("Lv. "); ALIGNED(4) const u8 gText_Name[] = _("NAME"); ALIGNED(4) const u8 gText_IDNumber[] = _("IDNo."); -const u8 gUnknown_841610A[] = _("{HIGHLIGHT WHITE2}{COLOR DARK_GREY}オダマキはかせが ピンチだ!\nポケモンを だして たすけてあげよう!"); -const u8 gUnknown_8416133[] = _("{HIGHLIGHT WHITE2}{COLOR DARK_GREY}このポケモンにしますか?"); +const u8 gUnknown_841610A[] = _("{HIGHLIGHT DYNAMIC_COLOR6}{COLOR WHITE}オダマキはかせが ピンチだ!\nポケモンを だして たすけてあげよう!"); +const u8 gUnknown_8416133[] = _("{HIGHLIGHT DYNAMIC_COLOR6}{COLOR WHITE}このポケモンにしますか?"); const u8 gUnknown_8416146[] = _("ポケモン"); const u8 gText_SaveError_PleaseExchangeBackupMemory[] = _("Save error.\pPlease exchange the\nbackup memory."); const u8 gSaveStatName_Player[] = _("PLAYER"); @@ -760,9 +760,9 @@ const u8 gUnknown_8418C62[] = _("なにも かわらなかった!"); const u8 gUnknown_8418C6F[] = _("もう これいじょう たべない みたい‥"); const u8 gText_SaveFailedScreen_CheckingBackupMemory[] = _("Save failed.\nChecking the backup memory‥\nPlease wait.\n“Time required:\nabout 1 minute”"); const u8 gText_SaveFailedScreen_BackupMemoryDamaged[] = _("The backup memory is damaged or\nthe game's battery has run dry.\nThe game can be played, but its\nprogress cannot be saved.\n“Please press the A Button.”"); -const u8 gUnknown_8418D70[] = _("{COLOR RED}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”"); +const u8 gUnknown_8418D70[] = _("{COLOR DARK_GREY}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”"); const u8 gUnknown_8418D99[] = _("けんさが しゅうりょうしました!\nもういちど レポ-トを かきこみます\nしばらくおまちください"); -const u8 gUnknown_8418DC9[] = _("レポ-トの かきこみは しゅうりょうしました\n{COLOR RED}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”"); +const u8 gUnknown_8418DC9[] = _("レポ-トの かきこみは しゅうりょうしました\n{COLOR DARK_GREY}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”"); const u8 gText_SaveFailedScreen_SaveCompleted[] = _("Save completed.\n“Please press the A Button.”"); const u8 gUnknown_8418E36[] = _("れんらくせん"); const u8 gUnknown_8418E3D[] = _("ひみつきち"); @@ -1032,7 +1032,7 @@ ALIGNED(4) const u8 gText_BerryCrush_NoBerries[] = _("You have no BERRIES.\nThe ALIGNED(4) const u8 gText_BerryCrush_MemberDroppedOut[] = _("A member dropped out.\nThe game will be canceled."); ALIGNED(4) const u8 gText_BerryCrush_TimeUp[] = _("Time's up.\pGood BERRY POWDER could not be\nmade…\p"); ALIGNED(4) const u8 gText_BerryCrush_CommunicationStandby[] = _("Communication standby…"); -ALIGNED(4) const u8 gText_1_ClrLtGryShdwBlk_Dynamic0[] = _("1. {COLOR LIGHT_GRAY}{SHADOW BLACK}{DYNAMIC 0x00}"); +ALIGNED(4) const u8 gText_1_ClrLtGryShdwBlk_Dynamic0[] = _("1. {COLOR BLUE}{SHADOW LIGHT_BLUE}{DYNAMIC 0x00}"); const u8 gText_1_Dynamic0[] = _("1. {DYNAMIC 0x00}"); ALIGNED(4) const u8 gText_SpaceTimes[] = _(" times"); ALIGNED(4) const u8 gText_XDotY[] = _("{STR_VAR_1}.{STR_VAR_2}"); @@ -1214,10 +1214,10 @@ const u8 gTradeText_CancelTrade[] = _("Cancel trade?"); const u8 gTradeText_PressBButtonToExit[] = _("Press the B Button to exit."); const u8 gUnknown_841E10A[] = _("SUMMARY"); const u8 gUnknown_841E112[] = _("TRADE"); -const u8 gUnknown_841E118[] = _("{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}Communication standby…\nPlease wait."); -const u8 gUnknown_841E145[] = _("{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}The trade has been canceled."); -const u8 gUnknown_841E16B[] = _("{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}That's your only POKéMON\nfor battle."); -const u8 gUnknown_841E199[] = _("{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}Waiting for your friend\nto finish…"); +const u8 gUnknown_841E118[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Communication standby…\nPlease wait."); +const u8 gUnknown_841E145[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}The trade has been canceled."); +const u8 gUnknown_841E16B[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}That's your only POKéMON\nfor battle."); +const u8 gUnknown_841E199[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Waiting for your friend\nto finish…"); const u8 gUnknown_841E1C5[] = _("Your friend wants\nto trade POKéMON."); const u8 gText_XWillBeSentToY[] = _("{STR_VAR_2} will be\nsent to {STR_VAR_1}."); const u8 gText_ByeByeVar1[] = _("Bye-bye, {STR_VAR_2}!"); @@ -1246,7 +1246,7 @@ const u8 gUnknown_841E2C9[] = _("{DYNAMIC 0x02} players"); const u8 gUnknown_841E2D4[] = _("{DYNAMIC 0x03} players"); const u8 gUnknown_841E2DF[] = _("{DPAD_ANY}えらぶ:{A_BUTTON}けってい"); const u8 gUnknown_841E2EC[] = _("{B_BUTTON}CANCEL"); -const u8 gUnknown_841E2F5[] = _("{COLOR BLUE}{SHADOW YELLOW} たいせんの くみあわせ\n{COLOR RED}{SHADOW GREEN}じぶんの ばしょをきめて ください"); +const u8 gUnknown_841E2F5[] = _("{COLOR RED}{SHADOW LIGHT_RED} たいせんの くみあわせ\n{COLOR DARK_GREY}{SHADOW LIGHT_GREY}じぶんの ばしょをきめて ください"); const u8 gUnknown_841E322[] = _("{ID}"); const u8 gText_CommunicationStandby5[] = _("Communication standby…"); const u8 gDaycareText_GetAlongVeryWell[] = _("The two seem to get along\nvery well."); diff --git a/src/trade.c b/src/trade.c index 21c127838..83436a682 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_ClrDkGryHltTranspShdwRed[] = _("{COLOR WHITE}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}"); const u8 gText_MaleSymbol4[] = _("♂"); const u8 gText_FemaleSymbol4[] = _("♀"); const u8 gText_GenderlessSymbol[] = _(""); |