65 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
d3a5921122 Review changes 3 2020-11-13 16:34:53 -03:00
Eduardo Quezada D'Ottone
26db02e95a Review changes 1 2020-11-13 15:36:36 -03:00
Eduardo Quezada D'Ottone
caf6253ba3 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
# Conflicts:
#	src/pokemon_icon.c
2020-11-10 19:37:02 -03:00
Eduardo Quezada D'Ottone
3849f7dd5d Female Eevee backsprite. 2020-11-06 16:45:25 -03:00
Eduardo Quezada D'Ottone
4d4b111327 Front pic gender differences for Eevee 2020-11-06 16:21:45 -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
LOuroboros
7cf3c256cd Added footprints for the Gen. 5 species, thanks to Blackforest 2020-11-01 09:44:05 -03:00
LOuroboros
6435158742 Added footprints for the Gen. 4 species 2020-10-27 09:38:04 -03:00
Eduardo Quezada
92728a1875 Added Ultimasoul's Forms from his FromID system. 2020-10-23 11:44:47 -03:00
Eduardo Quezada D'Ottone
38573ab402
Merge pull request #16 from LOuroboros/deoxys
Added the data of Deoxys' forms
2020-10-22 00:52:40 -03:00
DizzyEggg
448599f53c Merge with master 2020-09-08 12:01:20 +02:00
GriffinR
38d4fc9c17 Clean up rayquaza scene documentation 2020-08-27 16:04:11 -04:00
GriffinR
52b1251b48 Document second rayquaza scene 2020-08-27 15:43:27 -04:00
GriffinR
ba13e9ec95 Document first rayquaza scene 2020-08-27 15:43:18 -04:00
DizzyEggg
c2733236be Merge with master 2020-08-27 11:36:35 +02:00
BuffelSaft
06788896d2
Fix and Update Pokemon Sprites (#489)
* Fix broken sprites from Gen I-IV

Fix second frames with missing colors and some sprites having too many colors.

* Add more second frames

Added a second frame sprite for the following Pokemon: Beartic, Bouffalant, Cinccino, Galvantula, Golett, Golurk, Gurdurr, Minccino, Scolipede, Timburr, Zebstrika, Zekrom.
Fixed second frames for Chespin and Reshiram.

* Restore front sprites
2020-08-27 09:52:42 +02:00
GriffinR
95ea0e92e7 Start documenting rayquaza_scene 2020-08-25 17:49:42 -04:00
GriffinR
0e7f634b00 Wrap asm statements in NONMATCHING 2020-08-18 08:16:09 -04:00
GriffinR
b22709ee3d More slot machine data documentation 2020-07-28 14:29:44 -04:00
GriffinR
36a4764a78 Document some slot machine data 2020-07-26 02:15:59 -04:00
LOuroboros
dc67bd3749 A few things:
-Inserted the sprites of Deoxys' form
-Fixed mistakes that I made while adding their cries and sprites
-Tweaked the Y coord of Deoxys' Defense Form's back sprite
2020-07-23 14:34:01 -03:00
LOuroboros
e6f22f2993 Defined the paths for the sprites of Deoxys' forms 2020-07-23 13:12:26 -03:00
LOuroboros
383872ca92
Added the data of Zygarde's forms (#477)
* Defined species for Zygarde's 10% and Complete forms

* Defined the sprites for Zygarde's 10% and Complete forms

* Added coordinates and entries for the forms of Zygarde in the sprite data tables

* Set the InGame names of Zygarde's forms

* Added the base stats of Zygarde's forms

* Set the level up learnsets for the forms of Zygarde

* Defined the paths for the sprites of Zygarde's forms

* Linked the icons to the species of Zygarde's forms

* Added the icons of Zygarde's forms

* Fixed fuckups and inserted the icons of Zygarde's forms

* Added the cries of Zygarde's forms

* Tweaked the Y coordinate of Zygarde's 10% form's backsprite
2020-07-22 23:37:47 +02:00
DizzyEggg
88bdeed1a6 Merge with master 2020-04-15 14:40:16 +02:00
GriffinR
96958ba5e9 Drop unnecessary decor prefix 2020-04-13 13:04:22 -04:00
DizzyEggg
f95a335c0d Merge with master 2020-02-29 10:35:01 +01:00
GriffinR
172cb7bae9 Sync Unown and qmark mon folders with pokefirered 2020-02-25 14:18:28 -06:00
DizzyEggg
3c938d1809 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-02-23 12:42:21 +01:00
Eduardo Alvaro Quezada D'Ottone
70ebc6b55b
Lycanroc forms (#268)
* Midnight Lycanroc

* Dusk Lycanroc
2020-02-22 23:42:16 +01:00
GriffinR
689acd3613 Move slot machine data to src 2020-02-09 14:11:50 -06:00
Eduardo Alvaro Quezada D'Ottone
bb10a69f81
Busted Mimikyu (#254)
* Busted Mimikyu

* Fixed back sprite coords.
2020-02-08 19:32:01 +01:00
DizzyEggg
f1d1557a39 Merge with master 2020-01-12 15:06:52 +01:00
GriffinR
c85ca4b860 Standardize farfetchd spelling 2020-01-06 15:17:11 -06:00
DizzyEggg
f9cfc29f8f
Merge pull request #227 from SBird1337/pokemon_expansion
update gMonBackPicCoords, fix Xerneas PNG checksum
2020-01-01 15:15:18 +01:00
LOuroboros
d1d3ca5312 Various Forms Data (#226)
* Defined species for Shaymin's Sky Form and Giratina's Origin Form

* Defined the sprites for Shaymin's and Giratina's forms

* Added coordinates and entries for the forms of Shaymin and Giratina in the sprite data tables

* Set the InGame names for Shaymin's and Giratina's forms

* Added the base stats of Shaymin's and Giratina's forms

* Set the level up learnsets for the forms of Shaymin and Giratina

* Defined the paths of the sprites for the forms of Shaymin and Giratina

* Linked the icons to the species of Shaymin's and Giratina's forms

* Added the sprites of Shaymin's Sky Form and Giratina's Origin Form

* Added the icons of Shaymin's and Giratina's forms

* Fixed silly mistakes.

* Alright, fixed silly mistakes. For good now.

* Added the data for a lot of Pokémon's forms.
-Darmanitan Zen Mode
-Tornadus, Thundurus and Landorus Therian Forms
-Meloetta Pirouette Form
-Aegislash Blade Form
-Hoopa Unbound Form
-Minior Core Form
-Wishiwashi School Form

* Added the sprites of the Pokémon forms that were just inserted

* Added the sprites for the Black and White Forms of Kyurem
2020-01-01 15:07:56 +01:00
karathan
eea587f5c5 update gMonBackPicCoords, fix Xerneas PNG checksum 2020-01-01 03:18:15 +01:00
Pokestia
e4731b1289 Pokemon expansion (#211)
* Define species Meltan and Melmetal

Also shifted a few other species numbers

* Define Meltan and Melmetal Sprites

* Add Meltan and Melmetal coordinates and table entries

* Set Meltan and Melmetal ingame names

* Add Meltan and Melmetal base stats

* Add Meltan and Melmetal level up learnsets

* Set Meltan and Melmetal TM learnset

It is still blank because LGPE TMs don't match USUM TMs

* Define Meltan and Melmetal sprite paths

* Add Meltan and Melmetal sprite, icon and front animation

* Fix typo in bas stats

* Add Meltan and Melmetal pokedex entries

* Tab to space learnsets

* Tab to space pokedex text

This includes all mons with tabs in their dex entries.
2019-12-30 13:48:50 +01:00
LOuroboros
cbc50eac50 Defined the paths of the sprites for the Alolan Forms. 2019-11-13 11:45:38 -03:00
DizzyEggg
4c462a726e Merge with master and learnsets 2019-10-06 15:57:33 +02:00
GriffinR
6c9997a906 Document decor icons 2019-09-16 19:23:21 -05:00
DizzyEggg
54bc7d329e Cherrim 2019-06-16 09:27:42 +02:00
DizzyEggg
54150e3794 Revert "Cherrim sun form gfx"
This reverts commit cd09047c4f6400fa4b150350198efabbc648a6bc.
2019-06-15 14:16:11 +02:00
DizzyEggg
cd09047c4f Cherrim sun form gfx 2019-06-10 11:16:52 +02:00
DizzyEggg
1c60387968 Merge with master, placeholder back anims 2019-06-03 11:24:10 +02:00
Papa Cancer
e53ba4773d Documenting bags, berries and graphics
Bag graphics and berry graphics mostly documented
item_menu.c significantly documented
Bag structs documented and functions renamed to match formatting
2019-05-22 21:10:16 -05:00
DizzyEggg
fdb328fbd3 Gfx for megas 2019-04-29 14:27:36 +02:00
DizzyEggg
2d670fa803 Rotom forms and meowstic female 2019-04-23 13:00:40 +02:00
DizzyEggg
8cd03654b0 Icons for gen6 mons 2019-04-13 11:30:00 +02:00
DizzyEggg
51bb713aef Add Burmy Wormadam form gfx and data 2019-04-07 14:39:11 +02:00
DizzyEggg
9c6d3d33c7 Remove still pics 2019-04-04 16:12:55 +02:00