Hedara 0eeba00d1b Merge branch 'master' into master-upcoming-2025-04-30 ...

Conflicts:
	include/battle.h
	include/constants/expansion.h
	include/graphics.h
	src/battle_bg.c
	src/battle_util.c
	src/data/graphics/battle_terrain.h
	src/data/graphics/pokemon.h
	src/pokeblock_feed.c
	src/pokemon_sprite_visualizer.c

2025-04-30 15:22:37 +02:00

..

ability

27/04/25 Master to upcoming merge

2025-04-27 09:50:25 +02:00

ai

Fix party data assignment (#6712)

2025-04-28 08:48:21 +02:00

form_change

Encapsulate move data (#5852)

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

gimmick

17-04-25-master-merge

2025-04-17 14:14:37 +02:00

hold_effect

27/04/25 Master to upcoming merge

2025-04-27 09:50:25 +02:00

item_effect

Fix using items to heal partner in battle

2025-04-01 10:38:12 +02:00

move_animations

Updated move animation tests (#6554)

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

move_effect

Merge branch 'master' into master-upcoming-2025-04-30

2025-04-30 15:22:37 +02:00

move_effect_secondary

27/04/25 Master to upcoming merge

2025-04-27 09:50:25 +02:00

move_effects_combined

Merge branch '_RHH/master' into _RHH/upcoming

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

move_flags

Added missing gMovesInfo encapsulation (#6656)

2025-04-20 22:36:27 +02:00

starting_status

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

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

status1

Test for Freeze vs Scald thaw (#6658)

2025-04-20 22:36:50 +02:00

status2

Merge branch '_RHH/master' into _RHH/upcoming

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

weather

Configuration to make all Hail moves summon Snow or vis versa, to have only one ice weather (#6149)

2025-03-12 21:31:45 +01: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

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

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

move.c

Merge branch '_RHH/master' into _RHH/upcoming

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

sleep_clause.c

Fixes Magic Coat message when move is bounced back (#6419)

2025-03-19 13:57:48 +01:00

spread_moves.c

Fixes Emergency Exit and Eject Pack (#6459)

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

test_runner_features.c

Test battlers always have their forced abilities (#4707)

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

trainer_control.c

Trainer Party Pools (#5731)

2025-01-25 13:28:46 +01:00

trainer_control.h

Make generated files match the current formatting (#6636)

2025-04-17 13:38:30 +02:00

trainer_control.party

Trainer Party Pools (#5731)

2025-01-25 13:28:46 +01:00

trainer_slides.c

Fixed missing move encapsulation in upcoming (#6226)

2025-02-09 20:03:53 +01:00

trainer_slides.h

Removed Trainer Slides footgun (#6205)

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