Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,500 Commits 1 Branch 0 Tags
Commit Graph

723 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
93c7a70caa
Species Simplifier™ - Part 2 (#3546) 
* Gen 1 and 2 families + fixes

- Fixed mixed identation.
- Fixed Azurill being Normal/Water type in Pre-Gen6 setting.
- Fixed Wobbuffett being before Wynaut
- Fixed Dudunsparce's macro being out of order

* Updated macros of Megas that shared held item with base forms

* Gen 3 families

* Separated Latis macro

* Gen 4 families

* Moved Misc Info to the top of arrays

* Renamed FAMILY_x to P_FAMILY_x

* Gen 5 families

* Gen 6 families

* Gen 7 families

* Gen 8 families

* Gen 9 families

* Mega Evolutions

* Gigantamax Form toggles

* Alolan Forms

* Galarian Forms

* Added missing comments

* Hisuian Forms

* Paldean Forms

* Fixed missing Paldean form flags

* Fixed order

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-14 16:40:26 +01:00
kittenchilly
c1cdc320bb
Implement Rotom Catalog and Zygarde Cube (#3284) 
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-11-13 17:46:25 -03:00
Frank DeBlasio
b5b67973bd
Fixes Stantler's evolution's boolean (#3548) 
* Stantler's evolution now has the proper gen boolean

* Fixed comment for new evo methods
 2023-11-10 00:11:29 +01:00
Frank DeBlasio
33815079ae
Added missing cross-gen evolutions (#3547) 
* Added missing cross-gen evolutions

* Added forms for evos

* Converted some EVO_NONEs into EVO_MOVE

* Moved Ursaring's evolution up

* Added evolution methods for Dudunsparce and Maushold
 2023-11-09 23:29:22 +01:00
Eduardo Quezada D'Ottone
b29538f23d
Species Simplifier™ - Part 1 (#3544) 
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
 2023-11-09 11:43:35 -03:00
Alex
4b3c96a89b
Adds ability Zero to Hero (#3542) 2023-11-09 08:25:46 -03:00
Alex
954f67a29f
Fixes Dragon Tail and Pumpkaboo spelling (#3541) 2023-11-07 18:19:46 +01:00
leo60228
4863fb8a6b
wrap ogerpon dex entry to 4 lines 2023-11-03 22:18:55 -04:00
Eduardo Quezada D'Ottone
820be61c9f
Merge branch 'RHH/pr/upcoming/reorderMonGraphics' into RHH/review/gen9mon-4 2023-11-02 21:32:23 -04:00
kittenchilly
5ccef18a6f friendship = 50 -> friendship = STANDARD_FRIENDSHIP 2023-11-02 21:30:11 -04:00
Eduardo Quezada D'Ottone
eccd2c4a65
Merge commit '1467ffa3d8ca71b8b91da815dcf120421759793c' into gen9-species-nomigration 2023-11-02 21:28:53 -04:00
kittenchilly
c0c100d90d
Base friendship Gen 8+ config (#3491) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-30 16:45:52 -03:00
leo60228
a7e604e953
correct iron leaves dex entry 2023-10-30 12:31:18 -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
Bassoonian
cd9ef3a566 Formatting fix 2023-10-28 16:34:11 +02:00
Bassoonian
f472d768dd Rename Undiscovered to No Eggs Discovered 2023-10-28 16:32:55 +02:00
Eduardo Quezada
6d128a71b2 Fixed compile when Gen 9 is disabled 2023-10-28 10:54:20 -03:00
leo60228
7e3f11709d
kitakami dex entries 2023-10-27 01:33:31 -04:00
leo60228
a505afac1d
address review 2023-10-26 18:57:06 -04:00
kittenchilly
8fefdbe914
Evo and form changes 2023-10-26 17:34:20 -04:00
kittenchilly
3a9172de06
It can build now 2023-10-26 17:34:20 -04:00
kittenchilly
bb855f965c
Almost done with data 2023-10-26 17:34:20 -04:00
kittenchilly
5cbcf60c7e
Begin some stuff 2023-10-26 17:34:18 -04:00
leo60228
5f2b6f57f7
Merge branch 'upcoming' into gen9-species-nomigration 2023-10-26 17:31:31 -04:00
kittenchilly
a8632f0fc5
Update PLA Pokemon data to correct values (#3458) 
* Fix PLA Pokemon data to use correct values

* oops, cant forget basculin white stripe

* Update level_up_learnsets.h

* Update species_info.h
 2023-10-26 22:45:33 +02:00
Eduardo Quezada
1137d54b61 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	asm/macros/battle_script.inc
#	src/battle_script_commands.c
 2023-10-23 17:36:42 -03:00
Frank DeBlasio
bac135c6e8
Gave Razor Fang EVO_HELD_ITEM type/fieldUseFunc properties (#3456) 2023-10-23 17:03:31 -03:00
Eduardo Quezada
5660ac9495 Added new mon to pokedex orders 2023-10-23 14:19:40 -03: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
7b089a3aa1 Fixed Palafin Hero's Sp. Defense 2023-10-23 12:04:49 -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
fcc18c2ef0
correct paldean wooper type 2023-10-22 19:15:55 -04:00
leo60228
ba0534386d
Address review 2023-10-18 14:37:29 -04:00
leo60228
4e8ae5965e
make sure Tauros-Paldea forms are defined properly without P_GEN_9_POKEMON 2023-10-18 14:37:01 -04:00
leo60228
e10acf8b2d
gen 9 form learnsets 2023-10-18 14:37:00 -04:00
leo60228
5e0ff4ab52
gen 9 form learnset pointers 2023-10-18 14:37:00 -04:00
leo60228
ca931d09e9
form species info 2023-10-18 14:37:00 -04:00
leo60228
b5be823e3b
gen 9 forms (learnsets still missing) 2023-10-18 14:36:59 -04:00
Eduardo Quezada D'Ottone
a502427a7f
Merge pull request #18 from AlexOn1ine/speciesReorderItems 
(cherry picked from commit 6dc58dcc1797f8b72170c2c104c9cdf9b53c7b50)
 2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone
c221c67202
Merge pull request #16 from AlexOn1ine/speciesReorder 
(cherry picked from commit e081d2b7730d2a7554b88af3a39ba3a2c0f5ba01)
 2023-10-18 14:34:00 -04:00