diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-20 12:41:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 12:41:34 -0400 |
| commit | e4acfdf20b7d56b83cee6f4e49b257a2ecb92a95 (patch) | |
| tree | 4346f5efdcea0f2adf207bc769488d3f129016fe /src/oak_speech.c | |
| parent | e13e7eccafdc48b648bf20f8e02f72130c51d1ab (diff) | |
| parent | 9054fa32a01e102e668d1668c4e3893f2faffde8 (diff) | |
Merge pull request #82 from jiangzhengwenjz/pokemon
pokemon
Diffstat (limited to 'src/oak_speech.c')
| -rw-r--r-- | src/oak_speech.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/oak_speech.c b/src/oak_speech.c index 26736604e..c00335136 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -14,7 +14,7 @@ #include "menu.h" #include "help_system.h" #include "new_menu_helpers.h" -#include "pokemon_3.h" +#include "pokemon.h" #include "sound.h" #include "event_scripts.h" #include "scanline_effect.h" @@ -500,7 +500,7 @@ static void Task_OaksSpeech1(u8 taskId) break; case 1: sOakSpeechResources = AllocZeroed(sizeof(*sOakSpeechResources)); - SetUpMonSpriteManagerMaybe(1, 1); + OakSpeechNidoranFSetup(1, 1); break; case 2: SetGpuReg(REG_OFFSET_WIN0H, 0); @@ -1513,7 +1513,7 @@ static void Task_OakSpeech41(u8 taskId) static void Task_OakSpeech42(u8 taskId) { FreeAllWindowBuffers(); - sub_8044D80(); + OakSpeechNidoranFFreeResources(); Free(sOakSpeechResources); sOakSpeechResources = NULL; gTextFlags.canABSpeedUpPrint = FALSE; @@ -1612,7 +1612,7 @@ static void CreateNidoranFSprite(u8 taskId) { u8 spriteId; - DecompressPicFromTable(gUnknown_8235194, sub_8044E00(0), SPECIES_NIDORAN_F); + DecompressPicFromTable(gUnknown_8235194, OakSpeechNidoranFGetBuffer(0), SPECIES_NIDORAN_F); LoadCompressedSpritePaletteUsingHeap(&gUnknown_82373F4); SetMultiuseSpriteTemplateToPokemon(SPECIES_NIDORAN_F, 0); spriteId = CreateSprite(&gMultiuseSpriteTemplate, 0x60, 0x60, 1); |