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

En_Tanron2 (#615)

Browse Source 
* En_Tanron2

* Format

* PR
This commit is contained in:
Maide
2022-02-19 20:27:21 +00:00
committed by GitHub
parent 320a1a3030
commit 2b5fe949fe
5 changed files with 612 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -3
View File
@@ -4570,9 +4570,7 @@ beginseg
name "ovl_En_Tanron2"
compress
include "build/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.o"
include "build/data/ovl_En_Tanron2/ovl_En_Tanron2.data.o"
include "build/data/ovl_En_Tanron2/ovl_En_Tanron2.bss.o"
include "build/data/ovl_En_Tanron2/ovl_En_Tanron2.reloc.o"
include "build/src/overlays/actors/ovl_En_Tanron2/ovl_En_Tanron2_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_Boss_04/z_boss_04.h
+1 -1
View File
@@ -13,7 +13,7 @@ typedef struct Boss04 {
/* 0x0188 */ Vec3s jointTable[9];
/* 0x01BE */ Vec3s morphtable[9];
/* 0x01F4 */ s16 unk_1F4;
/* 0x01F6 */ s8 unk_1F6;
/* 0x01F6 */ u8 unk_1F6;
/* 0x01F7 */ u8 unk_1F7;
/* 0x01F8 */ s16 unk_1F8;
/* 0x01FA */ s16 unk_1FA;
src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c
+593 -32
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h
+16 -1
View File
@@ -10,7 +10,22 @@ typedef void (*EnTanron2ActionFunc)(struct EnTanron2*, GlobalContext*);
typedef struct EnTanron2 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ EnTanron2ActionFunc actionFunc;
/* 0x0148 */ char unk_148[0xB4];
/* 0x0148 */ s16 unk_148;
/* 0x014A */ s16 unk_14A;
/* 0x014C */ s16 unk_14C;
/* 0x014E */ s16 unk_14E;
/* 0x0150 */ s16 unk_150;
/* 0x0152 */ s16 unk_152;
/* 0x0154 */ s16 unk_154;
/* 0x0156 */ s16 unk_156;
/* 0x0158 */ u8 unk_158;
/* 0x0159 */ u8 unk_159;
/* 0x015A */ u8 unk_15A;
/* 0x015B */ u8 unk_15B;
/* 0x015C */ f32 unk_15C;
/* 0x0160 */ f32 unk_160;
/* 0x0164 */ ColliderCylinder collider1;
/* 0x01B0 */ ColliderCylinder collider2;
} EnTanron2; // size = 0x1FC
extern const ActorInit En_Tanron2_InitVars;
tools/disasm/variables.txt
+1 -3
View File
@@ -15683,9 +15683,7 @@
0x80BB821C:("D_80BB821C","f32","",0x4),
0x80BB8450:("D_80BB8450","UNK_TYPE4","",0x4),
0x80BB8454:("D_80BB8454","f32","",0x4),
0x80BB8458:("D_80BB8458","UNK_TYPE4","",0x4),
0x80BB845C:("D_80BB845C","UNK_TYPE4","",0x4),
0x80BB8460:("D_80BB8460","UNK_TYPE4","",0x4),
0x80BB8458:("D_80BB8458","EnTanron2*","[82]",0x148),
0x80BB9720:("D_80BB9720","UNK_TYPE4","",0x4),
0x80BB972C:("D_80BB972C","UNK_TYPE4","",0x4),
0x80BB9730:("En_Tanron3_InitVars","UNK_TYPE1","",0x1),