Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused species variable from TryItemUseFormChange functions.

Browse Source
This commit is contained in:
ultima-soul 2021-10-03 10:55:19 -07:00
parent 78d2215196
commit ce867cd0e0
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/party_menu.c
View File

@ -5166,10 +5166,9 @@ void ItemUseCB_EvolutionStone(u8 taskId, TaskFunc task)
} }
#define tState data[0] #define tState data[0]
#define tSpecies data[1] #define tTargetSpecies data[1]
#define tTargetSpecies data[2] #define tAnimWait data[2]
#define tAnimWait data[3] #define tNextFunc 3
#define tNextFunc 4
static void SpriteCB_FormChangeIconMosaic(struct Sprite *sprite) static void SpriteCB_FormChangeIconMosaic(struct Sprite *sprite)
{ {
@ -5197,14 +5196,12 @@ static void SpriteCB_FormChangeIconMosaic(struct Sprite *sprite)
static void Task_TryItemUseFormChange(u8 taskId) static void Task_TryItemUseFormChange(u8 taskId)
{ {
struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId]; struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
u16 species;
u16 targetSpecies; u16 targetSpecies;
struct Sprite *icon = &gSprites[sPartyMenuBoxes[gPartyMenu.slotId].monSpriteId]; struct Sprite *icon = &gSprites[sPartyMenuBoxes[gPartyMenu.slotId].monSpriteId];
switch (gTasks[taskId].tState) switch (gTasks[taskId].tState)
{ {
case 0: case 0:
species = gTasks[taskId].tSpecies;
targetSpecies = gTasks[taskId].tTargetSpecies; targetSpecies = gTasks[taskId].tTargetSpecies;
SetMonData(mon, MON_DATA_SPECIES, &targetSpecies); SetMonData(mon, MON_DATA_SPECIES, &targetSpecies);
CalculateMonStats(mon); CalculateMonStats(mon);
@ -5266,7 +5263,6 @@ static void Task_TryItemUseFormChange(u8 taskId)
bool32 TryItemUseFormChange(u8 taskId, TaskFunc task) bool32 TryItemUseFormChange(u8 taskId, TaskFunc task)
{ {
struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId]; struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
u16 species = GetMonData(mon, MON_DATA_SPECIES);
u16 targetSpecies = GetFormChangeTargetSpecies(mon, ItemId_GetSecondaryId(gSpecialVar_ItemId), gSpecialVar_ItemId); u16 targetSpecies = GetFormChangeTargetSpecies(mon, ItemId_GetSecondaryId(gSpecialVar_ItemId), gSpecialVar_ItemId);
if (targetSpecies != SPECIES_NONE) if (targetSpecies != SPECIES_NONE)
@ -5275,7 +5271,6 @@ bool32 TryItemUseFormChange(u8 taskId, TaskFunc task)
SetWordTaskArg(taskId, tNextFunc, (u32)task); SetWordTaskArg(taskId, tNextFunc, (u32)task);
gTasks[taskId].func = Task_TryItemUseFormChange; gTasks[taskId].func = Task_TryItemUseFormChange;
gTasks[taskId].tState = 0; gTasks[taskId].tState = 0;
gTasks[taskId].tSpecies = species;
gTasks[taskId].tTargetSpecies = targetSpecies; gTasks[taskId].tTargetSpecies = targetSpecies;
gTasks[taskId].tAnimWait = 0; gTasks[taskId].tAnimWait = 0;
return TRUE; return TRUE;
@ -5303,7 +5298,6 @@ void ItemUseCB_FormChange_ConsumedOnUse(u8 taskId, TaskFunc task)
} }
#undef tState #undef tState
#undef tSpecies
#undef tTargetSpecies #undef tTargetSpecies
#undef tAnimWait #undef tAnimWait
#undef tNextFunc #undef tNextFunc