From eea082da0e361b9f4c381a847a331717069741ae Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 14 Apr 2024 10:53:36 -0500 Subject: [PATCH] Move ROM::LoadAllGraphicsData call to MasterEditor --- src/app/editor/master_editor.cc | 2 ++ src/app/editor/overworld_editor.cc | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/editor/master_editor.cc b/src/app/editor/master_editor.cc index 350c51b6..4c4b7720 100644 --- a/src/app/editor/master_editor.cc +++ b/src/app/editor/master_editor.cc @@ -151,6 +151,8 @@ absl::Status MasterEditor::Update() { DrawInfoPopup(); if (rom()->is_loaded() && !rom_assets_loaded_) { + // Load all of the graphics data from the game. + RETURN_IF_ERROR(rom()->LoadAllGraphicsData()) // Initialize overworld graphics, maps, and palettes RETURN_IF_ERROR(overworld_editor_.LoadGraphics()); rom_assets_loaded_ = true; diff --git a/src/app/editor/overworld_editor.cc b/src/app/editor/overworld_editor.cc index 9af293cb..169f03ae 100644 --- a/src/app/editor/overworld_editor.cc +++ b/src/app/editor/overworld_editor.cc @@ -1599,8 +1599,6 @@ void OverworldEditor::DrawOverworldSprites() { // ---------------------------------------------------------------------------- absl::Status OverworldEditor::LoadGraphics() { - // Load all of the graphics data from the game. - PRINT_IF_ERROR(rom()->LoadAllGraphicsData()) graphics_bin_ = rom()->graphics_bin(); // Load the Link to the Past overworld.