mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-18 06:12:20 -05:00
Code Issues Projects Releases Wiki Activity

Add pulsate boss icon enhancement (#4651)

Browse Source
This commit is contained in:
Rozelette 2024-12-14 13:00:28 -06:00 committed by GitHub
parent 5d8e7740ef
commit e0f25905c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/SohMenuBar.cpp
View File

@ -1555,6 +1555,8 @@ void DrawEnhancementsMenu() {
UIWidgets::Tooltip("Restores the original outcomes when performing Reverse Bottle Adventure."); UIWidgets::Tooltip("Restores the original outcomes when performing Reverse Bottle Adventure.");
UIWidgets::PaddedEnhancementCheckbox("Early Eyeball Frog", CVAR_ENHANCEMENT("EarlyEyeballFrog"), true, false); UIWidgets::PaddedEnhancementCheckbox("Early Eyeball Frog", CVAR_ENHANCEMENT("EarlyEyeballFrog"), true, false);
UIWidgets::Tooltip("Restores a bug from NTSC 1.0/1.1 that allows you to obtain the eyeball frog from King Zora instead of the Zora Tunic by holding shield."); UIWidgets::Tooltip("Restores a bug from NTSC 1.0/1.1 that allows you to obtain the eyeball frog from King Zora instead of the Zora Tunic by holding shield.");
UIWidgets::PaddedEnhancementCheckbox("Pulsate boss icon", CVAR_ENHANCEMENT("PulsateBossIcon"), true, false);
UIWidgets::Tooltip("Restores an unfinished feature to pulsate the boss room icon when you are in the boss room.");
ImGui::EndMenu(); ImGui::EndMenu();
} }

2
soh/src/code/z_kaleido_scope_call.c
View File

@ -4,7 +4,7 @@
void (*sKaleidoScopeUpdateFunc)(PlayState* play); void (*sKaleidoScopeUpdateFunc)(PlayState* play);
void (*sKaleidoScopeDrawFunc)(PlayState* play); void (*sKaleidoScopeDrawFunc)(PlayState* play);
f32 gBossMarkScale; f32 gBossMarkScale = 1.0f;
u32 D_8016139C; u32 D_8016139C;
PauseMapMarksData* gLoadedPauseMarkDataTable; PauseMapMarksData* gLoadedPauseMarkDataTable;

16
soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
View File

@ -37,8 +37,6 @@ extern PauseMapMarksData gPauseMapMarkDataTable[];
extern PauseMapMarksData gPauseMapMarkDataTableMasterQuest[]; extern PauseMapMarksData gPauseMapMarkDataTableMasterQuest[];
void PauseMapMark_Init(PlayState* play) { void PauseMapMark_Init(PlayState* play) {
gBossMarkState = 0;
gBossMarkScale = 1.0f;
if(ResourceMgr_IsGameMasterQuest()) { if(ResourceMgr_IsGameMasterQuest()) {
gLoadedPauseMarkDataTable = gPauseMapMarkDataTableMasterQuest; gLoadedPauseMarkDataTable = gPauseMapMarkDataTableMasterQuest;
} else { } else {
@ -172,6 +170,20 @@ void PauseMapMark_Draw(PlayState* play) {
case SCENE_ICE_CAVERN: case SCENE_ICE_CAVERN:
PauseMapMark_DrawForDungeon(play); PauseMapMark_DrawForDungeon(play);
break; break;
case SCENE_DEKU_TREE_BOSS:
case SCENE_DODONGOS_CAVERN_BOSS:
case SCENE_JABU_JABU_BOSS:
case SCENE_FOREST_TEMPLE_BOSS:
case SCENE_FIRE_TEMPLE_BOSS:
case SCENE_WATER_TEMPLE_BOSS:
case SCENE_SPIRIT_TEMPLE_BOSS:
case SCENE_SHADOW_TEMPLE_BOSS:
case SCENE_GANONDORF_BOSS:
case SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR:
if (CVarGetInteger(CVAR_ENHANCEMENT("PulsateBossIcon"), 0) != 0) {
PauseMapMark_DrawForDungeon(play);
}
break;
} }
PauseMapMark_Clear(play); PauseMapMark_Clear(play);