From 72f2b6aa4d154514008f61cc35025875a0528e02 Mon Sep 17 00:00:00 2001 From: Rozelette Date: Thu, 11 Mar 2021 19:04:59 -0600 Subject: [PATCH] Fix incorrect .data start for En_Door (#68) --- src/overlays/actors/ovl_En_Door/z_en_door.c | 2 ++ tables/files.txt | 2 +- tables/objects.txt | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index d623359327..e5b8e62526 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -44,3 +44,5 @@ const ActorInit En_Door_InitVars = { #pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_0x80866800/EnDoor_Update.asm") #pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_0x80866800/func_80867350.asm") + +#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Door_0x80866800/EnDoor_Draw.asm") diff --git a/tables/files.txt b/tables/files.txt index 69a07e488c..af39523a84 100644 --- a/tables/files.txt +++ b/tables/files.txt @@ -14,7 +14,7 @@ ('overlays/', 'decomp/', 'ovl_En_GirlA', 0x80863870, ((0x80864A30, 0x8086536F),),()), ('overlays/', 'decomp/', 'ovl_En_Part', 0x80865370, ((0x808658E0, 0x8086598F),),()), ('overlays/', 'decomp/', 'ovl_En_Light', 0x80865990, ((0x808666B0, 0x808667FF),),()), - ('overlays/', 'decomp/', 'ovl_En_Door', 0x80866800, ((0x808674B0, 0x80867BBF),),((0x80867BC0,0x80867BCF),)), + ('overlays/', 'decomp/', 'ovl_En_Door', 0x80866800, ((0x808675D0, 0x80867BBF),),((0x80867BC0,0x80867BCF),)), ('overlays/', 'decomp/', 'ovl_En_Box', 0x80867BD0, ((0x80869B30, 0x80869D8F),),()), ('overlays/', 'decomp/', 'ovl_En_Pametfrog', 0x80869D90, ((0x8086D940, 0x8086DE1F),),()), ('overlays/', 'decomp/', 'ovl_En_Okuta', 0x8086DE20, ((0x80870870, 0x80870DAF),),()), diff --git a/tables/objects.txt b/tables/objects.txt index 8f229540c1..64c8dcc035 100644 --- a/tables/objects.txt +++ b/tables/objects.txt @@ -570,7 +570,7 @@ 0x80865920:"ovl_En_Part_rodata", 0x808666B0:"ovl_En_Light_data", 0x80866750:"ovl_En_Light_rodata", - 0x808674B0:"ovl_En_Door_data", + 0x808675D0:"ovl_En_Door_data", 0x80867A20:"ovl_En_Door_rodata", 0x80869B30:"ovl_En_Box_data", 0x80869BA0:"ovl_En_Box_rodata",