Eduardo Quezada 831b394ca1 Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909 ... # Conflicts: # Makefile # include/battle.h # include/battle_main.h # include/battle_util.h # include/data.h # make_tools.mk # map_data_rules.mk # src/battle_setup.c # src/fieldmap.c		2024-09-11 15:26:14 -03: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	Remove trailing whitespace (master) (#5174)	2024-08-14 19:48:20 -07:00
mapjson	Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909	2024-09-11 15:26:14 -03:00
mgba	Test moves, items, and abilities in battle	2023-02-01 13:53:57 +00:00
mgba-rom-test-hydra	Improved Test Runner Summary (#4641)	2024-07-20 18:22:40 +02:00
mid2agb	use floats for tempo calculation	2022-06-28 00:11:59 -04:00
patchelf	Hydra OSX support	2023-05-03 15:36:17 +02:00
preproc	Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909	2024-09-11 15:26:14 -03:00
ramscrgen	[Round 3] Apply all source related changes for the new INSTALL.md in one commit.	2020-12-16 21:24:44 -05:00
rsfont	Fix finding libpng in gbagfx and rsfont	2022-03-16 14:41:12 +01:00
scaninc	Merge branch 'followers' into followers-expanded-id	2023-12-31 01:49:56 -05:00
trainerproc	trainerproc: Parse line markers (#5122)	2024-08-08 20:12:18 +02:00