Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add spaces around - and remove comment from include in battle.h

This commit is contained in:
MCboy 2020-11-06 23:29:52 +03:30
parent 3b91735e63
commit e31158d017
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/battle.h
View File

@ -11,8 +11,7 @@
#include "battle_gfx_sfx_util.h"
#include "battle_util2.h"
#include "battle_bg.h"
#include "pokeball.h" // i'm not sure about this one
#include "pokeball.h"
#define GET_BATTLER_POSITION(battler) (gBattlerPositions[battler])
#define GET_BATTLER_SIDE(battler) (GetBattlerPosition(battler) & BIT_SIDE)
@ -257,7 +256,7 @@ struct BattleResults
u16 caughtMonSpecies; // 0x28
u8 caughtMonNick[POKEMON_NAME_LENGTH + 1]; // 0x2A
u8 filler35; // 0x35
u8 catchAttempts[POKEBALL_COUNT-1]; // 0x36 Doesn't include Master ball
u8 catchAttempts[POKEBALL_COUNT - 1]; // 0x36 Doesn't include Master ball
};
struct BattleTv_Side

10
src/tv.c
View File

@ -964,7 +964,7 @@ void GabbyAndTyBeforeInterview(void)
}
if (!gBattleResults.usedMasterBall)
{
for (i = 0; i < POKEBALL_COUNT-1; i ++)
for (i = 0; i < POKEBALL_COUNT - 1; i ++)
{
if (gBattleResults.catchAttempts[i])
{
@ -1136,7 +1136,7 @@ void PutPokemonTodayCaughtOnAir(void)
sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_CAUGHT, FALSE) != TRUE)
{
for (i = 0; i < POKEBALL_COUNT-1; i ++)
for (i = 0; i < POKEBALL_COUNT - 1; i ++)
{
ct += gBattleResults.catchAttempts[i];
}
@ -1153,7 +1153,7 @@ void PutPokemonTodayCaughtOnAir(void)
}
else
{
for (i = 0; i < POKEBALL_COUNT-1; i ++)
for (i = 0; i < POKEBALL_COUNT - 1; i ++)
{
ct += gBattleResults.catchAttempts[i];
}
@ -1204,7 +1204,7 @@ void PutPokemonTodayFailedOnTheAir(void)
if (!rbernoulli(1, 1))
{
for (i = 0, ct = 0; i < POKEBALL_COUNT-1; i ++)
for (i = 0, ct = 0; i < POKEBALL_COUNT - 1; i ++)
{
ct += gBattleResults.catchAttempts[i];
}
@ -2229,7 +2229,7 @@ void sub_80EE184(void)
show->breakingNews.kind = TVSHOW_BREAKING_NEWS;
show->breakingNews.active = FALSE;
balls = 0;
for (i = 0; i < POKEBALL_COUNT-1; i ++)
for (i = 0; i < POKEBALL_COUNT - 1; i ++)
{
balls += gBattleResults.catchAttempts[i];
}