ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-18 19:48:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,647 Commits 1 Branch 0 Tags
Commit Graph

112 Commits

Author SHA1 Message Date
ultima-soul
425746763a Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 20:08:43 -07:00
ultima-soul
f3f4d8e608 Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 19:52:20 -07:00
ultima-soul
eedd374a5f
Merge pull request #1420 from Blackforest92/pokemon_expansion 
Added missing gen8 battle sprites and available icons and various fixes
 2021-05-24 21:13:12 -07:00
Blackforest92
d74492b591 Returning Alcremie back to monkey 2021-05-25 10:57:06 +07:00
LOuroboros
0bc8ed59f5 Wings -> Feathers 2021-05-17 21:58:17 -03:00
ultima-soul
be7acc919a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-04-03 21:53:29 -07:00
ultima-soul
4a81102a46 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-02 13:57:19 -07:00
ultima-soul
b8721034ef Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-02 13:42:05 -07:00
GriffinR
dea07dc865 Standardize intro gfx names 2021-03-29 20:48:48 -04:00
GriffinR
c86cc8b371 Document intro, start intro_credits/credits 2021-03-28 23:13:56 -04:00
Blackforest92
badf8945d8 Added missing gen8 battle sprites and available icons - Fix Arceus, Palkia, Kyurem White and Black - Implement 1 tile 10 palettes system for Alcremie 2021-03-14 18:31:24 +07:00
ultima-soul
46e853c13b Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-02-03 16:23:23 -08:00
amiosi
762dcb8a7c cry fixes, type null 2021-02-03 14:10:39 -05:00
amiosi
b84f952f32 mistaken MrRime change 2021-02-03 13:09:09 -05:00
amiosi
418da6158b last of the cries 2021-02-03 12:57:56 -05:00
amiosi
032f8ac834 tapus pls 2021-02-02 14:43:12 -05:00
amiosi
9c2c337e6f tapu case 2021-02-02 14:24:15 -05:00
amiosi
f700004188 proper CamelCase 2021-02-02 14:21:00 -05:00
Evan
4912bc1d25 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2021-01-11 17:15:41 -07:00
ExpoSeed
10f4b48215 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-01 14:14:51 -08:00
ExpoSeed
208e0abe04 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2020-12-31 18:44:43 -06:00
ultima-soul
c675c92a1d Add Gen 8 Pokemon data. 2020-12-16 12:57:36 -08:00
Evan
a0ae0ece53 add ultranecrozium-z and update z crystal data 2020-12-08 09:55:50 -07:00
Evan
8a56a52666 update z crystal descriptions 2020-12-01 17:49:43 -05:00
Evan
539a88207e add z crystal and z ring 2020-11-29 10:00:03 -05:00
Ashley Coleman
0f04944b81 Rename graphics files for COOLTRAINER to match define 2020-11-26 11:05:02 -08:00
LOuroboros
1f33a030ac Fixed the pal. of Nu-Arceus' Fighting and Flying forms 2020-11-16 22:05:43 -03:00
LOuroboros
ae4525d170 Fixed the pal. of Arceus' Fighting and Flying forms 2020-11-16 18:39:49 -03:00
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
Evan
d64b926469 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2020-10-19 11:22:41 -06:00
DizzyEggg
448599f53c Merge with master 2020-09-08 12:01:20 +02:00
DizzyEggg
271219f962 Merge with master 2020-09-08 12:00:51 +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
DizzyEggg
35559d6b71 Merge with master 2020-08-27 10:58:31 +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