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-11 06:33:55 +08:00
parent 7d8272749f
commit e87ae0c76d
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/teachy_tv.c
+4 -11
View File
@@ -972,11 +972,8 @@ void TeachyTvClusFuncStartAnimNpcWalkIntoGrass(u8 taskId)
void TeachyTvClusFuncDudeMoveUp(u8 taskId) void TeachyTvClusFuncDudeMoveUp(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]];
ChangeBgY(3, 0x100, 2); ChangeBgY(3, 0x100, 2);
if (!(++data[2] & 0xF)) if (!(++data[2] & 0xF))
{ {
@@ -1125,13 +1122,12 @@ void TeachyTvPostBattleFadeControl(u8 taskId)
void TeachyTvGrassAnimationMain(u8 taskId, s16 x, s16 y, u8 subpriority, bool8 mode) void TeachyTvGrassAnimationMain(u8 taskId, s16 x, s16 y, u8 subpriority, bool8 mode)
{ {
u8 subprio;
int res; int res;
struct Sprite *obj; struct Sprite *obj;
int objId; int objId;
const struct SpriteTemplate *const *objTemAddr; const struct SpriteTemplate *const *objTemAddr;
subprio = subpriority; u8 subprio = subpriority;
if (gUnknown_203F450->var_4006 != 1) if (gUnknown_203F450->var_4006 != 1)
{ {
res = TeachyTvGrassAnimationCheckIfNeedsToGenerateGrassObj(x - 0x10, y); res = TeachyTvGrassAnimationCheckIfNeedsToGenerateGrassObj(x - 0x10, y);
@@ -1205,10 +1201,7 @@ u8 TeachyTvGrassAnimationCheckIfNeedsToGenerateGrassObj(s16 x, s16 y)
void TeachyTvPrepBattle(u8 taskId) void TeachyTvPrepBattle(u8 taskId)
{ {
s16 *data; s16 *data = gTasks[taskId].data;
taskId = taskId;
data = gTasks[taskId].data;
TeachyTvFree(); TeachyTvFree();
gSpecialVar_0x8004 = gTeachyTV_StaticResources.optionChosen; gSpecialVar_0x8004 = gTeachyTV_StaticResources.optionChosen;
gMain.savedCallback = TeachyTvRestorePlayerPartyCallback; gMain.savedCallback = TeachyTvRestorePlayerPartyCallback;