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
..
aif2pcm	Remove all leading whitespace	2023-10-23 13:24:38 -05:00
bin2c	[Round 3] Apply all source related changes for the new INSTALL.md in one commit.	2020-12-16 21:24:44 -05:00
gbafix	Merge branch 'master' of https://github.com/pret/pokeemerald	2021-05-23 10:51:26 -04:00
gbagfx	Pret merge (20th of June) (#4845)	2024-06-21 12:21:29 +02:00
jsonproc	[Build System Rewrite] mapjson now takes output directory parameters. (#1949)	2024-08-29 14:01:01 -04:00
learnset_helpers	Fix move names in learnset helper (#6510)	2025-03-31 13:41:51 +02:00
mapjson	Merge remote-tracking branch 'pret/master' into pret-merge-2025-05-02	2025-05-02 17:29:41 +02:00
mgba	Support make check on macOS (#6513)	2025-04-01 21:52:49 +02:00
mgba-rom-test-hydra	Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge	2025-05-24 21:24:56 +02:00
mid2agb	use floats for tempo calculation	2022-06-28 00:11:59 -04:00
patchelf	Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge	2025-05-24 21:24:56 +02:00
preproc	Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015	2024-10-15 20:56:56 -03:00
ramscrgen	Get rid of common syms (#2040)	2024-10-14 23:52:11 -04:00
rsfont	Fix finding libpng in gbagfx and rsfont	2022-03-16 14:41:12 +01:00
scaninc	Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015	2024-10-15 20:56:56 -03:00
trainerproc	Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge	2025-05-24 21:24:56 +02:00