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

Merge branch 'master' into heal_location

Browse Source
This commit is contained in:
PikalaxALT
2017-11-15 09:01:56 -05:00
parent 79609d52c8 055a419830
commit 89b695278d
2869 changed files with 155560 additions and 13742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/region_map.c
View File

@@ -308,7 +308,7 @@ static const struct {
} gUnknown_085A1EDC[] = {
gUnknown_085A1ED4,
MAPSEC_EVER_GRANDE_CITY,
SYS_POKEMON_LEAGUE_FLY
FLAG_SYS_POKEMON_LEAGUE_FLY
};
static const struct BgTemplate gUnknown_085A1EE4[] = {
@@ -1918,7 +1918,7 @@ static void sub_8124E0C(void)
sub_8084CCC(gSaveBlock2Ptr->playerGender == MALE ? 0x0C : 0x0D);
break;
case MAPSEC_EVER_GRANDE_CITY:
sub_8084CCC(FlagGet(SYS_POKEMON_LEAGUE_FLY) && gUnknown_0203A148->regionMap.posWithinMapSec == 0 ? 0x14 : 0x0B);
sub_8084CCC(FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && gUnknown_0203A148->regionMap.posWithinMapSec == 0 ? 0x14 : 0x0B);
break;
default:
if (gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2] != 0)