kittenchilly
244ca0be95
Add custom female icon sprites for Pikachu and Wobbuffet ( #3506 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-11-01 18:49:44 -03:00
Bassoonian
15e038cd30
Decapitalise Alcremie file names ( #3488 )
2023-10-30 10:53:26 -03:00
Eduardo Quezada D'Ottone
1467ffa3d8
Added missing Alcremie forms ( #3469 )
...
* Alcremie form sprites
Co-authored-by: Blackforest92 <rico.anjaya@gmail.com>
# Conflicts:
# graphics/pokemon/alcremie/lemon_cream/front.png
# graphics/pokemon/alcremie/matcha_cream/back.png
# graphics/pokemon/alcremie/matcha_cream/front.png
# graphics/pokemon/alcremie/mint_cream/front.png
# graphics/pokemon/alcremie/ruby_cream/front.png
# graphics/pokemon/alcremie/salted_cream/front.png
# include/graphics.h
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info.h
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/footprint_table.h
# src/data/pokemon_graphics/front_pic_anims.h
# src/data/pokemon_graphics/front_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon.c
* Fixed cries
* Removed Todos
* Temp: all forms use the same icon
* Grouped form data + Fixed missing Level up and Teachable learnsets
* Added missing data for form changes and back animations
* Grouped defines together
* Fixed compile
---------
Co-authored-by: Alex <alexthenotes@gmail.com>
2023-10-29 20:30:56 +01:00
Katy
efae521646
Gen7 Sprites/Animations For Species ( #3426 )
2023-10-28 23:47:58 -03:00
kittenchilly
1acaf7f869
Fixed icons
2023-10-26 17:34:21 -04:00
kittenchilly
ad210c5170
Update icon.png
2023-10-26 17:34:21 -04:00
kittenchilly
91b4659d5c
Ogerpon sprites
2023-10-26 17:34:21 -04:00
kittenchilly
d9ccc80b31
Sprites
2023-10-26 17:34:21 -04:00
leo60228
95aa3028bb
updated great tusk sprite
2023-10-25 00:23:22 -04:00
leo60228
f6e5076dc0
add new sprites
2023-10-24 23:20:59 -04:00
leo60228
176dec6e6f
new tinkaton sprite
2023-10-23 18:19:37 -04:00
leo60228
95e0dabfa3
icon/palette fixes
2023-10-23 18:16:48 -04:00
leo60228
1359df7f86
new iron bundle and tinkatink sprites
2023-10-23 17:53:25 -04:00
Alex
0756dc1d4a
coords and roaring moon
2023-10-23 16:16:11 -04:00
Alex
d1165c0471
A few better sprites
2023-10-23 16:14:06 -04:00
Eduardo Quezada
f570d14f2d
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/gen9-species-nomigration
...
# Conflicts:
# include/constants/species.h
# sound/cry_tables.inc
# src/data/pokemon_graphics/enemy_mon_elevation.h
# src/data/pokemon_graphics/front_pic_anims.h
2023-10-23 09:23:32 -03:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names ( #3248 )
...
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
2023-10-23 12:59:15 +01:00
leo60228
ba0534386d
Address review
2023-10-18 14:37:29 -04:00
Eduardo Quezada D'Ottone
a502427a7f
Merge pull request #18 from AlexOn1ine/speciesReorderItems
...
(cherry picked from commit 6dc58dcc17
2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone
c221c67202
Merge pull request #16 from AlexOn1ine/speciesReorder
...
(cherry picked from commit e081d2b773
2023-10-18 14:34:00 -04:00
Eduardo Quezada
c0540a3559
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
...
# Conflicts:
# include/battle.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
2023-10-15 00:30:00 -03:00
kittenchilly
a795148068
Add Pikachu World Cap mini icon ( #3401 )
2023-10-11 11:02:28 +02:00
Eduardo Quezada
f830b0725a
GMAX -> GIGANTAMAX
2023-10-10 18:07:12 -03:00
Eduardo Quezada
92301398bc
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
...
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle.h
# include/battle_controllers.h
# include/battle_interface.h
# include/config/battle.h
# include/constants/battle.h
# include/constants/battle_anim.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# include/data.h
# include/random.h
# sound/cry_tables.inc
# src/battle_anim_new.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/species_info.h
# src/data/text/move_names.h
# test/test_runner_battle.c
2023-10-09 16:51:41 -03:00
Ariel A
8df538479a
Merge branch 'master' into followers
2023-09-03 17:39:35 -04:00
Eduardo Quezada D'Ottone
76075ffe57
Revert unneeded sprite changes from 3051 ( #3205 )
2023-08-25 16:33:15 -04:00
CyanSMP64
ef69021f0f
some more tweaks by mrds
2023-08-24 13:00:31 +12:00
CyanSMP64
fd37946c1d
resize golduck
2023-08-22 20:31:13 +12:00
CyanSMP64
4e5809a0d0
tweak graveler, pikachu
2023-08-20 22:08:54 +12:00
CyanSMP64
60a2878f8f
tweak growlithe, slowbro, poliwag
2023-08-19 16:15:20 +12:00
CyanSMP64
c33660e00f
fix arcanine and zard
2023-08-19 15:37:41 +12:00
CyanSMP64
ec24754489
fix arcanine, change bg colour of green pokemon
2023-08-18 17:24:30 +12:00
CyanSMP64
74de0ef3ca
set background colour
2023-08-16 13:58:31 +12:00
CyanSMP64
0c27db10d6
Review mon sprites 0001-0080
2023-08-15 20:24:07 +12:00
Eclipse
c76e5deb9f
Fixed Wailord icon ( #3183 )
2023-07-30 10:08:56 -04:00
Eclipse
ca792d43cc
Gender differences sprites, final part ( #3122 )
...
* The last survivors
* Tweaked Numel, Milotic and Relicanth
Updated their sprites according to their current depictions.
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-07-18 21:31:22 -04:00
CyanSMP64
219ac7830c
Update female Alakazam's front sprite design ( #3149 )
2023-07-18 12:56:15 -04:00
Eclipse
fb8989414f
Fixed Mega Venasaur icon ( #3137 )
2023-07-16 02:40:21 -04:00
SonikkuA-DatH
6382640f8a
Castform, Cherrim Sun, Spinda, and Spheal Graphical Tweaks ( #3127 )
...
* Casrform graphics. Palette changes, edited backs, and 2 Frame anims
* Castform Graphics
* Cherrim graphics, and Castform redefinitions
* Spheal and Spinda Graphic edits. Spheal mouth adjustment, Spinda 2 frame and palette
* Revised Spinda Spot drawing function, removed tabs
* Animations for Castform forms, Spinda, Cherrim Sun, and Spheal set
* Spacing
* Forgot shiny pal. Fixed
* Delete .vs directory
* remove vs ref
2023-07-14 11:45:40 -04:00
GriffinR
f4111d8082
Sync castform folder organization
2023-07-09 14:57:51 -04:00
Eduardo Quezada
1562280bce
Fixed SPECIES_NONE icon
2023-07-07 14:50:01 -04:00
Eduardo Quezada
adfc0af372
Mon graphics are now loaded depending on their availability
...
- If it has a female sprite/palette, it's loaded.
- If it the species is enabled and it has a sprite/palette, it's loaded.
- Otherwise, load the SPECIES_NONE graphics.
2023-07-07 14:36:30 -04:00
Eduardo Quezada D'Ottone
862602233d
Gender differences sprites, part 3 ( #3095 )
2023-07-04 11:36:24 -04:00
SubzeroEclipse
c18ac55016
Tweaked Houndoom
...
Edited both male and female Houndoom sprites to make female's horns thinner.
2023-07-03 22:10:56 +02:00
SubzeroEclipse
5c98b9b427
Fixed Quagsire and Nuzleaf
...
Tweaked Quagsire female back and Nuzleaf to make their differences a bit more noticeable and faithful to the originals.
2023-07-03 18:12:39 +02:00
SubzeroEclipse
49e7893ed2
Fixed Meganium shiny
...
There was a mismatch between the normal and the shiny that I didn't notice at first, so the regular palette was fixed. Thanks to CyanSixFour for pointing that out.
2023-07-02 07:28:08 +02:00
SubzeroEclipse
23d51df7c0
Added Hisuian Sneasel
2023-07-01 11:16:31 +02:00
SubzeroEclipse
d202bdd09c
Added even more gender difference sprites, 2/2
2023-07-01 10:25:17 +02:00
Eduardo Quezada D'Ottone
2100a760ad
A selection of animation frames (redone) ( #3090 )
...
* Applin Family
* Placeholder single frames to macro
* Stufful/Bewear
* Chewtle/Drednaw
* Rookidee/Corvisquire/Corviknight
* Rolycoly/Carkol/Coalossal
* Missing animations
* Grubbin/Charjabug/Vikavolt
* Turtonator and Wimpod/Golisopod
* Jangmo-O/Hakamo-O/Kommo-O
* Pyukumuku and Dewpider/Araquanid
* Fixed Charjabug/Vikavolt palettes
* Pincurchin and Sizzlipede/Centiscorch
* Alolan Exeggutor and Salandit/Salazzle
* Reverted PLACEHOLDER_ONE_FRAME_ANIMATION for a separate PR
* Forgot Pyukumuku's animation
2023-06-30 14:13:42 +02:00
SubzeroEclipse
0733e0908c
Added even more gender difference sprites, 1/2
2023-06-30 10:40:46 +02:00
Eduardo Quezada D'Ottone
81e59ace25
Cleaned up remaining Castform hack stuff ( #3063 )
...
* Removed gCastformFrontSpriteCoords
* Removed sCastformElevations and IsCastformForm
* Removed sCastformBackSpriteYCoords and castformPalette in BattleStruct
* Scrubbed unused BS commands
* Removed B_ANIM_CASTFORM_CHANGE and BattleForm constants
* Removed redundant function in Pokémon Debug menu
* Removed handling in animation scripts
* Removed gBattleMonForms
* Reduced MAX_MON_PIC_FRAMES to 2
* Removed Castform/Cherrim makefile stuff
* Fixed weather form change tests not checking species.
* Fixed Castform palettes after Lunos' PR
2023-06-30 09:58:07 +02:00
Eclipse
fc52414383
Added many more gender differences sprites ( #3082 )
...
Added sprites for the remaining Gen1 mons and a couple of evolutions.
2023-06-27 21:11:01 -04:00
Eclipse
a44af6f06f
Gender differences sprites, part 1 ( #3070 )
...
* Added some gender difference sprites
Added sprites for:
- Pikachu/Raichu
- Doduo/Dodrio
- Goldeen/Seaking
- Xatu
- Politoed
- Meditite/Medicham
- Gible/Gabite/Garchomp
NOTE: I had to tweak Doduo's palette file because it wasn't matching the normal one and a result Doduo's beak looked weird.
* Swapped Pikachu sprites
Replaced them with the ones provided by CyanSixFour because they looked better than the ones that I had.
* Added Gloom and Vileplume
* Fixed Pikachu forms
Edited the macros so that only base Pikachu would show different forms based on gender. Big thanks to AsparagusEduardo for helping with this.
* Swapped a few more sprites
Replaced Goldeen (female back), Politoad (female back), Medicham (female all) sprites with those provided by CyanSixFour because they looked better. Also tweaked my male Meditite back
2023-06-26 19:04:19 -04:00
ghoulslash
5de84d9a2f
Killed the bKGD invalid index warnings and fixed the bit depth of the species sprites ( #3051 )
2023-06-24 13:27:40 -04:00
LOuroboros
d385ae3d5e
Killed the bKGD invalid index warning
...
Special thanks to:
-Blackforest for the tips on how to go about fixing the sprites with GIMP.
-Dat.S.H for a tip on how to make the conversion process easier to perform.
-Psf for actually going and doing it.
2023-06-07 23:13:07 -03:00
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
AgustinGDLV
d133564e21
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-05-16 21:57:06 -07:00
AaghatIsLive
a89288e30e
Fix Illumise pallete ( #2995 )
2023-05-12 08:24:47 -04:00
AgustinGDLV
aec51b5b04
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-05-11 20:02:06 -07:00
GriffinR
41ac28b210
Index pokemon footprint pngs
2023-05-09 22:43:48 -04:00
Jaizu
e6505bda4b
Fix some sprites ( #2926 )
...
* Fix hisuian typlosion
* Fix mega metagross backsprite
* Fix shiny Reuniclus
* Fix Duosion mouth
* Fix front mega metagross
* Fix front Yanmega
* Fix Electivire front sprite
* Fix shiny duskull
* Fix Hariyama sprite
* Fix Shiny masquerain
2023-04-18 19:49:42 -04:00
Jaizu
53d837ee62
Fix gen v icons
2023-04-01 08:20:20 +02:00
Jaizu
90d33cd7a0
Fix gen 4 icons
2023-04-01 08:20:13 +02:00
Jaizu
01a12d81c7
Fix gen 3 icons
2023-04-01 08:20:06 +02:00
Jaizu
9a8f120e1d
Fix gen 2 icons
2023-04-01 08:19:58 +02:00
Jaizu
5f3070e528
Forgot to fix Venusaur
2023-04-01 08:19:50 +02:00
Jaizu
83ef5a229d
Center gen 1 pokémon icons
2023-04-01 08:19:38 +02:00
AgustinGDLV
69fd63a922
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-21 09:56:58 -07:00
Alex
66c63ee458
hisuian sprite fixes
2023-03-14 18:23:50 +01:00
Alex
f3810465e8
samurott shiny.pal v2
2023-03-13 17:46:52 +01:00
Alex
59d5f078d2
samurott shiny.pal
2023-03-13 17:44:25 +01:00
AgustinGDLV
ec4b330b9b
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-10 21:00:41 -08:00
Alex
b8fec80f78
small braviary sprite fix
2023-03-02 18:04:12 +01:00
Alex
e16b5c2477
leftover
2023-03-02 17:27:45 +01:00
Alex
58b408cbbf
some new sprites
2023-03-02 17:04:24 +01:00
Alex
487e26e700
fix enamorus_t + samuroutt sprite + conflicts
2023-03-02 11:05:59 +01:00
Eduardo Quezada
501cff84b9
Removed unused single-frame front pics
2023-02-27 18:09:54 -03:00
Jaizu
8143f57eb9
Fix sprite palettes up to Ampharos included
2023-02-26 14:06:32 +01:00
AgustinGDLV
b4ec273353
Merge branch 'upcoming' into dynamax
2023-02-25 14:04:55 -08:00
Alex
48391d8eff
Basculegion female form
2023-02-24 08:46:34 +01:00
LOuroboros
db02cd05f6
Purged the bKGD warning once and for all
2023-02-24 02:01:55 -03:00
Alex
a870ec3c22
enamorus_t cry, basculegionf sprite, new typhlosion back sprite
2023-02-23 15:20:12 +01:00
AgustinGDLV
38f462551f
pulled rhh master, i hate merge conflicts
2023-02-22 18:50:54 -08:00
Alex
1f694ae7ed
missing pla sprites
2023-02-22 20:41:01 +01:00
Eduardo Quezada
c2f284a1d3
Apply official palettes for Gen 1 Pokémon. #2593
...
commit 136016ee4f77c618a2ab4c55bf6534281161396ea3616fc74ea383a4e2ffa7950a1f34f0d8f5091fb0d260e689092132b3e4348006fc9808e1b2a70e0eb0c22154734e26d09ef64a73f0556df3de03c1011727960abac77a1bd89c3ac9253d4004956d55aaad68ad6242df7c97b69d4b7685715c357f209c67a098eea1c4750f39ed3792029c61d66d0a727cd43a68ee30be1a79d4ff1c0e2dd05540245f88809b55067bb7818b337dfd49ac05e98e1ffb74e8780fd6e6df1fc25f6dc173be89da731602c6ee40c6739c6a2b45effa1a8d1f381e03625938f97d78560cb9cdcd4fe6779114857d8e96a32d8839619e717c8f940b41604f7deec58f2765fa0dde855a235a04188aa7f38b107880532a73093423859bfa4c9b17943ebb05f548e0d22cdff56dad0d8ea99acbc98c70cfbb9250ce5a477d6480770d4014705cee71f086270028466f0243ba7dfa5a42b3e28baaf4658283537accb9aca57833bfb122483cc8a0705562565a8f8ca65cf78bc025887f7c8c5f2fa3606401fa6561101eceb0a9423b4052e2b36db7c752fd6f76f5bb40c5eb658c62dda7d8055bbc773678e933e8a17bd3d06b1c09e362474e83c2a20f7e1a23880134efd983de5d8407ad24d81ccf96dd9c63d6f294c9e3a94343a45d18d84573f1b48d6d9e26270d1817d85a2bfca339f5e0c8e0d3fce1a6e462b20cd71f5fd81da1a3e1d68abbaa397c78d1432e45179dd0560bfa9c6ba832697cecb0e0ee4718cf91a54c84431a762fb719541aa926d6741abf4c126663bc45dccdc7fa13bf6b7fd3c43ab392518d4c7fbacc1953397590a10d88577510b413bd2ea6620202492add12002f32c7b41e5c7431c443d7af028d57b304d60da0a581b63cdc
2023-02-06 10:25:36 -03:00
Eduardo Quezada
d103025527
Merge branch 'RHH/upcoming' into RHH/pr/feature/palleteConversion2
...
# Conflicts:
# include/config/pokemon.h
2022-12-22 10:30:01 -03:00
Eduardo Quezada D'Ottone
b48f057fe7
Merge pull request #1589 from cynderquil/pokemon_expansion
...
Fix Bastiodon's second icon frame
2022-11-20 20:47:07 -03:00
AgustinGDLV
2139e138a9
removed duplicate sprites and changed folder format for gmax
2022-10-27 19:44:06 -07:00
AgustinGDLV
caaec99e77
added data and graphics for gigantamax mons
2022-10-27 16:18:37 -07:00
Jaizu
34c0a5bd8a
Spiky Eared Pichu second frame
2022-09-30 17:54:11 -03:00
Jaizu
40e4cb81ef
finish normal palette swapping
2022-09-30 17:54:04 -03:00
Jaizu
6278f710a0
Finish plenty of sprites.
...
This also includes some fixes to Swanna, Spiky Eared Pichu and some broken details across other species that I already forgot.
2022-09-30 17:53:58 -03:00
Eduardo Quezada
41d11b0708
Restored filename format for gendered species
2022-09-14 11:13:42 -03:00
Eduardo Quezada
0caf79f702
Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2
...
# Conflicts:
# graphics/pokemon/cherrim/anim_front.png
# graphics/pokemon/scyther/anim_front.png
# graphics/pokemon/scyther/front.png
# graphics/pokemon/shinx/anim_front.png
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/front_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon_icon.c
2022-09-13 20:44:49 -03:00
Blackforest92
07a07ddc8d
Update to latest master branch + allow Reveal Glass to work with Enamorus
2022-08-24 15:00:48 +07:00
Blackforest92
00a827b3fb
Add PLA pokemon to Form Species Table, add Kleavor's graphics
2022-08-19 17:47:34 +07:00
Blackforest92
56f4c319a4
Fix multiple pokemon graphics, tidying pokemon graphic folders
2022-07-22 22:17:29 +07:00
Ariel A
9beee311c4
Merge branch 'master' into romhack
2022-07-17 15:13:15 -04:00
Blackforest92
ff861ff963
Add some of Legends Arceus battle sprites
2022-07-04 12:28:40 +07:00
Blackforest92
8c88e8a9b7
Legends Arceus Pokemon 95% Finished
2022-07-03 17:15:37 +07:00
