mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-03-03 10:11:51 -05:00
Code Issues Projects Releases Wiki Activity

Stop Adult Anju from breaking (#4767)

Browse Source 
* stop anju from breaking

* remove comments

* remove whitespace
This commit is contained in:
Pepper0ni 2025-01-08 04:50:24 +00:00 committed by GitHub
parent 51fcf4d2c6
commit ad596387c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/game-interactor/GameInteractor.h
View File

@ -488,8 +488,6 @@ typedef enum {
VB_TRADE_TIMER_ODD_MUSHROOM, VB_TRADE_TIMER_ODD_MUSHROOM,
VB_TRADE_TIMER_FROG, VB_TRADE_TIMER_FROG,
VB_TRADE_TIMER_EYEDROPS, VB_TRADE_TIMER_EYEDROPS,
// Opt: *EnNiwLady
VB_ANJU_SET_OBTAINED_TRADE_ITEM,
/*** Fixes ***/ /*** Fixes ***/
// Vanilla condition: false // Vanilla condition: false

7
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View File

@ -66,6 +66,7 @@ extern void Player_SetupActionPreserveAnimMovement(PlayState* play, Player* play
extern s32 Player_SetupWaitForPutAway(PlayState* play, Player* player, AfterPutAwayFunc func); extern s32 Player_SetupWaitForPutAway(PlayState* play, Player* player, AfterPutAwayFunc func);
extern void Play_InitEnvironment(PlayState * play, s16 skyboxId); extern void Play_InitEnvironment(PlayState * play, s16 skyboxId);
extern void EnMk_Wait(EnMk* enMk, PlayState* play); extern void EnMk_Wait(EnMk* enMk, PlayState* play);
extern void func_80ABA778(EnNiwLady* enNiwLady, PlayState* play);
} }
#define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).GetContextOptionIndex() #define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).GetContextOptionIndex()
@ -1082,7 +1083,9 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
break; break;
} }
case VB_GIVE_ITEM_FROM_ANJU_AS_ADULT: { case VB_GIVE_ITEM_FROM_ANJU_AS_ADULT: {
EnNiwLady* enNiwLady = va_arg(args, EnNiwLady*);
Flags_SetItemGetInf(ITEMGETINF_2C); Flags_SetItemGetInf(ITEMGETINF_2C);
enNiwLady->actionFunc = func_80ABA778;
*should = false; *should = false;
break; break;
} }
@ -1171,9 +1174,12 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
break; break;
} }
case VB_TRADE_POCKET_CUCCO: { case VB_TRADE_POCKET_CUCCO: {
EnNiwLady* enNiwLady = va_arg(args, EnNiwLady*);
Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_POCKET_CUCCO); Randomizer_ConsumeAdultTradeItem(gPlayState, ITEM_POCKET_CUCCO);
// Trigger the reward now // Trigger the reward now
Flags_SetItemGetInf(ITEMGETINF_2E); Flags_SetItemGetInf(ITEMGETINF_2E);
enNiwLady->actionFunc = func_80ABA778;
*should = false; *should = false;
break; break;
} }
@ -1628,7 +1634,6 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
case VB_FREEZE_ON_SKULL_TOKEN: case VB_FREEZE_ON_SKULL_TOKEN:
case VB_TRADE_TIMER_ODD_MUSHROOM: case VB_TRADE_TIMER_ODD_MUSHROOM:
case VB_TRADE_TIMER_FROG: case VB_TRADE_TIMER_FROG:
case VB_ANJU_SET_OBTAINED_TRADE_ITEM:
case VB_GIVE_ITEM_FROM_TARGET_IN_WOODS: case VB_GIVE_ITEM_FROM_TARGET_IN_WOODS:
case VB_GIVE_ITEM_FROM_TALONS_CHICKENS: case VB_GIVE_ITEM_FROM_TALONS_CHICKENS:
case VB_GIVE_ITEM_FROM_DIVING_MINIGAME: case VB_GIVE_ITEM_FROM_DIVING_MINIGAME:

18
soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
View File

@ -410,10 +410,6 @@ void func_80ABA9B8(EnNiwLady* this, PlayState* play) {
if (GameInteractor_Should(VB_GIVE_ITEM_FROM_ANJU_AS_ADULT, true, this)) { if (GameInteractor_Should(VB_GIVE_ITEM_FROM_ANJU_AS_ADULT, true, this)) {
Actor_OfferGetItem(&this->actor, play, GI_POCKET_EGG, 200.0f, 100.0f); Actor_OfferGetItem(&this->actor, play, GI_POCKET_EGG, 200.0f, 100.0f);
this->actionFunc = func_80ABAC00; this->actionFunc = func_80ABAC00;
} else {
// Circumvent the item offer action
this->actionFunc = func_80ABAC84;
return;
} }
break; break;
@ -445,10 +441,6 @@ void func_80ABAB08(EnNiwLady* this, PlayState* play) {
if (GameInteractor_Should(VB_TRADE_POCKET_CUCCO, true, this)) { if (GameInteractor_Should(VB_TRADE_POCKET_CUCCO, true, this)) {
Actor_OfferGetItem(&this->actor, play, GI_COJIRO, 200.0f, 100.0f); Actor_OfferGetItem(&this->actor, play, GI_COJIRO, 200.0f, 100.0f);
this->actionFunc = func_80ABAC00; this->actionFunc = func_80ABAC00;
} else {
// Circumvent the item offer action
this->actionFunc = func_80ABAC84;
return;
} }
break; break;
case 1: case 1:
@ -484,12 +476,10 @@ void func_80ABAC84(EnNiwLady* this, PlayState* play) {
} }
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST); osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
if (LINK_IS_ADULT) { if (LINK_IS_ADULT) {
if (GameInteractor_Should(VB_ANJU_SET_OBTAINED_TRADE_ITEM, true, this)) { if (!Flags_GetItemGetInf(ITEMGETINF_2C)) {
if (!Flags_GetItemGetInf(ITEMGETINF_2C)) { Flags_SetItemGetInf(ITEMGETINF_2C);
Flags_SetItemGetInf(ITEMGETINF_2C); } else {
} else { Flags_SetItemGetInf(ITEMGETINF_2E);
Flags_SetItemGetInf(ITEMGETINF_2E);
}
} }
this->actionFunc = func_80ABA778; this->actionFunc = func_80ABA778;
} else { } else {