Commit graph

7018 commits

Author SHA1 Message Date
SonikkuA-DatH
377e46e2ec
For Magnemite sprite errors
Fixing Magnemite eye to use whites
Also fix back pixel
2021-10-18 17:49:08 -07:00
ghoulslash
ba741421d9
Merge pull request #1777 from AsparagusEduardo/fix_pyroarF
Fixed Female Pyroar's sprite position
2021-10-17 22:04:09 -04:00
Eduardo Quezada D'Ottone
3cdf736eb8 Merge branch 'PokemonExpansion' into fix_pyroarF
# Conflicts:
#	graphics/pokemon/pyroar/backf.png
2021-10-17 19:38:20 -03:00
BuffelSaft
0b7072e007
Merge pull request #1780 from rh-hideout/revert-1666-bKGD_PE
Revert "Fix the 'bKGD: invalid index' error"
2021-10-17 23:49:26 +13:00
Eduardo Quezada D'Ottone
80d8e4cfd4
Revert "Fix the 'bKGD: invalid index' error" 2021-10-17 07:32:49 -03:00
Eduardo Quezada D'Ottone
9986591b6f Fixed Female Pyroar's sprite position 2021-10-16 17:22:24 -03:00
Eduardo Quezada D'Ottone
2e8ad12857
Merge pull request #1648 from BuffelSaft/genders-in-PSS
PSS supports gender differences (kinda)
2021-10-15 08:55:44 -03:00
BuffelSaft
3631561638 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald into genders-in-PSS 2021-10-15 16:17:55 +13:00
BuffelSaft
7610a9abad Fix bug with female icon sprites
Thanks to AsparagusEduardo for this code!
2021-10-15 16:17:08 +13:00
ExpoSeed
7bce603039
Merge pull request #1714 from ultima-soul/form_change_table_fixes
Refactor Form Change Table Code
2021-10-05 15:37:51 -05:00
ultima-soul
ce867cd0e0 Remove unused species variable from TryItemUseFormChange functions. 2021-10-03 10:58:14 -07:00
ultima-soul
78d2215196 Improve and refactor some form change code. Separated out ability checks into their own methods. Change FORM_ITEM_USE_TIME to specify time of day instead of hardcoding. 2021-10-03 10:16:09 -07:00
Eduardo Quezada D'Ottone
d220d25aab
Merge pull request #1666 from LOuroboros/bKGD_PE
Fix the 'bKGD: invalid index' error
2021-09-26 11:39:26 -03:00
Eduardo Quezada D'Ottone
c574825974
Merge pull request #1689 from LOuroboros/itemUseDay
Added a day time exclusive equivalent to `FORM_USE_ITEM`
2021-09-25 22:11:51 -03:00
LOuroboros
234f3290c3 Added a day time exclusive equivalent to FORM_USE_ITEM
Primarily for Shaymin, since it can only change its form with the Gracidea during the day.
Special thanks to AsparagusEduardo.
2021-09-25 22:00:10 -03:00
Eduardo Quezada D'Ottone
082dd1cb23
Merge pull request #1685 from LOuroboros/formIcon
Fixed form icon subpriority
2021-09-25 20:07:26 -03:00
LOuroboros
87bc1f502a Fixed form icon subpriority 2021-09-25 19:58:12 -03:00
LOuroboros
6b2d756829 Fixed and pngcrush'd Bastiodon's icon
Thanks to Cynderquil for fixing it.
2021-09-23 20:40:33 -03:00
Eduardo Quezada D'Ottone
f9d1375451
Merge pull request #1375 from ExpoSeed/PE/form-change-table
Form change table
2021-09-22 00:04:26 -03:00
LOuroboros
1c59586e67 Fixed the 'bKGD: invalid index' error 2021-09-21 22:06:01 -03:00
Eduardo Quezada D'Ottone
bf8d285eed
Merge pull request #1601 from LOuroboros/gen5_2nd_frames
Added missing 2nd frames for Gen. 5 species
2021-09-21 21:44:42 -03:00
LOuroboros
8e38d72293 Fix Male Unfezant's anim_front.png 2021-09-21 20:53:18 -03:00
LOuroboros
afc55994a9 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into gen5_2nd_frames 2021-09-21 20:45:17 -03:00
Eduardo Quezada D'Ottone
08d3c31abe
Merge pull request #1584 from Blackforest92/pokemon_expansion
Port missing Gen8 icons from DPE
2021-09-20 22:48:57 -03:00
Eduardo Quezada D'Ottone
18d91cc935
Merge pull request #1647 from BuffelSaft/gender-diff-fixes1
Show gender differences in evo scene
2021-09-20 22:03:23 -03:00
Eduardo Quezada D'Ottone
d34c311566
Merge pull request #1646 from BuffelSaft/gender-diffs
Add sprites for major gender differences
2021-09-20 21:43:12 -03:00
Eduardo Quezada D'Ottone
d32df119a2
Merge pull request #1650 from LOuroboros/unown
Fix SPECIES_UNOWN
2021-09-20 21:14:11 -03:00
LOuroboros
acf755fb9c Fixed SPECIES_UNOWN 2021-09-11 04:35:16 -03:00
BuffelSaft
dc5259ed3f PSS supports gender differences (kinda)
Update the PSS to show gender-specific icons for mons that have them. Comes with a small but harmless bug - could use some suggestions for fixing it!
2021-09-11 16:59:39 +12:00
BuffelSaft
4aa7c096b7 Show gender differences in evo scene 2021-09-11 16:30:09 +12:00
BuffelSaft
db928a1329 Data entry for new sprites
Add sprite defines, entries to gender tables, etc.
2021-09-11 14:12:41 +12:00
BuffelSaft
0f5444d331 Add sprites and icons for major gender differences
Credit to MrDollSteak for the sprites - I palette swapped the hippos and made some of the icons, but everything else is MrDS!
2021-09-11 13:52:09 +12:00
ultima-soul
fd6f7eadbb
Merge pull request #1645 from BuffelSaft/sandshrew
Add alolan Sandshrew line to gSpeciesToNationalPokedexNum
2021-09-09 19:13:06 -07:00
BuffelSaft
b598efa956 Add alolan Sandshrew line to gSpeciesToNationalPokedexNum 2021-09-10 13:47:53 +12:00
ghoulslash
4f5c98d5b1
Merge pull request #1631 from LOuroboros/milotic
Fix Milotic's shiny palette
2021-09-07 06:34:15 -06:00
DizzyEggg
b0a1153a2b
Merge pull request #1600 from LOuroboros/gen6_footprints
Added footprints for Gen. 6 species
2021-09-06 10:36:46 +02:00
LOuroboros
7725ea0878 Fixed Milotic's shiny palette
Credits to Jaizu.
2021-09-06 04:13:45 -03:00
ghoulslash
03e21bb27e
Merge pull request #1591 from BuffelSaft/mienshao
Fix Mienshao's front sprite
2021-09-01 05:58:51 -06:00
LOuroboros
87461db04d Added missing 2nd frames for Gen. 5 species
Also made certain Pokémon such as Zebstrika or Galvantula use their 2nd frame.
2021-08-23 08:28:58 -03:00
LOuroboros
4b88b99e1b Fixed Hoopa's footprint 2021-08-23 06:45:04 -03:00
LOuroboros
5c1d7e52dc Added footprints for Gen. 6 species 2021-08-23 06:28:10 -03:00
ExpoSeed
a6f6be4e54
Merge pull request #1598 from LOuroboros/bronzor
Corrected Bronzor's evo level
2021-08-22 21:29:59 -05:00
LOuroboros
a0a888698e Corrected Bronzor's evo level 2021-08-22 23:19:26 -03:00
ExpoSeed
5493333ff5
Merge pull request #1594 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
2021-08-16 19:47:41 -05:00
ultima-soul
76a7a2720d Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-08-16 16:10:59 -07:00
GriffinR
ee5eee6ccc
Merge pull request #1493 from GriffinRichards/doc-itemmenu2
Document item menu
2021-08-15 12:01:57 -04:00
PikalaxALT
c7fc6ac893
Merge pull request #1492 from Kurausukun/cgbsound
Fix CgbSound Fakematches (Thanks to Revo)
2021-08-11 19:55:44 -04:00
ultima-soul
3f75a58137 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-08-11 16:55:29 -07:00
GriffinR
034b7f0513 Fix conflicting PC window names 2021-08-11 19:14:50 -04:00
GriffinR
80348e7188
Merge branch 'master' into doc-itemmenu2 2021-08-11 19:01:47 -04:00