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	Cleanup and add game version flag to mapjson tool	2019-02-04 17:28:45 -06:00
json11.cpp	convert mapjson.py to mapjson.cpp	2019-02-03 09:38:29 -06:00
json11.h	convert mapjson.py to mapjson.cpp	2019-02-03 09:38:29 -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
mapjson.cpp	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303	2023-03-03 11:00:50 -03:00
mapjson.h	convert mapjson.py to mapjson.cpp	2019-02-03 09:38:29 -06:00