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

..

ability_shield.c

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

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

air_balloon.c

Changed Tackle for Scratch in tests (#6730)

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

attack_up.c

Changed Tackle for Scratch in tests (#6730)

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

berserk_gene.c

Fixes Berserk Gene infinite loop (#6813)

2025-05-11 11:34:16 +02:00

big_root.c

Fixes Big Root Leech Seed heal amount (#6638)

2025-04-18 16:07:18 -04:00

blunder_policy.c

Encapsulate move data (#5852)

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

booster_energy.c

Encapsulate move data (#5852)

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

clear_amulet.c

Changed Tackle for Scratch in tests (#6730)

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

covert_cloak.c

Changed Tackle for Scratch in tests (#6730)

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

critical_hit_up.c

Changed Tackle for Scratch in tests (#6730)

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

cure_status.c

Fixes items preventing other switch in effects (#5732)

2024-12-03 11:15:29 -05:00

custap_berry.c

Changed Tackle for Scratch in tests (#6730)

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

defense_up.c

Changed Tackle for Scratch in tests (#6730)

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

eject_button.c

Changed Tackle for Scratch in tests (#6730)

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

eject_pack.c

Fixes Intimidate / Eject Pack interaction (#6645)

2025-04-21 17:33:29 +02:00

enigma_berry.c

Changed Tackle for Scratch in tests (#6730)

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

gems.c

Fix gems activating for moves that don't deal type damage (#6789)

2025-05-08 20:17:32 +02:00

iron_ball.c

Fix Iron Ball type effectiveness check (#6794)

2025-05-09 22:23:44 +02:00

jaboca_berry.c

Bugfixes batch (#6750)

2025-05-02 20:14:27 +02:00

kee_berry.c

Changed Tackle for Scratch in tests (#6730)

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

leek.c

Changed Tackle for Scratch in tests (#6730)

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

leftovers.c

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

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

life_orb.c

Fix Life Orb inflicting self damage when using status moves (#6767) (#6773)

2025-05-04 22:26:12 +02:00

luck_punch.c

Changed Tackle for Scratch in tests (#6730)

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

maranga_berry.c

Changed Tackle for Scratch in tests (#6730)

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

metronome.c

Changed Tackle for Scratch in tests (#6730)

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

micle_berry.c

Changed Tackle for Scratch in tests (#6730)

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

mirror_herb.c

Changed Tackle for Scratch in tests (#6730)

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

ogerpon_mask.c

Changed Tackle for Scratch in tests (#6730)

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

protective_pads.c

Changed Tackle for Scratch in tests (#6730)

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

quick_claw.c

Changed Tackle for Scratch in tests (#6730)

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

random_stat_up.c

Adds RNG tags and tests for Moody and Starf Berry (#6718)

2025-05-01 10:16:15 +02:00

red_card.c

Changed Tackle for Scratch in tests (#6730)

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

restore_hp.c

Encapsulate move data (#5852)

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

restore_stats.c

Changed White Herb hold effect name (#6815)

2025-05-11 11:34:47 +02:00

room_service.c

Encapsulate move data (#5852)

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

rowap_berry.c

Bugfixes batch (#6750)

2025-05-02 20:14:27 +02:00

safety_goggles.c

Encapsulate move data (#5852)

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

scope_lens.c

Changed Tackle for Scratch in tests (#6730)

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

seeds.c

Fixes Neutralizing Gas Exits, Weather Abilities and Terrain Effects order (#6435)

2025-03-16 23:10:20 +01:00

shell_bell.c

Changed Tackle for Scratch in tests (#6730)

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

special_attack_up.c

Changed Tackle for Scratch in tests (#6730)

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

special_defense_up.c

Changed Tackle for Scratch in tests (#6730)

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

speed_up.c

Changed Tackle for Scratch in tests (#6730)

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

throat_spray.c

Remove redundant bit for Throat Spray (#6593)

2025-04-13 16:22:04 +02:00

utility_umbrella.c

Encapsulate move data (#5852)

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