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

..

.gitignore

adding tools from pokeruby

2017-12-03 19:55:01 -06:00

asm_file.cpp

Let scaninc/preproc ignore empty asm files

2023-02-27 12:47:35 -05:00

asm_file.h

adding tools from pokeruby

2017-12-03 19:55:01 -06:00

c_file.cpp

Fix C comment consumption logic

2019-02-13 21:55:39 -06:00

c_file.h

adding tools from pokeruby

2017-12-03 19:55:01 -06:00

LICENSE

adding tools from pokeruby

2017-12-03 19:55:01 -06:00

Makefile

[Round 3] Apply all source related changes for the new INSTALL.md in one commit.

2020-12-16 21:24:44 -05:00

scaninc.cpp

Missing inc files in asm/*.s and data/*.s will raise an actual error message.

2020-11-12 11:04:38 -05:00

scaninc.h

Fix copyright mixup

2019-03-07 08:46:55 -06:00

source_file.cpp

Further removed trailing whitespaces

2022-09-13 16:26:36 -03:00

source_file.h

Update scaninc to include missing .include files in assembler files

2019-08-29 16:37:42 -05:00