summaryrefslogtreecommitdiff
path: root/include/battle_controllers.h
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-10-17 11:05:44 -0700
committerPikalaxALT <pikalaxalt@gmail.com>2018-10-17 11:05:44 -0700
commitaa6e1a91fc89d01ad65eb532d6832767c936807a (patch)
tree77ea1ef0aa2dff7e70165741fcc455c8faaadfc7 /include/battle_controllers.h
parent46e957bacd9ba5538262c89bb87e1915167bb201 (diff)
parentd05339979e39580b162e618087136bb220a4f20d (diff)
Merge branch 'master' into vs_seeker
Diffstat (limited to 'include/battle_controllers.h')
-rw-r--r--include/battle_controllers.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index c69cb1017..66984b453 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -181,7 +181,7 @@ void sub_8033648(void);
void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data);
// emitters
-void EmitGetMonData(u8 bufferId, u8 requestId, u8 monToCheck);
+void BtlController_EmitGetMonData(u8 bufferId, u8 requestId, u8 monToCheck);
void EmitGetRawMonData(u8 bufferId, u8 monId, u8 bytes); // unused
void EmitSetMonData(u8 bufferId, u8 requestId, u8 monToCheck, u8 bytes, void *data);
void EmitSetRawMonData(u8 bufferId, u8 monId, u8 bytes, void *data); // unused