Eduardo Quezada 98eb4e5027 Merge branch '_RHH/master' into _RHH/upcoming ...

# Conflicts:
#	asm/macros/battle_script.inc
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/frontier_util.c
#	test/battle/ai/ai.c

2024-07-19 09:20:05 -04:00

..

ability

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-19 09:20:05 -04:00

ai

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-19 09:20:05 -04:00

form_change

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-19 09:20:05 -04:00

gimmick

Fix Tera indicators (#4960)

2024-07-13 23:08:43 +02:00

hold_effect

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-19 09:20:05 -04:00

item_effect

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-05 14:25:25 -04:00

move_animations

Fix Smack Down anim + move anim tests (#4774)

2024-06-13 15:30:28 -04:00

move_effect

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-14 22:44:00 -04:00

move_effect_secondary

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-19 09:20:05 -04:00

move_effects_combined

fix tests when B_USE_FROSTBITE is TRUE (#4986)

2024-07-17 23:23:52 +02:00

move_flags

ignoresTargetAbility doesnt ignore the attacker's ability (#4855)

2024-06-22 09:52:25 +02:00

status1

Remove Duplicate ai code from battle_ai_util.c (#4883)

2024-07-03 10:48:31 +02:00

status2

Confusion, cursed body and poison touch trigger chance fixes and tests (#4831)

2024-06-18 20:07:40 +02:00

terrain

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-05 14:25:25 -04:00

weather

Refactors residual damage (#4945)

2024-07-13 12:12:40 +02:00

battle_message.c

Add switching message macros for tests (#4717)

2024-06-03 19:59:28 -04:00

crit_chance.c

Add RandomChance macro and ability trigger chance config (#4829)

2024-06-18 20:13:44 +02: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

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-19 09:20:05 -04:00

trainer_control.h

Minor shouldUseGimmick refactor (#4962)

2024-07-13 20:56:18 +02:00

trainer_control.party

Competitive-formatted parties (#3545)

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