Eduardo Quezada 831b394ca1 Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909 ...

# Conflicts:
#	Makefile
#	include/battle.h
#	include/battle_main.h
#	include/battle_util.h
#	include/data.h
#	make_tools.mk
#	map_data_rules.mk
#	src/battle_setup.c
#	src/fieldmap.c

2024-09-11 15:26:14 -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 branch '_pret/master' into _RHH/pr/master/pretSync20240909

2024-09-11 15:26:14 -03:00

mapjson.h

convert mapjson.py to mapjson.cpp

2019-02-03 09:38:29 -06:00