diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-25 00:18:58 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-25 00:18:58 +0200 |
commit | ace4c34c144a5fed5e9ed8d6f4f21111249d8c04 (patch) | |
tree | bca77f4e9425d0e9db19c44c6a46b31260e02575 /src/main_menu.c | |
parent | 5e14beed4ca669efd553ee2c3f0296db235188b2 (diff) | |
parent | 7db1772ece6ceac2a7b22ae6c8f7bf7891a26812 (diff) |
Merge branch 'master' into decompile_pokeblock_feed
Diffstat (limited to 'src/main_menu.c')
-rw-r--r-- | src/main_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main_menu.c b/src/main_menu.c index 09fd06d9e..3b616065b 100644 --- a/src/main_menu.c +++ b/src/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; |