diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-03 22:58:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-03 22:58:47 -0400 |
| commit | 86a4a2cd3b7cda3b1885e53e7c9ac4d31270bd6c (patch) | |
| tree | 5b3c87ca05d93264a7a3e62347a571299ce90795 /src/pokemon_3.c | |
| parent | 8d82578d3a101b06f9d2ced31738021007c4e533 (diff) | |
| parent | d8bfc0998dec654e908caddccf8147ea62c0ea4a (diff) | |
Merge pull request #328 from PikalaxALT/pokemon_data
Pokémon data
Diffstat (limited to 'src/pokemon_3.c')
| -rw-r--r-- | src/pokemon_3.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/src/pokemon_3.c b/src/pokemon_3.c index cb8eb2a46..c096e2e4b 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -23,28 +23,6 @@ #include "text.h" #include "util.h" -#define EVO_FRIENDSHIP 0x0001 // Pokémon levels up with friendship ≥ 220 -#define EVO_FRIENDSHIP_DAY 0x0002 // Pokémon levels up during the day with friendship ≥ 220 -#define EVO_FRIENDSHIP_NIGHT 0x0003 // Pokémon levels up at night with friendship ≥ 220 -#define EVO_LEVEL 0x0004 // Pokémon reaches the specified level -#define EVO_TRADE 0x0005 // Pokémon is traded -#define EVO_TRADE_ITEM 0x0006 // Pokémon is traded while it's holding the specified item -#define EVO_ITEM 0x0007 // specified item is used on Pokémon -#define EVO_LEVEL_ATK_GT_DEF 0x0008 // Pokémon reaches the specified level with attack > defense -#define EVO_LEVEL_ATK_EQ_DEF 0x0009 // Pokémon reaches the specified level with attack = defense -#define EVO_LEVEL_ATK_LT_DEF 0x000a // Pokémon reaches the specified level with attack < defense -#define EVO_LEVEL_SILCOON 0x000b // Pokémon reaches the specified level with a Silcoon personality value -#define EVO_LEVEL_CASCOON 0x000c // Pokémon reaches the specified level with a Cascoon personality value -#define EVO_LEVEL_NINJASK 0x000d // Pokémon reaches the specified level (special value for Ninjask) -#define EVO_LEVEL_SHEDINJA 0x000e // Pokémon reaches the specified level (special value for Shedinja) -#define EVO_BEAUTY 0x000f // Pokémon levels up with beauty ≥ specified value - -struct SpindaSpot -{ - u8 x, y; - u16 image[16]; -}; - extern u8 gPlayerPartyCount; extern u8 gEnemyPartyCount; extern struct BattlePokemon gBattleMons[4]; @@ -103,8 +81,8 @@ bool8 HealStatusConditions(struct Pokemon *mon, u32 unused, u32 healMask, u8 bat u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit) { - u8 *temp; - u8 *itemEffect; + const u8 *temp; + const u8 *itemEffect; u8 offset; int i; u8 j; @@ -112,7 +90,7 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit) offset = 6; - temp = (u8 *) gItemEffectTable[itemId - 13]; + temp = gItemEffectTable[itemId - 13]; if (!temp && itemId != ITEM_ENIGMA_BERRY) return 0; |