Fix move selection being broken from out-of-bounds access.

Mysticial · Mysticial · commit a19f22691dc0 · 2025-12-14T01:09:21.000-08:00
diff --git a/SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp b/SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp
@@ -96,14 +96,17 @@ bool TrainerBattleState::attempt_one_attack(
 
     int best_index = 4;
     for (int index = 0; index < 4; index++){
+//        cout << "index: " << index << endl;
         if (move_watcher[index] == MoveEffectivenessSymbol::None){
+//            cout << "skip due to none" << endl;
             continue;
         }
         if (m_settings.MODE == BattleAIMode::BlindMash){
             best_index = index;
             break;
         }
-        if (move_watcher[best_index] < move_watcher[index]){
+        if (best_index == 4 || move_watcher[best_index] < move_watcher[index]){
+//            cout << "better move found: " << index << endl;
             best_index = index;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -96,14 +96,17 @@ bool TrainerBattleState::attempt_one_attack(`
`96`	`96`
`97`	`97`	`int best_index = 4;`
`98`	`98`	`for (int index = 0; index < 4; index++){`
	`99`	`+// cout << "index: " << index << endl;`
`99`	`100`	`if (move_watcher[index] == MoveEffectivenessSymbol::None){`
	`101`	`+// cout << "skip due to none" << endl;`
`100`	`102`	`continue;`
`101`	`103`	`}`
`102`	`104`	`if (m_settings.MODE == BattleAIMode::BlindMash){`
`103`	`105`	`best_index = index;`
`104`	`106`	`break;`
`105`	`107`	`}`
`106`		`- if (move_watcher[best_index] < move_watcher[index]){`
	`108`	`+ if (best_index == 4 \|\| move_watcher[best_index] < move_watcher[index]){`
	`109`	`+// cout << "better move found: " << index << endl;`
`107`	`110`	`best_index = index;`
`108`	`111`	`}`
`109`	`112`	`}`