dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into navdata

Browse Source
This commit is contained in:
garak
2019-07-20 12:30:41 -04:00
committed by GitHub
parent dfa3e079c0 4d5c1ca03b
commit c39d25ff4d
96 changed files with 4362 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pokenav_unk_5.c
View File

@@ -42,8 +42,8 @@ struct CityMapEntry
static u32 sub_81CC568(struct Pokenav5Struct *);
static u32 sub_81CC5B4(struct Pokenav5Struct *);
static u32 sub_81CC5DC(struct Pokenav5Struct *);
static u32 sub_81CC6F4(int);
static u32 sub_81CCD34(int);
static u32 sub_81CC6F4(s32);
static u32 sub_81CCD34(s32);
static bool32 sub_81CC6BC(void);
static void sub_81CC9EC(void);
static void sub_81CC9C0(void);
@@ -295,7 +295,7 @@ static bool8 sub_81CC6D0(void)
return gSaveBlock2Ptr->regionMapZoom == 1;
}
static u32 sub_81CC6F4(int taskState)
static u32 sub_81CC6F4(s32 taskState)
{
int var0;
struct RegionMap *regionMap;
@@ -611,7 +611,7 @@ static bool32 sub_81CCD24(void)
return FuncIsActiveLoopedTask(sub_81CCD34);
}
static u32 sub_81CCD34(int taskState)
static u32 sub_81CCD34(s32 taskState)
{
struct Pokenav5Struct_2 *state = GetSubstructPtr(4);
if (taskState < (int)ARRAY_COUNT(gPokenavCityMaps))