mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-09 23:01:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #292 from nonmatch/patch-27

Browse Source
This commit is contained in:
notyourav
2022-01-12 10:40:29 -08:00
committed by GitHub
parent cb50175d59 b71a46546a
commit 40f6a15e1f
2 changed files with 3 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/vaatiArm.c
+3 -4
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;