Move ROM::LoadAllGraphicsData call to MasterEditor
This commit is contained in:
@@ -151,6 +151,8 @@ absl::Status MasterEditor::Update() {
|
|||||||
DrawInfoPopup();
|
DrawInfoPopup();
|
||||||
|
|
||||||
if (rom()->is_loaded() && !rom_assets_loaded_) {
|
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
|
// Initialize overworld graphics, maps, and palettes
|
||||||
RETURN_IF_ERROR(overworld_editor_.LoadGraphics());
|
RETURN_IF_ERROR(overworld_editor_.LoadGraphics());
|
||||||
rom_assets_loaded_ = true;
|
rom_assets_loaded_ = true;
|
||||||
|
|||||||
@@ -1599,8 +1599,6 @@ void OverworldEditor::DrawOverworldSprites() {
|
|||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
absl::Status OverworldEditor::LoadGraphics() {
|
absl::Status OverworldEditor::LoadGraphics() {
|
||||||
// Load all of the graphics data from the game.
|
|
||||||
PRINT_IF_ERROR(rom()->LoadAllGraphicsData())
|
|
||||||
graphics_bin_ = rom()->graphics_bin();
|
graphics_bin_ = rom()->graphics_bin();
|
||||||
|
|
||||||
// Load the Link to the Past overworld.
|
// Load the Link to the Past overworld.
|
||||||
|
|||||||
Reference in New Issue
Block a user