Eduardo Quezada 2b40e79ac3 Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # include/battle_util.h # src/battle_ai_main.c		2024-07-14 22:44:00 -04:00
..
aif2pcm
bin2c
gbafix
gbagfx
jsonproc
learnset_helpers
mapjson
mgba
mgba-rom-test-hydra
mid2agb
patchelf
preproc	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-14 22:44:00 -04:00
ramscrgen
rsfont
scaninc
trainerproc	Minor shouldUseGimmick refactor (#4962)	2024-07-13 20:56:18 +02:00