Eduardo Quezada 2b40e79ac3 Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # include/battle_util.h # src/battle_ai_main.c		2024-07-14 22:44:00 -04: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	jsonproc: filter out every non-alphanumeric character	2024-01-27 19:29:29 -08:00
learnset_helpers	Fix teachable learnsets crashing in some environments (#4389)	2024-04-15 15:57:42 -04:00
mapjson	Merge branch 'master' of https://github.com/pret/pokeemerald into rhhpretmerge	2023-05-12 13:48:52 +02:00
mgba	Test moves, items, and abilities in battle	2023-02-01 13:53:57 +00:00
mgba-rom-test-hydra	Added passing "KNOWN_FAILING" to test summary (#4063)	2024-01-29 17:01:50 -03: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 '_RHH/master' into _RHH/upcoming	2024-07-14 22:44:00 -04: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	Minor shouldUseGimmick refactor (#4962)	2024-07-13 20:56:18 +02:00