summaryrefslogtreecommitdiff
path: root/src/manager
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2020-08-08 14:59:11 -0700
committertheo3 <arisstephenson2@gmail.com>2020-08-08 14:59:11 -0700
commitac67812a254a71f6face762b96a2849ef4e9ea76 (patch)
tree91f3b89b091c267ddf7dc173b08e13d9f80e0320 /src/manager
parent0cb4a64f67e94bcdd9c511ae30a422839a5f173b (diff)
renamed all occurences of "link" to "player"
Diffstat (limited to 'src/manager')
-rw-r--r--src/manager/manager6.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/manager/manager6.c b/src/manager/manager6.c
index deb44026..7914a224 100644
--- a/src/manager/manager6.c
+++ b/src/manager/manager6.c
@@ -1,6 +1,6 @@
#include "global.h"
#include "entity.h"
-#include "link.h"
+#include "player.h"
#include "manager.h"
extern void* GetCurrentRoomProperty(u8);
@@ -19,13 +19,13 @@ void sub_08057CB4(Entity * this) {
return;
}
}
- if (this->actionDelay == 0 || gLinkState.field_0x10[2] == 0x1e) {
+ if (this->actionDelay == 0 || gPlayerState.field_0x10[2] == 0x1e) {
for (i = ((UnkManagerHelperStruct*) this->field_0x20);i->field_0x00 != 0xFFFF; i++) {
tmp = (i->field_0x07.all & 0x3);
- if (((tmp & (gLinkEntity.collisionLayer)) != 0) &&
- (((gLinkState.flags.all & 0x80) != 0) || ((i->field_0x07.b.unk2) != 0)) &&
+ if (((tmp & (gPlayerEntity.collisionLayer)) != 0) &&
+ (((gPlayerState.flags.all & 0x80) != 0) || ((i->field_0x07.b.unk2) != 0)) &&
(CheckPlayerInRegion(i->field_0x00,i->field_0x02,i->field_0x04,i->field_0x05) != 0) &&
- (gLinkEntity.height.HALF.HI == 0)) {
+ (gPlayerEntity.height.HALF.HI == 0)) {
DoExitTransition(GetCurrentRoomProperty(i->field_0x06));
}
}