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

..

bug_bite.c

Small Battle Test reorganization (#4504)

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

burn.c

Small Battle Test reorganization (#4504)

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

confusion.c

Small Battle Test reorganization (#4504)

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

def_minus_1.c

Small Battle Test reorganization (#4504)

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

dire_claw.c

Added missing redirect abilities Gen 3-4 config (#4920)

2024-07-07 09:52:59 +02:00

double_power_on_arg_status.c

Small Battle Test reorganization (#4504)

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

flinch.c

Small Battle Test reorganization (#4504)

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

freeze.c

fix tests when B_USE_FROSTBITE is TRUE (#4986)

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

paralysis.c

Small Battle Test reorganization (#4504)

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

pay_day.c

Small Battle Test reorganization (#4504)

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

poison.c

Small Battle Test reorganization (#4504)

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

psychic_noise.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-05-06 15:29:21 -04:00

rapid_spin.c

Small Battle Test reorganization (#4504)

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

sp_atk_minus_2.c

Remove and replace MOVE_EFFECT_SP_ATK_TWO_DOWN (#4557)

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

spd_minus_2.c

Small Battle Test reorganization (#4504)

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

spikes.c

Small Battle Test reorganization (#4504)

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

stealth_rock.c

Small Battle Test reorganization (#4504)

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

syrup_bomb.c

Add switching message macros for tests (#4717)

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

thrash.c

Rampage moves always confuse on final turn (#4722)

2024-06-05 05:38:04 +02:00

throat_chop.c

Small Battle Test reorganization (#4504)

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

trap_both.c

Small Battle Test reorganization (#4504)

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

tri_attack.c

fix tests when B_USE_FROSTBITE is TRUE (#4986)

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