Hedara
4ba3932174
Merge remote-tracking branch 'pret/master' into pret-merge
...
Converts all the expansion audio samples to use .wav
Adds the migration script bin_to_wav.py
Conflicts:
Makefile
make_tools.mk
sound/direct_sound_samples/cries/abra.aif
sound/direct_sound_samples/cries/absol.aif
sound/direct_sound_samples/cries/aerodactyl.aif
sound/direct_sound_samples/cries/aggron.aif
sound/direct_sound_samples/cries/aipom.aif
sound/direct_sound_samples/cries/alakazam.aif
sound/direct_sound_samples/cries/altaria.aif
sound/direct_sound_samples/cries/ampharos.aif
sound/direct_sound_samples/cries/anorith.aif
sound/direct_sound_samples/cries/arbok.aif
sound/direct_sound_samples/cries/arcanine.aif
sound/direct_sound_samples/cries/ariados.aif
sound/direct_sound_samples/cries/armaldo.aif
sound/direct_sound_samples/cries/aron.aif
sound/direct_sound_samples/cries/articuno.aif
sound/direct_sound_samples/cries/azumarill.aif
sound/direct_sound_samples/cries/azurill.aif
sound/direct_sound_samples/cries/bagon.aif
sound/direct_sound_samples/cries/baltoy.aif
sound/direct_sound_samples/cries/banette.aif
sound/direct_sound_samples/cries/barboach.aif
sound/direct_sound_samples/cries/bayleef.aif
sound/direct_sound_samples/cries/beautifly.aif
sound/direct_sound_samples/cries/beedrill.aif
sound/direct_sound_samples/cries/beldum.aif
sound/direct_sound_samples/cries/bellossom.aif
sound/direct_sound_samples/cries/bellsprout.aif
sound/direct_sound_samples/cries/blastoise.aif
sound/direct_sound_samples/cries/blaziken.aif
sound/direct_sound_samples/cries/blissey.aif
sound/direct_sound_samples/cries/breloom.aif
sound/direct_sound_samples/cries/bulbasaur.aif
sound/direct_sound_samples/cries/butterfree.aif
sound/direct_sound_samples/cries/cacnea.aif
sound/direct_sound_samples/cries/cacturne.aif
sound/direct_sound_samples/cries/camerupt.aif
sound/direct_sound_samples/cries/carvanha.aif
sound/direct_sound_samples/cries/cascoon.aif
sound/direct_sound_samples/cries/castform.aif
sound/direct_sound_samples/cries/caterpie.aif
sound/direct_sound_samples/cries/celebi.aif
sound/direct_sound_samples/cries/chansey.aif
sound/direct_sound_samples/cries/charizard.aif
sound/direct_sound_samples/cries/charmander.aif
sound/direct_sound_samples/cries/charmeleon.aif
sound/direct_sound_samples/cries/chikorita.aif
sound/direct_sound_samples/cries/chimecho.aif
sound/direct_sound_samples/cries/chinchou.aif
sound/direct_sound_samples/cries/clamperl.aif
sound/direct_sound_samples/cries/claydol.aif
sound/direct_sound_samples/cries/clefable.aif
sound/direct_sound_samples/cries/clefairy.aif
sound/direct_sound_samples/cries/cleffa.aif
sound/direct_sound_samples/cries/cloyster.aif
sound/direct_sound_samples/cries/combusken.aif
sound/direct_sound_samples/cries/corphish.aif
sound/direct_sound_samples/cries/corsola.aif
sound/direct_sound_samples/cries/cradily.aif
sound/direct_sound_samples/cries/crawdaunt.aif
sound/direct_sound_samples/cries/crobat.aif
sound/direct_sound_samples/cries/croconaw.aif
sound/direct_sound_samples/cries/cry_unused_265.aif
sound/direct_sound_samples/cries/cry_unused_268.aif
sound/direct_sound_samples/cries/cubone.aif
sound/direct_sound_samples/cries/cyndaquil.aif
sound/direct_sound_samples/cries/delcatty.aif
sound/direct_sound_samples/cries/delibird.aif
sound/direct_sound_samples/cries/deoxys.aif
sound/direct_sound_samples/cries/dewgong.aif
sound/direct_sound_samples/cries/diglett.aif
sound/direct_sound_samples/cries/ditto.aif
sound/direct_sound_samples/cries/dodrio.aif
sound/direct_sound_samples/cries/doduo.aif
sound/direct_sound_samples/cries/donphan.aif
sound/direct_sound_samples/cries/dragonair.aif
sound/direct_sound_samples/cries/dragonite.aif
sound/direct_sound_samples/cries/dratini.aif
sound/direct_sound_samples/cries/drowzee.aif
sound/direct_sound_samples/cries/dugtrio.aif
sound/direct_sound_samples/cries/dunsparce.aif
sound/direct_sound_samples/cries/dusclops.aif
sound/direct_sound_samples/cries/duskull.aif
sound/direct_sound_samples/cries/dustox.aif
sound/direct_sound_samples/cries/eevee.aif
sound/direct_sound_samples/cries/ekans.aif
sound/direct_sound_samples/cries/electabuzz.aif
sound/direct_sound_samples/cries/electrike.aif
sound/direct_sound_samples/cries/electrode.aif
sound/direct_sound_samples/cries/elekid.aif
sound/direct_sound_samples/cries/entei.aif
sound/direct_sound_samples/cries/espeon.aif
sound/direct_sound_samples/cries/exeggcute.aif
sound/direct_sound_samples/cries/exeggutor.aif
sound/direct_sound_samples/cries/exploud.aif
sound/direct_sound_samples/cries/farfetchd.aif
sound/direct_sound_samples/cries/fearow.aif
sound/direct_sound_samples/cries/feebas.aif
sound/direct_sound_samples/cries/feraligatr.aif
sound/direct_sound_samples/cries/flaaffy.aif
sound/direct_sound_samples/cries/flareon.aif
sound/direct_sound_samples/cries/flygon.aif
sound/direct_sound_samples/cries/forretress.aif
sound/direct_sound_samples/cries/furret.aif
sound/direct_sound_samples/cries/gardevoir.aif
sound/direct_sound_samples/cries/gastly.aif
sound/direct_sound_samples/cries/gengar.aif
sound/direct_sound_samples/cries/geodude.aif
sound/direct_sound_samples/cries/girafarig.aif
sound/direct_sound_samples/cries/glalie.aif
sound/direct_sound_samples/cries/gligar.aif
sound/direct_sound_samples/cries/gloom.aif
sound/direct_sound_samples/cries/golbat.aif
sound/direct_sound_samples/cries/goldeen.aif
sound/direct_sound_samples/cries/golduck.aif
sound/direct_sound_samples/cries/golem.aif
sound/direct_sound_samples/cries/gorebyss.aif
sound/direct_sound_samples/cries/granbull.aif
sound/direct_sound_samples/cries/graveler.aif
sound/direct_sound_samples/cries/grimer.aif
sound/direct_sound_samples/cries/groudon.aif
sound/direct_sound_samples/cries/grovyle.aif
sound/direct_sound_samples/cries/growlithe.aif
sound/direct_sound_samples/cries/grumpig.aif
sound/direct_sound_samples/cries/gulpin.aif
sound/direct_sound_samples/cries/gyarados.aif
sound/direct_sound_samples/cries/hariyama.aif
sound/direct_sound_samples/cries/haunter.aif
sound/direct_sound_samples/cries/heracross.aif
sound/direct_sound_samples/cries/hitmonchan.aif
sound/direct_sound_samples/cries/hitmonlee.aif
sound/direct_sound_samples/cries/hitmontop.aif
sound/direct_sound_samples/cries/ho_oh.aif
sound/direct_sound_samples/cries/hoothoot.aif
sound/direct_sound_samples/cries/hoppip.aif
sound/direct_sound_samples/cries/horsea.aif
sound/direct_sound_samples/cries/houndoom.aif
sound/direct_sound_samples/cries/houndour.aif
sound/direct_sound_samples/cries/huntail.aif
sound/direct_sound_samples/cries/hypno.aif
sound/direct_sound_samples/cries/igglybuff.aif
sound/direct_sound_samples/cries/illumise.aif
sound/direct_sound_samples/cries/ivysaur.aif
sound/direct_sound_samples/cries/jigglypuff.aif
sound/direct_sound_samples/cries/jirachi.aif
sound/direct_sound_samples/cries/jolteon.aif
sound/direct_sound_samples/cries/jumpluff.aif
sound/direct_sound_samples/cries/jynx.aif
sound/direct_sound_samples/cries/kabuto.aif
sound/direct_sound_samples/cries/kabutops.aif
sound/direct_sound_samples/cries/kadabra.aif
sound/direct_sound_samples/cries/kakuna.aif
sound/direct_sound_samples/cries/kangaskhan.aif
sound/direct_sound_samples/cries/kecleon.aif
sound/direct_sound_samples/cries/kingdra.aif
sound/direct_sound_samples/cries/kingler.aif
sound/direct_sound_samples/cries/kirlia.aif
sound/direct_sound_samples/cries/koffing.aif
sound/direct_sound_samples/cries/krabby.aif
sound/direct_sound_samples/cries/kyogre.aif
sound/direct_sound_samples/cries/lairon.aif
sound/direct_sound_samples/cries/lanturn.aif
sound/direct_sound_samples/cries/lapras.aif
sound/direct_sound_samples/cries/larvitar.aif
sound/direct_sound_samples/cries/latias.aif
sound/direct_sound_samples/cries/latios.aif
sound/direct_sound_samples/cries/ledian.aif
sound/direct_sound_samples/cries/ledyba.aif
sound/direct_sound_samples/cries/lickitung.aif
sound/direct_sound_samples/cries/lileep.aif
sound/direct_sound_samples/cries/linoone.aif
sound/direct_sound_samples/cries/lombre.aif
sound/direct_sound_samples/cries/lotad.aif
sound/direct_sound_samples/cries/loudred.aif
sound/direct_sound_samples/cries/ludicolo.aif
sound/direct_sound_samples/cries/lugia.aif
sound/direct_sound_samples/cries/lunatone.aif
sound/direct_sound_samples/cries/luvdisc.aif
sound/direct_sound_samples/cries/machamp.aif
sound/direct_sound_samples/cries/machoke.aif
sound/direct_sound_samples/cries/machop.aif
sound/direct_sound_samples/cries/magby.aif
sound/direct_sound_samples/cries/magcargo.aif
sound/direct_sound_samples/cries/magikarp.aif
sound/direct_sound_samples/cries/magmar.aif
sound/direct_sound_samples/cries/magnemite.aif
sound/direct_sound_samples/cries/magneton.aif
sound/direct_sound_samples/cries/makuhita.aif
sound/direct_sound_samples/cries/manectric.aif
sound/direct_sound_samples/cries/mankey.aif
sound/direct_sound_samples/cries/mantine.aif
sound/direct_sound_samples/cries/mareep.aif
sound/direct_sound_samples/cries/marill.aif
sound/direct_sound_samples/cries/marowak.aif
sound/direct_sound_samples/cries/marshtomp.aif
sound/direct_sound_samples/cries/masquerain.aif
sound/direct_sound_samples/cries/mawile.aif
sound/direct_sound_samples/cries/medicham.aif
sound/direct_sound_samples/cries/meditite.aif
sound/direct_sound_samples/cries/meganium.aif
sound/direct_sound_samples/cries/meowth.aif
sound/direct_sound_samples/cries/metagross.aif
sound/direct_sound_samples/cries/metang.aif
sound/direct_sound_samples/cries/metapod.aif
sound/direct_sound_samples/cries/mew.aif
sound/direct_sound_samples/cries/mewtwo.aif
sound/direct_sound_samples/cries/mightyena.aif
sound/direct_sound_samples/cries/milotic.aif
sound/direct_sound_samples/cries/miltank.aif
sound/direct_sound_samples/cries/minun.aif
sound/direct_sound_samples/cries/misdreavus.aif
sound/direct_sound_samples/cries/moltres.aif
sound/direct_sound_samples/cries/mr_mime.aif
sound/direct_sound_samples/cries/mudkip.aif
sound/direct_sound_samples/cries/muk.aif
sound/direct_sound_samples/cries/murkrow.aif
sound/direct_sound_samples/cries/natu.aif
sound/direct_sound_samples/cries/nidoking.aif
sound/direct_sound_samples/cries/nidoqueen.aif
sound/direct_sound_samples/cries/nidoran_f.aif
sound/direct_sound_samples/cries/nidoran_m.aif
sound/direct_sound_samples/cries/nidorina.aif
sound/direct_sound_samples/cries/nidorino.aif
sound/direct_sound_samples/cries/nincada.aif
sound/direct_sound_samples/cries/ninetales.aif
sound/direct_sound_samples/cries/ninjask.aif
sound/direct_sound_samples/cries/noctowl.aif
sound/direct_sound_samples/cries/nosepass.aif
sound/direct_sound_samples/cries/numel.aif
sound/direct_sound_samples/cries/nuzleaf.aif
sound/direct_sound_samples/cries/octillery.aif
sound/direct_sound_samples/cries/oddish.aif
sound/direct_sound_samples/cries/omanyte.aif
sound/direct_sound_samples/cries/omastar.aif
sound/direct_sound_samples/cries/onix.aif
sound/direct_sound_samples/cries/paras.aif
sound/direct_sound_samples/cries/parasect.aif
sound/direct_sound_samples/cries/pelipper.aif
sound/direct_sound_samples/cries/persian.aif
sound/direct_sound_samples/cries/phanpy.aif
sound/direct_sound_samples/cries/pichu.aif
sound/direct_sound_samples/cries/pidgeot.aif
sound/direct_sound_samples/cries/pidgeotto.aif
sound/direct_sound_samples/cries/pidgey.aif
sound/direct_sound_samples/cries/pikachu.aif
sound/direct_sound_samples/cries/piloswine.aif
sound/direct_sound_samples/cries/pineco.aif
sound/direct_sound_samples/cries/pinsir.aif
sound/direct_sound_samples/cries/plusle.aif
sound/direct_sound_samples/cries/politoed.aif
sound/direct_sound_samples/cries/poliwag.aif
sound/direct_sound_samples/cries/poliwhirl.aif
sound/direct_sound_samples/cries/poliwrath.aif
sound/direct_sound_samples/cries/ponyta.aif
sound/direct_sound_samples/cries/poochyena.aif
sound/direct_sound_samples/cries/porygon.aif
sound/direct_sound_samples/cries/porygon2.aif
sound/direct_sound_samples/cries/primeape.aif
sound/direct_sound_samples/cries/psyduck.aif
sound/direct_sound_samples/cries/pupitar.aif
sound/direct_sound_samples/cries/quagsire.aif
sound/direct_sound_samples/cries/quilava.aif
sound/direct_sound_samples/cries/qwilfish.aif
sound/direct_sound_samples/cries/raichu.aif
sound/direct_sound_samples/cries/raikou.aif
sound/direct_sound_samples/cries/ralts.aif
sound/direct_sound_samples/cries/rapidash.aif
sound/direct_sound_samples/cries/raticate.aif
sound/direct_sound_samples/cries/rattata.aif
sound/direct_sound_samples/cries/rayquaza.aif
sound/direct_sound_samples/cries/regice.aif
sound/direct_sound_samples/cries/regirock.aif
sound/direct_sound_samples/cries/registeel.aif
sound/direct_sound_samples/cries/relicanth.aif
sound/direct_sound_samples/cries/remoraid.aif
sound/direct_sound_samples/cries/rhydon.aif
sound/direct_sound_samples/cries/rhyhorn.aif
sound/direct_sound_samples/cries/roselia.aif
sound/direct_sound_samples/cries/sableye.aif
sound/direct_sound_samples/cries/salamence.aif
sound/direct_sound_samples/cries/sandshrew.aif
sound/direct_sound_samples/cries/sandslash.aif
sound/direct_sound_samples/cries/sceptile.aif
sound/direct_sound_samples/cries/scizor.aif
sound/direct_sound_samples/cries/scyther.aif
sound/direct_sound_samples/cries/seadra.aif
sound/direct_sound_samples/cries/seaking.aif
sound/direct_sound_samples/cries/sealeo.aif
sound/direct_sound_samples/cries/seedot.aif
sound/direct_sound_samples/cries/seel.aif
sound/direct_sound_samples/cries/sentret.aif
sound/direct_sound_samples/cries/seviper.aif
sound/direct_sound_samples/cries/sharpedo.aif
sound/direct_sound_samples/cries/shedinja.aif
sound/direct_sound_samples/cries/shelgon.aif
sound/direct_sound_samples/cries/shellder.aif
sound/direct_sound_samples/cries/shiftry.aif
sound/direct_sound_samples/cries/shroomish.aif
sound/direct_sound_samples/cries/shuckle.aif
sound/direct_sound_samples/cries/shuppet.aif
sound/direct_sound_samples/cries/silcoon.aif
sound/direct_sound_samples/cries/skarmory.aif
sound/direct_sound_samples/cries/skiploom.aif
sound/direct_sound_samples/cries/skitty.aif
sound/direct_sound_samples/cries/slaking.aif
sound/direct_sound_samples/cries/slakoth.aif
sound/direct_sound_samples/cries/slowbro.aif
sound/direct_sound_samples/cries/slowking.aif
sound/direct_sound_samples/cries/slowpoke.aif
sound/direct_sound_samples/cries/slugma.aif
sound/direct_sound_samples/cries/smeargle.aif
sound/direct_sound_samples/cries/smoochum.aif
sound/direct_sound_samples/cries/sneasel.aif
sound/direct_sound_samples/cries/snorlax.aif
sound/direct_sound_samples/cries/snorunt.aif
sound/direct_sound_samples/cries/snubbull.aif
sound/direct_sound_samples/cries/solrock.aif
sound/direct_sound_samples/cries/spearow.aif
sound/direct_sound_samples/cries/spheal.aif
sound/direct_sound_samples/cries/spinarak.aif
sound/direct_sound_samples/cries/spinda.aif
sound/direct_sound_samples/cries/spoink.aif
sound/direct_sound_samples/cries/squirtle.aif
sound/direct_sound_samples/cries/stantler.aif
sound/direct_sound_samples/cries/starmie.aif
sound/direct_sound_samples/cries/staryu.aif
sound/direct_sound_samples/cries/steelix.aif
sound/direct_sound_samples/cries/sudowoodo.aif
sound/direct_sound_samples/cries/suicune.aif
sound/direct_sound_samples/cries/sunflora.aif
sound/direct_sound_samples/cries/sunkern.aif
sound/direct_sound_samples/cries/surskit.aif
sound/direct_sound_samples/cries/swablu.aif
sound/direct_sound_samples/cries/swalot.aif
sound/direct_sound_samples/cries/swampert.aif
sound/direct_sound_samples/cries/swellow.aif
sound/direct_sound_samples/cries/swinub.aif
sound/direct_sound_samples/cries/taillow.aif
sound/direct_sound_samples/cries/tangela.aif
sound/direct_sound_samples/cries/tauros.aif
sound/direct_sound_samples/cries/teddiursa.aif
sound/direct_sound_samples/cries/tentacool.aif
sound/direct_sound_samples/cries/tentacruel.aif
sound/direct_sound_samples/cries/togepi.aif
sound/direct_sound_samples/cries/togetic.aif
sound/direct_sound_samples/cries/torchic.aif
sound/direct_sound_samples/cries/torkoal.aif
sound/direct_sound_samples/cries/totodile.aif
sound/direct_sound_samples/cries/trapinch.aif
sound/direct_sound_samples/cries/treecko.aif
sound/direct_sound_samples/cries/tropius.aif
sound/direct_sound_samples/cries/typhlosion.aif
sound/direct_sound_samples/cries/tyranitar.aif
sound/direct_sound_samples/cries/tyrogue.aif
sound/direct_sound_samples/cries/umbreon.aif
sound/direct_sound_samples/cries/unown.aif
sound/direct_sound_samples/cries/ursaring.aif
sound/direct_sound_samples/cries/vaporeon.aif
sound/direct_sound_samples/cries/venomoth.aif
sound/direct_sound_samples/cries/venonat.aif
sound/direct_sound_samples/cries/venusaur.aif
sound/direct_sound_samples/cries/vibrava.aif
sound/direct_sound_samples/cries/victreebel.aif
sound/direct_sound_samples/cries/vigoroth.aif
sound/direct_sound_samples/cries/vileplume.aif
sound/direct_sound_samples/cries/volbeat.aif
sound/direct_sound_samples/cries/voltorb.aif
sound/direct_sound_samples/cries/vulpix.aif
sound/direct_sound_samples/cries/wailmer.aif
sound/direct_sound_samples/cries/wailord.aif
sound/direct_sound_samples/cries/walrein.aif
sound/direct_sound_samples/cries/wartortle.aif
sound/direct_sound_samples/cries/weedle.aif
sound/direct_sound_samples/cries/weepinbell.aif
sound/direct_sound_samples/cries/weezing.aif
sound/direct_sound_samples/cries/whiscash.aif
sound/direct_sound_samples/cries/whismur.aif
sound/direct_sound_samples/cries/wigglytuff.aif
sound/direct_sound_samples/cries/wingull.aif
sound/direct_sound_samples/cries/wobbuffet.aif
sound/direct_sound_samples/cries/wooper.aif
sound/direct_sound_samples/cries/wurmple.aif
sound/direct_sound_samples/cries/wynaut.aif
sound/direct_sound_samples/cries/xatu.aif
sound/direct_sound_samples/cries/yanma.aif
sound/direct_sound_samples/cries/zangoose.aif
sound/direct_sound_samples/cries/zapdos.aif
sound/direct_sound_samples/cries/zigzagoon.aif
sound/direct_sound_samples/cries/zubat.aif
2025-12-01 16:46:34 +01:00
Marcus Huderle
d507b24ae9
Convert .aif files to .wav ( #2213 )
...
* Convert uncompress samples to .wav files, and introduce wav2agb with matching capabilities
Convert cries
Remove aif2pcm and cleanup wav2agb
* Add --no-pad option to support hq mixer
* Update wav2agb README
* Include the alignment padding in wav2agb
* cleanup
2025-12-01 09:01:26 -06:00
AlexOn1ine
bd919e3219
11/08/25 Master to upcoming merge
2025-08-11 08:31:12 +02:00
RavePossum
7500fc00db
Restore git history check ( #7463 )
2025-08-04 17:24:49 +02:00
hedara90
6e64f6f5ef
New sprite compressor ( #5627 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: DizzyEggg
Co-authored-by: Raymond Dodge <git@rayrobdod.name>
2025-05-30 23:10:54 +02:00
Eduardo Quezada
5954d662a5
Rebuild of makefile 7: Test Runner
2024-09-13 15:26:42 -03:00
Eduardo Quezada
5ea1f39a9d
Rebuild of makefile 5: trainerproc
2024-09-13 14:27:40 -03:00
GriffinR
19ad2e16ac
Merge branch 'master' of https://github.com/pret/pokeemerald into build-makefile-cleanup
2024-08-31 00:17:07 -04:00
Icedude907
625a006cab
[Build System Rewrite] mapjson now takes output directory parameters. ( #1949 )
2024-08-29 14:01:01 -04:00
Icedude907
2198ca31c7
Reordered makefile.
...
Added some documentation and simplified dependency scanning.
2023-11-12 13:57:44 +13:00
Icedude907
7fa9819d9a
Makefile uses make_tools, mapjson takes out dir.
...
Removed generated files (layouts.h, map_groups.h) from git.
2023-11-12 00:53:34 +13:00
Eduardo Quezada
d00c8902f9
Whitelist instead of Blacklist for TOOLDIRS in Makefiles
2023-02-25 16:49:41 -03:00
luckytyphlosion
92152e45e2
Fixes to makefile.
...
Merge C_ASM_DEP and DATA_ASM_DEP, NODEP and SCAN_DEPS can be overridden, add --no-print-directory to MAKEFLAGS in make_tools.mk (also removed some unused variables), add newline to help message in preproc.
2021-06-01 23:22:15 -04:00
luckytyphlosion
a839463c84
Optimize Makefile.
...
Don't do recursive makes for COMPARE and MODERN, use minimal makefile for making tools.
2021-06-01 20:40:11 -04:00
