ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-01 08:50:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2021 from AsparagusEduardo/PE_elevations

Browse Source 
Adjusted battle elevations for certain species
This commit is contained in:
ghoulslash 2022-01-13 11:45:57 -05:00 committed by GitHub
commit 6603149727
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 178 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
src/data/pokemon_graphics/enemy_mon_elevation.h
View File

@ -14,8 +14,6 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_MAGNETON] = 9,
[SPECIES_GASTLY] = 10,
[SPECIES_HAUNTER] = 11,
[SPECIES_VOLTORB] = 11,
[SPECIES_ELECTRODE] = 12,
[SPECIES_KOFFING] = 14,
[SPECIES_WEEZING] = 6,
[SPECIES_AERODACTYL] = 9,
@ -31,6 +29,8 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_MISDREAVUS] = 12,
[SPECIES_UNOWN] = 8,
[SPECIES_GLIGAR] = 8,
[SPECIES_MANTINE] = 6,
[SPECIES_PORYGON2] = 9,
[SPECIES_LUGIA] = 6,
[SPECIES_HO_OH] = 6,
[SPECIES_CELEBI] = 15,
@ -41,13 +41,12 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_WINGULL] = 15,
[SPECIES_PELIPPER] = 8,
[SPECIES_MASQUERAIN] = 10,
[SPECIES_BALTOY] = 1,
[SPECIES_BALTOY] = 5,
[SPECIES_CLAYDOL] = 10,
[SPECIES_FLYGON] = 7,
[SPECIES_GLALIE] = 12,
[SPECIES_LUNATONE] = 13,
[SPECIES_SOLROCK] = 4,
[SPECIES_SWABLU] = 12,
[SPECIES_ALTARIA] = 8,
[SPECIES_DUSKULL] = 13,
[SPECIES_SHUPPET] = 14,
@ -66,11 +65,14 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_DRIFLOON] = 5,
[SPECIES_DRIFBLIM] = 7,
[SPECIES_MISMAGIUS] = 3,
[SPECIES_CHINGLING] = 5,
[SPECIES_BRONZONG] = 4,
[SPECIES_MAGNEZONE] = 4,
[SPECIES_TOGEKISS] = 14,
[SPECIES_YANMEGA] = 6,
[SPECIES_GLISCOR] = 6,
[SPECIES_GLISCOR] = 9,
[SPECIES_PORYGON_Z] = 12,
[SPECIES_PROBOPASS] = 6,
[SPECIES_ROTOM] = 10,
[SPECIES_UXIE] = 6,
[SPECIES_MESPRIT] = 6,
@ -78,6 +80,8 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_CRESSELIA] = 3,
[SPECIES_DARKRAI] = 4,
// Gen 5
[SPECIES_MUNNA] = 7,
[SPECIES_MUSHARNA] = 5,
[SPECIES_WOOBAT] = 19,
[SPECIES_SWOOBAT] = 12,
[SPECIES_PETILIL] = 7,
@ -86,50 +90,178 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_ARCHEOPS] = 8,
[SPECIES_SOLOSIS] = 14,
[SPECIES_DUOSION] = 7,
[SPECIES_REUNICLUS] = 3,
[SPECIES_REUNICLUS] = 8,
[SPECIES_EMOLGA] = 19,
[SPECIES_TYNAMO] = 16,
[SPECIES_EELEKTRIK] = 8,
[SPECIES_EELEKTROSS] = 8,
[SPECIES_CRYOGONAL] = 3,
[SPECIES_BRAVIARY] = 8,
[SPECIES_HYDREIGON] = 3,
[SPECIES_VOLCARONA] = 6,
[SPECIES_TORNADUS] = 7,
[SPECIES_THUNDURUS] = 7,
[SPECIES_LANDORUS] = 7,
[SPECIES_MELOETTA] = 8,
// Gen 6
[SPECIES_FLETCHINDER] = 9,
[SPECIES_TALONFLAME] = 7,
[SPECIES_VIVILLON] = 9,
[SPECIES_FLABEBE] = 6,
[SPECIES_FLOETTE] = 4,
[SPECIES_HONEDGE] = 4,
[SPECIES_DOUBLADE] = 5,
[SPECIES_AEGISLASH] = 3,
[SPECIES_SPRITZEE] = 14,
[SPECIES_INKAY] = 14,
[SPECIES_CARBINK] = 4,
[SPECIES_KLEFKI] = 5,
[SPECIES_PHANTUMP] = 5,
[SPECIES_NOIBAT] = 8,
[SPECIES_YVELTAL] = 5,
[SPECIES_HOOPA] = 13,
// Gen 7
[SPECIES_VIKAVOLT] = 8,
[SPECIES_CUTIEFLY] = 10,
[SPECIES_RIBOMBEE] = 6,
[SPECIES_COMFEY] = 8,
[SPECIES_MINIOR] = 17,
[SPECIES_DHELMISE] = 2,
[SPECIES_TAPU_KOKO] = 9,
[SPECIES_TAPU_LELE] = 8,
[SPECIES_TAPU_BULU] = 5,
[SPECIES_TAPU_FINI] = 6,
[SPECIES_COSMOG] = 7,
[SPECIES_COSMOEM] = 3,
[SPECIES_LUNALA] = 6,
[SPECIES_NIHILEGO] = 6,
[SPECIES_KARTANA] = 3,
[SPECIES_NECROZMA] = 6,
[SPECIES_POIPOLE] = 9,
[SPECIES_NAGANADEL] = 7,
// Gen 8
[SPECIES_CORVISQUIRE] = 6,
[SPECIES_CORVISQUIRE] = 10,
[SPECIES_ORBEETLE] = 8,
[SPECIES_FLAPPLE] = 9,
[SPECIES_SINISTEA] = 9,
[SPECIES_POLTEAGEIST] = 11,
[SPECIES_RUNERIGUS] = 5,
[SPECIES_MILCERY] = 10,
[SPECIES_FROSMOTH] = 7,
[SPECIES_DREEPY] = 5,
[SPECIES_DRAKLOAK] = 5,
[SPECIES_DRAGAPULT] = 3,
[SPECIES_FROSMOTH] = 3,
[SPECIES_ETERNATUS] = 4,
[SPECIES_REGIELEKI] = 8,
[SPECIES_REGIDRAGO] = 5,
// Megas
[SPECIES_BEEDRILL_MEGA] = 5,
[SPECIES_PIDGEOT_MEGA] = 8,
[SPECIES_ALAKAZAM_MEGA] = 7,
[SPECIES_PINSIR_MEGA] = 4,
[SPECIES_GYARADOS_MEGA] = 6,
[SPECIES_AERODACTYL_MEGA] = 7,
[SPECIES_MEWTWO_MEGA_Y] = 3,
[SPECIES_SHARPEDO_MEGA] = 1,
[SPECIES_ALTARIA_MEGA] = 6,
[SPECIES_BANETTE_MEGA] = 5,
[SPECIES_GLALIE_MEGA] = 8,
[SPECIES_METAGROSS_MEGA] = 4,
[SPECIES_LATIAS_MEGA] = 8,
[SPECIES_LATIOS_MEGA] = 8,
[SPECIES_METAGROSS_MEGA] = 4,
[SPECIES_GLALIE_MEGA] = 8,
[SPECIES_ALTARIA_MEGA] = 6,
[SPECIES_SHARPEDO_MEGA] = 1,
[SPECIES_PIDGEOT_MEGA] = 8,
[SPECIES_BEEDRILL_MEGA] = 5,
[SPECIES_BANETTE_MEGA] = 5,
[SPECIES_MEWTWO_MEGA_Y] = 3,
[SPECIES_AERODACTYL_MEGA] = 3,
[SPECIES_GYARADOS_MEGA] = 6,
[SPECIES_PINSIR_MEGA] = 4,
[SPECIES_ALAKAZAM_MEGA] = 7,
[SPECIES_RAYQUAZA_MEGA] = 4,
// Alolan Forms
[SPECIES_RAICHU_ALOLAN] = 4,
[SPECIES_GEODUDE_ALOLAN] = 16,
// Galarian Forms
[SPECIES_WEEZING_GALARIAN] = 3,
[SPECIES_WEEZING_GALARIAN] = 6,
[SPECIES_ARTICUNO_GALARIAN] = 10,
[SPECIES_YAMASK_GALARIAN] = 4,
// Misc Forms
// Other Forms
[SPECIES_UNOWN_B] = 8,
[SPECIES_UNOWN_C] = 8,
[SPECIES_UNOWN_D] = 8,
[SPECIES_UNOWN_E] = 8,
[SPECIES_UNOWN_F] = 8,
[SPECIES_UNOWN_G] = 8,
[SPECIES_UNOWN_H] = 8,
[SPECIES_UNOWN_I] = 8,
[SPECIES_UNOWN_J] = 8,
[SPECIES_UNOWN_K] = 8,
[SPECIES_UNOWN_L] = 8,
[SPECIES_UNOWN_M] = 8,
[SPECIES_UNOWN_N] = 8,
[SPECIES_UNOWN_O] = 8,
[SPECIES_UNOWN_P] = 8,
[SPECIES_UNOWN_Q] = 8,
[SPECIES_UNOWN_R] = 8,
[SPECIES_UNOWN_S] = 8,
[SPECIES_UNOWN_T] = 8,
[SPECIES_UNOWN_U] = 8,
[SPECIES_UNOWN_V] = 8,
[SPECIES_UNOWN_W] = 8,
[SPECIES_UNOWN_X] = 8,
[SPECIES_UNOWN_Y] = 8,
[SPECIES_UNOWN_Z] = 8,
[SPECIES_UNOWN_QMARK] = 8,
[SPECIES_UNOWN_EMARK] = 8,
[SPECIES_CASTFORM_SUNNY] = 5,
[SPECIES_CASTFORM_RAINY] = 5,
[SPECIES_CASTFORM_SNOWY] = 5,
[SPECIES_ROTOM_HEAT] = 6,
[SPECIES_ROTOM_WASH] = 6,
[SPECIES_ROTOM_FROST] = 6,
[SPECIES_ROTOM_FAN] = 6,
[SPECIES_ROTOM_MOW] = 6,
[SPECIES_GIRATINA_ORIGIN] = 7,
[SPECIES_THUNDURUS_THERIAN] = 7,
[SPECIES_ETERNATUS_ETERNAMAX] = 4,
[SPECIES_MELOETTA_PIROUETTE] = 5,
[SPECIES_VIVILLON_POLAR] = 9,
[SPECIES_VIVILLON_TUNDRA] = 9,
[SPECIES_VIVILLON_CONTINENTAL] = 9,
[SPECIES_VIVILLON_GARDEN] = 9,
[SPECIES_VIVILLON_ELEGANT] = 9,
[SPECIES_VIVILLON_MEADOW] = 9,
[SPECIES_VIVILLON_MODERN] = 9,
[SPECIES_VIVILLON_MARINE] = 9,
[SPECIES_VIVILLON_ARCHIPELAGO] = 9,
[SPECIES_VIVILLON_HIGH_PLAINS] = 9,
[SPECIES_VIVILLON_SANDSTORM] = 9,
[SPECIES_VIVILLON_RIVER] = 9,
[SPECIES_VIVILLON_MONSOON] = 9,
[SPECIES_VIVILLON_SAVANNA] = 9,
[SPECIES_VIVILLON_SUN] = 9,
[SPECIES_VIVILLON_OCEAN] = 9,
[SPECIES_VIVILLON_JUNGLE] = 9,
[SPECIES_VIVILLON_FANCY] = 9,
[SPECIES_VIVILLON_POKE_BALL] = 9,
[SPECIES_FLABEBE_YELLOW_FLOWER] = 6,
[SPECIES_FLABEBE_ORANGE_FLOWER] = 6,
[SPECIES_FLABEBE_BLUE_FLOWER] = 6,
[SPECIES_FLABEBE_WHITE_FLOWER] = 6,
[SPECIES_FLOETTE_YELLOW_FLOWER] = 4,
[SPECIES_FLOETTE_ORANGE_FLOWER] = 4,
[SPECIES_FLOETTE_BLUE_FLOWER] = 4,
[SPECIES_FLOETTE_WHITE_FLOWER] = 4,
[SPECIES_FLOETTE_ETERNAL_FLOWER] = 4,
[SPECIES_AEGISLASH_BLADE] = 3,
[SPECIES_HOOPA_UNBOUND] = 3,
[SPECIES_MINIOR_METEOR_ORANGE] = 17,
[SPECIES_MINIOR_METEOR_YELLOW] = 17,
[SPECIES_MINIOR_METEOR_GREEN] = 17,
[SPECIES_MINIOR_METEOR_BLUE] = 17,
[SPECIES_MINIOR_METEOR_INDIGO] = 17,
[SPECIES_MINIOR_METEOR_VIOLET] = 17,
[SPECIES_MINIOR_CORE_RED] = 17,
[SPECIES_MINIOR_CORE_ORANGE] = 17,
[SPECIES_MINIOR_CORE_YELLOW] = 17,
[SPECIES_MINIOR_CORE_GREEN] = 17,
[SPECIES_MINIOR_CORE_BLUE] = 17,
[SPECIES_MINIOR_CORE_INDIGO] = 17,
[SPECIES_MINIOR_CORE_VIOLET] = 17,
[SPECIES_NECROZMA_DAWN_WINGS] = 6,
[SPECIES_NECROZMA_ULTRA] = 5,
[SPECIES_SINISTEA_ANTIQUE] = 10,
[SPECIES_POLTEAGEIST_ANTIQUE] = 12,
[SPECIES_ETERNATUS_ETERNAMAX] = 13,
};

46
src/data/pokemon_graphics/front_pic_coordinates.h
View File

@ -507,12 +507,12 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_VOLTORB] =
{
.size = MON_COORDS_SIZE(32, 40),
.y_offset = 15,
.y_offset = 11,
},
[SPECIES_ELECTRODE] =
{
.size = MON_COORDS_SIZE(48, 48),
.y_offset = 11,
.y_offset = 8,
},
[SPECIES_EXEGGCUTE] =
{
@ -1137,7 +1137,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_MANTINE] =
{
.size = MON_COORDS_SIZE(64, 56),
.y_offset = 10,
.y_offset = 9,
},
[SPECIES_SKARMORY] =
{
@ -1242,7 +1242,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_PUPITAR] =
{
.size = MON_COORDS_SIZE(40, 48),
.y_offset = 11,
.y_offset = 9,
},
[SPECIES_TYRANITAR] =
{
@ -1472,7 +1472,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_BALTOY] =
{
.size = MON_COORDS_SIZE(40, 40),
.y_offset = 14,
.y_offset = 11,
},
[SPECIES_CLAYDOL] =
{
@ -1497,7 +1497,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_BARBOACH] =
{
.size = MON_COORDS_SIZE(48, 40),
.y_offset = 15,
.y_offset = 11,
},
[SPECIES_WHISCASH] =
{
@ -1507,7 +1507,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_LUVDISC] =
{
.size = MON_COORDS_SIZE(32, 40),
.y_offset = 14,
.y_offset = 11,
},
[SPECIES_CORPHISH] =
{
@ -1672,7 +1672,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_SWABLU] =
{
.size = MON_COORDS_SIZE(48, 40),
.y_offset = 14,
.y_offset = 12,
},
[SPECIES_ALTARIA] =
{
@ -2172,7 +2172,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_CHINGLING] =
{
.size = MON_COORDS_SIZE(40, 40),
.y_offset = 15,
.y_offset = 12,
},
[SPECIES_STUNKY] =
{
@ -2392,7 +2392,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_DUSKNOIR] =
{
.size = MON_COORDS_SIZE(64, 64),
.y_offset = 4,
.y_offset = 2,
},
[SPECIES_FROSLASS] =
{
@ -2452,12 +2452,12 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_PHIONE] =
{
.size = MON_COORDS_SIZE(56, 40),
.y_offset = 12,
.y_offset = 8,
},
[SPECIES_MANAPHY] =
{
.size = MON_COORDS_SIZE(64, 40),
.y_offset = 13,
.y_offset = 10,
},
[SPECIES_DARKRAI] =
{
@ -2592,7 +2592,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_MUNNA] =
{
.size = MON_COORDS_SIZE(32, 32),
.y_offset = 16,
.y_offset = 14,
},
[SPECIES_MUSHARNA] =
{
@ -3737,7 +3737,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_WISHIWASHI] =
{
.size = MON_COORDS_SIZE(40, 24),
.y_offset = 20,
.y_offset = 15,
},
[SPECIES_MAREANIE] =
{
@ -4237,7 +4237,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_ARROKUDA] =
{
.size = MON_COORDS_SIZE(56, 32),
.y_offset = 17,
.y_offset = 13,
},
[SPECIES_BARRASKEWDA] =
{
@ -5249,7 +5249,7 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_ROTOM_MOW] =
{
.size = MON_COORDS_SIZE(56, 64),
.y_offset = 3,
.y_offset = 12,
},
// Giratina
[SPECIES_GIRATINA_ORIGIN] =
@ -5915,37 +5915,37 @@ const struct MonCoords gMonFrontPicCoords[] =
[SPECIES_MINIOR_CORE_RED] =
{
.size = MON_COORDS_SIZE(48, 40),
.y_offset = 16,
.y_offset = 14,
},
[SPECIES_MINIOR_CORE_ORANGE] =
{
.size = MON_COORDS_SIZE(48, 40),
.y_offset = 16,
.y_offset = 14,
},
[SPECIES_MINIOR_CORE_YELLOW] =
{
.size = MON_COORDS_SIZE(48, 40),
.y_offset = 16,
.y_offset = 14,
},
[SPECIES_MINIOR_CORE_GREEN] =
{
.size = MON_COORDS_SIZE(48, 40),
.y_offset = 16,
.y_offset = 14,
},
[SPECIES_MINIOR_CORE_BLUE] =
{
.size = MON_COORDS_SIZE(48, 40),
.y_offset = 16,
.y_offset = 14,
},
[SPECIES_MINIOR_CORE_INDIGO] =
{
.size = MON_COORDS_SIZE(48, 40),
.y_offset = 16,
.y_offset = 14,
},
[SPECIES_MINIOR_CORE_VIOLET] =
{
.size = MON_COORDS_SIZE(48, 40),
.y_offset = 16,
.y_offset = 14,
},
// Mimikyu
[SPECIES_MIMIKYU_BUSTED] =