Bassoonian
310f746565
Fix space indentation in .s and .inc files ( #9371 )
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-02-27 12:45:00 -08:00
Linathan
31d3e5f022
Add missing cries for Cramorant-Gulping, Cramorant-Gorging, Oinkologne-Female, and Ursaluna-Bloodmoon ( #8911 )
...
Co-authored-by: LinathanZel <LinathanZel@github.com>
2026-01-16 07:19:23 +00:00
Linathan
4c4255f69b
Add Legends Z-A cries ( #8151 )
2026-01-13 20:18:24 +01:00
Hedara
addb11cfa2
Merge branch 'master' into master-to-upcoming
...
Conflicts:
include/constants/expansion.h
src/battle_script_commands.c
2026-01-02 11:49:03 +01:00
lordraindance2
eee89c0a60
Added a include/config option to change mega cry sounds ( #7558 )
2026-01-02 10:19:34 +01:00
Hedara
4bdef731e4
Merge remote-tracking branch 'pret/master' into pret-merge
...
Conflicts:
include/constants/battle_ai.h
src/battle_ai_script_commands.c
src/battle_gfx_sfx_util.c
src/pokemon_summary_screen.c
src/trainer_pokemon_sprites.c
2026-01-01 22:16:58 +01:00
Marcus Huderle
9045b9b582
Remove mistakenly-added test file
2025-12-29 07:41:43 -06:00
Marcus Huderle
8d1f3ccd6a
Update .wav samples to use 'agbl' chunk to accomodate for vanilla's off-by-one behavior
2025-12-27 10:33:04 -06:00
hedara90
8de29867d9
Make Porygon not load-bearing ( #8688 )
2025-12-27 16:26:41 +01:00
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
ba74c076f6
pret merge
2025-11-16 12:01:13 +01:00
psf
fdcaac9175
Added some music documentation ( #2198 )
2025-11-06 09:27:16 +00:00
AlexOn1ine
ce52d83343
25/08/25 Master merge
2025-08-25 17:30:38 +02:00
Hedara
da77dba59f
Merge remote-tracking branch 'pret/master' into pret-merge
...
Conflicts:
data/battle_scripts_1.s
include/constants/battle.h
src/battle_script_commands.c
src/battle_util.c
2025-08-21 15:40:38 +02:00
Josh
65f9c04757
Key split restructure ( #2168 )
...
Key split tables have been given names based on usage (KeySplitTable1 -> keysplit_piano etc) and a new macro has been set up to better represent the individual bytes for key splits with it being more obvious to how said bytes are used for the respective voice in the voicegroup.
---------
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2025-08-02 02:11:50 +01:00
Josh
0dfec24967
Allow names for voicegroups and use a macro for use with drumsets ( #2149 )
...
mid2agb has been modified to allow more than just numbers when naming voicegroups and voicegroups have been renamed to match. A "voice_group" macro has been set up with a optional parameter for the starting note will shift the offset by the specified amount * 0xC which is the length of 1 voice in a voicegroup. All drumset voicegroups have a "starting_note" of 36.
2025-07-30 19:43:08 +01:00
Daniel Walls
cc33d6171b
Add config options for removing bard phoneme audio to save ROM space ( #7155 )
2025-06-18 20:16:25 -07:00
Bassoonian
708bb4a831
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge10apr
2025-04-10 23:57:57 +02:00
DizzyEggg
4618ba7407
Align gMPlayTrack_BGM
2025-04-01 00:31:38 +02:00
Eduardo Quezada
3442b09852
Renamed folders and symbols to match species defines ( #5581 )
2024-10-27 20:15:11 +01:00
Eduardo Quezada
ee9c6d4912
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-17 00:16:01 -03:00
Eduardo Quezada
80447bee8e
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
2024-10-15 20:56:56 -03:00
GriffinR
32f05269a3
Add missing terminal newlines
2024-08-31 00:53:23 -04:00
SombrAbsol
346b29ff67
Remove metadata in AIF files ( #4958 )
...
* Remove unnecessary metadata from .aif files to reduce audio footprint in the repo
2024-08-02 09:01:30 -07:00
Eduardo Quezada
1eb0b3261f
Added option to disable species cries ( #4791 )
...
* Added option to disable cries
* Update src/pokemon.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-06-15 22:07:13 +02:00
Cafei
571d7bc436
Fix silent Oricorio Pom-Pom cry ( #4551 )
...
* Fix Oricorio Pom-Pom silent cry
* Silly mistake, thanks for pointing it out
2024-05-12 15:45:34 -04:00
Eduardo Quezada
fbff04d4e3
Fixed silent Klefki cry ( #4392 )
...
* Fixed Klefki's cry not being hearable
* Added warning to family toggle file
2024-04-14 21:06:17 +02:00
Eduardo Quezada
75ad61e5bf
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# src/battle_ai_main.c
# src/battle_ai_util.c
# src/battle_tv.c
# src/data/battle_moves.h
# src/data/graphics/pokemon.h
2024-02-19 10:13:13 -03:00
Eduardo Quezada D'Ottone
3d2e0d2065
Fixed Ursaluna's cry using P_GEN_9_CROSS_EVOS ( #4210 )
2024-02-18 10:21:56 +01:00
Eduardo Quezada D'Ottone
6da1be01a9
Added Indigo Disk cries ( #4164 )
2024-02-09 19:46:09 +01:00
Eduardo Quezada D'Ottone
4adc2dcb16
Species Simplifier™ - Part 3 ( #3562 )
...
* Added SpeciesInfo fields
# Conflicts:
# include/pokemon.h
* Added missing comments
* Renamed gigantamax to isGigantamax
* Converted species flags to agbcc bit flags
* Added padding after flags
* Pikachu form config
* Dex text
* Reordered Paradox flag
* Missing Pikachu ifdef comments
* Moved P_GEN_x_POKEMON settings to the species_families file
* Gen 1 Dex entries
* Renamed file to species_enabled.h
* Prevent Pokémon from evolving if their evolution is disabled
* Prevent Pokémon from being affected by Eviolite if their evolution is disabled
* Prevent Pokémon offspring if they're disabled
* Corrected imprementation of evolution prevention
It could potentially overwrite items by accident
* Cross-evo configs
* Gen 2 dex entries
* Changed cry table to use assignable IDs
# Conflicts:
# include/pokemon.h
* Form table pointers
* Beginning support for moving data to gSpeciesInfo
* Pokédexes reads text from gSpeciesInfo
* Reading species names from gSpeciesInfo
* Fixed erroneous copy-paste
* Moved Bulbasaur to Raichu Family data do gSpeciesinfo
* Added female pic sizes
* Macros for Front, Back, Palette and Learnsets
* Sandshrew to Dugtrio Families
* Obtains Height/Weight from gSpeciesInfo
* Read category from gSpeciesInfo
* Removed unused data from pokedex_entries.h
* Moved Gen 1 data to gSpeciesInfo
* Moved Gen 2 data to gSpeciesInfo + fixed Ursaluna Bloodmoon not producing Teddiursa eggs
* Moved Gen 3 data to gSpeciesInfo
* Moved Gen 4 data to gSpeciesInfo
* HGSS dex properly shows form sprites
* Fixed data type for GetSpeciesHeight/Weight
* Reading Pokédex Size data from gSpeciesInfo
* Cleaned up mon graphic decompression function
* Reading Front Pics gSpeciesInfo
* Reading Back Pics gSpeciesInfo
* Updated uses of GetMonSpritePalStruct to allow loading the data directly instead of reading the struct
* Reading palettes from gSpeciesInfo
* Reading animation delay from gSpeciesInfo
* Fixed Pokémon Debug Menu not reading animation delay
* Reading front anim Id from gSpeciesInfo
* Reading back anim Id from gSpeciesInfo
* Reading Animation Frames from gSpeciesInfo
* Reading Icon Sprites from gSpeciesInfo
* Reading Icon Palette IDs from gSpeciesInfo
* Reading Footprints from gSpeciesInfo
* Reading Mon Pic sizes from gSpeciesInfo
* Separate mon pic sizes for female mon
* Reading Level Up Learnsets from gSpeciesInfo
* Reading Teachable Learnsets from gSpeciesInfo
* Reading National Dex Number from gSpeciesInfo
* Reading Enemy Mon Elevation from gSpeciesInfo
* Reading Evolutions from gSpeciesInfo
* Reading form table from gSpeciesInfo
* Fixed button label inconsistency in pokémon debug menu
* Reading form change table from gSpeciesInfo
* Removed need to define mon graphics in include/graphics.h
* Reordered mon graphics by family
* Fixed National dex number offset
* gFrontierBannedSpecies now checks IsSpeciesEnabled
* Added 3 more toggles for Fusions, Primal Reversions and Ultra Burst
* Gen 3 & 4 family toggles for dex entries
* Fixed missing Mr. Rime data
* Gen 1 dex descriptions as compound strings
* Gen 2 dex descriptions as compound strings
* Gen 3 dex descriptions as compound strings
* Gen 4 dex descriptions as compound strings
* Fixed compile in agbcc
* Moved Gen 5 data to gSpeciesInfo
* Using PLACEHOLDER_ANIM_SINGLE_FRAME when needed (same hash)
* Renamed PLACEHOLDER_TWO_FRAME_ANIMATION to PLACEHOLDER_ANIM_TWO_FRAMES
* Fixed capitalization for front pic anims
* Fixed `CanEvolve`
* Moved Gen 6 data to gSpeciesInfo
* Gen 7 without macros
* Gen 8 without macros
* Gen 9 without macros
* Fixed Gen 9 sound data
* Finished moving Gen 7 data in macros (by Alex)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Ultra Necrozma is now included in the fusion forms define
* Cries are now properly excluded from the rom when disabling species
* Removed P_GEN_x_POKEMON from form_change_tables.h
* Fixed Yanmega's cry ignoring the P_GEN_4_CROSS_EVOS setting
* Added P_NEW_EVOS_IN_REGIONAL_DEX setting
* Automatic ASSUMPTION_FAIL when used species are disabled
* Finished moving Gen 8 data in macros (by Alex)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Expanded Alcremie macro
* Finished moving Gen 9 data in macros (by Alex)
* Fixed missing data for Komala and Marshadow
* Form species id tables use family toggles + added missing Ursaluna form species id table
* Fixed Genesect palettes
* Fixed Flabébé family graphics
* Fixed Minior Graphics
* Fixed missing Calyrex data
* Family toggles in mon graphcis (By Jasper/Bassoonian)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Fixed missing Ogerpon data
* Ordered Level Up Learnsets (missing toggles)
Also added White Basculin learnset
* Added more Minior synonyms
* Fixed enamorus order
* Reordered teachable learnsets
* Removed sSpeciesXXX level up learnsets + reordered
* Removed unneeded assumes
* Removed unused extra animations
* Family toggles in mon level up learnsets (By Jasper/Bassoonian)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Fixed Phione graphics inclusion
* Family toggles for Teachable Learnsets
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Ordered Front Pic Anims
* Family toggles for front pic animations
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Fixed HGSS dex incorrectly showing the wrong mon when catching it
* Family toggles for Egg Moves + reodered
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Fixed HGSS not checking for null footprints
* Review changes
* Fixed Female difference mon not using their macros
* Fixed Alcremie Macro
* Fixed compile error when disabling the Bulbasaur family
* Fixed Turtwig and Chimchar family + Houndour and Mareep cries not being excluded properly
* Re-added missing Egg graphical data
* Fixed crash during the Birch Intro when Lotad is disabled
* Renamed PALLETE to PALETTES
* Removed extra spacing for YOffsets
* Fixed compile when only disabling cross-gen evolutions
* Added Tera Forms define (Ogerpon and Terapagos)
* Fixed Necrozma macro
* Removed .noFlip = FALSE
* Fixed dex number in summary screen for forms when nat dex is disabled
* Fixed Paldean form paths
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-12-08 15:05:10 +01:00
Icedude907
85f4ca6943
All mid2agb songs are controlled by a midi.cfg file
2023-11-15 13:26:49 +13:00
Philipp AUER
11e8407958
[audio] resample oversampled cries to 13379Hz ( #3359 )
...
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-11-09 09:04:29 -03:00
Eduardo Quezada D'Ottone
eccd2c4a65
Merge commit '1467ffa3d8ca71b8b91da815dcf120421759793c' into gen9-species-nomigration
2023-11-02 21:28:53 -04:00
leo60228
392a65dec0
cry fixes
2023-10-30 23:20:24 -04:00
leo60228
7be2c62d98
add teal mask cries (but none tweaked yet)
2023-10-29 23:18:45 -04:00
Eduardo Quezada D'Ottone
1467ffa3d8
Added missing Alcremie forms ( #3469 )
...
* Alcremie form sprites
Co-authored-by: Blackforest92 <rico.anjaya@gmail.com>
# Conflicts:
# graphics/pokemon/alcremie/lemon_cream/front.png
# graphics/pokemon/alcremie/matcha_cream/back.png
# graphics/pokemon/alcremie/matcha_cream/front.png
# graphics/pokemon/alcremie/mint_cream/front.png
# graphics/pokemon/alcremie/ruby_cream/front.png
# graphics/pokemon/alcremie/salted_cream/front.png
# include/graphics.h
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info.h
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/footprint_table.h
# src/data/pokemon_graphics/front_pic_anims.h
# src/data/pokemon_graphics/front_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon.c
* Fixed cries
* Removed Todos
* Temp: all forms use the same icon
* Grouped form data + Fixed missing Level up and Teachable learnsets
* Added missing data for form changes and back animations
* Grouped defines together
* Fixed compile
---------
Co-authored-by: Alex <alexthenotes@gmail.com>
2023-10-29 20:30:56 +01:00
leo60228
fca19a03f1
downsample cries (like #3359 )
2023-10-26 21:45:21 -04:00
leo60228
144ed150c0
update cry tables
2023-10-26 17:42:14 -04:00
Eduardo Quezada
ed3e2f8e09
Gen 9 form order
2023-10-23 13:30:32 -03:00
Eduardo Quezada
f570d14f2d
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/gen9-species-nomigration
...
# Conflicts:
# include/constants/species.h
# sound/cry_tables.inc
# src/data/pokemon_graphics/enemy_mon_elevation.h
# src/data/pokemon_graphics/front_pic_anims.h
2023-10-23 09:23:32 -03:00
leo60228
14c225436a
remove leftover cry
2023-10-22 19:15:25 -04:00
leo60228
87a03c3c73
Fix Paldean form order
2023-10-18 14:44:30 -04:00
leo60228
ba0534386d
Address review
2023-10-18 14:37:29 -04:00
leo60228
5113efa64a
cry fixes
2023-10-18 14:37:01 -04:00
leo60228
4e8ae5965e
make sure Tauros-Paldea forms are defined properly without P_GEN_9_POKEMON
2023-10-18 14:37:01 -04:00
leo60228
b5be823e3b
gen 9 forms (learnsets still missing)
2023-10-18 14:36:59 -04:00
Eduardo Quezada D'Ottone
a502427a7f
Merge pull request #18 from AlexOn1ine/speciesReorderItems
...
(cherry picked from commit 6dc58dcc17
2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone
133ffc7260
Merge pull request #15 from Bassoonian/rhhspeciesreorder
...
Add gen 9 Pokémon data
(cherry picked from commit cd3e65f5c9
2023-10-18 14:33:56 -04:00
