Nephrite
a1e67572b6
Replaces STATUS2 usage with volatiles in code ( #7262 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-07-11 22:53:49 +02:00
Pawkkie
419219bb31
Add AI_FLAG_ASSUME_STAB ( #6797 )
2025-07-10 19:58:31 +02:00
Nephrite
e8abfbce49
Untangled TMs and HMs from item ids ( #7173 )
2025-07-04 19:07:53 +02:00
Bassoonian
6333702461
Converts more defines to enums and name unnamed enums ( #7071 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-18 14:30:37 +02:00
Nephrite
a18709fb47
Bag refactor (groundwork for expansion) ( #7018 )
2025-06-18 10:59:24 +02:00
Nephrite
06cd3af3ea
Volatile status refactoring ( #6983 )
2025-06-18 07:22:41 +02:00
Bassoonian
1a6ed20713
Add dedicated getter functions for Pokémon types and abilities ( #7043 )
2025-06-03 22:05:22 +02:00
Bassoonian
c5c7bb13c9
Converts a bunch of defines to enums ( #7041 )
2025-06-02 15:54:37 +02:00
AlexOn1ine
b90fdd1b3c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
Hedara
2b92ba315a
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
...
Conflicts:
include/battle_anim.h
include/battle_controllers.h
include/battle_gfx_sfx_util.h
include/battle_interface.h
include/battle_main.h
include/battle_script_commands.h
include/battle_util.h
include/easy_chat.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/field_player_avatar.h
include/intro.h
include/item_use.h
include/metatile_behavior.h
include/move_relearner.h
include/pokedex.h
include/pokemon.h
include/pokemon_icon.h
include/roamer.h
include/script_pokemon_util.h
include/sprite.h
include/text.h
include/wild_encounter.h
src/battle_controllers.c
2025-05-24 20:38:21 +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
Alex
8ec998abff
Fixes ate type being ignored after checking summary screen ( #6888 )
2025-05-22 14:07:36 +02:00
Bassoonian
59d315734d
Update header files to match source files ( #2143 )
2025-05-19 09:18:04 +01:00
AlexOn1ine
33607529cd
conflicts
2025-05-16 10:46:32 +02:00
Hedara
2945c83bbc
Merge commit '2044bea883d08ec9266d21ac0cd6a56c3e0d5962' into pret-merge
...
Conflicts:
include/battle.h
include/battle_ai_script_commands.h
include/battle_anim.h
include/battle_controllers.h
include/battle_gfx_sfx_util.h
include/battle_main.h
include/battle_script_commands.h
include/battle_util.h
include/pokemon.h
include/recorded_battle.h
src/battle_ai_script_commands.c
src/battle_anim.c
src/battle_anim_mons.c
src/battle_anim_sound_tasks.c
src/battle_anim_status_effects.c
src/battle_controller_link_opponent.c
src/battle_controller_link_partner.c
src/battle_controller_opponent.c
src/battle_controller_player.c
src/battle_controller_player_partner.c
src/battle_controller_recorded_opponent.c
src/battle_controller_recorded_player.c
src/battle_controller_wally.c
src/battle_controllers.c
src/battle_gfx_sfx_util.c
src/battle_interface.c
src/battle_main.c
src/battle_message.c
src/battle_records.c
src/battle_script_commands.c
src/battle_tv.c
src/battle_util.c
src/battle_util2.c
src/pokeball.c
src/pokemon.c
src/recorded_battle.c
src/reshow_battle_screen.c
2025-05-15 21:15:37 +02:00
Alex
2044bea883
Rename battlerId to battler for consistency ( #2126 )
2025-05-09 12:43:23 +01:00
hedara90
d1aa49cca3
Remove compressed palettes ( #6455 )
2025-04-26 22:58:40 +02:00
PCG
f661f3b3ac
Pokedex Plus HGSS move configs ( #6687 )
2025-04-24 19:34:37 +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
Bassoonian
1c3d346d4f
Make form change methods into enum + type checking ( #6631 )
2025-04-16 23:45:41 +02:00
psf
e146940f25
Add B_LEVEL_UP_NOTIFICATION to improve player QoL when performing multiple level ups ( #4901 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-12 10:23:48 +02:00
Hedara
c8f227903f
Merge branch 'upcoming' into upcoming-master
2025-04-09 11:25:01 +02:00
Alex
f364cf9e71
Alcremie Evolution clean up follow up ( #6557 )
2025-04-09 11:18:07 +02:00
Hedara
2210e2d410
Merge branch 'master' into upcoming-master
2025-04-09 11:06:38 +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
d767211c4a
helper function to get the species type based on personality
2025-03-31 14:49:40 +02:00
Eduardo Quezada
2b3589b44f
Moved Pokémon Jump types to gSpeciesInfo ( #5602 )
2025-02-27 07:46:14 -08:00
Hedara
27da389d1e
Merge branch 'master' into master-to-upcoming
2025-02-06 13:05:02 +01:00
Eduardo Quezada
fe41f9eaf5
Fixed non-regional forms breeding incorrectly ( #4985 )
2025-02-03 17:03:29 +01:00
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" ( #6082 )
2025-01-22 21:50:39 +01:00
Bassoonian
a3ce3a569d
Converts a bunch of defines to enums ( #6071 )
2025-01-21 21:19:41 +01:00
Eduardo Quezada
ce40c3356c
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-12 08:42:57 -03:00
Eduardo Quezada
15a034a1d9
Fixed multiple transform/form change graphical issues ( #6005 )
2025-01-12 09:49:19 +01:00
Eduardo Quezada
8821779815
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-11 08:07:15 -03:00
Eduardo Quezada
c33c38e020
Remove form change function footguns ( #5995 )
2025-01-11 09:57:39 +01:00
PhallenTree
c10287b4c1
Fixes various Dynamax HP conversions/calculations ( #5933 )
2025-01-07 20:08:31 +01:00
Eduardo Quezada
9669a0554d
Encapsulate move data ( #5852 )
2025-01-01 20:34:33 +01:00
Eduardo Quezada
3bc4126558
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-28 15:28:07 -03:00
Eduardo Quezada
91c7bd9e53
Fixed givemon not respecting perfect IVs for species ( #5873 )
2024-12-26 21:22:45 +01:00
Alex
8edf14423a
Refactors argument into a union ( #5853 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-12-23 15:51:35 -03:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup ( #5812 )
2024-12-21 19:45:50 +01:00
GhoulMage
5df6f0b753
AI_FLAG_ACE_POKEMON takes into account separate trainers (#5608 )
2024-10-29 15:18:29 -04:00
Eduardo Quezada
dfa3690d74
Added config to disable gender differences ( #5595 )
2024-10-29 15:38:26 +01:00
Eduardo Quezada
3205f377d5
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-21 08:18:44 -03:00
ghoulslash
d487bd0548
Revival Blessing fixes + Using Lunar Blessing's animation ( #5490 )
...
* revival blessing fixes, add anim
* fix lunar blessing anim
* Added support for Revival Blessing in tests
* Added test to confirm absent flag fix
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-19 11:34:58 -03:00
kittenchilly
19009c6d21
Add support for overworld sprite gender differences + add all the sprites ( #5394 )
2024-10-04 17:56:21 +02:00
Rachel
b478881fc6
Add in-battle shadows underneath all enemy battlers ( #5178 )
...
* Add data to SpeciesInfo entries for in-battle shadows
* Implement sized shadows in the sprite visualizer
* Implement sized shadows in game code
* Show shadows for the lead battler for opponents during their battle anim
* Feedback on shadows, round 1
* Revert removal of Goomy and Sliggoo shadows
* Fixed GEN_3 setting
* Code cleanup + remove pre-processor branches
* Fix bugs with gen-3 configuration branch
* Style corrections, final shadow coordinate adjustments
* Adjustments to Garbodor and Araquanid
2024-09-10 21:27:49 +02:00
Eduardo Quezada
abb1fd20f3
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-12 16:24:04 -04:00
Alex
805bb2888c
Fixes wrong padding in struct SpeciesInfo ( #5139 )
...
Fixes wrong padding in struct SpeciesInfo that is if I counted correctly.
After I opened #5138 I realized it might be an issue on master as well.
2024-08-11 18:27:22 +02:00
