Decompile OctorokBoss

include/coord.h

@@ -13,7 +13,7 @@ void PositionRelative(Entity*, Entity*, s32, s32);
 void CopyPositionAndSpriteOffset(Entity* param_1, Entity* param_2);
 void sub_0806FA90(Entity*, Entity*, s32, s32);
 void ResolveEntityOnTop(Entity*, Entity*);
-void sub_0806FAD8(Entity*, Entity*);
+void ResolveEntityBelow(Entity*, Entity*);
 
 extern const s16 gSineTable[64];
 extern const s16 gCosineTable[256];

include/functions.h

@@ -56,8 +56,11 @@ extern s32 GetItemPrice();
 extern void DoExitTransition(ScreenTransitionData*);
 extern void CreateDustAt(s32, s32, u32);
 extern void PutItemOnSlot(u32 itemID);
-extern void CreateSpeechBubbleSleep(Entity*, u32, u32);
+extern Entity* CreateSpeechBubbleQuestionMark(Entity*, s32, s32);
+extern Entity* CreateSpeechBubbleExclamationMark(Entity*, s32, s32);
+extern Entity* CreateSpeechBubbleSleep(Entity*, s32, s32);
 extern u32 CheckPlayerProximity(u32, u32, u32, u32);
+extern void ChangeLightLevel(s32);
 
 // Unidentified
 extern u32 sub_0806ED78(Entity*);
@@ -80,7 +83,7 @@ extern s32 sub_0806ED9C(Entity*, u32, u32);
 extern void sub_0807000C(Entity*);
 extern void sub_08068BEC(Entity*, u32);
 extern s32 sub_0806F078(Entity*, s32);
-extern void sub_0801D2B4(Entity*, u32);
+extern void ChangeObjPalette(Entity*, u32);
 extern void sub_0806FD3C(Entity*);
 extern void sub_0805ED14(u32*);
 extern void sub_080A7C18(u32, u32, u32);
@@ -130,7 +133,6 @@ extern void sub_0807AABC(Entity*);
 extern void UpdateGlobalProgress(void);
 extern void sub_0805B4D0(u32);
 extern void sub_0804D0B4(void);
-extern void sub_0805308C(s32);
 extern void sub_080534AC();
 extern void sub_0807BA8C(u32, u32);
 extern void sub_0804D9B0();

include/object.h

@@ -140,7 +140,7 @@ typedef enum {
     SMALL_ICE_BLOCK,
     BIG_ICE_BLOCK,
     OBJECT_86,
-    OBJECT_87,
+    OCTOROK_BOSS_OBJECT,
     HUGE_BOOK,
     OBJECT_89,
     OBJECT_8A,
@@ -336,7 +336,7 @@ extern void BigPushableLever(Entity*);
 extern void SmallIceBlock(Entity*);
 extern void BigIceBlock(Entity*);
 extern void Object86(Entity*);
-extern void Object87(Entity*);
+extern void OctorokBossObject(Entity*);
 extern void MacroBook(Entity*);
 extern void Object89(Entity*);
 extern void Object8A(Entity*);

include/projectile.h

@@ -0,0 +1,44 @@
+#ifndef PROJECTILE_H
+#define PROJECTILE_H
+
+typedef enum {
+    /*00*/ DARK_NUT_SWORD_SLASH,
+    /*01*/ ROCK_PROJECTILE,
+    /*02*/ BONE_PROJECTILE,
+    /*03*/ MOBLIN_SPEAR,
+    /*04*/ DEKU_SEED_PROJECTILE,
+    /*05*/ PROJECTILE_5,
+    /*06*/ DIRT_BALL_PROJECTILE,
+    /*07*/ WIND_PROJECTILE,
+    /*08*/ FIRE_PROJECTILE,
+    /*09*/ ICE_PROJECTILE,
+    /*0A*/ GLEEROK_PROJECTILE,
+    /*0B*/ KEATON_DAGGER,
+    /*0C*/ GUARD_LINE_OF_SIGHT,
+    /*0D*/ ARROW_PROJECTILE,
+    /*0E*/ MAZAAL_ENERGY_BEAM,
+    /*0F*/ OCTOROK_BOSS_PROJECTILE,
+    /*10*/ STALFOS_PROJECTILE,
+    /*11*/ LAKITU_CLOUD_PROJECTILE,
+    /*12*/ LAKITU_LIGHTNING,
+    /*13*/ MANDIBLES_PROJECTILE,
+    /*14*/ REMOVABLE_DUST,
+    /*15*/ SPIDER_WEB,
+    /*16*/ TORCH_TRAP_PROJECTILE,
+    /*17*/ GURUGURU_BAR_PROJECTILE,
+    /*18*/ V1_DARK_MAGIC_PROJECTILE,
+    /*19*/ BALL_AND_CHAIN,
+    /*1A*/ V1_FIRE_PROJECTILE,
+    /*1B*/ CANNONBALL_PROJECTILE,
+    /*1C*/ V1_EYE_LASER,
+    /*1D*/ WINDER,
+    /*1E*/ SPIKED_ROLLERS,
+    /*1F*/ V2_PROJECTILE,
+    /*20*/ V3_HAND_PROJECTILE,
+    /*21*/ V3_ELECTRIC_PROJECTILE,
+    /*22*/ GYORG_TAIL,
+    /*23*/ GYORG_MALE_ENERGY_PROJECTILE,
+    /*24*/ V3_TENNIS_BALL_PROJECTILE,
+} Projectile;
+
+#endif

include/room.h

@@ -66,7 +66,7 @@ typedef struct {
     u8 field_0x9;
     u8 unk2;
     u8 filler2;
-    s16 field_0xc;
+    s16 lightLevel;
     u8 filler3[2];
     u8 unk_10[4];
     u32 roomFlags;