Commit Graph

5 Commits

Author SHA1 Message Date
Eduardo Quezada
4c57b84cd9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602
# Conflicts:
#	graphics/pokemon/mawile/footprint.png
#	src/battle_gfx_sfx_util.c
#	src/fldeff_sweetscent.c
#	src/pokedex.c
2023-06-02 11:45:28 -04:00
LOuroboros
834ab37b2c Added Gen. 7 footprint sprites 2021-12-18 17:48:45 -03:00
Eduardo Quezada D'Ottone
80d8e4cfd4
Revert "Fix the 'bKGD: invalid index' error" 2021-10-17 07:32:49 -03:00
LOuroboros
1c59586e67 Fixed the 'bKGD: invalid index' error 2021-09-21 22:06:01 -03: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