Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion

Browse Source

...

This commit is contained in:

ExpoSeed committed 2020-10-04 02:35:23 -05:00

2 parents 4a773ce18d 448599f53c

commit 5794fc69e8

6096 files changed

+141182 -52254

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sound/cry_tables.inc

+1317 -274

File diff suppressed because it is too large. Load diff

sound/direct_sound_data.inc

+2464 -388

File diff suppressed because it is too large. Load diff

sound/direct_sound_samples/cries/abra.aif → sound/direct_sound_samples/cries/cry_abra.aif

File renamed without changes.

sound/direct_sound_samples/cries/absol.aif → sound/direct_sound_samples/cries/cry_absol.aif

File renamed without changes.

sound/direct_sound_samples/cries/aerodactyl.aif → sound/direct_sound_samples/cries/cry_aerodactyl.aif

File renamed without changes.

sound/direct_sound_samples/cries/aggron.aif → sound/direct_sound_samples/cries/cry_aggron.aif

File renamed without changes.

sound/direct_sound_samples/cries/aipom.aif → sound/direct_sound_samples/cries/cry_aipom.aif

File renamed without changes.

sound/direct_sound_samples/cries/alakazam.aif → sound/direct_sound_samples/cries/cry_alakazam.aif

File renamed without changes.

sound/direct_sound_samples/cries/altaria.aif → sound/direct_sound_samples/cries/cry_altaria.aif

File renamed without changes.

sound/direct_sound_samples/cries/ampharos.aif → sound/direct_sound_samples/cries/cry_ampharos.aif

File renamed without changes.

sound/direct_sound_samples/cries/anorith.aif → sound/direct_sound_samples/cries/cry_anorith.aif

File renamed without changes.

sound/direct_sound_samples/cries/arbok.aif → sound/direct_sound_samples/cries/cry_arbok.aif

File renamed without changes.

sound/direct_sound_samples/cries/arcanine.aif → sound/direct_sound_samples/cries/cry_arcanine.aif

File renamed without changes.

sound/direct_sound_samples/cries/ariados.aif → sound/direct_sound_samples/cries/cry_ariados.aif

File renamed without changes.

sound/direct_sound_samples/cries/armaldo.aif → sound/direct_sound_samples/cries/cry_armaldo.aif

File renamed without changes.

sound/direct_sound_samples/cries/aron.aif → sound/direct_sound_samples/cries/cry_aron.aif

File renamed without changes.

sound/direct_sound_samples/cries/articuno.aif → sound/direct_sound_samples/cries/cry_articuno.aif

File renamed without changes.

sound/direct_sound_samples/cries/azumarill.aif → sound/direct_sound_samples/cries/cry_azumarill.aif

File renamed without changes.

sound/direct_sound_samples/cries/azurill.aif → sound/direct_sound_samples/cries/cry_azurill.aif

File renamed without changes.

sound/direct_sound_samples/cries/bagon.aif → sound/direct_sound_samples/cries/cry_bagon.aif

File renamed without changes.

sound/direct_sound_samples/cries/baltoy.aif → sound/direct_sound_samples/cries/cry_baltoy.aif

File renamed without changes.

sound/direct_sound_samples/cries/banette.aif → sound/direct_sound_samples/cries/cry_banette.aif

File renamed without changes.

sound/direct_sound_samples/cries/barboach.aif → sound/direct_sound_samples/cries/cry_barboach.aif

File renamed without changes.

sound/direct_sound_samples/cries/bayleef.aif → sound/direct_sound_samples/cries/cry_bayleef.aif

File renamed without changes.

sound/direct_sound_samples/cries/beautifly.aif → sound/direct_sound_samples/cries/cry_beautifly.aif

File renamed without changes.

sound/direct_sound_samples/cries/beedrill.aif → sound/direct_sound_samples/cries/cry_beedrill.aif

File renamed without changes.

sound/direct_sound_samples/cries/beldum.aif → sound/direct_sound_samples/cries/cry_beldum.aif

File renamed without changes.

sound/direct_sound_samples/cries/bellossom.aif → sound/direct_sound_samples/cries/cry_bellossom.aif

File renamed without changes.

sound/direct_sound_samples/cries/bellsprout.aif → sound/direct_sound_samples/cries/cry_bellsprout.aif

File renamed without changes.

sound/direct_sound_samples/cries/blastoise.aif → sound/direct_sound_samples/cries/cry_blastoise.aif

File renamed without changes.

sound/direct_sound_samples/cries/blaziken.aif → sound/direct_sound_samples/cries/cry_blaziken.aif

File renamed without changes.

sound/direct_sound_samples/cries/blissey.aif → sound/direct_sound_samples/cries/cry_blissey.aif

File renamed without changes.

sound/direct_sound_samples/cries/breloom.aif → sound/direct_sound_samples/cries/cry_breloom.aif

File renamed without changes.

sound/direct_sound_samples/cries/bulbasaur.aif → sound/direct_sound_samples/cries/cry_bulbasaur.aif

File renamed without changes.

sound/direct_sound_samples/cries/butterfree.aif → sound/direct_sound_samples/cries/cry_butterfree.aif

File renamed without changes.

sound/direct_sound_samples/cries/cacnea.aif → sound/direct_sound_samples/cries/cry_cacnea.aif

File renamed without changes.

sound/direct_sound_samples/cries/cacturne.aif → sound/direct_sound_samples/cries/cry_cacturne.aif

File renamed without changes.

sound/direct_sound_samples/cries/camerupt.aif → sound/direct_sound_samples/cries/cry_camerupt.aif

File renamed without changes.

sound/direct_sound_samples/cries/carvanha.aif → sound/direct_sound_samples/cries/cry_carvanha.aif

File renamed without changes.

sound/direct_sound_samples/cries/cascoon.aif → sound/direct_sound_samples/cries/cry_cascoon.aif

File renamed without changes.

sound/direct_sound_samples/cries/castform.aif → sound/direct_sound_samples/cries/cry_castform.aif

File renamed without changes.

sound/direct_sound_samples/cries/caterpie.aif → sound/direct_sound_samples/cries/cry_caterpie.aif

File renamed without changes.

sound/direct_sound_samples/cries/celebi.aif → sound/direct_sound_samples/cries/cry_celebi.aif

File renamed without changes.

sound/direct_sound_samples/cries/chansey.aif → sound/direct_sound_samples/cries/cry_chansey.aif

File renamed without changes.

sound/direct_sound_samples/cries/charizard.aif → sound/direct_sound_samples/cries/cry_charizard.aif

File renamed without changes.

sound/direct_sound_samples/cries/charmander.aif → sound/direct_sound_samples/cries/cry_charmander.aif

File renamed without changes.

sound/direct_sound_samples/cries/charmeleon.aif → sound/direct_sound_samples/cries/cry_charmeleon.aif

File renamed without changes.

sound/direct_sound_samples/cries/chikorita.aif → sound/direct_sound_samples/cries/cry_chikorita.aif

File renamed without changes.

sound/direct_sound_samples/cries/chimecho.aif → sound/direct_sound_samples/cries/cry_chimecho.aif

File renamed without changes.

sound/direct_sound_samples/cries/chinchou.aif → sound/direct_sound_samples/cries/cry_chinchou.aif

File renamed without changes.

sound/direct_sound_samples/cries/clamperl.aif → sound/direct_sound_samples/cries/cry_clamperl.aif

File renamed without changes.

sound/direct_sound_samples/cries/claydol.aif → sound/direct_sound_samples/cries/cry_claydol.aif

File renamed without changes.

sound/direct_sound_samples/cries/clefable.aif → sound/direct_sound_samples/cries/cry_clefable.aif

File renamed without changes.

sound/direct_sound_samples/cries/clefairy.aif → sound/direct_sound_samples/cries/cry_clefairy.aif

File renamed without changes.

sound/direct_sound_samples/cries/cleffa.aif → sound/direct_sound_samples/cries/cry_cleffa.aif

File renamed without changes.

sound/direct_sound_samples/cries/cloyster.aif → sound/direct_sound_samples/cries/cry_cloyster.aif

File renamed without changes.

sound/direct_sound_samples/cries/combusken.aif → sound/direct_sound_samples/cries/cry_combusken.aif

File renamed without changes.

sound/direct_sound_samples/cries/corphish.aif → sound/direct_sound_samples/cries/cry_corphish.aif

File renamed without changes.

sound/direct_sound_samples/cries/corsola.aif → sound/direct_sound_samples/cries/cry_corsola.aif

File renamed without changes.

sound/direct_sound_samples/cries/cradily.aif → sound/direct_sound_samples/cries/cry_cradily.aif

File renamed without changes.

sound/direct_sound_samples/cries/crawdaunt.aif → sound/direct_sound_samples/cries/cry_crawdaunt.aif

File renamed without changes.

sound/direct_sound_samples/cries/crobat.aif → sound/direct_sound_samples/cries/cry_crobat.aif

File renamed without changes.

sound/direct_sound_samples/cries/croconaw.aif → sound/direct_sound_samples/cries/cry_croconaw.aif

File renamed without changes.

sound/direct_sound_samples/cries/cubone.aif → sound/direct_sound_samples/cries/cry_cubone.aif

File renamed without changes.

sound/direct_sound_samples/cries/cyndaquil.aif → sound/direct_sound_samples/cries/cry_cyndaquil.aif

File renamed without changes.

sound/direct_sound_samples/cries/delcatty.aif → sound/direct_sound_samples/cries/cry_delcatty.aif

File renamed without changes.

sound/direct_sound_samples/cries/delibird.aif → sound/direct_sound_samples/cries/cry_delibird.aif

File renamed without changes.

sound/direct_sound_samples/cries/deoxys.aif → sound/direct_sound_samples/cries/cry_deoxys.aif

File renamed without changes.

sound/direct_sound_samples/cries/dewgong.aif → sound/direct_sound_samples/cries/cry_dewgong.aif

File renamed without changes.

sound/direct_sound_samples/cries/diglett.aif → sound/direct_sound_samples/cries/cry_diglett.aif

File renamed without changes.

sound/direct_sound_samples/cries/ditto.aif → sound/direct_sound_samples/cries/cry_ditto.aif

File renamed without changes.

sound/direct_sound_samples/cries/dodrio.aif → sound/direct_sound_samples/cries/cry_dodrio.aif

File renamed without changes.

sound/direct_sound_samples/cries/doduo.aif → sound/direct_sound_samples/cries/cry_doduo.aif

File renamed without changes.

sound/direct_sound_samples/cries/donphan.aif → sound/direct_sound_samples/cries/cry_donphan.aif

File renamed without changes.

sound/direct_sound_samples/cries/dragonair.aif → sound/direct_sound_samples/cries/cry_dragonair.aif

File renamed without changes.

sound/direct_sound_samples/cries/dragonite.aif → sound/direct_sound_samples/cries/cry_dragonite.aif

File renamed without changes.

sound/direct_sound_samples/cries/dratini.aif → sound/direct_sound_samples/cries/cry_dratini.aif

File renamed without changes.

sound/direct_sound_samples/cries/drowzee.aif → sound/direct_sound_samples/cries/cry_drowzee.aif

File renamed without changes.

sound/direct_sound_samples/cries/dugtrio.aif → sound/direct_sound_samples/cries/cry_dugtrio.aif

File renamed without changes.

sound/direct_sound_samples/cries/dunsparce.aif → sound/direct_sound_samples/cries/cry_dunsparce.aif

File renamed without changes.

sound/direct_sound_samples/cries/dusclops.aif → sound/direct_sound_samples/cries/cry_dusclops.aif

File renamed without changes.

sound/direct_sound_samples/cries/duskull.aif → sound/direct_sound_samples/cries/cry_duskull.aif

File renamed without changes.

sound/direct_sound_samples/cries/dustox.aif → sound/direct_sound_samples/cries/cry_dustox.aif

File renamed without changes.

sound/direct_sound_samples/cries/eevee.aif → sound/direct_sound_samples/cries/cry_eevee.aif

File renamed without changes.

sound/direct_sound_samples/cries/ekans.aif → sound/direct_sound_samples/cries/cry_ekans.aif

File renamed without changes.

sound/direct_sound_samples/cries/electabuzz.aif → sound/direct_sound_samples/cries/cry_electabuzz.aif

File renamed without changes.

sound/direct_sound_samples/cries/electrike.aif → sound/direct_sound_samples/cries/cry_electrike.aif

File renamed without changes.

sound/direct_sound_samples/cries/electrode.aif → sound/direct_sound_samples/cries/cry_electrode.aif

File renamed without changes.

sound/direct_sound_samples/cries/elekid.aif → sound/direct_sound_samples/cries/cry_elekid.aif

File renamed without changes.

sound/direct_sound_samples/cries/entei.aif → sound/direct_sound_samples/cries/cry_entei.aif

File renamed without changes.

sound/direct_sound_samples/cries/espeon.aif → sound/direct_sound_samples/cries/cry_espeon.aif

File renamed without changes.

sound/direct_sound_samples/cries/exeggcute.aif → sound/direct_sound_samples/cries/cry_exeggcute.aif

File renamed without changes.

sound/direct_sound_samples/cries/exeggutor.aif → sound/direct_sound_samples/cries/cry_exeggutor.aif

File renamed without changes.

sound/direct_sound_samples/cries/exploud.aif → sound/direct_sound_samples/cries/cry_exploud.aif

File renamed without changes.

sound/direct_sound_samples/cries/farfetchd.aif → sound/direct_sound_samples/cries/cry_farfetchd.aif

File renamed without changes.

sound/direct_sound_samples/cries/fearow.aif → sound/direct_sound_samples/cries/cry_fearow.aif

File renamed without changes.

sound/direct_sound_samples/cries/feebas.aif → sound/direct_sound_samples/cries/cry_feebas.aif

File renamed without changes.

sound/direct_sound_samples/cries/feraligatr.aif → sound/direct_sound_samples/cries/cry_feraligatr.aif

File renamed without changes.

sound/direct_sound_samples/cries/flaaffy.aif → sound/direct_sound_samples/cries/cry_flaaffy.aif

File renamed without changes.

sound/direct_sound_samples/cries/flareon.aif → sound/direct_sound_samples/cries/cry_flareon.aif

File renamed without changes.

Loaded 100 of 6096 files, more files were not shown because too many files have changed in this diff. Show more