mirror of
https://github.com/pret/pokeemerald.git
synced 2026-05-06 21:51:57 -05:00
749225ace1
# 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 |
||
|---|---|---|
| .. | ||
| easy_chat_group_actions.h | ||
| easy_chat_group_adjectives.h | ||
| easy_chat_group_battle.h | ||
| easy_chat_group_conditions.h | ||
| easy_chat_group_endings.h | ||
| easy_chat_group_events.h | ||
| easy_chat_group_feelings.h | ||
| easy_chat_group_greetings.h | ||
| easy_chat_group_hobbies.h | ||
| easy_chat_group_lifestyle.h | ||
| easy_chat_group_misc.h | ||
| easy_chat_group_move_1.h | ||
| easy_chat_group_move_2.h | ||
| easy_chat_group_people.h | ||
| easy_chat_group_pokemon.h | ||
| easy_chat_group_pokemon2.h | ||
| easy_chat_group_speech.h | ||
| easy_chat_group_status.h | ||
| easy_chat_group_time.h | ||
| easy_chat_group_trainer.h | ||
| easy_chat_group_trendy_saying.h | ||
| easy_chat_group_voices.h | ||
| easy_chat_groups.h | ||
| easy_chat_words_by_letter.h | ||