mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-27 22:03:53 +01:00
make it compile
This commit is contained in:
parent
59ff4aec9b
commit
d29b9d268f
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
extern u8 *const gTVStringVarPtrs[3];
|
extern u8 *const gTVStringVarPtrs[3];
|
||||||
|
|
||||||
|
void ClearTVShowData(void);
|
||||||
void sub_80EE184(void);
|
void sub_80EE184(void);
|
||||||
void sub_80EE35C(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u16 betterMove);
|
void sub_80EE35C(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u16 betterMove);
|
||||||
void sub_80EE8C8(u16 winStreak, u8 facility);
|
void sub_80EE8C8(u16 winStreak, u8 facility);
|
||||||
@ -38,6 +39,11 @@ void sub_80EECC8(void);
|
|||||||
void sub_80EECEC(void);
|
void sub_80EECEC(void);
|
||||||
void sub_80F1208(TVShow *shows);
|
void sub_80F1208(TVShow *shows);
|
||||||
void sub_80EE44C(u8 nMonsCaught, u8 nPkblkUsed);
|
void sub_80EE44C(u8 nMonsCaught, u8 nPkblkUsed);
|
||||||
|
void SetPokemonAnglerSpecies(u16 species);
|
||||||
|
void UpdateTVShowsPerDay(u16 days);
|
||||||
|
void PutPokemonTodayCaughtOnAir(void);
|
||||||
|
void TV_PutSecretBaseVisitOnTheAir(void);
|
||||||
|
bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unused, u8 sheen, u8 language);
|
||||||
void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlayer, u16 speciesOpponent);
|
void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlayer, u16 speciesOpponent);
|
||||||
|
|
||||||
#endif //GUARD_TV_H
|
#endif //GUARD_TV_H
|
||||||
|
@ -97,7 +97,6 @@ void SetUpBattleVarsAndBirchZigzagoon(void)
|
|||||||
void sub_8032768(void)
|
void sub_8032768(void)
|
||||||
{
|
{
|
||||||
s32 i;
|
s32 i;
|
||||||
u8 *data;
|
|
||||||
|
|
||||||
if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
|
if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
|
||||||
sub_8184DA4(1);
|
sub_8184DA4(1);
|
||||||
@ -120,11 +119,11 @@ void sub_8032768(void)
|
|||||||
sub_81B8D64(i, 0);
|
sub_81B8D64(i, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < sizeof(gBattleStruct->field_1A4); i++)
|
for (i = 0; i < sizeof(gBattleStruct->tvMovePoints); i++)
|
||||||
*((u8*)(&gBattleStruct->field_1A4) + i) = 0;
|
*((u8*)(&gBattleStruct->tvMovePoints) + i) = 0;
|
||||||
|
|
||||||
for (i = 0; i < sizeof(gBattleStruct->field_204); i++)
|
for (i = 0; i < sizeof(gBattleStruct->tv); i++)
|
||||||
*((u8*)(&gBattleStruct->field_204) + i) = 0;
|
*((u8*)(&gBattleStruct->tv) + i) = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void InitSinglePlayerBtlControllers(void)
|
static void InitSinglePlayerBtlControllers(void)
|
||||||
|
@ -766,9 +766,8 @@ void TryPutLinkBattleTvShowOnAir(void)
|
|||||||
species = GetMonData(&gEnemyParty[i], MON_DATA_SPECIES, NULL);
|
species = GetMonData(&gEnemyParty[i], MON_DATA_SPECIES, NULL);
|
||||||
if (species != SPECIES_NONE && !GetMonData(&gEnemyParty[i], MON_DATA_IS_EGG, NULL))
|
if (species != SPECIES_NONE && !GetMonData(&gEnemyParty[i], MON_DATA_IS_EGG, NULL))
|
||||||
{
|
{
|
||||||
s32 id = 1;
|
|
||||||
for (sum = 0, j = 0; j < 4; j++)
|
for (sum = 0, j = 0; j < 4; j++)
|
||||||
sum += movePoints->points[id][i * 4 + j];
|
sum += movePoints->points[1][i * 4 + j];
|
||||||
|
|
||||||
if (opponentBestSum == sum)
|
if (opponentBestSum == sum)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user