Eduardo Quezada e4a439aa46 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/data/bard_music/moves.h # src/data/bard_music/pokemon.h		2022-10-30 12:30:38 -03:00
..
actions.h	Review changes	2022-10-27 11:26:09 -03:00
adjectives.h	Review changes	2022-10-27 11:26:09 -03:00
bard_sounds.h	Review changes	2022-10-27 11:26:09 -03:00
battle.h	Review changes	2022-10-27 11:26:09 -03:00
conditions.h	Review changes	2022-10-27 11:26:09 -03:00
default_sound.h	Review changes	2022-10-27 11:26:09 -03:00
endings.h	Review changes	2022-10-27 11:26:09 -03:00
events.h	Review changes	2022-10-27 11:26:09 -03:00
feelings.h	Review changes	2022-10-27 11:26:09 -03:00
greetings.h	Review changes	2022-10-27 11:26:09 -03:00
hobbies.h	Review changes	2022-10-27 11:26:09 -03:00
length_table.h	Review changes	2022-10-27 11:26:09 -03:00
lifestyle.h	Review changes	2022-10-27 11:26:09 -03:00
misc.h	Review changes	2022-10-27 11:26:09 -03:00
moves.h	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030	2022-10-30 12:30:38 -03:00
people.h	Review changes	2022-10-27 11:26:09 -03:00
pokemon.h	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030	2022-10-30 12:30:38 -03:00
speech.h	Review changes	2022-10-27 11:26:09 -03:00
status.h	Review changes	2022-10-27 11:26:09 -03:00
time.h	Review changes	2022-10-27 11:26:09 -03:00
trainer.h	Review changes	2022-10-27 11:26:09 -03:00
trendysaying.h	Review changes	2022-10-27 11:26:09 -03:00
voices.h	Review changes	2022-10-27 11:26:09 -03:00
word_pitch.h	Review changes	2022-10-27 11:26:09 -03:00