Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,093 Commits 1 Branch 0 Tags
Commit Graph

324 Commits

Author SHA1 Message Date
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
6a28506ee2 19/11/25 Master to upcoming merge 2025-11-19 18:20:30 +01:00
AlexOn1ine
ba74c076f6 pret merge 2025-11-16 12:01:13 +01:00
PCG
d2425c1468
Move Relearners for TMs, Tutors and Egg moves (#8040) 
Co-authored-by: khbsd <khb.dev@gmail.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
 2025-11-09 12:54:01 -08:00
khbsd
82a63a09fe
update: time-based encounters system tuneup and @cawtds' header script (#8158) 2025-11-07 21:25:09 -08:00
grintoul1
c230e54678 Master to Upcoming merge 20251107 2025-11-07 22:45:57 +00:00
FosterProgramming
8d692bc96e
Fix wild_encounters script not closing arrays properly (#8123) 2025-11-07 11:46:56 +01:00
FosterProgramming
97b115d572
Adds an auto-generated include file of script commands (#8156) 2025-11-06 21:10:42 -08:00
FosterProgramming
8b8c593bf6
Fix preproc not correctly reading skipped lines symbols inside enum (#2197) 2025-11-05 09:04:30 +00:00
Bassoonian
473a0aa44d
Add Legends Z-A content (#7935) 
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
 2025-11-04 22:25:33 +01:00
Hedara
5c31b58b81 Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge 
Conflicts:
	spritesheet_rules.mk
	tools/mapjson/mapjson.cpp
 2025-11-01 15:13:16 +01:00
Martin Griffin
d1d5435487
Improve undefined map assembler messages (#2196) 2025-10-29 21:34:03 -04:00
wiz1989
ea20dea191
update of sv.json to consider newest DLC changes (#7672) 2025-09-13 16:06:36 +02:00
AlexOn1ine
ce52d83343 25/08/25 Master merge 2025-08-25 17:30:38 +02:00
Alex
c80a41b730
Suppress trainerproc compile warning for unused func (#7592) 2025-08-21 17:31:59 +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
grintoul
916f083852
Added trainerBackPic to Trainer struct to de-couple trainer pic and trainer back pic defines (#7425) 2025-08-13 11:02:41 +02:00
Martin Griffin
de6c9c6176
Hacky support for enums in C asm statements (#7494) 2025-08-11 10:06:23 +02:00
hedara90
469a0b476a
Update trainer.h usage warning (#7439) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-08-02 11:54:39 +01:00
AlexOn1ine
bc73f4654b merge master 31/07/25 2025-08-01 12:18:11 +02: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
Eduardo Quezada
d801556a97 Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727 2025-07-27 11:59:07 -04:00
GriffinR
20012cba6e
Merge pull request #2130 from Catnip-Consumer/preproc-windows-fixes 
Apply fixes to preproc for Windows compatibility
 2025-07-21 18:56:37 -04:00
Philipp AUER
e63e89e270
Fix potential stack memory leak in gbagfx due to out of bounds read (#2162) 
* fix(tools): gbagfx potential oob read

---------

Co-authored-by: sbird <sbird@no.tld>
 2025-07-21 18:33:44 +01:00
Martin Griffin
731948a769
preproc: Support __attribute__ in enums (#7344) 2025-07-18 21:43:02 +02:00
hedara90
05b1db8cc6
trainerproc copy other trainer party (#7251) 2025-07-18 15:57:57 +01:00
hedara90
6367ce71be
Remove wrongly added binary files (#7307) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-07-09 09:55:07 +02:00
Alex
f808201945
Fixes Natural Gift moveend execution (#7274) 2025-07-05 15:05:35 -04:00
Hedara
84972342d6 Add 'Macro' key to trainerproc 2025-06-18 21:51:46 +02:00
hedara90
260813fc3f
Improve smol compressor (#7073) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-06-09 18:28:00 +02:00
hedara90
0917af214c
Replace all usages of lz compression with smol (#7032) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-31 19:47:54 +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
khbsd
38ba41b324
fix: better area mons handling, no longer duplicates hiddenMons field (#6945) 2025-05-30 17:22:05 +02:00
psf
9656400f88
Moved time constants to dedicated files (#7019) 2025-05-30 16:39:01 +02:00
Hedara
9d80ad530d Merge branch 'master' into master-to-upcoming 
Conflicts:
	Makefile
	data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
	data/maps/MtChimney/scripts.inc
	data/maps/MtPyre_Summit/scripts.inc
	data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
	include/constants/event_objects.h
	include/constants/expansion.h
	src/battle_script_commands.c
	src/battle_util.c
	src/field_screen_effect.c
 2025-05-28 14:26:15 +02:00
Hedara
647c786c53 Merge commit '07c897a' into pret-merge 
Conflicts:
	include/constants/heal_locations.h
	map_data_rules.mk
 2025-05-27 19:46:13 +02:00
Hedara
c27930eabf Merge commit '678fdf9' into pret-merge 
Conflicts:
	data/maps/BirthIsland_Exterior/scripts.inc
	data/maps/DesertUnderpass/scripts.inc
	data/maps/Route117/scripts.inc
	data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
	data/maps/SootopolisCity/scripts.inc
	include/constants/event_objects.h
	src/battle_setup.c
	src/event_object_movement.c
	src/field_control_avatar.c
	src/item_use.c
	src/scrcmd.c
	tools/mapjson/mapjson.cpp
 2025-05-27 19:22:40 +02:00
Hedara
4a442cc3e6 Merge commit '091b726' into pret-merge 
Conflicts:
	include/constants/heal_locations.h
	map_data_rules.mk
 2025-05-27 19:02:53 +02:00
Hedara
90aed43c27 Merge branch 'master' into master-upcoming 
Conflicts:
	.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
	.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
	.github/ISSUE_TEMPLATE/03_feature_requests.yaml
	.github/ISSUE_TEMPLATE/04_other_errors.yaml
	.github/pull_request_template.md
	src/battle_controller_player.c
	src/battle_main.c
	src/battle_script_commands.c
	src/battle_util.c
	src/data/graphics/pokemon.h
	src/data/pokemon/species_info/gen_9_families.h
	test/battle/ability/flower_veil.c
	test/battle/ability/sweet_veil.c
	test/battle/ability/synchronize.c
	test/battle/ability/water_bubble.c
	test/battle/move_effect/fell_stinger.c
	test/battle/move_effect/level_damage.c
	test/battle/move_effect/magic_room.c
	test/battle/move_effect/me_first.c
	test/battle/move_effect/sky_drop.c
	test/battle/move_effect/smack_down.c
	test/battle/move_effect/wish.c
	test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
 2025-05-22 15:41:08 +02:00
jfb1337
ce9bbcc3b7
Fix trainers.party parser failing on apostrophes (#6938) 2025-05-21 10:41:18 +02:00
Eduardo Quezada
406fd7ce81
Expand trainerproc to support additional battle types (#6770) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-05-17 15:08:44 +02:00
GriffinR
929bc8b990 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2025-05-14 11:50:11 -04:00
Martin Griffin
484c41c49d Remove files that should not have been committed 2025-05-13 14:56:31 +01:00
Alex
2044bea883
Rename battlerId to battler for consistency (#2126) 2025-05-09 12:43:23 +01:00
Pawkkie
3f5335c4ba
Refactor AI flags to u64 (#6753) 
Co-authored-by: DizzyEggg
 2025-05-04 17:16:34 +02:00
AlexOn1ine
40bf9ae087 conflicts 2025-05-03 10:26:07 +02:00
Hedara
4fa48b6e89 Merge remote-tracking branch 'pret/master' into pret-merge-2025-05-02 2025-05-02 17:29:41 +02:00
Hedara
c8d3a6b4df Added missing include due to g++ changes 2025-05-02 16:03:55 +02:00
Catnip-Consumer
2cc013ff3e Apply fixes to preproc for Windows compatibility 2025-04-28 14:36:19 +03:00