diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2022-09-29 19:07:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-29 19:07:48 -0400 |
| commit | 8888fb2ec1cf1a27b5611e58b59f36762afeec54 (patch) | |
| tree | d6151de2468dd2ab865603c36c85765a26db96cd /soh/src/code/z_map_mark.c | |
| parent | dc3c0dd9c852ae704aaa6f6f7ad7258d7076c5ec (diff) | |
Master Quest (#3) (#1632)4.0.0
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
Diffstat (limited to 'soh/src/code/z_map_mark.c')
| -rw-r--r-- | soh/src/code/z_map_mark.c | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/soh/src/code/z_map_mark.c b/soh/src/code/z_map_mark.c index 3ebbfd119..79540ee20 100644 --- a/soh/src/code/z_map_mark.c +++ b/soh/src/code/z_map_mark.c @@ -42,28 +42,33 @@ static MapMarkInfo sMapMarkInfoTable[] = { { gMapBossIconTex, G_IM_FMT_IA, G_IM_SIZ_8b, 8, 8, 32, 32, 1 << 10, 1 << 10 }, // Boss Skull Icon }; -static MapMarkDataOverlay sMapMarkDataOvl = { - NULL, - //(uintptr_t)_ovl_map_mark_dataSegmentRomStart, - //(uintptr_t)_ovl_map_mark_dataSegmentRomEnd, - //_ovl_map_mark_dataSegmentStart, - //_ovl_map_mark_dataSegmentEnd, - 0, 0, 0, 0, - gMapMarkDataTable, -}; +//static MapMarkDataOverlay sMapMarkDataOvl = { +// NULL, +// //(uintptr_t)_ovl_map_mark_dataSegmentRomStart, +// //(uintptr_t)_ovl_map_mark_dataSegmentRomEnd, +// //_ovl_map_mark_dataSegmentStart, +// //_ovl_map_mark_dataSegmentEnd, +// 0, 0, 0, 0, +// gMapMarkDataTableVanilla, +//}; MapMarkData** sLoadedMarkDataTable; void MapMark_Init(GlobalContext* globalCtx) { - MapMarkDataOverlay* overlay = &sMapMarkDataOvl; - u32 overlaySize = (uintptr_t)overlay->vramEnd - (uintptr_t)overlay->vramStart; + //MapMarkDataOverlay* overlay = &sMapMarkDataOvl; + //u32 overlaySize = (uintptr_t)overlay->vramEnd - (uintptr_t)overlay->vramStart; - overlay->loadedRamAddr = GAMESTATE_ALLOC_MC(&globalCtx->state, overlaySize); - LOG_CHECK_NULL_POINTER("dlftbl->allocp", overlay->loadedRamAddr); + //overlay->loadedRamAddr = GAMESTATE_ALLOC_MC(&globalCtx->state, overlaySize); + //LOG_CHECK_NULL_POINTER("dlftbl->allocp", overlay->loadedRamAddr); - Overlay_Load(overlay->vromStart, overlay->vromEnd, overlay->vramStart, overlay->vramEnd, overlay->loadedRamAddr); + //Overlay_Load(overlay->vromStart, overlay->vromEnd, overlay->vramStart, overlay->vramEnd, overlay->loadedRamAddr); - sLoadedMarkDataTable = gMapMarkDataTable; + if(ResourceMgr_IsGameMasterQuest()) { + sLoadedMarkDataTable = gMapMarkDataTableMq; + } else { + sLoadedMarkDataTable = gMapMarkDataTableVanilla; + } + //sLoadedMarkDataTable = gMapMarkDataTableVanilla; //sLoadedMarkDataTable = (void*)(uintptr_t)( //(overlay->vramTable != NULL) //? (void*)((uintptr_t)overlay->vramTable - ((intptr_t)overlay->vramStart - (intptr_t)overlay->loadedRamAddr)) @@ -71,7 +76,7 @@ void MapMark_Init(GlobalContext* globalCtx) { } void MapMark_ClearPointers(GlobalContext* globalCtx) { - sMapMarkDataOvl.loadedRamAddr = NULL; + //sMapMarkDataOvl.loadedRamAddr = NULL; sLoadedMarkDataTable = NULL; } |