rename battle4 and battleai

7 files changed, 13 insertions, 13 deletions

diff --git a/include/battle.h b/include/battle.h
index 158ae46b2..67d3d873d 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -898,7 +898,7 @@ void sub_80458B4(void);
 u8 GetMoveTarget(u16 move, u8 useMoveTarget);
 u8 IsPokeDisobedient(void);
 
-// battle_4
+// battle_script_commands
 void AI_CalcDmg(u8 bankAtk, u8 bankDef);
 u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef);
 u8 AI_TypeCalc(u16 move, u16 species, u8 ability);
@@ -910,6 +910,7 @@ void BufferMoveToLearnIntoBattleTextBuff2(void);
 void sub_8056A3C(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
 bool8 UproarWakeUpCheck(u8 bank);
 
+extern void (* const gBattleScriptingCommandsTable[])(void);
 extern const u8 gUnknown_0831C494[];
 
 // battle_5
diff --git a/include/battle_ai.h b/include/battle_ai_script_commands.h
index 2a315059b..5fb422b41 100644
--- a/include/battle_ai.h
+++ b/include/battle_ai_script_commands.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_BATTLE_AI_H
-#define GUARD_BATTLE_AI_H
+#ifndef GUARD_BATTLE_AI_SCRIPT_COMMANDS_H
+#define GUARD_BATTLE_AI_SCRIPT_COMMANDS_H
 
 void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves);
 void BattleAI_SetupAIData(u8 defaultScoreMoves);
@@ -10,4 +10,4 @@ void ClearBankAbilityHistory(u8 bank);
 void RecordItemEffectBattle(u8 bank, u8 itemEffect);
 void ClearBankItemEffectHistory(u8 bank);
 
-#endif // GUARD_BATTLE_AI_H
+#endif // GUARD_BATTLE_AI_SCRIPT_COMMANDS_H
diff --git a/ld_script.txt b/ld_script.txt
index 5adacecf6..5e273c049 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -59,7 +59,7 @@ SECTIONS {
         asm/battle_1.o(.text);
         asm/battle_2.o(.text);
         src/battle_3.o(.text);
-        src/battle_4.o(.text);
+        src/battle_script_commands.o(.text);
         asm/battle_5.o(.text);
         asm/battle_controller_player.o(.text);
         asm/battle_7.o(.text);
@@ -177,7 +177,7 @@ SECTIONS {
         asm/decoration.o(.text);
         asm/slot_machine.o(.text);
         asm/contest_painting.o(.text);
-        src/battle_ai.o(.text);
+        src/battle_ai_script_commands.o(.text);
         asm/trader.o(.text);
         asm/starter_choose.o(.text);
         asm/wallclock.o(.text);
@@ -329,7 +329,7 @@ SECTIONS {
         data/link.o(.rodata);
         src/rtc.o(.rodata);
         data/data2b.o(.rodata);
-        src/battle_4.o(.rodata);
+        src/battle_script_commands.o(.rodata);
         data/battle_controller_player.o(.rodata);
         data/data2b_2.o(.rodata);
         data/battle_controller_opponent.o(.rodata);
@@ -409,7 +409,7 @@ SECTIONS {
         data/decoration.o(.rodata);
         data/slot_machine.o(.rodata);
         data/contest_painting.o(.rodata);
-        src/battle_ai.o(.rodata);
+        src/battle_ai_script_commands.o(.rodata);
         data/data4.o(.rodata);
         data/battle_controller_link_partner.o(.rodata);
         data/battle_message.o(.rodata);
diff --git a/src/battle_3.c b/src/battle_3.c
index e81d527d0..e42d9317d 100644
--- a/src/battle_3.c
+++ b/src/battle_3.c
@@ -13,7 +13,7 @@
 #include "text.h"
 #include "string_util.h"
 #include "battle_message.h"
-#include "battle_ai.h"
+#include "battle_ai_script_commands.h"
 #include "battle_controllers.h"
 #include "event_data.h"
 #include "calculate_base_damage.h"
@@ -57,7 +57,6 @@ extern u8 gCurrMovePos;
 extern u8 gUnknown_020241E9;
 
 extern const struct BattleMove gBattleMoves[];
-extern void (* const gBattleScriptingCommandsTable[])(void);
 
 // scripts
 extern const u8 gUnknown_082DAE2A[];
diff --git a/src/battle_ai.c b/src/battle_ai_script_commands.c
index 8590b0f03..dae43f13c 100644
--- a/src/battle_ai.c
+++ b/src/battle_ai_script_commands.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "battle_ai.h"
+#include "battle_ai_script_commands.h"
 #include "pokemon.h"
 #include "battle.h"
 #include "species.h"
diff --git a/src/battle_4.c b/src/battle_script_commands.c
index e82f78570..2e6b3dbae 100644
--- a/src/battle_4.c
+++ b/src/battle_script_commands.c
@@ -2,7 +2,7 @@
 #include "battle.h"
 #include "battle_move_effects.h"
 #include "battle_message.h"
-#include "battle_ai.h"
+#include "battle_ai_script_commands.h"
 #include "moves.h"
 #include "abilities.h"
 #include "item.h"
diff --git a/sym_ewram.txt b/sym_ewram.txt
index fa655f5ea..3a1747889 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -1405,7 +1405,7 @@ gUnknown_0203AB30: @ 203AB30
 gUnknown_0203AB34: @ 203AB34
 	.space 0x4
 
-    .include "src/battle_ai.o"
+    .include "src/battle_ai_script_commands.o"
     
 .align 2
 gUnknown_0203AB40: @ 203AB40