izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Dm_Char01 (#589)

Browse Source 
* Dm_Char01

* Merge

* Extract verts

* PR
This commit is contained in:
Maide
2022-02-19 19:11:13 +00:00
committed by GitHub
parent 3086543498
commit 2d6a74c0aa
6 changed files with 524 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_mtoride.xml
+2 -2
View File
@@ -31,7 +31,7 @@
<TextureAnimation Name="object_mtoride_Matanimheader_00AA50" Offset="0xAA50" />
<DList Name="object_mtoride_DL_00AF90" Offset="0xAF90" />
<DList Name="object_mtoride_DL_00AF98" Offset="0xAF98" />
<!-- <Blob Name="object_mtoride_Blob_00B1A0" Size="0x10" Offset="0xB1A0" /> -->
<TextureAnimation Name="object_mtoride_Matanimheader_00B1A0" Offset="0xB1A0" />
<DList Name="object_mtoride_DL_00DE50" Offset="0xDE50" />
<DList Name="object_mtoride_DL_00DF18" Offset="0xDF18" />
<DList Name="object_mtoride_DL_00F3C0" Offset="0xF3C0" />
@@ -40,7 +40,7 @@
<DList Name="object_mtoride_DL_00FAE0" Offset="0xFAE0" />
<DList Name="object_mtoride_DL_00FAE8" Offset="0xFAE8" />
<Collision Name="object_mtoride_Colheader_00FE5C" Offset="0xFE5C" />
<!-- <Blob Name="object_mtoride_Blob_00FE90" Size="0x10" Offset="0xFE90" /> -->
<TextureAnimation Name="object_mtoride_Matanimheader_00FE90" Offset="0xFE90" />
<Collision Name="object_mtoride_Colheader_010C3C" Offset="0x10C3C" />
<DList Name="object_mtoride_DL_010EF0" Offset="0x10EF0" />
<DList Name="object_mtoride_DL_010FD8" Offset="0x10FD8" />
assets/xml/overlays/ovl_Dm_Char01.xml
+7
View File
@@ -0,0 +1,7 @@
<Root>
<File Name="ovl_Dm_Char01" BaseAddress="0x80AA81E0" RangeStart="0x1BE0" RangeEnd="0x28B0">
<Array Name="ovl_dm_char01_Vtx_1BE0" Count="205" Offset="0x1BE0">
<Vtx/>
</Array>
</File>
</Root>
spec
+1 -3
View File
@@ -3267,9 +3267,7 @@ beginseg
name "ovl_Dm_Char01"
compress
include "build/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.o"
include "build/data/ovl_Dm_Char01/ovl_Dm_Char01.data.o"
include "build/data/ovl_Dm_Char01/ovl_Dm_Char01.bss.o"
include "build/data/ovl_Dm_Char01/ovl_Dm_Char01.reloc.o"
include "build/src/overlays/actors/ovl_Dm_Char01/ovl_Dm_Char01_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c
+497 -23
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h
+17 -3
View File
@@ -7,11 +7,25 @@ struct DmChar01;
typedef void (*DmChar01ActionFunc)(struct DmChar01*, GlobalContext*);
#define DMCHAR01_GET(thisx) ((thisx)->params)
enum {
/* 0 */ DMCHAR01_0,
/* 1 */ DMCHAR01_1,
/* 2 */ DMCHAR01_2,
/* 3 */ DMCHAR01_3,
};
typedef struct DmChar01 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x5C];
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ UNK_TYPE1 unk15C[0x44];
/* 0x01A0 */ DmChar01ActionFunc actionFunc;
/* 0x01A4 */ char unk_1A4[0x1AC];
/* 0x01A4 */ UNK_TYPE1 unk1A4[0x8];
/* 0x01AC */ s16 unk_1AC[205];
/* 0x0346 */ s16 unk_346;
/* 0x0348 */ f32 unk_348;
/* 0x034C */ u8 unk_34C;
/* 0x034D */ u8 unk_34D;
} DmChar01; // size = 0x350
extern const ActorInit Dm_Char01_InitVars;
undefined_syms.txt
-23
View File
@@ -984,29 +984,6 @@ D_060005FC = 0x060005FC;
D_06001804 = 0x06001804;
D_0600A6D0 = 0x0600A6D0;
// ovl_Dm_Char01
D_06009928 = 0x06009928;
D_06009D70 = 0x06009D70;
D_06009E4C = 0x06009E4C;
D_0600A398 = 0x0600A398;
D_0600A5C0 = 0x0600A5C0;
D_0600A8F8 = 0x0600A8F8;
D_0600AA50 = 0x0600AA50;
D_0600AF98 = 0x0600AF98;
D_0600B1A0 = 0x0600B1A0;
D_0600DE50 = 0x0600DE50;
D_0600DF18 = 0x0600DF18;
D_0600F3C0 = 0x0600F3C0;
D_0600F768 = 0x0600F768;
D_0600FAE8 = 0x0600FAE8;
D_0600FE5C = 0x0600FE5C;
D_0600FE90 = 0x0600FE90;
D_06010C3C = 0x06010C3C;
D_06010EF0 = 0x06010EF0;
D_06010FD8 = 0x06010FD8;
D_060110B8 = 0x060110B8;
// ovl_Dm_Char02
D_0600AD68 = 0x0600AD68;