summaryrefslogtreecommitdiff
path: root/src/link.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-08-22 22:28:46 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-08-22 22:28:46 +0200
commit0408b6160a0e97ba62f9867114ea047bb2fe3b15 (patch)
treee5d2921a51d8081859c1fe1863cd30d5fbc81ae2 /src/link.c
parent8f4128c49491007a8f407ad541dd3dd5e17436ec (diff)
parent20594938e275bd3d6ec6f38b42400eaac79fa86e (diff)
Merge branch 'master' into decompile_cute_sketch
Diffstat (limited to 'src/link.c')
-rw-r--r--src/link.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/link.c b/src/link.c
index 5858ad8bf..850201ccb 100644
--- a/src/link.c
+++ b/src/link.c
@@ -2,7 +2,6 @@
#include "link.h"
#include "battle.h"
#include "berry.h"
-#include "berry_blender.h"
#include "hall_of_fame.h"
#include "item_use.h"
#include "main.h"
@@ -42,6 +41,8 @@ extern u16 gBattleTypeFlags;
extern u16 word_3004858;
+extern void Blender_SetBankBerryData(u8 bank, u16 itemID);
+
static void InitLinkTestBG(u8, u8, u8, u8);
void InitLinkTestBG_Unused(u8, u8, u8, u8);
void LinkTestScreen();
@@ -556,7 +557,7 @@ static void ProcessRecvCmds(u8 unusedParam)
sub_8007E24();
break;
case 0xAAAB:
- sub_80516C4(i, gRecvCmds[1][i]);
+ Blender_SetBankBerryData(i, gRecvCmds[1][i]);
break;
case 0xCCCC:
#if defined(ENGLISH)