diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
| commit | 1b895ff52c011d51a9516791148cd5088ba411b5 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /src/pokeblock_feed.c | |
| parent | be33878b94cc38913447682d3e34e674df68619f (diff) | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'src/pokeblock_feed.c')
| -rw-r--r-- | src/pokeblock_feed.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 10f7d34d8..6978f0715 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -52,9 +52,6 @@ struct PokeblockFeedStruct extern u16 gSpecialVar_ItemId; extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern const u8 gBattleTerrainPalette_Frontier[]; -extern const u8 gBattleTerrainTiles_Building[]; -extern const u8 gUnknown_08D9BA44[]; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const u16 gUnknown_0860F074[]; @@ -387,7 +384,7 @@ static const struct WindowTemplate sWindowTemplates[] = DUMMY_WIN_TEMPLATE }; -static const u8* const sPokeblocksPals[] = +static const u32* const sPokeblocksPals[] = { gPokeblockRed_Pal, gPokeblockBlue_Pal, @@ -788,8 +785,8 @@ static void Task_HandleMonAtePokeblock(u8 taskId) else StringExpandPlaceholders(gStringVar4, gText_Var1DisdainfullyAteVar2); - gTextFlags.flag_0 = 1; - AddTextPrinterParameterized2(0, 1, gStringVar4, GetPlayerTextSpeed(), NULL, 2, 1, 3); + gTextFlags.canABSpeedUpPrint = 1; + AddTextPrinterParameterized2(0, 1, gStringVar4, GetPlayerTextSpeedDelay(), NULL, 2, 1, 3); gTasks[taskId].func = Task_WaitForAtePokeblockText; } |