2020-04-01

Universal-Team · Mar 28, 2020 · 16454e3 · 16454e3
1 parent 2e70792
commit 16454e3
Show file tree

Hide file tree

Showing 66 changed files with 25 additions and 22 deletions.
diff --git 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;i<keys123.size();i++) {
-			printTextTinted(keys123[i].character, TextColor::gray, xPos + keys123[i].x + 16 - (getTextWidth(keys123[i].character) / 2), 192 - keyboard.height + keys123[i].y + 8, false, true);
+			printTextTinted(keys123[i].character, TextColor::white, xPos + keys123[i].x + 16 - (getTextWidth(keys123[i].character) / 2), 192 - keyboard.height + keys123[i].y + 8, false, true);
 		}
 	} else if(layout == 1) {
 		for(unsigned i=0;i<keysABC.size();i++) {
-			printTextTinted(keysABC[i].character, TextColor::gray, xPos + keysABC[i].x + 16 - (getTextWidth(keysABC[i].character) / 2), 192 - keyboard.height + keysABC[i].y + 8, false, true);
+			printTextTinted(keysABC[i].character, TextColor::white, xPos + keysABC[i].x + 16 - (getTextWidth(keysABC[i].character) / 2), 192 - keyboard.height + keysABC[i].y + 8, false, true);
 		}
-		printTextTinted("a/A", TextColor::gray, xPos + keysSpecialKana[0].x + 16 - (getTextWidth("a/A") / 2), 192 - keyboard.height + keysSpecialKana[0].y + 8, false, true);
+		printTextTinted("a/A", TextColor::white, xPos + keysSpecialKana[0].x + 16 - (getTextWidth("a/A") / 2), 192 - keyboard.height + keysSpecialKana[0].y + 8, false, true);
 	} else if(layout == 2) {
 		for(unsigned i=0;i<keysAIU.size();i++) {
 			std::u16string str;
 			str += (katakana ? tokatakana(keysAIU[i].character[0]) : keysAIU[i].character[0]);
-			printTextTinted(str, TextColor::gray, xPos + keysAIU[i].x + 16 - (getTextWidth(str) / 2), 192 - keyboard.height + keysAIU[i].y + 8, false, true);
+			printTextTinted(str, TextColor::white, xPos + keysAIU[i].x + 16 - (getTextWidth(str) / 2), 192 - keyboard.height + keysAIU[i].y + 8, false, true);
 		}
-		printTextTinted(katakana ? "ｯﾞﾟ" : "っﾞﾟ", TextColor::gray, xPos + keysSpecialKana[0].x + 16 - (getTextWidth(katakana ? "ｯﾞﾟ" : "っﾞﾟ") / 2), 192 - keyboard.height + keysSpecialKana[0].y + 8, false, true);
-		printTextTinted(katakana ? "あ" : "ア", TextColor::gray, xPos + keysSpecialKana[1].x + 16 - (getTextWidth(katakana ? "あ" : "ア") / 2), 192 - keyboard.height + keysSpecialKana[1].y + 8, false, true);
+		printTextTinted(katakana ? "ｯﾞﾟ" : "っﾞﾟ", TextColor::white, xPos + keysSpecialKana[0].x + 16 - (getTextWidth(katakana ? "ｯﾞﾟ" : "っﾞﾟ") / 2), 192 - keyboard.height + keysSpecialKana[0].y + 8, false, true);
+		printTextTinted(katakana ? "あ" : "ア", TextColor::white, xPos + keysSpecialKana[1].x + 16 - (getTextWidth(katakana ? "あ" : "ア") / 2), 192 - keyboard.height + keysSpecialKana[1].y + 8, false, true);
 	} else if(layout == 3) {
 		for(unsigned i=0;i<keysQWERTY.size();i++) {
 			std::string str;

diff --git a/arm9/source/loading.cpp b/arm9/source/loading.cpp
@@ -62,7 +62,7 @@ void loadLoadingLogo(void) {
 
 void showLoadingLogo(void) {
 	angle = 0;
-	oamSet(&oamSub, 127, 112, 80, 0, 15, SpriteSize_32x32, SpriteColorFormat_Bmp, logoGfx, 0, false, false, false, false, false);
+	oamSet(&oamSub, 127, 96, 64, 0, 15, SpriteSize_32x32, SpriteColorFormat_Bmp, logoGfx, 0, true, false, false, false, false);
 	oamUpdate(&oamSub);
 	irqSet(IRQ_VBLANK, loadingAnimation);
 }

diff --git a/arm9/source/manager.cpp b/arm9/source/manager.cpp
@@ -279,6 +279,7 @@ void drawBoxScreen(void) {
 }
 
 std::string boxBgPath(bool top, int box) {
+	box = 0;
 	if(top)	return (wideScreen ? "/graphics/box/chestWide.gfx" : "/graphics/box/chest.gfx");
 	std::string game;
 	switch(save->version()) {
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/graphics/graphics/arrowRed.bmp b/graphics/graphics/arrowRed.bmp
diff --git a/graphics/graphics/arrowYellow.bmp b/graphics/graphics/arrowYellow.bmp
diff --git a/graphics/graphics/ball/0.bmp b/graphics/graphics/ball/0.bmp
diff --git a/graphics/graphics/ball/1.bmp b/graphics/graphics/ball/1.bmp
diff --git a/graphics/graphics/ball/10.bmp b/graphics/graphics/ball/10.bmp
diff --git a/graphics/graphics/ball/11.bmp b/graphics/graphics/ball/11.bmp
diff --git a/graphics/graphics/ball/12.bmp b/graphics/graphics/ball/12.bmp
diff --git a/graphics/graphics/ball/13.bmp b/graphics/graphics/ball/13.bmp
diff --git a/graphics/graphics/ball/14.bmp b/graphics/graphics/ball/14.bmp
diff --git a/graphics/graphics/ball/15.bmp b/graphics/graphics/ball/15.bmp
diff --git a/graphics/graphics/ball/16.bmp b/graphics/graphics/ball/16.bmp
diff --git a/graphics/graphics/ball/17.bmp b/graphics/graphics/ball/17.bmp
diff --git a/graphics/graphics/ball/18.bmp b/graphics/graphics/ball/18.bmp
diff --git a/graphics/graphics/ball/19.bmp b/graphics/graphics/ball/19.bmp
diff --git a/graphics/graphics/ball/2.bmp b/graphics/graphics/ball/2.bmp
diff --git a/graphics/graphics/ball/20.bmp b/graphics/graphics/ball/20.bmp
diff --git a/graphics/graphics/ball/21.bmp b/graphics/graphics/ball/21.bmp
diff --git a/graphics/graphics/ball/22.bmp b/graphics/graphics/ball/22.bmp
diff --git a/graphics/graphics/ball/23.bmp b/graphics/graphics/ball/23.bmp
diff --git a/graphics/graphics/ball/24.bmp b/graphics/graphics/ball/24.bmp
diff --git a/graphics/graphics/ball/25.bmp b/graphics/graphics/ball/25.bmp
diff --git a/graphics/graphics/ball/3.bmp b/graphics/graphics/ball/3.bmp
diff --git a/graphics/graphics/ball/4.bmp b/graphics/graphics/ball/4.bmp
diff --git a/graphics/graphics/ball/5.bmp b/graphics/graphics/ball/5.bmp
diff --git a/graphics/graphics/ball/6.bmp b/graphics/graphics/ball/6.bmp
diff --git a/graphics/graphics/ball/7.bmp b/graphics/graphics/ball/7.bmp
diff --git a/graphics/graphics/ball/8.bmp b/graphics/graphics/ball/8.bmp
diff --git a/graphics/graphics/ball/9.bmp b/graphics/graphics/ball/9.bmp
diff --git a/graphics/graphics/box/bw/0.bmp b/graphics/graphics/box/bw/0.bmp
diff --git a/graphics/graphics/box/chest.bmp b/graphics/graphics/box/chest.bmp
diff --git a/graphics/graphics/box/chestWide.bmp b/graphics/graphics/box/chestWide.bmp
diff --git a/graphics/graphics/box/dp/0.bmp b/graphics/graphics/box/dp/0.bmp
diff --git a/graphics/graphics/box/e/0.bmp b/graphics/graphics/box/e/0.bmp
diff --git a/graphics/graphics/box/rs/0.bmp b/graphics/graphics/box/rs/0.bmp
diff --git a/graphics/graphics/boxBgTop.bmp b/graphics/graphics/boxBgTop.bmp
diff --git a/graphics/graphics/boxBgTopWide.bmp b/graphics/graphics/boxBgTopWide.bmp
diff --git a/graphics/graphics/boxButton.bmp b/graphics/graphics/boxButton.bmp
diff --git a/graphics/graphics/icon.bmp b/graphics/graphics/icon.bmp
diff --git a/graphics/graphics/infoBox.bmp b/graphics/graphics/infoBox.bmp
diff --git a/graphics/graphics/item.bmp b/graphics/graphics/item.bmp
diff --git a/graphics/graphics/keyboardKana.bmp b/graphics/graphics/keyboardKana.bmp
diff --git a/graphics/graphics/keyboardKey.bmp b/graphics/graphics/keyboardKey.bmp
diff --git a/graphics/graphics/keyboardQWERTY.bmp b/graphics/graphics/keyboardQWERTY.bmp
diff --git a/graphics/graphics/listBg.bmp b/graphics/graphics/listBg.bmp
diff --git a/graphics/graphics/menuBg.bmp b/graphics/graphics/menuBg.bmp
diff --git a/graphics/graphics/menuButton.bmp b/graphics/graphics/menuButton.bmp
diff --git a/graphics/graphics/menuButtonBlue.bmp b/graphics/graphics/menuButtonBlue.bmp
diff --git a/graphics/graphics/menuIconSheet.bmp b/graphics/graphics/menuIconSheet.bmp
diff --git a/graphics/graphics/party.bmp b/graphics/graphics/party.bmp
diff --git a/graphics/graphics/search.bmp b/graphics/graphics/search.bmp
diff --git a/graphics/graphics/shiny.bmp b/graphics/graphics/shiny.bmp
diff --git a/icon.bmp b/icon.bmp
diff --git a/nitrofiles/graphics/font.nftr b/nitrofiles/graphics/font.nftr
diff --git a/resources/nftr tools/font.bmp b/resources/nftr tools/font.bmp
diff --git a/resources/nftr tools/font.xcf b/resources/nftr tools/font.xcf
diff --git a/sound/back.wav b/sound/back.wav
diff --git a/sound/center1.bak b/sound/center1.bak
diff --git a/sound/center1.mod b/sound/center1.mod
diff --git a/sound/click.wav b/sound/click.wav