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.h

Merge branch '_RHH/master' into _RHH/upcoming

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

overworld_script.h

Backwards-compatible BoxPokémon Refactor (#3438)

2023-12-27 17:48:17 +01:00

test.h

Rename MgbaPrintf_ to Test_MgbaPrintf (#4642)

2024-05-31 17:54:25 +02:00