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
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
Eduardo Quezada
124c17d315
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# README.md
# data/field_effect_scripts.s
# data/maps/AncientTomb/scripts.inc
# data/maps/DesertRuins/scripts.inc
# data/maps/IslandCave/scripts.inc
# data/scripts/follower.inc
# graphics/object_events/pics/pokemon/wailord.png
# graphics/object_events/pics/pokemon_old/substitute.png
# include/constants/event_objects.h
# include/global.h
# remote_build.sh
# spritesheet_rules.mk
# src/bike.c
# src/data/object_events/object_event_anims.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info_followers.h
# src/data/object_events/object_event_pic_tables.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_screen_effect.c
# src/overworld.c
# src/palette.c
# src/pokemon_summary_screen.c
# src/scrcmd.c
# src/trainer_see.c
2024-02-17 23:40:08 -03:00
Eduardo Quezada D'Ottone
76075ffe57
Revert unneeded sprite changes from 3051 ( #3205 )
2023-08-25 16:33:15 -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
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
GriffinR
41ac28b210
Index pokemon footprint pngs
2023-05-09 22:43:48 -04:00
Eduardo Quezada
501cff84b9
Removed unused single-frame front pics
2023-02-27 18:09:54 -03:00
GriffinR
172cb7bae9
Sync Unown and qmark mon folders with pokefirered
2020-02-25 14:18:28 -06:00
garak
d0115db565
move pokemon graphics to mon-specific directories
2019-03-16 12:21:47 -05:00
