Merge branch 'master' into demo-jp

src/npc/din.c

@@ -5,8 +5,6 @@
 #include "functions.h"
 #include "save.h"
 
-extern u32 sub_08002632(Entity*);
-
 void Din(Entity* this) {
     switch (this->action) {
         case 0:

src/npc/guard.c

@@ -85,8 +85,8 @@ void sub_08063DC8(Entity* this) {
         InitAnimationForceUpdate(this, this->animationState + 4);
     } else {
         sub_0806EE20(this);
-        if (this->field_0x3e != this->animationState) {
-            this->animationState = this->field_0x3e;
+        if (this->knockbackDirection != this->animationState) {
+            this->animationState = this->knockbackDirection;
             InitializeAnimation(this, this->animationState + 4);
         } else {
             GetNextFrame(this);

src/npc/postman.c

@@ -67,7 +67,7 @@ void sub_0806045C(Entity* this) {
             TextboxNoOverlapFollow(0);
             break;
         default:
-            bVar1 = this->field_0x3e;
+            bVar1 = this->knockbackDirection;
             if (bVar1 != this->animationState) {
                 this->animationState = bVar1;
                 InitAnimationForceUpdate(this, 4 + bVar1);