Eduardo Quezada 749225ace1 Matching merge from upstream pret ... # Conflicts: # graphics/interface/menu_info.png # include/pokemon.h # src/battle_ai_switch_items.c # src/battle_anim_mons.c # src/battle_anim_water.c # src/battle_controller_opponent.c # src/battle_gfx_sfx_util.c # src/battle_main.c # src/battle_pike.c # src/battle_script_commands.c # src/data/pokemon/species_info.h # src/pokemon.c # src/pokemon_summary_screen.c		2023-01-20 12:31:54 -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/pr/sync/pretmerge_20221030	2022-10-30 12:30:38 -03:00
mid2agb	use floats for tempo calculation	2022-06-28 00:11:59 -04:00
preproc	Further removed trailing whitespaces	2022-09-13 16:26:36 -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	Further removed trailing whitespaces	2022-09-13 16:26:36 -03:00