Eduardo Quezada 569749f9c2 Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # Makefile # gflib/sprite.h # graphics/object_events/pics/pokemon/wailord.png # include/constants/event_objects.h # include/random.h # src/data/object_events/object_event_graphics.h # src/data/object_events/object_event_graphics_info.h # src/data/object_events/object_event_graphics_info_pointers.h # src/event_object_movement.c # src/random.c # src/scrcmd.c		2024-05-18 10:12:17 -04:00
..
base_oam.h	Move field effects data and graphics into own directory, and cleanup naming for object events	2020-02-12 17:32:51 -06:00
berry_tree_graphics_tables.h	Fix extended berry stage palettes	2024-01-05 11:32:59 +01:00
movement_action_func_tables.h	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-01-17 18:11:35 -03:00
movement_type_func_tables.h	refactor: code review for expansion	2024-05-17 20:45:32 -04:00
object_event_anims.h	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers	2024-02-17 23:40:08 -03:00
object_event_graphics_info_followers.h	Final cleanup	2024-05-16 18:08:10 -04:00
object_event_graphics_info_pointers.h	Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers	2024-05-18 10:12:17 -04:00
object_event_graphics_info.h	Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers	2024-05-18 10:12:17 -04:00
object_event_graphics.h	Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers	2024-05-18 10:12:17 -04:00
object_event_pic_tables_followers.h	TEMPORARY: Reverted Gen 4-8 followers	2024-05-17 14:40:45 -04:00
object_event_pic_tables.h	Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers	2024-05-18 10:12:17 -04:00
object_event_subsprites.h	Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers	2024-05-18 10:12:17 -04:00