summaryrefslogtreecommitdiff
path: root/src/battle_main.c
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-09-14 22:35:18 -0500
committerDiegoisawesome <diego@domoreaweso.me>2018-09-14 22:35:18 -0500
commit48586660fd1eeee2d038abfa64d7358278b36f4d (patch)
tree1067c32f4b1fa7bcc935ca541409685cb57eb895 /src/battle_main.c
parente8be47abb880a06090f36a7305ab0e4f59f0a701 (diff)
parentb8c9d9a980303d4bcd1cfd9400926736363d1df9 (diff)
Merge branch 'master' of github.com:Diegoisawesome/pokeemerald
Diffstat (limited to 'src/battle_main.c')
-rw-r--r--src/battle_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_main.c b/src/battle_main.c
index 1a1f6f61a..781fbeff4 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -2055,7 +2055,7 @@ void VBlankCB_Battle(void)
ScanlineEffect_InitHBlankDmaTransfer();
}
-void nullsub_17(void)
+void nullsub_17(struct Sprite *sprite)
{
}