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 |
||
---|---|---|
.. | ||
arrow_cursor.png | ||
blank.pal | ||
blank.png | ||
hof_pc_topbar.pal | ||
main_menu_bg.pal | ||
main_menu_text.pal | ||
menu_info.png | ||
menu_info1.pal | ||
menu_info2.pal | ||
menu_info3.pal | ||
mon_markings.png | ||
mon_markings_menu.png | ||
mystery_gift_textbox_border.png | ||
option_menu_equals_sign.png | ||
option_menu_text.pal | ||
outline_cursor.png | ||
red.pal | ||
scroll_indicator.png | ||
split_icons.png | ||
status_icons.png | ||
std_menu.pal | ||
swap_line.png | ||
ui_learn_move.png |