atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1148 from PokeCodec/savedIme

Browse source 
Remove unused var from ruby and other minor refactors.
This commit is contained in:
PikalaxALT 2020-08-23 19:47:08 -04:00 committed by GitHub
commit d7e31f5a85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/contest.c
View file

@ -999,8 +999,6 @@ void ResetLinkContestBoolean(void)
static void SetupContestGpuRegs(void) static void SetupContestGpuRegs(void)
{ {
u16 savedIme;
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP);
SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDCNT, 0);
SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0);
@ -3410,8 +3408,7 @@ static void GetAllChosenMoves(void)
static void RankContestants(void) static void RankContestants(void)
{ {
s32 i; s32 i, j;
s32 j;
s16 arr[CONTESTANT_COUNT]; s16 arr[CONTESTANT_COUNT];
for (i = 0; i < CONTESTANT_COUNT; i++) for (i = 0; i < CONTESTANT_COUNT; i++)
@ -3486,8 +3483,7 @@ static bool8 ContestantCanUseTurn(u8 contestant)
{ {
if (eContestantStatus[contestant].numTurnsSkipped != 0 || eContestantStatus[contestant].noMoreTurns) if (eContestantStatus[contestant].numTurnsSkipped != 0 || eContestantStatus[contestant].noMoreTurns)
return FALSE; return FALSE;
else return TRUE;
return TRUE;
} }
static void SetContestantStatusesForNextRound(void) static void SetContestantStatusesForNextRound(void)
@ -3541,8 +3537,7 @@ bool8 Contest_IsMonsTurnDisabled(u8 contestant)
{ {
if (eContestantStatus[contestant].numTurnsSkipped != 0 || eContestantStatus[contestant].noMoreTurns) if (eContestantStatus[contestant].numTurnsSkipped != 0 || eContestantStatus[contestant].noMoreTurns)
return TRUE; return TRUE;
else return FALSE;
return FALSE;
} }
static void CalculateTotalPointsForContestant(u8 contestant) static void CalculateTotalPointsForContestant(u8 contestant)
@ -4485,17 +4480,14 @@ static void CalculateAppealMoveImpact(u8 contestant)
eContestantStatus[contestant].comboAppealBonus = eContestantStatus[contestant].baseAppeal * eContestantStatus[contestant].completedCombo; eContestantStatus[contestant].comboAppealBonus = eContestantStatus[contestant].baseAppeal * eContestantStatus[contestant].completedCombo;
eContestantStatus[contestant].completedComboFlag = TRUE; // Redundant with completedCombo, used by AI eContestantStatus[contestant].completedComboFlag = TRUE; // Redundant with completedCombo, used by AI
} }
else if (gContestMoves[eContestantStatus[contestant].currMove].comboStarterId != 0)
{
eContestantStatus[contestant].hasJudgesAttention = TRUE;
eContestantStatus[contestant].usedComboMove = TRUE;
}
else else
{ {
if (gContestMoves[eContestantStatus[contestant].currMove].comboStarterId != 0) eContestantStatus[contestant].hasJudgesAttention = FALSE;
{
eContestantStatus[contestant].hasJudgesAttention = TRUE;
eContestantStatus[contestant].usedComboMove = TRUE;
}
else
{
eContestantStatus[contestant].hasJudgesAttention = FALSE;
}
} }
} }
if (eContestantStatus[contestant].repeatedMove) if (eContestantStatus[contestant].repeatedMove)

13
src/fldeff_cut.c
View file

@ -227,9 +227,7 @@ bool8 SetUpFieldMove_Cut(void)
y = gPlayerFacingPosition.y + sHyperCutStruct[i].y; y = gPlayerFacingPosition.y + sHyperCutStruct[i].y;
tileCuttable = TRUE; tileCuttable = TRUE;
j = 0; for (j = 0; j < 2; ++j) {
do
{
if (sHyperCutStruct[i].unk2[j] == 0) if (sHyperCutStruct[i].unk2[j] == 0)
break; break;
if (cutTiles[(u8)(sHyperCutStruct[i].unk2[j] - 1)] == FALSE) if (cutTiles[(u8)(sHyperCutStruct[i].unk2[j] - 1)] == FALSE)
@ -237,7 +235,7 @@ bool8 SetUpFieldMove_Cut(void)
tileCuttable = FALSE; tileCuttable = FALSE;
break; break;
} }
} while (++j <= 1); }
if (tileCuttable == TRUE) if (tileCuttable == TRUE)
{ {
@ -253,11 +251,8 @@ bool8 SetUpFieldMove_Cut(void)
sHyperCutTiles[tileArrayId] = TRUE; sHyperCutTiles[tileArrayId] = TRUE;
ret = TRUE; ret = TRUE;
} }
else else if (MetatileBehavior_IsCuttableGrass(tileBehavior) == TRUE)
{ sHyperCutTiles[tileArrayId] = TRUE;
if (MetatileBehavior_IsCuttableGrass(tileBehavior) == TRUE)
sHyperCutTiles[tileArrayId] = TRUE;
}
} }
} }
} }