Eduardo Quezada 749225ace1 Matching merge from upstream pret ... # Conflicts: # graphics/interface/menu_info.png # include/pokemon.h # src/battle_ai_switch_items.c # src/battle_anim_mons.c # src/battle_anim_water.c # src/battle_controller_opponent.c # src/battle_gfx_sfx_util.c # src/battle_main.c # src/battle_pike.c # src/battle_script_commands.c # src/data/pokemon/species_info.h # src/pokemon.c # src/pokemon_summary_screen.c		2023-01-20 12:31:54 -03:00
..
easy_chat_group_actions.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_adjectives.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_battle.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_conditions.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_endings.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_events.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_feelings.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_greetings.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_hobbies.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_lifestyle.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_misc.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_move_1.h
easy_chat_group_move_2.h
easy_chat_group_people.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_pokemon.h
easy_chat_group_pokemon2.h	Revert "Removed Unown hack"	2023-01-07 11:39:56 -03:00
easy_chat_group_speech.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_status.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_time.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_trainer.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_trendy_saying.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_group_voices.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_groups.h	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
easy_chat_words_by_letter.h	Revert "Removed Unown hack"	2023-01-07 11:39:56 -03:00