diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-19 19:46:37 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-19 19:46:37 +0200 |
| commit | dee61330769b3e3a93844c9a0ef609500fe399d3 (patch) | |
| tree | 1f36102b4133fdfe5fe2fd8a062d085e9673b062 /include/battle_2.h | |
| parent | dd0f19476c3a15514e3d08855cee3266fdbdf2ed (diff) | |
| parent | 8ceecd9fba385442f55bff2d19977e3c2fd6e5e8 (diff) | |
fix merge conflicts
Diffstat (limited to 'include/battle_2.h')
| -rw-r--r-- | include/battle_2.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/battle_2.h b/include/battle_2.h index 677bf0505..ceec2aa00 100644 --- a/include/battle_2.h +++ b/include/battle_2.h @@ -17,6 +17,8 @@ void RunBattleScriptCommands_PopCallbacksStack(void); void RunBattleScriptCommands(void); u32 sub_80397C4(u32 setId, u32 tableId); void sub_8039E9C(struct Sprite *sprite); +void nullsub_20(void); +void BeginBattleIntro(void); extern const u8 gStatusConditionString_PoisonJpn[8]; extern const u8 gStatusConditionString_SleepJpn[8]; |