Rolling PP counter implemented and refactored

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2 years ago · 40242b7067
parent 89c480ceab
commit 40242b7067
2 changed files with 12 additions and 2 deletions
--- a/BIN
+++ b/BIN
--- a/main.cpp
+++ b/main.cpp
@ -1278,11 +1278,21 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 						}
 						for (int i=0;i<moves.size();i++) {
 							if (BATTLE_STATE==BattleState::GRADE_SELECT&&POWER_SELECTION_CURSOR[-CURRENT_TURN-1]==counter) {
+								Pixel drawCol;
 								if (POWER_GRADE_CURSOR[-CURRENT_TURN-1]==i) {
-									DrawFancyStringDecal({static_cast<float>(8+WIDTH/4+12+i*8),static_cast<float>(12*counter+8+displayYOffset)},std::wstring(1,moves[i]->grade));
+									if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->GetPP()>=moves[i]->PPCost) {
+										drawCol=WHITE;
+									} else {
+										drawCol=RED;
+									}
 								} else {
-									DrawFancyStringDecal({static_cast<float>(8+WIDTH/4+12+i*8),static_cast<float>(12*counter+8+displayYOffset)},std::wstring(1,moves[i]->grade),DARK_GREY);
+									if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->GetPP()>=moves[i]->PPCost) {
+										drawCol=DARK_GREY;
+									} else {
+										drawCol=DARK_RED;
+									}
 								}
+								DrawFancyStringDecal({static_cast<float>(8+WIDTH/4+12+i*8),static_cast<float>(12*counter+8+displayYOffset)},std::wstring(1,moves[i]->grade),drawCol);
 							} else {
 								DrawFancyStringDecal({static_cast<float>(8+WIDTH/4+12+i*8),static_cast<float>(12*counter+8+displayYOffset)},std::wstring(1,moves[i]->grade));
 							}