Extract entity definitions

src/npc/bigGoron.c

@@ -30,7 +30,7 @@ extern u32 gUnk_0200B650;
 void sub_0806D110(void);
 void sub_0806D164(Entity* this);
 
-extern Hitbox gUnk_080FD180;
+extern Hitbox gHitbox_3;
 Entity* sub_0806D00C(Entity* this);
 
 void sub_0806D4C0(Entity*, u32);
@@ -238,7 +238,7 @@ void sub_0806D3C0(Entity* this) {
             DeleteThisEntity();
         }
         this->action = 1;
-        this->hitbox = &gUnk_080FD180;
+        this->hitbox = &gHitbox_3;
         sub_0805E3A0(this, 2);
         sub_0807DD64(this);
     } else {

src/npc/npc4E.c

@@ -8,7 +8,7 @@
 #include "flags.h"
 #include "object.h"
 
-extern Hitbox gUnk_080FD170;
+extern Hitbox gHitbox_2;
 typedef struct {
     u32 unk_00;
     s8 unk_04;
@@ -35,7 +35,7 @@ void NPC4E(Entity* this) {
     if (this->action == 0) {
         this->action = 1;
         this->spriteSettings.b.draw = 4;
-        this->hitbox = &gUnk_080FD170;
+        this->hitbox = &gHitbox_2;
         sub_0807DD50(this);
     } else {
         sub_0807DD94(this, 0);

src/npc/npc5.c

@@ -25,7 +25,7 @@ typedef struct {
     u16 unk_8; // u16
 } UnkHeap;
 
-extern Hitbox gUnk_080FD150;
+extern Hitbox gHitbox_0;
 
 void sub_08060E70(Entity*, u32);
 
@@ -140,7 +140,7 @@ void sub_08060AE0(Entity* this) {
         this->field_0x40 = 0x48;
         this->damageType = 0x49;
         this->flags2 = 3;
-        this->hitbox = &gUnk_080FD150;
+        this->hitbox = &gHitbox_0;
         this->field_0x17 &= 0xfe;
         this->field_0x6c.HALF.LO = 0xff;
         sub_08060E70(this, this->animationState);

src/npc/picolyteBottle.c

@@ -13,7 +13,7 @@ extern void (*const gUnk_081142BC[])(Entity*);
 
 extern void sub_08078828(Entity*);
 
-extern Hitbox gUnk_080FD150;
+extern Hitbox gHitbox_0;
 
 void PicolyteBottle(Entity* this) {
     gUnk_081142BC[this->action](this);
@@ -42,7 +42,7 @@ void sub_0806DF00(Entity* this) {
         sub_0806E014(this);
         sub_0807DD50(this);
     } else {
-        this->hitbox = &gUnk_080FD150;
+        this->hitbox = &gHitbox_0;
         this->collisionLayer = 1;
         sub_0806E0DC(this);
     }