Hedara 51a5577f65 Merge branch 'master' into master-upcoming ...

Conflicts:
	src/battle_controller_safari.c
	src/data/moves_info.h
	src/graphics.c

2025-06-25 14:17:07 +02:00

..

ability

Merge branch 'master' into master-upcoming

2025-06-25 14:17:07 +02:00

ai

comment test

2025-06-20 17:31:16 +02:00

form_change

Converted Relic Song into a proper form change (#7139)

2025-06-17 00:02:25 +02:00

gimmick

Master to upcoming merge, 20/06/25

2025-06-20 17:09:58 +02:00

hold_effect

Master to upcoming merge, 20/06/25

2025-06-20 17:09:58 +02:00

item_effect

Changed Tackle for Scratch in tests (#6730)

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

move_animations

Stat Change (Animation) Refactor (#7144)

2025-06-18 14:24:35 +02:00

move_effect

Master to upcoming merge, 20/06/25 (#7169)

2025-06-23 10:04:44 +02:00

move_effect_secondary

Add dedicated getter functions for Pokémon types and abilities (#7043)

2025-06-03 22:05:22 +02:00

move_effects_combined

Removed Mind Blown effect in favor of move flag (#7138)

2025-06-17 00:02:46 +02:00

move_flags

Master to upcoming merge, 20/06/25

2025-06-20 17:09:58 +02:00

starting_status

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

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

status1

Add dedicated getter functions for Pokémon types and abilities (#7043)

2025-06-03 22:05:22 +02:00

status2

Changed Tackle for Scratch in tests (#6730)

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

weather

Add dedicated getter functions for Pokémon types and abilities (#7043)

2025-06-03 22:05:22 +02:00

battle_message.c

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

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

crit_chance.c

Add dedicated getter functions for Pokémon types and abilities (#7043)

2025-06-03 22:05:22 +02:00

damage_formula.c

Encapsulate move data (#5852)

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

defrost.c

Fixes spread move fire types not defrosting all targets (#6998)

2025-05-29 11:25:10 +02: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

Combines Super Fang and Guardian of Alola effects (#7048)

2025-06-03 10:26:25 +02:00

sleep_clause.c

Remove non-volatile status EFFECTs (#6772)

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

spread_moves.c

Fixes spread move fire types not defrosting all targets (#6998)

2025-05-29 11:25:10 +02: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

Add dedicated getter functions for Pokémon types and abilities (#7043)

2025-06-03 22:05:22 +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

Add dedicated getter functions for Pokémon types and abilities (#7043)

2025-06-03 22:05:22 +02:00

trainer_slides.h

Removed Trainer Slides footgun (#6205)

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