mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-30 23:10:14 -05:00
Code Issues Projects Releases Wiki Activity

reordering

Browse Source
This commit is contained in:
Demur Rumed 2025-01-29 03:02:29 +00:00
parent 8294bc5839
commit 887e3d6ca8
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
soh/soh/Enhancements/debugger/debugSaveEditor.h
View File

@ -528,13 +528,6 @@ const std::vector<FlagTable> flagTables = {
{ RAND_INF_WINDMILL_MAN_SOUL, "RAND_INF_WINDMILL_MAN_SOUL" },
{ RAND_INF_MAN_ON_ROOF_SOUL, "RAND_INF_MAN_ON_ROOF_SOUL" },
{ RAND_INF_MALON_SOUL, "RAND_INF_MALON_SOUL" },
{ RAND_INF_RAURU_SOUL, "RAND_INF_RAURU_SOUL" },
{ RAND_INF_SARIA_SOUL, "RAND_INF_SARIA_SOUL" },
{ RAND_INF_DARUNIA_SOUL, "RAND_INF_DARUNIA_SOUL" },
{ RAND_INF_RUTO_SOUL, "RAND_INF_RUTO_SOUL" },
{ RAND_INF_NABOORU_SOUL, "RAND_INF_NABOORU_SOUL" },
{ RAND_INF_IMPA_SOUL, "RAND_INF_IMPA_SOUL" },
{ RAND_INF_ZELDA_SOUL, "RAND_INF_ZELDA_SOUL" },
{ RAND_INF_BEGGAR_SOUL, "RAND_INF_BEGGAR_SOUL" },
{ RAND_INF_ARMS_DEALER_SOUL, "RAND_INF_ARMS_DEALER_SOUL" },
{ RAND_INF_BEAN_SALESMAN_SOUL, "RAND_INF_BEAN_SALESMAN_SOUL" },
@ -551,6 +544,13 @@ const std::vector<FlagTable> flagTables = {
{ RAND_INF_DIVING_SOUL, "RAND_INF_DIVING_SOUL" },
{ RAND_INF_SCIENTIST_SOUL, "RAND_INF_SCIENTIST_SOUL" },
{ RAND_INF_KAEPORA_SOUL, "RAND_INF_KAEPORA_SOUL" },
{ RAND_INF_RAURU_SOUL, "RAND_INF_RAURU_SOUL" },
{ RAND_INF_SARIA_SOUL, "RAND_INF_SARIA_SOUL" },
{ RAND_INF_DARUNIA_SOUL, "RAND_INF_DARUNIA_SOUL" },
{ RAND_INF_RUTO_SOUL, "RAND_INF_RUTO_SOUL" },
{ RAND_INF_NABOORU_SOUL, "RAND_INF_NABOORU_SOUL" },
{ RAND_INF_IMPA_SOUL, "RAND_INF_IMPA_SOUL" },
{ RAND_INF_ZELDA_SOUL, "RAND_INF_ZELDA_SOUL" },
{ RAND_INF_HAS_OCARINA_A, "RAND_INF_HAS_OCARINA_A"},
{ RAND_INF_HAS_OCARINA_C_UP, "RAND_INF_HAS_OCARINA_C_UP" },

30
soh/soh/Enhancements/randomizer/logic.cpp
View File

@ -163,13 +163,6 @@ namespace Rando {
case RG_WINDMILL_MAN_SOUL:
case RG_MAN_ON_ROOF_SOUL:
case RG_MALON_SOUL:
case RG_RAURU_SOUL:
case RG_SARIA_SOUL:
case RG_DARUNIA_SOUL:
case RG_RUTO_SOUL:
case RG_NABOORU_SOUL:
case RG_IMPA_SOUL:
case RG_ZELDA_SOUL:
case RG_BEGGAR_SOUL:
case RG_ARMS_DEALER_SOUL:
case RG_BEAN_SALESMAN_SOUL:
@ -186,6 +179,13 @@ namespace Rando {
case RG_DIVING_SOUL:
case RG_SCIENTIST_SOUL:
case RG_KAEPORA_SOUL:
case RG_RAURU_SOUL:
case RG_SARIA_SOUL:
case RG_DARUNIA_SOUL:
case RG_RUTO_SOUL:
case RG_NABOORU_SOUL:
case RG_IMPA_SOUL:
case RG_ZELDA_SOUL:
// Overworld Keys
case RG_SKELETON_KEY:
case RG_GUARD_HOUSE_KEY:
@ -1453,7 +1453,7 @@ namespace Rando {
{ RG_RUTO_SOUL, RAND_INF_RUTO_SOUL },
{ RG_NABOORU_SOUL, RAND_INF_NABOORU_SOUL },
{ RG_IMPA_SOUL, RAND_INF_IMPA_SOUL },
{ RG_ZELDA_SOUL, RAND_INF_ZELDA_SOUL },
{ RG_ZELDA_SOUL, RAND_INF_ZELDA_SOUL },
{ RG_BEGGAR_SOUL, RAND_INF_BEGGAR_SOUL },
{ RG_ARMS_DEALER_SOUL, RAND_INF_ARMS_DEALER_SOUL },
{ RG_BEAN_SALESMAN_SOUL, RAND_INF_BEAN_SALESMAN_SOUL },
@ -1875,13 +1875,6 @@ namespace Rando {
case RG_WINDMILL_MAN_SOUL:
case RG_MAN_ON_ROOF_SOUL:
case RG_MALON_SOUL:
case RG_RAURU_SOUL:
case RG_SARIA_SOUL:
case RG_DARUNIA_SOUL:
case RG_RUTO_SOUL:
case RG_NABOORU_SOUL:
case RG_IMPA_SOUL:
case RG_ZELDA_SOUL:
case RG_BEGGAR_SOUL:
case RG_ARMS_DEALER_SOUL:
case RG_BEAN_SALESMAN_SOUL:
@ -1898,6 +1891,13 @@ namespace Rando {
case RG_DIVING_SOUL:
case RG_SCIENTIST_SOUL:
case RG_KAEPORA_SOUL:
case RG_RAURU_SOUL:
case RG_SARIA_SOUL:
case RG_DARUNIA_SOUL:
case RG_RUTO_SOUL:
case RG_NABOORU_SOUL:
case RG_IMPA_SOUL:
case RG_ZELDA_SOUL:
case RG_OCARINA_A_BUTTON:
case RG_OCARINA_C_UP_BUTTON:
case RG_OCARINA_C_DOWN_BUTTON: