From a27bcf72c600d9355cafe01b3863fa7756f8a15f Mon Sep 17 00:00:00 2001
From: 21aslade <21aslade@go.dsdmail.net>
Date: Fri, 19 Jun 2020 13:31:59 -0600
Subject: [PATCH] mask.c OK

Not updated to latest changes to header files yet
---
 asm/mask.s       | 255 -----------------------------------------------
 include/entity.h |   4 +-
 linker.ld        |   2 +-
 src/mask.c       | 127 +++++++++++++++++++++++
 4 files changed, 130 insertions(+), 258 deletions(-)
 delete mode 100644 asm/mask.s
 create mode 100644 src/mask.c

diff --git a/asm/mask.s b/asm/mask.s
deleted file mode 100644
index 2b2977dc..00000000
--- a/asm/mask.s
+++ /dev/null
@@ -1,255 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Mask
-Mask: @ 0x0809298C
-	push {lr}
-	ldr r2, _080929A0 @ =gUnk_081227A4
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_080929A0: .4byte gUnk_081227A4
-
-	thumb_func_start sub_080929A4
-sub_080929A4: @ 0x080929A4
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	ldrb r1, [r5, #0xb]
-	movs r6, #0xc0
-	adds r0, r6, #0
-	ands r0, r1
-	cmp r0, #0
-	beq _08092A08
-	adds r4, r5, #0
-	adds r4, #0x86
-	ldrh r0, [r4]
-	bl CheckFlags
-	cmp r0, #0
-	beq _08092A08
-	ldrb r0, [r5, #0xb]
-	adds r1, r6, #0
-	ands r1, r0
-	cmp r1, #0x40
-	beq _080929D2
-	cmp r1, #0x80
-	beq _08092A04
-	b _08092A08
-_080929D2:
-	ldr r0, _080929F4 @ =gUnk_030010A0
-	ldrh r1, [r0, #0xa]
-	movs r0, #0xc1
-	lsls r0, r0, #1
-	cmp r1, r0
-	beq _080929EE
-	cmp r1, r0
-	blt _080929FC
-	ldr r0, _080929F8 @ =0x0000044F
-	cmp r1, r0
-	bgt _080929FC
-	subs r0, #2
-	cmp r1, r0
-	blt _080929FC
-_080929EE:
-	bl DeleteThisEntity
-	b _08092A08
-	.align 2, 0
-_080929F4: .4byte gUnk_030010A0
-_080929F8: .4byte 0x0000044F
-_080929FC:
-	ldrh r0, [r4]
-	bl ClearFlag
-	b _08092A08
-_08092A04:
-	bl DeleteThisEntity
-_08092A08:
-	movs r0, #1
-	strb r0, [r5, #0xc]
-	movs r0, #0xc0
-	lsls r0, r0, #9
-	str r0, [r5, #0x20]
-	bl Random
-	movs r1, #7
-	ands r0, r1
-	lsls r0, r0, #0xa
-	movs r2, #0x80
-	lsls r2, r2, #6
-	adds r1, r2, #0
-	adds r2, r5, #0
-	adds r2, #0x78
-	movs r3, #0
-	orrs r0, r1
-	strh r0, [r2]
-	ldrb r0, [r5, #0xe]
-	lsrs r0, r0, #1
-	strb r0, [r5, #0xf]
-	strb r3, [r5, #0xe]
-	ldrb r1, [r5, #0xb]
-	movs r0, #0x3f
-	ands r0, r1
-	strb r0, [r5, #0x1e]
-	movs r4, #0x2e
-	ldrsh r1, [r5, r4]
-	ldr r2, _08092A8C @ =gRoomControls
-	ldrh r0, [r2, #6]
-	subs r1, r1, r0
-	asrs r1, r1, #4
-	movs r3, #0x3f
-	ands r1, r3
-	movs r4, #0x32
-	ldrsh r0, [r5, r4]
-	ldrh r2, [r2, #8]
-	subs r0, r0, r2
-	asrs r0, r0, #4
-	ands r0, r3
-	lsls r0, r0, #6
-	orrs r1, r0
-	adds r4, r5, #0
-	adds r4, #0x7e
-	strh r1, [r4]
-	ldrh r0, [r4]
-	movs r1, #1
-	bl sub_080001DA
-	adds r1, r5, #0
-	adds r1, #0x7c
-	strh r0, [r1]
-	ldrh r0, [r4]
-	movs r1, #1
-	bl sub_080002E0
-	adds r1, r5, #0
-	adds r1, #0x7a
-	strh r0, [r1]
-	ldr r0, _08092A90 @ =0x00004022
-	ldrh r1, [r4]
-	movs r2, #1
-	bl SetTile
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08092A8C: .4byte gRoomControls
-_08092A90: .4byte 0x00004022
-
-	thumb_func_start sub_08092A94
-sub_08092A94: @ 0x08092A94
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldr r2, _08092B08 @ =gLinkEntity
-	ldrb r0, [r2, #0xc]
-	cmp r0, #6
-	bne _08092B04
-	ldrb r0, [r2, #0x14]
-	cmp r0, #0
-	bne _08092B04
-	movs r1, #0x32
-	ldrsh r0, [r4, r1]
-	adds r0, #0x28
-	movs r3, #0x32
-	ldrsh r1, [r2, r3]
-	cmp r0, r1
-	blt _08092B04
-	movs r0, #0x2e
-	ldrsh r1, [r4, r0]
-	movs r3, #0x2e
-	ldrsh r0, [r2, r3]
-	subs r1, r1, r0
-	ldrb r0, [r4, #0xf]
-	cmp r1, r0
-	bge _08092B04
-	cmn r1, r0
-	ble _08092B04
-	adds r0, r4, #0
-	adds r0, #0x7c
-	ldrh r0, [r0]
-	adds r5, r4, #0
-	adds r5, #0x7e
-	ldrh r1, [r5]
-	movs r2, #1
-	bl SetTile
-	adds r0, r4, #0
-	adds r0, #0x7a
-	ldrh r0, [r0]
-	ldrh r1, [r5]
-	movs r2, #1
-	bl sub_08000148
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	ldrh r0, [r4, #0x36]
-	subs r0, #0x20
-	strh r0, [r4, #0x36]
-	ldrh r0, [r4, #0x32]
-	adds r0, #0x20
-	strh r0, [r4, #0x32]
-	ldrb r1, [r4, #0x19]
-	movs r0, #0x3f
-	ands r0, r1
-	movs r1, #0x80
-	orrs r0, r1
-	strb r0, [r4, #0x19]
-_08092B04:
-	pop {r4, r5, pc}
-	.align 2, 0
-_08092B08: .4byte gLinkEntity
-
-	thumb_func_start sub_08092B0C
-sub_08092B0C: @ 0x08092B0C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xe]
-	cmp r0, #1
-	bne _08092B50
-	movs r0, #0
-	movs r1, #3
-	strb r1, [r4, #0xc]
-	strb r0, [r4, #0xe]
-	ldrb r0, [r4, #0xb]
-	movs r1, #0xc0
-	ands r1, r0
-	cmp r1, #0x40
-	beq _08092B32
-	cmp r1, #0x80
-	bne _08092B3C
-	movs r0, #0x72
-	bl sub_08004488
-_08092B32:
-	adds r0, r4, #0
-	adds r0, #0x86
-	ldrh r0, [r0]
-	bl SetFlag
-_08092B3C:
-	adds r0, r4, #0
-	movs r1, #5
-	movs r2, #0
-	bl CreateFx
-	adds r0, r4, #0
-	movs r1, #3
-	bl sub_0805457C
-	b _08092B6A
-_08092B50:
-	adds r0, r4, #0
-	adds r0, #0x78
-	ldrh r1, [r0]
-	adds r0, r4, #0
-	bl sub_080044EC
-	movs r1, #0x36
-	ldrsh r0, [r4, r1]
-	cmp r0, #0
-	bne _08092B6A
-	ldrb r0, [r4, #0xe]
-	adds r0, #1
-	strb r0, [r4, #0xe]
-_08092B6A:
-	pop {r4, pc}
-
-	thumb_func_start sub_08092B6C
-sub_08092B6C: @ 0x08092B6C
-	push {lr}
-	bl DeleteThisEntity
-	pop {pc}
diff --git a/include/entity.h b/include/entity.h
index 0edf7fa0..86228465 100644
--- a/include/entity.h
+++ b/include/entity.h
@@ -135,9 +135,9 @@ typedef struct Entity {
     u8 field_0x6d;
     u8 filler4[6];
     u32* heldObjectPtr;
-    u8 filler3[2];
+    u16 field_0x78;
     u16 itemCooldown;
-    u32 field_0x7c;
+    union SplitWord field_0x7c;
     u16 field_0x80;
     u16 field_0x82;
     union SplitHWord cutsceneBeh;
diff --git a/linker.ld b/linker.ld
index d6a4b66c..e87ab5d4 100644
--- a/linker.ld
+++ b/linker.ld
@@ -681,7 +681,7 @@ SECTIONS {
 		asm/lavaPlatform.o(.text);
 		asm/object5A.o(.text);
 		asm/object5B.o(.text);
-		asm/mask.o(.text);
+		src/mask.o(.text);
 		asm/houseDoorInterior.o(.text);
 		asm/whirlwind.o(.text);
 		asm/objectBlockingStairs.o(.text);
diff --git a/src/mask.c b/src/mask.c
new file mode 100644
index 00000000..87e1f1a8
--- /dev/null
+++ b/src/mask.c
@@ -0,0 +1,127 @@
+#include "global.h"
+#include "entity.h"
+#include "room.h"
+#include "random.h"
+
+#define COORD_TO_TILE(entity) ((((entity->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 0x3fU) | (((entity->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 0x3fU) << 6)
+
+extern void (*gUnk_081227A4[])(Entity *);
+extern void DeleteThisEntity();
+extern u16 gUnk_030010A0[];
+extern bool32 CheckFlags(u16);
+extern void ClearFlag(u16);
+extern s16 sub_080001DA(u16, u32);
+extern void SetTile(u32, u16, u32);
+extern u16 sub_080002E0(u16, u32);
+extern void sub_08000148(u16, u16, u32);
+extern Entity gLinkEntity;
+extern void sub_08004488(u32);
+extern void sub_080044EC(Entity *, u16);
+extern void CreateFx(Entity *, u16, u16);
+extern void sub_0805457C(Entity *, s32);
+extern void SetFlag(u16);
+
+void Mask(Entity *this) {
+    gUnk_081227A4[this->action](this);
+}
+
+void sub_080929A4(Entity *this) {
+    if (this->entityType.parameter2 & 0xC0) {
+        if (CheckFlags(this->field_0x86)) {
+            s32 field_0x0a;
+            switch (this->entityType.parameter2 & 0xC0) {
+                case 0x40:
+                    field_0x0a = gUnk_030010A0[0x5];
+                    
+                    switch (field_0x0a) {
+                        default:
+                            break;
+                        case 0x44D ... 0x44F:
+                        case 0x182:
+                            DeleteThisEntity();
+                            goto switchEnd;
+                    }
+
+                    ClearFlag(this->field_0x86);
+                    break;
+                case 0x80:
+                    DeleteThisEntity();
+                    break;
+            }
+            switchEnd:
+        }
+    }
+
+    this->action = 1;
+    this->field_0x20 = 0x18000;
+
+    this->field_0x78 = ((Random() & 7) << 10) | 0x2000;
+    
+    this->field_0xf = this->parameter3 >> 1;
+    this->parameter3 = 0;
+
+    this->animationList = this->entityType.parameter2 & 0x3f;
+
+    this->field_0x7c.HALF.HI = COORD_TO_TILE(this);
+    this->field_0x7c.HALF.LO = sub_080001DA(this->field_0x7c.HALF.HI, 1);
+
+    this->itemCooldown = sub_080002E0(this->field_0x7c.HALF.HI, 1);
+
+    SetTile(0x4022, this->field_0x7c.HALF.HI, 1);
+}
+
+void sub_08092A94(Entity *this) {
+    if (gLinkEntity.action != 6) {
+        return;
+    }
+
+    if (gLinkEntity.animationState != 0) {
+        return;
+    }
+
+    if (this->y.HALF.HI + 40 < gLinkEntity.y.HALF.HI) {
+        return;
+    }
+
+    if (this->x.HALF.HI - gLinkEntity.x.HALF.HI >= this->field_0xf || this->x.HALF.HI - gLinkEntity.x.HALF.HI <= -this->field_0xf) {
+        return;
+    }
+
+    SetTile((u16)this->field_0x7c.HALF.LO, this->field_0x7c.HALF.HI, 1);
+    
+    sub_08000148(this->itemCooldown, this->field_0x7c.HALF.HI, 1);
+
+    this->action = 2;
+    this->height.HALF.HI -= 0x20;
+    this->y.HALF.HI += 0x20;
+    this->spriteOrder.b3 = 2;
+}
+
+void sub_08092B0C(Entity *this) {
+    if (this->parameter3 == 1) {
+        this->action = 3;
+        this->parameter3 = 0;
+        switch (this->entityType.parameter2 & 0xC0)
+        {
+            case 0x80:
+                sub_08004488(0x72);
+            case 0x40:
+                SetFlag(this->field_0x86);
+                break;
+                
+        }
+        CreateFx(this, 5, 0);
+        sub_0805457C(this, 3);
+    }
+    else {
+        sub_080044EC(this, this->field_0x78);
+
+        if (this->height.HALF.HI == 0) {
+            this->parameter3++;
+        }
+    }
+}
+
+void sub_08092B6C(Entity *this) {
+    DeleteThisEntity();
+}
\ No newline at end of file