pokecrystal-board/audio
Rangi 32ed487a47 Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm
2018-02-03 19:42:56 -05:00
..
music Remove useless file 2017-11-30 21:44:27 +01:00
cries.asm Change a few Unknown labels 2017-12-24 20:07:23 -05:00
cry_pointers.asm Keep table labels in the same files as their contents. 2017-12-11 22:44:25 -05:00
drumkits.asm Move more data tables into data/ files. 2017-12-11 15:20:32 -05:00
engine.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
music_pointers.asm Keep table labels in the same files as their contents. 2017-12-11 22:44:25 -05:00
notes.asm Move data/audio/ back into audio/ 2017-12-15 12:38:59 -05:00
sfx_crystal.asm pitchoffset macro to replace forceoctave 2016-07-29 10:40:54 -04:00
sfx_pointers.asm wiggle → wobble 2018-01-19 00:16:08 -05:00
sfx.asm wiggle → wobble 2018-01-19 00:16:08 -05:00
wave_samples.asm Correction, wave patterns are quite interesting. 2018-01-26 11:39:35 -05:00