Eduardo Quezada fcdc9ed65a Merge branch '_RHH/master' into _RHH/upcoming ...

# Conflicts:
#	src/battle_util.c
#	src/data/pokemon/species_info/gen_7_families.h
#	test/battle/ability/download.c
#	test/battle/ability/intimidate.c
#	test/battle/ability/supreme_overlord.c
#	test/battle/ability/zero_to_hero.c
#	test/battle/ai/ai.c
#	test/battle/move_effect/plasma_fists.c

2024-07-05 14:25:25 -04: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

Pret merge (20th of June) (#4845)

2024-06-21 12:21:29 +02:00

jsonproc

jsonproc: filter out every non-alphanumeric character

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

learnset_helpers

Fix teachable learnsets crashing in some environments (#4389)

2024-04-15 15:57:42 -04: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-05-16 17:31:46 -04: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

trainerproc

Gimmick Refactor (#4449)

2024-06-22 22:25:40 +02:00