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

Obj_Spidertent (1 non-matching) (#639)

Browse Source 
* Obj_Spidertent

* Match func_80B2FC98 (thanks Anon58)

* PR

* Fix

* PR

* PR
This commit is contained in:
Maide
2022-03-24 21:56:51 -03:00
committed by GitHub
parent 47ef03494b
commit 7ee4615cd0
4 changed files with 769 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+4 -1
View File
@@ -3973,8 +3973,11 @@ beginseg
name "ovl_Obj_Spidertent"
compress
include "build/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.o"
include "build/data/ovl_Obj_Spidertent/ovl_Obj_Spidertent.data.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_Obj_Spidertent/ovl_Obj_Spidertent_reloc.o"
#else
include "build/data/ovl_Obj_Spidertent/ovl_Obj_Spidertent.reloc.o"
#endif
endseg
beginseg
src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c
+748 -70
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h
+16 -2
View File
@@ -7,9 +7,23 @@ struct ObjSpidertent;
typedef void (*ObjSpidertentActionFunc)(struct ObjSpidertent*, GlobalContext*);
#define OBJSPIDERTENT_GET_1(thisx) ((thisx)->params & 1)
#define OBJSPIDERTENT_GET_7F00(thisx) (((thisx)->params >> 8) & 0x7F)
typedef struct ObjSpidertent {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x284];
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ ColliderTris collider;
/* 0x017C */ ColliderTrisElement colliderElements[6];
/* 0x03A4 */ Vec3f unk_3A4;
/* 0x03B0 */ f32 unk_3B0[4];
/* 0x03C0 */ u8 unk_3C0;
/* 0x03C1 */ s8 unk_3C1;
/* 0x03C2 */ u8 unk_3C2;
/* 0x03C3 */ u8 unk_3C3;
/* 0x03C4 */ u8 unk_3C4;
/* 0x03C5 */ u8 unk_3C5;
/* 0x03C6 */ s8 unk_3C6;
/* 0x03C7 */ s8 unk_3C7;
/* 0x03C8 */ ObjSpidertentActionFunc actionFunc;
} ObjSpidertent; // size = 0x3CC
tools/disasm/variables.txt
+1 -4
View File
@@ -14200,10 +14200,7 @@
0x80B311D8:("D_80B311D8","UNK_TYPE1","",0x1),
0x80B31340:("D_80B31340","UNK_TYPE1","",0x1),
0x80B31350:("D_80B31350","UNK_TYPE1","",0x1),
0x80B313A0:("D_80B313A0","UNK_TYPE1","",0x18),
0x80B313B8:("D_80B313B8","UNK_TYPE1","",0x18),
0x80B313D0:("D_80B313D0","UNK_TYPE1","",0x18),
0x80B313E8:("D_80B313E8","UNK_TYPE1","",0x18),
0x80B313A0:("D_80B313A0","ObjSpidertentStruct2","[4]",0x60),
0x80B31400:("D_80B31400","UNK_TYPE1","",0x1),
0x80B3140C:("D_80B3140C","UNK_TYPE1","",0x1),
0x80B31418:("D_80B31418","UNK_TYPE1","",0x1),