ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename battle_2.c to battle_main.c

Browse Source
This commit is contained in:
camthesaxman 2018-01-16 16:15:02 -06:00
parent c3c13d0acf
commit b4bb562363
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle.h
View File

@ -4,7 +4,7 @@
// should they be included here or included individually by every file? // should they be included here or included individually by every file?
#include "battle_util.h" #include "battle_util.h"
#include "battle_script_commands.h" #include "battle_script_commands.h"
#include "battle_2.h" #include "battle_main.h"
#include "battle_ai_switch_items.h" #include "battle_ai_switch_items.h"
#include "battle_gfx_sfx_util.h" #include "battle_gfx_sfx_util.h"
#include "battle_util2.h" #include "battle_util2.h"

6
include/battle_2.h → include/battle_main.h
View File

@ -1,5 +1,5 @@
#ifndef GUARD_BATTLE_2_H #ifndef GUARD_BATTLE_MAIN_H
#define GUARD_BATTLE_2_H #define GUARD_BATTLE_MAIN_H
void CB2_InitBattle(void); void CB2_InitBattle(void);
void BattleMainCB2(void); void BattleMainCB2(void);
@ -52,4 +52,4 @@ extern const u8 gStatusConditionString_LoveJpn[8];
extern const u8 * const gStatusConditionStringsTable[7][2]; extern const u8 * const gStatusConditionStringsTable[7][2];
#endif // GUARD_BATTLE_2_H #endif // GUARD_BATTLE_MAIN_H

4
ld_script.txt
View File

@ -59,7 +59,7 @@ SECTIONS {
src/decompress.o(.text); src/decompress.o(.text);
asm/rom_8034C54.o(.text); asm/rom_8034C54.o(.text);
src/battle_bg.o(.text); src/battle_bg.o(.text);
src/battle_2.o(.text); src/battle_main.o(.text);
src/battle_util.o(.text); src/battle_util.o(.text);
src/battle_script_commands.o(.text); src/battle_script_commands.o(.text);
src/battle_util2.o(.text); src/battle_util2.o(.text);
@ -379,7 +379,7 @@ SECTIONS {
data/main_menu.o(.rodata); data/main_menu.o(.rodata);
data/battle_1.o(.rodata); data/battle_1.o(.rodata);
data/data2b.o(.rodata); data/data2b.o(.rodata);
src/battle_2.o(.rodata); src/battle_main.o(.rodata);
src/battle_util.o(.rodata); src/battle_util.o(.rodata);
src/battle_script_commands.o(.rodata); src/battle_script_commands.o(.rodata);
src/battle_controller_player.o(.rodata); src/battle_controller_player.o(.rodata);

0
src/battle_2.c → src/battle_main.c
View File