Eduardo Quezada 5d372b5f8a Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # README.md # gflib/sprite.c # graphics/object_events/pics/pokemon/togetic.png # 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_followers.h # src/event_object_movement.c # src/field_effect_helpers.c		2024-01-18 08:12:09 -03:00
..
aif2pcm	Remove all leading whitespace	2023-10-23 13:24:38 -05:00
bin2c	[Round 3] Apply all source related changes for the new INSTALL.md in one commit.	2020-12-16 21:24:44 -05:00
gbafix	Merge branch 'master' of https://github.com/pret/pokeemerald	2021-05-23 10:51:26 -04:00
gbagfx	Remove all leading whitespace	2023-10-23 13:24:38 -05:00
jsonproc	Fix build of jsonproc	2022-11-02 19:51:43 -05:00
mapjson	Merge branch 'master' of https://github.com/pret/pokeemerald into rhhpretmerge	2023-05-12 13:48:52 +02:00
mgba	Test moves, items, and abilities in battle	2023-02-01 13:53:57 +00:00
mgba-rom-test-hydra	Buffer 'GBA: '-prefixed messages	2023-10-23 07:47:13 +01:00
mid2agb	use floats for tempo calculation	2022-06-28 00:11:59 -04:00
patchelf	Hydra OSX support	2023-05-03 15:36:17 +02:00
preproc	Merge branch 'followers' into followers-expanded-id	2023-12-31 01:49:56 -05:00
ramscrgen	[Round 3] Apply all source related changes for the new INSTALL.md in one commit.	2020-12-16 21:24:44 -05:00
rsfont	Fix finding libpng in gbagfx and rsfont	2022-03-16 14:41:12 +01:00
scaninc	Merge branch 'followers' into followers-expanded-id	2023-12-31 01:49:56 -05:00