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

245 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
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
97b115d572
Adds an auto-generated include file of script commands (#8156) 2025-11-06 21:10:42 -08:00
FosterProgramming
46b122c5ce
Revert HGSS dex and movelist changes (#8016) 2025-10-23 13:52:25 +02:00
FosterProgramming
eac5da89ad
Make movelist calculations happen during compilation instead of runtime (#7967) 2025-10-20 15:31:42 +02:00
Martin Griffin
44c886e1c9
Add make release target (#7296) 2025-09-10 07:27:44 +01:00
Martin Griffin
7b5844762d
make check TESTS="..." support for filenames and infix matches (#7536) 2025-08-13 10:39:55 +02:00
hedara90
2f6e1ea6d3
Enum conversion for enum MoveEffects and enum BattleMoveEffects (#7366) 2025-07-19 10:28:25 +02:00
hedara90
14dbbf63d4
Remove competitive syntax config (#7154) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-07-12 13:03:36 -07:00
Nephrite
7d5a949b71
Bag refactor 2 (#7166) 2025-07-11 11:50:38 +02:00
Jared Schoeny
b18de9d182 Add making release build 2025-07-07 10:24:45 -10:00
DizzyEggg
8e7274f3fc
lto support (#7182) 2025-06-26 15:53:14 +02:00
Hedara
51a5577f65 Merge branch 'master' into master-upcoming 
Conflicts:
	src/battle_controller_safari.c
	src/data/moves_info.h
	src/graphics.c
 2025-06-25 14:17:07 +02:00
Hedara
726f18f360 Merge remote-tracking branch 'pret/master' into pret-merge 
Conflicts:
	asm/macros/event.inc
	data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
	data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
	data/scripts/trainer_hill.inc
	include/graphics.h
 2025-06-24 10:42:24 +02:00
DizzyEggg
01fc7e76ef Fix wrong keep temps files directory in makefile 2025-06-22 11:26:31 +02:00
hedara90
260813fc3f
Improve smol compressor (#7073) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-06-09 18:28:00 +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
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
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
GriffinR
0c32d840fa
Merge pull request #2141 from pret/porymap-6 
Update for Porymap 6
 2025-05-27 10:53:17 -04:00
Martin Griffin
372553b319
Explicit -std=gnu17 in CPPFLAGS to mirror CFLAGS (#6839) 2025-05-26 09:33:17 +02:00
Kurausukun
bd0a02c456
Correct C23 Checks (#2144) 2025-05-19 15:43:06 +01:00
AlexOn1ine
35dff24c9b Master to upcoming merge 2025-05-15 20:37:27 +02:00
hedara90
9924ae3391
Make make clean work again (#6848) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-15 10:40:35 +02:00
mudskipper13
ad0e98bb12
Prevent scaninc touching tests when make-ing non-test builds (#6812) 2025-05-15 10:15:22 +02:00
Hedara
1abfa7acfa Merge branch 'master' into master-upcoming 
Conflicts:
	include/battle.h
	include/constants/battle_string_ids.h
	src/battle_ai_util.c
	src/battle_main.c
	src/battle_util.c
	test/battle/ai/ai.c
 2025-05-12 18:21:35 +02:00
hedara90
2bc82a886a
Add AUTO_GEN_TARGETS for .party files and map_groups_count, but on master (#6824) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-11 22:37:11 +02:00
PCG
f661f3b3ac
Pokedex Plus HGSS move configs (#6687) 2025-04-24 19:34:37 +02:00
Hedara
2210e2d410 Merge branch 'master' into upcoming-master 2025-04-09 11:06:38 +02:00
khbsd
26f28103ec
Add Time-Based Encounters (#6454) 2025-04-09 09:49:09 +02:00
aronson
991065f25a
Support make check on macOS (#6513) 2025-04-01 21:52:49 +02:00
Rachel
c7ac1a19df
Refactor teachable learnset helper (#6378) 2025-03-04 20:10:00 +01:00
Eduardo Quezada
cd84e07341 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-23 23:01:25 -03:00
RavePossum
2aa0ee3de8
Add dependency on json files to learnset helper (#6083) 2025-01-23 00:20:07 +01:00
Eduardo Quezada
cacd07db9a Merge branch '_RHH/master' into _RHH/upcoming 2025-01-17 13:49:32 -03:00
RavePossum
536f386bed
Explicitly specify dependencies for teachable learnset helper (#6015) 2025-01-13 00:01:47 +01:00
hedara90
846734e894
Ported Makefile fix from upcoming (#6007) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-01-11 21:53:15 +01:00
Martin Griffin
7f2b76d597
Fix Makefile rules so that test.elf builds in build/test (#6004) 2025-01-11 11:29:51 -03:00
Eduardo Quezada
8821779815 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-11 08:07:15 -03:00
psf
71cf1bfaa7
Updated Makefile to allow for the creation of specific tests (#5993) 2025-01-11 07:25:04 +00:00
Eduardo Quezada
004efd1e5a Merge branch '_RHH/master' into _RHH/upcoming 2024-12-31 18:38:03 -03:00
Eduardo Quezada
009de5c98c
Setting Battle configs during tests (#5803) 
Co-authored-by: sbird <sbird@no.tld>
 2024-12-29 23:28:39 +01:00
DizzyEggg
6a2a3b2540 remove fno-toplevel-reorder 2024-12-21 14:30:15 +01:00
GriffinR
dbff8c4360
Merge branch 'porymap-6' into generate-map-constants 2024-12-09 20:25:41 -05:00
kittenchilly
ec60c6536c Merge branch 'master' into upcoming-pret-merge-nov 2024-11-30 10:49:37 -06:00
Hedara
2125bee3cd Merge remote-tracking branch 'pret/master' into pret-to-master 2024-11-29 13:36:26 +01:00
GriffinR
6560bbab21 Restore .map file creation 2024-11-23 14:17:40 -05:00