Adrienn Tindall 96c1096bfc Merge branch 'master' into master		2023-08-27 18:26:56 -05:00
..
battle_command.h	Added redquested changes	2023-08-20 13:48:58 -04:00
battle_controller_opponent.h	Clean up battle file structure + struct names	2023-08-19 18:39:58 -04:00
battle_controller_player.h	Clean up battle file structure + struct names	2023-08-19 18:39:58 -04:00
battle_controller.h	Clean up battle file structure + struct names	2023-08-19 18:39:58 -04:00
battle_cursor.h	Clean up battle file structure + struct names	2023-08-19 18:39:58 -04:00
battle_finger.h	Clean up battle file structure + struct names	2023-08-19 18:39:58 -04:00
battle_hp_bar.h	Clean up battle file structure + struct names	2023-08-19 18:39:58 -04:00
battle_input.h	Clean up battle file structure + struct names	2023-08-19 18:39:58 -04:00
battle_setup.h	Fix pointer style conflict in BattleSetup::party	2023-08-25 20:08:45 -04:00
battle_system.h	OPTIONS -> Options	2023-08-22 04:11:56 -04:00
battle.h	OPTIONS -> Options	2023-08-22 04:11:56 -04:00
overlay_12_0224E4FC.h	Finish fixing conflicts	2023-08-20 11:44:32 -04:00
overlay_12_0226BEC4.h	Clean up battle file structure + struct names	2023-08-19 18:39:58 -04:00
overlay_12_02266024.h	Clean up battle file structure + struct names	2023-08-19 18:39:58 -04:00