Eduardo Quezada
dce10ab705
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# test/species.c
2024-06-04 16:47:29 -04:00
kittenchilly
a5b75746ea
Pawmi
2024-06-03 14:17:34 -05:00
kittenchilly
ea617ccd7a
Okidogi
2024-06-03 13:56:37 -05:00
kittenchilly
33972cedf3
Pawmo
2024-06-03 13:48:36 -05:00
hedara90
5bf7f08ad2
Added Normal and Terastal Terapagos sprites ( #4691 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-06-03 13:33:42 -05:00
Eduardo Quezada
ee1d14755a
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
2024-06-02 11:06:41 -04:00
Eduardo Quezada
3202625ca5
Restored Gen 4-8 followers
...
This reverts commit 24913f5339
2024-06-02 10:31:01 -04:00
hedara90
240b69d032
Added Normal and Terastal Terapagos sprites ( #4691 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-06-02 08:26:43 +02:00
Eduardo Quezada
021074cd2e
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info.h
# src/data/pokemon/species_info/gen_1_families.h
# src/data/pokemon/species_info/gen_2_families.h
# src/data/pokemon/species_info/gen_4_families.h
# src/data/pokemon/species_info/gen_5_families.h
# src/data/pokemon/species_info/gen_8_families.h
2024-05-28 14:28:33 -04:00
Eduardo Quezada
80b193280d
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_main.c
# src/data/item_icon_table.h
# src/data/pokemon/species_info/gen_9_families.h
2024-05-27 10:13:42 -04:00
kittenchilly
2e07dbb0ee
Add Gen 9 and PLA footprints + update some footprints ( #4621 )
...
* PLA footprints
* Gen 9 Starters
* Gen 9 Cross Gen Evos
* Question mark
* Gen 9 regular mons
* Gen 9 Paradox mons
* Gen 9 legendaries and mythicals
* Past gen mon footprint changes
2024-05-26 22:20:51 +02:00
BlueAnthem37510
a507af300e
Sceptilite & Salandit sprite fixes ( #4614 )
...
Co-authored-by: BlueAnthem37510 <a@a.com>
2024-05-24 11:28:35 +02:00
Cafei
a28ee83b06
sawsbuck sprites ( #4592 )
2024-05-18 17:07:27 +02:00
Eduardo Quezada
ddd92b9672
Removed unused garbage
2024-05-17 14:41:14 -04:00
Eduardo Quezada
24913f5339
TEMPORARY: Reverted Gen 4-8 followers
2024-05-17 14:40:45 -04:00
Eduardo Quezada
6eba5bcb80
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
2024-05-16 17:31:46 -04:00
Eduardo Quezada
ab682ce900
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/items.h
# src/pokemon_summary_screen.c
2024-05-15 09:58:21 -04:00
kittenchilly
35362fbd24
Update various sprites to ones from PokeCommunity ( #4554 )
...
* Updated battle sprites
* Update icon sprites
* Revert appletun change
2024-05-14 18:28:50 +02:00
Eduardo Quezada
3219a48adf
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_script_commands.c
2024-05-13 11:00:12 -04:00
Cafei
eae221b9cf
A bunch of Pokemon sprite changes and fixes ( #4552 )
...
* A bunch of sprite fixes
- New Basculin Blue and White animations to fix their entry animations
- New Xerneas Neutral entry animation derived from its Active form animation
- Recolored Iron Hands and Iron Bundle back sprites
* Requested changes
2024-05-12 16:08:10 -04:00
TheJamesLJ
b66738ff8d
Multiple sprite updates ( #4541 )
...
* Updated Mega Mewtwo Y sprite to fix transparent eye pixel
* Updated Keldeo Resolute sprite to a two framed animation
* Updated Keldeo Resolute sprite to increase definition to facial features
* Improved Keldeo Resolutes second frame to match BW2 original & changed front animation
* Added Meloetta Pirouette front anim
* Updated Meloetta Pirouette anim frame to a dip
2024-05-12 15:43:49 -04:00
Eduardo Quezada
5ada0f838a
Fixed Dusk Mane Necrozma
2024-05-12 15:18:10 -04:00
Eduardo Quezada
ff49551809
Hisuian Mon
2024-05-12 10:54:45 -04:00
Eduardo Quezada
be37820bd9
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_script_commands.c
2024-05-11 19:53:19 -04:00
Eduardo Quezada
2e8f6c64f1
Fixed Galar follower palettes + some Gen 5 (by Gerben BSc)
2024-05-11 19:35:55 -04:00
Eduardo Quezada
45ee5b5c8f
Multiple fixes (see commit description)
...
- New Eternatus 32x32 sprite by Gerben BSc
- Fixed missing Hero Zamazenta sprite
- Fixed missing Single Strike Urshifu sprite
- Moved Alcremie Strawberry sprite to respective folder
2024-05-11 19:09:05 -04:00
Cafei
1ef7e11ef2
Unown entry animation fix ( #4546 )
...
- Changed all anim_front.png into front.png
- Set PLACEHOLDER_ANIM_SINGLE_FRAME in front_pic_anims.h
2024-05-10 18:20:25 -04:00
Eduardo Quezada
dda9c79a88
Fixed Cyndaquil Shiny Palettes
2024-05-06 17:27:38 -04:00
Eduardo Quezada
35a76248d1
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/data/pokemon/species_info/gen_4_families.h
2024-05-06 16:03:29 -04:00
Eduardo Quezada
0c74fd31c3
Merge branch '_RHH/master' into _RHH/upcoming
2024-05-02 14:24:17 -04:00
Eduardo Quezada
bd2c6836cc
Fixed several follower palettes
2024-04-28 14:40:54 -04:00
Cafei
3ac67acc63
Fix Tatsugiri Droopy back sprite ( #4455 )
2024-04-28 11:05:23 -04:00
Eduardo Quezada
5b223cfc3e
Fixed Decidueye normal follower palette
2024-04-26 12:19:03 -04:00
Eduardo Quezada
5e2ffef002
Fixed (most) normal Gen 7 palettes
2024-04-26 12:10:36 -04:00
Eduardo Quezada
b006e2d213
Shiny Gen 7 sprites (gotta fix regular palettes)
2024-04-26 11:43:34 -04:00
Eduardo Quezada
6061400073
Added separate palette data for followers
2024-04-20 18:35:55 -04:00
Eduardo Quezada
3d9c7732f6
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/event_object_movement.h
# src/data.c
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info/gen_4_families.h
2024-04-20 13:23:14 -04:00
Eduardo Quezada
c4c371824f
Merge branch '_RHH/master' into _RHH/upcoming
2024-04-20 08:22:49 -04:00
Alex
4b048c327b
Pokemoncommunity sprites (new batch) ( #4414 )
2024-04-20 07:58:21 -04:00
kittenchilly
88ce33c864
Add further icon sprite changes and fixes ( #4413 )
2024-04-20 09:41:01 +02:00
Eduardo Quezada
5bf379720f
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/moves_info.h
2024-04-12 21:30:52 -04:00
kittenchilly
77db5d9d1e
Update almost all Gen 9 icon sprites + add the missing ones ( #4290 )
...
* Ogerpon form icons
* Sprigatito family
* Fuecoco family
* Quaxly family
* Lechonk family
* Tarountula family
* Nymble family
* Pawmi family
* Tandemaus family
* Fidough family
* Smoliv family
* Squawkabilly forms
* Nacli family
* Charcadet family
* Tadbulb family
* Wattrel family
* Maschiff family
* Shroodle family
* Bramblin family
* Toedscool family
* Klawf
* Capsakid family
* Rellor family
* Flittle family
* Tinkatink family
* Wiglett family
* Bombirdier
* Finizen family
* Varoom family
* Cyclizar
* Orthworm
* Glimmet family
* Greavard family
* Flamigo
* Cetoddle family
* Veluza
* Dondozo
* Tatsugiri forms
* Annihilape
* Clodsire
* Farigiraf
* Dudunsparce
* Kingambit
* Great Tusk
* Scream Tail
* Brute Bonnet
* Flutter Mane
* Slither Wing
* Sandy Shocks
* Iron Treads
* Iron Bundle
* Iron Hands
* Iron Jugulis
* Iron Moth
* Iron Thorns
* Frigibax family
* Gimmighoul family
* Treasures of Ruin
* Roaring Moon
* Iron Valiant
* Paradox duo
* Walking Wake
* Iron Leaves
* Dipplin
* Poltchageist family
* The Loyal Three
* Ursaluna Bloodmoon
* Revert "Ursaluna Bloodmoon"
This reverts commit 33486816cf2d0e90e51d
2024-04-06 11:26:16 +02:00
kittenchilly
e8c05debce
Add unique icons for all of Arceus's forms ( #4329 )
2024-04-03 20:40:45 +02:00
Alex
29a4444fc1
Pecharunt sprite from pokemoncommunity ( #4324 )
...
* Pecharunt sprite from pokemoncommunity
* disable icon sprite
2024-04-02 21:32:47 +02:00
Eduardo Quezada
e479fa1007
Merge with latest merrp branch + starting to move the functionality of separate palettes to gSpeciesInfo
2024-03-25 16:03:56 -03:00
Eduardo Quezada
39ed85635f
Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/data.h
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info.h
# src/data/pokemon/species_info/gen_1_families.h
# src/data/pokemon/species_info/gen_2_families.h
# src/data/pokemon/species_info/gen_3_families.h
# src/data/pokemon/species_info/gen_4_families.h
# src/data/pokemon/species_info/gen_5_families.h
# src/data/pokemon/species_info/gen_6_families.h
# src/data/pokemon/species_info/gen_7_families.h
# src/data/pokemon/species_info/gen_8_families.h
2024-03-17 23:41:23 -03:00
kittenchilly
b7f5ef3cd7
Add Paldean Wooper mini icon ( #4260 )
2024-03-08 23:25:59 +01:00
Eduardo Quezada
ead108d28e
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/data/graphics/pokemon.h
2024-02-19 13:49:10 -03:00
Eduardo Quezada
75ad61e5bf
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# src/battle_ai_main.c
# src/battle_ai_util.c
# src/battle_tv.c
# src/data/battle_moves.h
# src/data/graphics/pokemon.h
2024-02-19 10:13:13 -03:00
kittenchilly
585e06e756
Move Tatsugiri and Squawkabilly base species icons to graphic root folders ( #4212 )
2024-02-18 21:30:52 +01:00
