dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-06-10 08:30:52 +08:00
parent b44bd642b8
commit a8f6aeb05d
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/teachy_tv.c
+3 -6
View File
@@ -502,10 +502,8 @@ void TeachyTvClusFuncClearBg2TeachyTvGraphic(u8 taskId)
void TeachyTvClusFuncNpcMoveAndSetupTextPrinter(u8 taskId) void TeachyTvClusFuncNpcMoveAndSetupTextPrinter(u8 taskId)
{ {
s16 *data;
struct Sprite * spriteAddr; struct Sprite * spriteAddr;
s16 * data = gTasks[taskId].data;
data = gTasks[taskId].data;
spriteAddr = &gSprites[data[1]]; spriteAddr = &gSprites[data[1]];
if (data[2] != 35) if (data[2] != 35)
++data[2]; ++data[2];
@@ -531,8 +529,7 @@ void TeachyTvClusFuncIdleIfTextPrinterIsActive(u8 taskId)
void TeachyTvRenderMsgAndSwitchClusterFuncs(u8 taskId) void TeachyTvRenderMsgAndSwitchClusterFuncs(u8 taskId)
{ {
s16 *data; s16 *data = gTasks[taskId].data;
data = gTasks[taskId].data;
if (JOY_NEW(B_BUTTON)) if (JOY_NEW(B_BUTTON))
{ {
u8 *offset = &(gUnknown_203F450->var_4006); u8 *offset = &(gUnknown_203F450->var_4006);
@@ -556,7 +553,7 @@ void TeachyTvRenderMsgAndSwitchClusterFuncs(u8 taskId)
void TeachyTvClusFuncTextPrinterSwitchStringByOptionChosen(u8 taskId) void TeachyTvClusFuncTextPrinterSwitchStringByOptionChosen(u8 taskId)
{ {
s16 *data = (u16 *)gTasks[taskId].data; s16 *data = gTasks[taskId].data;
const u8 * const* texts = &gUnknown_8479560; const u8 * const* texts = &gUnknown_8479560;
TeachyTvInitTextPrinter(texts[gTeachyTV_StaticResources.optionChosen]); TeachyTvInitTextPrinter(texts[gTeachyTV_StaticResources.optionChosen]);
++data[3]; ++data[3];