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
..
2024-04-27 19:35:42 +02:00
2023-11-24 16:19:32 +01:00
2024-05-19 10:14:31 +02:00
2023-02-01 11:48:55 -05:00
2025-04-30 11:26:09 +02:00
2025-05-27 19:22:40 +02:00
2025-05-07 16:50:12 +02:00
2025-02-10 00:30:54 +01:00
2024-08-14 13:02:40 +02:00
2024-04-06 15:05:15 -03:00
2022-11-22 02:17:03 -05:00
2023-12-20 12:38:28 +01:00
2024-08-15 23:00:20 +02:00
2023-01-28 09:03:18 -05:00
2024-10-04 12:56:21 -04:00