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

non-matching guard

This commit is contained in:
Behemoth 2020-08-08 19:17:22 +02:00
parent 10819392f7
commit 50a10e8549
3 changed files with 178 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
asm/non_matching/guard/sub_08063D44.inc
View File

@ -1,69 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
push {r4, lr}
adds r4, r0, #0
ldr r0, _08063DA0 @ =gUnk_03003DBC
ldrb r0, [r0]
cmp r0, #0x46
bhi _08063DC6
ldrb r0, [r4, #9]
movs r1, #0x15
eors r0, r1
rsbs r1, r0, #0
orrs r1, r0
lsrs r1, r1, #0x1f
lsls r1, r1, #4
ldr r0, _08063DA4 @ =gUnk_0810F524
adds r1, r1, r0
adds r0, r4, #0
bl LoadExtraSpriteData
cmp r0, #0
beq _08063DC6
adds r0, r4, #0
movs r1, #4
bl InitializeAnimation
ldr r0, _08063DA8 @ =gUnk_0810F6BC
ldrb r1, [r4, #0xa]
lsls r1, r1, #2
adds r1, r1, r0
ldr r1, [r1]
adds r0, r4, #0
movs r2, #0
bl sub_0806EE04
ldrb r0, [r4, #0xa]
cmp r0, #0
blt _08063DB6
cmp r0, #3
bgt _08063DAC
movs r0, #0xc
bl sub_080A7EE0
str r4, [r0, #0x50]
movs r1, #0x3c
strb r1, [r0, #0xf]
b _08063DB6
.align 2, 0
_08063DA0: .4byte gUnk_03003DBC
_08063DA4: .4byte gUnk_0810F524
_08063DA8: .4byte gUnk_0810F6BC
_08063DAC:
cmp r0, #5
bgt _08063DB6
adds r0, r4, #0
bl sub_08078778
_08063DB6:
ldrb r0, [r4, #0xc]
adds r0, #1
movs r1, #0
strb r0, [r4, #0xc]
strb r1, [r4, #0xa]
adds r0, r4, #0
bl sub_08063DC8
_08063DC6:
pop {r4, pc}
.syntax divided

73
asm/non_matching/guard/sub_08063E90.inc
View File

@ -1,73 +0,0 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #9]
movs r1, #0x15
eors r0, r1
rsbs r1, r0, #0
orrs r1, r0
lsrs r1, r1, #0x1f
lsls r1, r1, #4
ldr r0, _08063EC8 @ =gUnk_0810F524
adds r1, r1, r0
adds r0, r4, #0
bl LoadExtraSpriteData
cmp r0, #0
beq _08063F1E
ldrb r0, [r4, #0xc]
adds r0, #1
strb r0, [r4, #0xc]
ldrb r1, [r4, #0xe]
cmp r1, #0
beq _08063ECC
adds r1, r4, #0
adds r1, #0x70
movs r0, #8
strb r0, [r1]
b _08063ED2
.align 2, 0
_08063EC8: .4byte gUnk_0810F524
_08063ECC:
adds r0, r4, #0
adds r0, #0x70
strb r1, [r0]
_08063ED2:
movs r0, #0
strb r0, [r4, #0xe]
adds r0, r4, #0
bl sub_0805ACC0
adds r2, r0, #0
cmp r2, #0
bne _08063EF2
ldrh r0, [r4, #0x2e]
adds r1, r4, #0
adds r1, #0x68
strh r0, [r1]
ldrh r0, [r4, #0x32]
adds r1, #2
strh r0, [r1]
b _08063EFE
_08063EF2:
lsrs r1, r2, #0x10
adds r0, r4, #0
adds r0, #0x68
strh r1, [r0]
adds r0, #2
strh r2, [r0]
_08063EFE:
adds r1, r4, #0
adds r1, #0x71
movs r0, #0
strb r0, [r1]
subs r1, #0x39
movs r0, #1
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
adds r0, r4, #0
bl sub_0807DD64
adds r0, r4, #0
bl sub_08063F20
_08063F1E:
pop {r4, pc}
.syntax divided

312
src/npc/guard.c
View File

@ -30,6 +30,12 @@ extern u32 sub_0805ACC0(Entity*);
extern void sub_0807DDAC(Entity*, u32); extern void sub_0807DDAC(Entity*, u32);
extern void sub_0807DDE4(Entity*); extern void sub_0807DDE4(Entity*);
extern void sub_0807000C(Entity*); extern void sub_0807000C(Entity*);
extern void sub_0806EE04(Entity*, void*, u32);
extern Entity* sub_080A7EE0(int);
extern void sub_08078778(Entity*);
extern void sub_0807DD64(Entity*);
void sub_08063DC8(Entity*);
void sub_08063F20(Entity*);
extern void (*const gUnk_0810F544[])(Entity*); extern void (*const gUnk_0810F544[])(Entity*);
extern void (*const gUnk_0810F550[])(Entity*); extern void (*const gUnk_0810F550[])(Entity*);
@ -40,157 +46,195 @@ extern SpriteLoadData gUnk_0810F524[];
extern void* gUnk_0810F6BC[]; extern void* gUnk_0810F6BC[];
extern ScreenTransition gScreenTransition; extern ScreenTransition gScreenTransition;
void Guard(Entity *this) void Guard(Entity* this) {
{ if ((this->flags & 2) != 0) {
if ((this->flags & 2) != 0) { gUnk_0810F544[this->action](this);
gUnk_0810F544[this->action](this); } else {
} sub_08063D24(this);
else { }
sub_08063D24(this);
}
} }
void sub_08063D24(Entity *this) void sub_08063D24(Entity* this) {
{ gUnk_0810F550[this->action](this);
gUnk_0810F550[this->action](this); sub_0806ED78(this);
sub_0806ED78(this);
} }
NAKED
void sub_08063D44(Entity* this) { void sub_08063D44(Entity* this) {
asm(".include \"asm/non_matching/guard/sub_08063D44.inc\""); Entity* ent;
} u32 temp, idx;
void sub_08063DC8(Entity *this) if (gUnk_03003DBC > 0x46)
{ return;
if ((this->entityType).form == 0xff) {
this->action = 2; temp = this->entityType.subtype;
this->actionDelay = 0x1e; temp ^= 0x15;
this->animationState = sub_0806F5A4(GetFacingDirection(this,&gLinkEntity)); idx = ((-temp | temp) >> 0x1f) * 4;
InitAnimationForceUpdate(this, this->animationState + 4); if (!LoadExtraSpriteData(this, &gUnk_0810F524[idx]))
} return;
else {
sub_0806EE20(this); InitializeAnimation(this, 4);
if (this->field_0x3e != this->animationState) { sub_0806EE04(this, gUnk_0810F6BC[this->entityType.form], 0);
this->animationState = this->field_0x3e; switch (this->entityType.form) {
InitializeAnimation(this, this->animationState + 4); case 0 ... 3:
ent = sub_080A7EE0(0xc);
ent->parent = this;
ent->field_0xf = 0x3c;
break;
case 4 ... 5:
sub_08078778(this);
break;
} }
else {
GetNextFrame(this);
}
if (this->interactType != 0) {
this->action = 3;
this->interactType = 0;
InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this,&gLinkEntity)));
sub_08064428(this);
}
}
}
void sub_08063E54(Entity *this)
{
if (--this->actionDelay == 0) {
SetRoomFlag(0xf);
}
}
void sub_08063E6C(Entity *this)
{
if ((gTextBox.doTextBox & 0x7f) == 0) {
this->action = 1;
InitializeAnimation(this, this->animationState + 4);
}
}
NAKED
void sub_08063E90(Entity* this) {
asm(".include \"asm/non_matching/guard/sub_08063E90.inc\"");
}
void sub_08063F20(Entity *this)
{
sub_0807DDAC(this, 0);
sub_0807DDE4(this);
GetNextFrame(this);
if (this->interactType != 0) {
this->action++; this->action++;
this->interactType = 0; this->entityType.form = 0;
InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity)) + *(s8 *)&this->field_0x70); sub_08063DC8(this);
sub_08064428(this);
}
} }
void sub_08063F78(Entity *this) void sub_08063DC8(Entity* this) {
{ if ((this->entityType).form == 0xff) {
if ((gTextBox.doTextBox & 0x7f) == 0) { this->action = 2;
this->action = this->action - 1; this->actionDelay = 0x1e;
InitializeAnimation(this,(this->animationState >> 1) + 4 + *(s8 *)&this->field_0x70); this->animationState = sub_0806F5A4(GetFacingDirection(this, &gLinkEntity));
} InitAnimationForceUpdate(this, this->animationState + 4);
} } else {
sub_0806EE20(this);
void Guard_Head(Entity *this) if (this->field_0x3e != this->animationState) {
{ this->animationState = this->field_0x3e;
u8 bVar1; InitializeAnimation(this, this->animationState + 4);
u32 uVar2; } else {
u32 pbVar3; GetNextFrame(this);
u32 uVar4; }
u32 pbVar5; if (this->interactType != 0) {
this->action = 3;
uVar2 = this->frames.all & 0x3f; this->interactType = 0;
pbVar5 = (this->frameIndex & 0x3f); InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity)));
uVar4 = this->frameSpriteSettings & 0x3f; sub_08064428(this);
if ((this->entityType).subtype == 0x15) { }
if ((this->frameIndex & 0x40) != 0) {
pbVar5 = pbVar5 + 0x21;
pbVar3 = 0xffffffff;
uVar4 = 0;
} }
else { }
pbVar3 = (uVar2 + 0x19);
if ((this->frameSpriteSettings & 0x3f) != 0) { void sub_08063E54(Entity* this) {
uVar4 += 0x1f; if (--this->actionDelay == 0) {
} SetRoomFlag(0xf);
} }
} }
else {
pbVar3 = (uVar2 + 0x46); void sub_08063E6C(Entity* this) {
pbVar5 = pbVar5 + 0x2d; if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((this->frameSpriteSettings & 0x3f) != 0) { this->action = 1;
uVar4 += 0x4c; InitializeAnimation(this, this->animationState + 4);
} }
}
uVar4--;
SetExtraSpriteFrame(this, 0, pbVar3);
SetExtraSpriteFrame(this, 1, pbVar5);
SetExtraSpriteFrame(this, 2, uVar4);
SetSpriteSubEntryOffsetData1(this, 1, 0);
SetSpriteSubEntryOffsetData2(this, 1, 2);
sub_0807000C(this);
} }
void sub_08064030(Entity *arg0,Entity *arg1) void sub_08063E90(Entity* this) {
{ Entity* ent;
*(u32*)&arg1->animationState = (-gRoomVars.greatFairyState | gRoomVars.greatFairyState) >> 0x1f; u32 temp, idx;
u32 unk;
temp = this->entityType.subtype;
temp ^= 0x15;
idx = ((-temp | temp) >> 0x1f) * 4;
if (!LoadExtraSpriteData(this, &gUnk_0810F524[idx]))
return;
this->action++;
if (this->actionDelay) {
this->field_0x70.BYTES.byte0 = 8;
} else {
this->field_0x70.BYTES.byte0 = 0;
}
this->actionDelay = 0;
unk = sub_0805ACC0(this);
if (unk == 0) {
this->field_0x68.HWORD = this->x.HALF.HI;
this->field_0x6a.HWORD = this->y.HALF.HI;
} else {
this->field_0x68.HWORD = unk >> 0x10;
this->field_0x6a.HWORD = unk;
}
this->field_0x70.BYTES.byte1 = 0;
this->collisionLayer = 1;
UpdateSpriteForCollisionLayer(this);
sub_0807DD64(this);
sub_08063F20(this);
} }
void sub_08064044(void) void sub_08063F20(Entity* this) {
{ sub_0807DDAC(this, 0);
gScreenTransition.unk = 1; sub_0807DDE4(this);
GetNextFrame(this);
if (this->interactType != 0) {
this->action++;
this->interactType = 0;
InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity)) + *(s8*)&this->field_0x70);
sub_08064428(this);
}
} }
void sub_08064050(Entity *arg0, struct_08064050 *arg1) void sub_08063F78(Entity* this) {
{ if ((gTextBox.doTextBox & 0x7f) == 0) {
u32 unk; this->action = this->action - 1;
InitializeAnimation(this, (this->animationState >> 1) + 4 + *(s8*)&this->field_0x70);
arg1->unk2 = 0; }
switch (arg0->entityType.parameter) { }
case 0x11:
arg1->unk2 = 1; void Guard_Head(Entity* this) {
break; u8 bVar1;
case 0x12: u32 uVar2;
arg1->unk2 = 2; u32 pbVar3;
break; u32 uVar4;
case 0x13: u32 pbVar5;
arg1->unk2 = 3;
} uVar2 = this->frames.all & 0x3f;
pbVar5 = (this->frameIndex & 0x3f);
uVar4 = this->frameSpriteSettings & 0x3f;
if ((this->entityType).subtype == 0x15) {
if ((this->frameIndex & 0x40) != 0) {
pbVar5 = pbVar5 + 0x21;
pbVar3 = 0xffffffff;
uVar4 = 0;
} else {
pbVar3 = (uVar2 + 0x19);
if ((this->frameSpriteSettings & 0x3f) != 0) {
uVar4 += 0x1f;
}
}
} else {
pbVar3 = (uVar2 + 0x46);
pbVar5 = pbVar5 + 0x2d;
if ((this->frameSpriteSettings & 0x3f) != 0) {
uVar4 += 0x4c;
}
}
uVar4--;
SetExtraSpriteFrame(this, 0, pbVar3);
SetExtraSpriteFrame(this, 1, pbVar5);
SetExtraSpriteFrame(this, 2, uVar4);
SetSpriteSubEntryOffsetData1(this, 1, 0);
SetSpriteSubEntryOffsetData2(this, 1, 2);
sub_0807000C(this);
}
void sub_08064030(Entity* arg0, Entity* arg1) {
*(u32*)&arg1->animationState = (-gRoomVars.greatFairyState | gRoomVars.greatFairyState) >> 0x1f;
}
void sub_08064044(void) {
gScreenTransition.unk = 1;
}
void sub_08064050(Entity* arg0, struct_08064050* arg1) {
u32 unk;
arg1->unk2 = 0;
switch (arg0->entityType.parameter) {
case 0x11:
arg1->unk2 = 1;
break;
case 0x12:
arg1->unk2 = 2;
break;
case 0x13:
arg1->unk2 = 3;
}
} }