Eduardo Quezada 502a56efd1 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ...

# Conflicts:
#	include/global.h
#	src/data.c
#	src/data/pokemon/species_info/gen_7.h

2024-02-13 20:35:05 -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

gbagfx bit depth upconversion fix

2024-01-27 14:29:31 -08:00

jsonproc

jsonproc: filter out every non-alphanumeric character

2024-01-27 19:29:29 -08:00

learnset_helpers

Updated teacheable learnests to Indigo Disk data (#4155)

2024-02-08 17:27:26 +01: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

Added passing "KNOWN_FAILING" to test summary (#4063)

2024-01-29 17:01:50 -03: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 '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers

2024-02-13 20:35:05 -03: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