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

Boss_02 Documentation, Part 2: Document Twinmold Param Types and name most BSS variables (#931)

Browse Source 
* Boss_02 Documentation, Part 2: Document Twinmold Param Types and name most BSS variables

* Respond to hensldm's review
This commit is contained in:
Tom Overton
2022-07-22 05:53:14 +01:00
committed by GitHub
parent 905c089beb
commit 7732f5e96d
4 changed files with 241 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_Boss_02/z_boss_02.c
+222 -220
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Boss_02/z_boss_02.h
+8 -1
View File
@@ -30,6 +30,13 @@ typedef enum {
/* 4 */ TWINMOLD_EFFECT_FLASH, // The flashes of light that appear when the parts of Twinmold explode
} TwinmoldEffectType;
typedef enum {
/* 0 */ TWINMOLD_RED,
/* 35 */ TWINMOLD_BLUE = 35,
/* 100 */ TWINMOLD_TAIL = 100,
/* 200 */ TWINMOLD_STATIC = 200,
} TwinmoldParams;
typedef struct Boss02 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ u8 unk_0144;
@@ -68,7 +75,7 @@ typedef struct Boss02 {
/* 0x15D4 */ Vec3s jointTable[TWINMOLD_HEAD_LIMB_MAX];
/* 0x1622 */ Vec3s morphTable[TWINMOLD_HEAD_LIMB_MAX];
/* 0x1670 */ Boss02ActionFunc actionFunc;
/* 0x1674 */ struct Boss02* unk_1674; // points to the other's instance
/* 0x1674 */ struct Boss02* otherTwinmold; // points to the other's instance
/* 0x1678 */ s32 unk_1678;
/* 0x167C */ Vec3f unk_167C;
/* 0x1688 */ ColliderJntSph colliderSphere1;
tools/disasm/functions.txt
+5 -5
View File
@@ -9306,11 +9306,11 @@
0x809DAAA8:("func_809DAAA8",),
0x809DAB78:("func_809DAB78",),
0x809DBFB4:("func_809DBFB4",),
0x809DC218:("func_809DC218",),
0x809DC320:("Boss02_Update",),
0x809DC78C:("func_809DC78C",),
0x809DCA00:("Boss02_Draw",),
0x809DD0A8:("func_809DD0A8",),
0x809DC218:("Boss02_Tail_Update",),
0x809DC320:("Boss02_Twinmold_Update",),
0x809DC78C:("Boss02_Static_Update",),
0x809DCA00:("Boss02_Twinmold_Draw",),
0x809DD0A8:("Boss02_Static_Draw",),
0x809DD0CC:("Boss02_UpdateEffects",),
0x809DD2F8:("Boss02_DrawEffects",),
0x809DD934:("func_809DD934",),
tools/disasm/variables.txt
+6 -6
View File
@@ -10232,12 +10232,12 @@
0x809E0420:("D_809E0420","UNK_TYPE1","",0x1),
0x809E0421:("D_809E0421","UNK_TYPE1","",0x1),
0x809E0422:("D_809E0422","UNK_TYPE1","",0x1),
0x809E0424:("D_809E0424","UNK_TYPE4","",0x4),
0x809E0428:("D_809E0428","UNK_TYPE4","",0x4),
0x809E042C:("D_809E042C","UNK_TYPE4","",0x4),
0x809E0430:("D_809E0430","UNK_TYPE1","",0x1),
0x809E0434:("D_809E0434","UNK_TYPE4","",0x4),
0x809E0438:("D_809E0438","UNK_TYPE1","",0x1),
0x809E0424:("sRedTwinmold","UNK_TYPE4","",0x4),
0x809E0428:("sBlueTwinmold","UNK_TYPE4","",0x4),
0x809E042C:("sTwinmoldStatic","UNK_TYPE4","",0x4),
0x809E0430:("sMusicStartTimer","UNK_TYPE1","",0x1),
0x809E0434:("sBlueWarp","UNK_TYPE4","",0x4),
0x809E0438:("sEffects","UNK_TYPE1","",0x1),
0x809E8EA0:("D_809E8EA0","UNK_TYPE4","",0x4),
0x809E8EAC:("Boss_03_InitVars","UNK_TYPE1","",0x1),
0x809E8ECC:("D_809E8ECC","UNK_TYPE1","",0x1),