falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LinkState members renamed for conformancy

This commit is contained in:
theo3 2020-07-14 16:54:35 -07:00
parent f9bdae5fe6
commit fc0727243d
7 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
include/link.h
View File

@ -7,27 +7,27 @@
#include "entity.h"
typedef struct {
/*0x00*/ u8 filler[2];
/*0x00*/ u8 field_0x0[2];
/*0x02*/ u8 jumpStatus;
/*0x03*/ u8 filler2[2];
/*0x03*/ u8 field_0x3[2];
/*0x05*/ u8 heldObject;
/*0x06*/ u8 pushedObject;
/*0x07*/ u8 unk;
/*0x08*/ u16 unk2;
/*0x0a*/ u8 unk3;
/*0x07*/ u8 field_0x7;
/*0x08*/ u16 field_0x8;
/*0x0a*/ u8 field_0xa;
/*0x0b*/ u8 keepFacing;
/*0x0c*/ u8 linkAction;
/*0x0d*/ u8 filler3[2];
/*0x0d*/ u8 field_0xd[2];
/*0x0f*/ u8 hurtBlinkSpeed;
/*0x10*/ u8 filler4[4];
/*0x14*/ u16 filler5[3];
/*0x1a*/ u8 filler6[2];
/*0x10*/ u8 field_0x10[4];
/*0x14*/ u16 field_0x14[3];
/*0x1a*/ u8 field_0x1a[2];
/*0x1c*/ u8 field_0x1c;
/*0x1d*/ u8 filler9[5];
/*0x22*/ u16 filler7[2];
/*0x1d*/ u8 field_0x1d[5];
/*0x22*/ u16 field_0x22[2];
/*0x26*/ u8 swimState;
/*0x27*/ u8 filler8[5];
/*0x2c*/ u8* unk4;
/*0x27*/ u8 field_0x27[5];
/*0x2c*/ u8* field_0x2c;
/*0x30*/ union {
/* */ u32 all;
/* */ struct {
@ -41,19 +41,19 @@ typedef struct {
/* */ u32 filler11b : 16;
/* */ } PACKED b;
/* */ } flags;
/*0x34*/ u8 filler12[6];
/*0x3a*/ u16 unk5;
/*0x3c*/ u8 filler13[2];
/*0x34*/ u8 field_0x34[6];
/*0x3a*/ u16 field_0x3a;
/*0x3c*/ u8 field_0x3c[2];
/*0x3e*/ u8 swordGoldParticle : 1;
/* */ u8 swordBlueParticle : 1;
/* */ u8 filler14 : 6;
/*0x3f*/ u8 unk6;
/*0x40*/ u8 filler15[75];
/*0x8b*/ u8 unk7;
/*0x8c*/ u32 filler16[7];
/*0xa8*/ u8 filler17[3];
/*0xab*/ u8 unk71;
/*0xac*/ u32 unk8;
/*0x3f*/ u8 field_0x3f;
/*0x40*/ u8 field_0x40[75];
/*0x8b*/ u8 field_0x8b;
/*0x8c*/ u32 field_0x8c[7];
/*0xa8*/ u8 field_0xa8[3];
/*0xab*/ u8 field_0xab;
/*0xac*/ u32 field_0xac;
} LinkState;

0
src/code_08077B98.c Normal file
View File

2
src/item11.c
View File

@ -59,7 +59,7 @@ void sub_08018CBC(Entity *this)
this->spriteTileSize = 0xa6;
this->palette = 0x33;
this->spriteVramOffset = 0;
(this->entityType).form = gLinkState.filler9[0] - 1;
(this->entityType).form = gLinkState.field_0x1d[0] - 1;
this->actionDelay = gUnk_080B3DE0[(this->entityType).form * 2];
this->field_0x44 = gUnk_080B3DE0[(this->entityType).form * 2 + 1];
this->field_0x40 = 0x1b;

6
src/npc/bladeBrothers.c
View File

@ -358,15 +358,15 @@ void sub_08068E78(Entity* this) {
void sub_08068E90(Entity* this) {
LinkState* s = &gLinkState;
*(u16*)&s->unk8 = (1 << (gUnk_08111740[this->actionDelay] - 1)) | *(u16*)&s->unk8;
*(u16*)&s->field_0xac = (1 << (gUnk_08111740[this->actionDelay] - 1)) | *(u16*)&s->field_0xac;
}
void sub_08068EB4(void) {
gLinkState.unk71 = 0;
gLinkState.field_0xab = 0;
}
void sub_08068EC4(Entity* param_1, Entity* param_2) {
if (gUnk_08111740[param_1->actionDelay] == gLinkState.unk71) {
if (gUnk_08111740[param_1->actionDelay] == gLinkState.field_0xab) {
*(u16*)&param_2->flags = gUnk_0811172A[param_1->actionDelay];
*(u32*)&param_2->animationState = 1;
} else {

2
src/object/cloud.c
View File

@ -131,7 +131,7 @@ void sub_0809F69C(Entity* this) {
void sub_0809F6CC(Entity* this) {
if (((gRoomControls.unk6 & 4) == 0) && (--this->actionDelay == 0)) {
gLinkState.unk7 = 1;
gLinkState.field_0x8b = 1;
DeleteThisEntity();
}
}

2
src/object/object86.c
View File

@ -76,6 +76,6 @@ void sub_08099ECC(Entity *this)
this->previousActionFlag = 1;
CopyPosition(this, &gLinkEntity);
gLinkState.linkAction = 3;
gLinkState.filler12[4] = 0;
gLinkState.field_0x34[4] = 0;
gLinkState.flags.all |= 0x8000;
}

4
src/ocarina.c
View File

@ -42,10 +42,10 @@ void OcarinaUse(ItemBehavior* itemBeh, s32 inputFlags) {
gLinkEntity.flags &= 127;
gLinkEntity.field_0x7a = 2;
gLinkState.flags.all |= 0x10000000;
gLinkState.filler8[0] = 255;
gLinkState.field_0x27[0] = 255;
gUnk_02034490 = 1;
bVar1 = (8 >> inputFlags);
gLinkState.unk3 |= bVar1;
gLinkState.field_0xa |= bVar1;
gLinkState.keepFacing |= bVar1;
sub_08078F60();
sub_08077D38(itemBeh, inputFlags);