mirror of
https://github.com/pret/pokeemerald.git
synced 2026-09-17 07:25:23 -05:00
Conflicts: include/constants/event_objects.h src/event_object_movement.c src/follower_helper.c
Conflicts: include/constants/event_objects.h src/event_object_movement.c src/follower_helper.c