mirror of https://github.com/pret/pokeemerald.git
rename battle_2.c to battle_main.c
This commit is contained in:
parent
c3c13d0acf
commit
b4bb562363
|
@ -4,7 +4,7 @@
|
|||
// should they be included here or included individually by every file?
|
||||
#include "battle_util.h"
|
||||
#include "battle_script_commands.h"
|
||||
#include "battle_2.h"
|
||||
#include "battle_main.h"
|
||||
#include "battle_ai_switch_items.h"
|
||||
#include "battle_gfx_sfx_util.h"
|
||||
#include "battle_util2.h"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#ifndef GUARD_BATTLE_2_H
|
||||
#define GUARD_BATTLE_2_H
|
||||
#ifndef GUARD_BATTLE_MAIN_H
|
||||
#define GUARD_BATTLE_MAIN_H
|
||||
|
||||
void CB2_InitBattle(void);
|
||||
void BattleMainCB2(void);
|
||||
|
@ -52,4 +52,4 @@ extern const u8 gStatusConditionString_LoveJpn[8];
|
|||
|
||||
extern const u8 * const gStatusConditionStringsTable[7][2];
|
||||
|
||||
#endif // GUARD_BATTLE_2_H
|
||||
#endif // GUARD_BATTLE_MAIN_H
|
|
@ -59,7 +59,7 @@ SECTIONS {
|
|||
src/decompress.o(.text);
|
||||
asm/rom_8034C54.o(.text);
|
||||
src/battle_bg.o(.text);
|
||||
src/battle_2.o(.text);
|
||||
src/battle_main.o(.text);
|
||||
src/battle_util.o(.text);
|
||||
src/battle_script_commands.o(.text);
|
||||
src/battle_util2.o(.text);
|
||||
|
@ -379,7 +379,7 @@ SECTIONS {
|
|||
data/main_menu.o(.rodata);
|
||||
data/battle_1.o(.rodata);
|
||||
data/data2b.o(.rodata);
|
||||
src/battle_2.o(.rodata);
|
||||
src/battle_main.o(.rodata);
|
||||
src/battle_util.o(.rodata);
|
||||
src/battle_script_commands.o(.rodata);
|
||||
src/battle_controller_player.o(.rodata);
|
||||
|
|
Loading…
Reference in New Issue