diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-16 16:15:02 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-16 16:15:02 -0600 |
| commit | b4bb5623638413fe9a26904d0524cfdc5b9f30ec (patch) | |
| tree | eab23be1cd33b9355fa96101f24f3f19305ba27c | |
| parent | c3c13d0acfa46a54bd05d1c7dcea2955103ac3ad (diff) | |
rename battle_2.c to battle_main.c
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | include/battle_main.h (renamed from include/battle_2.h) | 6 | ||||
| -rw-r--r-- | ld_script.txt | 4 | ||||
| -rw-r--r-- | src/battle_main.c (renamed from src/battle_2.c) | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/battle.h b/include/battle.h index 71a25eaa7..a437f41d4 100644 --- a/include/battle.h +++ b/include/battle.h @@ -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" diff --git a/include/battle_2.h b/include/battle_main.h index ee61efd9b..54b5e7da6 100644 --- a/include/battle_2.h +++ b/include/battle_main.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 diff --git a/ld_script.txt b/ld_script.txt index ae8dd057d..d85b3a59d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -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); diff --git a/src/battle_2.c b/src/battle_main.c index b19dcace1..b19dcace1 100644 --- a/src/battle_2.c +++ b/src/battle_main.c |