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

Merge pull request #292 from nonmatch/patch-27

This commit is contained in:
notyourav 2022-01-12 10:40:29 -08:00 committed by GitHub
parent cb50175d59 b71a46546a
commit 40f6a15e1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
asm/non_matching/vaati/sub_08043770.inc
View File

@ -1,58 +0,0 @@
.syntax unified
push {r4, r5, lr}
adds r2, r0, #0
ldrb r0, [r2, #0xe]
subs r0, #1
strb r0, [r2, #0xe]
lsls r0, r0, #0x18
lsrs r4, r0, #0x18
cmp r4, #0
bne _080437D8
ldr r0, [r2, #0x64]
ldr r3, [r0, #0x14]
ldr r0, _080437AC @ =gRoomTransition
adds r5, r0, #0
adds r5, #0x39
ldrb r1, [r5]
movs r0, #0xc
ands r0, r1
cmp r0, #0
bne _0804379A
movs r0, #2
strb r0, [r3, #0xd]
_0804379A:
ldrb r0, [r2, #0xb]
cmp r0, #0
bne _080437B0
ldr r0, [r3, #0x64]
str r4, [r0, #0x14]
ldrb r1, [r5]
movs r0, #0xfe
b _080437B8
.align 2, 0
_080437AC: .4byte gRoomTransition
_080437B0:
ldr r0, [r3, #0x64]
str r4, [r0, #0x18]
ldrb r1, [r5]
movs r0, #0xfd
_080437B8:
ands r0, r1
strb r0, [r5]
ldr r0, [r2, #0x64]
ldr r0, [r0, #0x10]
movs r1, #0
str r1, [r0, #0x64]
ldr r0, [r2, #0x64]
ldr r0, [r0, #0x10]
adds r0, #0x45
strb r1, [r0]
ldr r1, [r2, #0x68]
ldr r0, [r2, #0x64]
ldr r0, [r0, #0x10]
str r0, [r1, #0x50]
bl DeleteThisEntity
_080437D8:
pop {r4, r5, pc}
.align 2, 0
.syntax divided

7
src/enemy/vaatiArm.c
View File

@ -1081,7 +1081,7 @@ void sub_08043738(Entity* this) {
deleteThing(this, 3);
}
NONMATCH("asm/non_matching/vaati/sub_08043770.inc", void sub_08043770(Entity* this)) {
void sub_08043770(Entity* this) {
Entity* entity;
if (--this->actionDelay == 0) {
@ -1090,10 +1090,10 @@ NONMATCH("asm/non_matching/vaati/sub_08043770.inc", void sub_08043770(Entity* th
entity->subAction = 2;
}
if (this->type2 == 0) {
((VaatiArm_HeapStruct*)this->myHeap)->parent = NULL;
((VaatiArm_HeapStruct*)entity->myHeap)->parent = NULL;
gRoomTransition.field_0x39 &= 0xfe;
} else {
*(u32*)((VaatiArm_HeapStruct*)this->myHeap)->s1 = 0;
*(u32*)((VaatiArm_HeapStruct*)entity->myHeap)->s1 = 0;
gRoomTransition.field_0x39 &= 0xfd;
}
((VaatiArm_HeapStruct*)this->myHeap)->entities[4]->myHeap = NULL;
@ -1102,7 +1102,6 @@ NONMATCH("asm/non_matching/vaati/sub_08043770.inc", void sub_08043770(Entity* th
DeleteThisEntity();
}
}
END_NONMATCH
u32 sub_080437DC(Entity* this) {
u16 temp;