diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 11:28:03 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 11:28:03 -0500 |
| commit | fd0fc184d6d06e01e017ba88b06d3c1709e626de (patch) | |
| tree | 56e7852cb2d20931985caf1e25003fdc43391025 /src/fieldmap.c | |
| parent | 91844cdfb2e0c3c1fd00fae45d1cec2be763c522 (diff) | |
| parent | 4e07002d13c97f90cb8885298c0db2c331dc2b07 (diff) | |
Merge branch 'master' of https://github.com/pret/pokefirered into doc-pokemonleague
Diffstat (limited to 'src/fieldmap.c')
| -rw-r--r-- | src/fieldmap.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c index adb26f230..90682da10 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -16,7 +16,7 @@ struct ConnectionFlags u8 east:1; }; -void sub_8058A00(struct MapHeader *mapHeader); +static void InitMapLayoutData(struct MapHeader *mapHeader); void map_copy_with_padding(u16 *map, u16 width, u16 height); void mapheader_copy_mapdata_of_adjacent_maps(struct MapHeader *mapHeader); void fillSouthConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset); @@ -63,20 +63,20 @@ const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * conn return Overworld_GetMapHeaderByGroupAndId(connection->mapGroup, connection->mapNum); } -void not_trainer_hill_battle_pyramid(void) +void InitMap(void) { - sub_8058A00(&gMapHeader); - mapheader_run_script_with_tag_x1(); + InitMapLayoutData(&gMapHeader); + RunOnLoadMapScript(); } -void sub_80589E8(void) +void InitMapFromSavedGame(void) { - sub_8058A00(&gMapHeader); + InitMapLayoutData(&gMapHeader); LoadSavedMapView(); - mapheader_run_script_with_tag_x1(); + RunOnLoadMapScript(); } -void sub_8058A00(struct MapHeader * mapHeader) +static void InitMapLayoutData(struct MapHeader * mapHeader) { const struct MapLayout * mapLayout = mapHeader->mapLayout; CpuFastFill(0x03FF03FF, gBackupMapLayout, sizeof(gBackupMapLayout)); @@ -490,7 +490,7 @@ void MapGridSetMetatileEntryAt(s32 x, s32 y, u16 metatile) } } -void sub_8059024(s32 x, s32 y, bool32 arg2) +void MapGridSetMetatileImpassabilityAt(s32 x, s32 y, bool32 arg2) { if (x >= 0 && x < VMap.Xsize && y >= 0 && y < VMap.Ysize) |