diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-09 16:42:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 16:42:21 -0500 |
| commit | 3e72d6748771f83c98be2864e6bb628e161c6cf2 (patch) | |
| tree | 7edfb8b54fe1e694e946d17399a3099f3ad7b140 /include/battle_2.h | |
| parent | 08a5efbd8144d2cb1f4b8da62ba484ffcc9a1f93 (diff) | |
| parent | b6ec90db6192c8405c9fe952aae7f356bcd1b0c3 (diff) | |
Merge pull request #65 from DizzyEggg/decompile_battle_message
Decompile battle message
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 |