github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-23 06:35:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip

Browse source
This commit is contained in:
briaguya 2022-06-01 14:31:53 -04:00
commit 7330258897
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
soh/soh/OTRGlobals.h
View file

@ -8,6 +8,7 @@
#ifdef __cplusplus #ifdef __cplusplus
#include "Enhancements/savestates.h" #include "Enhancements/savestates.h"
#include "Enhancements/randomizer.h" #include "Enhancements/randomizer.h"
#include "spoiler_log.hpp"
class OTRGlobals class OTRGlobals
{ {
@ -75,6 +76,8 @@ int AudioPlayer_GetDesiredBuffered(void);
void AudioPlayer_Play(const uint8_t* buf, uint32_t len); void AudioPlayer_Play(const uint8_t* buf, uint32_t len);
void AudioMgr_CreateNextAudioBuffer(s16* samples, u32 num_samples); void AudioMgr_CreateNextAudioBuffer(s16* samples, u32 num_samples);
int Controller_ShouldRumble(size_t i); int Controller_ShouldRumble(size_t i);
void LoadItemLocations(const char* spoilerFileName);
void ParseItemLocations(const char* spoilerfilename);
void ParseItemLocations(SpoilerData spoilerData); void ParseItemLocations(SpoilerData spoilerData);
ItemID GetItemIdFromGetItem(GetItemID getItemId); ItemID GetItemIdFromGetItem(GetItemID getItemId);
s16 GetItemModelFromId(s16 itemId); s16 GetItemModelFromId(s16 itemId);

4
soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
View file

@ -899,7 +899,7 @@ void func_80986BF8(DemoIm* this, GlobalContext* globalCtx) {
} }
u8 successImpa; u8 successImpa;
void GivePlayerRandoRewardImpa(Actor* impa, GlobalContext* globalCtx, Key check) { void GivePlayerRandoRewardImpa(Actor* impa, GlobalContext* globalCtx, RandomizerCheck check) {
if (!Player_InBlockingCsMode(globalCtx, GET_PLAYER(globalCtx))) { if (!Player_InBlockingCsMode(globalCtx, GET_PLAYER(globalCtx))) {
if (successImpa == 0 && (globalCtx->actorCtx.titleCtx.delayTimer == 0) && if (successImpa == 0 && (globalCtx->actorCtx.titleCtx.delayTimer == 0) &&
(globalCtx->actorCtx.titleCtx.alpha == 0)) { (globalCtx->actorCtx.titleCtx.alpha == 0)) {
@ -922,7 +922,7 @@ void GivePlayerRandoRewardImpa(Actor* impa, GlobalContext* globalCtx, Key check)
void func_80986C30(DemoIm* this, GlobalContext* globalCtx) { void func_80986C30(DemoIm* this, GlobalContext* globalCtx) {
if (func_80986A5C(this, globalCtx)) { if (func_80986A5C(this, globalCtx)) {
if (gSaveContext.n64ddFlag) { if (gSaveContext.n64ddFlag) {
GivePlayerRandoRewardImpa(this, globalCtx, SONG_FROM_IMPA); GivePlayerRandoRewardImpa(this, globalCtx, RC_SONG_FROM_IMPA);
} else { } else {
globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gZeldasCourtyardLullabyCs); globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gZeldasCourtyardLullabyCs);
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;

4
soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
View file

@ -350,7 +350,7 @@ void func_80AA0EFC(EnMa1* this, GlobalContext* globalCtx) {
} }
} }
void GivePlayerRandoRewardMalon(EnMa1* malon, GlobalContext* globalCtx, Key check) { void GivePlayerRandoRewardMalon(EnMa1* malon, GlobalContext* globalCtx, RandomizerCheck check) {
Player* player = GET_PLAYER(globalCtx); Player* player = GET_PLAYER(globalCtx);
if (!Flags_GetTreasure(globalCtx, 0x1F) && if (!Flags_GetTreasure(globalCtx, 0x1F) &&
@ -381,7 +381,7 @@ void func_80AA0F44(EnMa1* this, GlobalContext* globalCtx) {
} }
if (gSaveContext.n64ddFlag) { if (gSaveContext.n64ddFlag) {
GivePlayerRandoRewardMalon(this, globalCtx, SONG_FROM_MALON); GivePlayerRandoRewardMalon(this, globalCtx, RC_SONG_FROM_MALON);
return; return;
} }

2
soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
View file

@ -227,7 +227,7 @@ u16 EnZl4_GetText(GlobalContext* globalCtx, Actor* thisx) {
return ret; return ret;
} }
void GivePlayerRandoRewardZeldaChild(EnZl4* zelda, GlobalContext* globalCtx, Key check) { void GivePlayerRandoRewardZeldaChild(EnZl4* zelda, GlobalContext* globalCtx, RandomizerCheck check) {
if (!Player_InBlockingCsMode(globalCtx, GET_PLAYER(globalCtx))) { if (!Player_InBlockingCsMode(globalCtx, GET_PLAYER(globalCtx))) {
if (!Flags_GetTreasure(globalCtx, 0x1F) && Actor_TextboxIsClosing(&zelda->actor, globalCtx) && if (!Flags_GetTreasure(globalCtx, 0x1F) && Actor_TextboxIsClosing(&zelda->actor, globalCtx) &&
gSaveContext.eventChkInf[4] != 1 && (globalCtx->actorCtx.titleCtx.delayTimer == 0) && gSaveContext.eventChkInf[4] != 1 && (globalCtx->actorCtx.titleCtx.delayTimer == 0) &&