Eduardo Quezada 9917f5cc8b Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 ... # Conflicts: # Makefile # include/constants/pokemon.h # include/pokemon.h # make_tools.mk # src/battle_ai_script_commands.c # src/battle_controllers.c # src/battle_main.c # src/battle_script_commands.c # src/party_menu.c # src/pokemon.c # src/trade.c # src/trainer_pokemon_sprites.c		2023-03-03 11:00:50 -03:00
..
aif2pcm	Further removed trailing whitespaces	2022-09-13 16:26:36 -03: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	Matching merge from upstream pret	2023-01-20 12:31:54 -03:00
jsonproc	Fix build of jsonproc	2022-11-02 19:51:43 -05:00
mapjson	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303	2023-03-03 11:00:50 -03:00
mgba	Test moves, items, and abilities in battle	2023-02-01 13:53:57 +00:00
mgba-rom-test-hydra	Hydra fixes and improvements (#2718)	2023-02-21 16:30:42 +01:00
mid2agb	use floats for tempo calculation	2022-06-28 00:11:59 -04:00
patchelf	Test moves, items, and abilities in battle	2023-02-01 13:53:57 +00:00
preproc	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303	2023-03-03 11:00:50 -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 remote-tracking branch 'pret/master' into RHH/sync/pret_20230303	2023-03-03 11:00:50 -03:00