summaryrefslogtreecommitdiff
path: root/include/reshow_battle_screen.h
diff options
context:
space:
mode:
authorU-User-PC\User <golemgalvanize@github.com>2017-10-18 19:28:36 -0400
committerU-User-PC\User <golemgalvanize@github.com>2017-10-18 19:28:36 -0400
commitd4532c70cb03962d38517fef2d723f81a9b27c1b (patch)
tree70220c06025360d7089011f5d80239b61ac183af /include/reshow_battle_screen.h
parent11f9a27640a9f921c6dc1858261d9a609a6599ca (diff)
parent0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff)
fix merge conflicts
Diffstat (limited to 'include/reshow_battle_screen.h')
-rw-r--r--include/reshow_battle_screen.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/reshow_battle_screen.h b/include/reshow_battle_screen.h
index 62773b48b..c22135280 100644
--- a/include/reshow_battle_screen.h
+++ b/include/reshow_battle_screen.h
@@ -1,6 +1,7 @@
#ifndef GUARD_RESHOW_BATTLE_SCREEN_H
#define GUARD_RESHOW_BATTLE_SCREEN_H
+void nullsub_35(void);
void ReshowBattleScreenAfterMenu(void);
#endif // GUARD_RESHOW_BATTLE_SCREEN_H