fix hyrule magic decompression memory leak, misc housekeeping

2024-02-03 00:04:21 -05:00
parent 13b588fa75
commit aed54f1493
10 changed files with 58 additions and 18 deletions
--- a/src/app/zelda3/overworld_map.cc
+++ b/src/app/zelda3/overworld_map.cc
@@ -65,6 +65,8 @@ void OverworldMap::LoadAreaInfo() {
    }
  }

+  message_id_ = rom_.toint16(overworldMessages + (parent_ * 2));
+
  if (index_ < 0x40) {
    area_graphics_ = rom_[mapGfx + parent_];
    area_palette_ = rom_[overworldMapPalette + parent_];
@@ -117,8 +119,6 @@ void OverworldMap::LoadAreaInfo() {
      parent_ = 129;
    }

-    message_id_ = rom_[overworldMessages + parent_];
-
    area_palette_ = rom_[overworldSpecialPALGroup + parent_ - 0x80];
    if ((index_ >= 0x80 && index_ <= 0x8A && index_ != 0x88) ||
        index_ == 0x94) {