Document object_kibako (#542)

* Document object_kibako

* File comment header

* Single line comment styling
This commit is contained in:
Tom Overton 2022-01-03 23:04:30 -08:00 committed by GitHub
parent 9c682e5e52
commit 6125d48b07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 14 deletions

View File

@ -1,8 +1,9 @@
<Root>
<!-- Object for small wooden crate -->
<File Name="object_kibako" Segment="6">
<Texture Name="object_kibako_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="64" Offset="0x0" />
<DList Name="object_kibako_DL_001180" Offset="0x1180" />
<Texture Name="object_kibako_Tex_001240" OutName="tex_001240" Format="rgba16" Width="64" Height="16" Offset="0x1240" />
<DList Name="object_kibako_DL_001A70" Offset="0x1A70" />
<Texture Name="gSmallCrateTex" OutName="small_crate" Format="rgba16" Width="32" Height="64" Offset="0x0" />
<DList Name="gSmallCrateDL" Offset="0x1180" />
<Texture Name="gSmallCrateFragmentTex" OutName="small_crate_fragment" Format="rgba16" Width="64" Height="16" Offset="0x1240" />
<DList Name="gSmallCrateFragmentDL" Offset="0x1A70" />
</File>
</Root>

View File

@ -5,6 +5,8 @@
*/
#include "z_obj_kibako.h"
#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#include "objects/object_kibako/object_kibako.h"
#define FLAGS 0x04000010
@ -66,14 +68,11 @@ static ColliderCylinderInit sCylinderInit = {
{ 15, 30, 0, { 0, 0, 0 } },
};
extern Gfx D_06001A70[];
extern Gfx D_06001180[];
static s16 sObjectIdList[] = { GAMEPLAY_DANGEON_KEEP, OBJECT_KIBAKO };
static Gfx* sKakeraDisplayLists[] = { D_05007980, D_06001A70 };
static Gfx* sKakeraDisplayLists[] = { gameplay_dangeon_keep_DL_007980, gSmallCrateFragmentDL };
static Gfx* sDisplayLists[] = { D_05007890, D_06001180 };
static Gfx* sDisplayLists[] = { gameplay_dangeon_keep_DL_007890, gSmallCrateDL };
static InitChainEntry sInitChain[] = {
ICHAIN_F32_DIV1000(gravity, -1500, ICHAIN_CONTINUE),

View File

@ -3968,11 +3968,6 @@ D_06000180 = 0x06000180;
D_06003478 = 0x06003478;
D_0600805C = 0x0600805C;
// ovl_Obj_Kibako
D_06001180 = 0x06001180;
D_06001A70 = 0x06001A70;
// ovl_Obj_Kzsaku
D_06000040 = 0x06000040;