ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,088 Commits 1 Branch 0 Tags 235 MiB
caf6253ba3
Commit Graph

344 Commits

Author SHA1 Message Date
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
ultima-soul
1e283e9dbf
Merge pull request #551 from LOuroboros/gen5_footprints 
Added footprints for the Gen. 5 species
 2020-11-02 10:28:06 -08:00
ExpoSeed
3573c467e7
Merge pull request #552 from LOuroboros/gen4_footprints_corrections 
Corrected a few Gen. 4 footprints after accidentally screwing them up
 2020-11-01 20:59:24 -06:00
ultima-soul
1ec8282cd8
Merge pull request #545 from ExpoSeed/mega-pinsir-icon-fix 
Fix Mega Pinsir Icon
 2020-11-01 10:15:08 -08:00
LOuroboros
e948ffc8b7 Corrected a few Gen. 4 footprints after accidentally screwing them up 2020-11-01 12:24:34 -03:00
LOuroboros
7fe0e779f4 Review corrections 2020-11-01 12:01:07 -03:00
LOuroboros
7cf3c256cd Added footprints for the Gen. 5 species, thanks to Blackforest 2020-11-01 09:44:05 -03:00
ExpoSeed
c71f0ed1b7
Merge pull request #547 from LOuroboros/gen4_footprints 
Added footprints for the Gen. 4 species
 2020-10-31 22:37:41 -05:00
LOuroboros
781b8f919e Review changes 2020-10-30 17:41:50 -03:00
LOuroboros
79555e8a7e Fixed Bouffalant's sprite 2020-10-27 15:31:59 -03:00
LOuroboros
480a8cc751 I missed Buneary's footprint 2020-10-27 15:16:20 -03:00
LOuroboros
3d117c9127 8bpp bad 1bpp good 2020-10-27 15:07:28 -03:00
LOuroboros
6435158742 Added footprints for the Gen. 4 species 2020-10-27 09:38:04 -03:00
ExpoSeed
2668f86256 Fixed Mega Pinsir icon. Thanks Blackforest! 2020-10-27 00:34:04 -05:00
Eduardo Quezada
2c098d8294 Merge branch 'pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/data/pokemon/base_stats.h
 2020-10-26 20:06:37 -03:00
Eduardo Quezada
92728a1875 Added Ultimasoul's Forms from his FromID system. 2020-10-23 11:44:47 -03:00
ultima-soul
635432a2e4
Merge pull request #526 from LOuroboros/tsareena 
Corrected Tsareena's sprites
 2020-10-22 18:30:10 -07:00
ExpoSeed
3de4df5b76
Merge pull request #528 from LOuroboros/magnemite 
Fixed Magnemite's and Magneton's battle sprites
 2020-10-22 20:26:48 -05: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
LOuroboros
d005287c50 Fixed Magnemite's and Magneton's battle sprites 
Their normal back sprite palettes were glitchy. Discord users Jaizu and Blackforest fixed them
 2020-10-21 10:24:03 -03:00
LOuroboros
5ecac6ff95 Corrected Tsareena's sprites 
Some of its palettes were buggy as reported by Ryuhouji. This was fixed by Discord user Blackforest.
 2020-10-21 07:29:50 -03:00
ExpoSeed
81ac09af0b Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion 2020-10-12 12:45:42 -05:00
Evan
f4909b4d96 align pokenav task funcs and update some pokenav menu bg gfx files 2020-10-11 08:50:58 -06:00
ExpoSeed
bc4e992be2 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion 2020-10-11 00:10:12 -05:00
ExpoSeed
9c43bcb429 Delete accidentally pushed file 2020-10-05 23:33:36 -05:00
DizzyEggg
448599f53c Merge with master 2020-09-08 12:01:20 +02:00
PikalaxALT
c3f6c56e19
Merge pull request #1161 from GriffinRichards/doc-wallclock 
Document wall clock data
 2020-09-04 19:48:04 -04:00
GriffinR
1264c4615a
Merge pull request #1158 from GriffinRichards/doc-cablecar 
Document cable car
 2020-09-03 16:24:27 -04:00
GriffinR
4ad147f75d
Merge pull request #1156 from GriffinRichards/doc-rayscene 
Document Rayquaza cutscene
 2020-09-01 14:46:14 -04:00
GriffinR
778bdb4d30 Document wallclock data 2020-08-29 15:55:28 -04:00
GriffinR
71a066f945 Document cable car 2020-08-28 03:54:04 -04:00
GriffinR
38d4fc9c17 Clean up rayquaza scene documentation 2020-08-27 16:04:11 -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
22c1bf965a Finish documenting berry blender 2020-08-24 17:06:55 -04:00
GriffinR
0ff767a9b5 Start documenting berry blender 2020-08-22 19:39:39 -04:00
GriffinR
6c34effda9
Merge pull request #1138 from GriffinRichards/doc-contest 
Document contest
 2020-08-20 16:03:47 -04:00
PikalaxALT
3372993a63
Merge pull request #1133 from GriffinRichards/doc-pblock 
Document use_pokeblock
 2020-08-17 16:28:15 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR
c42c1ab8c1 Document contest appeal 2020-08-15 14:32:30 -04:00
GriffinR
25f45ffa84
Merge pull request #1125 from GriffinRichards/doc-namingscr 
Document naming screen
 2020-08-15 00:06:57 -04:00
GriffinR
ade49de329
Merge branch 'master' into doc-pblock 2020-08-12 19:49:55 -04:00
GriffinR
4f615b65e6 Continue documenting use_pokeblock 2020-08-11 13:56:17 -04:00
GriffinR
8b95e1964b
Merge pull request #1121 from GriffinRichards/doc-roulette 
Document roulette
 2020-08-10 17:18:09 -04:00
GriffinR
e947729d65 Start documenting use_pokeblock 2020-08-10 13:48:16 -04:00
LOuroboros
d37896d51b Merge branch 'pokemon_expansion' of https://github.com/dizzyeggg/pokeemerald into deoxys 2020-08-09 20:55:28 -03:00