pokeemerald/tools
Hedara 90aed43c27 Merge branch 'master' into master-upcoming
Conflicts:
	.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
	.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
	.github/ISSUE_TEMPLATE/03_feature_requests.yaml
	.github/ISSUE_TEMPLATE/04_other_errors.yaml
	.github/pull_request_template.md
	src/battle_controller_player.c
	src/battle_main.c
	src/battle_script_commands.c
	src/battle_util.c
	src/data/graphics/pokemon.h
	src/data/pokemon/species_info/gen_9_families.h
	test/battle/ability/flower_veil.c
	test/battle/ability/sweet_veil.c
	test/battle/ability/synchronize.c
	test/battle/ability/water_bubble.c
	test/battle/move_effect/fell_stinger.c
	test/battle/move_effect/level_damage.c
	test/battle/move_effect/magic_room.c
	test/battle/move_effect/me_first.c
	test/battle/move_effect/sky_drop.c
	test/battle/move_effect/smack_down.c
	test/battle/move_effect/wish.c
	test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
2025-05-22 15:41:08 +02:00
..
aif2pcm Remove all leading whitespace 2023-10-23 13:24:38 -05:00
bin2c [Round 3] Apply all source related changes for the new INSTALL.md in one commit. 2020-12-16 21:24:44 -05:00
gbafix Merge branch 'master' of https://github.com/pret/pokeemerald 2021-05-23 10:51:26 -04:00
gbagfx More review addressing 2025-01-17 18:47:38 -03:00
jsonproc [Build System Rewrite] mapjson now takes output directory parameters. (#1949) 2024-08-29 14:01:01 -04:00
learnset_helpers Pokedex Plus HGSS move configs (#6687) 2025-04-24 19:34:37 +02:00
mapjson Merge remote-tracking branch 'pret/master' into pret-merge-2025-05-02 2025-05-02 17:29:41 +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 Low Health Beeps Configuration (#6328) 2025-03-15 22:02:48 -07:00
patchelf Hydra OSX support 2023-05-03 15:36:17 +02:00
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 Fix finding libpng in gbagfx and rsfont 2022-03-16 14:41:12 +01:00
scaninc Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015 2024-10-15 20:56:56 -03:00
trainerproc Merge branch 'master' into master-upcoming 2025-05-22 15:41:08 +02:00
wild_encounters Remove hardcoded values from wild_encounter.h generation (#6640) 2025-04-20 22:27:36 +02:00