diff options
author | yenatch <yenatch@gmail.com> | 2017-05-23 23:20:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-23 23:20:23 -0400 |
commit | 710e451a3ff825bf6c5f1dd621791b06668a62f2 (patch) | |
tree | b56e62ed55a2a7df128643768a5df3986c0f77d6 /src/battle_2.c | |
parent | c271797ecd3ce97420bcaa680c6a4bebeb60d8fc (diff) | |
parent | 9b084e8d572dc1472052983d9fce58696c77c56b (diff) |
Merge pull request #305 from NieDzejkob/master
Name some stuff
Diffstat (limited to 'src/battle_2.c')
-rw-r--r-- | src/battle_2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index 6bcccbaf9..e5091bd08 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -293,7 +293,7 @@ extern u8 sub_80170DC(); extern u8 ItemId_GetHoldEffect(u16); extern void sub_8094C98(); -void sub_800E7F8(void); +void InitBattle(void); void sub_800EC9C(void); void sub_800F104(void); void sub_800F298(void); @@ -347,11 +347,11 @@ void sub_800E7C4(void) } else { - sub_800E7F8(); + InitBattle(); } } -void sub_800E7F8(void) +void InitBattle(void) { s32 i; @@ -767,7 +767,7 @@ void sub_800F104(void) { gBattleTypeFlags = *pSavedBattleTypeFlags; gMain.savedCallback = *pSavedCallback; - SetMainCallback2(sub_800E7F8); + SetMainCallback2(InitBattle); } break; } |