summaryrefslogtreecommitdiff
path: root/src/battle_main.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-09-12 22:59:04 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-09-12 22:59:04 +0200
commita08d9dd451dd87a24b833eef2d3c09daae2a524d (patch)
tree024875f0465dea995ea30a0d30adf2cd73f4d87a /src/battle_main.c
parent8a81bd1bce852e58efb9f48f4e8db225a3ee2f15 (diff)
parent095cbbc5c297055d2cb2c01a2c8c04dc7d055cb6 (diff)
Merge branch 'master' into anims
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)
{
}