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

Merge branch 'master' into Unbound

Browse Source
This commit is contained in:
Skeli
2021-05-07 18:34:43 -04:00
parent 391a6fe9f8 b63ca60f2d
commit d895d13973
14 changed files with 25 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Back_Pic_Table.c
View File

@@ -1192,7 +1192,6 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES] =
[SPECIES_KUBFU] = {gBackShinySprite1183KubfuTiles, (64 * 64) / 2, SPECIES_KUBFU},
[SPECIES_URSHIFU_SINGLE] = {gBackShinySprite1184UrshifuSingleTiles, (64 * 64) / 2, SPECIES_URSHIFU_SINGLE},
[SPECIES_ZARUDE] = {gBackShinySprite1185ZarudeTiles, (64 * 64) / 2, SPECIES_ZARUDE},
[SPECIES_UNKNOWN_MYTHICAL] = {gBackShinySprite1186UnknownMythicalTiles, (64 * 64) / 2, SPECIES_UNKNOWN_MYTHICAL},
[SPECIES_CALYREX] = {gBackShinySprite1187CalyrexTiles, (64 * 64) / 2, SPECIES_CALYREX},
[SPECIES_REGIELEKI] = {gBackShinySprite1188RegielekiTiles, (64 * 64) / 2, SPECIES_REGIELEKI},
[SPECIES_REGIDRAGO] = {gBackShinySprite1189RegidragoTiles, (64 * 64) / 2, SPECIES_REGIDRAGO},

38
src/Base_Stats.c
View File

@@ -10586,7 +10586,7 @@ const struct BaseStats gBaseStats[] =
.baseSpeed = 50,
.type1 = TYPE_ICE,
.type2 = TYPE_ICE,
.catchRate = 200,
.catchRate = 255,
.expYield = 74,
.evYield_HP = 1,
.evYield_Attack = 0,
@@ -30499,7 +30499,7 @@ const struct BaseStats gBaseStats[] =
.genderRatio = PERCENT_FEMALE(12.5),
.eggCycles = 15,
.friendship = 50,
.growthRate = GROWTH_MEDIUM_FAST,
.growthRate = GROWTH_MEDIUM_SLOW,
.eggGroup1 = EGG_GROUP_WATER_1,
.eggGroup2 = EGG_GROUP_FIELD,
.ability1 = ABILITY_TORRENT,
@@ -38362,39 +38362,7 @@ const struct BaseStats gBaseStats[] =
.noFlip = TRUE,
},
/* [SPECIES_UNKNOWN_MYTHICAL] = //PLACEHOLDER DATA
{
.baseHP = 100,
.baseAttack = 100,
.baseDefense = 100,
.baseSpAttack = 100,
.baseSpDefense = 100,
.baseSpeed = 100,
.type1 = TYPE_NORMAL,
.type2 = TYPE_NORMAL,
.catchRate = 255,
.expYield = 255,
.evYield_HP = 0,
.evYield_Attack = 0,
.evYield_Defense = 0,
.evYield_SpAttack = 0,
.evYield_SpDefense = 0,
.evYield_Speed = 0,
.item1 = ITEM_NONE,
.item2 = ITEM_NONE,
.genderRatio = MON_GENDERLESS,
.eggCycles = 120,
.friendship = 0,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.ability1 = ABILITY_PRESSURE,
.ability2 = ABILITY_NONE,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_NONE,
.noFlip = TRUE,
},
/*
[SPECIES_CALYREX] = //PLACEHOLDER DATA
{
.baseHP = 100,

12
src/Cry_Table.c
View File

@@ -13926,18 +13926,6 @@ const struct ToneData gCryTable[NUM_SPECIES] =
.sustain = 0xff,
.release = 0x0,
},
[SPECIES_UNKNOWN_MYTHICAL] =
{
.type = 0x20,
.key = 0x3c,
.length = 0x0,
.pan_sweep = 0x0,
.wav = gCryUnknownMythical,
.attack = 0xff,
.decay = 0x0,
.sustain = 0xff,
.release = 0x0,
},
[SPECIES_CALYREX] =
{
.type = 0x20,

12
src/Cry_Table_2.c
View File

@@ -13926,18 +13926,6 @@ const struct ToneData gCryTable2[NUM_SPECIES] =
.sustain = 0xff,
.release = 0x0,
},
[SPECIES_UNKNOWN_MYTHICAL] =
{
.type = 0x20,
.key = 0x3c,
.length = 0x0,
.pan_sweep = 0x0,
.wav = gCryUnknownMythical,
.attack = 0xff,
.decay = 0x0,
.sustain = 0xff,
.release = 0x0,
},
[SPECIES_CALYREX] =
{
.type = 0x20,

1
src/Front_Pic_Table.c
View File

@@ -1192,7 +1192,6 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES] =
[SPECIES_KUBFU] = {gFrontSprite1183KubfuTiles, (64 * 64) / 2, SPECIES_KUBFU},
[SPECIES_URSHIFU_SINGLE] = {gFrontSprite1184UrshifuSingleTiles, (64 * 64) / 2, SPECIES_URSHIFU_SINGLE},
[SPECIES_ZARUDE] = {gFrontSprite1185ZarudeTiles, (64 * 64) / 2, SPECIES_ZARUDE},
[SPECIES_UNKNOWN_MYTHICAL] = {gFrontSprite1186UnknownMythicalTiles, (64 * 64) / 2, SPECIES_UNKNOWN_MYTHICAL},
[SPECIES_CALYREX] = {gFrontSprite1187CalyrexTiles, (64 * 64) / 2, SPECIES_CALYREX},
[SPECIES_REGIELEKI] = {gFrontSprite1188RegielekiTiles, (64 * 64) / 2, SPECIES_REGIELEKI},
[SPECIES_REGIDRAGO] = {gFrontSprite1189RegidragoTiles, (64 * 64) / 2, SPECIES_REGIDRAGO},

1
src/Icon_Table.c
View File

@@ -1189,7 +1189,6 @@ const u8* const gMonIconTable[NUM_SPECIES] =
[SPECIES_KUBFU] = gIconSprite1183KubfuTiles,
[SPECIES_URSHIFU_SINGLE] = gIconSprite1184UrshifuSingleTiles,
[SPECIES_ZARUDE] = gIconSprite1185ZarudeTiles,
[SPECIES_UNKNOWN_MYTHICAL] = gIconSprite1186UnknownMythicalTiles,
[SPECIES_CALYREX] = gIconSprite1187CalyrexTiles,
[SPECIES_REGIELEKI] = gIconSprite1188RegielekiTiles,
[SPECIES_REGIDRAGO] = gIconSprite1189RegidragoTiles,

1
src/Learnsets.c
View File

@@ -21280,7 +21280,6 @@ const struct LevelUpMove* const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_KUBFU] = sKubfuLevelUpLearnset,
[SPECIES_URSHIFU_SINGLE] = sUrshifuLevelUpLearnset,
[SPECIES_ZARUDE] = sZarudeLevelUpLearnset,
[SPECIES_UNKNOWN_MYTHICAL] = sUnknownMythicalLevelUpLearnset,
[SPECIES_CALYREX] = sCalyrexLevelUpLearnset,
[SPECIES_REGIELEKI] = sRegielekiLevelUpLearnset,
[SPECIES_REGIDRAGO] = sRegidragoLevelUpLearnset,

1
src/Palette_Table.c
View File

@@ -1192,7 +1192,6 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES] =
[SPECIES_KUBFU] = {gFrontSprite1183KubfuPal, SPECIES_KUBFU, 0x0},
[SPECIES_URSHIFU_SINGLE] = {gFrontSprite1184UrshifuSinglePal, SPECIES_URSHIFU_SINGLE, 0x0},
[SPECIES_ZARUDE] = {gFrontSprite1185ZarudePal, SPECIES_ZARUDE, 0x0},
[SPECIES_UNKNOWN_MYTHICAL] = {gFrontSprite1186UnknownMythicalPal, SPECIES_UNKNOWN_MYTHICAL, 0x0},
[SPECIES_CALYREX] = {gFrontSprite1187CalyrexPal, SPECIES_CALYREX, 0x0},
[SPECIES_REGIELEKI] = {gFrontSprite1188RegielekiPal, SPECIES_REGIELEKI, 0x0},
[SPECIES_REGIDRAGO] = {gFrontSprite1189RegidragoPal, SPECIES_REGIDRAGO, 0x0},

1
src/Shiny_Palette_Table.c
View File

@@ -1192,7 +1192,6 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES] =
[SPECIES_KUBFU] = {gBackShinySprite1183KubfuPal, SPECIES_KUBFU + NUM_SPECIES, 0x0},
[SPECIES_URSHIFU_SINGLE] = {gBackShinySprite1184UrshifuSinglePal, SPECIES_URSHIFU_SINGLE + NUM_SPECIES, 0x0},
[SPECIES_ZARUDE] = {gBackShinySprite1185ZarudePal, SPECIES_ZARUDE + NUM_SPECIES, 0x0},
[SPECIES_UNKNOWN_MYTHICAL] = {gBackShinySprite1186UnknownMythicalPal, SPECIES_UNKNOWN_MYTHICAL + NUM_SPECIES, 0x0},
[SPECIES_CALYREX] = {gBackShinySprite1187CalyrexPal, SPECIES_CALYREX + NUM_SPECIES, 0x0},
[SPECIES_REGIELEKI] = {gBackShinySprite1188RegielekiPal, SPECIES_REGIELEKI + NUM_SPECIES, 0x0},
[SPECIES_REGIDRAGO] = {gBackShinySprite1189RegidragoPal, SPECIES_REGIDRAGO + NUM_SPECIES, 0x0},

3
src/Species_To_Pokdex_Table.c
View File

@@ -1187,8 +1187,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
[SPECIES_KUBFU - 1] = NATIONAL_DEX_KUBFU,
[SPECIES_URSHIFU_SINGLE - 1] = NATIONAL_DEX_URSHIFU,
[SPECIES_ZARUDE - 1] = NATIONAL_DEX_ZARUDE,
/* [SPECIES_UNKNOWN_MYTHICAL -1] = NATIONAL_DEX_UNKNOWN,
[SPECIES_CALYREX - 1] = NATIONAL_DEX_CALYREX,
/* [SPECIES_CALYREX - 1] = NATIONAL_DEX_CALYREX,
[SPECIES_REGIELEKI - 1] = NATIONAL_DEX_REGIELEKI,
[SPECIES_REGIDRAGO - 1] = NATIONAL_DEX_REGIDRAGO, */
[SPECIES_CRAMORANT_GULPING - 1] = NATIONAL_DEX_CRAMORANT,

1
src/tm_compatibility/109 - Defog.txt
View File

@@ -111,6 +111,7 @@ SERVINE
SERPERIOR
PIDOVE
TRANQUILL
UNFEZANT
UNFEZANT_F
WOOBAT
SWOOBAT

1
src/tm_compatibility/26 - Earthquake.txt
View File

@@ -288,6 +288,7 @@ GUZZLORD
NECROZMA
NECROZMA_DUSK_MANE
NECROZMA_DAWN_WINGS
MELMETAL
STAKATAKA
RILLABOOM
GREEDENT

2
src/tm_compatibility/33 - Reflect.txt
View File

@@ -31,6 +31,8 @@ MAGNEMITE
MAGNETON
DROWZEE
HYPNO
VOLTORB
ELECTRODE
EXEGGCUTE
EXEGGCUTE_A
EXEGGUTOR

17
src/tm_compatibility/49 - Leech Fang.txt
View File

@@ -1,5 +1,7 @@
TM49: Leech Fang
SANDSHREW
SANDSHREW_A
SANDSLASH
SANDSLASH_A
ZUBAT
GOLBAT
@@ -7,6 +9,9 @@ PARAS
PARASECT
VENONAT
VENOMOTH
VICTREEBEL
KABUTO
KABUTOPS
MEW
SPINARAK
ARIADOS
@@ -15,6 +20,7 @@ NINCADA
NINJASK
SHEDINJA
KRICKETUNE
DRAPION
YANMEGA
JOLTIK
GALVANTULA
@@ -22,6 +28,7 @@ SHELMET
ACCELGOR
LARVESTA
VOLCARONA
GENESECT
NOIBAT
NOIVERN
LITTEN
@@ -41,3 +48,13 @@ MIMIKYU
MIMIKYU_BUSTED
BUZZWOLE
NAGANADEL
DOTTLER
ORBEETLE
SIZZLIPEDE
CENTISKORCH
IMPIDIMP
MORGREM
GRIMMSNARL
CURSOLA
FROSMOTH
DRACOVISH