Eduardo Quezada 4c57b84cd9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602 ... # Conflicts: # graphics/pokemon/mawile/footprint.png # src/battle_gfx_sfx_util.c # src/fldeff_sweetscent.c # src/pokedex.c		2023-06-02 11:45:28 -04:00
..
aif2pcm
bin2c
gbafix
gbagfx	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602	2023-06-02 11:45:28 -04:00
jsonproc
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	Hydra OSX support	2023-05-03 15:36:17 +02:00
mid2agb
patchelf	Hydra OSX support	2023-05-03 15:36:17 +02:00
preproc	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303	2023-03-03 11:00:50 -03:00
ramscrgen
rsfont
scaninc	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303	2023-03-03 11:00:50 -03:00