Eduardo Quezada 75ad61e5bf Merge branch '_RHH/master' into _RHH/upcoming ...

# Conflicts:
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	src/battle_ai_main.c
#	src/battle_ai_util.c
#	src/battle_tv.c
#	src/data/battle_moves.h
#	src/data/graphics/pokemon.h

2024-02-19 10:13:13 -03:00

..

ability

Merge branch '_RHH/master' into _RHH/upcoming

2024-02-19 10:13:13 -03:00

form_change

Merge branch '_RHH/master' into _RHH/upcoming

2024-02-09 17:02:56 -03:00

hold_effect

Merge branch '_RHH/master' into _RHH/upcoming

2024-02-08 12:19:51 -03:00

item_effect

Merge branch '_RHH/master' into _RHH/upcoming

2024-02-09 17:02:56 -03:00

move_effect

Merge branch '_RHH/master' into _RHH/upcoming

2024-02-19 10:13:13 -03:00

move_flags

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

status1

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

terrain

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

weather

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

ai_calc_best_move_score.c

fix omniscient flag (#4114)

2024-02-02 08:49:36 -07:00

ai_check_viability.c

Adds Powerful status move flag (#4125)

2024-02-18 15:05:08 +01:00

ai_powerful_status.c

Adds Powerful status move flag (#4125)

2024-02-18 15:05:08 +01:00

ai_trytofaint.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

ai.c

Secondary effects overhaul minor follow-up (#4062)

2024-02-04 23:02:59 +01:00

crit_chance.c

Adds Dragon Cheer (#4122)

2024-02-03 08:00:41 -07:00

damage_formula.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

exp.c

Fix Wall Werrors on modern (#3412)

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

move.c

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

trainer_control.c

Sets neutral nature and ability 0 as default in trainer control (#4172)

2024-02-18 15:02:58 +01:00