fight documentation

2022-10-08 22:07:56 -05:00
parent c0b005fa3d
commit cd222d498a
106 changed files with 1120 additions and 880 deletions
--- a/include/2.0L/PR/libaudio.h
+++ b/include/2.0L/PR/libaudio.h
@@ -682,7 +682,7 @@ typedef struct {
    ALPan               pan;            /* overall pan for this chan        */
    u8                  priority;       /* priority for this chan           */
    u8                  vol;            /* current volume for this chan     */
-    u8                  unk9;
+    u8                  unkA;
    u8                  fxmix;          /* current fx mix for this chan     */
    u8                  sustain;        /* current sustain pedal state      */
    f32                 pitchBend;      /* current pitch bend val in cents  */
--- a/include/enums.h
+++ b/include/enums.h
@@ -216,9 +216,10 @@ enum bkprog_e{
 	// {index=0xCC, type="Prog", level=6, name="Cobweb to Green Cauldron Broken"},
 	BKPROG_CD_GRATE_TO_WATER_SWITCH_3_OPEN = 0xcd,
    BKPROG_CE_GRATE_TO_MMM_PUZZLE_OPEN,
-
-	// {index=0xD1, type="Prog", level=12, name="Fight 1st Jinjo Statue Activated Cutscene"},
-	// {index=0xD2, type="Prog", level=12, name="Fight 1st Jinjo Statue Rising Cutscene"},
+    BKPROG_CF_HAS_ENTERED_FINAL_FIGHT,
+    
+    BKPROG_D1_HAS_ACTIVATED_A_JINJO_STATUE_IN_FINAL_FIGHT = 0xD1,
+    BKPROG_D2_HAS_SPAWNED_A_JINJO_STATUE_IN_FINAL_FIGHT,
 	// {index=0xD3, type="Prog", level=6, name="??FF PATTERN 2^0"},
 	// {index=0xD4, type="Prog", level=6, name="??FF PATTERN 2^1"},
 	// {index=0xD5, type="Prog", level=6, name="??FF PATTERN 2^2"},
@@ -676,16 +677,16 @@ enum comusic_e
    COMUISC_97_BBONUS_DROP_PIECE,
    COMUSIC_98_BBONUS_PIECES_SHUFFLE, // Looping
    MUSIC_MUMBO_BBQ,
-    SFX_JINJONATOR_HITS_GRUNTY_A,
-    SFX_JINJONATOR_HITS_GRUNTY_B,
-    SFX_JINJONATOR_HITS_GRUNTY_C,
-    SFX_JINJONATOR_HITS_GRUNTY_D,
-    SFX_JINJONATOR_HITS_GRUNTY_E,
-    SFX_JINJONATOR_HITS_GRUNTY_F,
-    SFX_JINJONATOR_HITS_GRUNTY_G = 0xA0,
-    SFX_JINJONATOR_HITS_GRUNTY_H,
-    SFX_JINJONATOR_HITS_GRUNTY_I,
-    SFX_JINJONATOR_HITS_GRUNTY_J,
+    COMUSIC_9A_JINJONATOR_HITS_GRUNTY_A,
+    COMUSIC_9B_JINJONATOR_HITS_GRUNTY_B,
+    COMUSIC_9C_JINJONATOR_HITS_GRUNTY_C,
+    COMUSIC_9D_JINJONATOR_HITS_GRUNTY_D,
+    COMUSIC_9E_JINJONATOR_HITS_GRUNTY_E,
+    COMUSIC_9F_JINJONATOR_HITS_GRUNTY_F,
+    COMUSIC_A0_JINJONATOR_HITS_GRUNTY_G = 0xA0,
+    COMUSIC_A1_JINJONATOR_HITS_GRUNTY_H,
+    COMUSIC_A2_JINJONATOR_HITS_GRUNTY_I,
+    COMUSIC_A3_JINJONATOR_HITS_GRUNTY_J,
    JINGLE_JINJONATOR_DRUMMING_A,
    JINGLE_JINJONATOR_DRUMMING_B,
    JINGLE_JINJONATOR_DRUMMING_C,
@@ -1293,7 +1294,8 @@ enum sfx_e
    SFX_3FA_HONEYCOMB_TALKING,
    SFX_3FB_UNKNOWN, //conga

-    SFX_406_GOLD_BULLION_TALKING = 0x406,
+    SFX_405_UNKNOWN = 0x405,
+    SFX_406_GOLD_BULLION_TALKING,
    SFX_407_MUMBO_TALKING_1,
    SFX_408_MUMBO_TALKING_2,
    SFX_409_MUMBO_TALKING_3,
@@ -1858,9 +1860,26 @@ enum actor_e
    ACTOR_386_PORTRAIT_OF_TREE_AND_MOON,
    ACTOR_387_PORTRAIT_OF_TEEHEE,
    ACTOR_388_PORTRAIT_OF_MINION,
+    ACTOR_389_GRUNTY_SPELL_FIREBALL,
+
+    ACTOR_38B_GRUNTILDA_FINAL_BOSS = 0x38B,

    ACTOR_39F_FIGHT_FLIGHT_PAD = 0x39F,
    ACTOR_3A0_ICECUBE_B,
+    ACTOR_3A1_STONE_JINJO = 0x3A1,
+    ACTOR_3A2_JINJO_STATUE_BASE = 0x3A2,
+
+    ACTOR_3A5_BOSS_JINJO_ORANGE = 0x3A5,
+    ACTOR_3A6_BOSS_JINJO_GREEN,
+    ACTOR_3A7_BOSS_JINJO_PINK,
+    ACTOR_3A8_BOSS_JINJO_YELLOW,
+    ACTOR_3A9_JINJONATOR_STATUE_BASE = 0x3A9,
+
+    ACTOR_3AA_GRUNTY_SPELL_GREEN_ATTACK = 0x3AA,
+    ACTOR_3AB_GRUNTY_SPELL_BARRIER,
+    ACTOR_3AC_JINJONATOR,
+
+    ACTOR_3AF_GRUNTY_SHADOW = 0x3AF,

    ACTOR_3BA_UNKOWN        = 0x3ba,

@@ -2639,14 +2658,14 @@ enum asset_e
    // Unused
    // Unused
    // Unused
-    // 3bb Yellow Jinjo
-    // 3bc Orange Jinjo
+    ASSET_3BB_MODEL_JINJO_YELLOW = 0x3BB,
+    ASSET_3BC_MODEL_JINJO_ORANGE,
    // 3bd TTC Lighthouse A
    // 3be TTC Lighthouse B
    ASSET_3BF_MODEL_PLAYER_SHADOW = 0x3BF,
-    // 3c0 Blue Jinjo
-    // 3c1 Pink Jinjo
-    // 3c2 Green Jinjo
+    ASSET_3C0_MODEL_JINJO_BLUE,
+    ASSET_3C1_MODEL_JINJO_PINK,
+    ASSET_3C2_MODEL_JINJO_GREEN,
    // Unused
    // Unused
    ASSET_3C5_MODEL_GRUBLIN           = 0x3c5,
@@ -3027,16 +3046,16 @@ enum asset_e
    ASSET_53A_MODEL_SHRAPNAL_PIECE_EYE = 0x53A,
    ASSET_53B_MODEL_SHRAPNAL_PIECE_SPIKE,
    ASSET_53C_MODEL_SHRAPNAL_PIECE_PLATE,
-    // 53d Gruntilda On Broomstick
+    ASSET_53D_MODEL_GRUNTILDA_FINAL_BOSS,
    // 53e Gnawty's Bed
    // 53f Gnawty's Shelves
    // 540 GL Shock Jump Pad Switch
-    // 541 (Fireball?)
+    ASSET_541_SPRITE_FIREBALL_SPELL_ATTACK = 0x541,
    // 542 (Shadow?)
-    // 543 Final Battle Jinjo Stand
-    // 544 Final Battle Jinjonator Stand
-    // 545 Final Battle Stone Jinjo
-    // 546 Grunty's Barrier Spell
+    ASSET_543_MODEL_JINJO_STATUE_BASE = 0x543,
+    ASSET_544_MODEL_JINJONATOR_STATUE_BASE,
+    ASSET_545_MODEL_STONE_JINJO,
+    ASSET_546_MODEL_GRUNTY_SPELL_BARRIER = 0x546,
    // 547 GL Blue Egg Refill Pillow
    // 548 GL Red Feather Refill Pillow
    // 549 GL Gold Feather Refill Pillow
@@ -3047,11 +3066,11 @@ enum asset_e
    // 54e Copyright Info (Title Screen)
    // 54f Cheato
    // 550 Large Door To Final Battle
-    // 551 Jinjonator
-    // 552 Broomstick Head (Upon Breaking)
-    // 553 Broomstick Shaft Short (Upon Breaking)
-    // 554 Broomstick Shaft Long (Upon Breaking)
-    // 555 Broomstick Eye (Upon Breaking)
+    ASSET_551_MODEL_JINJONATOR = 0x551,
+    ASSET_552_MODEL_BROOMSTICK_PIECE_HEAD,
+    ASSET_553_MODEL_BROOMSTICK_PIECE_SHORT,
+    ASSET_554_MODEL_BROOMSTICK_PIECE_LONG,
+    ASSET_555_MODEL_BROOMSTICK_PIECE_EYE,
    // 556 Blast When Yellow Jinjo Hits Gruntilda
    // 557 Blast When Orange Jinjo Hits Gruntilda
    // 558 Blast When Green Jinjo Hits Gruntilda
@@ -3423,7 +3442,7 @@ enum asset_e
    ASSET_6C6_SPRITE_SMOKE_PINK,
    ASSET_6C7_SPRITE_SMOKE_GREEN_2,
    ASSET_6C8_SPRITE_SMOKE_BLUE,
-    ASSET_6C9_SPRITE_SMOKE_GREEN_BIG,
+    ASSET_6C9_SPRITE_GREEN_SPELL_ATTACK,

    ASSET_6D1_SPRITE_GOLDFEATHTER = 0x6d1,

@@ -3949,9 +3968,26 @@ enum marker_e{
    MARKER_259_PORTRAIT_OF_TREE_AND_MOON,
    MARKER_25A_PORTRAIT_OF_TEEHEE,
    MARKER_25B_PORTRAIT_OF_MINION,
+    MARKER_25C_GRUNTY_SPELL_FIREBALL,

+    MARKER_25E_GRUNTILDA_FINAL_BOSS = 0x25E,
    MARKER_25F_ICECUBE_B = 0x25F,

+    MARKER_276_STONE_JINJO = 0x276,
+
+    MARKER_27A_JINJO_STATUE_BASE = 0x27A,
+    MARKER_27B_BOSS_JINJO_ORANGE,
+    MARKER_27C_BOSS_JINJO_GREEN,
+    MARKER_27D_BOSS_JINJO_PINK,
+    MARKER_27E_BOSS_JINJO_YELLOW,
+    MARKER_27F_JINJONATOR_STATUE_BASE,
+
+    MARKER_280_GRUNTY_SPELL_GREEN_ATTACK = 0x280,
+
+    MARKER_284_GRUNTY_SPELL_BARRIER = 0x284,
+    MARKER_285_JINJONATOR,
+
+    MARKER_288_GRUNTY_SHADOW = 0x288,

    MARKER_295_GRUNTLING_BLUE = 0x295,
    MARKER_296_TEEHEE_PURPLE,
--- a/include/functions.h
+++ b/include/functions.h
@@ -582,7 +582,10 @@ f32 climbGetTopY(void);
 void func_802596AC(f32 a0[3], f32 a1[3], f32 a2[3], f32 a3[3]);

 void func_8024E55C(s32, void *);
-void func_802C3C88(GenMethod_1, s32);
+
+void __spawnqueue_add_1(GenMethod_1, s32);
+#define SPAWNQUEUE_ADD_1(method, arg0) __spawnqueue_add_1((GenMethod_1) (method), reinterpret_cast(s32, (arg0)))
+
 void func_802FAD64(enum item_e);
 void nodeprop_getPosition(NodeProp *, f32[3]);
 bool func_80311480(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32));
--- a/include/prop.h
+++ b/include/prop.h
@@ -180,7 +180,7 @@ typedef struct actor_s{
    u32 unk58_0: 1;
    f32 unk5C;
    f32 unk60; //0x60
-    f32 yaw_moving; //0x64
+    f32 yaw_ideal; //0x64
    f32 pitch;//0x68
    f32 unk6C;
    f32 unk70;
--- a/include/structs.h
+++ b/include/structs.h
@@ -491,7 +491,8 @@ typedef struct{
 }struct4Cs;

 typedef struct struct_4D_s{
-    u8 unk0[0x18];
+    f32 unk0[3];
+    f32 unkC[3];
 }struct4Ds;

 typedef struct{