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

cleanup after removing logic tracker code

Browse source
This commit is contained in:
Demur Rumed 2025-07-19 21:55:18 +00:00
commit 7bead5bf1e
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/compile_logic.py
View file

@ -305,7 +305,7 @@ for rr in RRs:
_, code = code.split(None, 1) _, code = code.split(None, 1)
output(f"\tEntrance({name}, []{{return {rr.gen(code)};}}") output(f"\tEntrance({name}, []{{return {rr.gen(code)};}}")
if deprioritize: if deprioritize:
output(", \"\", false") output(", false")
output("),\n") output("),\n")
output("});\n") output("});\n")

4
soh/soh/Enhancements/randomizer/location_access/generated.cpp
View file

@ -6,7 +6,7 @@ using namespace Rando;
extern "C" SaveContext gSaveContext; extern "C" SaveContext gSaveContext;
void RegionTable_Init_Generated() { void RegionTable_Init_Generated() {
// clang-format off // clang-format off
areaTable[RR_ROOT] = Region("Root", SCENE_ID_MAX, false, {RA_LINKS_POCKET}, { 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->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);}), 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, {}, {}, { areaTable[RR_GANONS_CASTLE_GANON_ARENA] = Region("Ganon's Arena", SCENE_GANON_BOSS, false, {}, {}, {
LOCATION(RC_GANON, logic->CanKillEnemy(RE_GANON)), LOCATION(RC_GANON, logic->CanKillEnemy(RE_GANON)),
}, {}); }, {});
// clang-format on // clang-format on
} }

4
soh/soh/Enhancements/randomizer/logic.s
View file

@ -7,7 +7,7 @@ using namespace Rando;
extern "C" SaveContext gSaveContext; extern "C" SaveContext gSaveContext;
void RegionTable_Init_Generated() { void RegionTable_Init_Generated() {
// clang-format off // clang-format off
:: ::
def RR_ROOT SCENE_ID_MAX false RA_LINKS_POCKET def RR_ROOT SCENE_ID_MAX false RA_LINKS_POCKET
@ -6717,6 +6717,6 @@ Ganon's Arena
RC_GANON (CanKillEnemy RE_GANON) RC_GANON (CanKillEnemy RE_GANON)
:: ::
// clang-format on // clang-format on
} }
:: ::