Hedara 9d80ad530d Merge branch 'master' into master-to-upcoming ...

Conflicts:
	Makefile
	data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
	data/maps/MtChimney/scripts.inc
	data/maps/MtPyre_Summit/scripts.inc
	data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
	include/constants/event_objects.h
	include/constants/expansion.h
	src/battle_script_commands.c
	src/battle_util.c
	src/field_screen_effect.c

2025-05-28 14:26:15 +02:00

..

ability

Master to upcoming merge

2025-05-26 10:41:11 +02:00

ai

Fix bad odds / defensive switchin double switch cases (#6927)

2025-05-26 16:59:25 +02:00

form_change

Changed Tackle for Scratch in tests (#6730)

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

gimmick

New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct (#6834)

2025-05-15 09:40:02 +02:00

hold_effect

Fixes Gen3 berry activation timing (#6993)

2025-05-27 23:36:00 +02:00

item_effect

Changed Tackle for Scratch in tests (#6730)

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

move_animations

Updated move animation tests (#6554)

2025-04-09 12:17:57 +02:00

move_effect

Merge branch 'master' into master-to-upcoming

2025-05-28 14:26:15 +02:00

move_effect_secondary

Merge branch 'master' into master-upcoming

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

move_effects_combined

Added weather accuracy move flags (#6857)

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

move_flags

Merge branch 'master' into master-upcoming

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

starting_status

Added missing Move Effect TODO tests - Volume E (#5915)

2025-01-01 16:06:20 +01:00

status1

Remove non-volatile status EFFECTs (#6772)

2025-05-16 22:52:51 +02:00

status2

Changed Tackle for Scratch in tests (#6730)

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

weather

Merge branch 'master' into master-upcoming

2025-05-12 18:21:35 +02:00

battle_message.c

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

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

crit_chance.c

Merge branch '_RHH/master' into _RHH/upcoming

2025-02-12 09:30:59 -03:00

damage_formula.c

Encapsulate move data (#5852)

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

end_turn_effects.c

review comments

2025-03-12 23:41:28 +01:00

exp.c

Changed Tackle for Scratch in tests (#6730)

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

move.c

Changed Tackle for Scratch in tests (#6730)

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

sleep_clause.c

Remove non-volatile status EFFECTs (#6772)

2025-05-16 22:52:51 +02:00

spread_moves.c

Fixes Emergency Exit and Eject Pack (#6459)

2025-03-29 14:04:01 +01:00

switch_in_abilities.c

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

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

test_runner_features.c

Test battlers always have their forced abilities (#4707)

2024-07-21 21:20:39 +02:00

trainer_control.c

Expand trainerproc to support additional battle types (#6770)

2025-05-17 15:08:44 +02:00

trainer_control.h

Expand trainerproc to support additional battle types (#6770)

2025-05-17 15:08:44 +02:00

trainer_control.party

Expand trainerproc to support additional battle types (#6770)

2025-05-17 15:08:44 +02:00

trainer_slides.c

Changed Tackle for Scratch in tests (#6730)

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

trainer_slides.h

Removed Trainer Slides footgun (#6205)

2025-02-07 13:30:57 +01:00