Eduardo Quezada 35a76248d1 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # src/data/pokemon/species_info/gen_4_families.h		2024-05-06 16:03:29 -04:00
..
aif2pcm
bin2c
gbafix
gbagfx
jsonproc
learnset_helpers
mapjson
mgba
mgba-rom-test-hydra
mid2agb
patchelf
preproc
ramscrgen
rsfont
scaninc
trainerproc	Adds support for shouldDynamax and shouldTerastal in trainer parties (#4431)	2024-04-23 17:54:46 +01:00
test.py	Shiny Gen 7 sprites (gotta fix regular palettes)	2024-04-26 11:43:34 -04:00