Eduardo Quezada 00e2ca6030 Merge branch '_RHH/master' into _RHH/upcoming ...

# Conflicts:
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	src/battle_ai_util.c
#	src/battle_script_commands.c
#	src/battle_tv.c
#	src/data/battle_moves.h
#	src/data/pokemon/species_info/gen_9.h

2024-01-22 15:56:10 -03:00

..

ability

Merge branch '_RHH/master' into _RHH/upcoming

2024-01-22 15:56:10 -03:00

form_change

Tweaked helper functions

2023-12-30 17:42:53 +09:00

hold_effect

Merge branch '_RHH/master' into _RHH/upcoming

2024-01-22 15:56:10 -03:00

item_effect

Added last CannotUseItemsInBattle tests (#3789)

2023-12-21 20:06:12 +01:00

move_effect

Merge branch '_RHH/master' into _RHH/upcoming

2024-01-22 15:56:10 -03:00

move_flags

Removed ALWAYS_CRIT, renamed critBoost (#3779)

2023-12-20 16:16:02 +01:00

status1

Test improvements (#3408)

2023-10-12 12:14:07 +02:00

terrain

Species Simplifier™ - Part 3 (#3562)

2023-12-08 15:05:10 +01:00

weather

Remove all trailing whitespace (upcoming) (#3473)

2023-10-27 13:54:55 -03:00

ai_check_viability.c

Applied more review fixes

2024-01-12 03:02:48 +09:00

ai_trytofaint.c

Remove function GetMoveDamageResult (#3536)

2023-11-09 20:53:14 +01:00

ai.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-01-09 09:19:12 -03:00

crit_chance.c

Removed ALWAYS_CRIT, renamed critBoost (#3779)

2023-12-20 16:16:02 +01:00

damage_formula.c

Adds combined pledge move effects (#3336)

2023-11-21 16:23:22 +01:00

exp.c

Fix Wall Werrors on modern (#3412)

2023-10-13 18:39:35 +02:00

move.c

Tweaked helper functions

2023-12-30 17:42:53 +09:00

trainer_control.c

Backwards-compatible BoxPokémon Refactor (#3438)

2023-12-27 17:48:17 +01:00