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

..

map.json

Merge commit '678fdf9' into pret-merge

2025-05-27 19:22:40 +02:00

scripts.inc

Generate local IDs from map.json files

2024-10-12 03:04:24 -04:00