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

more consistency

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-06-10 08:36:36 +08:00
parent f32fdd0bff
commit 1345bffa22
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/teachy_tv.c
+8 -16
View File
@@ -289,8 +289,7 @@ void TeachyTvSetupScrollIndicatorArrowPair(void)
else { else {
struct TeachyTvBuf *temp; struct TeachyTvBuf *temp;
u8 res; u8 res = AddScrollIndicatorArrowPair(&gUnknown_8479380, &(gTeachyTV_StaticResources.scrollOffset));
res = AddScrollIndicatorArrowPair(&gUnknown_8479380, &(gTeachyTV_StaticResources.scrollOffset));
temp = gUnknown_203F450; temp = gUnknown_203F450;
temp->var_4007 = res; temp->var_4007 = res;
} }
@@ -500,9 +499,8 @@ void TeachyTvClusFuncClearBg2TeachyTvGraphic(u8 taskId)
void TeachyTvClusFuncNpcMoveAndSetupTextPrinter(u8 taskId) void TeachyTvClusFuncNpcMoveAndSetupTextPrinter(u8 taskId)
{ {
struct Sprite * spriteAddr;
s16 * data = gTasks[taskId].data; s16 * data = gTasks[taskId].data;
spriteAddr = &gSprites[data[1]]; struct Sprite * priteAddr = &gSprites[data[1]];
if (data[2] != 35) if (data[2] != 35)
++data[2]; ++data[2];
else { else {
@@ -619,11 +617,8 @@ void TeachyTvClusFuncDudeMoveUp(u8 taskId)
void TeachyTvClusFuncDudeMoveRight(u8 taskId) void TeachyTvClusFuncDudeMoveRight(u8 taskId)
{ {
s16 *data; s16 *data = gTasks[taskId].data;
struct Sprite *obj; struct Sprite *obj = &gSprites[data[1]];
data = gTasks[taskId].data;
obj = &gSprites[data[1]];
ChangeBgX(3, 0x100, 1); ChangeBgX(3, 0x100, 1);
if (!(++data[2] & 0xF)) if (!(++data[2] & 0xF))
++gUnknown_203F450->var_4004; ++gUnknown_203F450->var_4004;
@@ -641,9 +636,9 @@ void TeachyTvClusFuncDudeMoveRight(u8 taskId)
void TeachyTvClusFuncDudeTurnLeft(u8 taskId) void TeachyTvClusFuncDudeTurnLeft(u8 taskId)
{ {
struct Sprite *v3;
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
v3 = &gSprites[data[1]]; struct Sprite *v3 = &gSprites[data[1]];
StartSpriteAnim(v3, 6); StartSpriteAnim(v3, 6);
++data[3]; ++data[3];
data[4] = 0; data[4] = 0;
@@ -653,11 +648,8 @@ void TeachyTvClusFuncDudeTurnLeft(u8 taskId)
void TeachyTvClusFuncDudeMoveLeft(u8 taskId) void TeachyTvClusFuncDudeMoveLeft(u8 taskId)
{ {
s16 *data; s16 *data = gTasks[taskId].data;
struct Sprite *v2; struct Sprite *v2 = &gSprites[data[1]];
data = gTasks[taskId].data;
v2 = &gSprites[data[1]];
if (!(v2->pos2.x & 0xF)) if (!(v2->pos2.x & 0xF))
TeachyTvGrassAnimationMain(taskId, v2->pos2.x - 8, v2->pos2.y, 0, 0); TeachyTvGrassAnimationMain(taskId, v2->pos2.x - 8, v2->pos2.y, 0, 0);