diff --git a/asm/non_matching/vaati/sub_08066ACC.inc b/asm/non_matching/vaati/sub_08066ACC.inc
new file mode 100644
index 00000000..16c661c9
--- /dev/null
+++ b/asm/non_matching/vaati/sub_08066ACC.inc
@@ -0,0 +1,86 @@
+
+    .syntax unified
+	push {r4, r5, lr}
+	adds r4, r0, #0
+	ldr r1, _08066B18 @ =sub_08066B74
+	bl sub_0807DD94
+	adds r0, r4, #0
+	adds r0, #0x69
+	ldrb r0, [r0]
+	lsls r0, r0, #0x18
+	asrs r0, r0, #0x18
+	cmp r0, #0
+	beq _08066AF6
+	ldr r0, _08066B1C @ =gScreenTransition
+	ldr r0, [r0]
+	movs r1, #3
+	ands r0, r1
+	cmp r0, #0
+	bne _08066AF6
+	adds r0, r4, #0
+	bl sub_08095CB0
+_08066AF6:
+	adds r1, r4, #0
+	adds r1, #0x5a
+	ldrb r2, [r1]
+	movs r0, #0x81
+	rsbs r0, r0, #0
+	ands r2, r0
+	adds r5, r1, #0
+	cmp r2, #0
+	beq _08066B6E
+	cmp r2, #2
+	beq _08066B34
+	cmp r2, #2
+	bhi _08066B20
+	cmp r2, #1
+	beq _08066B2A
+	b _08066B66
+	.align 2, 0
+_08066B18: .4byte sub_08066B74
+_08066B1C: .4byte gScreenTransition
+_08066B20:
+	cmp r2, #3
+	beq _08066B40
+	cmp r2, #4
+	beq _08066B52
+	b _08066B66
+_08066B2A:
+	movs r0, #0x87
+	lsls r0, r0, #2
+	bl EnqueueSFX
+	b _08066B66
+_08066B34:
+	ldr r0, _08066B3C @ =0x0000021E
+	bl EnqueueSFX
+	b _08066B66
+	.align 2, 0
+_08066B3C: .4byte 0x0000021E
+_08066B40:
+	adds r0, r4, #0
+	adds r0, #0x84
+	ldr r1, [r0]
+	movs r0, #4
+	str r0, [r1, #4]
+	adds r0, r4, #0
+	bl sub_0805DDEC
+	b _08066B66
+_08066B52:
+	adds r0, r4, #0
+	adds r0, #0x84
+	ldr r1, [r0]
+	str r2, [r1, #4]
+	adds r0, r4, #0
+	bl sub_0805DE18
+	ldr r0, _08066B70 @ =0x0000021D
+	bl EnqueueSFX
+_08066B66:
+	ldrb r1, [r5]
+	movs r0, #0x7f
+	ands r0, r1
+	strb r0, [r5]
+_08066B6E:
+	pop {r4, r5, pc}
+	.align 2, 0
+_08066B70: .4byte 0x0000021D
+    .syntax divided
diff --git a/asm/vaati.s b/asm/vaati.s
deleted file mode 100644
index a9f5bf86..00000000
--- a/asm/vaati.s
+++ /dev/null
@@ -1,335 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Vaati
-Vaati: @ 0x08066A5C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r1, _08066A90 @ =gUnk_08110734
-	ldrb r0, [r4, #0xc]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r1, [r0]
-	adds r0, r4, #0
-	bl _call_via_r1
-	ldrb r3, [r4, #0x1a]
-	lsrs r1, r3, #4
-	adds r0, r4, #0
-	adds r0, #0x5b
-	ldrb r2, [r0]
-	movs r0, #1
-	ands r0, r2
-	adds r1, r1, r0
-	movs r0, #0xf
-	ands r1, r0
-	movs r0, #0x10
-	rsbs r0, r0, #0
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r4, #0x1a]
-	pop {r4, pc}
-	.align 2, 0
-_08066A90: .4byte gUnk_08110734
-
-	thumb_func_start sub_08066A94
-sub_08066A94: @ 0x08066A94
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r2, #0
-	movs r3, #1
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	strb r2, [r4, #0xd]
-	ldrb r1, [r4, #0x18]
-	subs r0, #5
-	ands r0, r1
-	orrs r0, r3
-	strb r0, [r4, #0x18]
-	adds r0, r4, #0
-	adds r0, #0x68
-	strb r2, [r0]
-	adds r0, #1
-	strb r2, [r0]
-	adds r0, r4, #0
-	movs r1, #2
-	bl sub_0805E3A0
-	adds r0, r4, #0
-	bl sub_0807DD64
-	adds r0, r4, #0
-	bl sub_08066ACC
-	pop {r4, pc}
-
-	thumb_func_start sub_08066ACC
-sub_08066ACC: @ 0x08066ACC
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldr r1, _08066B18 @ =sub_08066B74
-	bl sub_0807DD94
-	adds r0, r4, #0
-	adds r0, #0x69
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	cmp r0, #0
-	beq _08066AF6
-	ldr r0, _08066B1C @ =gScreenTransition
-	ldr r0, [r0]
-	movs r1, #3
-	ands r0, r1
-	cmp r0, #0
-	bne _08066AF6
-	adds r0, r4, #0
-	bl sub_08095CB0
-_08066AF6:
-	adds r1, r4, #0
-	adds r1, #0x5a
-	ldrb r2, [r1]
-	movs r0, #0x81
-	rsbs r0, r0, #0
-	ands r2, r0
-	adds r5, r1, #0
-	cmp r2, #0
-	beq _08066B6E
-	cmp r2, #2
-	beq _08066B34
-	cmp r2, #2
-	bhi _08066B20
-	cmp r2, #1
-	beq _08066B2A
-	b _08066B66
-	.align 2, 0
-_08066B18: .4byte sub_08066B74
-_08066B1C: .4byte gScreenTransition
-_08066B20:
-	cmp r2, #3
-	beq _08066B40
-	cmp r2, #4
-	beq _08066B52
-	b _08066B66
-_08066B2A:
-	movs r0, #0x87
-	lsls r0, r0, #2
-	bl EnqueueSFX
-	b _08066B66
-_08066B34:
-	ldr r0, _08066B3C @ =0x0000021E
-	bl EnqueueSFX
-	b _08066B66
-	.align 2, 0
-_08066B3C: .4byte 0x0000021E
-_08066B40:
-	adds r0, r4, #0
-	adds r0, #0x84
-	ldr r1, [r0]
-	movs r0, #4
-	str r0, [r1, #4]
-	adds r0, r4, #0
-	bl sub_0805DDEC
-	b _08066B66
-_08066B52:
-	adds r0, r4, #0
-	adds r0, #0x84
-	ldr r1, [r0]
-	str r2, [r1, #4]
-	adds r0, r4, #0
-	bl sub_0805DE18
-	ldr r0, _08066B70 @ =0x0000021D
-	bl EnqueueSFX
-_08066B66:
-	ldrb r1, [r5]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r5]
-_08066B6E:
-	pop {r4, r5, pc}
-	.align 2, 0
-_08066B70: .4byte 0x0000021D
-
-	thumb_func_start sub_08066B74
-sub_08066B74: @ 0x08066B74
-	push {r4, r5, r6, lr}
-	mov ip, r0
-	ldr r0, [r1, #8]
-	ldr r4, _08066BCC @ =0xFFF00000
-	ands r4, r0
-	ldr r2, _08066BD0 @ =0x000FFFFF
-	ands r0, r2
-	str r0, [r1, #8]
-	cmp r4, #0
-	bne _08066B8A
-	b _08066C86
-_08066B8A:
-	mov r3, ip
-	adds r3, #0x80
-	mov r5, ip
-	adds r5, #0x68
-	movs r6, #1
-_08066B94:
-	mvns r0, r4
-	adds r1, r0, #1
-	ands r1, r4
-	eors r4, r1
-	mov r2, ip
-	ldrb r0, [r2, #0x14]
-	lsrs r2, r0, #1
-	movs r0, #0x80
-	lsls r0, r0, #0x12
-	cmp r1, r0
-	beq _08066C4C
-	cmp r1, r0
-	bhi _08066BE6
-	movs r0, #0x80
-	lsls r0, r0, #0xf
-	cmp r1, r0
-	beq _08066C34
-	cmp r1, r0
-	bhi _08066BD4
-	movs r0, #0x80
-	lsls r0, r0, #0xd
-	cmp r1, r0
-	beq _08066C24
-	movs r0, #0x80
-	lsls r0, r0, #0xe
-	cmp r1, r0
-	beq _08066C2C
-	b _08066C82
-	.align 2, 0
-_08066BCC: .4byte 0xFFF00000
-_08066BD0: .4byte 0x000FFFFF
-_08066BD4:
-	movs r0, #0x80
-	lsls r0, r0, #0x10
-	cmp r1, r0
-	beq _08066C3C
-	movs r0, #0x80
-	lsls r0, r0, #0x11
-	cmp r1, r0
-	beq _08066C44
-	b _08066C82
-_08066BE6:
-	movs r0, #0x80
-	lsls r0, r0, #0x15
-	cmp r1, r0
-	beq _08066C64
-	cmp r1, r0
-	bhi _08066C04
-	movs r0, #0x80
-	lsls r0, r0, #0x13
-	cmp r1, r0
-	beq _08066C54
-	movs r0, #0x80
-	lsls r0, r0, #0x14
-	cmp r1, r0
-	beq _08066C5C
-	b _08066C82
-_08066C04:
-	movs r0, #0x80
-	lsls r0, r0, #0x17
-	cmp r1, r0
-	beq _08066C70
-	cmp r1, r0
-	bhi _08066C1A
-	movs r0, #0x80
-	lsls r0, r0, #0x16
-	cmp r1, r0
-	beq _08066C6C
-	b _08066C82
-_08066C1A:
-	movs r0, #0x80
-	lsls r0, r0, #0x18
-	cmp r1, r0
-	beq _08066C76
-	b _08066C82
-_08066C24:
-	adds r0, r2, #0
-	adds r0, #0x10
-	strh r0, [r3]
-	b _08066C82
-_08066C2C:
-	adds r0, r2, #0
-	adds r0, #0x14
-	strh r0, [r3]
-	b _08066C82
-_08066C34:
-	adds r0, r2, #0
-	adds r0, #0x18
-	strh r0, [r3]
-	b _08066C82
-_08066C3C:
-	adds r0, r2, #0
-	adds r0, #0x1c
-	strh r0, [r3]
-	b _08066C82
-_08066C44:
-	adds r0, r2, #0
-	adds r0, #0x20
-	strh r0, [r3]
-	b _08066C82
-_08066C4C:
-	adds r0, r2, #0
-	adds r0, #0x24
-	strh r0, [r3]
-	b _08066C82
-_08066C54:
-	adds r0, r2, #0
-	adds r0, #0x28
-	strh r0, [r3]
-	b _08066C82
-_08066C5C:
-	adds r0, r2, #0
-	adds r0, #0x2c
-	strh r0, [r3]
-	b _08066C82
-_08066C64:
-	adds r0, r2, #0
-	adds r0, #0x30
-	strh r0, [r3]
-	b _08066C82
-_08066C6C:
-	strb r6, [r5]
-	b _08066C82
-_08066C70:
-	movs r0, #0xff
-	strb r0, [r5]
-	b _08066C82
-_08066C76:
-	mov r2, ip
-	adds r2, #0x69
-	ldrb r1, [r2]
-	adds r0, r6, #0
-	eors r0, r1
-	strb r0, [r2]
-_08066C82:
-	cmp r4, #0
-	bne _08066B94
-_08066C86:
-	mov r0, ip
-	adds r0, #0x84
-	ldr r1, [r0]
-	mov r0, ip
-	bl HandlePostScriptActions
-	pop {r4, r5, r6, pc}
-
-	thumb_func_start sub_08066C94
-sub_08066C94: @ 0x08066C94
-	push {lr}
-	movs r1, #0
-	bl sub_0805DA90
-	movs r0, #0xf7
-	bl SoundReq
-	pop {pc}
-
-	thumb_func_start sub_08066CA4
-sub_08066CA4: @ 0x08066CA4
-	push {lr}
-	movs r1, #1
-	bl sub_0805DA90
-	movs r0, #0xf6
-	bl SoundReq
-	pop {pc}
diff --git a/data/const/npc/vaati.s b/data/const/npc/vaati.s
deleted file mode 100644
index cf25ef3d..00000000
--- a/data/const/npc/vaati.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08110734:: @ 08110734
-	.4byte sub_08066A94
-	.4byte sub_08066ACC
diff --git a/include/script.h b/include/script.h
index cfc2c180..b00a5dbd 100644
--- a/include/script.h
+++ b/include/script.h
@@ -36,6 +36,7 @@ void sub_0807DEDC(Entity*, ScriptExecutionContext*, u32, u32);
 
 ScriptExecutionContext* StartCutscene(Entity* entity, u16* script);
 void ExecuteScriptForEntity(Entity* entity, void (*postScriptCallback)(Entity*, ScriptExecutionContext*));
+void HandlePostScriptActions(Entity* entity, ScriptExecutionContext* context);
 void HandleEntity0x82Actions(Entity* entity);
 void sub_0807DD94(Entity*, void (*function)(Entity*, ScriptExecutionContext*));
 #endif
diff --git a/linker.ld b/linker.ld
index fc72936e..a556c55c 100644
--- a/linker.ld
+++ b/linker.ld
@@ -588,7 +588,7 @@ SECTIONS {
         asm/kingDaltus.o(.text);
         asm/ministerPotho.o(.text);
         src/npc/npc26.o(.text);
-        asm/vaati.o(.text);
+        src/npc/vaati.o(.text);
         src/npc/zelda.o(.text);
         src/npc/mutoh.o(.text);
         src/npc/carpenter.o(.text);
@@ -1292,7 +1292,7 @@ SECTIONS {
         data/animations/npc/ministerPotho.o(.rodata);
         src/npc/npc26.o(.rodata);
         data/animations/npc/npc26.o(.rodata);
-        data/const/npc/vaati.o(.rodata);
+        src/npc/vaati.o(.rodata);
         data/animations/npc/vaati.o(.rodata);
         data/const/npc/zelda.o(.rodata);
         data/const/npc/mutoh.o(.rodata);
diff --git a/src/npc/vaati.c b/src/npc/vaati.c
new file mode 100644
index 00000000..ee65bbcc
--- /dev/null
+++ b/src/npc/vaati.c
@@ -0,0 +1,130 @@
+#include "global.h"
+#include "enemy.h"
+#include "entity.h"
+#include "script.h"
+#include "audio.h"
+#include "structures.h"
+#include "functions.h"
+
+extern void sub_08095CB0(Entity*);
+extern void sub_0805DDEC(Entity*);
+extern void sub_0805DE18(Entity*);
+extern void sub_0805DA90(Entity*, u32);
+
+void sub_08066A94(Entity*);
+void sub_08066ACC(Entity*);
+void sub_08066B74(Entity*, ScriptExecutionContext*);
+
+void (*const gUnk_08110734[])(Entity*) = { sub_08066A94, sub_08066ACC };
+
+void Vaati(Entity* this) {
+    gUnk_08110734[this->action](this);
+    this->palette.b.b0 = this->palette.b.b4 + (this->frameSpriteSettings & 1);
+}
+
+void sub_08066A94(Entity* this) {
+    this->action = 1;
+    this->subAction = 0;
+    this->spriteSettings.b.draw = 1;
+    this->field_0x68.HALF.LO = 0;
+    this->field_0x68.HALF.HI = 0;
+    sub_0805E3A0(this, 2);
+    sub_0807DD64(this);
+    sub_08066ACC(this);
+}
+
+NONMATCH("asm/non_matching/vaati/sub_08066ACC.inc", void sub_08066ACC(Entity* this)) {
+    sub_0807DD94(this, sub_08066B74);
+    if ((*(s8*)&this->field_0x68.HALF.HI != 0) && ((gScreenTransition.frameCount & 3) == 0)) {
+        sub_08095CB0(this);
+    }
+
+    if ((this->frames.all & ~0x80) != 0) {
+        switch (this->frames.all & ~0x80u) {
+            case 1:
+                EnqueueSFX(0x21c);
+                break;
+            case 2:
+                EnqueueSFX(0x21e);
+                break;
+            case 3:
+                (*(ScriptExecutionContext**)&this->cutsceneBeh)->intVariable = 4;
+                sub_0805DDEC(this);
+                break;
+            case 4:
+                (*(ScriptExecutionContext**)&this->cutsceneBeh)->intVariable = 4;
+                sub_0805DE18(this);
+                EnqueueSFX(0x21d);
+                break;
+        }
+        this->frames.b.f3 = 0;
+    }
+}
+END_NONMATCH
+
+void sub_08066B74(Entity* this, ScriptExecutionContext* context) {
+    u8 animationState;
+    u32 currentAction;
+    short* psVar4;
+    u32 actions;
+
+    actions = context->postScriptActions & 0xfff00000;
+    context->postScriptActions = context->postScriptActions & 0xfffff;
+    if (actions != 0) {
+        do {
+            currentAction = (~actions + 1) & actions;
+            actions = actions ^ currentAction;
+            animationState = this->animationState >> 1;
+
+            switch (currentAction) {
+                case 1 << 20:
+                    this->field_0x80.HWORD = animationState + 0x10;
+                    break;
+                case 1 << 21:
+                    this->field_0x80.HWORD = animationState + 0x14;
+                    break;
+                case 1 << 22:
+                    this->field_0x80.HWORD = animationState + 0x18;
+                    break;
+                case 1 << 23:
+                    this->field_0x80.HWORD = animationState + 0x1c;
+                    break;
+                case 1 << 24:
+                    this->field_0x80.HWORD = animationState + 0x20;
+                    break;
+                case 1 << 25:
+                    this->field_0x80.HWORD = animationState + 0x24;
+                    break;
+                case 1 << 26:
+                    this->field_0x80.HWORD = animationState + 0x28;
+                    break;
+                case 1 << 27:
+                    this->field_0x80.HWORD = animationState + 0x2c;
+                    break;
+                case 1 << 28:
+                    this->field_0x80.HWORD = animationState + 0x30;
+                    break;
+                case 1 << 29:
+                    this->field_0x68.HALF.LO = 1;
+                    break;
+                case 1 << 30:
+                    this->field_0x68.HALF.LO = 0xff;
+                    break;
+                case 1 << 31:
+                    this->field_0x68.HALF.HI ^= 1;
+                    break;
+            }
+        } while (actions != 0);
+    }
+    HandlePostScriptActions(this, *(ScriptExecutionContext**)&this->cutsceneBeh);
+}
+
+void sub_08066C94(Entity* this) {
+    sub_0805DA90(this, 0);
+    SoundReq(SFX_APPARATE);
+}
+
+void sub_08066CA4(Entity* this) {
+    sub_0805DA90(this, 1);
+    SoundReq(SFX_EVAPORATE);
+}