Eduardo Quezada
651e87af5f
Converted Relic Song into a proper form change ( #7139 )
2025-06-17 00:02:25 +02:00
wiz1989
e63ac48de2
added Ash Greninja overworld sprites ( #6976 )
2025-06-07 09:57:43 +02:00
Bassoonian
c5c7bb13c9
Converts a bunch of defines to enums ( #7041 )
2025-06-02 15:54:37 +02:00
Hedara
90aed43c27
Merge branch 'master' into master-upcoming
...
Conflicts:
.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
.github/ISSUE_TEMPLATE/03_feature_requests.yaml
.github/ISSUE_TEMPLATE/04_other_errors.yaml
.github/pull_request_template.md
src/battle_controller_player.c
src/battle_main.c
src/battle_script_commands.c
src/battle_util.c
src/data/graphics/pokemon.h
src/data/pokemon/species_info/gen_9_families.h
test/battle/ability/flower_veil.c
test/battle/ability/sweet_veil.c
test/battle/ability/synchronize.c
test/battle/ability/water_bubble.c
test/battle/move_effect/fell_stinger.c
test/battle/move_effect/level_damage.c
test/battle/move_effect/magic_room.c
test/battle/move_effect/me_first.c
test/battle/move_effect/sky_drop.c
test/battle/move_effect/smack_down.c
test/battle/move_effect/wish.c
test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
2025-05-22 15:41:08 +02:00
kittenchilly
75f6d85582
Improve a few Gen 9 Pokemon sprites ( #6885 )
2025-05-17 19:48:44 +02:00
AlexOn1ine
33607529cd
conflicts
2025-05-16 10:46:32 +02:00
kittenchilly
7359d234c8
PokeCommunity sprites batch (April 2025) ( #6840 )
2025-05-16 09:35:30 +02:00
Hedara
1abfa7acfa
Merge branch 'master' into master-upcoming
...
Conflicts:
include/battle.h
include/constants/battle_string_ids.h
src/battle_ai_util.c
src/battle_main.c
src/battle_util.c
test/battle/ai/ai.c
2025-05-12 18:21:35 +02:00
PCG
904b399a81
Added Egg Moves for Basculin White Striped ( #6769 )
2025-05-04 11:43:57 +02:00
Hedara
0eeba00d1b
Merge branch 'master' into master-upcoming-2025-04-30
...
Conflicts:
include/battle.h
include/constants/expansion.h
include/graphics.h
src/battle_bg.c
src/battle_util.c
src/data/graphics/battle_terrain.h
src/data/graphics/pokemon.h
src/pokeblock_feed.c
src/pokemon_sprite_visualizer.c
2025-04-30 15:22:37 +02:00
Cafe
b451bc3606
New Lurantis animation ( #6725 )
2025-04-30 12:45:29 +02:00
Hedara
4873589c65
Merge remote-tracking branch 'pret/master' into new-pret-merge
...
Conflicts:
asm/macros/battle_script.inc
data/battle_anim_scripts.s
include/battle.h
include/battle_controllers.h
include/battle_setup.h
include/constants/battle.h
src/battle_anim_normal.c
src/battle_anim_utility_funcs.c
src/battle_bg.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
2025-04-29 20:27:33 +02:00
khbsd
971a595e4a
Evolution Refactor ( #6556 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2025-04-23 16:01:33 +02:00
grintoul1
ec2aef2eff
Battle Transition: mugshots for multibattles ( #6567 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-17 16:18:20 +02:00
Eduardo Quezada
2b417bfeed
Implemented Alcremie Evolution Method ( #6530 )
...
Co-authored-by: khbsd <khb.dev@gmail.com>
2025-04-08 19:50:21 +02:00
AlexOn1ine
ba3ebc70d5
Merge remote-tracking branch 'rhh/master' into 06-03-25-Merge
2025-03-06 18:08:55 +01:00
Eduardo Quezada
3eae7a0c96
Gen 1's Special base stat ( #6330 )
2025-03-06 11:09:53 +01:00
kittenchilly
f747deb6ca
Fix Melmetal's weight ( #6382 )
2025-03-05 17:58:35 +01:00
Rachel
c7ac1a19df
Refactor teachable learnset helper ( #6378 )
2025-03-04 20:10:00 +01:00
Eduardo Quezada
2b3589b44f
Moved Pokémon Jump types to gSpeciesInfo ( #5602 )
2025-02-27 07:46:14 -08:00
Eduardo Quezada
ff098bc520
Reverted compound literal OW mon pic tables ( #6216 )
2025-02-19 19:17:59 +01:00
Eduardo Quezada
64c5113b23
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-02 14:18:13 -03:00
Bassoonian
a0097ef395
Add Poltchageist family form data ( #6163 )
2025-02-01 17:46:59 -03:00
khbsd
4fc56128d0
Add Mega Evo, Primal Reversion, and Ultra Necrozma OW sprites ( #5874 )
...
Co-authored-by: kittenchilly <mario.pikmin.zelda@gmail.com>
2025-01-30 22:29:20 -03:00
Eduardo Quezada
a34a3cad36
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-26 22:57:11 -03:00
Cafe
37b6f031c8
Duraludon battle animation ( #6086 )
2025-01-26 17:27:05 +01:00
Eduardo Quezada
6a3d95b422
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-25 22:29:12 -03:00
Bassoonian
c372a3bf82
Fix Enamorus not changing forms ( #6093 )
2025-01-24 07:59:24 -03:00
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" ( #6082 )
2025-01-22 21:50:39 +01:00
Eduardo Quezada
ed505cfb5f
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-21 19:32:51 -03:00
Bassoonian
a3ce3a569d
Converts a bunch of defines to enums ( #6071 )
2025-01-21 21:19:41 +01:00
Eduardo Quezada
4825e523ce
Moved mon pic tables to gSpeciesInfo + macro cleanup ( #5597 )
2025-01-20 07:52:29 -08:00
Eduardo Quezada
3cdcb4b282
Moved front animations frames to gSpeciesInfo ( #5605 )
...
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-01-19 21:14:12 -08:00
Eduardo Quezada
cd1482bbaa
Expanded Pokémon Follower transformation functionality ( #5048 )
2025-01-18 23:19:06 +01:00
moostoet
3b19f6972b
Rename Furfrou Species tags to match Pokemon Showdown exports ( #6041 )
2025-01-17 14:39:52 -03:00
Cafe
570c6521d9
Misc pokemon sprite fixes ( #5846 )
2024-12-22 18:43:24 +01:00
Eduardo Quezada
9a0b5756ca
Fix "PlantCloak" references ( #5821 )
2024-12-20 22:25:18 +01:00
kittenchilly
a669c4c109
New Enamorus-Incarnate sprite ( #5797 )
2024-12-13 15:26:12 +01:00
kittenchilly
5477033a19
Updated Ogerpon, Enamorus and Sinistcha sprites ( #5793 )
2024-12-09 12:51:18 +01:00
Eduardo Quezada
4635f0e0f8
Converted Stance Change to proper Form Change + Tests ( #5749 )
2024-12-01 22:36:25 +01:00
Hedara
f6fdca615f
Merge branch 'master' into master-to-upcoming
2024-11-29 11:32:12 +01:00
Alex
0f4b598984
Fixes Aegislash not reverting back ( #5734 )
2024-11-28 23:21:42 +01:00
Eduardo Quezada
b2ef363ac8
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-19 14:19:53 -03:00
kittenchilly
c4d83079a9
PokeCommunity sprites batch (October) ( #5655 )
2024-11-15 21:16:41 +01:00
Eduardo Quezada
dfa3690d74
Added config to disable gender differences ( #5595 )
2024-10-29 15:38:26 +01:00
Eclipse
5b5ecaa6ee
Fixed some gba sprites ( #5607 )
2024-10-28 09:22:07 -03:00
Eduardo Quezada
3442b09852
Renamed folders and symbols to match species defines ( #5581 )
2024-10-27 20:15:11 +01:00
Eduardo Quezada
358c0d0699
Added back GBA sprites via config ( #5206 )
...
* Add back older sprites
* Graphics config
* Added GBA most graphical data to gSpeciesInfo
* Footprints are now affected by P_GBA_SPECIES_GFX + removed duplicated files
* GBA mon icons
* Split GBA footprints into separate config
* Separated GBA icons into their own config
* Fixed GBA icons depending on P_GBA_SPECIES_GFX instead of P_GBA_ICONS
* Moved GBA sprites to regular folder with prefix
* Renamed configs
* Temporarely disabled shadows when GBA sprites are enabled
* Removed remaining files from pokemon_old folder
2024-10-18 13:37:00 +02:00
Eduardo Quezada
ee9c6d4912
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-17 00:16:01 -03:00
Eduardo Quezada
9ed153ff93
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015
2024-10-15 22:22:52 -03:00
