Commit graph

7419 commits

Author SHA1 Message Date
GriffinR
a6ab2eb883
Merge branch 'master' into trailingSpaces 2021-09-23 21:39:21 -04: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
GriffinR
f8f7617946 Add TAG_NONE 2021-09-14 13:14:14 -04: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
PikalaxALT
0c2e9a5b4c
Merge pull request #1502 from GriffinRichards/clean-lilycovelady
Clean up Lilycove Lady
2021-09-09 16:04:08 -04:00
GriffinR
cbf8863e5b Clean up Lilycove Lady 2021-09-09 15:24:34 -04:00
ghoulslash
4f5c98d5b1
Merge pull request #1631 from LOuroboros/milotic
Fix Milotic's shiny palette
2021-09-07 06:34:15 -06:00
GriffinR
4037cf147b
Merge pull request #1500 from GriffinRichards/fix-healthboxgfx
Move more gfx symbols into gHealthboxElementsGfxTable
2021-09-06 21:47:44 -04:00
GriffinR
b183a793a1 Move more gfx symbols into gHealthboxElementsGfxTable 2021-09-06 17:45:10 -04:00
GriffinR
4dbaca9dc6
Merge pull request #1499 from froggestspirit/master
Identify unknown healthbox GFX
2021-09-06 16:54:28 -04:00
froggestspirit
71da126dbb case 2021-09-06 16:41:59 -04:00
froggestspirit
5f755757f9 Const rename 2021-09-06 11:40:40 -04:00
froggestspirit
f8a24cdd6f Identify unknown healthbox GFX 2021-09-06 10:42:05 -04:00
froggestspirit
73554ec88d Merge remote-tracking branch 'pret/master' 2021-09-06 10:32:14 -04: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
554210c5e3 Removed trailing spaces in the most relevant files
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03: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
GriffinR
63e6b914e4
Merge pull request #1497 from GriffinRichards/doc-hasmargin
Label swap line margin flag
2021-08-21 12:06:30 -04:00
GriffinR
8f5e2bbeba Label swap line margin flag 2021-08-21 11:04:28 -04: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
dfdcfc1568 Document remaining functions in cable_club 2021-08-15 16:22:15 -04:00
GriffinR
e01ae55c13 Start more link_rfu_2 documentation 2021-08-15 15:13:42 -04: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
GriffinR
cc51627465
Merge pull request #1489 from GriffinRichards/doc-playerpc
Document player pc
2021-08-11 18:59:58 -04:00