diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-09 20:25:41 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-09 20:25:41 -0400 |
| commit | f1d07acc48e483f00f8d6d573af12199f68123d4 (patch) | |
| tree | 6e9ace8e4822e19224561dc99728d80699eaa635 /include/battle_2.h | |
| parent | 6d66081be0b1b26ce55a6f1a2a20644e2ae5c7f7 (diff) | |
| parent | 8914645231c9301579ed39bdd9200ad50e5296d0 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into use_build
Diffstat (limited to 'include/battle_2.h')
| -rw-r--r-- | include/battle_2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/battle_2.h b/include/battle_2.h index edd6b6ef3..677bf0505 100644 --- a/include/battle_2.h +++ b/include/battle_2.h @@ -15,6 +15,7 @@ void SwapTurnOrder(u8 id1, u8 id2); void BattleTurnPassed(void); void RunBattleScriptCommands_PopCallbacksStack(void); void RunBattleScriptCommands(void); +u32 sub_80397C4(u32 setId, u32 tableId); void sub_8039E9C(struct Sprite *sprite); extern const u8 gStatusConditionString_PoisonJpn[8]; @@ -25,6 +26,6 @@ extern const u8 gStatusConditionString_IceJpn[8]; extern const u8 gStatusConditionString_ConfusionJpn[8]; extern const u8 gStatusConditionString_LoveJpn[8]; -extern const u8 * const gStatusConditionStringsTable[][2]; +extern const u8 * const gStatusConditionStringsTable[7][2]; #endif // GUARD_BATTLE_2_H |