resolve conflicts with master

include/functions.h

@@ -5,7 +5,7 @@
 #include "global.h"
 #include "entity.h"
 #include "position.h"
-#include "link.h"
+#include "player.h"
 #include "structures.h"
 
 // Identified - to be sorted into header files
@@ -41,6 +41,7 @@ extern void CopyPositionAndSpriteOffset(Entity*, Entity*);
 extern u8* GetSpriteSubEntryOffsetDataPointer(u32, u32);
 extern u32 LoadFixedGFX(Entity*, u32);
 extern void ExecuteScriptCommandSet(Entity*, void *);
+extern void _DmaFill32(u32, void*, u32);
 
 // Unidentified
 extern void sub_0806ED78(Entity*);
@@ -197,7 +198,7 @@ extern void sub_08001290(Entity*, u32);
 extern void sub_08004488(u32);
 extern void sub_08004596(Entity*, u32);
 extern u32 sub_0807953C(void);
-extern void ResetLink(void);
+extern void ResetPlayer(void);
 extern void sub_080A29BC(Entity*);
 extern void sub_080AE068(Entity*);
 extern Entity* sub_0805E8D4(void);
@@ -228,4 +229,6 @@ extern u32 sub_0806F3E4(Entity*);
 extern void sub_0804A7D4(Entity*);
 extern void sub_08033744(Entity*);
 extern void sub_0800417E(Entity*, u32);
+extern void sub_080784C8();
+extern void sub_08017640();
 #endif

include/greatFairy.h

@@ -35,7 +35,7 @@ extern void (*const gUnk_081207A4[])(Entity*);
 
 extern u32 gUnk_0810C2E4;
 extern RoomControls gRoomControls;
-extern Entity gLinkEntity;
+extern Entity gPlayerEntity;
 extern const s16 GreatFairy_RippleOffsets[10];
 extern u32 gUnk_02034350;
 extern RoomVars gRoomVars;

include/item.h

@@ -3,7 +3,7 @@
 
 #include "global.h"
 #include "entity.h"
-#include "link.h"
+#include "player.h"
 
 void extern DebugItem(ItemBehavior*, u32);
 void extern Sword(ItemBehavior*, u32);

include/npc.h

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "entity.h"
-#include "link.h"
+#include "player.h"
 
 #ifndef NPC_H
 #define NPC_H

include/object.h

@@ -64,7 +64,7 @@ extern void JarPortal(Entity*);
 extern void BossDoor(Entity*);
 extern void Object3A(Entity*);
 extern void MacroMushromStalks(Entity*);
-extern void MacroLink(Entity*);
+extern void MacroPlayer(Entity*);
 extern void Object3D(Entity*);
 extern void Object3E(Entity*);
 extern void GiantLeaf(Entity*);

include/player.h

@@ -1,7 +1,7 @@
 // clang-format off
 
-#ifndef LINK_H
-#define LINK_H
+#ifndef PLAYER_H
+#define PLAYER_H
 
 #include "global.h"
 #include "entity.h"
@@ -16,7 +16,7 @@ typedef struct {
     /*0x08*/ u16 field_0x8;
     /*0x0a*/ u8 field_0xa;
     /*0x0b*/ u8 keepFacing;
-    /*0x0c*/ u8 linkAction;
+    /*0x0c*/ u8 playerAction;
     /*0x0d*/ u8 field_0xd[2];
     /*0x0f*/ u8 hurtBlinkSpeed;
     /*0x10*/ u8 field_0x10[4];
@@ -58,7 +58,7 @@ typedef struct {
     /*0xa8*/ u8 field_0xa8[3];
     /*0xab*/ u8 field_0xab;
     /*0xac*/ u32 field_0xac;
-} LinkState;
+} PlayerState;
 
 
 typedef struct {
@@ -96,9 +96,9 @@ typedef struct {
 
 extern u8 gBombBagSizes[];
 
-extern LinkState gLinkState;
+extern PlayerState gPlayerState;
 extern Stats gStats;
-extern Entity gLinkEntity;
+extern Entity gPlayerEntity;
 
 
 extern u32 GetInventoryValue(u32);

include/structures.h

@@ -3,7 +3,7 @@
 
 #include "global.h"
 #include "entity.h"
-#include "link.h"
+#include "player.h"
 
 typedef struct {
     char header[4];
@@ -62,7 +62,8 @@ typedef struct {
     u8 playerState;
     u8 field_0xf;
     Coords playerStartPos;
-    u16 playerLayer;
+    u8 playerLayer;
+    u8 field_0x13;
     u8 field_0x14[0xa];
     u16 field_0x20;
     u16 field_0x22;