diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 4 | ||||
| -rw-r--r-- | include/greatFairy.h | 2 | ||||
| -rw-r--r-- | include/item.h | 2 | ||||
| -rw-r--r-- | include/npc.h | 2 | ||||
| -rw-r--r-- | include/object.h | 2 | ||||
| -rw-r--r-- | include/player.h (renamed from include/link.h) | 12 | ||||
| -rw-r--r-- | include/structures.h | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/include/functions.h b/include/functions.h index 27050f59..98282908 100644 --- a/include/functions.h +++ b/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 @@ -198,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); diff --git a/include/greatFairy.h b/include/greatFairy.h index 1a65fd1c..3ceb31b2 100644 --- a/include/greatFairy.h +++ b/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; diff --git a/include/item.h b/include/item.h index d276b5fa..7546d84f 100644 --- a/include/item.h +++ b/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); diff --git a/include/npc.h b/include/npc.h index 103df393..4551b756 100644 --- a/include/npc.h +++ b/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 diff --git a/include/object.h b/include/object.h index b24a30d2..5a2e66cb 100644 --- a/include/object.h +++ b/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*); diff --git a/include/link.h b/include/player.h index 5a7a73a2..f3c49bfd 100644 --- a/include/link.h +++ b/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]; @@ -56,7 +56,7 @@ typedef struct { /*0xa8*/ u8 field_0xa8[3]; /*0xab*/ u8 field_0xab; /*0xac*/ u32 field_0xac; -} LinkState; +} PlayerState; typedef struct { @@ -94,9 +94,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); diff --git a/include/structures.h b/include/structures.h index 73bbd510..e44f6f76 100644 --- a/include/structures.h +++ b/include/structures.h @@ -3,7 +3,7 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" typedef struct { char header[4]; |