Eduardo Quezada D'Ottone
eccd2c4a65
Merge commit '1467ffa3d8ca71b8b91da815dcf120421759793c' into gen9-species-nomigration
2023-11-02 21:28:53 -04:00
Eduardo Quezada D'Ottone
1467ffa3d8
Added missing Alcremie forms ( #3469 )
...
* Alcremie form sprites
Co-authored-by: Blackforest92 <rico.anjaya@gmail.com>
# Conflicts:
# graphics/pokemon/alcremie/lemon_cream/front.png
# graphics/pokemon/alcremie/matcha_cream/back.png
# graphics/pokemon/alcremie/matcha_cream/front.png
# graphics/pokemon/alcremie/mint_cream/front.png
# graphics/pokemon/alcremie/ruby_cream/front.png
# graphics/pokemon/alcremie/salted_cream/front.png
# include/graphics.h
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info.h
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/footprint_table.h
# src/data/pokemon_graphics/front_pic_anims.h
# src/data/pokemon_graphics/front_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon.c
* Fixed cries
* Removed Todos
* Temp: all forms use the same icon
* Grouped form data + Fixed missing Level up and Teachable learnsets
* Added missing data for form changes and back animations
* Grouped defines together
* Fixed compile
---------
Co-authored-by: Alex <alexthenotes@gmail.com>
2023-10-29 20:30:56 +01:00
leo60228
a505afac1d
address review
2023-10-26 18:57:06 -04:00
kittenchilly
5cbcf60c7e
Begin some stuff
2023-10-26 17:34:18 -04:00
kittenchilly
86917f1453
Update species.h
2023-10-26 17:33:20 -04:00
Eduardo Quezada
ed3e2f8e09
Gen 9 form order
2023-10-23 13:30:32 -03:00
Eduardo Quezada
174ad11535
SPECIES_GIMMIGHOUL_CHEST
2023-10-23 12:09:44 -03:00
Eduardo Quezada
2e9e157cf8
SPECIES_DUDUNSPARCE_TWO_SEGMENT
2023-10-23 11:45:15 -03:00
Eduardo Quezada
be921c57fc
SPECIES_TATSUGIRI_CURLY
2023-10-23 11:26:50 -03:00
Eduardo Quezada
82bb758d19
SPECIES_PALAFIN_ZERO
2023-10-23 11:08:06 -03:00
Eduardo Quezada
792aee86ea
SPECIES_SQUAWKABILLY_GREEN_PLUMAGE
2023-10-23 10:55:16 -03:00
Eduardo Quezada
ff60b7ff73
Maushold Family of Three define
2023-10-23 10:24:47 -03:00
Eduardo Quezada
e6c5077d7c
Oinkologne Male define
2023-10-23 10:12:55 -03:00
Eduardo Quezada
a92a3256df
Fixed Paldean Tauros Combat Breed order and data names
2023-10-23 09:33:37 -03:00
Eduardo Quezada
f570d14f2d
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/gen9-species-nomigration
...
# Conflicts:
# include/constants/species.h
# sound/cry_tables.inc
# src/data/pokemon_graphics/enemy_mon_elevation.h
# src/data/pokemon_graphics/front_pic_anims.h
2023-10-23 09:23:32 -03:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names ( #3248 )
...
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
2023-10-23 12:59:15 +01:00
Eduardo Quezada D'Ottone
6585a62b13
Dynamax Cleanup ( #3435 )
...
* Mon animation names
* Moved indicator code so it follows the same standards as the other indicators
* Whitespace
* Fixed modern compile
* Fixed issue that caused Low Key Toxtricity learning Amped moves when Gigantamaxed
2023-10-23 11:39:22 +01:00
leo60228
87a03c3c73
Fix Paldean form order
2023-10-18 14:44:30 -04:00
leo60228
ba0534386d
Address review
2023-10-18 14:37:29 -04:00
leo60228
b3e5c3179f
Revert "reorder species.h"
...
This reverts commit d68eb27bbe906eb80c55dd2988c8af4e4970cf72.
2023-10-18 14:37:27 -04:00
leo60228
3e1ecec800
revert SPECIES_DARMANITAN_GALARIAN_* renames
2023-10-18 14:37:27 -04:00
leo60228
61d3cdd8da
revert separate SPECIES_UNOWN
2023-10-18 14:37:21 -04:00
Eduardo Quezada D'Ottone
6df433735e
reorder species.h
2023-10-18 14:37:01 -04:00
Eduardo Quezada D'Ottone
133ffc7260
Merge pull request #15 from Bassoonian/rhhspeciesreorder
...
Add gen 9 Pokémon data
(cherry picked from commit cd3e65f5c9
2023-10-18 14:33:56 -04:00
Eduardo Quezada
f830b0725a
GMAX -> GIGANTAMAX
2023-10-10 18:07:12 -03:00
AgustinGDLV
69fd63a922
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-21 09:56:58 -07:00
Alex
a870ec3c22
enamorus_t cry, basculegionf sprite, new typhlosion back sprite
2023-02-23 15:20:12 +01:00
AgustinGDLV
38f462551f
pulled rhh master, i hate merge conflicts
2023-02-22 18:50:54 -08:00
Eduardo Quezada D'Ottone
7622d84a4f
Revert "Removed Unown hack"
2023-01-07 11:39:56 -03:00
Eduardo Quezada
74d8c587fe
Merge branch 'RHH/upcoming' into RHH/pr/cleanup/unown
...
# Conflicts:
# src/data/pokemon/species_info.h
# src/data/pokemon_graphics/front_pic_anims.h
2023-01-04 17:58:54 -03:00
Eduardo Quezada
4bac880042
Removed Unown hack
2022-11-25 16:55:53 -03:00
Eduardo Quezada
011ec16f1e
Organized conffig files into their own folder and cleaned up
2022-11-14 11:03:49 -03:00
AgustinGDLV
caaec99e77
added data and graphics for gigantamax mons
2022-10-27 16:18:37 -07:00
Eduardo Quezada
df4c065ea6
Separated P_NEW_POKEMON into sections by generation.
...
Sizes:
- GEN_3 15.690.076 bytes
- GEN_4 17.480.816 bytes
- GEN_5 19.544.944 bytes
- GEN_6 20.907.332 bytes
- GEN_7 22.233.288 bytes
- GEN_8 23.605.744 bytes
2022-08-30 12:50:59 -04:00
Blackforest92
07a07ddc8d
Update to latest master branch + allow Reveal Glass to work with Enamorus
2022-08-24 15:00:48 +07:00
Eduardo Quezada
75ac960365
Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms
2022-08-22 17:27:21 -04:00
Blackforest92
8c88e8a9b7
Legends Arceus Pokemon 95% Finished
2022-07-03 17:15:37 +07:00
Eduardo Quezada D'Ottone
84d713a50f
Legendary and Mythical flags
2022-04-14 18:44:20 -04:00
ultima-soul
84a7f960c8
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2022-02-28 23:37:41 -08:00
GriffinR
5d033c2e4d
Convert pokedex defines to enums
2022-01-05 12:18:49 -05:00
Eduardo Quezada D'Ottone
3bbaf5a15d
Optimized SpeciesHasGenderDifference into Base Stat flag
2022-01-01 19:24:34 -03:00
amiosi
663cc5b15c
oricorio...
2021-02-03 13:02:13 -05:00
amiosi
47e1d6b790
MIMEJR -> MIME_JR
2021-02-02 12:36:05 -05:00
ultima-soul
c675c92a1d
Add Gen 8 Pokemon data.
2020-12-16 12:57:36 -08:00
GriffinR
f95192ed87
Define terminal species IDs relatively
2020-12-08 00:45:05 -05:00
ExpoSeed
f2259d7ce1
Remove IS_ULTRA_BEAST
2020-11-24 22:44:00 -06:00
ExpoSeed
3adf316574
Add mon flags
2020-11-24 22:42:42 -06:00
Eduardo Quezada D'Ottone
cb6802f01e
Standarized naming schemes.
2020-11-06 20:15:28 -03:00
Eduardo Quezada D'Ottone
0c6dc6abab
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# graphics/pokemon/burmy/footprint.png
# graphics/pokemon/gastrodon/footprint.png
# graphics/pokemon/rotom/footprint.png
# graphics/pokemon/shellos/footprint.png
# graphics/pokemon/wormadam/footprint.png
# include/constants/species.h
# src/data/pokemon/base_stats.h
2020-11-03 00:13:51 -03:00
Eduardo Quezada
ed6fd6c964
Fixed compile
2020-10-26 22:37:01 -03:00
