mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-07 02:40:30 -05:00
Code Issues Projects Releases Wiki Activity

flynn -> dev

Browse Source 
flynn -> dev
This commit is contained in:
briaguya 2022-11-28 15:59:00 -05:00 committed by GitHub
commit 97e612b921
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -7,8 +7,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
project(Ship LANGUAGES C CXX
VERSION 5.0.0)
set(PROJECT_BUILD_NAME "FLYNN ALFA" CACHE STRING "")
VERSION 5.0.1)
set(PROJECT_BUILD_NAME "FLYNN BRAVO" CACHE STRING "")
set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)

5
soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
View File

@ -118,7 +118,10 @@ void func_808C12C4(u8* arg1, s16 arg2) {
}
void func_808C1554(void* arg0, void* floorTex, s32 arg2, f32 arg3) {
arg0 = ResourceMgr_LoadTexByName(arg0);
// Entering the King Dodongo boss battle was crashing when using only an mq otr
// because it was trying to load a texture from a non-mq path
// HACK: LoadTexByName doesn't account for mq vs non-mq paths, LoadTexOrDListByName does.
arg0 = ResourceMgr_LoadTexOrDListByName(arg0);
floorTex = ResourceMgr_LoadTexByName(floorTex);
u16* temp_s3 = SEGMENTED_TO_VIRTUAL(arg0);

4
soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
View File

@ -75,6 +75,10 @@ u16 EnKz_GetTextNoMaskChild(PlayState* play, EnKz* this) {
if ((gSaveContext.n64ddFlag && Flags_GetRandomizerInf(RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY)) ||
(!gSaveContext.n64ddFlag && CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE))) {
// Allow turning in Ruto's letter even if you have already rescued her
if (gSaveContext.n64ddFlag && !(gSaveContext.eventChkInf[3] & 8)) {
player->exchangeItemId = EXCH_ITEM_LETTER_RUTO;
}
return 0x402B;
} else if (gSaveContext.eventChkInf[3] & 8) {
return 0x401C;

2
soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c
View File

@ -303,7 +303,7 @@ void EnRr_SetupReleasePlayer(EnRr* this, PlayState* play) {
this->retreat = true;
}
}
if (CUR_EQUIP_VALUE(EQUIP_TUNIC) != 1 /* Kokiri tunic */) {
if (CUR_EQUIP_VALUE(EQUIP_TUNIC) != 1 /* Kokiri tunic */ && !gSaveContext.n64ddFlag /* Randomizer Save File */) {
tunic = Inventory_DeleteEquipment(play, EQUIP_TUNIC);
if (tunic != 0) {
this->eatenTunic = tunic;

1
soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View File

@ -488,6 +488,7 @@ void FileChoose_UpdateMainMenu(GameState* thisx) {
this->configMode = CM_ROTATE_TO_QUEST_MENU;
} else {
this->configMode = CM_ROTATE_TO_NAME_ENTRY;
gSaveContext.isMasterQuest = MIN_QUEST == MASTER_QUEST;
this->questType[this->buttonIndex] = MIN_QUEST;
CVar_SetS32("gOnFileSelectNameEntry", 1);
this->kbdButton = FS_KBD_BTN_NONE;