falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

document remaining door assets (#1351) 

* initial commit of remaining door asset documentation

* format

* forgor the g removed comments

* space in metal door desc

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* space in spider door dsc

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
MegaIDK 2023-08-21 23:09:19 -03:00 committed by GitHub
parent 8059537150
commit 108b482ad0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assets/xml/objects/object_dor01.xml
View File

@ -1,7 +1,8 @@
<Root>
<!-- Object for Astral Observatory / Marine Research Lab Door (Bland metal door) -->
<File Name="object_dor01" Segment="6">
<DList Name="object_dor01_DL_000440" Offset="0x440" /> <!-- Original name is "z2_dor01_modelT" -->
<DList Name="object_dor01_DL_000448" Offset="0x448" /> <!-- Original name is "z2_dor01_model" -->
<Texture Name="object_dor01_Tex_000650" OutName="tex_000650" Format="rgba16" Width="16" Height="128" Offset="0x650" />
<DList Name="gObservatoryLabDoorEmptyDL" Offset="0x440" /> <!-- Original name is "z2_dor01_modelT" -->
<DList Name="gObservatoryLabDoorDL" Offset="0x448" /> <!-- Original name is "z2_dor01_model" -->
<Texture Name="gObservatoryLabDoorTex" OutName="observatory_lab_door" Format="rgba16" Width="16" Height="128" Offset="0x650" />
</File>
</Root>

5
assets/xml/objects/object_kinsta2_obj.xml
View File

@ -1,6 +1,7 @@
<Root>
<!-- Object for Oceanside Spider House Door -->
<File Name="object_kinsta2_obj" Segment="6">
<DList Name="object_kinsta2_obj_DL_000310" Offset="0x310" />
<Texture Name="object_kinsta2_obj_Tex_0004E8" OutName="tex_0004E8" Format="rgba16" Width="32" Height="64" Offset="0x4E8" />
<DList Name="gOceansideSpiderHouseDoorDL" Offset="0x310" />
<Texture Name="gOceansideSpiderHouseDoorTex" OutName="oceanside_spider_house_door" Format="rgba16" Width="32" Height="64" Offset="0x4E8" />
</File>
</Root>

7
assets/xml/objects/object_wdor01.xml
View File

@ -1,7 +1,8 @@
<Root>
<!-- Object for Lottery Shop / Curiosity Shop / Mayor's House Door -->
<File Name="object_wdor01" Segment="6">
<DList Name="object_wdor01_DL_000540" Offset="0x540" />
<DList Name="object_wdor01_DL_000548" Offset="0x548" />
<Texture Name="object_wdor01_Tex_0006B0" OutName="tex_0006B0" Format="rgba16" Width="32" Height="64" Offset="0x6B0" />
<DList Name="gLotteryCuriosityShopMayorHouseDoorEmptyDL" Offset="0x540" />
<DList Name="gLotteryCuriosityShopMayorHouseDoorDL" Offset="0x548" />
<Texture Name="gLotteryCuriosityShopMayorHouseDoorTex" OutName="lottery_curiosity_shop_mayor_house_door" Format="rgba16" Width="32" Height="64" Offset="0x6B0" />
</File>
</Root>

7
assets/xml/objects/object_wdor02.xml
View File

@ -1,7 +1,8 @@
<Root>
<!-- Object for Post Office / Trading Post Door -->
<File Name="object_wdor02" Segment="6">
<DList Name="object_wdor02_DL_000540" Offset="0x540" />
<DList Name="object_wdor02_DL_000548" Offset="0x548" />
<Texture Name="object_wdor02_Tex_0006B0" OutName="tex_0006B0" Format="rgba16" Width="32" Height="64" Offset="0x6B0" />
<DList Name="gPostOfficeTradingPostDoorEmptyDL" Offset="0x540" />
<DList Name="gPostOfficeTradingPostDoorDL" Offset="0x548" />
<Texture Name="gPostOfficeTradingPostDoorTex" OutName="post_office_trading_post_door" Format="rgba16" Width="32" Height="64" Offset="0x6B0" />
</File>
</Root>

7
assets/xml/objects/object_wdor03.xml
View File

@ -1,7 +1,8 @@
<Root>
<!-- Object for Stock Pot Inn & Swordsman's School Door -->
<File Name="object_wdor03" Segment="6">
<DList Name="object_wdor03_DL_000540" Offset="0x540" />
<DList Name="object_wdor03_DL_000548" Offset="0x548" />
<Texture Name="object_wdor03_Tex_0006B0" OutName="tex_0006B0" Format="rgba16" Width="32" Height="64" Offset="0x6B0" />
<DList Name="gInnSchoolDoorEmptyDL" Offset="0x540" />
<DList Name="gInnSchoolDoorDL" Offset="0x548" />
<Texture Name="gInnScoolDoorTex" OutName="inn_school_door" Format="rgba16" Width="32" Height="64" Offset="0x6B0" />
</File>
</Root>

12
src/overlays/actors/ovl_En_Door/z_en_door.c
View File

@ -5,7 +5,7 @@
*/
#include "z_en_door.h"
#include "objects/object_mkk/object_mkk.h"
#include "objects/object_kinsta2_obj/object_kinsta2_obj.h"
#include "objects/object_dor01/object_dor01.h"
#include "objects/object_dor02/object_dor02.h"
#include "objects/object_dor03/object_dor03.h"
@ -400,17 +400,17 @@ static u8 sAnimCloseFrames[2 * PLAYER_FORM_MAX] = {
static Gfx* D_808679A4[14][2] = {
{ gDoorLeftDL, gDoorRightDL },
{ gWoodfallDoorDL, gWoodfallDoorDL },
{ object_dor01_DL_000448, object_dor01_DL_000448 },
{ gObservatoryLabDoorDL, gObservatoryLabDoorDL },
{ gZoraHallDoorDL, gZoraHallDoorDL },
{ gSwampDoorDL, gSwampDoorDL },
{ gMagicHagPotionShopDoorDL, gMagicHagPotionShopDoorDL },
{ object_wdor01_DL_000548, object_wdor01_DL_000548 }, // Lottery Shop / Curiosity Shop / Mayor's House Door
{ object_wdor02_DL_000548, object_wdor02_DL_000548 }, // Trading Post / Post Office Door
{ object_wdor03_DL_000548, object_wdor03_DL_000548 }, // Stockpot Inn & Swordsman's School Door
{ gLotteryCuriosityShopMayorHouseDoorDL, gLotteryCuriosityShopMayorHouseDoorDL },
{ gPostOfficeTradingPostDoorDL, gPostOfficeTradingPostDoorDL },
{ gInnSchoolDoorDL, gInnSchoolDoorDL },
{ gMilkBarDoorDL, gMilkBarDoorDL },
{ gMusicBoxHouseDoorDL, gMusicBoxHouseDoorDL },
{ gPiratesFortressDoorDL, gPiratesFortressDoorDL },
{ gWhiteBoeEyesDL, gWhiteBoeEyesDL },
{ gOceansideSpiderHouseDoorDL, gOceansideSpiderHouseDoorDL },
{ gFieldWoodDoorLeftDL, gFieldWoodDoorRightDL },
};