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
..
arrow_cursor.png
blank.pal
blank.png
hof_pc_topbar.pal
main_menu_bg.pal
main_menu_text.pal
menu_info.png	Matching merge from upstream pret	2023-01-20 12:31:54 -03:00
menu_info1.pal
menu_info2.pal
menu_info3.pal
mon_markings_menu.png
mon_markings.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