diff --git a/C++ProjectTemplate b/C++ProjectTemplate index be887fd..fdc8d7b 100755 Binary files a/C++ProjectTemplate and b/C++ProjectTemplate differ diff --git a/main.cpp b/main.cpp index 6bd1fe7..5e407d0 100644 --- a/main.cpp +++ b/main.cpp @@ -780,8 +780,10 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"), POWER_GRADE_CURSOR[-CURRENT_TURN-1]=std::clamp(POWER_GRADE_CURSOR[-CURRENT_TURN-1]-1,0,(int)(BATTLE_MOVELIST_DISPLAY[POWER_SELECTION_CURSOR[-CURRENT_TURN-1]].size())-1); } if (ACTIONKEYPRESSED) { - PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove=BATTLE_MOVELIST_DISPLAY[POWER_SELECTION_CURSOR[-CURRENT_TURN-1]][POWER_GRADE_CURSOR[-CURRENT_TURN-1]]; - SetupTargetSelect(); + if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->GetPP()>=BATTLE_MOVELIST_DISPLAY[POWER_SELECTION_CURSOR[-CURRENT_TURN-1]][POWER_GRADE_CURSOR[-CURRENT_TURN-1]]->PPCost) { + PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->selectedMove=BATTLE_MOVELIST_DISPLAY[POWER_SELECTION_CURSOR[-CURRENT_TURN-1]][POWER_GRADE_CURSOR[-CURRENT_TURN-1]]; + SetupTargetSelect(); + } } } }break; @@ -1277,8 +1279,8 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"), DrawStringPropDecal({12,static_cast(12*counter+8+displayYOffset)},name); } for (int i=0;iGetPP()>=moves[i]->PPCost) { drawCol=WHITE; @@ -1292,10 +1294,15 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"), drawCol=DARK_RED; } } - DrawFancyStringDecal({static_cast(8+WIDTH/4+12+i*8),static_cast(12*counter+8+displayYOffset)},std::wstring(1,moves[i]->grade),drawCol); } else { - DrawFancyStringDecal({static_cast(8+WIDTH/4+12+i*8),static_cast(12*counter+8+displayYOffset)},std::wstring(1,moves[i]->grade)); + drawCol=WHITE; + if (PARTY_MEMBER_STATS[PARTY_MEMBER_ID[-CURRENT_TURN-1]]->GetPP()>=moves[i]->PPCost) { + drawCol=WHITE; + } else { + drawCol=RED; + } } + DrawFancyStringDecal({static_cast(8+WIDTH/4+12+i*8),static_cast(12*counter+8+displayYOffset)},std::wstring(1,moves[i]->grade),drawCol); } } ++counter;