diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-30 20:28:46 -0400 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-30 20:28:46 -0400 |
commit | c7e71bc47d322fc7da3a07910ba36fe236b51e13 (patch) | |
tree | b24d817d82621d758804fc995189fffc7413f72e /include/battle.h | |
parent | 044e8cc93b46fccb2e4e5ed5accf4c55917a3f7f (diff) | |
parent | 5fb9b9052276243d54ecfc27d0514e9c35825e8c (diff) |
Merge branch 'master' of https://github.com/pret/pokeruby into refactor_src
Diffstat (limited to 'include/battle.h')
-rw-r--r-- | include/battle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index 2b6773660..7850a9dd6 100644 --- a/include/battle.h +++ b/include/battle.h @@ -795,7 +795,7 @@ void BattleTurnPassed(void); // asm/battle_2.o void sub_8012324(void); void sub_8012FBC(u8, u8); -u8 b_first_side(u8, u8, u8); +u8 GetWhoStrikesFirst(u8, u8, u8); void TurnValuesCleanUp(u8); void SpecialStatusesClear(void); void sub_80138F0(void); |