atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15710 commits 2 branches 40 tags 600 MiB
Commit graph

334 commits

Author SHA1 Message Date
hedara90
45835a2c33
Fixed stray transparent pixels in Urshifu sprites (#5071) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-02 11:48:20 -07:00
Eduardo Quezada
18aff2db3b Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	asm/macros/battle_anim_script.inc
#	data/battle_anim_scripts.s
#	include/constants/battle_anim.h
#	src/battle_anim.c
#	src/data/battle_anim.h
 2024-07-27 16:26:37 -04:00
hedara90
b0b63f66b9
Added Ivy Cudgel Animation (#5034) 
* Added Ivy Cudgel Anim, changed Ogerpon palettes, added jumpifmovetypeequals command

* Make the 20 year old compiler not complain

* Maybe better cudgel

* Moved animation

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-07-26 18:06:44 +02:00
Eduardo Quezada
cc00446eb8 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info/gen_9_families.h
 2024-07-26 09:42:52 -04:00
hedara90
3d65141db8
Fixed Sandile sprite (#5038) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-07-26 00:07:43 +02:00
hedara90
7a4df80f89
Added Ogerpon Tera Sprites (#4996) 
* Added Ogerpon Tera Sprites

* Updated references to Ogerpon Tera forms

* Fixed back sprite offsets and color indices for Hearthflame Tera

* Removed Ogerpon data duplicates

---------

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-07-23 11:55:07 -04:00
Eduardo Quezada
0b02527e5c Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	test/test_runner.c
 2024-07-21 13:36:07 -04:00
hedara90
7e509c440b
Added Terapagos Stellar Sprite (#5008) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-07-21 08:17:31 +02:00
Eduardo Quezada
fcdc9ed65a Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_util.c
#	src/data/pokemon/species_info/gen_7_families.h
#	test/battle/ability/download.c
#	test/battle/ability/intimidate.c
#	test/battle/ability/supreme_overlord.c
#	test/battle/ability/zero_to_hero.c
#	test/battle/ai/ai.c
#	test/battle/move_effect/plasma_fists.c
 2024-07-05 14:25:25 -04:00
Cafei
3ec371de05
Fixes (#4887) 2024-06-29 20:46:00 +02:00
Eduardo Quezada
88028c0c37
Split Pokémon Object Events from Following Pokémon functionality (#4761) 
* Split Pokémon Object Events from Following Pokémon functionality

* Renamed follower pngs and palettes

* Define renames

* Reorder configs

* Renaming: SpeciesInfo fields, macros and palettes.
 2024-06-13 22:46:27 +02:00
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.

# Conflicts:
#	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-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