diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-08-26 21:24:02 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-08-26 21:24:02 -0400 |
| commit | 47b9907ec58c55759a95aed1f31e92fb72031a5f (patch) | |
| tree | 5a473edae75105a009135ded3d096f133c34d72b /src/engine | |
| parent | 613fd1aa059d6894662566049840f3e1fd8cb02e (diff) | |
| parent | 1a33ca381de71bb3b4b250a2f3b41b0c15ed5f21 (diff) | |
merge
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/link.c | 5 | ||||
| -rw-r--r-- | src/engine/main_menu.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/engine/link.c b/src/engine/link.c index 5858ad8bf..850201ccb 100644 --- a/src/engine/link.c +++ b/src/engine/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) diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c index 09fd06d9e..3b616065b 100644 --- a/src/engine/main_menu.c +++ b/src/engine/main_menu.c @@ -1421,14 +1421,14 @@ void AddBirchSpeechObjects(u8 taskId) gTasks[taskId].data[TD_AZURILL_SPRITE_ID] = spriteId; //Create Brendan sprite - spriteId = CreateTrainerSprite_BirchSpeech(0, 120, 60, 0, unk_2000000); + spriteId = CreateTrainerSprite(0, 120, 60, 0, unk_2000000); gSprites[spriteId].callback = nullsub_34; gSprites[spriteId].invisible = 1; gSprites[spriteId].oam.priority = 0; gTasks[taskId].data[TD_BRENDAN_SPRITE_ID] = spriteId; //Create May sprite - spriteId = CreateTrainerSprite_BirchSpeech(1, 120, 60, 0, unk_2000000 + 0x800); + spriteId = CreateTrainerSprite(1, 120, 60, 0, unk_2000000 + 0x800); gSprites[spriteId].callback = nullsub_34; gSprites[spriteId].invisible = 1; gSprites[spriteId].oam.priority = 0; |