Tiny Misc Cleanups

- Fix some warnings
- Do some other random cleanup

Shouldn't change any functionality

Author: SuperDude88

asm/patches/make_game_nonlinear.asm

@@ -539,7 +539,7 @@ skip_setting_pictograph_gallery_flag:
   li r3, 3 ; DRC stage ID
   bl isStageBossEnemy
 ; The cloud around DRI normally sets an event bit when it fades away (in the cutscene after warping out of DRC)
-; Change this to check for defeating Gohma too
+; Change this to check for defeating Gohma instead
 .org 0x02387500 ; in daObjRcloud_c::_create
   li r3, 3 ; DRC stage ID
   bl isStageBossEnemy

gui/desktop/tracker/tracker.cpp

@@ -68,8 +68,6 @@ void MainWindow::initialize_tracker_world(Settings& settings,
     trackerInventory.clear();
     mappedCharts.clear();
 
-    trackerStarted = true;
-
     // Build the world used for the tracker
     auto& trackerWorld = trackerWorlds[0];
     trackerWorld = World();
@@ -302,8 +300,6 @@ void MainWindow::initialize_tracker_world(Settings& settings,
     set_areas_entrances();
 
     // Setup the display of randomized entrances
-    auto allShuffleableEntrances = trackerWorld.getShuffledEntrances(EntranceType::ALL, false);
-
     int currentPointSize = 12;
     for (auto& entrance : shuffledEntrances)
     {
@@ -364,6 +360,8 @@ void MainWindow::initialize_tracker_world(Settings& settings,
         }
         checkBox->blockSignals(false);
     }
+
+    trackerStarted = true;
 }
 
 void MainWindow::on_start_tracker_button_clicked()

logic/LogicTests.cpp

@@ -4,8 +4,6 @@
 #include <vector>
 #include <filesystem>
 
-#include <libs/zlib-ng.hpp>
-
 #include <logic/Generate.hpp>
 #include <seedgen/random.hpp>
 #include <seedgen/config.hpp>

seedgen/config.cpp

@@ -999,7 +999,7 @@ PermalinkError Config::loadPermalink(std::string b64permalink) {
         LOG_ERR_AND_RETURN(PermalinkError::INVALID_VERSION);
     }
 
-    const std::vector<char> bytes(optionsBytes.begin(), optionsBytes.end());
+    const std::vector<uint8_t> bytes(optionsBytes.begin(), optionsBytes.end());
     PackedBitsReader bitsReader(bytes);
 
     for(const Option& option : PERMALINK_OPTIONS) {
@@ -1048,7 +1048,7 @@ PermalinkError Config::loadPermalink(std::string b64permalink) {
         }
     }
 
-    if (bitsReader.current_byte_index != bitsReader.bytes.size() - 1) {
+    if (!bitsReader.reachedLastByte()) {
         LOG_ERR_AND_RETURN(PermalinkError::INCORRECT_LENGTH);
     }
 
@@ -1109,7 +1109,7 @@ std::string Config::getPermalink(const bool& internal /* = false */) const {
 
     // Add the packed bits to the permalink
     bitsWriter.flush();
-    for (const auto& byte : bitsWriter.bytes) {
+    for (const auto& byte : bitsWriter.getBytes()) {
         permalink += byte;
     }
 

seedgen/packed_bits.hpp

@@ -1,16 +1,20 @@
 #pragma once
 
+#include <cstdint>
+#include <vector>
+
 // Packed Bits classes copied from the original Wind Waker Randomizer
 class PackedBitsWriter
 {
+private:
+    size_t bits_left_in_byte = 8;
+    uint8_t current_byte = 0;
+    std::vector<uint8_t> bytes = {};
+
 public:
     PackedBitsWriter() = default;
     ~PackedBitsWriter() = default;
 
-    uint8_t bits_left_in_byte = 8;
-    size_t current_byte = 0;
-    std::vector<char> bytes = {};
-
     template <typename T>
     void write(T value, size_t length)
     {
@@ -49,17 +53,21 @@ class PackedBitsWriter
         bits_left_in_byte = 8;
     }
 
+    const std::vector<uint8_t>& getBytes() const {
+        return bytes;
+    }
 };
 
 class PackedBitsReader
 {
-public:
-    PackedBitsReader(const std::vector<char>& bytes_) : bytes(bytes_) {}
-    ~PackedBitsReader() = default;
-
+private:
     size_t current_bit_index = 0;
     size_t current_byte_index = 0;
-    std::vector<char> bytes = {};
+    std::vector<uint8_t> bytes = {};
+
+public:
+    PackedBitsReader(const std::vector<uint8_t>& bytes_) : bytes(bytes_) {}
+    ~PackedBitsReader() = default;
 
     size_t read(size_t length)
     {
@@ -103,4 +111,8 @@ class PackedBitsReader
 
         return value;
     }
+
+    bool reachedLastByte() const {
+        return current_byte_index == bytes.size() - 1;
+    }
 };