Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-06-03 06:15:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
c27930eabf
pokeemerald/tools/mapjson
History
Hedara c27930eabf Merge commit '678fdf9' into pret-merge 
Conflicts:
	data/maps/BirthIsland_Exterior/scripts.inc
	data/maps/DesertUnderpass/scripts.inc
	data/maps/Route117/scripts.inc
	data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
	data/maps/SootopolisCity/scripts.inc
	include/constants/event_objects.h
	src/battle_setup.c
	src/event_object_movement.c
	src/field_control_avatar.c
	src/item_use.c
	src/scrcmd.c
	tools/mapjson/mapjson.cpp
2025-05-27 19:22:40 +02:00
..
.gitignore Cleanup and add game version flag to mapjson tool 2019-02-04 17:28:45 -06:00
json11.cpp Added missing include due to g++ changes 2025-05-02 16:03:55 +02: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 commit '678fdf9' into pret-merge 2025-05-27 19:22:40 +02:00
mapjson.h convert mapjson.py to mapjson.cpp 2019-02-03 09:38:29 -06:00