talon OK

4 files changed, 114 insertions, 116 deletions

diff --git a/include/enemy.h b/include/enemy.h
index a7d01603..25cc5529 100644
--- a/include/enemy.h
+++ b/include/enemy.h
@@ -4,107 +4,107 @@
 #include "global.h"
 #include "entity.h"
 
-extern void  Octorok(Entity*);
-extern void  Chuchu(Entity*);
-extern void  Leever(Entity*);
-extern void  Peahat(Entity*);
-extern void  Rollobite(Entity*);
-extern void  DarkNut(Entity*);
-extern void  HangingSeed(Entity*);
-extern void  Beetle(Entity*);
-extern void  Keese(Entity*);
-extern void  DoorMimic(Entity*);
-extern void  RockChuchu(Entity*);
-extern void  SpinyChuchu(Entity*);
-extern void  CuccoChickAggr(Entity*);
-extern void  Moldorm(Entity*);
-extern void  EnemyE(Entity*);
-extern void  Moldworm(Entity*);
-extern void  Sluggula(Entity*);
-extern void  Pesto(Entity*);
-extern void  Puffstool(Entity*);
-extern void  ChuchuBoss(Entity*);
-extern void  LikeLike(Entity*);
-extern void  SpearMoblin(Entity*);
-extern void  BusinessScrub(Entity*);
-extern void  RupeeLike(Entity*);
-extern void  Madderpillar(Entity*);
-extern void  WaterDrop(Entity*);
-extern void  WallMaster(Entity*);
-extern void  BombPeahat(Entity*);
-extern void  Spark(Entity*);
-extern void  Chaser(Entity*);
-extern void  SpikedBeetle(Entity*);
-extern void  SensorBladeTrap(Entity*);
-extern void  Helmasaur(Entity*);
-extern void  FallingBoulder(Entity*);
-extern void  Bobomb(Entity*);
-extern void  WallMaster2(Entity*);
-extern void  Gleerok(Entity*);
-extern void  VaatiEyesMacro(Entity*);
-extern void  Tektite(Entity*);
-extern void  WizzrobeWind(Entity*);
-extern void  WizzrobeFire(Entity*);
-extern void  WizzrobeIce(Entity*);
-extern void  Armos(Entity*);
-extern void  Eyegore(Entity*);
-extern void  Rope(Entity*);
-extern void  SmallPesto(Entity*);
-extern void  AcroBandit(Entity*);
-extern void  BladeTrap(Entity*);
-extern void  Keaton(Entity*);
-extern void  Crow(Entity*);
-extern void  Mulldozer(Entity*);
-extern void  Bombarossa(Entity*);
-extern void  Wisp(Entity*);
-extern void  SpinyBeetle(Entity*);
-extern void  MazaalHead(Entity*);
-extern void  MazaalMacro(Entity*);
-extern void  MazaalHand(Entity*);
-extern void  OctorokBoss(Entity*);
-extern void  FlyingPot(Entity*);
-extern void  Gibdo(Entity*);
-extern void  OctorokGolden(Entity*);
-extern void  TektiteGolden(Entity*);
-extern void  RopeGolden(Entity*);
-extern void  CloudPiranha(Entity*);
-extern void  ScissorsBeetle(Entity*);
-extern void  CuccoAggr(Entity*);
-extern void  Stalfos(Entity*);
-extern void  FlyingSkull(Entity*);
-extern void  MazaalBracelet(Entity*);
-extern void  Takkuri(Entity*);
-extern void  BowMoblin(Entity*);
-extern void  Lakitu(Entity*);
-extern void  LakituCloud(Entity*);
-extern void  Enemy49(Entity*);
-extern void  VaatiRebornEnemy(Entity*);
-extern void  VaatiProjectile(Entity*);
-extern void  BallChainSoldier(Entity*);
-extern void  Enemy4D(Entity*);
-extern void  Ghini(Entity*);
-extern void  VaatiTransfigured(Entity*);
-extern void  Enemy50(Entity*);
-extern void  VaatiWrath(Entity*);
-extern void  VaatiArm(Entity*);
-extern void  Dust(Entity*);
-extern void  VaatiBall(Entity*);
-extern void  Octorok(Entity*);
-extern void  Slime(Entity*);
-extern void  MiniSlime(Entity*);
-extern void  FireballGuy(Entity*);
-extern void  MiniFireballGuy(Entity*);
-extern void  Enemy5A(Entity*);
-extern void  BusinessScrubPrologue(Entity*);
-extern void  GyorgFemale(Entity*);
-extern void  GyorgMale(Entity*);
-extern void  Curtain(Entity*);
-extern void  Enemy5F(Entity*);
-extern void  GyorgChild(Entity*);
-extern void  GyorgFemaleEye(Entity*);
-extern void  Enemy62(Entity*);
-extern void  GyorgFemaleMouth(Entity*);
-extern void  Enemy64(Entity*);
-extern void  TreeItem(Entity*);
-extern void  Enemy66(Entity*);
+extern void Octorok(Entity*);
+extern void Chuchu(Entity*);
+extern void Leever(Entity*);
+extern void Peahat(Entity*);
+extern void Rollobite(Entity*);
+extern void DarkNut(Entity*);
+extern void HangingSeed(Entity*);
+extern void Beetle(Entity*);
+extern void Keese(Entity*);
+extern void DoorMimic(Entity*);
+extern void RockChuchu(Entity*);
+extern void SpinyChuchu(Entity*);
+extern void CuccoChickAggr(Entity*);
+extern void Moldorm(Entity*);
+extern void EnemyE(Entity*);
+extern void Moldworm(Entity*);
+extern void Sluggula(Entity*);
+extern void Pesto(Entity*);
+extern void Puffstool(Entity*);
+extern void ChuchuBoss(Entity*);
+extern void LikeLike(Entity*);
+extern void SpearMoblin(Entity*);
+extern void BusinessScrub(Entity*);
+extern void RupeeLike(Entity*);
+extern void Madderpillar(Entity*);
+extern void WaterDrop(Entity*);
+extern void WallMaster(Entity*);
+extern void BombPeahat(Entity*);
+extern void Spark(Entity*);
+extern void Chaser(Entity*);
+extern void SpikedBeetle(Entity*);
+extern void SensorBladeTrap(Entity*);
+extern void Helmasaur(Entity*);
+extern void FallingBoulder(Entity*);
+extern void Bobomb(Entity*);
+extern void WallMaster2(Entity*);
+extern void Gleerok(Entity*);
+extern void VaatiEyesMacro(Entity*);
+extern void Tektite(Entity*);
+extern void WizzrobeWind(Entity*);
+extern void WizzrobeFire(Entity*);
+extern void WizzrobeIce(Entity*);
+extern void Armos(Entity*);
+extern void Eyegore(Entity*);
+extern void Rope(Entity*);
+extern void SmallPesto(Entity*);
+extern void AcroBandit(Entity*);
+extern void BladeTrap(Entity*);
+extern void Keaton(Entity*);
+extern void Crow(Entity*);
+extern void Mulldozer(Entity*);
+extern void Bombarossa(Entity*);
+extern void Wisp(Entity*);
+extern void SpinyBeetle(Entity*);
+extern void MazaalHead(Entity*);
+extern void MazaalMacro(Entity*);
+extern void MazaalHand(Entity*);
+extern void OctorokBoss(Entity*);
+extern void FlyingPot(Entity*);
+extern void Gibdo(Entity*);
+extern void OctorokGolden(Entity*);
+extern void TektiteGolden(Entity*);
+extern void RopeGolden(Entity*);
+extern void CloudPiranha(Entity*);
+extern void ScissorsBeetle(Entity*);
+extern void CuccoAggr(Entity*);
+extern void Stalfos(Entity*);
+extern void FlyingSkull(Entity*);
+extern void MazaalBracelet(Entity*);
+extern void Takkuri(Entity*);
+extern void BowMoblin(Entity*);
+extern void Lakitu(Entity*);
+extern void LakituCloud(Entity*);
+extern void Enemy49(Entity*);
+extern void VaatiRebornEnemy(Entity*);
+extern void VaatiProjectile(Entity*);
+extern void BallChainSoldier(Entity*);
+extern void Enemy4D(Entity*);
+extern void Ghini(Entity*);
+extern void VaatiTransfigured(Entity*);
+extern void Enemy50(Entity*);
+extern void VaatiWrath(Entity*);
+extern void VaatiArm(Entity*);
+extern void Dust(Entity*);
+extern void VaatiBall(Entity*);
+extern void Octorok(Entity*);
+extern void Slime(Entity*);
+extern void MiniSlime(Entity*);
+extern void FireballGuy(Entity*);
+extern void MiniFireballGuy(Entity*);
+extern void Enemy5A(Entity*);
+extern void BusinessScrubPrologue(Entity*);
+extern void GyorgFemale(Entity*);
+extern void GyorgMale(Entity*);
+extern void Curtain(Entity*);
+extern void Enemy5F(Entity*);
+extern void GyorgChild(Entity*);
+extern void GyorgFemaleEye(Entity*);
+extern void Enemy62(Entity*);
+extern void GyorgFemaleMouth(Entity*);
+extern void Enemy64(Entity*);
+extern void TreeItem(Entity*);
+extern void Enemy66(Entity*);
 #endif
\ No newline at end of file
diff --git a/include/entity.h b/include/entity.h
index 7a6618e2..0edf7fa0 100644
--- a/include/entity.h
+++ b/include/entity.h
@@ -28,7 +28,7 @@ union SplitHWord {
     struct {
         u8 LO, HI;
     } PACKED HALF;
-};
+} PACKED;
 
 typedef struct Entity {
     u32* field_0x0;
@@ -130,7 +130,7 @@ typedef struct Entity {
     u32* otherEntity;
     u8 field_0x68;
     u8 field_0x69;
-    u16 field_0x6a;
+    union SplitHWord field_0x6a;
     u8 field_0x6c;
     u8 field_0x6d;
     u8 filler4[6];
diff --git a/include/functions.h b/include/functions.h
index 79464b11..b1932d28 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -19,6 +19,7 @@ extern void DeleteEntity(Entity*);
 extern u32 __modsi3(u32, u32);
 extern void DoFade(u32, u32);
 extern void UpdateAnimationSingleFrame(Entity*);
+extern u32 GetInventoryValue(u32);
 
 // Unidentified
 extern void sub_0806ED78(Entity*);
@@ -52,15 +53,10 @@ extern void sub_0807DD50(Entity*);
 extern void sub_0807DD94(Entity*, u32);
 extern Entity* sub_0805EB00(u32, u32, u32);
 extern Entity* sub_0805EB2C(u32, u32, u32, u32, u32);
-
-extern u32 sub_080045C4(Entity*, Entity*);
-extern u32 sub_0801E99C(Entity*);
-extern void sub_0805E3A0(Entity*, u32);
-extern Entity* sub_0805EB00(u32, u32, u32);
-extern u32 sub_0806F5A4(u32);
-extern void sub_08078778(Entity*);
-extern void sub_08078784(Entity*, u32);
-extern void sub_0807DD50(Entity*);
-extern void sub_0807DD94(Entity*, u32);
-
+extern u32 sub_0806FDEC(Entity*, u32*);
+extern s32 sub_0806ED9C(Entity*, u32, u32);
+extern s32* sub_0807DAD0(Entity*, u8*);
+extern void sub_0806FF60(Entity*, u32, u32);
+extern void sub_0806FF88(Entity*, u32, u32);
+extern void sub_0807000C(Entity*);
 #endif
\ No newline at end of file
diff --git a/include/textbox.h b/include/textbox.h
index a25e0723..a15867b6 100644
--- a/include/textbox.h
+++ b/include/textbox.h
@@ -18,4 +18,6 @@ typedef struct {
 
 extern TextBox gTextBox;
 
+void TextboxNoOverlap(u32 index, Entity* ent);
+
 #endif
\ No newline at end of file