diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Destroy.s
deleted file mode 100644
index 00f28795cd..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Destroy.s
+++ /dev/null
@@ -1,14 +0,0 @@
-glabel BgTokiSwd_Destroy
-/* 000D8 808BAF18 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 000DC 808BAF1C 00803025 */  or      $a2, $a0, $zero            ## $a2 = 00000000
-/* 000E0 808BAF20 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 000E4 808BAF24 00A02025 */  or      $a0, $a1, $zero            ## $a0 = 00000000
-/* 000E8 808BAF28 0C0170EB */  jal     ActorCollider_FreeCylinder
-              
-/* 000EC 808BAF2C 24C50150 */  addiu   $a1, $a2, 0x0150           ## $a1 = 00000150
-/* 000F0 808BAF30 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 000F4 808BAF34 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 000F8 808BAF38 03E00008 */  jr      $ra                        
-/* 000FC 808BAF3C 00000000 */  nop
-
-
diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Draw.s
deleted file mode 100644
index 32b688400d..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Draw.s
+++ /dev/null
@@ -1,77 +0,0 @@
-glabel BgTokiSwd_Draw
-/* 00384 808BB1C4 27BDFFA0 */  addiu   $sp, $sp, 0xFFA0           ## $sp = FFFFFFA0
-/* 00388 808BB1C8 AFB0001C */  sw      $s0, 0x001C($sp)           
-/* 0038C 808BB1CC 00A08025 */  or      $s0, $a1, $zero            ## $s0 = 00000000
-/* 00390 808BB1D0 AFBF0024 */  sw      $ra, 0x0024($sp)           
-/* 00394 808BB1D4 AFB10020 */  sw      $s1, 0x0020($sp)           
-/* 00398 808BB1D8 AFA40060 */  sw      $a0, 0x0060($sp)           
-/* 0039C 808BB1DC 8CA50000 */  lw      $a1, 0x0000($a1)           ## 00000000
-/* 003A0 808BB1E0 3C06808C */  lui     $a2, %hi(D_808BC420)       ## $a2 = 808C0000
-/* 003A4 808BB1E4 24C6C420 */  addiu   $a2, $a2, %lo(D_808BC420)  ## $a2 = 808BC420
-/* 003A8 808BB1E8 27A40038 */  addiu   $a0, $sp, 0x0038           ## $a0 = FFFFFFD8
-/* 003AC 808BB1EC 240702D7 */  addiu   $a3, $zero, 0x02D7         ## $a3 = 000002D7
-/* 003B0 808BB1F0 0C031AB1 */  jal     func_800C6AC4              
-/* 003B4 808BB1F4 00A08825 */  or      $s1, $a1, $zero            ## $s1 = 00000000
-/* 003B8 808BB1F8 0C024F46 */  jal     func_80093D18              
-/* 003BC 808BB1FC 8E040000 */  lw      $a0, 0x0000($s0)           ## 00000000
-/* 003C0 808BB200 8FA40060 */  lw      $a0, 0x0060($sp)           
-/* 003C4 808BB204 02002825 */  or      $a1, $s0, $zero            ## $a1 = 00000000
-/* 003C8 808BB208 0C00BAF3 */  jal     func_8002EBCC              
-/* 003CC 808BB20C 00003025 */  or      $a2, $zero, $zero          ## $a2 = 00000000
-/* 003D0 808BB210 8E2202C0 */  lw      $v0, 0x02C0($s1)           ## 000002C0
-/* 003D4 808BB214 3C0FDB06 */  lui     $t7, 0xDB06                ## $t7 = DB060000
-/* 003D8 808BB218 35EF0020 */  ori     $t7, $t7, 0x0020           ## $t7 = DB060020
-/* 003DC 808BB21C 244E0008 */  addiu   $t6, $v0, 0x0008           ## $t6 = 00000008
-/* 003E0 808BB220 AE2E02C0 */  sw      $t6, 0x02C0($s1)           ## 000002C0
-/* 003E4 808BB224 3C060001 */  lui     $a2, 0x0001                ## $a2 = 00010000
-/* 003E8 808BB228 00D03021 */  addu    $a2, $a2, $s0              
-/* 003EC 808BB22C AC4F0000 */  sw      $t7, 0x0000($v0)           ## 00000000
-/* 003F0 808BB230 8CC61DE4 */  lw      $a2, 0x1DE4($a2)           ## 00011DE4
-/* 003F4 808BB234 8E040000 */  lw      $a0, 0x0000($s0)           ## 00000000
-/* 003F8 808BB238 24180020 */  addiu   $t8, $zero, 0x0020         ## $t8 = 00000020
-/* 003FC 808BB23C 30C6007F */  andi    $a2, $a2, 0x007F           ## $a2 = 00000000
-/* 00400 808BB240 00063023 */  subu    $a2, $zero, $a2            
-/* 00404 808BB244 AFB80010 */  sw      $t8, 0x0010($sp)           
-/* 00408 808BB248 00002825 */  or      $a1, $zero, $zero          ## $a1 = 00000000
-/* 0040C 808BB24C 24070020 */  addiu   $a3, $zero, 0x0020         ## $a3 = 00000020
-/* 00410 808BB250 0C0253A7 */  jal     Draw_TexScroll              
-/* 00414 808BB254 AFA20034 */  sw      $v0, 0x0034($sp)           
-/* 00418 808BB258 8FA30034 */  lw      $v1, 0x0034($sp)           
-/* 0041C 808BB25C 3C08DA38 */  lui     $t0, 0xDA38                ## $t0 = DA380000
-/* 00420 808BB260 35080003 */  ori     $t0, $t0, 0x0003           ## $t0 = DA380003
-/* 00424 808BB264 AC620004 */  sw      $v0, 0x0004($v1)           ## 00000004
-/* 00428 808BB268 8E2202C0 */  lw      $v0, 0x02C0($s1)           ## 000002C0
-/* 0042C 808BB26C 3C05808C */  lui     $a1, %hi(D_808BC434)       ## $a1 = 808C0000
-/* 00430 808BB270 24A5C434 */  addiu   $a1, $a1, %lo(D_808BC434)  ## $a1 = 808BC434
-/* 00434 808BB274 24590008 */  addiu   $t9, $v0, 0x0008           ## $t9 = 00000008
-/* 00438 808BB278 AE3902C0 */  sw      $t9, 0x02C0($s1)           ## 000002C0
-/* 0043C 808BB27C AC480000 */  sw      $t0, 0x0000($v0)           ## 00000000
-/* 00440 808BB280 8E040000 */  lw      $a0, 0x0000($s0)           ## 00000000
-/* 00444 808BB284 240602E6 */  addiu   $a2, $zero, 0x02E6         ## $a2 = 000002E6
-/* 00448 808BB288 0C0346A2 */  jal     Matrix_NewMtx              
-/* 0044C 808BB28C AFA20030 */  sw      $v0, 0x0030($sp)           
-/* 00450 808BB290 8FA30030 */  lw      $v1, 0x0030($sp)           
-/* 00454 808BB294 3C0B0600 */  lui     $t3, 0x0600                ## $t3 = 06000000
-/* 00458 808BB298 256B1BD0 */  addiu   $t3, $t3, 0x1BD0           ## $t3 = 06001BD0
-/* 0045C 808BB29C AC620004 */  sw      $v0, 0x0004($v1)           ## 00000004
-/* 00460 808BB2A0 8E2202C0 */  lw      $v0, 0x02C0($s1)           ## 000002C0
-/* 00464 808BB2A4 3C0ADE00 */  lui     $t2, 0xDE00                ## $t2 = DE000000
-/* 00468 808BB2A8 3C06808C */  lui     $a2, %hi(D_808BC448)       ## $a2 = 808C0000
-/* 0046C 808BB2AC 24490008 */  addiu   $t1, $v0, 0x0008           ## $t1 = 00000008
-/* 00470 808BB2B0 AE2902C0 */  sw      $t1, 0x02C0($s1)           ## 000002C0
-/* 00474 808BB2B4 AC4B0004 */  sw      $t3, 0x0004($v0)           ## 00000004
-/* 00478 808BB2B8 AC4A0000 */  sw      $t2, 0x0000($v0)           ## 00000000
-/* 0047C 808BB2BC 8E050000 */  lw      $a1, 0x0000($s0)           ## 00000000
-/* 00480 808BB2C0 24C6C448 */  addiu   $a2, $a2, %lo(D_808BC448)  ## $a2 = 808BC448
-/* 00484 808BB2C4 27A40038 */  addiu   $a0, $sp, 0x0038           ## $a0 = FFFFFFD8
-/* 00488 808BB2C8 0C031AD5 */  jal     func_800C6B54              
-/* 0048C 808BB2CC 24070308 */  addiu   $a3, $zero, 0x0308         ## $a3 = 00000308
-/* 00490 808BB2D0 8FBF0024 */  lw      $ra, 0x0024($sp)           
-/* 00494 808BB2D4 8FB0001C */  lw      $s0, 0x001C($sp)           
-/* 00498 808BB2D8 8FB10020 */  lw      $s1, 0x0020($sp)           
-/* 0049C 808BB2DC 03E00008 */  jr      $ra                        
-/* 004A0 808BB2E0 27BD0060 */  addiu   $sp, $sp, 0x0060           ## $sp = 00000000
-/* 004A4 808BB2E4 00000000 */  nop
-/* 004A8 808BB2E8 00000000 */  nop
-/* 004AC 808BB2EC 00000000 */  nop
-
diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Init.s
deleted file mode 100644
index b1e064bbbb..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Init.s
+++ /dev/null
@@ -1,61 +0,0 @@
-glabel BgTokiSwd_Init
-/* 00008 808BAE48 27BDFFD0 */  addiu   $sp, $sp, 0xFFD0           ## $sp = FFFFFFD0
-/* 0000C 808BAE4C AFA50034 */  sw      $a1, 0x0034($sp)           
-/* 00010 808BAE50 AFBF001C */  sw      $ra, 0x001C($sp)           
-/* 00014 808BAE54 AFB00018 */  sw      $s0, 0x0018($sp)           
-/* 00018 808BAE58 3C05808C */  lui     $a1, %hi(D_808BC414)       ## $a1 = 808C0000
-/* 0001C 808BAE5C 00808025 */  or      $s0, $a0, $zero            ## $s0 = 00000000
-/* 00020 808BAE60 0C01E037 */  jal     Actor_ProcessInitChain
-              
-/* 00024 808BAE64 24A5C414 */  addiu   $a1, $a1, %lo(D_808BC414)  ## $a1 = 808BC414
-/* 00028 808BAE68 3C014448 */  lui     $at, 0x4448                ## $at = 44480000
-/* 0002C 808BAE6C 44812000 */  mtc1    $at, $f4                   ## $f4 = 800.00
-/* 00030 808BAE70 3C05808C */  lui     $a1, %hi(func_808BAF40)    ## $a1 = 808C0000
-/* 00034 808BAE74 24A5AF40 */  addiu   $a1, $a1, %lo(func_808BAF40) ## $a1 = 808BAF40
-/* 00038 808BAE78 02002025 */  or      $a0, $s0, $zero            ## $a0 = 00000000
-/* 0003C 808BAE7C 0C22EB90 */  jal     func_808BAE40              
-/* 00040 808BAE80 E60400BC */  swc1    $f4, 0x00BC($s0)           ## 000000BC
-/* 00044 808BAE84 3C028016 */  lui     $v0, 0x8016                ## $v0 = 80160000
-/* 00048 808BAE88 2442E660 */  addiu   $v0, $v0, 0xE660           ## $v0 = 8015E660
-/* 0004C 808BAE8C 8C4E0004 */  lw      $t6, 0x0004($v0)           ## 8015E664
-/* 00050 808BAE90 26050150 */  addiu   $a1, $s0, 0x0150           ## $a1 = 00000150
-/* 00054 808BAE94 55C00003 */  bnel    $t6, $zero, .L808BAEA4     
-/* 00058 808BAE98 8C4F1360 */  lw      $t7, 0x1360($v0)           ## 8015F9C0
-/* 0005C 808BAE9C AE000134 */  sw      $zero, 0x0134($s0)         ## 00000134
-/* 00060 808BAEA0 8C4F1360 */  lw      $t7, 0x1360($v0)           ## 8015F9C0
-.L808BAEA4:
-/* 00064 808BAEA4 24010005 */  addiu   $at, $zero, 0x0005         ## $at = 00000005
-/* 00068 808BAEA8 8FB90034 */  lw      $t9, 0x0034($sp)           
-/* 0006C 808BAEAC 15E10004 */  bne     $t7, $at, .L808BAEC0       
-/* 00070 808BAEB0 3C010001 */  lui     $at, 0x0001                ## $at = 00010000
-/* 00074 808BAEB4 00390821 */  addu    $at, $at, $t9              
-/* 00078 808BAEB8 241800FF */  addiu   $t8, $zero, 0x00FF         ## $t8 = 000000FF
-/* 0007C 808BAEBC A4381D30 */  sh      $t8, 0x1D30($at)           ## 00011D30
-.L808BAEC0:
-/* 00080 808BAEC0 8FA40034 */  lw      $a0, 0x0034($sp)           
-/* 00084 808BAEC4 0C0170D9 */  jal     ActorCollider_AllocCylinder
-              
-/* 00088 808BAEC8 AFA50024 */  sw      $a1, 0x0024($sp)           
-/* 0008C 808BAECC 3C07808C */  lui     $a3, %hi(D_808BC3E0)       ## $a3 = 808C0000
-/* 00090 808BAED0 24E7C3E0 */  addiu   $a3, $a3, %lo(D_808BC3E0)  ## $a3 = 808BC3E0
-/* 00094 808BAED4 8FA40034 */  lw      $a0, 0x0034($sp)           
-/* 00098 808BAED8 8FA50024 */  lw      $a1, 0x0024($sp)           
-/* 0009C 808BAEDC 0C01712B */  jal     ActorCollider_InitCylinder
-              
-/* 000A0 808BAEE0 02003025 */  or      $a2, $s0, $zero            ## $a2 = 00000000
-/* 000A4 808BAEE4 02002025 */  or      $a0, $s0, $zero            ## $a0 = 00000000
-/* 000A8 808BAEE8 0C0189B7 */  jal     ActorCollider_Cylinder_Update
-              
-/* 000AC 808BAEEC 8FA50024 */  lw      $a1, 0x0024($sp)           
-/* 000B0 808BAEF0 3C06808C */  lui     $a2, %hi(D_808BC40C)       ## $a2 = 808C0000
-/* 000B4 808BAEF4 24C6C40C */  addiu   $a2, $a2, %lo(D_808BC40C)  ## $a2 = 808BC40C
-/* 000B8 808BAEF8 26040098 */  addiu   $a0, $s0, 0x0098           ## $a0 = 00000098
-/* 000BC 808BAEFC 0C0187B5 */  jal     func_80061ED4              
-/* 000C0 808BAF00 00002825 */  or      $a1, $zero, $zero          ## $a1 = 00000000
-/* 000C4 808BAF04 8FBF001C */  lw      $ra, 0x001C($sp)           
-/* 000C8 808BAF08 8FB00018 */  lw      $s0, 0x0018($sp)           
-/* 000CC 808BAF0C 27BD0030 */  addiu   $sp, $sp, 0x0030           ## $sp = 00000000
-/* 000D0 808BAF10 03E00008 */  jr      $ra                        
-/* 000D4 808BAF14 00000000 */  nop
-
-
diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Update.s
deleted file mode 100644
index 48df28b486..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Update.s
+++ /dev/null
@@ -1,22 +0,0 @@
-glabel BgTokiSwd_Update
-/* 0033C 808BB17C 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 00340 808BB180 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 00344 808BB184 AFA5001C */  sw      $a1, 0x001C($sp)           
-/* 00348 808BB188 AFA40018 */  sw      $a0, 0x0018($sp)           
-/* 0034C 808BB18C 8C99014C */  lw      $t9, 0x014C($a0)           ## 0000014C
-/* 00350 808BB190 0320F809 */  jalr    $ra, $t9                   
-/* 00354 808BB194 00000000 */  nop
-/* 00358 808BB198 8FA4001C */  lw      $a0, 0x001C($sp)           
-/* 0035C 808BB19C 8FA70018 */  lw      $a3, 0x0018($sp)           
-/* 00360 808BB1A0 3C010001 */  lui     $at, 0x0001                ## $at = 00010000
-/* 00364 808BB1A4 34211E60 */  ori     $at, $at, 0x1E60           ## $at = 00011E60
-/* 00368 808BB1A8 00812821 */  addu    $a1, $a0, $at              
-/* 0036C 808BB1AC 0C017713 */  jal     Actor_CollisionCheck_SetOT
-              ## CollisionCheck_setOT
-/* 00370 808BB1B0 24E60150 */  addiu   $a2, $a3, 0x0150           ## $a2 = 00000150
-/* 00374 808BB1B4 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 00378 808BB1B8 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 0037C 808BB1BC 03E00008 */  jr      $ra                        
-/* 00380 808BB1C0 00000000 */  nop
-
-
diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAE40.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAE40.s
deleted file mode 100644
index cf2c1d0e52..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAE40.s
+++ /dev/null
@@ -1,5 +0,0 @@
-glabel func_808BAE40
-/* 00000 808BAE40 03E00008 */  jr      $ra                        
-/* 00004 808BAE44 AC85014C */  sw      $a1, 0x014C($a0)           ## 0000014C
-
-
diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAF40.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAF40.s
deleted file mode 100644
index 9a2cf736a8..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAF40.s
+++ /dev/null
@@ -1,106 +0,0 @@
-glabel func_808BAF40
-/* 00100 808BAF40 27BDFFE0 */  addiu   $sp, $sp, 0xFFE0           ## $sp = FFFFFFE0
-/* 00104 808BAF44 AFB00014 */  sw      $s0, 0x0014($sp)           
-/* 00108 808BAF48 3C108016 */  lui     $s0, 0x8016                ## $s0 = 80160000
-/* 0010C 808BAF4C 2610E660 */  addiu   $s0, $s0, 0xE660           ## $s0 = 8015E660
-/* 00110 808BAF50 960E0EDC */  lhu     $t6, 0x0EDC($s0)           ## 8015F53C
-/* 00114 808BAF54 AFB10018 */  sw      $s1, 0x0018($sp)           
-/* 00118 808BAF58 00A08825 */  or      $s1, $a1, $zero            ## $s1 = 00000000
-/* 0011C 808BAF5C 31CF8000 */  andi    $t7, $t6, 0x8000           ## $t7 = 00000000
-/* 00120 808BAF60 AFBF001C */  sw      $ra, 0x001C($sp)           
-/* 00124 808BAF64 15E00015 */  bne     $t7, $zero, .L808BAFBC     
-/* 00128 808BAF68 AFA40020 */  sw      $a0, 0x0020($sp)           
-/* 0012C 808BAF6C 8E181360 */  lw      $t8, 0x1360($s0)           ## 8015F9C0
-/* 00130 808BAF70 3C054448 */  lui     $a1, 0x4448                ## $a1 = 44480000
-/* 00134 808BAF74 2B010004 */  slti    $at, $t8, 0x0004           
-/* 00138 808BAF78 50200011 */  beql    $at, $zero, .L808BAFC0     
-/* 0013C 808BAF7C 8E0B0004 */  lw      $t3, 0x0004($s0)           ## 8015E664
-/* 00140 808BAF80 0C00B84B */  jal     func_8002E12C              
-/* 00144 808BAF84 24067530 */  addiu   $a2, $zero, 0x7530         ## $a2 = 00007530
-/* 00148 808BAF88 5040000D */  beql    $v0, $zero, .L808BAFC0     
-/* 0014C 808BAF8C 8E0B0004 */  lw      $t3, 0x0004($s0)           ## 8015E664
-/* 00150 808BAF90 0C02FF21 */  jal     func_800BFC84              
-/* 00154 808BAF94 02202025 */  or      $a0, $s1, $zero            ## $a0 = 00000000
-/* 00158 808BAF98 14400008 */  bne     $v0, $zero, .L808BAFBC     
-/* 0015C 808BAF9C 3C09808C */  lui     $t1, %hi(D_808BBD90)       ## $t1 = 808C0000
-/* 00160 808BAFA0 96190EDC */  lhu     $t9, 0x0EDC($s0)           ## 8015F53C
-/* 00164 808BAFA4 2529BD90 */  addiu   $t1, $t1, %lo(D_808BBD90)  ## $t1 = 808BBD90
-/* 00168 808BAFA8 240A0001 */  addiu   $t2, $zero, 0x0001         ## $t2 = 00000001
-/* 0016C 808BAFAC 37288000 */  ori     $t0, $t9, 0x8000           ## $t0 = 00008000
-/* 00170 808BAFB0 A6080EDC */  sh      $t0, 0x0EDC($s0)           ## 8015F53C
-/* 00174 808BAFB4 AE291D68 */  sw      $t1, 0x1D68($s1)           ## 00001D68
-/* 00178 808BAFB8 A20A1414 */  sb      $t2, 0x1414($s0)           ## 8015FA74
-.L808BAFBC:
-/* 0017C 808BAFBC 8E0B0004 */  lw      $t3, 0x0004($s0)           ## 8015E664
-.L808BAFC0:
-/* 00180 808BAFC0 8FA40020 */  lw      $a0, 0x0020($sp)           
-/* 00184 808BAFC4 15600005 */  bne     $t3, $zero, .L808BAFDC     
-/* 00188 808BAFC8 00000000 */  nop
-/* 0018C 808BAFCC 960C0EDE */  lhu     $t4, 0x0EDE($s0)           ## 8015F53E
-/* 00190 808BAFD0 318D0020 */  andi    $t5, $t4, 0x0020           ## $t5 = 00000000
-/* 00194 808BAFD4 51A00026 */  beql    $t5, $zero, .L808BB070     
-/* 00198 808BAFD8 8E081360 */  lw      $t0, 0x1360($s0)           ## 8015F9C0
-.L808BAFDC:
-/* 0019C 808BAFDC 0C00BD04 */  jal     func_8002F410              
-/* 001A0 808BAFE0 02202825 */  or      $a1, $s1, $zero            ## $a1 = 00000000
-/* 001A4 808BAFE4 1040001B */  beq     $v0, $zero, .L808BB054     
-/* 001A8 808BAFE8 8FA40020 */  lw      $a0, 0x0020($sp)           
-/* 001AC 808BAFEC 8E0E0004 */  lw      $t6, 0x0004($s0)           ## 8015E664
-/* 001B0 808BAFF0 3C18808C */  lui     $t8, %hi(D_808BB7A0)       ## $t8 = 808C0000
-/* 001B4 808BAFF4 02202025 */  or      $a0, $s1, $zero            ## $a0 = 00000000
-/* 001B8 808BAFF8 11C00007 */  beq     $t6, $zero, .L808BB018     
-/* 001BC 808BAFFC 2718B7A0 */  addiu   $t8, $t8, %lo(D_808BB7A0)  ## $t8 = 808BB7A0
-/* 001C0 808BB000 0C021344 */  jal     Item_Give              
-/* 001C4 808BB004 2405003C */  addiu   $a1, $zero, 0x003C         ## $a1 = 0000003C
-/* 001C8 808BB008 3C0F808C */  lui     $t7, %hi(D_808BB2F0)       ## $t7 = 808C0000
-/* 001CC 808BB00C 25EFB2F0 */  addiu   $t7, $t7, %lo(D_808BB2F0)  ## $t7 = 808BB2F0
-/* 001D0 808BB010 10000002 */  beq     $zero, $zero, .L808BB01C   
-/* 001D4 808BB014 AE2F1D68 */  sw      $t7, 0x1D68($s1)           ## 00001D68
-.L808BB018:
-/* 001D8 808BB018 AE381D68 */  sw      $t8, 0x1D68($s1)           ## 00001D68
-.L808BB01C:
-/* 001DC 808BB01C 3C041000 */  lui     $a0, 0x1000                ## $a0 = 10000000
-/* 001E0 808BB020 0C03E803 */  jal     Audio_SetBGM
-              
-/* 001E4 808BB024 348400FF */  ori     $a0, $a0, 0x00FF           ## $a0 = 100000FF
-/* 001E8 808BB028 0C03E803 */  jal     Audio_SetBGM
-              
-/* 001EC 808BB02C 24040053 */  addiu   $a0, $zero, 0x0053         ## $a0 = 00000053
-/* 001F0 808BB030 8FA40020 */  lw      $a0, 0x0020($sp)           
-/* 001F4 808BB034 24190001 */  addiu   $t9, $zero, 0x0001         ## $t9 = 00000001
-/* 001F8 808BB038 A2191414 */  sb      $t9, 0x1414($s0)           ## 8015FA74
-/* 001FC 808BB03C 3C05808C */  lui     $a1, %hi(func_808BB0AC)    ## $a1 = 808C0000
-/* 00200 808BB040 24A5B0AC */  addiu   $a1, $a1, %lo(func_808BB0AC) ## $a1 = 808BB0AC
-/* 00204 808BB044 0C22EB90 */  jal     func_808BAE40              
-/* 00208 808BB048 AC800118 */  sw      $zero, 0x0118($a0)         ## 00000118
-/* 0020C 808BB04C 10000008 */  beq     $zero, $zero, .L808BB070   
-/* 00210 808BB050 8E081360 */  lw      $t0, 0x1360($s0)           ## 8015F9C0
-.L808BB054:
-/* 00214 808BB054 0C00B821 */  jal     func_8002E084              
-/* 00218 808BB058 24052000 */  addiu   $a1, $zero, 0x2000         ## $a1 = 00002000
-/* 0021C 808BB05C 10400003 */  beq     $v0, $zero, .L808BB06C     
-/* 00220 808BB060 8FA40020 */  lw      $a0, 0x0020($sp)           
-/* 00224 808BB064 0C00BD60 */  jal     func_8002F580              
-/* 00228 808BB068 02202825 */  or      $a1, $s1, $zero            ## $a1 = 00000000
-.L808BB06C:
-/* 0022C 808BB06C 8E081360 */  lw      $t0, 0x1360($s0)           ## 8015F9C0
-.L808BB070:
-/* 00230 808BB070 24010005 */  addiu   $at, $zero, 0x0005         ## $at = 00000005
-/* 00234 808BB074 15010008 */  bne     $t0, $at, .L808BB098       
-/* 00238 808BB078 3C010001 */  lui     $at, 0x0001                ## $at = 00010000
-/* 0023C 808BB07C 02211021 */  addu    $v0, $s1, $at              
-/* 00240 808BB080 84431D30 */  lh      $v1, 0x1D30($v0)           ## 00001D30
-/* 00244 808BB084 18600003 */  blez    $v1, .L808BB094            
-/* 00248 808BB088 2469FFFF */  addiu   $t1, $v1, 0xFFFF           ## $t1 = FFFFFFFF
-/* 0024C 808BB08C 10000002 */  beq     $zero, $zero, .L808BB098   
-/* 00250 808BB090 A4491D30 */  sh      $t1, 0x1D30($v0)           ## 00001D30
-.L808BB094:
-/* 00254 808BB094 A4401D30 */  sh      $zero, 0x1D30($v0)         ## 00001D30
-.L808BB098:
-/* 00258 808BB098 8FBF001C */  lw      $ra, 0x001C($sp)           
-/* 0025C 808BB09C 8FB00014 */  lw      $s0, 0x0014($sp)           
-/* 00260 808BB0A0 8FB10018 */  lw      $s1, 0x0018($sp)           
-/* 00264 808BB0A4 03E00008 */  jr      $ra                        
-/* 00268 808BB0A8 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
-
-
diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB0AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB0AC.s
deleted file mode 100644
index 714956b3c3..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB0AC.s
+++ /dev/null
@@ -1,39 +0,0 @@
-glabel func_808BB0AC
-/* 0026C 808BB0AC 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 00270 808BB0B0 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 00274 808BB0B4 AFA5001C */  sw      $a1, 0x001C($sp)           
-/* 00278 808BB0B8 0C00BD04 */  jal     func_8002F410              
-/* 0027C 808BB0BC AFA40018 */  sw      $a0, 0x0018($sp)           
-/* 00280 808BB0C0 10400012 */  beq     $v0, $zero, .L808BB10C     
-/* 00284 808BB0C4 8FA40018 */  lw      $a0, 0x0018($sp)           
-/* 00288 808BB0C8 3C0E8016 */  lui     $t6, 0x8016                ## $t6 = 80160000
-/* 0028C 808BB0CC 8DCEE664 */  lw      $t6, -0x199C($t6)          ## 8015E664
-/* 00290 808BB0D0 3C0F808C */  lui     $t7, %hi(BgTokiSwd_Draw)    ## $t7 = 808C0000
-/* 00294 808BB0D4 2405182D */  addiu   $a1, $zero, 0x182D         ## $a1 = 0000182D
-/* 00298 808BB0D8 11C00006 */  beq     $t6, $zero, .L808BB0F4     
-/* 0029C 808BB0DC 25EFB1C4 */  addiu   $t7, $t7, %lo(BgTokiSwd_Draw) ## $t7 = 808BB1C4
-/* 002A0 808BB0E0 0C00BE0A */  jal     Audio_PlayActorSound2
-              
-/* 002A4 808BB0E4 AFA40018 */  sw      $a0, 0x0018($sp)           
-/* 002A8 808BB0E8 8FA40018 */  lw      $a0, 0x0018($sp)           
-/* 002AC 808BB0EC 10000002 */  beq     $zero, $zero, .L808BB0F8   
-/* 002B0 808BB0F0 AC800134 */  sw      $zero, 0x0134($a0)         ## 00000134
-.L808BB0F4:
-/* 002B4 808BB0F4 AC8F0134 */  sw      $t7, 0x0134($a0)           ## 00000134
-.L808BB0F8:
-/* 002B8 808BB0F8 3C05808C */  lui     $a1, %hi(func_808BB128)    ## $a1 = 808C0000
-/* 002BC 808BB0FC 0C22EB90 */  jal     func_808BAE40              
-/* 002C0 808BB100 24A5B128 */  addiu   $a1, $a1, %lo(func_808BB128) ## $a1 = 808BB128
-/* 002C4 808BB104 10000005 */  beq     $zero, $zero, .L808BB11C   
-/* 002C8 808BB108 8FBF0014 */  lw      $ra, 0x0014($sp)           
-.L808BB10C:
-/* 002CC 808BB10C 8FB8001C */  lw      $t8, 0x001C($sp)           
-/* 002D0 808BB110 8F021C44 */  lw      $v0, 0x1C44($t8)           ## 00001C44
-/* 002D4 808BB114 AC440438 */  sw      $a0, 0x0438($v0)           ## 00000438
-/* 002D8 808BB118 8FBF0014 */  lw      $ra, 0x0014($sp)           
-.L808BB11C:
-/* 002DC 808BB11C 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 002E0 808BB120 03E00008 */  jr      $ra                        
-/* 002E4 808BB124 00000000 */  nop
-
-
diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB128.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB128.s
deleted file mode 100644
index 11b8e59c4e..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB128.s
+++ /dev/null
@@ -1,26 +0,0 @@
-glabel func_808BB128
-/* 002E8 808BB128 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 002EC 808BB12C AFA40018 */  sw      $a0, 0x0018($sp)           
-/* 002F0 808BB130 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 002F4 808BB134 AFA5001C */  sw      $a1, 0x001C($sp)           
-/* 002F8 808BB138 00A02025 */  or      $a0, $a1, $zero            ## $a0 = 00000000
-/* 002FC 808BB13C 0C01B129 */  jal     func_8006C4A4              
-/* 00300 808BB140 24050001 */  addiu   $a1, $zero, 0x0001         ## $a1 = 00000001
-/* 00304 808BB144 5040000A */  beql    $v0, $zero, .L808BB170     
-/* 00308 808BB148 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 0030C 808BB14C 8FA2001C */  lw      $v0, 0x001C($sp)           
-/* 00310 808BB150 3C010001 */  lui     $at, 0x0001                ## $at = 00010000
-/* 00314 808BB154 00411021 */  addu    $v0, $v0, $at              
-/* 00318 808BB158 84431D30 */  lh      $v1, 0x1D30($v0)           ## 00001D30
-/* 0031C 808BB15C 286100FF */  slti    $at, $v1, 0x00FF           
-/* 00320 808BB160 10200002 */  beq     $at, $zero, .L808BB16C     
-/* 00324 808BB164 246E0005 */  addiu   $t6, $v1, 0x0005           ## $t6 = 00000005
-/* 00328 808BB168 A44E1D30 */  sh      $t6, 0x1D30($v0)           ## 00001D30
-.L808BB16C:
-/* 0032C 808BB16C 8FBF0014 */  lw      $ra, 0x0014($sp)           
-.L808BB170:
-/* 00330 808BB170 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 00334 808BB174 03E00008 */  jr      $ra                        
-/* 00338 808BB178 00000000 */  nop
-
-
diff --git a/data/overlays/actors/z_bg_toki_swd.data.s b/data/overlays/actors/z_bg_toki_swd.data.s
deleted file mode 100644
index cce1248200..0000000000
--- a/data/overlays/actors/z_bg_toki_swd.data.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.include "macro.inc"
-
- # assembler directives
- .set noat      # allow manual use of $at
- .set noreorder # don't insert nops after branches
- .set gp=64     # allow use of 64-bit general purposee registers
-
-.section .data
-
-glabel D_808BB2F0
- .word 0x00000009, 0x000001A9, 0x0000000A, 0x00000001, 0x000C0000, 0x01000000, 0x00000000, 0x00000000, 0x00000036, 0x00000034, 0x00000000, 0x00000036, 0x00000034, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000001, 0x0002006E, 0x006F0000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0xFFFFFFC5, 0x00000000, 0xFFFFFFE3, 0xFFFFFFC5, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x000A006E, 0x006F0000, 0x00000000, 0x00000000, 0x0000002E, 0xFFFFFFE6, 0x00000000, 0x0000002E, 0xFFFFFFE6, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000001, 0x000800E6, 0x00E700E7, 0x0000002D, 0x00000001, 0x000100D2, 0x00E600E6, 0x00000001, 0x00010000, 0x00F10000, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD9018C, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD9019D, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD901AE, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD902A8, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD90000, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD9007A, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD90064, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD90074, 0xFF000000, 0x42700000, 0xFFD60048, 0xFFD9005F, 0x00000001, 0x00010050, 0x01960000, 0x00000000, 0x42700000, 0xFFFF005F, 0xFFED2F73, 0x00000000, 0x42700000, 0xFFFF005F, 0xFFED6B2F, 0x00000000, 0x42700000, 0xFFFF005F, 0xFFED6169, 0x00000000, 0x42700000, 0xFFFF005F, 0xFFED0000, 0x00000000, 0x42700000, 0xFFFF005F, 0xFFED0005, 0x00000000, 0x42700000, 0xFFFF0081, 0xFFDE7961, 0x00000000, 0x42700000, 0xFFFF00AD, 0xFFED742F, 0x00000000, 0x42700000, 0xFFEF00D9, 0xFFEC2E64, 0x00000000, 0x42700000, 0xFFE80148, 0xFFF40000, 0x00000000, 0x42700000, 0xFFE501FD, 0xFFFE2F73, 0x00000000, 0x42700000, 0xFFD7032D, 0x000A6B2F, 0x00000000, 0x42700000, 0xFFC40505, 0x00266D61, 0x00000000, 0x42700000, 0xFFC60776, 0x005B0000, 0x00000000, 0x42700000, 0xFFCB09DE, 0x00850005, 0x00000000, 0x42700000, 0xFFDF0D75, 0x00C17961, 0x00000000, 0x42700000, 0x00000F78, 0x00E1742F, 0x00000000, 0x42700000, 0x000710DD, 0x00F56565, 0x00000000, 0x42700000, 0x000710DC, 0x00F50000, 0x00000000, 0x42700000, 0x000710DC, 0x00F52F73, 0xFF000000, 0x42700000, 0x000710DC, 0x00F56B2F, 0x00000002, 0x00010000, 0x010E0000, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF72F73, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF76B2F, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF76169, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF70000, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF70005, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF77961, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF7742F, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF72E64, 0xFF00001E, 0x42700000, 0xFFEC0055, 0xFFF70000, 0x00000002, 0x00010050, 0x01A90000, 0x00000005, 0x42700000, 0xFFFF0070, 0x00072F73, 0x00000005, 0x42700000, 0xFFFF0070, 0x00076B2F, 0x00000005, 0x42700000, 0xFFFF0070, 0x00076169, 0x00000005, 0x42700000, 0xFFFF0070, 0x00070000, 0x0000000F, 0x42700000, 0xFFFF0070, 0x00070005, 0x00000014, 0x42700000, 0xFFFF0075, 0x00077961, 0x00000019, 0x42700000, 0xFFFF0075, 0x0007742F, 0x00000019, 0x42700000, 0xFFFF0075, 0x00072E64, 0x00000014, 0x42700000, 0xFFFF0075, 0x00070000, 0x00000014, 0x42700000, 0xFFFF0075, 0x00072F73, 0x00000014, 0x42700000, 0xFFFF0075, 0x00076B2F, 0x00000014, 0x42700000, 0xFFFF0075, 0x00076D61, 0x00000014, 0x42700000, 0xFFFF0075, 0x00070000, 0x00000014, 0x42700000, 0xFFFF0075, 0x00070005, 0x00000014, 0x42700000, 0xFFFF0075, 0x00077961, 0x00000014, 0x42700000, 0xFFFF0075, 0x0007742F, 0x00000014, 0x42700000, 0xFFFF0075, 0x00076565, 0x00000014, 0x42700000, 0xFFFF0075, 0x00070000, 0x00000014, 0x42700000, 0xFFFF0075, 0x00072F73, 0xFF000014, 0x42700000, 0xFFFF0075, 0x00076B2F, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000
-glabel D_808BB7A0
- .word 0x00000009, 0x00000170, 0x00000001, 0x00010000, 0x007E0000, 0x00000000, 0x42700000, 0xFFFF0065, 0xFF92616D, 0x00000000, 0x42200000, 0xFFFF0065, 0xFF926964, 0x00000000, 0x42200000, 0xFFFF0065, 0xFF9200FB, 0x00000000, 0x42200000, 0xFFFF0065, 0xFF920111, 0x00000000, 0x42200000, 0xFFFF0065, 0xFF93012D, 0x00000000, 0x42200000, 0xFFFF0047, 0xFF920033, 0x00000000, 0x42200000, 0xFFFF0048, 0xFF9200FB, 0x00000000, 0x42200000, 0xFFFF0048, 0xFF9200FB, 0x00000000, 0x42200000, 0xFFFF0048, 0xFF922F68, 0xFF000000, 0x42200000, 0xFFFF0048, 0xFF92612F, 0x00000001, 0x0001003A, 0x01530000, 0x00000000, 0x42700001, 0xFFF7006A, 0xFFFDA1BC, 0x00000000, 0x42700000, 0xFFF7006A, 0xFFFDA5F3, 0x00000000, 0x42700000, 0xFFF7006A, 0xFFFDA5EB, 0x00000000, 0x42700000, 0xFFF7006A, 0xFFFDA5A2, 0x00000000, 0x42700000, 0xFFBD006C, 0xFFCBBAEE, 0x00000000, 0x42700000, 0xFFBD006C, 0xFFCBC9B8, 0x00000000, 0x42700000, 0xFFBD006C, 0xFFCB0020, 0x00000000, 0x42700000, 0xFFBD006C, 0xFFCBA5A4, 0x00000000, 0x42700000, 0xFFBD006C, 0xFFCB0020, 0x00000000, 0x42700000, 0xFFAD0066, 0xFFD6A5E1, 0x00000000, 0x42700000, 0xFF8C0051, 0xFFEDA5D0, 0x00000000, 0x42700000, 0xFF8A0051, 0x00360020, 0x00000000, 0x42700000, 0xFF96004E, 0x0074A5A6, 0x00000000, 0x42700000, 0xFFE5004B, 0x00E2A5E5, 0x00000000, 0x42700000, 0x00790052, 0x0138C0AE, 0x00000000, 0x42700000, 0x0128004C, 0x0176A5E5, 0x00000000, 0x42700000, 0x02350050, 0x01010020, 0x00000000, 0x42700000, 0x02660050, 0xFFFFA5EB, 0x00000000, 0x42700000, 0x02520050, 0xFF6FA5E1, 0x00000000, 0x42700000, 0x01DB0050, 0xFE840020, 0x00000000, 0x42700000, 0x01430050, 0xFDFFA5E1, 0x00000000, 0x42700000, 0x00C00050, 0xFDC2A5D0, 0x00000000, 0x42700000, 0xFFD30050, 0xFDA40020, 0x00000000, 0x42700000, 0xFF720050, 0xFDB3A5A6, 0x00000000, 0x42700000, 0xFF1C0050, 0xFDCEA5E5, 0x00000000, 0x42700000, 0xFE88005D, 0xFE23C0AE, 0x00000000, 0x42700000, 0xFDB8005F, 0xFF49A5E5, 0x00000000, 0x42700000, 0xFD9B005F, 0xFFDE0020, 0xFF000000, 0x42700000, 0xFDAD005F, 0x00A1A5EB, 0x00000002, 0x00010000, 0x009B0000, 0x00000005, 0x4221999A, 0xFFFF006F, 0x0005A1BC, 0x00000005, 0x42200000, 0xFFFF006F, 0x0005A5F3, 0x00000005, 0x42200000, 0xFFFF006F, 0x0005A5EB, 0x0000000F, 0x42200000, 0xFFFF006F, 0x0005A5A2, 0x0000000F, 0x42200000, 0xFFFF006F, 0x0005BAEE, 0x0000000F, 0x42200000, 0xFFFF0068, 0x0008C9B8, 0x00000005, 0x42200000, 0xFFFF0068, 0x00080020, 0x0000001E, 0x42200000, 0xFFFF0068, 0x0008A5A4, 0x0000001E, 0x42200000, 0xFFFF0068, 0x00080020, 0xFF00001E, 0x42200000, 0xFFFF0068, 0x0008A5E1, 0x00000002, 0x0001003A, 0x01700000, 0x00000005, 0x42700001, 0x00000078, 0x000CA1BC, 0x00000005, 0x42700000, 0x00000078, 0x000CA5F3, 0x00000005, 0x42700000, 0x00000078, 0x000CA5EB, 0x0000000A, 0x42700000, 0x00000078, 0x000CA5A2, 0x00000005, 0x42700000, 0xFFFF005F, 0x000BBAEE, 0x00000005, 0x42700000, 0xFFFF005F, 0x000BC9B8, 0x00000005, 0x42700000, 0xFFFF005F, 0x000B0020, 0x00000005, 0x42700000, 0xFFFF005F, 0x000BA5A4, 0x00000005, 0x42700000, 0xFFFF005F, 0x000B0020, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5E1, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5D0, 0x0000000A, 0x42700000, 0xFFFD005F, 0x00080020, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5A6, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5E5, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008C0AE, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5E5, 0x0000000A, 0x42700000, 0xFFFD005F, 0x00080020, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5EB, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5E1, 0x0000000A, 0x42700000, 0xFFFD005F, 0x00080020, 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008A5E1, 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008A5D0, 0x0000000F, 0x42700000, 0xFFFD005F, 0x00080020, 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008A5A6, 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008A5E5, 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008C0AE, 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008A5E5, 0x0000000F, 0x42700000, 0xFFFD005F, 0x00080020, 0xFF00001E, 0x42700000, 0xFFFD005F, 0x0008A5EB, 0x0000000A, 0x00000001, 0x000C0000, 0x00B40000, 0x00000000, 0x00000000, 0x0000001C, 0xFFFFFFF6, 0x00000000, 0xFFFFFFF2, 0x00000009, 0x00000000, 0xBE6EEEEF, 0x00000000, 0x00000004, 0x00000001, 0x0002005A, 0x005B0000, 0x00000000, 0x00000000, 0xFFFFFFF2, 0x00000024, 0x00000000, 0xFFFFFFF2, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x000A005A, 0x005B0000, 0x00000000, 0x00000000, 0xFFFFFFF8, 0xFFFFFFDD, 0x00000000, 0xFFFFFFF8, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, 0x00000001, 0x000100BE, 0x00D200D2, 0x000003E8, 0x00000001, 0x000800D2, 0x00D300D3, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000
-glabel D_808BBD90
- .word 0x0000000B, 0x00000BB8, 0x00000021, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFF8, 0xFFFFFFFF, 0x00000000, 0xFFFFFFF8, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000003, 0x00050000, 0x00010000, 0x80000000, 0x00000000, 0x00000000, 0x00000334, 0x00000000, 0x00000000, 0x00000334, 0x00000000, 0x00000000, 0x00000001, 0x00020001, 0x00100000, 0x80000000, 0x00000000, 0x00000000, 0x00000334, 0x00000000, 0x00000000, 0x000002D0, 0x00000000, 0x00000000, 0x00000001, 0x00050010, 0x00B00000, 0x80000000, 0x00000000, 0x00000000, 0x000002D0, 0x00000000, 0x00000000, 0x000002D0, 0x00000000, 0x00000000, 0x00000001, 0x0000003E, 0x00000003, 0x00040028, 0x00467D74, 0x00000000, 0xFFFFFFFF, 0x00000031, 0x000002CF, 0x00000001, 0x0000002F, 0x000002AF, 0x3D888889, 0xBD888889, 0xBD888889, 0x00040046, 0x00DC8010, 0x00000000, 0x00000001, 0x0000002F, 0x000002AF, 0x00000000, 0x00000086, 0x00000015, 0xBBDA740E, 0x3F147AE1, 0x3BDA740E, 0x000200DC, 0x01108000, 0x00000000, 0x00000000, 0x00000086, 0x00000015, 0x00000000, 0x00000065, 0x00000002, 0x00000000, 0xBF227627, 0x00000000, 0x00000003, 0x00000001, 0x000C0154, 0x01550000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000006, 0xFFFF0000, 0x0032FFFF, 0xFFFFFFFF, 0x70E60032, 0x003C0000, 0x00000000, 0xFFFF003C, 0x00FAFFFF, 0xFFFFFFFF, 0x70E700FA, 0x01040000, 0x00000000, 0xFFFF0104, 0x0122FFFF, 0xFFFFFFFF, 0x70E80122, 0x01400000, 0x00000000, 0x00000001, 0x00010000, 0x00FB0000, 0x00000000, 0x42700000, 0xFFC5000C, 0x02B20222, 0x00000000, 0x42700000, 0xFFC5000C, 0x02B200FA, 0x00000000, 0x42700000, 0xFFC5000C, 0x02B20000, 0x00000000, 0x42700000, 0xFFC5000C, 0x02B20000, 0x00000000, 0x42700000, 0xFFC5000C, 0x02B20000, 0x00000000, 0x42700000, 0xFFE10018, 0x02BD0000, 0x00000000, 0x42700000, 0xFFE10018, 0x02BD0000, 0x00000000, 0x42700000, 0xFFE10018, 0x02BD0000, 0x00000000, 0x42700000, 0xFFE10018, 0x02BD2D70, 0x00000000, 0x42700000, 0xFFE10018, 0x02BD0085, 0x00000000, 0x42700000, 0xFFE10018, 0x02BD01E6, 0xFF000000, 0x42700000, 0xFFE10018, 0x02BD0000, 0x00000001, 0x0001005A, 0x014B0000, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0222, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC00FA, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 0xFF000000, 0x42700000, 0xFF66005C, 0x00EC2D70, 0x00000001, 0x000100DC, 0x01EB0000, 0x00000000, 0x42700001, 0xFFFE007A, 0x00270222, 0x00000000, 0x42700001, 0xFFFE007A, 0x002700FA, 0x00000000, 0x42700001, 0xFFFE0066, 0x00270000, 0x00000000, 0x42700001, 0xFFFE005A, 0x00270000, 0x00000000, 0x42700001, 0xFFFE0051, 0x003E0000, 0x00000000, 0x42700001, 0xFFFE0051, 0x003E0000, 0x00000000, 0x42700001, 0xFFFE0051, 0x003E0000, 0x00000000, 0x42700001, 0xFFFE0051, 0x003E0000, 0x00000000, 0x42700001, 0xFFFE0051, 0x003E2D70, 0xFF000000, 0x42700001, 0xFFFE0051, 0x003E0085, 0x00000002, 0x00010000, 0x01180000, 0x0000001E, 0x42700000, 0x002B0034, 0x02CC0222, 0x0000001E, 0x42700000, 0x002B0034, 0x02CC00FA, 0x0000000A, 0x42700000, 0x002B0034, 0x02CC0000, 0x0000000A, 0x42700000, 0x002B0034, 0x02CC0000, 0x0000000A, 0x42700000, 0x002B0034, 0x02CC0000, 0x0000000A, 0x42700000, 0x003F0056, 0x02D20000, 0x0000001E, 0x42700000, 0x003F0056, 0x02D20000, 0x0000001E, 0x42700000, 0x003F0056, 0x02D20000, 0x0000001E, 0x42700000, 0x003F0056, 0x02D22D70, 0x0000001E, 0x42700000, 0x003F0055, 0x02D10085, 0x0000001E, 0x42700000, 0x003F0055, 0x02D101E6, 0xFF00001E, 0x42700000, 0x003E0055, 0x02D10000, 0x00000002, 0x0001005A, 0x01680000, 0x0000001E, 0x42700000, 0xFF970053, 0x016E0222, 0x0000001E, 0x42700000, 0xFF980053, 0x016C00FA, 0x0000001E, 0x42700000, 0xFFC10053, 0x01530000, 0x0000001E, 0x42700000, 0xFFF00063, 0x00FF0000, 0x0000001E, 0x42700000, 0xFFE2006F, 0x00B10000, 0x0000001E, 0x42700000, 0xFFB00070, 0x00790000, 0x0000001E, 0x42700000, 0xFFB00070, 0x00790000, 0x0000001E, 0x42700000, 0xFFB00070, 0x00790000, 0xFF00001E, 0x42700000, 0xFFB00070, 0x00792D70, 0x00000002, 0x000100DC, 0x02080000, 0x0000001E, 0x42700001, 0x00000089, 0xFFC90222, 0x0000001E, 0x42700001, 0x00000089, 0xFFC900FA, 0x0000001E, 0x42700001, 0x00000075, 0xFFC90000, 0x0000001E, 0x42700001, 0x00000069, 0xFFC90000, 0x0000001E, 0x42700001, 0x00000062, 0xFFE10000, 0x0000001E, 0x42700001, 0x00000062, 0xFFE10000, 0x0000001E, 0x42700001, 0x00000062, 0xFFE10000, 0x0000001E, 0x42700001, 0x00000062, 0xFFE10000, 0x0000001E, 0x42700001, 0x00000062, 0xFFE12D70, 0xFF00001E, 0x42700001, 0x00000062, 0xFFE10085, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000
-glabel Bg_Toki_Swd_InitVars
- .word 0x006C0600, 0x00000010, 0x005E0000, 0x0000019C
-.word BgTokiSwd_Init
-.word BgTokiSwd_Destroy
-.word BgTokiSwd_Update
-.word BgTokiSwd_Draw
-glabel D_808BC3E0
- .word 0x0A000039, 0x12010000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00000100, 0x000A0046, 0x00000000, 0x00000000
-glabel D_808BC40C
- .word 0x0A000023, 0x0064FF00
-glabel D_808BC414
- .word 0x48500019, 0x00000000, 0x00000000
-
diff --git a/data/overlays/actors/z_bg_toki_swd.reloc.s b/data/overlays/actors/z_bg_toki_swd.reloc.s
deleted file mode 100644
index 11b803e8ca..0000000000
--- a/data/overlays/actors/z_bg_toki_swd.reloc.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.include "macro.inc"
-
- # assembler directives
- .set noat      # allow manual use of $at
- .set noreorder # don't insert nops after branches
- .set gp=64     # allow use of 64-bit general purposee registers
-
-.section .rodata
-glabel D_808BC460
-
-.incbin "baserom/ovl_Bg_Toki_Swd", 0x1620, 0x000000A0
diff --git a/data/overlays/actors/z_bg_toki_swd.rodata.s b/data/overlays/actors/z_bg_toki_swd.rodata.s
deleted file mode 100644
index 5d4e7c1725..0000000000
--- a/data/overlays/actors/z_bg_toki_swd.rodata.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.include "macro.inc"
-
- # assembler directives
- .set noat      # allow manual use of $at
- .set noreorder # don't insert nops after branches
- .set gp=64     # allow use of 64-bit general purposee registers
-
-.section .rodata
-
-glabel D_808BC420
-    .asciz "../z_bg_toki_swd.c"
-    .balign 4
-
-glabel D_808BC434
-    .asciz "../z_bg_toki_swd.c"
-    .balign 4
-
-glabel D_808BC448
-    .asciz "../z_bg_toki_swd.c"
-    .balign 4
-
-.balign 16
-
diff --git a/spec b/spec
index 342deac111..db21d2c688 100644
--- a/spec
+++ b/spec
@@ -1591,9 +1591,7 @@ endseg
 beginseg
     name "ovl_Bg_Toki_Swd"
     include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.o"
-    include "build/data/overlays/actors/z_bg_toki_swd.data.o"
-    include "build/data/overlays/actors/z_bg_toki_swd.rodata.o"
-    include "build/data/overlays/actors/z_bg_toki_swd.reloc.o"
+    include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_reloc.o"
 endseg
 
 beginseg
diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
index 4b75128177..459d1d3360 100644
--- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
+++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
@@ -1,14 +1,306 @@
+/*
+ * File: z_bg_toki_swd.c
+ * Overlay: ovl_Bg_Toki_Swd
+ * Description: Master Sword (Contains Cutscenes)
+*/
+
 #include "z_bg_toki_swd.h"
 
 #define ROOM  0x00
 #define FLAGS 0x00000010
 
-void BgTokiSwd_Init(BgTokiSwd* this, GlobalContext* globalCtx);
-void BgTokiSwd_Destroy(BgTokiSwd* this, GlobalContext* globalCtx);
-void BgTokiSwd_Update(BgTokiSwd* this, GlobalContext* globalCtx);
-void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx);
+static void BgTokiSwd_Init(BgTokiSwd* this, GlobalContext* globalCtx);
+static void BgTokiSwd_Destroy(BgTokiSwd* this, GlobalContext* globalCtx);
+static void BgTokiSwd_Update(BgTokiSwd* this, GlobalContext* globalCtx);
+static void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx);
+static void BgTokiSwd_SetupAction(BgTokiSwd* this, ActorFunc actionFunc);
+static void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx);
+static void func_808BB0AC(BgTokiSwd* this, GlobalContext* globalCtx);
+static void func_808BB128(BgTokiSwd* this, GlobalContext* globalCtx);
+
+extern u32 D_06001BD0;
+
+static u32 D_808BB2F0[] =
+{
+    0x00000009, 0x000001A9, 0x0000000A, 0x00000001, 
+    0x000C0000, 0x01000000, 0x00000000, 0x00000000, 
+    0x00000036, 0x00000034, 0x00000000, 0x00000036, 
+    0x00000034, 0x00000000, 0x00000000, 0x00000000, 
+    0x00000004, 0x00000001, 0x0002006E, 0x006F0000, 
+    0x00000000, 0x00000000, 0xFFFFFFE3, 0xFFFFFFC5, 
+    0x00000000, 0xFFFFFFE3, 0xFFFFFFC5, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000003, 0x00000001, 
+    0x000A006E, 0x006F0000, 0x00000000, 0x00000000, 
+    0x0000002E, 0xFFFFFFE6, 0x00000000, 0x0000002E, 
+    0xFFFFFFE6, 0x00000000, 0x00000000, 0x00000000, 
+    0x000003E8, 0x00000001, 0x000800E6, 0x00E700E7, 
+    0x0000002D, 0x00000001, 0x000100D2, 0x00E600E6, 
+    0x00000001, 0x00010000, 0x00F10000, 0x00000000, 
+    0x42700000, 0xFFD60048, 0xFFD9018C, 0x00000000, 
+    0x42700000, 0xFFD60048, 0xFFD9019D, 0x00000000, 
+    0x42700000, 0xFFD60048, 0xFFD901AE, 0x00000000, 
+    0x42700000, 0xFFD60048, 0xFFD902A8, 0x00000000, 
+    0x42700000, 0xFFD60048, 0xFFD90000, 0x00000000, 
+    0x42700000, 0xFFD60048, 0xFFD9007A, 0x00000000, 
+    0x42700000, 0xFFD60048, 0xFFD90064, 0x00000000, 
+    0x42700000, 0xFFD60048, 0xFFD90074, 0xFF000000, 
+    0x42700000, 0xFFD60048, 0xFFD9005F, 0x00000001, 
+    0x00010050, 0x01960000, 0x00000000, 0x42700000, 
+    0xFFFF005F, 0xFFED2F73, 0x00000000, 0x42700000, 
+    0xFFFF005F, 0xFFED6B2F, 0x00000000, 0x42700000, 
+    0xFFFF005F, 0xFFED6169, 0x00000000, 0x42700000, 
+    0xFFFF005F, 0xFFED0000, 0x00000000, 0x42700000, 
+    0xFFFF005F, 0xFFED0005, 0x00000000, 0x42700000, 
+    0xFFFF0081, 0xFFDE7961, 0x00000000, 0x42700000, 
+    0xFFFF00AD, 0xFFED742F, 0x00000000, 0x42700000, 
+    0xFFEF00D9, 0xFFEC2E64, 0x00000000, 0x42700000, 
+    0xFFE80148, 0xFFF40000, 0x00000000, 0x42700000, 
+    0xFFE501FD, 0xFFFE2F73, 0x00000000, 0x42700000, 
+    0xFFD7032D, 0x000A6B2F, 0x00000000, 0x42700000, 
+    0xFFC40505, 0x00266D61, 0x00000000, 0x42700000, 
+    0xFFC60776, 0x005B0000, 0x00000000, 0x42700000, 
+    0xFFCB09DE, 0x00850005, 0x00000000, 0x42700000, 
+    0xFFDF0D75, 0x00C17961, 0x00000000, 0x42700000, 
+    0x00000F78, 0x00E1742F, 0x00000000, 0x42700000, 
+    0x000710DD, 0x00F56565, 0x00000000, 0x42700000, 
+    0x000710DC, 0x00F50000, 0x00000000, 0x42700000, 
+    0x000710DC, 0x00F52F73, 0xFF000000, 0x42700000, 
+    0x000710DC, 0x00F56B2F, 0x00000002, 0x00010000, 
+    0x010E0000, 0x0000001E, 0x42700000, 0xFFEC0055, 
+    0xFFF72F73, 0x0000001E, 0x42700000, 0xFFEC0055, 
+    0xFFF76B2F, 0x0000001E, 0x42700000, 0xFFEC0055, 
+    0xFFF76169, 0x0000001E, 0x42700000, 0xFFEC0055, 
+    0xFFF70000, 0x0000001E, 0x42700000, 0xFFEC0055, 
+    0xFFF70005, 0x0000001E, 0x42700000, 0xFFEC0055, 
+    0xFFF77961, 0x0000001E, 0x42700000, 0xFFEC0055, 
+    0xFFF7742F, 0x0000001E, 0x42700000, 0xFFEC0055, 
+    0xFFF72E64, 0xFF00001E, 0x42700000, 0xFFEC0055, 
+    0xFFF70000, 0x00000002, 0x00010050, 0x01A90000, 
+    0x00000005, 0x42700000, 0xFFFF0070, 0x00072F73, 
+    0x00000005, 0x42700000, 0xFFFF0070, 0x00076B2F, 
+    0x00000005, 0x42700000, 0xFFFF0070, 0x00076169, 
+    0x00000005, 0x42700000, 0xFFFF0070, 0x00070000, 
+    0x0000000F, 0x42700000, 0xFFFF0070, 0x00070005, 
+    0x00000014, 0x42700000, 0xFFFF0075, 0x00077961, 
+    0x00000019, 0x42700000, 0xFFFF0075, 0x0007742F, 
+    0x00000019, 0x42700000, 0xFFFF0075, 0x00072E64, 
+    0x00000014, 0x42700000, 0xFFFF0075, 0x00070000, 
+    0x00000014, 0x42700000, 0xFFFF0075, 0x00072F73, 
+    0x00000014, 0x42700000, 0xFFFF0075, 0x00076B2F, 
+    0x00000014, 0x42700000, 0xFFFF0075, 0x00076D61, 
+    0x00000014, 0x42700000, 0xFFFF0075, 0x00070000, 
+    0x00000014, 0x42700000, 0xFFFF0075, 0x00070005, 
+    0x00000014, 0x42700000, 0xFFFF0075, 0x00077961, 
+    0x00000014, 0x42700000, 0xFFFF0075, 0x0007742F, 
+    0x00000014, 0x42700000, 0xFFFF0075, 0x00076565, 
+    0x00000014, 0x42700000, 0xFFFF0075, 0x00070000, 
+    0x00000014, 0x42700000, 0xFFFF0075, 0x00072F73, 
+    0xFF000014, 0x42700000, 0xFFFF0075, 0x00076B2F, 
+    0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000,
+};
+
+static u32 D_808BB7A0[] =
+{
+     0x00000009, 0x00000170, 0x00000001, 0x00010000, 
+     0x007E0000, 0x00000000, 0x42700000, 0xFFFF0065, 
+     0xFF92616D, 0x00000000, 0x42200000, 0xFFFF0065, 
+     0xFF926964, 0x00000000, 0x42200000, 0xFFFF0065, 
+     0xFF9200FB, 0x00000000, 0x42200000, 0xFFFF0065, 
+     0xFF920111, 0x00000000, 0x42200000, 0xFFFF0065,
+     0xFF93012D, 0x00000000, 0x42200000, 0xFFFF0047, 
+     0xFF920033, 0x00000000, 0x42200000, 0xFFFF0048, 
+     0xFF9200FB, 0x00000000, 0x42200000, 0xFFFF0048, 
+     0xFF9200FB, 0x00000000, 0x42200000, 0xFFFF0048, 
+     0xFF922F68, 0xFF000000, 0x42200000, 0xFFFF0048, 
+     0xFF92612F, 0x00000001, 0x0001003A, 0x01530000, 
+     0x00000000, 0x42700001, 0xFFF7006A, 0xFFFDA1BC, 
+     0x00000000, 0x42700000, 0xFFF7006A, 0xFFFDA5F3, 
+     0x00000000, 0x42700000, 0xFFF7006A, 0xFFFDA5EB, 
+     0x00000000, 0x42700000, 0xFFF7006A, 0xFFFDA5A2, 
+     0x00000000, 0x42700000, 0xFFBD006C, 0xFFCBBAEE, 
+     0x00000000, 0x42700000, 0xFFBD006C, 0xFFCBC9B8, 
+     0x00000000, 0x42700000, 0xFFBD006C, 0xFFCB0020, 
+     0x00000000, 0x42700000, 0xFFBD006C, 0xFFCBA5A4, 
+     0x00000000, 0x42700000, 0xFFBD006C, 0xFFCB0020, 
+     0x00000000, 0x42700000, 0xFFAD0066, 0xFFD6A5E1, 
+     0x00000000, 0x42700000, 0xFF8C0051, 0xFFEDA5D0, 
+     0x00000000, 0x42700000, 0xFF8A0051, 0x00360020, 
+     0x00000000, 0x42700000, 0xFF96004E, 0x0074A5A6, 
+     0x00000000, 0x42700000, 0xFFE5004B, 0x00E2A5E5, 
+     0x00000000, 0x42700000, 0x00790052, 0x0138C0AE, 
+     0x00000000, 0x42700000, 0x0128004C, 0x0176A5E5, 
+     0x00000000, 0x42700000, 0x02350050, 0x01010020, 
+     0x00000000, 0x42700000, 0x02660050, 0xFFFFA5EB, 
+     0x00000000, 0x42700000, 0x02520050, 0xFF6FA5E1, 
+     0x00000000, 0x42700000, 0x01DB0050, 0xFE840020, 
+     0x00000000, 0x42700000, 0x01430050, 0xFDFFA5E1, 
+     0x00000000, 0x42700000, 0x00C00050, 0xFDC2A5D0, 
+     0x00000000, 0x42700000, 0xFFD30050, 0xFDA40020, 
+     0x00000000, 0x42700000, 0xFF720050, 0xFDB3A5A6, 
+     0x00000000, 0x42700000, 0xFF1C0050, 0xFDCEA5E5, 
+     0x00000000, 0x42700000, 0xFE88005D, 0xFE23C0AE, 
+     0x00000000, 0x42700000, 0xFDB8005F, 0xFF49A5E5, 
+     0x00000000, 0x42700000, 0xFD9B005F, 0xFFDE0020, 
+     0xFF000000, 0x42700000, 0xFDAD005F, 0x00A1A5EB, 
+     0x00000002, 0x00010000, 0x009B0000, 0x00000005, 
+     0x4221999A, 0xFFFF006F, 0x0005A1BC, 0x00000005, 
+     0x42200000, 0xFFFF006F, 0x0005A5F3, 0x00000005, 
+     0x42200000, 0xFFFF006F, 0x0005A5EB, 0x0000000F, 
+     0x42200000, 0xFFFF006F, 0x0005A5A2, 0x0000000F, 
+     0x42200000, 0xFFFF006F, 0x0005BAEE, 0x0000000F, 
+     0x42200000, 0xFFFF0068, 0x0008C9B8, 0x00000005, 
+     0x42200000, 0xFFFF0068, 0x00080020, 0x0000001E, 
+     0x42200000, 0xFFFF0068, 0x0008A5A4, 0x0000001E, 
+     0x42200000, 0xFFFF0068, 0x00080020, 0xFF00001E, 
+     0x42200000, 0xFFFF0068, 0x0008A5E1, 0x00000002, 
+     0x0001003A, 0x01700000, 0x00000005, 0x42700001, 
+     0x00000078, 0x000CA1BC, 0x00000005, 0x42700000, 
+     0x00000078, 0x000CA5F3, 0x00000005, 0x42700000, 
+     0x00000078, 0x000CA5EB, 0x0000000A, 0x42700000, 
+     0x00000078, 0x000CA5A2, 0x00000005, 0x42700000, 
+     0xFFFF005F, 0x000BBAEE, 0x00000005, 0x42700000, 
+     0xFFFF005F, 0x000BC9B8, 0x00000005, 0x42700000, 
+     0xFFFF005F, 0x000B0020, 0x00000005, 0x42700000, 
+     0xFFFF005F, 0x000BA5A4, 0x00000005, 0x42700000, 
+     0xFFFF005F, 0x000B0020, 0x0000000A, 0x42700000, 
+     0xFFFD005F, 0x0008A5E1, 0x0000000A, 0x42700000, 
+     0xFFFD005F, 0x0008A5D0, 0x0000000A, 0x42700000, 
+     0xFFFD005F, 0x00080020, 0x0000000A, 0x42700000, 
+     0xFFFD005F, 0x0008A5A6, 0x0000000A, 0x42700000, 
+     0xFFFD005F, 0x0008A5E5, 0x0000000A, 0x42700000, 
+     0xFFFD005F, 0x0008C0AE, 0x0000000A, 0x42700000, 
+     0xFFFD005F, 0x0008A5E5, 0x0000000A, 0x42700000, 
+     0xFFFD005F, 0x00080020, 0x0000000A, 0x42700000, 
+     0xFFFD005F, 0x0008A5EB, 0x0000000A, 0x42700000, 
+     0xFFFD005F, 0x0008A5E1, 0x0000000A, 0x42700000, 
+     0xFFFD005F, 0x00080020, 0x0000000F, 0x42700000, 
+     0xFFFD005F, 0x0008A5E1, 0x0000000F, 0x42700000, 
+     0xFFFD005F, 0x0008A5D0, 0x0000000F, 0x42700000, 
+     0xFFFD005F, 0x00080020, 0x0000000F, 0x42700000, 
+     0xFFFD005F, 0x0008A5A6, 0x0000000F, 0x42700000, 
+     0xFFFD005F, 0x0008A5E5, 0x0000000F, 0x42700000, 
+     0xFFFD005F, 0x0008C0AE, 0x0000000F, 0x42700000, 
+     0xFFFD005F, 0x0008A5E5, 0x0000000F, 0x42700000, 
+     0xFFFD005F, 0x00080020, 0xFF00001E, 0x42700000, 
+     0xFFFD005F, 0x0008A5EB, 0x0000000A, 0x00000001, 
+     0x000C0000, 0x00B40000, 0x00000000, 0x00000000, 
+     0x0000001C, 0xFFFFFFF6, 0x00000000, 0xFFFFFFF2, 
+     0x00000009, 0x00000000, 0xBE6EEEEF, 0x00000000, 
+     0x00000004, 0x00000001, 0x0002005A, 0x005B0000, 
+     0x00000000, 0x00000000, 0xFFFFFFF2, 0x00000024, 
+     0x00000000, 0xFFFFFFF2, 0x00000024, 0x00000000, 
+     0x00000000, 0x00000000, 0x00000003, 0x00000001, 
+     0x000A005A, 0x005B0000, 0x00000000, 0x00000000, 
+     0xFFFFFFF8, 0xFFFFFFDD, 0x00000000, 0xFFFFFFF8, 
+     0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 
+     0x0000002D, 0x00000001, 0x000100BE, 0x00D200D2, 
+     0x000003E8, 0x00000001, 0x000800D2, 0x00D300D3, 
+     0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000,
+};
+
+static u32 D_808BBD90[] = 
+{
+    0x0000000B, 0x00000BB8, 0x00000021, 0x00000001, 
+    0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 
+    0xFFFFFFF8, 0xFFFFFFFF, 0x00000000, 0xFFFFFFF8, 
+    0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 
+    0x0000000A, 0x00000003, 0x00050000, 0x00010000, 
+    0x80000000, 0x00000000, 0x00000000, 0x00000334, 
+    0x00000000, 0x00000000, 0x00000334, 0x00000000, 
+    0x00000000, 0x00000001, 0x00020001, 0x00100000, 
+    0x80000000, 0x00000000, 0x00000000, 0x00000334, 
+    0x00000000, 0x00000000, 0x000002D0, 0x00000000, 
+    0x00000000, 0x00000001, 0x00050010, 0x00B00000, 
+    0x80000000, 0x00000000, 0x00000000, 0x000002D0, 
+    0x00000000, 0x00000000, 0x000002D0, 0x00000000, 
+    0x00000000, 0x00000001, 0x0000003E, 0x00000003, 
+    0x00040028, 0x00467D74, 0x00000000, 0xFFFFFFFF, 
+    0x00000031, 0x000002CF, 0x00000001, 0x0000002F, 
+    0x000002AF, 0x3D888889, 0xBD888889, 0xBD888889, 
+    0x00040046, 0x00DC8010, 0x00000000, 0x00000001, 
+    0x0000002F, 0x000002AF, 0x00000000, 0x00000086, 
+    0x00000015, 0xBBDA740E, 0x3F147AE1, 0x3BDA740E, 
+    0x000200DC, 0x01108000, 0x00000000, 0x00000000, 
+    0x00000086, 0x00000015, 0x00000000, 0x00000065, 
+    0x00000002, 0x00000000, 0xBF227627, 0x00000000, 
+    0x00000003, 0x00000001, 0x000C0154, 0x01550000, 
+    0x00000000, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFD, 
+    0xFFFFFFFF, 0x00000000, 0xFFFFFFFD, 0x00000000, 
+    0x00000000, 0x00000000, 0x00000013, 0x00000006, 
+    0xFFFF0000, 0x0032FFFF, 0xFFFFFFFF, 0x70E60032, 
+    0x003C0000, 0x00000000, 0xFFFF003C, 0x00FAFFFF, 
+    0xFFFFFFFF, 0x70E700FA, 0x01040000, 0x00000000, 
+    0xFFFF0104, 0x0122FFFF, 0xFFFFFFFF, 0x70E80122, 
+    0x01400000, 0x00000000, 0x00000001, 0x00010000, 
+    0x00FB0000, 0x00000000, 0x42700000, 0xFFC5000C, 
+    0x02B20222, 0x00000000, 0x42700000, 0xFFC5000C, 
+    0x02B200FA, 0x00000000, 0x42700000, 0xFFC5000C, 
+    0x02B20000, 0x00000000, 0x42700000, 0xFFC5000C, 
+    0x02B20000, 0x00000000, 0x42700000, 0xFFC5000C, 
+    0x02B20000, 0x00000000, 0x42700000, 0xFFE10018, 
+    0x02BD0000, 0x00000000, 0x42700000, 0xFFE10018, 
+    0x02BD0000, 0x00000000, 0x42700000, 0xFFE10018, 
+    0x02BD0000, 0x00000000, 0x42700000, 0xFFE10018, 
+    0x02BD2D70, 0x00000000, 0x42700000, 0xFFE10018, 
+    0x02BD0085, 0x00000000, 0x42700000, 0xFFE10018, 
+    0x02BD01E6, 0xFF000000, 0x42700000, 0xFFE10018, 
+    0x02BD0000, 0x00000001, 0x0001005A, 0x014B0000, 
+    0x00000000, 0x42700000, 0xFF66005C, 0x00EC0222, 
+    0x00000000, 0x42700000, 0xFF66005C, 0x00EC00FA, 
+    0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 
+    0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 
+    0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 
+    0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 
+    0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 
+    0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 
+    0xFF000000, 0x42700000, 0xFF66005C, 0x00EC2D70, 
+    0x00000001, 0x000100DC, 0x01EB0000, 0x00000000, 
+    0x42700001, 0xFFFE007A, 0x00270222, 0x00000000, 
+    0x42700001, 0xFFFE007A, 0x002700FA, 0x00000000, 
+    0x42700001, 0xFFFE0066, 0x00270000, 0x00000000, 
+    0x42700001, 0xFFFE005A, 0x00270000, 0x00000000, 
+    0x42700001, 0xFFFE0051, 0x003E0000, 0x00000000, 
+    0x42700001, 0xFFFE0051, 0x003E0000, 0x00000000, 
+    0x42700001, 0xFFFE0051, 0x003E0000, 0x00000000, 
+    0x42700001, 0xFFFE0051, 0x003E0000, 0x00000000, 
+    0x42700001, 0xFFFE0051, 0x003E2D70, 0xFF000000, 
+    0x42700001, 0xFFFE0051, 0x003E0085, 0x00000002, 
+    0x00010000, 0x01180000, 0x0000001E, 0x42700000, 
+    0x002B0034, 0x02CC0222, 0x0000001E, 0x42700000, 
+    0x002B0034, 0x02CC00FA, 0x0000000A, 0x42700000, 
+    0x002B0034, 0x02CC0000, 0x0000000A, 0x42700000, 
+    0x002B0034, 0x02CC0000, 0x0000000A, 0x42700000, 
+    0x002B0034, 0x02CC0000, 0x0000000A, 0x42700000, 
+    0x003F0056, 0x02D20000, 0x0000001E, 0x42700000, 
+    0x003F0056, 0x02D20000, 0x0000001E, 0x42700000, 
+    0x003F0056, 0x02D20000, 0x0000001E, 0x42700000, 
+    0x003F0056, 0x02D22D70, 0x0000001E, 0x42700000, 
+    0x003F0055, 0x02D10085, 0x0000001E, 0x42700000, 
+    0x003F0055, 0x02D101E6, 0xFF00001E, 0x42700000, 
+    0x003E0055, 0x02D10000, 0x00000002, 0x0001005A, 
+    0x01680000, 0x0000001E, 0x42700000, 0xFF970053, 
+    0x016E0222, 0x0000001E, 0x42700000, 0xFF980053, 
+    0x016C00FA, 0x0000001E, 0x42700000, 0xFFC10053, 
+    0x01530000, 0x0000001E, 0x42700000, 0xFFF00063, 
+    0x00FF0000, 0x0000001E, 0x42700000, 0xFFE2006F, 
+    0x00B10000, 0x0000001E, 0x42700000, 0xFFB00070, 
+    0x00790000, 0x0000001E, 0x42700000, 0xFFB00070, 
+    0x00790000, 0x0000001E, 0x42700000, 0xFFB00070, 
+    0x00790000, 0xFF00001E, 0x42700000, 0xFFB00070, 
+    0x00792D70, 0x00000002, 0x000100DC, 0x02080000, 
+    0x0000001E, 0x42700001, 0x00000089, 0xFFC90222, 
+    0x0000001E, 0x42700001, 0x00000089, 0xFFC900FA, 
+    0x0000001E, 0x42700001, 0x00000075, 0xFFC90000, 
+    0x0000001E, 0x42700001, 0x00000069, 0xFFC90000, 
+    0x0000001E, 0x42700001, 0x00000062, 0xFFE10000, 
+    0x0000001E, 0x42700001, 0x00000062, 0xFFE10000, 
+    0x0000001E, 0x42700001, 0x00000062, 0xFFE10000, 
+    0x0000001E, 0x42700001, 0x00000062, 0xFFE10000, 
+    0x0000001E, 0x42700001, 0x00000062, 0xFFE12D70, 
+    0xFF00001E, 0x42700001, 0x00000062, 0xFFE10085, 
+    0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000,
+};
 
-/*
 const ActorInit Bg_Toki_Swd_InitVars =
 {
     ACTOR_BG_TOKI_SWD,
@@ -22,19 +314,178 @@ const ActorInit Bg_Toki_Swd_InitVars =
     (ActorFunc)BgTokiSwd_Update,
     (ActorFunc)BgTokiSwd_Draw,
 };
-*/
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAE40.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Init.s")
+static ColliderCylinderInit colliderInit =
+{
+    0x0A, 0x00, 0x00, 0x39, 
+    0x12, 0x01, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 
+    0xFFCFFFFF, 
+    0x00, 0x00, 0x00, 0x00, 
+    0xFFCFFFFF,
+    0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x01, 0x00, 
+    0x000A,
+    0x0046, 
+    0x0000000000000000,
+};
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Destroy.s")
+static SubActor98Init subActor98Init =
+{
+    0x0A,
+    0x0023,
+    0x0064,
+    0xFF,
+};
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAF40.s")
+static InitChainEntry initChain[] =
+{
+    ICHAIN_VEC3F_DIV1000(scale, 0x19, ICHAIN_STOP),
+};
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB0AC.s")
+static void BgTokiSwd_SetupAction(BgTokiSwd* this, ActorFunc actionFunc)
+{
+   this->actionFunc = actionFunc;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB128.s")
+static void BgTokiSwd_Init(BgTokiSwd* this, GlobalContext* globalCtx) 
+{
+   ColliderCylinderMain* collision;
+   Actor* thisx = &this->actor;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Update.s")
+   Actor_ProcessInitChain(thisx, initChain);
+   this->actor.shape.unk_08 = 800.0f;
+   BgTokiSwd_SetupAction(thisx, func_808BAF40);
+   collision = &this->collider;
+   if (LINK_IS_ADULT) 
+   { 
+       thisx->draw = NULL;
+   }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Draw.s")
+   if (gSaveContext.scene_setup_index == 5) 
+   {
+       globalCtx->unk_11D30[0] = 0xFF;
+   }
+
+   ActorCollider_AllocCylinder(globalCtx, collision);
+   ActorCollider_InitCylinder(globalCtx, collision, thisx, &colliderInit);
+   ActorCollider_Cylinder_Update(thisx, collision);
+   func_80061ED4(&thisx->sub_98, 0, &subActor98Init);
+}
+
+static void BgTokiSwd_Destroy(BgTokiSwd* this, GlobalContext* globalCtx)
+{
+   ColliderCylinderMain* collider = &this->collider;
+   ActorCollider_FreeCylinder(globalCtx, collider);
+}
+
+static void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx) 
+{
+   if (((gSaveContext.event_chk_inf[4] & 0x8000) == 0) && (gSaveContext.scene_setup_index < 4) && 
+        (func_8002E12C(&this->actor, 800.0f, 0x7530) != 0) && (func_800BFC84(globalCtx) == 0)) 
+   {
+       gSaveContext.event_chk_inf[4] |= 0x8000;
+       globalCtx->csCtx.segment = D_808BBD90;
+       gSaveContext.cutscene_trigger = 1;
+   } 
+   if (LINK_IS_CHILD || ((gSaveContext.event_chk_inf[5] & 0x20) != 0)) 
+   {
+       if (func_8002F410(&this->actor, globalCtx) != 0) 
+       {
+           if (LINK_IS_CHILD) 
+           {
+               Item_Give(globalCtx, ITEM_SWORD_MASTER);
+               globalCtx->csCtx.segment = D_808BB2F0;
+           } 
+           else 
+           {
+               globalCtx->csCtx.segment = D_808BB7A0;
+           }
+           Audio_SetBGM(NA_BGM_STOP);
+           Audio_SetBGM(NA_SE_PL_BOUND_DIRT);
+           gSaveContext.cutscene_trigger = 1;
+           this->actor.attachedA = 0;
+           BgTokiSwd_SetupAction(this, func_808BB0AC);
+       } 
+       else 
+       {
+           if (func_8002E084(&this->actor, 0x2000) != 0) 
+           {
+               func_8002F580(&this->actor, globalCtx);
+           }
+       }
+   } 
+   if (gSaveContext.scene_setup_index == 5) 
+   {
+       if (globalCtx->unk_11D30[0] > 0) 
+       {
+           globalCtx->unk_11D30[0]--;
+       }
+       else
+       {
+           globalCtx->unk_11D30[0] = 0;
+       }
+   }
+}
+
+static void func_808BB0AC(BgTokiSwd* this, GlobalContext* globalCtx)
+{
+    Player* player;
+
+    //if attached is set, sword has been pulled/placed from the pedestal
+    if (func_8002F410(&this->actor, globalCtx) != 0)
+    {
+        if (LINK_IS_CHILD)
+        {
+            Audio_PlayActorSound2(&this->actor, NA_SE_IT_SWORD_PUTAWAY_STN); 
+            this->actor.draw = NULL; //sword has been pulled, dont draw sword
+        }
+        else
+        {
+            this->actor.draw = BgTokiSwd_Draw; //sword has been placed, draw the master sword
+        }
+        BgTokiSwd_SetupAction(this, func_808BB128);
+    }
+    else
+    {
+        player = PLAYER;
+        player->interactRangeActor = &this->actor;
+    }
+}
+
+static void func_808BB128(BgTokiSwd* this, GlobalContext* globalCtx)
+{
+    if ((func_8006C4A4(globalCtx, 1) != 0) && (globalCtx->unk_11D30[0] < 0xFF))
+    {
+        globalCtx->unk_11D30[0] += 5;
+    }
+}
+
+static void BgTokiSwd_Update(BgTokiSwd* this, GlobalContext* globalCtx)
+{
+    this->actionFunc(&this->actor, globalCtx);
+    Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider);
+}
+
+static void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx)
+{
+    s32 pad[4];
+    GameState* state;
+    GraphicsContext* gfxCtx;
+    Gfx* gfxArr[4];
+    state = &globalCtx->state;
+    gfxCtx = globalCtx->state.gfxCtx;
+
+    func_800C6AC4(gfxArr, state->gfxCtx, "../z_bg_toki_swd.c", 727);
+    func_80093D18(globalCtx->state.gfxCtx);
+
+    func_8002EBCC(&this->actor, globalCtx, 0);
+    
+    gSPSegment(gfxCtx->polyOpa.p++, 0x08, Draw_TexScroll(globalCtx->state.gfxCtx, 0, 
+                 -(globalCtx->gameplayFrames % 0x80), 32, 32));
+    gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 742), 
+                G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(gfxCtx->polyOpa.p++, &D_06001BD0);
+  
+    func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 776);
+}
diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h
index 535268eb27..efc0f885d6 100644
--- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h
+++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h
@@ -7,7 +7,8 @@
 typedef struct
 {
     /* 0x0000 */ Actor actor;
-    /* 0x014C */ char unk_14C[0x50];
+    /* 0x014C */ ActorFunc actionFunc;
+    /* 0x0150 */ ColliderCylinderMain collider;
 } BgTokiSwd; // size = 0x019C
 
 extern const ActorInit Bg_Toki_Swd_InitVars;
diff --git a/undefined_syms.txt b/undefined_syms.txt
index 3c5db9e11d..b36919f649 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -408,3 +408,7 @@ D_06000278 = 0x06000278;
 
 // z_obj_bombiwa
 D_060009E0 = 0x060009E0;
+
+// z_bg_toki_swd
+D_06001BD0 = 0x06001BD0;
+