diff options
author | camthesaxman <cameronghall@cox.net> | 2017-08-25 22:13:55 -0500 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-08-25 22:13:55 -0500 |
commit | b40b8dd1bbeb196231ca24a16553bd75490edce5 (patch) | |
tree | 49e1fd92499e77a2d74af6885c1c7ec4a83a2cdb /src/main_menu.c | |
parent | 406ced34a1db5a700a542eb2b7a629b0e31c992d (diff) | |
parent | 4df36cd814d6bf045d56bc4c30b611838333b705 (diff) |
Merge branch 'master' of https://github.com/pret/pokeruby
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; |