mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-22 17:32:19 -05:00
Code Issues Projects Releases Wiki Activity

Restore Gold skulltula CS from the "0.9" version (#1217)

Browse Source 
* GS CS

* add to defaults
This commit is contained in:
louist103 2022-08-21 22:11:23 -04:00 committed by GitHub
parent f5112a709a
commit eed3942b81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libultraship/libultraship/ImGuiImpl.cpp
View File

@ -1501,6 +1501,7 @@ namespace SohImGui {
Tooltip("Restores N64 Weird Frames allowing weirdshots to behave the same as N64"); Tooltip("Restores N64 Weird Frames allowing weirdshots to behave the same as N64");
PaddedEnhancementCheckbox("Bombchus out of bounds", "gBombchusOOB", true, false); PaddedEnhancementCheckbox("Bombchus out of bounds", "gBombchusOOB", true, false);
Tooltip("Allows bombchus to explode out of bounds\nSimilar to GameCube and Wii VC"); Tooltip("Allows bombchus to explode out of bounds\nSimilar to GameCube and Wii VC");
PaddedEnhancementCheckbox("Restore old Gold Skulltula cutscene", "gGsCutscene", true, false);
ImGui::EndMenu(); ImGui::EndMenu();
} }
@ -2266,6 +2267,7 @@ namespace SohImGui {
// Bombchus out of bounds // Bombchus out of bounds
CVar_SetS32("gBombchusOOB", 0); CVar_SetS32("gBombchusOOB", 0);
CVar_SetS32("gGsCutscene", 0);
// Autosave // Autosave
CVar_SetS32("gAutosave", 0); CVar_SetS32("gAutosave", 0);
} }

2
soh/include/z64player.h
View File

@ -356,7 +356,7 @@ typedef struct {
/* 0x00 */ s32 active; /* 0x00 */ s32 active;
/* 0x04 */ Vec3f tip; /* 0x04 */ Vec3f tip;
/* 0x10 */ Vec3f base; /* 0x10 */ Vec3f base;
} WeaponInfo; // size = 0x1C\ } WeaponInfo; // size = 0x1C
typedef enum { typedef enum {
FLAG_NONE, FLAG_NONE,

3
soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c
View File

@ -331,6 +331,9 @@ s32 func_80B0C9F0(EnSw* this, GlobalContext* globalCtx) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALTU_DAMAGE); Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALTU_DAMAGE);
return true; return true;
} }
if(CVar_GetS32("gGsCutscene", 0)) {
OnePointCutscene_Init(globalCtx, 2200, 90, &this->actor, MAIN_CAM);
}
Enemy_StartFinishingBlow(globalCtx, &this->actor); Enemy_StartFinishingBlow(globalCtx, &this->actor);
if (((this->actor.params & 0xE000) >> 0xD) != 0) { if (((this->actor.params & 0xE000) >> 0xD) != 0) {
this->skelAnime.playSpeed = 8.0f; this->skelAnime.playSpeed = 8.0f;