dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

almost there, troubles

Browse Source
This commit is contained in:
DizzyEggg
2017-09-12 00:01:12 +02:00
parent 738e776630
commit 4242ede445
16 changed files with 246 additions and 834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle.h
View File

@@ -289,7 +289,7 @@ struct BattleScriptsStack
struct BattleResources
{
void* secretBaseOpponent;
struct SecretBaseRecord* secretBase;
struct UnknownFlags *flags;
struct BattleScriptsStack* battleScriptsStack;
void* battleCallbackStack;

4
include/pokemon.h
View File

@@ -571,8 +571,8 @@ u8 GetMonAbility(struct Pokemon *mon);
void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord);
u8 GetSecretBaseTrainerPicIndex(void);
u8 GetSecretBaseTrainerNameIndex(void);
u8 PlayerPartyAndPokemonStorageFull(void);
u8 PokemonStorageFull(void);
bool8 IsPlayerPartyAndPokemonStorageFull(void);
bool8 IsPokemonStorageFull(void);
void GetSpeciesName(u8 *name, u16 species);
u8 CalculatePPWithBonus(u16 move, u8 ppBonuses, u8 moveIndex);
void RemoveMonPPBonus(struct Pokemon *mon, u8 moveIndex);

12
include/species.h
View File

@@ -1,4 +1,8 @@
enum {
#ifndef GUARD_SPECIES_H
#define GUARD_SPECIES_H
enum
{
SPECIES_NONE, // 0x000
SPECIES_BULBASAUR, // 0x001
SPECIES_IVYSAUR, // 0x002
@@ -442,4 +446,8 @@ enum {
SPECIES_UNOWN_Z,
SPECIES_UNOWN_EMARK,
SPECIES_UNOWN_QMARK,
};
};
#define NUM_SPECIES SPECIES_EGG
#endif // GUARD_SPECIES_H