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
..
2021-11-07 13:33:05 -05:00
2021-07-20 15:18:31 -04:00
2024-11-03 10:11:05 -05:00
2024-01-22 19:12:52 -03:00
2024-05-30 13:56:14 -04:00
2025-01-17 17:54:38 +00:00
2023-08-04 14:17:28 -04:00
2023-11-23 21:31:33 +01:00
2022-09-11 14:14:49 -04:00
2021-07-20 15:18:31 -04:00
2025-02-12 14:31:42 +01:00
2021-07-20 15:18:31 -04:00