Commit Graph

6 Commits

Author SHA1 Message Date
Eduardo Quezada
9917f5cc8b Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303
# Conflicts:
#	Makefile
#	include/constants/pokemon.h
#	include/pokemon.h
#	make_tools.mk
#	src/battle_ai_script_commands.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/party_menu.c
#	src/pokemon.c
#	src/trade.c
#	src/trainer_pokemon_sprites.c
2023-03-03 11:00:50 -03:00
Eduardo Quezada
d00c8902f9 Whitelist instead of Blacklist for TOOLDIRS in Makefiles 2023-02-25 16:49:41 -03:00
Martin Griffin
f933ad3183 Build patchelf and hydra only for check 2023-02-10 18:06:15 +01:00
Martin Griffin
f1b9872bf0 Test moves, items, and abilities in battle
Thank you to SBird for providing mgba-rom-test binaries and Spikes/Toxic
Spikes tests!

Co-authored-by: sbird <sbird@no.tld>
2023-02-01 13:53:57 +00:00
luckytyphlosion
92152e45e2 Fixes to makefile.
Merge C_ASM_DEP and DATA_ASM_DEP, NODEP and SCAN_DEPS can be overridden, add --no-print-directory to MAKEFLAGS in make_tools.mk (also removed some unused variables), add newline to help message in preproc.
2021-06-01 23:22:15 -04:00
luckytyphlosion
a839463c84 Optimize Makefile.
Don't do recursive makes for COMPARE and MODERN, use minimal makefile for making tools.
2021-06-01 20:40:11 -04:00