diff --git a/arm9/source/input.cpp b/arm9/source/input.cpp index a4813294c..407e8b145 100644 --- a/arm9/source/input.cpp +++ b/arm9/source/input.cpp @@ -427,21 +427,21 @@ void drawKeyboard(int layout) { if(layout == 0) { for(unsigned i=0;iversion()) { @@ -346,7 +347,7 @@ void drawBox(bool top) { drawImage((top && wideScreen) ? 17 : 5, 15, bankBox, top, false); // Print box name - printTextCenteredTintedMaxW((top ? Banks::bank->boxName(currentBankBox) : save->boxName(currentSaveBox)), 110 * (top ? WIDE_SCALE : 1), 1, TextColor::gray, boxTitleX, top ? 20 : boxTitleY, top, false, top ? WIDE_SCALE : 1); + printTextCenteredTintedMaxW((top ? Banks::bank->boxName(currentBankBox) : save->boxName(currentSaveBox)), 110 * (top ? WIDE_SCALE : 1), 1, TextColor::white, boxTitleX, top ? 20 : boxTitleY, top, false, top ? WIDE_SCALE : 1); if(!top) { drawImage(boxButton.width+5, 192-search.height, search, false, false); @@ -361,16 +362,16 @@ void drawPokemonInfo(const PKX &pkm) { if(pkm.species() > 0 && pkm.species() < 650) { // Show shiny star if applicable - if(pkm.shiny()) drawImageScaled(170 + (69 * WIDE_SCALE), 45, WIDE_SCALE, 1, shiny, true, false); + if(pkm.shiny()) drawImageScaled(170 + (69 * WIDE_SCALE), 45, WIDE_SCALE, 1, shiny, true, true); // Print Pokédex number char str[9]; snprintf(str, sizeof(str), "%s%.3i", i18n::localize(Config::getLang("lang"), "dexNo").c_str(), pkm.species()); - printTextTintedScaled(str, WIDE_SCALE, 1, TextColor::gray, 170, 8, true, true); + printTextTintedScaled(str, WIDE_SCALE, 1, TextColor::white, 170, 8, true, true); // Print name - if(pkm.nicknamed()) printTextTintedMaxW(pkm.nickname(), 80 * WIDE_SCALE, 1, (pkm.gender() ? (pkm.gender() == 1 ? TextColor::red : TextColor::gray) : TextColor::blue), 170, 25, true, true, WIDE_SCALE); - else printTextTintedMaxW(i18n::species(Config::getLang("lang"), pkm.species()), 80 * WIDE_SCALE, 1, (pkm.gender() ? (pkm.gender() == 1 ? TextColor::red : TextColor::gray) : TextColor::blue), 170, 25, true, true, WIDE_SCALE); + if(pkm.nicknamed()) printTextTintedMaxW(pkm.nickname(), 80 * WIDE_SCALE, 1, (pkm.gender() ? (pkm.gender() == 1 ? TextColor::red : TextColor::white) : TextColor::blue), 170, 25, true, true, WIDE_SCALE); + else printTextTintedMaxW(i18n::species(Config::getLang("lang"), pkm.species()), 80 * WIDE_SCALE, 1, (pkm.gender() ? (pkm.gender() == 1 ? TextColor::red : TextColor::white) : TextColor::blue), 170, 25, true, true, WIDE_SCALE); // Draw types int type = (pkm.generation() < Generation::FIVE && pkm.type1() > 8) ? pkm.type1()-1 : pkm.type1(); @@ -381,7 +382,7 @@ void drawPokemonInfo(const PKX &pkm) { } // Print Level - printTextTintedScaled(i18n::localize(Config::getLang("lang"), "lv")+std::to_string(pkm.level()), WIDE_SCALE, 1, TextColor::gray, 170, 57, true, true); + printTextTintedScaled(i18n::localize(Config::getLang("lang"), "lv")+std::to_string(pkm.level()), WIDE_SCALE, 1, TextColor::white, 170, 57, true, true); } } diff --git a/arm9/source/utils/config.cpp b/arm9/source/utils/config.cpp index 302c2dd90..34c28c212 100644 --- a/arm9/source/utils/config.cpp +++ b/arm9/source/utils/config.cpp @@ -76,6 +76,8 @@ void Config::setString(const std::string &key, const std::string &v) { } Language Config::getLang(const std::string &key) { + return Language::BRH; + if(!configJson.contains(key) || !configJson[key].is_string()) { return sysLang(); } diff --git a/arm9/source/utils/sound.cpp b/arm9/source/utils/sound.cpp index 283907145..7a7019c51 100644 --- a/arm9/source/utils/sound.cpp +++ b/arm9/source/utils/sound.cpp @@ -12,13 +12,13 @@ mm_sound_effect Sound::click, Sound::back; void Sound::load(const char *path) { - char realPath[PATH_MAX]; - if(access(path, F_OK) == 0) { - strcpy(realPath, path); - } else { - strcpy(realPath, "nitro:/sound/sfx.msl"); - } - mmInitDefault(realPath); + // char realPath[PATH_MAX]; + // if(access(path, F_OK) == 0) { + // strcpy(realPath, path); + // } else { + // strcpy(realPath, "nitro:/sound/sfx.msl"); + // } + mmInitDefault("nitro:/sound/center1.msl"); mmLoadEffect(SFX_BACK); mmLoadEffect(SFX_CLICK); @@ -45,5 +45,5 @@ void Sound::load(const char *path) { } void Sound::play(mm_sound_effect &sound) { - if(Config::getBool("playSfx")) mmEffectEx(&sound); + /*if(Config::getBool("playSfx"))*/ mmEffectEx(&sound); } diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b8c7fd55c..f09760969 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,7 +1,7 @@ trigger: branches: include: ['*'] - exclude: [translation] + exclude: [translation, '2020-04-01'] tags: include: ['*'] diff --git a/graphics/graphics/arrowBlue.bmp b/graphics/graphics/arrowBlue.bmp index 1aa7bf26b..35ae40207 100644 Binary files a/graphics/graphics/arrowBlue.bmp and b/graphics/graphics/arrowBlue.bmp differ diff --git a/graphics/graphics/arrowRed.bmp b/graphics/graphics/arrowRed.bmp index c3f574f2e..b0e9935ea 100644 Binary files a/graphics/graphics/arrowRed.bmp and b/graphics/graphics/arrowRed.bmp differ diff --git a/graphics/graphics/arrowYellow.bmp b/graphics/graphics/arrowYellow.bmp index a0e5ecd95..0d381b3f4 100644 Binary files a/graphics/graphics/arrowYellow.bmp and b/graphics/graphics/arrowYellow.bmp differ diff --git a/graphics/graphics/ball/0.bmp b/graphics/graphics/ball/0.bmp index 058949b97..e43f06d36 100644 Binary files a/graphics/graphics/ball/0.bmp and b/graphics/graphics/ball/0.bmp differ diff --git a/graphics/graphics/ball/1.bmp b/graphics/graphics/ball/1.bmp index 42096742e..848ed0a33 100644 Binary files a/graphics/graphics/ball/1.bmp and b/graphics/graphics/ball/1.bmp differ diff --git a/graphics/graphics/ball/10.bmp b/graphics/graphics/ball/10.bmp index 11b96e12b..4a6e8f8d8 100644 Binary files a/graphics/graphics/ball/10.bmp and b/graphics/graphics/ball/10.bmp differ diff --git a/graphics/graphics/ball/11.bmp b/graphics/graphics/ball/11.bmp index c24ec7232..aa8f38846 100644 Binary files a/graphics/graphics/ball/11.bmp and b/graphics/graphics/ball/11.bmp differ diff --git a/graphics/graphics/ball/12.bmp b/graphics/graphics/ball/12.bmp index e1297ebc9..bf37337a5 100644 Binary files a/graphics/graphics/ball/12.bmp and b/graphics/graphics/ball/12.bmp differ diff --git a/graphics/graphics/ball/13.bmp b/graphics/graphics/ball/13.bmp index 3a604e40e..86b89c006 100644 Binary files a/graphics/graphics/ball/13.bmp and b/graphics/graphics/ball/13.bmp differ diff --git a/graphics/graphics/ball/14.bmp b/graphics/graphics/ball/14.bmp index fe45e9003..33b532271 100644 Binary files a/graphics/graphics/ball/14.bmp and b/graphics/graphics/ball/14.bmp differ diff --git a/graphics/graphics/ball/15.bmp b/graphics/graphics/ball/15.bmp index cb05ec676..d133e6dac 100644 Binary files a/graphics/graphics/ball/15.bmp and b/graphics/graphics/ball/15.bmp differ diff --git a/graphics/graphics/ball/16.bmp b/graphics/graphics/ball/16.bmp index 8242e4aee..ee92b48cf 100644 Binary files a/graphics/graphics/ball/16.bmp and b/graphics/graphics/ball/16.bmp differ diff --git a/graphics/graphics/ball/17.bmp b/graphics/graphics/ball/17.bmp index 418d4e982..f2829dbe4 100644 Binary files a/graphics/graphics/ball/17.bmp and b/graphics/graphics/ball/17.bmp differ diff --git a/graphics/graphics/ball/18.bmp b/graphics/graphics/ball/18.bmp index d7b282dfe..6da0070d5 100644 Binary files a/graphics/graphics/ball/18.bmp and b/graphics/graphics/ball/18.bmp differ diff --git a/graphics/graphics/ball/19.bmp b/graphics/graphics/ball/19.bmp index 54e7652f5..786a3a407 100644 Binary files a/graphics/graphics/ball/19.bmp and b/graphics/graphics/ball/19.bmp differ diff --git a/graphics/graphics/ball/2.bmp b/graphics/graphics/ball/2.bmp index f0fcd6bab..d4a8579f4 100644 Binary files a/graphics/graphics/ball/2.bmp and b/graphics/graphics/ball/2.bmp differ diff --git a/graphics/graphics/ball/20.bmp b/graphics/graphics/ball/20.bmp index 92d2a36de..744558f46 100644 Binary files a/graphics/graphics/ball/20.bmp and b/graphics/graphics/ball/20.bmp differ diff --git a/graphics/graphics/ball/21.bmp b/graphics/graphics/ball/21.bmp index 60656d524..ede84c313 100644 Binary files a/graphics/graphics/ball/21.bmp and b/graphics/graphics/ball/21.bmp differ diff --git a/graphics/graphics/ball/22.bmp b/graphics/graphics/ball/22.bmp index ee84b8737..6bc84b223 100644 Binary files a/graphics/graphics/ball/22.bmp and b/graphics/graphics/ball/22.bmp differ diff --git a/graphics/graphics/ball/23.bmp b/graphics/graphics/ball/23.bmp index 0ce6c398e..7a23d5369 100644 Binary files a/graphics/graphics/ball/23.bmp and b/graphics/graphics/ball/23.bmp differ diff --git a/graphics/graphics/ball/24.bmp b/graphics/graphics/ball/24.bmp index 218c276cc..933e503f2 100644 Binary files a/graphics/graphics/ball/24.bmp and b/graphics/graphics/ball/24.bmp differ diff --git a/graphics/graphics/ball/25.bmp b/graphics/graphics/ball/25.bmp index 30dee5781..1352d43e3 100644 Binary files a/graphics/graphics/ball/25.bmp and b/graphics/graphics/ball/25.bmp differ diff --git a/graphics/graphics/ball/3.bmp b/graphics/graphics/ball/3.bmp index 55a567837..b4fafd282 100644 Binary files a/graphics/graphics/ball/3.bmp and b/graphics/graphics/ball/3.bmp differ diff --git a/graphics/graphics/ball/4.bmp b/graphics/graphics/ball/4.bmp index 924089056..4a6e8f8d8 100644 Binary files a/graphics/graphics/ball/4.bmp and b/graphics/graphics/ball/4.bmp differ diff --git a/graphics/graphics/ball/5.bmp b/graphics/graphics/ball/5.bmp index eee2d8357..2433289e9 100644 Binary files a/graphics/graphics/ball/5.bmp and b/graphics/graphics/ball/5.bmp differ diff --git a/graphics/graphics/ball/6.bmp b/graphics/graphics/ball/6.bmp index 9e667692c..cde7a35ed 100644 Binary files a/graphics/graphics/ball/6.bmp and b/graphics/graphics/ball/6.bmp differ diff --git a/graphics/graphics/ball/7.bmp b/graphics/graphics/ball/7.bmp index 18a3130d2..0dbe43b05 100644 Binary files a/graphics/graphics/ball/7.bmp and b/graphics/graphics/ball/7.bmp differ diff --git a/graphics/graphics/ball/8.bmp b/graphics/graphics/ball/8.bmp index fa3e2c1c1..2433289e9 100644 Binary files a/graphics/graphics/ball/8.bmp and b/graphics/graphics/ball/8.bmp differ diff --git a/graphics/graphics/ball/9.bmp b/graphics/graphics/ball/9.bmp index 638c3bbe4..9b8adeb07 100644 Binary files a/graphics/graphics/ball/9.bmp and b/graphics/graphics/ball/9.bmp differ diff --git a/graphics/graphics/box/bw/0.bmp b/graphics/graphics/box/bw/0.bmp index f2e8648aa..dbc6cc8e8 100644 Binary files a/graphics/graphics/box/bw/0.bmp and b/graphics/graphics/box/bw/0.bmp differ diff --git a/graphics/graphics/box/chest.bmp b/graphics/graphics/box/chest.bmp index c339ef273..752af2a42 100644 Binary files a/graphics/graphics/box/chest.bmp and b/graphics/graphics/box/chest.bmp differ diff --git a/graphics/graphics/box/chestWide.bmp b/graphics/graphics/box/chestWide.bmp index 389be17a4..ca5f68693 100644 Binary files a/graphics/graphics/box/chestWide.bmp and b/graphics/graphics/box/chestWide.bmp differ diff --git a/graphics/graphics/box/dp/0.bmp b/graphics/graphics/box/dp/0.bmp index 0bb1f0146..602276a3a 100644 Binary files a/graphics/graphics/box/dp/0.bmp and b/graphics/graphics/box/dp/0.bmp differ diff --git a/graphics/graphics/box/e/0.bmp b/graphics/graphics/box/e/0.bmp index ceb5a3c11..00483429b 100644 Binary files a/graphics/graphics/box/e/0.bmp and b/graphics/graphics/box/e/0.bmp differ diff --git a/graphics/graphics/box/rs/0.bmp b/graphics/graphics/box/rs/0.bmp index d8583bee7..f50d9eee3 100644 Binary files a/graphics/graphics/box/rs/0.bmp and b/graphics/graphics/box/rs/0.bmp differ diff --git a/graphics/graphics/boxBgTop.bmp b/graphics/graphics/boxBgTop.bmp index 74dfec1bc..86ab823dd 100644 Binary files a/graphics/graphics/boxBgTop.bmp and b/graphics/graphics/boxBgTop.bmp differ diff --git a/graphics/graphics/boxBgTopWide.bmp b/graphics/graphics/boxBgTopWide.bmp index 132054a57..c1a3431c0 100644 Binary files a/graphics/graphics/boxBgTopWide.bmp and b/graphics/graphics/boxBgTopWide.bmp differ diff --git a/graphics/graphics/boxButton.bmp b/graphics/graphics/boxButton.bmp index 30f4d377a..34c0f30e6 100644 Binary files a/graphics/graphics/boxButton.bmp and b/graphics/graphics/boxButton.bmp differ diff --git a/graphics/graphics/icon.bmp b/graphics/graphics/icon.bmp index e73568e10..84405ac9d 100644 Binary files a/graphics/graphics/icon.bmp and b/graphics/graphics/icon.bmp differ diff --git a/graphics/graphics/infoBox.bmp b/graphics/graphics/infoBox.bmp index c15da5e69..31c38f1c3 100644 Binary files a/graphics/graphics/infoBox.bmp and b/graphics/graphics/infoBox.bmp differ diff --git a/graphics/graphics/item.bmp b/graphics/graphics/item.bmp index b42d898d7..091d915a1 100644 Binary files a/graphics/graphics/item.bmp and b/graphics/graphics/item.bmp differ diff --git a/graphics/graphics/keyboardKana.bmp b/graphics/graphics/keyboardKana.bmp index 508dffdac..e5151bae9 100644 Binary files a/graphics/graphics/keyboardKana.bmp and b/graphics/graphics/keyboardKana.bmp differ diff --git a/graphics/graphics/keyboardKey.bmp b/graphics/graphics/keyboardKey.bmp index 51d788032..681dfc20f 100644 Binary files a/graphics/graphics/keyboardKey.bmp and b/graphics/graphics/keyboardKey.bmp differ diff --git a/graphics/graphics/keyboardQWERTY.bmp b/graphics/graphics/keyboardQWERTY.bmp index b922a2aa7..352154a2a 100644 Binary files a/graphics/graphics/keyboardQWERTY.bmp and b/graphics/graphics/keyboardQWERTY.bmp differ diff --git a/graphics/graphics/listBg.bmp b/graphics/graphics/listBg.bmp index e9fdc4e20..64e603059 100644 Binary files a/graphics/graphics/listBg.bmp and b/graphics/graphics/listBg.bmp differ diff --git a/graphics/graphics/menuBg.bmp b/graphics/graphics/menuBg.bmp index 93356ded1..fdcd8e148 100644 Binary files a/graphics/graphics/menuBg.bmp and b/graphics/graphics/menuBg.bmp differ diff --git a/graphics/graphics/menuButton.bmp b/graphics/graphics/menuButton.bmp index a289bbecf..e7a57eb75 100644 Binary files a/graphics/graphics/menuButton.bmp and b/graphics/graphics/menuButton.bmp differ diff --git a/graphics/graphics/menuButtonBlue.bmp b/graphics/graphics/menuButtonBlue.bmp index da151d7a6..c8347700d 100644 Binary files a/graphics/graphics/menuButtonBlue.bmp and b/graphics/graphics/menuButtonBlue.bmp differ diff --git a/graphics/graphics/menuIconSheet.bmp b/graphics/graphics/menuIconSheet.bmp index 5cb1c34dc..bd5be94a3 100644 Binary files a/graphics/graphics/menuIconSheet.bmp and b/graphics/graphics/menuIconSheet.bmp differ diff --git a/graphics/graphics/party.bmp b/graphics/graphics/party.bmp index 559061b63..625457bca 100644 Binary files a/graphics/graphics/party.bmp and b/graphics/graphics/party.bmp differ diff --git a/graphics/graphics/search.bmp b/graphics/graphics/search.bmp index b337bd17c..1b22052fb 100644 Binary files a/graphics/graphics/search.bmp and b/graphics/graphics/search.bmp differ diff --git a/graphics/graphics/shiny.bmp b/graphics/graphics/shiny.bmp index c587b4fa4..8005569b7 100644 Binary files a/graphics/graphics/shiny.bmp and b/graphics/graphics/shiny.bmp differ diff --git a/icon.bmp b/icon.bmp index 0ca923d5d..a457bb375 100644 Binary files a/icon.bmp and b/icon.bmp differ diff --git a/nitrofiles/graphics/font.nftr b/nitrofiles/graphics/font.nftr index d9fd32bfe..6a051e2c7 100644 Binary files a/nitrofiles/graphics/font.nftr and b/nitrofiles/graphics/font.nftr differ diff --git a/resources/nftr tools/font.bmp b/resources/nftr tools/font.bmp index 09b1a7b81..9bca1b38f 100644 Binary files a/resources/nftr tools/font.bmp and b/resources/nftr tools/font.bmp differ diff --git a/resources/nftr tools/font.xcf b/resources/nftr tools/font.xcf index cab6305be..08cd623e3 100644 Binary files a/resources/nftr tools/font.xcf and b/resources/nftr tools/font.xcf differ diff --git a/sound/back.wav b/sound/back.wav index 6c33e2bed..5ca3d29d1 100644 Binary files a/sound/back.wav and b/sound/back.wav differ diff --git a/sound/center1.bak b/sound/center1.bak new file mode 100644 index 000000000..09f28c3e5 Binary files /dev/null and b/sound/center1.bak differ diff --git a/sound/center1.mod b/sound/center1.mod index a562cb6a1..6269ef76c 100644 Binary files a/sound/center1.mod and b/sound/center1.mod differ diff --git a/sound/click.wav b/sound/click.wav index ed432d173..5ca3d29d1 100644 Binary files a/sound/click.wav and b/sound/click.wav differ