Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants

This commit is contained in:
GriffinR
2024-10-15 22:04:45 -04:00
98 changed files with 281 additions and 555 deletions

View File

@@ -38,7 +38,7 @@
static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0;
static EWRAM_DATA u16 sPrevMetatileBehavior = 0;
u8 gSelectedObjectEvent;
COMMON_DATA u8 gSelectedObjectEvent = 0;
static void GetPlayerPosition(struct MapPosition *);
static void GetInFrontOfPlayerPosition(struct MapPosition *);