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
..
direct_sound_samples	Added Indigo Disk cries (#4164)	2024-02-09 19:46:09 +01:00
programmable_wave_samples	Give programmable wave samples generic names	2021-11-06 12:07:42 -04:00
songs	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
voicegroups	Give generic names to unknown direct sound wave data	2021-11-06 17:00:24 -04:00
cry_tables.inc	Merge branch '_RHH/master' into _RHH/upcoming	2024-02-19 10:13:13 -03:00
direct_sound_data.inc	Merge branch '_RHH/master' into _RHH/upcoming	2024-02-19 10:13:13 -03:00
keysplit_tables.inc	Update keysplit_tables.inc	2018-09-21 12:36:48 -04:00
MPlayDef.s	Fix macro v069 in sound/MPlayDef.s	2022-01-08 00:58:05 +08:00
music_player_table.inc	forgot we could do this	2022-01-22 19:41:31 -05:00
programmable_wave_data.inc	Give programmable wave samples generic names	2021-11-06 12:07:42 -04:00
song_table.inc	Remove address comments in sound directory	2021-07-21 00:56:04 -04:00
voice_groups.inc	Split voicegroups and cry tables properly.	2020-04-03 23:14:10 -04:00