mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-24 17:18:50 -05:00
Code Issues Projects Releases Wiki Activity

Add RAND_INF flags for all silver rupees.

Browse Source
This commit is contained in:
Christopher Leggett 2024-02-11 15:14:21 -05:00
parent 69d4e43fd5
commit cd27dc5c45
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
2 changed files with 147 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/include/z64save.h
View File

@ -283,7 +283,7 @@ typedef struct {
// #endregion
// #region SOH [Randomizer]
// Upstream TODO: Move these to their own struct or name to more obviously specific to Randomizer
/* */ u16 randomizerInf[16];
/* */ u16 randomizerInf[25];
/* */ u8 mqDungeonCount;
/* */ u16 adultTradeItems;
/* */ u8 triforcePiecesCollected;

146
soh/soh/Enhancements/randomizer/randomizer_inf.h
View File

@ -267,6 +267,152 @@ typedef enum {
RAND_INF_ZD_FISH_4,
RAND_INF_ZD_FISH_5,
RAND_INF_BOTTOM_OF_THE_WELL_SILVER_RUPEE_1,
RAND_INF_BOTTOM_OF_THE_WELL_SILVER_RUPEE_2,
RAND_INF_BOTTOM_OF_THE_WELL_SILVER_RUPEE_3,
RAND_INF_BOTTOM_OF_THE_WELL_SILVER_RUPEE_4,
RAND_INF_BOTTOM_OF_THE_WELL_SILVER_RUPEE_5,
RAND_INF_ICE_CAVERN_SPINNING_BLADES_SILVER_RUPEE_1,
RAND_INF_ICE_CAVERN_SPINNING_BLADES_SILVER_RUPEE_2,
RAND_INF_ICE_CAVERN_SPINNING_BLADES_SILVER_RUPEE_3,
RAND_INF_ICE_CAVERN_SPINNING_BLADES_SILVER_RUPEE_4,
RAND_INF_ICE_CAVERN_SPINNING_BLADES_SILVER_RUPEE_5,
RAND_INF_ICE_CAVERN_SLIDING_SILVER_RUPEE_1,
RAND_INF_ICE_CAVERN_SLIDING_SILVER_RUPEE_2,
RAND_INF_ICE_CAVERN_SLIDING_SILVER_RUPEE_3,
RAND_INF_ICE_CAVERN_SLIDING_SILVER_RUPEE_4,
RAND_INF_ICE_CAVERN_SLIDING_SILVER_RUPEE_5,
RAND_INF_GERUDO_TRAINING_GROUNDS_BOULDER_SILVER_RUPEE_1,
RAND_INF_GERUDO_TRAINING_GROUNDS_BOULDER_SILVER_RUPEE_2,
RAND_INF_GERUDO_TRAINING_GROUNDS_BOULDER_SILVER_RUPEE_3,
RAND_INF_GERUDO_TRAINING_GROUNDS_BOULDER_SILVER_RUPEE_4,
RAND_INF_GERUDO_TRAINING_GROUNDS_BOULDER_SILVER_RUPEE_5,
RAND_INF_GERUDO_TRAINING_GROUNDS_LAVA_SILVER_RUPEE_1,
RAND_INF_GERUDO_TRAINING_GROUNDS_LAVA_SILVER_RUPEE_2,
RAND_INF_GERUDO_TRAINING_GROUNDS_LAVA_SILVER_RUPEE_3,
RAND_INF_GERUDO_TRAINING_GROUNDS_LAVA_SILVER_RUPEE_4,
RAND_INF_GERUDO_TRAINING_GROUNDS_LAVA_SILVER_RUPEE_5,
RAND_INF_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_1,
RAND_INF_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_2,
RAND_INF_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_3,
RAND_INF_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_4,
RAND_INF_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_5,
RAND_INF_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_1,
RAND_INF_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_2,
RAND_INF_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_3,
RAND_INF_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_4,
RAND_INF_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_5,
RAND_INF_SPIRIT_BOULDER_SILVER_RUPEE_1,
RAND_INF_SPIRIT_BOULDER_SILVER_RUPEE_2,
RAND_INF_SPIRIT_BOULDER_SILVER_RUPEE_3,
RAND_INF_SPIRIT_BOULDER_SILVER_RUPEE_4,
RAND_INF_SPIRIT_BOULDER_SILVER_RUPEE_5,
RAND_INF_SHADOW_SCYTHE_SILVER_RUPEE_1,
RAND_INF_SHADOW_SCYTHE_SILVER_RUPEE_2,
RAND_INF_SHADOW_SCYTHE_SILVER_RUPEE_3,
RAND_INF_SHADOW_SCYTHE_SILVER_RUPEE_4,
RAND_INF_SHADOW_SCYTHE_SILVER_RUPEE_5,
RAND_INF_SHADOW_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE_1,
RAND_INF_SHADOW_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE_2,
RAND_INF_SHADOW_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE_3,
RAND_INF_SHADOW_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE_4,
RAND_INF_SHADOW_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE_5,
RAND_INF_SHADOW_INVISIBLE_SPIKES_SILVER_RUPEE_1,
RAND_INF_SHADOW_INVISIBLE_SPIKES_SILVER_RUPEE_2,
RAND_INF_SHADOW_INVISIBLE_SPIKES_SILVER_RUPEE_3,
RAND_INF_SHADOW_INVISIBLE_SPIKES_SILVER_RUPEE_4,
RAND_INF_SHADOW_INVISIBLE_SPIKES_SILVER_RUPEE_5,
RAND_INF_FOREST_TRIAL_SILVER_RUPEE_1,
RAND_INF_FOREST_TRIAL_SILVER_RUPEE_2,
RAND_INF_FOREST_TRIAL_SILVER_RUPEE_3,
RAND_INF_FOREST_TRIAL_SILVER_RUPEE_4,
RAND_INF_FOREST_TRIAL_SILVER_RUPEE_5,
RAND_INF_FIRE_TRIAL_SILVER_RUPEE_1,
RAND_INF_FIRE_TRIAL_SILVER_RUPEE_2,
RAND_INF_FIRE_TRIAL_SILVER_RUPEE_3,
RAND_INF_FIRE_TRIAL_SILVER_RUPEE_4,
RAND_INF_FIRE_TRIAL_SILVER_RUPEE_5,
RAND_INF_LIGHT_TRIAL_SILVER_RUPEE_1,
RAND_INF_LIGHT_TRIAL_SILVER_RUPEE_2,
RAND_INF_LIGHT_TRIAL_SILVER_RUPEE_3,
RAND_INF_LIGHT_TRIAL_SILVER_RUPEE_4,
RAND_INF_LIGHT_TRIAL_SILVER_RUPEE_5,
RAND_INF_SPIRIT_TRIAL_SILVER_RUPEE_1,
RAND_INF_SPIRIT_TRIAL_SILVER_RUPEE_2,
RAND_INF_SPIRIT_TRIAL_SILVER_RUPEE_3,
RAND_INF_SPIRIT_TRIAL_SILVER_RUPEE_4,
RAND_INF_SPIRIT_TRIAL_SILVER_RUPEE_5,
RAND_INF_DODONGOS_CAVERN_MQ_SILVER_RUPEE_1,
RAND_INF_DODONGOS_CAVERN_MQ_SILVER_RUPEE_2,
RAND_INF_DODONGOS_CAVERN_MQ_SILVER_RUPEE_3,
RAND_INF_DODONGOS_CAVERN_MQ_SILVER_RUPEE_4,
RAND_INF_DODONGOS_CAVERN_MQ_SILVER_RUPEE_5,
RAND_INF_GERUDO_TRAINING_GROUNDS_MQ_BOULDER_SILVER_RUPEE_1,
RAND_INF_GERUDO_TRAINING_GROUNDS_MQ_BOULDER_SILVER_RUPEE_2,
RAND_INF_GERUDO_TRAINING_GROUNDS_MQ_BOULDER_SILVER_RUPEE_3,
RAND_INF_GERUDO_TRAINING_GROUNDS_MQ_BOULDER_SILVER_RUPEE_4,
RAND_INF_GERUDO_TRAINING_GROUNDS_MQ_BOULDER_SILVER_RUPEE_5,
RAND_INF_GERUDO_TRAINING_GROUNDS_MQ_LAVA_SILVER_RUPEE_1,
RAND_INF_GERUDO_TRAINING_GROUNDS_MQ_LAVA_SILVER_RUPEE_2,
RAND_INF_GERUDO_TRAINING_GROUNDS_MQ_LAVA_SILVER_RUPEE_3,
RAND_INF_GERUDO_TRAINING_GROUNDS_MQ_LAVA_SILVER_RUPEE_4,
RAND_INF_GERUDO_TRAINING_GROUNDS_MQ_LAVA_SILVER_RUPEE_5,
RAND_INF_GERUDO_TRAINING_GROUNDS_MQ_LAVA_SILVER_RUPEE_6,
RAND_INF_GERUDO_TRAINING_GROUNDS_MQ_TOILET_SILVER_RUPEE_1,
RAND_INF_GERUDO_TRAINING_GROUNDS_MQ_TOILET_SILVER_RUPEE_2,
RAND_INF_GERUDO_TRAINING_GROUNDS_MQ_TOILET_SILVER_RUPEE_3,
RAND_INF_SPIRIT_MQ_LOBBY_SILVER_RUPEE_1,
RAND_INF_SPIRIT_MQ_LOBBY_SILVER_RUPEE_2,
RAND_INF_SPIRIT_MQ_LOBBY_SILVER_RUPEE_3,
RAND_INF_SPIRIT_MQ_LOBBY_SILVER_RUPEE_4,
RAND_INF_SPIRIT_MQ_LOBBY_SILVER_RUPEE_5,
RAND_INF_SHADOW_MQ_SCYTHE_SILVER_RUPEE_1,
RAND_INF_SHADOW_MQ_SCYTHE_SILVER_RUPEE_2,
RAND_INF_SHADOW_MQ_SCYTHE_SILVER_RUPEE_3,
RAND_INF_SHADOW_MQ_SCYTHE_SILVER_RUPEE_4,
RAND_INF_SHADOW_MQ_SCYTHE_SILVER_RUPEE_5,
RAND_INF_SHADOW_MQ_INVISIBLE_SCYTHE_SILVER_RUPEE_1,
RAND_INF_SHADOW_MQ_INVISIBLE_SCYTHE_SILVER_RUPEE_2,
RAND_INF_SHADOW_MQ_INVISIBLE_SCYTHE_SILVER_RUPEE_3,
RAND_INF_SHADOW_MQ_INVISIBLE_SCYTHE_SILVER_RUPEE_4,
RAND_INF_SHADOW_MQ_INVISIBLE_SCYTHE_SILVER_RUPEE_5,
RAND_INF_SHADOW_MQ_INVISIBLE_SCYTHE_SILVER_RUPEE_6,
RAND_INF_SHADOW_MQ_INVISIBLE_SCYTHE_SILVER_RUPEE_7,
RAND_INF_SHADOW_MQ_INVISIBLE_SCYTHE_SILVER_RUPEE_8,
RAND_INF_SHADOW_MQ_INVISIBLE_SCYTHE_SILVER_RUPEE_9,
RAND_INF_SHADOW_MQ_INVISIBLE_SCYTHE_SILVER_RUPEE_10,
RAND_INF_SHADOW_MQ_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE_1,
RAND_INF_SHADOW_MQ_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE_2,
RAND_INF_SHADOW_MQ_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE_3,
RAND_INF_SHADOW_MQ_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE_4,
RAND_INF_SHADOW_MQ_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE_5,
RAND_INF_SHADOW_MQ_INVISIBLE_SPIKES_SILVER_RUPEE_1,
RAND_INF_SHADOW_MQ_INVISIBLE_SPIKES_SILVER_RUPEE_2,
RAND_INF_SHADOW_MQ_INVISIBLE_SPIKES_SILVER_RUPEE_3,
RAND_INF_SHADOW_MQ_INVISIBLE_SPIKES_SILVER_RUPEE_4,
RAND_INF_SHADOW_MQ_INVISIBLE_SPIKES_SILVER_RUPEE_5,
RAND_INF_SHADOW_MQ_INVISIBLE_SPIKES_SILVER_RUPEE_6,
RAND_INF_SHADOW_MQ_INVISIBLE_SPIKES_SILVER_RUPEE_7,
RAND_INF_SHADOW_MQ_INVISIBLE_SPIKES_SILVER_RUPEE_8,
RAND_INF_SHADOW_MQ_INVISIBLE_SPIKES_SILVER_RUPEE_9,
RAND_INF_SHADOW_MQ_INVISIBLE_SPIKES_SILVER_RUPEE_10,
RAND_INF_FIRE_TRIAL_MQ_SILVER_RUPEE_1,
RAND_INF_FIRE_TRIAL_MQ_SILVER_RUPEE_2,
RAND_INF_FIRE_TRIAL_MQ_SILVER_RUPEE_3,
RAND_INF_FIRE_TRIAL_MQ_SILVER_RUPEE_4,
RAND_INF_FIRE_TRIAL_MQ_SILVER_RUPEE_5,
RAND_INF_WATER_TRIAL_MQ_SILVER_RUPEE_1,
RAND_INF_WATER_TRIAL_MQ_SILVER_RUPEE_2,
RAND_INF_WATER_TRIAL_MQ_SILVER_RUPEE_3,
RAND_INF_WATER_TRIAL_MQ_SILVER_RUPEE_4,
RAND_INF_WATER_TRIAL_MQ_SILVER_RUPEE_5,
RAND_INF_SHADOW_TRIAL_MQ_SILVER_RUPEE_1,
RAND_INF_SHADOW_TRIAL_MQ_SILVER_RUPEE_2,
RAND_INF_SHADOW_TRIAL_MQ_SILVER_RUPEE_3,
RAND_INF_SHADOW_TRIAL_MQ_SILVER_RUPEE_4,
RAND_INF_SHADOW_TRIAL_MQ_SILVER_RUPEE_5,
// If you add anything to this list, you need to update the size of randomizerInf in z64save.h to be ceil(RAND_INF_MAX / 16)
RAND_INF_MAX,