diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-03 12:07:02 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-02-03 12:08:27 -0500 |
| commit | 34deceb13695e7b13a27ecb94666fc95d2ced550 (patch) | |
| tree | 0f014b2b82c6c0e546ab27c6b612c082ca98675e /src | |
| parent | 017fa7e3361e3dafd06dd34d434f1d56159c051e (diff) | |
Remove old references to battle pyramid
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_main.c | 1 | ||||
| -rw-r--r-- | src/fieldmap.c | 16 | ||||
| -rw-r--r-- | src/script.c | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index fd8aeffbc..17fbb58b4 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4163,7 +4163,6 @@ bool8 TryRunFromBattle(u8 battler) { bool8 effect = FALSE; u8 holdEffect; - u8 pyramidMultiplier; u8 speedVar; if (gBattleMons[battler].item == ITEM_ENIGMA_BERRY) diff --git a/src/fieldmap.c b/src/fieldmap.c index d64215295..db3a18e04 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_tower_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)); diff --git a/src/script.c b/src/script.c index 0a4b69bac..99bfa9999 100644 --- a/src/script.c +++ b/src/script.c @@ -406,7 +406,7 @@ u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag) } } -void mapheader_run_script_with_tag_x1(void) +void RunOnLoadMapScript(void) { mapheader_run_script_by_tag(1); } |