From 7bead5bf1e922b976b7b9d8645972d39e38cf2aa Mon Sep 17 00:00:00 2001 From: Demur Rumed Date: Sat, 19 Jul 2025 21:55:18 +0000 Subject: [PATCH] cleanup after removing logic tracker code --- soh/compile_logic.py | 2 +- soh/soh/Enhancements/randomizer/location_access/generated.cpp | 4 ++-- soh/soh/Enhancements/randomizer/logic.s | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/soh/compile_logic.py b/soh/compile_logic.py index 60e44e382..c526815e3 100755 --- a/soh/compile_logic.py +++ b/soh/compile_logic.py @@ -305,7 +305,7 @@ for rr in RRs: _, code = code.split(None, 1) output(f"\tEntrance({name}, []{{return {rr.gen(code)};}}") if deprioritize: - output(", \"\", false") + output(", false") output("),\n") output("});\n") diff --git a/soh/soh/Enhancements/randomizer/location_access/generated.cpp b/soh/soh/Enhancements/randomizer/location_access/generated.cpp index 1084e46d9..3ffce4f5f 100644 --- a/soh/soh/Enhancements/randomizer/location_access/generated.cpp +++ b/soh/soh/Enhancements/randomizer/location_access/generated.cpp @@ -6,7 +6,7 @@ using namespace Rando; extern "C" SaveContext gSaveContext; void RegionTable_Init_Generated() { -// clang-format off + // clang-format off areaTable[RR_ROOT] = Region("Root", SCENE_ID_MAX, false, {RA_LINKS_POCKET}, { EventAccess(&logic->KakarikoVillageGateOpen, []{return ctx->GetOption(RSK_KAK_GATE).Is(RO_KAK_GATE_OPEN);}), EventAccess(&logic->THCouldFree1TorchCarpenter, []{return ctx->GetOption(RSK_GERUDO_FORTRESS).Is(RO_GF_CARPENTERS_FREE);}), @@ -6324,5 +6324,5 @@ areaTable[RR_GANONS_CASTLE_ESCAPE] = Region("Ganon's Castle Escape", SCENE_GANON areaTable[RR_GANONS_CASTLE_GANON_ARENA] = Region("Ganon's Arena", SCENE_GANON_BOSS, false, {}, {}, { LOCATION(RC_GANON, logic->CanKillEnemy(RE_GANON)), }, {}); -// clang-format on + // clang-format on } diff --git a/soh/soh/Enhancements/randomizer/logic.s b/soh/soh/Enhancements/randomizer/logic.s index 6f08329d3..97ebc56a2 100644 --- a/soh/soh/Enhancements/randomizer/logic.s +++ b/soh/soh/Enhancements/randomizer/logic.s @@ -7,7 +7,7 @@ using namespace Rando; extern "C" SaveContext gSaveContext; void RegionTable_Init_Generated() { -// clang-format off + // clang-format off :: def RR_ROOT SCENE_ID_MAX false RA_LINKS_POCKET @@ -6717,6 +6717,6 @@ Ganon's Arena RC_GANON (CanKillEnemy RE_GANON) :: -// clang-format on + // clang-format on } ::