diff options
author | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
---|---|---|
committer | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
commit | 50fcc3a1e96a1e35576d2d0769aec251a40805dd (patch) | |
tree | f100b156dfa1eb6fe773d90004d79bb246e9dcbf /include/battle_controllers.h | |
parent | acdd8cab26671a975b4f155b84b24388df9d84bc (diff) | |
parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/battle_controllers.h')
-rw-r--r-- | include/battle_controllers.h | 2 |
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 |