mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-08 20:55:10 +01:00
afcc1178b2
# Conflicts: # data/battle_ai_scripts.s # data/battle_scripts_1.s # include/battle_controllers.h # include/battle_script_commands.h # include/battle_util.h # include/constants/battle_script_commands.h # include/constants/global.h # include/decompress.h # src/battle_anim_effects_1.c # src/battle_anim_normal.c # src/battle_anim_poison.c # src/battle_anim_water.c # src/battle_arena.c # src/battle_controller_link_opponent.c # src/battle_controller_link_partner.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controller_player_partner.c # src/battle_controller_recorded_opponent.c # src/battle_controller_recorded_player.c # src/battle_controller_safari.c # src/battle_controller_wally.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/berry.c # src/data/trainers.h # src/decompress.c # src/field_effect.c # src/hall_of_fame.c # src/overworld.c # src/pokeball.c # src/pokemon.c # src/pokemon_icon.c # src/pokemon_storage_system.c # src/scrcmd.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_pokemon2.h | ||
| easy_chat_group_pokemon.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 | ||