Hedara da77dba59f Merge remote-tracking branch 'pret/master' into pret-merge ...

Conflicts:
	data/battle_scripts_1.s
	include/constants/battle.h
	src/battle_script_commands.c
	src/battle_util.c

2025-08-21 15:40:38 +02:00

..

aif2pcm

…

bin2c

…

gbafix

…

gbagfx

Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727

2025-07-27 11:59:07 -04:00

jsonproc

…

learnset_helpers

Pokedex Plus HGSS move configs (#6687)

2025-04-24 19:34:37 +02:00

mapjson

Merge commit '07c897a' into pret-merge

2025-05-27 19:46:13 +02:00

mgba

…

mgba-rom-test-hydra

Remove files that should not have been committed

2025-05-13 14:56:31 +01:00

mid2agb

Merge remote-tracking branch 'pret/master' into pret-merge

2025-08-21 15:40:38 +02:00

patchelf

Remove files that should not have been committed

2025-05-13 14:56:31 +01:00

preproc

Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727

2025-07-27 11:59:07 -04:00

ramscrgen

…

rsfont

…

scaninc

…

trainerproc

Merge branch 'master' into master-upcoming

2025-05-22 15:41:08 +02:00

wild_encounters

fix: better area mons handling, no longer duplicates hiddenMons field (#6945)

2025-05-30 17:22:05 +02:00