Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-10-23 01:22:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion

Browse Source
This commit is contained in:
ExpoSeed
2020-10-11 00:10:12 -05:00
parent 22db85b4e9 13f37cf974
commit bc4e992be2
7 changed files with 61 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle.h
View File

@@ -493,7 +493,7 @@ struct BattleScripting
u8 field_20;
u8 reshowMainState;
u8 reshowHelperState;
u8 field_23;
u8 levelUpHP;
u8 windowsType; // 0 - normal, 1 - battle arena
u8 multiplayerId;
u8 specialTrainerBattleType;

5
include/constants/item_effects.h
View File

@@ -51,6 +51,11 @@
// fields 6 and onwards are item-specific arguments
// Special HP recovery amounts for ITEM4_HEAL_HP
#define ITEM6_HEAL_FULL ((u8) -1)
#define ITEM6_HEAL_HALF ((u8) -2)
#define ITEM6_HEAL_LVL_UP ((u8) -3)
// Used for GetItemEffectType.
#define ITEM_EFFECT_X_ITEM 0
#define ITEM_EFFECT_RAISE_LEVEL 1

76
include/constants/pokemon.h
View File

@@ -240,12 +240,12 @@
#define UNOWN_FORM_COUNT 28
// Battle move flags
#define FLAG_MAKES_CONTACT 0x1
#define FLAG_PROTECT_AFFECTED 0x2
#define FLAG_MAGICCOAT_AFFECTED 0x4
#define FLAG_SNATCH_AFFECTED 0x8
#define FLAG_MIRROR_MOVE_AFFECTED 0x10
#define FLAG_KINGSROCK_AFFECTED 0x20
#define FLAG_MAKES_CONTACT (1 << 0)
#define FLAG_PROTECT_AFFECTED (1 << 1)
#define FLAG_MAGICCOAT_AFFECTED (1 << 2)
#define FLAG_SNATCH_AFFECTED (1 << 3)
#define FLAG_MIRROR_MOVE_AFFECTED (1 << 4)
#define FLAG_KINGSROCK_AFFECTED (1 << 5)
// Growth rates
#define GROWTH_MEDIUM_FAST 0
@@ -269,38 +269,38 @@
#define F_SUMMARY_SCREEN_FLIP_SPRITE 0x80
// Evolution type flags
#define EVO_MEGA_EVOLUTION 0xffff // Not an actual evolution, used to temporarily mega evolve in battle.
#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
#define EVO_LEVEL_FEMALE 0x0010 // Pokémon reaches the specified level, is female
#define EVO_LEVEL_MALE 0x0011 // Pokémon reaches the specified level, is male
#define EVO_LEVEL_NIGHT 0x0012 // Pokémon reaches the specified level, is night
#define EVO_LEVEL_DAY 0x0013 // Pokémon reaches the specified level, is day
#define EVO_LEVEL_DUSK 0x0014 // Pokémon reaches the specified level, is dusk (5-6 P.M)
#define EVO_ITEM_HOLD_DAY 0x0015 // Pokémon levels up, holds specified item at day
#define EVO_ITEM_HOLD_NIGHT 0x0016 // Pokémon levels up, holds specified item at night
#define EVO_MOVE 0x0017 // Pokémon levels up, knows specified move
#define EVO_MOVE_TYPE 0x0018 // Pokémon levels up, knows move with specified type
#define EVO_MAP 0x0019 // Pokémon levels up on specified map
#define EVO_ITEM_MALE 0x001A // specified item is used on a male Pokémon
#define EVO_ITEM_FEMALE 0x001B // specified item is used on a female Pokémon
#define EVO_LEVEL_RAIN 0x001C // Pokémon reaches the specified level while it's raining
#define EVO_SPECIFIC_MON_IN_PARTY 0x001D // Pokémon levels up with a specified Pokémon in party
#define EVO_LEVEL_DARK_TYPE_MON_IN_PARTY 0x001E // Pokémon reaches the specified level with a Dark Type Pokémon in party
// Evolution types
#define EVO_MEGA_EVOLUTION 0xffff // Not an actual evolution, used to temporarily mega evolve in battle.
#define EVO_FRIENDSHIP 1 // Pokémon levels up with friendship ≥ 220
#define EVO_FRIENDSHIP_DAY 2 // Pokémon levels up during the day with friendship ≥ 220
#define EVO_FRIENDSHIP_NIGHT 3 // Pokémon levels up at night with friendship ≥ 220
#define EVO_LEVEL 4 // Pokémon reaches the specified level
#define EVO_TRADE 5 // Pokémon is traded
#define EVO_TRADE_ITEM 6 // Pokémon is traded while it's holding the specified item
#define EVO_ITEM 7 // specified item is used on Pokémon
#define EVO_LEVEL_ATK_GT_DEF 8 // Pokémon reaches the specified level with attack > defense
#define EVO_LEVEL_ATK_EQ_DEF 9 // Pokémon reaches the specified level with attack = defense
#define EVO_LEVEL_ATK_LT_DEF 10 // Pokémon reaches the specified level with attack < defense
#define EVO_LEVEL_SILCOON 11 // Pokémon reaches the specified level with a Silcoon personality value
#define EVO_LEVEL_CASCOON 12 // Pokémon reaches the specified level with a Cascoon personality value
#define EVO_LEVEL_NINJASK 13 // Pokémon reaches the specified level (special value for Ninjask)
#define EVO_LEVEL_SHEDINJA 14 // Pokémon reaches the specified level (special value for Shedinja)
#define EVO_BEAUTY 15 // Pokémon levels up with beauty ≥ specified value
#define EVO_LEVEL_FEMALE 17 // Pokémon reaches the specified level, is female
#define EVO_LEVEL_MALE 18 // Pokémon reaches the specified level, is male
#define EVO_LEVEL_NIGHT 19 // Pokémon reaches the specified level, is night
#define EVO_LEVEL_DAY 20 // Pokémon reaches the specified level, is day
#define EVO_LEVEL_DUSK 21 // Pokémon reaches the specified level, is dusk (5-6 P.M)
#define EVO_ITEM_HOLD_DAY 22 // Pokémon levels up, holds specified item at day
#define EVO_ITEM_HOLD_NIGHT 23 // Pokémon levels up, holds specified item at night
#define EVO_MOVE 24 // Pokémon levels up, knows specified move
#define EVO_MOVE_TYPE 25 // Pokémon levels up, knows move with specified type
#define EVO_MAP 26 // Pokémon levels up on specified map
#define EVO_ITEM_MALE 27 // specified item is used on a male Pokémon
#define EVO_ITEM_FEMALE 28 // specified item is used on a female Pokémon
#define EVO_LEVEL_RAIN 29 // Pokémon reaches the specified level while it's raining
#define EVO_SPECIFIC_MON_IN_PARTY 30 // Pokémon levels up with a specified Pokémon in party
#define EVO_LEVEL_DARK_TYPE_MON_IN_PARTY 31 // Pokémon reaches the specified level with a Dark Type Pokémon in party
#define EVOS_PER_MON 8