diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 08f86e5a3..e08fdbcb3 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -2260,12 +2260,10 @@ void AnimTask_SwallowDeformMon(u8 taskId) void AnimTask_TransformMon(u8 taskId) { - int i, j; u8 position; struct BattleAnimBgData animBg; u8 *dest; u8 *src; - u16 *bgTilemap; u16 stretch; switch (gTasks[taskId].data[0]) @@ -4694,9 +4692,6 @@ static void AnimMeteorMashStar_Step(struct Sprite *sprite) // arg 4: duration static void AnimMeteorMashStar(struct Sprite *sprite) { - s16 y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); - s16 x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) { sprite->data[0] = sprite->x - gBattleAnimArgs[0]; @@ -4947,9 +4942,7 @@ static void AnimTask_OdorSleuthMovementWaitFinish(u8 taskId) } static void MoveOdorSleuthClone(struct Sprite *sprite) -{ - int zero = 0; - +{ if (++sprite->data[1] > 1) { sprite->data[1] = 0; diff --git a/src/scrcmd.c b/src/scrcmd.c index 671da7659..2bb8b8874 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -529,21 +529,29 @@ bool8 ScrCmd_checkpcitem(struct ScriptContext * ctx) bool8 ScrCmd_adddecoration(struct ScriptContext * ctx) { + u32 UNUSED decorId = VarGet(ScriptReadHalfword(ctx)); + return FALSE; } bool8 ScrCmd_removedecoration(struct ScriptContext * ctx) { + u32 UNUSED decorId = VarGet(ScriptReadHalfword(ctx)); + return FALSE; } bool8 ScrCmd_checkdecorspace(struct ScriptContext * ctx) { + u32 UNUSED decorId = VarGet(ScriptReadHalfword(ctx)); + return FALSE; } bool8 ScrCmd_checkdecor(struct ScriptContext * ctx) { + u32 UNUSED decorId = VarGet(ScriptReadHalfword(ctx)); + return FALSE; } @@ -1452,12 +1460,6 @@ bool8 ScrCmd_multichoicedefault(struct ScriptContext * ctx) bool8 ScrCmd_drawbox(struct ScriptContext * ctx) { - /*u8 left = ScriptReadByte(ctx); - u8 top = ScriptReadByte(ctx); - u8 right = ScriptReadByte(ctx); - u8 bottom = ScriptReadByte(ctx); - - MenuDrawTextWindow(left, top, right, bottom);*/ return FALSE; } @@ -1482,6 +1484,11 @@ bool8 ScrCmd_multichoicegrid(struct ScriptContext * ctx) bool8 ScrCmd_erasebox(struct ScriptContext * ctx) { + u8 UNUSED left = ScriptReadByte(ctx); + u8 UNUSED top = ScriptReadByte(ctx); + u8 UNUSED right = ScriptReadByte(ctx); + u8 UNUSED bottom = ScriptReadByte(ctx); + return FALSE; } @@ -1515,6 +1522,8 @@ bool8 ScrCmd_hidemonpic(struct ScriptContext * ctx) bool8 ScrCmd_showcontestpainting(struct ScriptContext * ctx) { + u8 UNUSED contestWinnerId = ScriptReadByte(ctx); + return FALSE; } @@ -1622,6 +1631,9 @@ bool8 ScrCmd_bufferitemnameplural(struct ScriptContext * ctx) bool8 ScrCmd_bufferdecorationname(struct ScriptContext * ctx) { + u8 UNUSED stringVarIndex = ScriptReadByte(ctx); + u16 UNUSED decorId = VarGet(ScriptReadHalfword(ctx)); + return FALSE; } @@ -1778,6 +1790,8 @@ bool8 ScrCmd_hidemoneybox(struct ScriptContext * ctx) bool8 ScrCmd_updatemoneybox(struct ScriptContext * ctx) { + u8 UNUSED x = ScriptReadByte(ctx); + u8 UNUSED y = ScriptReadByte(ctx); u8 ignore = ScriptReadByte(ctx); if (!ignore) @@ -1797,12 +1811,16 @@ bool8 ScrCmd_showcoinsbox(struct ScriptContext * ctx) bool8 ScrCmd_hidecoinsbox(struct ScriptContext * ctx) { + u8 UNUSED x = ScriptReadByte(ctx); + u8 UNUSED y = ScriptReadByte(ctx); HideCoinsWindow(); return FALSE; } bool8 ScrCmd_updatecoinsbox(struct ScriptContext * ctx) { + u8 UNUSED x = ScriptReadByte(ctx); + u8 UNUSED y = ScriptReadByte(ctx); PrintCoinsString(GetCoins()); return FALSE; }