sha1sum changed Conflicts: include/global.h include/overworld.h include/pokemon.h src/map_name_popup.c src/pokedex_area_screen.c src/pokemon.c
sha1sum changed Conflicts: include/global.h include/overworld.h include/pokemon.h src/map_name_popup.c src/pokedex_area_screen.c src/pokemon.c