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

Merge pull request #1247 from PidgeyALT/attemptcountfix 

use constants for ball throw count
This commit is contained in:
GriffinR 2020-11-06 15:41:25 -05:00 committed by GitHub
parent 75b12b86dc e31158d017
commit 8b1c2c946b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/battle.h
View File

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

11
src/tv.c
View File

@ -32,6 +32,7 @@
#include "decoration.h" #include "decoration.h"
#include "secret_base.h" #include "secret_base.h"
#include "tv.h" #include "tv.h"
#include "pokeball.h"
#include "data.h" #include "data.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/contest.h" #include "constants/contest.h"
@ -963,7 +964,7 @@ void GabbyAndTyBeforeInterview(void)
} }
if (!gBattleResults.usedMasterBall) if (!gBattleResults.usedMasterBall)
{ {
for (i = 0; i < 11; i ++) for (i = 0; i < POKEBALL_COUNT - 1; i ++)
{ {
if (gBattleResults.catchAttempts[i]) if (gBattleResults.catchAttempts[i])
{ {
@ -1135,7 +1136,7 @@ void PutPokemonTodayCaughtOnAir(void)
sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_CAUGHT, FALSE) != TRUE) if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_CAUGHT, FALSE) != TRUE)
{ {
for (i = 0; i < 11; i ++) for (i = 0; i < POKEBALL_COUNT - 1; i ++)
{ {
ct += gBattleResults.catchAttempts[i]; ct += gBattleResults.catchAttempts[i];
} }
@ -1152,7 +1153,7 @@ void PutPokemonTodayCaughtOnAir(void)
} }
else else
{ {
for (i = 0; i < 11; i ++) for (i = 0; i < POKEBALL_COUNT - 1; i ++)
{ {
ct += gBattleResults.catchAttempts[i]; ct += gBattleResults.catchAttempts[i];
} }
@ -1203,7 +1204,7 @@ void PutPokemonTodayFailedOnTheAir(void)
if (!rbernoulli(1, 1)) if (!rbernoulli(1, 1))
{ {
for (i = 0, ct = 0; i < 11; i ++) for (i = 0, ct = 0; i < POKEBALL_COUNT - 1; i ++)
{ {
ct += gBattleResults.catchAttempts[i]; ct += gBattleResults.catchAttempts[i];
} }
@ -2228,7 +2229,7 @@ void sub_80EE184(void)
show->breakingNews.kind = TVSHOW_BREAKING_NEWS; show->breakingNews.kind = TVSHOW_BREAKING_NEWS;
show->breakingNews.active = FALSE; show->breakingNews.active = FALSE;
balls = 0; balls = 0;
for (i = 0; i < 11; i ++) for (i = 0; i < POKEBALL_COUNT - 1; i ++)
{ {
balls += gBattleResults.catchAttempts[i]; balls += gBattleResults.catchAttempts[i];
} }