diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-08-22 15:33:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 15:33:38 -0500 |
| commit | 46ca339a3a8d44ae199228e2e4198daa9d337efb (patch) | |
| tree | 152f0292a9f382f9f2ac545e605e2eecc95ae1f6 /src/link.c | |
| parent | 3e7bdf4f5fd54676c6f965325ec5b67d3d8b3eef (diff) | |
| parent | 20594938e275bd3d6ec6f38b42400eaac79fa86e (diff) | |
Merge branch 'master' into decompile_battle_5
Diffstat (limited to 'src/link.c')
| -rw-r--r-- | src/link.c | 5 |
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) |