diff options
Diffstat (limited to 'WitnessRandomizer')
-rw-r--r-- | WitnessRandomizer/Panels.h | 34 | ||||
-rw-r--r-- | WitnessRandomizer/WitnessRandomizer.cpp | 26 |
2 files changed, 30 insertions, 30 deletions
diff --git a/WitnessRandomizer/Panels.h b/WitnessRandomizer/Panels.h index 7b9c96c..747bbc7 100644 --- a/WitnessRandomizer/Panels.h +++ b/WitnessRandomizer/Panels.h | |||
@@ -19,23 +19,23 @@ const std::vector<int> lasers = { | |||
19 | 19 | ||
20 | // Note: Some of these (non-desert) are duplicated elsewhere | 20 | // Note: Some of these (non-desert) are duplicated elsewhere |
21 | const std::vector<int> burnablePanels = { | 21 | const std::vector<int> burnablePanels = { |
22 | 0x17D9C, // Treehouse Yellow 7 | 22 | // 0x17D9C, // Treehouse Yellow 7 |
23 | 0x17DC2, // Treehouse Yellow 8 | 23 | // 0x17DC2, // Treehouse Yellow 8 |
24 | 0x17DC4, // Treehouse Yellow 9 | 24 | // 0x17DC4, // Treehouse Yellow 9 |
25 | 0x00999, // Swamp Discontinuous 1 | 25 | // 0x00999, // Swamp Discontinuous 1 |
26 | 0x0099D, // Swamp Discontinuous 2 | 26 | // 0x0099D, // Swamp Discontinuous 2 |
27 | 0x009A0, // Swamp Discontinuous 3 | 27 | // 0x009A0, // Swamp Discontinuous 3 |
28 | 0x009A1, // Swamp Discontinuous 4 | 28 | // 0x009A1, // Swamp Discontinuous 4 |
29 | 0x00007, // Swamp Rotation Tutorial 1 | 29 | // 0x00007, // Swamp Rotation Tutorial 1 |
30 | 0x00008, // Swamp Rotation Tutorial 2 | 30 | // 0x00008, // Swamp Rotation Tutorial 2 |
31 | 0x00009, // Swamp Rotation Tutorial 3 | 31 | // 0x00009, // Swamp Rotation Tutorial 3 |
32 | 0x0000A, // Swamp Rotation Tutorial 4 | 32 | // 0x0000A, // Swamp Rotation Tutorial 4 |
33 | 0x28AC7, // Town Blue 1 | 33 | // 0x28AC7, // Town Blue 1 |
34 | 0x28AC8, // Town Blue 2 | 34 | // 0x28AC8, // Town Blue 2 |
35 | 0x28ACA, // Town Blue 3 | 35 | // 0x28ACA, // Town Blue 3 |
36 | 0x28ACB, // Town Blue 4 | 36 | // 0x28ACB, // Town Blue 4 |
37 | 0x28ACC, // Town Blue 5 | 37 | // 0x28ACC, // Town Blue 5 |
38 | 0x17CF0, // Mill Discard | 38 | // 0x17CF0, // Mill Discard |
39 | 39 | ||
40 | 0x00698, // Desert Surface 1 | 40 | 0x00698, // Desert Surface 1 |
41 | 0x0048F, // Desert Surface 2 | 41 | 0x0048F, // Desert Surface 2 |
diff --git a/WitnessRandomizer/WitnessRandomizer.cpp b/WitnessRandomizer/WitnessRandomizer.cpp index 7827ddb..6ce0256 100644 --- a/WitnessRandomizer/WitnessRandomizer.cpp +++ b/WitnessRandomizer/WitnessRandomizer.cpp | |||
@@ -5,6 +5,7 @@ | |||
5 | * Treehouse pivots *should* work, but I need to not copy style_flags. | 5 | * Treehouse pivots *should* work, but I need to not copy style_flags. |
6 | This seems to cause crashes when pivots appear elsewhere in the world. | 6 | This seems to cause crashes when pivots appear elsewhere in the world. |
7 | * Some panels are impossible casually: (idc, I think) | 7 | * Some panels are impossible casually: (idc, I think) |
8 | * Shadows burn marks are not appearing | ||
8 | ** Town Stars, Invisible dots | 9 | ** Town Stars, Invisible dots |
9 | * Something is wrong with jungle | 10 | * Something is wrong with jungle |
10 | * FEATURES: | 11 | * FEATURES: |
@@ -48,20 +49,19 @@ int main(int argc, char** argv) | |||
48 | srand(seed); | 49 | srand(seed); |
49 | } | 50 | } |
50 | 51 | ||
51 | /* | 52 | // randomizer.SwapPanels(0x28AC7, 0x00698, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 1 |
52 | randomizer.SwapPanels(0x0007C, 0x0005D, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 1 | 53 | // randomizer.SwapPanels(0x28AC8, 0x0048F, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 2 |
53 | randomizer.SwapPanels(0x0007E, 0x0005E, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 2 | 54 | // randomizer.SwapPanels(0x28ACA, 0x09F92, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 3 |
54 | randomizer.SwapPanels(0x00075, 0x0005F, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 3 | 55 | // randomizer.SwapPanels(0x28ACB, 0x0A036, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 4 |
55 | randomizer.SwapPanels(0x00073, 0x00060, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 4 | 56 | // randomizer.SwapPanels(0x28ACC, 0x09DA6, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 5 |
56 | randomizer.SwapPanels(0x00077, 0x00061, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 5 | 57 | // 0x00079; // Symmetry Island Colored Dots 6 |
57 | 0x00079; // Symmetry Island Colored Dots 6 | 58 | // |
59 | // 0x0005D; // Outside Tutorial Dots Tutorial 1 | ||
60 | // 0x0005E; // Outside Tutorial Dots Tutorial 2 | ||
61 | // 0x0005F; // Outside Tutorial Dots Tutorial 3 | ||
62 | // 0x00060; // Outside Tutorial Dots Tutorial 4 | ||
63 | // 0x00061; // Outside Tutorial Dots Tutorial 5 | ||
58 | 64 | ||
59 | 0x0005D; // Outside Tutorial Dots Tutorial 1 | ||
60 | 0x0005E; // Outside Tutorial Dots Tutorial 2 | ||
61 | 0x0005F; // Outside Tutorial Dots Tutorial 3 | ||
62 | 0x00060; // Outside Tutorial Dots Tutorial 4 | ||
63 | 0x00061; // Outside Tutorial Dots Tutorial 5 | ||
64 | */ | ||
65 | 65 | ||
66 | 66 | ||
67 | // Content swaps -- must happen before squarePanels | 67 | // Content swaps -- must happen before squarePanels |