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

..

aromatherapy.c

Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210)

2025-02-09 21:54:03 +01:00

bug_bite.c

Fixes Bug Bite eaten berry not ignoring Unnerve (#6666)

2025-04-22 00:38:39 +02:00

burn.c

Encapsulate move data (#5852)

2025-01-01 20:34:33 +01:00

confusion.c

Update battle messages to Gen 5+ standards (#3240)

2024-10-21 14:52:45 -03:00

def_minus_1.c

Small Battle Test reorganization (#4504)

2024-05-06 09:36:52 +02:00

dire_claw.c

Added missing redirect abilities Gen 3-4 config (#4920)

2024-07-07 09:52:59 +02:00

flame_burst.c

Create missing ability and move effect test files (#6845)

2025-05-16 12:20:44 +02:00

flinch.c

Changed Tackle for Scratch in tests (#6730)

2025-04-30 17:18:52 -04:00

freeze.c

Added weather accuracy move flags (#6857)

2025-05-16 07:58:40 +02:00

haze.c

Fixed LGPE move test fail with B_UPDATED_MOVE_DATA to GEN_7 (#6657)

2025-04-21 14:48:49 +02:00

ion_deluge.c

Changed Tackle for Scratch in tests (#6730)

2025-04-30 17:18:52 -04:00

leech_seed.c

Fixed LGPE move test fail with B_UPDATED_MOVE_DATA to GEN_7 (#6657)

2025-04-21 14:48:49 +02:00

light_screen.c

Fixed LGPE move test fail with B_UPDATED_MOVE_DATA to GEN_7 (#6657)

2025-04-21 14:48:49 +02:00

order_up.c

Encapsulate move data (#5852)

2025-01-01 20:34:33 +01:00

paralysis.c

Encapsulate move data (#5852)

2025-01-01 20:34:33 +01:00

pay_day.c

Update battle messages to Gen 5+ standards (#3240)

2024-10-21 14:52:45 -03:00

poison.c

Small Battle Test reorganization (#4504)

2024-05-06 09:36:52 +02:00

psychic_noise.c

Encapsulate move data (#5852)

2025-01-01 20:34:33 +01:00

reflect.c

Fixed LGPE move test fail with B_UPDATED_MOVE_DATA to GEN_7 (#6657)

2025-04-21 14:48:49 +02:00

remove_status.c

Create missing ability and move effect test files (#6845)

2025-05-16 12:20:44 +02:00

salt_cure.c

Create missing ability and move effect test files (#6845)

2025-05-16 12:20:44 +02:00

smack_down.c

Merge branch 'master' into master-upcoming

2025-05-22 15:41:08 +02:00

sp_atk_minus_2.c

Remove and replace MOVE_EFFECT_SP_ATK_TWO_DOWN (#4557)

2024-05-12 15:07:43 +02:00

spd_minus_2.c

Small Battle Test reorganization (#4504)

2024-05-06 09:36:52 +02:00

spikes.c

Update battle messages to Gen 5+ standards (#3240)

2024-10-21 14:52:45 -03:00

steal_item.c

Adds Thief/Covet config to send stolen item to bag and Pickup config to pickup user's item in wild battles (#5829)

2024-12-19 13:51:03 +01:00

stealth_rock.c

Update battle messages to Gen 5+ standards (#3240)

2024-10-21 14:52:45 -03:00

syrup_bomb.c

Changed Tackle for Scratch in tests (#6730)

2025-04-30 17:18:52 -04:00

thrash.c

Rampage moves always confuse on final turn (#4722)

2024-06-05 05:38:04 +02:00

throat_chop.c

EndTurnEffectsOrder Refactor

2025-02-09 13:48:08 +01:00

trap_both.c

Small Battle Test reorganization (#4504)

2024-05-06 09:36:52 +02:00

tri_attack.c

fix tests when B_USE_FROSTBITE is TRUE (#4986)

2024-07-17 23:23:52 +02:00

will_o_wisp.c

Create missing ability and move effect test files (#6845)

2025-05-16 12:20:44 +02:00