From b444031315c5ff335fde284cac464b75709b542f Mon Sep 17 00:00:00 2001 From: rozlette Date: Thu, 27 Feb 2020 16:14:26 -0600 Subject: [PATCH] Remove lingering references to incorrect file --- include/dmadata.h | 4 ++-- linker_scripts/dmadata_script.txt | 4 ++-- tables/dmadata_table.txt | 2 +- tables/makerom_files.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/dmadata.h b/include/dmadata.h index 5d827232cf..a99acc5e2c 100644 --- a/include/dmadata.h +++ b/include/dmadata.h @@ -279,8 +279,8 @@ extern u32 ovl_En_Rd_vrom_end; extern u32 ovl_Bg_F40_Flift_vrom_start; extern u32 ovl_Bg_F40_Flift_vrom_end; -extern u32 ovl_Bg_Heavy_Block_vrom_start; -extern u32 ovl_Bg_Heavy_Block_vrom_end; +extern u32 ovl_Obj_Mure_vrom_start; +extern u32 ovl_Obj_Mure_vrom_end; extern u32 ovl_En_Sw_vrom_start; extern u32 ovl_En_Sw_vrom_end; diff --git a/linker_scripts/dmadata_script.txt b/linker_scripts/dmadata_script.txt index b0e3961e29..c66fb06e1a 100644 --- a/linker_scripts/dmadata_script.txt +++ b/linker_scripts/dmadata_script.txt @@ -274,8 +274,8 @@ ovl_En_Rd_vrom_end = 0x00D51720; ovl_Bg_F40_Flift_vrom_start = 0x00D51720; ovl_Bg_F40_Flift_vrom_end = 0x00D51AA0; -ovl_Bg_Heavy_Block_vrom_start = 0x00D51AA0; -ovl_Bg_Heavy_Block_vrom_end = 0x00D52B10; +ovl_Obj_Mure_vrom_start = 0x00D51AA0; +ovl_Obj_Mure_vrom_end = 0x00D52B10; ovl_En_Sw_vrom_start = 0x00D52B10; ovl_En_Sw_vrom_end = 0x00D56050; diff --git a/tables/dmadata_table.txt b/tables/dmadata_table.txt index a7f5525fa8..8c39dec669 100644 --- a/tables/dmadata_table.txt +++ b/tables/dmadata_table.txt @@ -95,7 +95,7 @@ ('build/decomp/ovl_En_Floormas', 'build/comp/ovl_En_Floormas.yaz0', 0x10, 0), ('build/decomp/ovl_En_Rd', 'build/comp/ovl_En_Rd.yaz0', 0x10, 0), ('build/decomp/ovl_Bg_F40_Flift', 'build/comp/ovl_Bg_F40_Flift.yaz0', 0x10, 0), - ('build/decomp/ovl_Bg_Heavy_Block', 'build/comp/ovl_Bg_Heavy_Block.yaz0', 0x10, 0), + ('build/decomp/ovl_Obj_Mure', 'build/comp/ovl_Obj_Mure.yaz0', 0x10, 0), ('build/decomp/ovl_En_Sw', 'build/comp/ovl_En_Sw.yaz0', 0x10, 0), ('build/decomp/ovl_Object_Kankyo', 'build/comp/ovl_Object_Kankyo.yaz0', 0x10, 0), ('build/decomp/ovl_En_Horse_Link_Child', 'build/comp/ovl_En_Horse_Link_Child.yaz0', 0x10, 0), diff --git a/tables/makerom_files.txt b/tables/makerom_files.txt index c86b2bd24c..fa54de8460 100644 --- a/tables/makerom_files.txt +++ b/tables/makerom_files.txt @@ -90,7 +90,7 @@ build/comp/ovl_Demo_Kankyo.yaz0 build/comp/ovl_En_Floormas.yaz0 build/comp/ovl_En_Rd.yaz0 build/comp/ovl_Bg_F40_Flift.yaz0 -build/comp/ovl_Bg_Heavy_Block.yaz0 +build/comp/ovl_Obj_Mure.yaz0 build/comp/ovl_En_Sw.yaz0 build/comp/ovl_Object_Kankyo.yaz0 build/comp/ovl_En_Horse_Link_Child.yaz0