canvas and ow edit changes

src/app/editor/overworld_editor.cc

@@ -24,15 +24,15 @@ namespace editor {
 
 namespace {
 void UpdateSelectedTile16(int selected, gfx::Bitmap &tile16_blockset,
-                          gfx::Bitmap &selected_tile) {
+                          Bytes &selected_tile) {
+  selected_tile.reserve(256);
   auto blockset = tile16_blockset.GetData();
-  auto bitmap = selected_tile.GetData();
 
   int src_pos = ((selected - ((selected / 0x08) * 0x08)) * 0x10) +
                 ((selected / 0x08) * 2048);
   for (int yy = 0; yy < 0x10; yy++) {
     for (int xx = 0; xx < 0x10; xx++) {
-      bitmap[xx + (yy * 0x10)] = blockset[src_pos + xx + (yy * 0x80)];
+      selected_tile[xx + (yy * 0x10)] = blockset[src_pos + xx + (yy * 0x80)];
     }
   }
 }
@@ -70,7 +70,7 @@ absl::Status OverworldEditor::Update() {
       selected_tile_bmp_.Create(16, 16, 64, 256);
     }
     UpdateSelectedTile16(selected_tile_, tile16_blockset_bmp_,
-                         selected_tile_bmp_);
+                         selected_tile_data_);
     selected_tile_bmp_.ApplyPalette(palette_);
     rom_.RenderBitmap(&selected_tile_bmp_);
     update_selected_tile_ = false;

src/app/editor/overworld_editor.h

@@ -97,6 +97,7 @@ class OverworldEditor {
   gfx::Bitmap current_gfx_bmp_;
   gfx::Bitmap all_gfx_bmp;
   gfx::Bitmap selected_tile_bmp_;
+  Bytes selected_tile_data_;
 
   gui::Canvas overworld_map_canvas_;
   gui::Canvas current_gfx_canvas_;

src/app/rom.cc

@@ -534,25 +534,26 @@ absl::StatusOr<Bytes> ROM::Decompress(int offset, int size, int mode) {
 
         if (mode == kNintendoMode1) {  // Reversed byte order for overworld maps
           // addr = (s2 | s1);
-          addr = (rom_data_[offset + 1]) | ((rom_data_[offset]) << 8);
+          addr = (rom_data_[offset + 1] & kSnesByteMax) |
+                 ((rom_data_[offset] & kSnesByteMax) << 8);
+          if (addr > offset) {
+            return absl::InternalError(absl::StrFormat(
+                "DecompressOverworld: Offset for command copy exceeds "
+                "current position (Offset : %#04x | Pos : %#06x)\n",
+                addr, offset));
+          }
+
+          if (buffer_pos + length >= size) {
+            size *= 2;
+            buffer.resize(size);
+          }
+
           memcpy(buffer.data() + buffer_pos, buffer.data() + addr, length);
           buffer_pos += length;
           offset += 2;
           break;
         }
 
-        if (addr > offset) {
-          return absl::InternalError(absl::StrFormat(
-              "DecompressOverworld: Offset for command copy exceeds "
-              "current position (Offset : %#04x | Pos : %#06x)\n",
-              addr, offset));
-        }
-
-        if (buffer_pos + length >= size) {
-          size *= 2;
-          buffer.resize(size);
-        }
-
         for (int i = 0; i < length; i++) {
           buffer[buffer_pos] = buffer[addr + i];
           buffer_pos++;
@@ -687,7 +688,7 @@ void ROM::RenderBitmap(gfx::Bitmap* bitmap) const {
 }
 
 gfx::SNESColor ROM::ReadColor(int offset) {
-  short color = (short)((rom_data_[offset + 1] << 8) + rom_data_[offset]);
+  short color = toint16(offset);
   gfx::snes_color new_color;
   new_color.red = (color & 0x1F) * 8;
   new_color.green = ((color >> 5) & 0x1F) * 8;
@@ -701,7 +702,7 @@ gfx::SNESPalette ROM::ReadPalette(int offset, int num_colors) {
   std::vector<gfx::SNESColor> colors(num_colors);
 
   while (color_offset < num_colors) {
-    short color = (short)((rom_data_[offset + 1] << 8) + rom_data_[offset]);
+    short color = toint16(offset);
     gfx::snes_color new_color;
     new_color.red = (color & 0x1F) * 8;
     new_color.green = ((color >> 5) & 0x1F) * 8;
@@ -783,31 +784,6 @@ void ROM::LoadAllPalettes() {
     palette_groups_["ow_mini_map"].AddPalette(
         ReadPalette(core::overworldMiniMapPalettes + (i * 256), 128));
   }
-
-  // TODO: check for the paletts in the empty bank space that kan will allocate
-  // and read them in here
-  // TODO magic colors
-  // LW
-  // int j = 0;
-  // while (j < 64) {
-  //   zelda3::overworld_BackgroundPalette[j++] =
-  //       Color.FromArgb(0xFF, 0x48, 0x98, 0x48);
-  // }
-
-  // // DW
-  // while (j < 128) {
-  //   zelda3::overworld_BackgroundPalette[j++] =
-  //       Color.FromArgb(0xFF, 0x90, 0x88, 0x50);
-  // }
-
-  // // SP
-  // while (j < core::kNumOverworldMaps) {
-  //   zelda3::overworld_BackgroundPalette[j++] =
-  //       Color.FromArgb(0xFF, 0x48, 0x98, 0x48);
-  // }
-
-  // zelda3::overworld_BackgroundPalette =
-  //     ReadPalette(core::customAreaSpecificBGPalette, 160);
 }
 
 }  // namespace app