Wakka Overdrive fix

Author: coderwilson

battle/boss.py

@@ -786,7 +786,7 @@ def extractor():
                 elif (
                     memory.main.get_enemy_current_hp()[0] < 1400
                     and not screen.faint_check()
-                    and memory.main.get_overdrive_battle(4) == 100
+                    and Wakka.has_overdrive()
                 ):
                     CurrentPlayer().defend()
                 else:
@@ -796,7 +796,7 @@ def extractor():
                     memory.main.get_enemy_current_hp()[0] < 1900
                     and Wakka.has_overdrive()
                 ):
-                    Wakka.overdrive(combat=True)
+                    Wakka.overdrive()
                 else:
                     CurrentPlayer().attack()
         elif memory.main.diag_skip_possible():

players/base.py

@@ -347,6 +347,11 @@ def overdrive_percent(self, combat=False) -> int:
             return self._read_char_stat_offset_address(PlayerMagicNumbers.OVERDRIVE)
 
     def has_overdrive(self, combat=False) -> bool:
+        # Passed variable now does nothing, 11/30, clean up if the below logic works.
+        if memory.main.battle_active():
+            combat = True
+        else:
+            combat = False
         return self.overdrive_percent(combat=combat) == 100
 
     def is_turn(self) -> bool: