Commit graph

2 commits

Author SHA1 Message Date
Eduardo Quezada
3d9c7732f6 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
#	include/event_object_movement.h
#	src/data.c
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info/gen_4_families.h
2024-04-20 13:23:14 -04:00
Philipp AUER
b5c7332182
feat: check if inside of git repository before building (#4363)
* feat: check if inside of git repository before building

* pokemon_expansion -> pokeemerald-expansion

---------

Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-04-07 10:43:04 -04:00