Hedara 1916703e5a Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge ...

Conflicts:
	include/battle_script_commands.h
	include/constants/event_objects.h
	include/event_object_movement.h
	include/field_effect.h
	include/field_effect_helpers.h
	include/sprite.h
	src/battle_controller_player.c
	src/event_object_movement.c
	src/pokeball.c

2025-06-25 17:49:19 +02:00

..

map.json

Continue adding local IDs to map.json files

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

scripts.inc

Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge

2025-06-25 17:49:19 +02:00