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

..

battle

Merge branch '_RHH/master' into _RHH/upcoming

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

fpmath.c

Merge branch 'RHH/master' into RHH/upcoming

2023-08-12 16:31:44 -04:00

pokemon.c

Add createmon Script Cmd, Support for 2v1Wild Battles (#4688)

2024-06-13 19:11:36 +02:00

random.c

Optional high-quality RNG (#3780)

2023-12-22 17:39:15 +00:00

species.c

Merge branch '_RHH/master' into _RHH/upcoming

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

sprite.c

Merge branch 'RHH/master' into RHH/upcoming

2023-08-12 16:31:44 -04:00

test_runner_args.c

Test moves, items, and abilities in battle

2023-02-01 13:53:57 +00:00

test_runner_battle.c

Gimmick Refactor (#4449)

2024-06-22 22:25:40 +02:00

test_runner.c

Merge branch '_RHH/master' into _RHH/upcoming

2024-06-04 16:47:29 -04:00

text.c

Vanilla species names fit in health box without narrowing (#4979)

2024-07-15 16:01:36 +01:00