Leahnaya/Dynamic-Pokemon-Expansion
1
0
Fork 0
mirror of https://github.com/Skeli789/Dynamic-Pokemon-Expansion.git synced 2026-09-08 01:55:38 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Unbound

Browse Source
This commit is contained in:
Skeli
2021-07-04 16:06:31 -04:00
parent b201d252ad ea167c3a45
commit 90d53aabc9
240 changed files with 3321 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/evolution.h
View File

@@ -43,6 +43,7 @@ enum EvolutionMethods
EVO_MOVE, // knows a given move
EVO_OTHER_PARTY_MON, //another poke in the party, arg is a specific species
EVO_LEVEL_SPECIFIC_TIME_RANGE, // above given level with a range (unknown is [start][end]. eg lycanroc -> 1700-1800 hrs -> 0x1112)
EVO_FLAG_SET, //If a certain flag is set. Can be used for touching the Mossy/Icy Rock for Leafeon/Glaceon evolutions
EVO_CRITICAL_HIT, // successfully land 3 critical hits in one battle
EVO_NATURE_HIGH, // evolution based on high key nature at a certain level
EVO_NATURE_LOW, // evolution based on low key nature at a certain level

2
include/items.h
View File

@@ -766,7 +766,7 @@
#define ITEM_RIBBON_SWEET 0x2D1
#define ITEM_STAR_SWEET 0x2D2
#define ITEM_GALARICA_CUFF 0x2D3
#define ITEM_GALARICA_CROWN 0x2D4 //Placeholder name for G-Slowking item
#define ITEM_GALARICA_WREATH 0x2D4
//New Key Items
#define ITEM_GRACIDEA 0x217

17
include/pokedex.h
View File

@@ -1002,10 +1002,11 @@ enum
#define NATIONAL_DEX_KUBFU 891
#define NATIONAL_DEX_URSHIFU 892
#define NATIONAL_DEX_ZARUDE 893
#define NATIONAL_DEX_CALYREX 894
#define NATIONAL_DEX_REGIELEKI 895
#define NATIONAL_DEX_REGIDRAGO 896
#define NATIONAL_DEX_UNKNOWN 897
#define NATIONAL_DEX_REGIELEKI 894
#define NATIONAL_DEX_REGIDRAGO 895
#define NATIONAL_DEX_GLASTRIER 896
#define NATIONAL_DEX_SPECTRIER 897
#define NATIONAL_DEX_CALYREX 898
#define FINAL_DEX_ENTRY NATIONAL_DEX_MELMETAL //Not +1 b/c used like this for some asm
#define NATIONAL_DEX_COUNT FINAL_DEX_ENTRY + 1
@@ -1517,10 +1518,11 @@ extern const u8 DEX_ENTRY_ETERNATUS[];
extern const u8 DEX_ENTRY_KUBFU[];
extern const u8 DEX_ENTRY_URSHIFU_SINGLE[];
extern const u8 DEX_ENTRY_ZARUDE[];
extern const u8 DEX_ENTRY_CALYREX[];
extern const u8 DEX_ENTRY_REGIELEKI[];
extern const u8 DEX_ENTRY_REGIDRAGO[];
extern const u8 DEX_ENTRY_UNKNWON_MYTHICAL[];
extern const u8 DEX_ENTRY_GLASTRIER[];
extern const u8 DEX_ENTRY_SPECTRIER[];
extern const u8 DEX_ENTRY_CALYREX[];
extern const u8 DEX_ENTRY_RATTATA_A[];
extern const u8 DEX_ENTRY_RATICATE_A[];
@@ -1589,3 +1591,6 @@ extern const u8 DEX_ENTRY_ZACIAN_CROWNED[];
extern const u8 DEX_ENTRY_ZAMAZENTA_CROWNED[];
extern const u8 DEX_ENTRY_ETERNATUS_ETERNAMAX[];
extern const u8 DEX_ENTRY_URSHIFU_RAPID[];
extern const u8 DEX_ENTRY_ZARUDE_DADA[];
extern const u8 DEX_ENTRY_CALYREX_ICE_RIDER[];
extern const u8 DEX_ENTRY_CALYREX_SHADOW_RIDER[];