Eduardo Quezada 80b193280d Merge branch '_RHH/master' into _RHH/upcoming ...

# Conflicts:
#	src/battle_main.c
#	src/data/item_icon_table.h
#	src/data/pokemon/species_info/gen_9_families.h

2024-05-27 10:13:42 -04:00

..

ability

Merge branch '_RHH/master' into _RHH/upcoming

2024-05-27 10:13:42 -04:00

form_change

Opponents Shaymin Sky form correctly reverts on frozen status (#4559)

2024-05-14 13:28:10 +02:00

gimmick

Merge branch '_RHH/master' into _RHH/upcoming

2024-05-27 10:13:42 -04:00

hold_effect

Merge branch '_RHH/master' into _RHH/upcoming

2024-05-27 10:13:42 -04:00

item_effect

Merge branch '_RHH/master' into _RHH/upcoming

2024-05-27 10:13:42 -04:00

move_effect

Merge branch '_RHH/master' into _RHH/upcoming

2024-05-27 10:13:42 -04:00

move_effect_secondary

Remove and replace MOVE_EFFECT_SP_ATK_TWO_DOWN (#4557)

2024-05-12 15:07:43 +02:00

move_effects_combined

Small Battle Test reorganization (#4504)

2024-05-06 09:36:52 +02:00

move_flags

Small Battle Test reorganization (#4504)

2024-05-06 09:36:52 +02:00

status1

Move data unification (#3999)

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

terrain

Merge branch '_RHH/master' into _RHH/upcoming

2024-05-27 10:13:42 -04:00

weather

Combine weather set commands (#4434)

2024-04-24 14:10:25 -04:00

ai_calc_best_move_score.c

Renamed "MoveHasMoveEffect" functions

2024-02-26 14:21:38 +09:00

ai_check_viability.c

Merge remote-tracking branch 'rhh/upcoming' into battlemove_refactored

2024-02-26 14:23:53 +09:00

ai_powerful_status.c

Fixed test

2024-02-26 15:12:34 +09:00

ai_trytofaint.c

Make AI see Loaded Dice hold effect for multi hit moves that strike 5… (#4622)

2024-05-26 22:19:45 +02:00

ai.c

AI respects partner when using spread moves in double battles (#4518)

2024-05-17 00:41:55 +02:00

crit_chance.c

Adds Dragon Cheer (#4122)

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

damage_formula.c

Enable GF move names by default

2024-04-25 18:40:37 +01:00

exp.c

Fix Wall Werrors on modern (#3412)

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

move.c

Apply suggestions from code review

2024-02-26 23:59:15 +09:00

trainer_control.c

Competitive-formatted parties (#3545)

2024-04-06 15:05:15 -03:00

trainer_control.h

Add missing shouldDynamax (#4442)

2024-04-25 10:10:36 +02:00

trainer_control.party

Competitive-formatted parties (#3545)

2024-04-06 15:05:15 -03:00