Eduardo Quezada D'Ottone 681ad8c7a9 Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig ... # Conflicts: # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/form_change_tables.h # src/data/pokemon/form_species_table_pointers.h # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/front_pic_coordinates.h		2022-09-18 18:25:05 -03:00
..
direct_sound_samples
programmable_wave_samples
songs
voicegroups
cry_tables.inc
direct_sound_data.inc	Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig	2022-09-18 18:25:05 -03:00
keysplit_tables.inc
MPlayDef.s
music_player_table.inc
programmable_wave_data.inc
song_table.inc
voice_groups.inc