diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-31 21:55:57 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-31 21:55:57 -0400 |
commit | c3c08bf0379e172b8d7dd1b233947ebca83a3c3c (patch) | |
tree | 3a9f25df908ec635e53915bbb08586f5182603f7 /src | |
parent | ef535b98b5e1384ce5f663a4ab4dfcb003fbe1c7 (diff) |
through sub_8124610
Diffstat (limited to 'src')
-rw-r--r-- | src/region_map.c | 28 | ||||
-rw-r--r-- | src/tv.c | 4 |
2 files changed, 29 insertions, 3 deletions
diff --git a/src/region_map.c b/src/region_map.c index 5284922cc..cd0f0b87c 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -13,6 +13,7 @@ #include "rom6.h" #include "secret_base.h" #include "string_util.h" +#include "strings.h" #include "text.h" #include "region_map.h" @@ -632,7 +633,7 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) case 8: gRegionMap->mapSecId = gMapHeader.regionMapSectionId; - if (gRegionMap->mapSecId != MAPSEC_UNK_0x57) + if (gRegionMap->mapSecId != MAPSEC_SS_TIDAL) { r4 = &gSaveBlock1Ptr->warp4; mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum); @@ -1208,3 +1209,28 @@ u8 *GetMapName(u8 *dest, u16 regionMapId, u16 padLength) } return str; } + +u8 *sub_81245DC(u8 *dest, u16 mapSecId) +{ + switch (mapSecId) + { + case MAPSEC_SS_TIDAL: + return StringCopy(dest, gText_Ferry); + case MAPSEC_SECRET_BASE: + return StringCopy(dest, gText_SecretBase); + default: + return GetMapName(dest, mapSecId, 0); + } +} + +u8 *sub_8124610(u8 *dest, u16 mapSecId) +{ + if (mapSecId == MAPSEC_AQUA_HIDEOUT_OLD) + { + return StringCopy(dest, gText_Hideout); + } + else + { + return sub_81245DC(dest, mapSecId); + } +} @@ -6435,7 +6435,7 @@ void DoTVShowTodaysRivalTrainer(void) case MAPSEC_SECRET_BASE: sTVShowState = 8; break; - case MAPSEC_UNK_0x57: + case MAPSEC_SS_TIDAL: switch (show->rivalTrainer.mapDataId) { case 0x115 ... 0x117: @@ -6633,7 +6633,7 @@ void DoTVShowHoennTreasureInvestigators(void) { case 0: StringCopy(gStringVar1, ItemId_GetItem(show->treasureInvestigators.item)->name); - if (show->treasureInvestigators.location == MAPSEC_UNK_0x57) + if (show->treasureInvestigators.location == MAPSEC_SS_TIDAL) { switch (show->treasureInvestigators.mapDataId) { |