Minor tweaks

If Yuna is not in the party in Kilika for any reason, she will swap in. Maybe fixes a Kilika bug.
New feature to set RNG by its index number and desired value.
Load Game updates, used for testing Kilika bugs.
Improvement to the Defend logic.

Author: coderwilson

battle/main.py

@@ -419,6 +419,8 @@ def kilika_woods(valefor_charge=True, best_charge: int = 99, next_battle=[]):
                     break
                 elif screen.faint_check():
                     revive()
+                elif not 1 in memory.main.get_active_battle_formation():
+                    buddy_swap(Yuna)
                 elif Kimahri.is_turn() or Lulu.is_turn():
                     if memory.main.get_battle_char_slot(4) >= 3:
                         buddy_swap(Wakka)

json_ai_files/save_load_details.json

@@ -65,7 +65,7 @@
                 "end_game_version_val": "0",
                 "nea_zone": "0",
                 "nem_ap_val": "1",
-                "special_movement": "none"
+                "special_movement": "Kilika_rng_manip"
             }
         }
     },

load_game.py

@@ -34,6 +34,8 @@ def move_after_load(spec_move: str):
         load_miihen_start()
     elif spec_move == "MRR":
         load_mrr()
+    elif spec_move == "Kilika_rng_manip":
+        kilika_rng_manip()
 
 
 def load_into_game(gamestate: str, step_counter: str):
@@ -547,6 +549,11 @@ def load_baaj():
     FFXC.set_neutral()
     memory.main.wait_frames(30 * 0.04)
 
+def kilika_rng_manip():
+    # Kilika start, RNG01
+    # 1904657448
+    logger.warning("==== Hard setting value for testing")
+    memory.main.set_rng_by_index(value=1904657448, index=1)
 
 def besaid_trials():
     # Exit Tent

memory/main.py

@@ -2406,6 +2406,12 @@ def reset_battle_end():
     process.write_bytes(key, 1, 1)
 
 
+def set_rng_by_index(value:int=0, index:int=1):
+    global base_value
+    global process
+    key = base_value + 0x00D35ED8 + (index * 4)
+    process.write_bytes(key, 0x7E9F20D2, 4)
+
 def set_rng_2():
     global base_value
     global process

players/base.py

@@ -359,7 +359,9 @@ def escaped(self) -> bool:
 
     def is_defending(self) -> bool:
         defend_byte = self._read_char_battle_state_address(offset=PlayerMagicNumbers.DEFENDING)
-        return (defend_byte >> 3) == 1
+        result = (defend_byte >> 3) & 1 == 1
+        logger.warning(f"Character is defending: {result}")
+        return result
 
     def hp(self, combat=False) -> int:
         if not combat: