4 commits

Author	SHA1	Message	Date
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
GriffinR	68f97d02f4	Colorize menu_info.png	2023-01-12 13:17:31 -05:00
ultima-soul	3ed51d6d91	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-11-21 10:40:26 -08:00
GriffinR	085f8adec6	Start remaining menu documentation	2021-11-03 17:38:08 -04:00

Renamed from graphics/interface_fr/menu.png (Browse further)