add subdirs

74 files changed, 58 insertions, 0 deletions

diff --git a/src/bladeTrap.c b/src/enemy/bladeTrap.c
index 3c37d08a..3c37d08a 100644
--- a/src/bladeTrap.c
+++ b/src/enemy/bladeTrap.c
diff --git a/src/bombPeahat.c b/src/enemy/bombPeahat.c
index 3921737a..3921737a 100644
--- a/src/bombPeahat.c
+++ b/src/enemy/bombPeahat.c
diff --git a/src/bowMoblin.c b/src/enemy/bowMoblin.c
index 6c7620d6..6c7620d6 100644
--- a/src/bowMoblin.c
+++ b/src/enemy/bowMoblin.c
diff --git a/src/hangingSeed.c b/src/enemy/hangingSeed.c
index 7f0ba1dc..7f0ba1dc 100644
--- a/src/hangingSeed.c
+++ b/src/enemy/hangingSeed.c
diff --git a/src/keese.c b/src/enemy/keese.c
index 0cbc9acd..0cbc9acd 100644
--- a/src/keese.c
+++ b/src/enemy/keese.c
diff --git a/src/lakitu.c b/src/enemy/lakitu.c
index 9189c525..9189c525 100644
--- a/src/lakitu.c
+++ b/src/enemy/lakitu.c
diff --git a/src/lakituCloud.c b/src/enemy/lakituCloud.c
index 0dca3465..0dca3465 100644
--- a/src/lakituCloud.c
+++ b/src/enemy/lakituCloud.c
diff --git a/src/miniFireballGuy.c b/src/enemy/miniFireballGuy.c
index d7bdc540..d7bdc540 100644
--- a/src/miniFireballGuy.c
+++ b/src/enemy/miniFireballGuy.c
diff --git a/src/octorok.c b/src/enemy/octorok.c
index ff699ec0..ff699ec0 100644
--- a/src/octorok.c
+++ b/src/enemy/octorok.c
diff --git a/src/slime.c b/src/enemy/slime.c
index 42a5d952..42a5d952 100644
--- a/src/slime.c
+++ b/src/enemy/slime.c
diff --git a/src/smallPesto.c b/src/enemy/smallPesto.c
index c29fe80c..c29fe80c 100644
--- a/src/smallPesto.c
+++ b/src/enemy/smallPesto.c
diff --git a/src/manager1.c b/src/manager/manager1.c
index ba556db0..ba556db0 100644
--- a/src/manager1.c
+++ b/src/manager/manager1.c
diff --git a/src/manager2.c b/src/manager/manager2.c
index 707c13d1..707c13d1 100644
--- a/src/manager2.c
+++ b/src/manager/manager2.c
diff --git a/src/manager27.c b/src/manager/manager27.c
index db5bd8b6..db5bd8b6 100644
--- a/src/manager27.c
+++ b/src/manager/manager27.c
diff --git a/src/manager2E.c b/src/manager/manager2E.c
index 3e528098..3e528098 100644
--- a/src/manager2E.c
+++ b/src/manager/manager2E.c
diff --git a/src/bigGoron.c b/src/npc/bigGoron.c
index 0d6b9f3f..0d6b9f3f 100644
--- a/src/bigGoron.c
+++ b/src/npc/bigGoron.c
diff --git a/src/bladeBrothers.c b/src/npc/bladeBrothers.c
index 68630e8e..68630e8e 100644
--- a/src/bladeBrothers.c
+++ b/src/npc/bladeBrothers.c
diff --git a/src/carpenter.c b/src/npc/carpenter.c
index b0608f6d..b0608f6d 100644
--- a/src/carpenter.c
+++ b/src/npc/carpenter.c
diff --git a/src/cat.c b/src/npc/cat.c
index 1ec7df88..1ec7df88 100644
--- a/src/cat.c
+++ b/src/npc/cat.c
diff --git a/src/clothesRack.c b/src/npc/clothesRack.c
index 9dd18b37..9dd18b37 100644
--- a/src/clothesRack.c
+++ b/src/npc/clothesRack.c
diff --git a/src/cow.c b/src/npc/cow.c
index 633334b1..633334b1 100644
--- a/src/cow.c
+++ b/src/npc/cow.c
diff --git a/src/dampe.c b/src/npc/dampe.c
index b7947c32..b7947c32 100644
--- a/src/dampe.c
+++ b/src/npc/dampe.c
diff --git a/src/emma.c b/src/npc/emma.c
index c43b961c..c43b961c 100644
--- a/src/emma.c
+++ b/src/npc/emma.c
diff --git a/src/epona.c b/src/npc/epona.c
index 617867b6..617867b6 100644
--- a/src/epona.c
+++ b/src/npc/epona.c
diff --git a/src/festari.c b/src/npc/festari.c
index ff64ccd6..ff64ccd6 100644
--- a/src/festari.c
+++ b/src/npc/festari.c
diff --git a/src/forestMinish.c b/src/npc/forestMinish.c
index 29a4ea6a..29a4ea6a 100644
--- a/src/forestMinish.c
+++ b/src/npc/forestMinish.c
diff --git a/src/gentari.c b/src/npc/gentari.c
index f41a7438..f41a7438 100644
--- a/src/gentari.c
+++ b/src/npc/gentari.c
diff --git a/src/goron.c b/src/npc/goron.c
index b65e97ea..b65e97ea 100644
--- a/src/goron.c
+++ b/src/npc/goron.c
diff --git a/src/guard.c b/src/npc/guard.c
index 765a89dd..765a89dd 100644
--- a/src/guard.c
+++ b/src/npc/guard.c
diff --git a/src/mailbox.c b/src/npc/mailbox.c
index 1aca5a34..1aca5a34 100644
--- a/src/mailbox.c
+++ b/src/npc/mailbox.c
diff --git a/src/malon.c b/src/npc/malon.c
index de484cc4..de484cc4 100644
--- a/src/malon.c
+++ b/src/npc/malon.c
diff --git a/src/milkCart.c b/src/npc/milkCart.c
index b423dca7..b423dca7 100644
--- a/src/milkCart.c
+++ b/src/npc/milkCart.c
diff --git a/src/mutoh.c b/src/npc/mutoh.c
index b50ff552..b50ff552 100644
--- a/src/mutoh.c
+++ b/src/npc/mutoh.c
diff --git a/src/postman.c b/src/npc/postman.c
index b3a51dba..b3a51dba 100644
--- a/src/postman.c
+++ b/src/npc/postman.c
diff --git a/src/rem.c b/src/npc/rem.c
index 2edd917e..2edd917e 100644
--- a/src/rem.c
+++ b/src/npc/rem.c
diff --git a/src/simon.c b/src/npc/simon.c
index 4e01af67..4e01af67 100644
--- a/src/simon.c
+++ b/src/npc/simon.c
diff --git a/src/smith.c b/src/npc/smith.c
index 061d3c40..061d3c40 100644
--- a/src/smith.c
+++ b/src/npc/smith.c
diff --git a/src/stamp.c b/src/npc/stamp.c
index db1d7310..db1d7310 100644
--- a/src/stamp.c
+++ b/src/npc/stamp.c
diff --git a/src/syrup.c b/src/npc/syrup.c
index 341c60c8..341c60c8 100644
--- a/src/syrup.c
+++ b/src/npc/syrup.c
diff --git a/src/talon.c b/src/npc/talon.c
index 01449c06..01449c06 100644
--- a/src/talon.c
+++ b/src/npc/talon.c
diff --git a/src/teachers.c b/src/npc/teachers.c
index a82bdadd..a82bdadd 100644
--- a/src/teachers.c
+++ b/src/npc/teachers.c
diff --git a/src/townMinish.c b/src/npc/townMinish.c
index c47a2a3f..c47a2a3f 100644
--- a/src/townMinish.c
+++ b/src/npc/townMinish.c
diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c
new file mode 100644
index 00000000..454474cb
--- /dev/null
+++ b/src/npc/townsperson.c
@@ -0,0 +1,58 @@
+#include "global.h"
+#include "entity.h"
+#include "npc.h"
+#include "link.h"
+#include "textbox.h"
+
+extern void (*const gUnk_0810B774[])(Entity*);
+extern void (*const gUnk_0810B77C[])(Entity*);
+extern void sub_08061CB4(Entity*, u32);
+extern u32 sub_0806ED9C(Entity*, u32, u32);
+extern void sub_0806ED78(Entity*);
+
+extern SpriteLoadData* gUnk_0810B6EC[];
+
+void Townsperson(Entity *this)
+{
+  if ((this->flags & 2) != 0) {
+    gUnk_0810B77C[this->action](this);
+  }
+  else {
+    gUnk_0810B774[this->action](this);
+  }
+}
+
+void sub_08061BC8(Entity *this)
+{  
+  if (LoadExtraSpriteData(this, gUnk_0810B6EC[this->entityType.form])) {
+    this->animationState = 2;
+    this->field_0xf = this->entityType.form + 1;
+    this->action++;
+    sub_08061CB4(this, 2);
+  }
+}
+
+void sub_08061C00(Entity *this)
+{
+  s32 uVar1;
+  
+  uVar1 = sub_0806ED9C(this, 0x20, 0x20);
+  if (uVar1 < 0) {
+    uVar1 = this->animationState + 4;
+  }
+  else {
+    if (this->field_0xf == 0) {
+      this->field_0xf = 0x10;
+    }
+    else {
+      this->field_0xf--;
+      uVar1 = this->animIndex & 3;
+    }
+  }
+  sub_08061CB4(this, uVar1);
+  sub_0806ED78(this);
+  if (this->interactType != 0) {
+    this->interactType = 0;
+    TextboxNoOverlapFollow(this->entityType.parameter + 0xa01);
+  }
+}
\ No newline at end of file
diff --git a/src/wheaton.c b/src/npc/wheaton.c
index 06285482..06285482 100644
--- a/src/wheaton.c
+++ b/src/npc/wheaton.c
diff --git a/src/windTribespeople.c b/src/npc/windTribespeople.c
index d01f22d4..d01f22d4 100644
--- a/src/windTribespeople.c
+++ b/src/npc/windTribespeople.c
diff --git a/src/zelda.c b/src/npc/zelda.c
index 2ba8bf28..2ba8bf28 100644
--- a/src/zelda.c
+++ b/src/npc/zelda.c
diff --git a/src/archway.c b/src/object/archway.c
index ff6c7b14..ff6c7b14 100644
--- a/src/archway.c
+++ b/src/object/archway.c
diff --git a/src/bell.c b/src/object/bell.c
index 072b0798..072b0798 100644
--- a/src/bell.c
+++ b/src/object/bell.c
diff --git a/src/chestSpawner.c b/src/object/chestSpawner.c
index 8af7769d..8af7769d 100644
--- a/src/chestSpawner.c
+++ b/src/object/chestSpawner.c
diff --git a/src/cloud.c b/src/object/cloud.c
index 734559c4..734559c4 100644
--- a/src/cloud.c
+++ b/src/object/cloud.c
diff --git a/src/fan.c b/src/object/fan.c
index 481e3887..481e3887 100644
--- a/src/fan.c
+++ b/src/object/fan.c
diff --git a/src/giantLeaf.c b/src/object/giantLeaf.c
index 9003f28b..9003f28b 100644
--- a/src/giantLeaf.c
+++ b/src/object/giantLeaf.c
diff --git a/src/greatFairy.c b/src/object/greatFairy.c
index 2f3276b9..2f3276b9 100644
--- a/src/greatFairy.c
+++ b/src/object/greatFairy.c
diff --git a/src/heartContainer.c b/src/object/heartContainer.c
index 10714a8e..10714a8e 100644
--- a/src/heartContainer.c
+++ b/src/object/heartContainer.c
diff --git a/src/lightableSwitch.c b/src/object/lightableSwitch.c
index 2368da04..2368da04 100644
--- a/src/lightableSwitch.c
+++ b/src/object/lightableSwitch.c
diff --git a/src/mask.c b/src/object/mask.c
index 6dd866c9..6dd866c9 100644
--- a/src/mask.c
+++ b/src/object/mask.c
diff --git a/src/metalDoor.c b/src/object/metalDoor.c
index 1f18a272..1f18a272 100644
--- a/src/metalDoor.c
+++ b/src/object/metalDoor.c
diff --git a/src/mineralWaterSource.c b/src/object/mineralWaterSource.c
index c874530b..c874530b 100644
--- a/src/mineralWaterSource.c
+++ b/src/object/mineralWaterSource.c
diff --git a/src/minishSizedEntrance.c b/src/object/minishSizedEntrance.c
index ca261d35..ca261d35 100644
--- a/src/minishSizedEntrance.c
+++ b/src/object/minishSizedEntrance.c
diff --git a/src/object1A.c b/src/object/object1A.c
index f7d9e469..f7d9e469 100644
--- a/src/object1A.c
+++ b/src/object/object1A.c
diff --git a/src/object1C.c b/src/object/object1C.c
index 16c20816..16c20816 100644
--- a/src/object1C.c
+++ b/src/object/object1C.c
diff --git a/src/object1D.c b/src/object/object1D.c
index 1912facb..1912facb 100644
--- a/src/object1D.c
+++ b/src/object/object1D.c
diff --git a/src/object49.c b/src/object/object49.c
index d9551953..d9551953 100644
--- a/src/object49.c
+++ b/src/object/object49.c
diff --git a/src/object86.c b/src/object/object86.c
index 979ab47a..979ab47a 100644
--- a/src/object86.c
+++ b/src/object/object86.c
diff --git a/src/object9E.c b/src/object/object9E.c
index 4c770e82..4c770e82 100644
--- a/src/object9E.c
+++ b/src/object/object9E.c
diff --git a/src/objectA8.c b/src/object/objectA8.c
index b68a141a..b68a141a 100644
--- a/src/objectA8.c
+++ b/src/object/objectA8.c
diff --git a/src/railtrack.c b/src/object/railtrack.c
index 95c418f4..95c418f4 100644
--- a/src/railtrack.c
+++ b/src/object/railtrack.c
diff --git a/src/smoke.c b/src/object/smoke.c
index b4c83115..b4c83115 100644
--- a/src/smoke.c
+++ b/src/object/smoke.c
diff --git a/src/swordsmanNewsletter.c b/src/object/swordsmanNewsletter.c
index 414ac180..414ac180 100644
--- a/src/swordsmanNewsletter.c
+++ b/src/object/swordsmanNewsletter.c
diff --git a/src/thoughtBubble.c b/src/object/thoughtBubble.c
index 73316eca..73316eca 100644
--- a/src/thoughtBubble.c
+++ b/src/object/thoughtBubble.c
diff --git a/src/treeHidingPortal.c b/src/object/treeHidingPortal.c
index 8ea54861..8ea54861 100644
--- a/src/treeHidingPortal.c
+++ b/src/object/treeHidingPortal.c
diff --git a/src/well.c b/src/object/well.c
index 9efcd750..9efcd750 100644
--- a/src/well.c
+++ b/src/object/well.c
diff --git a/src/windTribeFlag.c b/src/object/windTribeFlag.c
index f9c82da8..f9c82da8 100644
--- a/src/windTribeFlag.c
+++ b/src/object/windTribeFlag.c
diff --git a/src/windcrest.c b/src/object/windcrest.c
index 231eb425..231eb425 100644
--- a/src/windcrest.c
+++ b/src/object/windcrest.c