Eduardo Quezada 6b79c7772c Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 ...

# Conflicts:
#	src/battle_interface.c

2022-09-16 11:56:50 -03:00

..

aif2pcm

Further removed trailing whitespaces

2022-09-13 16:26:36 -03: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

Further removed trailing whitespaces

2022-09-13 16:26:36 -03:00

jsonproc

Further removed trailing whitespaces

2022-09-13 16:26:36 -03:00

mapjson

Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909

2022-09-16 11:56:50 -03:00

mid2agb

use floats for tempo calculation

2022-06-28 00:11:59 -04:00

preproc

Further removed trailing whitespaces

2022-09-13 16:26:36 -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

Further removed trailing whitespaces

2022-09-13 16:26:36 -03:00