From d535d0be9af06abee4db7c4c5e6ec1f5ff8d5f32 Mon Sep 17 00:00:00 2001 From: briaguya Date: Wed, 10 Aug 2022 11:21:10 -0400 Subject: [PATCH 1/3] make array big enough for all the checks --- soh/include/z64save.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/include/z64save.h b/soh/include/z64save.h index 8b434d81c..19f33bd08 100644 --- a/soh/include/z64save.h +++ b/soh/include/z64save.h @@ -175,7 +175,7 @@ typedef struct { /* 0x1422 */ s16 sunsSongState; // controls the effects of suns song /* 0x1424 */ s16 healthAccumulator; RandoSetting randoSettings[300]; - ItemLocationRando itemLocations[500]; + ItemLocationRando itemLocations[505]; HintLocationRando hintLocations[50]; char childAltarText[250]; char adultAltarText[750]; From f5d7955547fdcff504237bb610ee47e57e7a4575 Mon Sep 17 00:00:00 2001 From: briaguya Date: Wed, 10 Aug 2022 11:39:10 -0400 Subject: [PATCH 2/3] ensure itemlocations is big enough for every check --- soh/include/z64save.h | 2 +- soh/soh/Enhancements/randomizer/randomizerTypes.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/soh/include/z64save.h b/soh/include/z64save.h index 19f33bd08..9da18f72e 100644 --- a/soh/include/z64save.h +++ b/soh/include/z64save.h @@ -175,7 +175,7 @@ typedef struct { /* 0x1422 */ s16 sunsSongState; // controls the effects of suns song /* 0x1424 */ s16 healthAccumulator; RandoSetting randoSettings[300]; - ItemLocationRando itemLocations[505]; + ItemLocationRando itemLocations[RC_MAX]; HintLocationRando hintLocations[50]; char childAltarText[250]; char adultAltarText[750]; diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h index c7db92ca0..72f6c4fd3 100644 --- a/soh/soh/Enhancements/randomizer/randomizerTypes.h +++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h @@ -752,7 +752,8 @@ typedef enum { RC_ZR_NEAR_DOMAIN_GOSSIP_STONE, RC_ZR_NEAR_GROTTOS_GOSSIP_STONE, RC_ZR_OPEN_GROTTO_GOSSIP_STONE, - RC_UNKNOWN_CHECK + RC_UNKNOWN_CHECK, + RC_MAX } RandomizerCheck; // based on https://github.com/TestRunnerSRL/OoT-Randomizer/blob/e337d7f603b91a6bacb618fb32cc7fd70ed9ffca/ItemList.py From d74220d3ac5f6d11422e530f0908aaba3a172e96 Mon Sep 17 00:00:00 2001 From: briaguya Date: Wed, 10 Aug 2022 11:55:47 -0400 Subject: [PATCH 3/3] don't give link's pocket garbage --- soh/soh/Enhancements/randomizer/randomizerTypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h index 72f6c4fd3..3f0da52b7 100644 --- a/soh/soh/Enhancements/randomizer/randomizerTypes.h +++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h @@ -10,6 +10,7 @@ typedef struct { } Sprite; typedef enum { + RC_UNKNOWN_CHECK, RC_LINKS_POCKET, RC_QUEEN_GOHMA, RC_KING_DODONGO, @@ -752,7 +753,6 @@ typedef enum { RC_ZR_NEAR_DOMAIN_GOSSIP_STONE, RC_ZR_NEAR_GROTTOS_GOSSIP_STONE, RC_ZR_OPEN_GROTTO_GOSSIP_STONE, - RC_UNKNOWN_CHECK, RC_MAX } RandomizerCheck;