Hedara 2e4833240f Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge ...

Conflicts:
	include/item.h
	src/battle_ai_script_commands.c
	src/battle_main.c
	src/battle_pyramid_bag.c
	src/battle_script_commands.c
	src/battle_util.c
	src/item.c
	src/item_menu.c
	src/item_use.c
	src/pokemon.c
	src/pokemon_summary_screen.c
	src/shop.c

2025-05-24 21:24:56 +02:00

..

.gitignore

Competitive-formatted parties (#3545)

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

main.c

Fix trainers.party parser failing on apostrophes (#6938)

2025-05-21 10:41:18 +02:00

Makefile

Competitive-formatted parties (#3545)

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

trainerproc

Rename ItemId_GetX to GetItemX (#2116)

2025-05-22 13:27:52 +01:00