dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

rename battle4 and battleai

Browse Source
This commit is contained in:
DizzyEggg
2017-09-28 17:38:07 +02:00
parent 7273b8f262
commit 6d4d58a8a7
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/battle.h
+2 -1
View File
@@ -898,7 +898,7 @@ void sub_80458B4(void);
u8 GetMoveTarget(u16 move, u8 useMoveTarget); u8 GetMoveTarget(u16 move, u8 useMoveTarget);
u8 IsPokeDisobedient(void); u8 IsPokeDisobedient(void);
// battle_4 // battle_script_commands
void AI_CalcDmg(u8 bankAtk, u8 bankDef); void AI_CalcDmg(u8 bankAtk, u8 bankDef);
u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef); u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef);
u8 AI_TypeCalc(u16 move, u16 species, u8 ability); 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); void sub_8056A3C(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
bool8 UproarWakeUpCheck(u8 bank); bool8 UproarWakeUpCheck(u8 bank);
extern void (* const gBattleScriptingCommandsTable[])(void);
extern const u8 gUnknown_0831C494[]; extern const u8 gUnknown_0831C494[];
// battle_5 // battle_5
include/battle_ai.h → include/battle_ai_script_commands.h
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GUARD_BATTLE_AI_H #ifndef GUARD_BATTLE_AI_SCRIPT_COMMANDS_H
#define GUARD_BATTLE_AI_H #define GUARD_BATTLE_AI_SCRIPT_COMMANDS_H
void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves); void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves);
void BattleAI_SetupAIData(u8 defaultScoreMoves); void BattleAI_SetupAIData(u8 defaultScoreMoves);
@@ -10,4 +10,4 @@ void ClearBankAbilityHistory(u8 bank);
void RecordItemEffectBattle(u8 bank, u8 itemEffect); void RecordItemEffectBattle(u8 bank, u8 itemEffect);
void ClearBankItemEffectHistory(u8 bank); void ClearBankItemEffectHistory(u8 bank);
#endif // GUARD_BATTLE_AI_H #endif // GUARD_BATTLE_AI_SCRIPT_COMMANDS_H
ld_script.txt
+4 -4
View File
@@ -59,7 +59,7 @@ SECTIONS {
asm/battle_1.o(.text); asm/battle_1.o(.text);
asm/battle_2.o(.text); asm/battle_2.o(.text);
src/battle_3.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_5.o(.text);
asm/battle_controller_player.o(.text); asm/battle_controller_player.o(.text);
asm/battle_7.o(.text); asm/battle_7.o(.text);
@@ -177,7 +177,7 @@ SECTIONS {
asm/decoration.o(.text); asm/decoration.o(.text);
asm/slot_machine.o(.text); asm/slot_machine.o(.text);
asm/contest_painting.o(.text); asm/contest_painting.o(.text);
src/battle_ai.o(.text); src/battle_ai_script_commands.o(.text);
asm/trader.o(.text); asm/trader.o(.text);
asm/starter_choose.o(.text); asm/starter_choose.o(.text);
asm/wallclock.o(.text); asm/wallclock.o(.text);
@@ -329,7 +329,7 @@ SECTIONS {
data/link.o(.rodata); data/link.o(.rodata);
src/rtc.o(.rodata); src/rtc.o(.rodata);
data/data2b.o(.rodata); data/data2b.o(.rodata);
src/battle_4.o(.rodata); src/battle_script_commands.o(.rodata);
data/battle_controller_player.o(.rodata); data/battle_controller_player.o(.rodata);
data/data2b_2.o(.rodata); data/data2b_2.o(.rodata);
data/battle_controller_opponent.o(.rodata); data/battle_controller_opponent.o(.rodata);
@@ -409,7 +409,7 @@ SECTIONS {
data/decoration.o(.rodata); data/decoration.o(.rodata);
data/slot_machine.o(.rodata); data/slot_machine.o(.rodata);
data/contest_painting.o(.rodata); data/contest_painting.o(.rodata);
src/battle_ai.o(.rodata); src/battle_ai_script_commands.o(.rodata);
data/data4.o(.rodata); data/data4.o(.rodata);
data/battle_controller_link_partner.o(.rodata); data/battle_controller_link_partner.o(.rodata);
data/battle_message.o(.rodata); data/battle_message.o(.rodata);
src/battle_3.c
+1 -2
View File
@@ -13,7 +13,7 @@
#include "text.h" #include "text.h"
#include "string_util.h" #include "string_util.h"
#include "battle_message.h" #include "battle_message.h"
#include "battle_ai.h" #include "battle_ai_script_commands.h"
#include "battle_controllers.h" #include "battle_controllers.h"
#include "event_data.h" #include "event_data.h"
#include "calculate_base_damage.h" #include "calculate_base_damage.h"
@@ -57,7 +57,6 @@ extern u8 gCurrMovePos;
extern u8 gUnknown_020241E9; extern u8 gUnknown_020241E9;
extern const struct BattleMove gBattleMoves[]; extern const struct BattleMove gBattleMoves[];
extern void (* const gBattleScriptingCommandsTable[])(void);
// scripts // scripts
extern const u8 gUnknown_082DAE2A[]; extern const u8 gUnknown_082DAE2A[];
src/battle_ai.c → src/battle_ai_script_commands.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include "global.h" #include "global.h"
#include "battle_ai.h" #include "battle_ai_script_commands.h"
#include "pokemon.h" #include "pokemon.h"
#include "battle.h" #include "battle.h"
#include "species.h" #include "species.h"
src/battle_4.c → src/battle_script_commands.c
+1 -1
View File
@@ -2,7 +2,7 @@
#include "battle.h" #include "battle.h"
#include "battle_move_effects.h" #include "battle_move_effects.h"
#include "battle_message.h" #include "battle_message.h"
#include "battle_ai.h" #include "battle_ai_script_commands.h"
#include "moves.h" #include "moves.h"
#include "abilities.h" #include "abilities.h"
#include "item.h" #include "item.h"
sym_ewram.txt
+1 -1
View File
@@ -1405,7 +1405,7 @@ gUnknown_0203AB30: @ 203AB30
gUnknown_0203AB34: @ 203AB34 gUnknown_0203AB34: @ 203AB34
.space 0x4 .space 0x4
.include "src/battle_ai.o" .include "src/battle_ai_script_commands.o"
.align 2 .align 2
gUnknown_0203AB40: @ 203AB40 gUnknown_0203AB40: @ 203AB40