Hedara c27930eabf Merge commit '678fdf9' into pret-merge ... Conflicts: data/maps/BirthIsland_Exterior/scripts.inc data/maps/DesertUnderpass/scripts.inc data/maps/Route117/scripts.inc data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc data/maps/SootopolisCity/scripts.inc include/constants/event_objects.h src/battle_setup.c src/event_object_movement.c src/field_control_avatar.c src/item_use.c src/scrcmd.c tools/mapjson/mapjson.cpp		2025-05-27 19:22:40 +02:00
..
aif2pcm
bin2c
gbafix
gbagfx	Pret merge (20th of June) (#4845)	2024-06-21 12:21:29 +02:00
jsonproc	[Build System Rewrite] mapjson now takes output directory parameters. (#1949)	2024-08-29 14:01:01 -04:00
learnset_helpers	Fix move names in learnset helper (#6510)	2025-03-31 13:41:51 +02:00
mapjson	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
mgba	Support make check on macOS (#6513)	2025-04-01 21:52:49 +02:00
mgba-rom-test-hydra	Made memory integrity checks run betweeen PARAMETRIZE runs (#6462)	2025-03-28 21:43:04 +01:00
mid2agb
patchelf
preproc	Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015	2024-10-15 20:56:56 -03:00
ramscrgen	Get rid of common syms (#2040)	2024-10-14 23:52:11 -04:00
rsfont
scaninc	Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015	2024-10-15 20:56:56 -03:00
trainerproc	Fix trainers.party parser failing on apostrophes (#6938)	2025-05-21 10:41:18 +02:00