Eduardo Quezada fcdc9ed65a Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # src/battle_util.c # src/data/pokemon/species_info/gen_7_families.h # test/battle/ability/download.c # test/battle/ability/intimidate.c # test/battle/ability/supreme_overlord.c # test/battle/ability/zero_to_hero.c # test/battle/ai/ai.c # test/battle/move_effect/plasma_fists.c		2024-07-05 14:25:25 -04:00
..
aif2pcm
bin2c
gbafix
gbagfx	Pret merge (20th of June) (#4845)	2024-06-21 12:21:29 +02:00
jsonproc
learnset_helpers	Fix teachable learnsets crashing in some environments (#4389)	2024-04-15 15:57:42 -04:00
mapjson
mgba
mgba-rom-test-hydra
mid2agb
patchelf
preproc	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-05-16 17:31:46 -04:00
ramscrgen
rsfont
scaninc
trainerproc	Gimmick Refactor (#4449)	2024-06-22 22:25:40 +02:00