diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978FCC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978FCC.s
deleted file mode 100644
index 94308726b2..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978FCC.s
+++ /dev/null
@@ -1,29 +0,0 @@
-glabel func_80978FCC
-/* 0069C 80978FCC 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 006A0 80978FD0 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 006A4 80978FD4 AFA5001C */  sw      $a1, 0x001C($sp)           
-/* 006A8 80978FD8 AFA60020 */  sw      $a2, 0x0020($sp)           
-/* 006AC 80978FDC AFA70024 */  sw      $a3, 0x0024($sp)           
-/* 006B0 80978FE0 0C25E3AF */  jal     func_80978EBC              
-/* 006B4 80978FE4 AFA40018 */  sw      $a0, 0x0018($sp)           
-/* 006B8 80978FE8 1440000A */  bne     $v0, $zero, .L80979014     
-/* 006BC 80978FEC 8FA40018 */  lw      $a0, 0x0018($sp)           
-/* 006C0 80978FF0 8FAE0020 */  lw      $t6, 0x0020($sp)           
-/* 006C4 80978FF4 AC8E0164 */  sw      $t6, 0x0164($a0)           ## 00000164
-/* 006C8 80978FF8 8FAF0024 */  lw      $t7, 0x0024($sp)           
-/* 006CC 80978FFC AC8F0168 */  sw      $t7, 0x0168($a0)           ## 00000168
-/* 006D0 80979000 8FA60028 */  lw      $a2, 0x0028($sp)           
-/* 006D4 80979004 0C25E3D8 */  jal     func_80978F60              
-/* 006D8 80979008 8FA5001C */  lw      $a1, 0x001C($sp)           
-/* 006DC 8097900C 10000004 */  beq     $zero, $zero, .L80979020   
-/* 006E0 80979010 24020001 */  addiu   $v0, $zero, 0x0001         ## $v0 = 00000001
-.L80979014:
-/* 006E4 80979014 0C00B55C */  jal     Actor_Kill
-              
-/* 006E8 80979018 00000000 */  nop
-/* 006EC 8097901C 00001025 */  or      $v0, $zero, $zero          ## $v0 = 00000000
-.L80979020:
-/* 006F0 80979020 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 006F4 80979024 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 006F8 80979028 03E00008 */  jr      $ra                        
-/* 006FC 8097902C 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s
deleted file mode 100644
index eb54b0aaa0..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s
+++ /dev/null
@@ -1,75 +0,0 @@
-.rdata
-glabel D_8097BFF0
-    .asciz "../z_demo_gj.c"
-    .balign 4
-
-glabel D_8097C000
-    .asciz "../z_demo_gj.c"
-    .balign 4
-
-glabel D_8097C010
-    .asciz "../z_demo_gj.c"
-    .balign 4
-
-.text
-glabel func_80979030
-/* 00700 80979030 27BDFFB8 */  addiu   $sp, $sp, 0xFFB8           ## $sp = FFFFFFB8
-/* 00704 80979034 3C0E8016 */  lui     $t6, %hi(gGameInfo)
-/* 00708 80979038 8DCEFA90 */  lw      $t6, %lo(gGameInfo)($t6)
-/* 0070C 8097903C AFBF001C */  sw      $ra, 0x001C($sp)           
-/* 00710 80979040 AFB00018 */  sw      $s0, 0x0018($sp)           
-/* 00714 80979044 AFA40048 */  sw      $a0, 0x0048($sp)           
-/* 00718 80979048 AFA5004C */  sw      $a1, 0x004C($sp)           
-/* 0071C 8097904C AFA60050 */  sw      $a2, 0x0050($sp)           
-/* 00720 80979050 85CF1454 */  lh      $t7, 0x1454($t6)           ## 80161454
-/* 00724 80979054 3C068098 */  lui     $a2, %hi(D_8097BFF0)       ## $a2 = 80980000
-/* 00728 80979058 24C6BFF0 */  addiu   $a2, $a2, %lo(D_8097BFF0)  ## $a2 = 8097BFF0
-/* 0072C 8097905C 15E0002A */  bne     $t7, $zero, .L80979108     
-/* 00730 80979060 27A40030 */  addiu   $a0, $sp, 0x0030           ## $a0 = FFFFFFE8
-/* 00734 80979064 8CB00000 */  lw      $s0, 0x0000($a1)           ## 00000000
-/* 00738 80979068 2407048B */  addiu   $a3, $zero, 0x048B         ## $a3 = 0000048B
-/* 0073C 8097906C 0C031AB1 */  jal     Graph_OpenDisps              
-/* 00740 80979070 02002825 */  or      $a1, $s0, $zero            ## $a1 = 00000000
-/* 00744 80979074 0C024F46 */  jal     func_80093D18              
-/* 00748 80979078 02002025 */  or      $a0, $s0, $zero            ## $a0 = 00000000
-/* 0074C 8097907C 8E0202C0 */  lw      $v0, 0x02C0($s0)           ## 000002C0
-/* 00750 80979080 3C08DA38 */  lui     $t0, 0xDA38                ## $t0 = DA380000
-/* 00754 80979084 35080002 */  ori     $t0, $t0, 0x0002           ## $t0 = DA380002
-/* 00758 80979088 24590008 */  addiu   $t9, $v0, 0x0008           ## $t9 = 00000008
-/* 0075C 8097908C AE1902C0 */  sw      $t9, 0x02C0($s0)           ## 000002C0
-/* 00760 80979090 3C058098 */  lui     $a1, %hi(D_8097C000)       ## $a1 = 80980000
-/* 00764 80979094 AC480000 */  sw      $t0, 0x0000($v0)           ## 00000000
-/* 00768 80979098 24A5C000 */  addiu   $a1, $a1, %lo(D_8097C000)  ## $a1 = 8097C000
-/* 0076C 8097909C 02002025 */  or      $a0, $s0, $zero            ## $a0 = 00000000
-/* 00770 809790A0 2406048D */  addiu   $a2, $zero, 0x048D         ## $a2 = 0000048D
-/* 00774 809790A4 0C0346A2 */  jal     Matrix_NewMtx              
-/* 00778 809790A8 AFA2002C */  sw      $v0, 0x002C($sp)           
-/* 0077C 809790AC 8FA3002C */  lw      $v1, 0x002C($sp)           
-/* 00780 809790B0 3C0ADE00 */  lui     $t2, 0xDE00                ## $t2 = DE000000
-/* 00784 809790B4 3C0DD838 */  lui     $t5, 0xD838                ## $t5 = D8380000
-/* 00788 809790B8 AC620004 */  sw      $v0, 0x0004($v1)           ## 00000004
-/* 0078C 809790BC 8E0202C0 */  lw      $v0, 0x02C0($s0)           ## 000002C0
-/* 00790 809790C0 35AD0002 */  ori     $t5, $t5, 0x0002           ## $t5 = D8380002
-/* 00794 809790C4 240E0040 */  addiu   $t6, $zero, 0x0040         ## $t6 = 00000040
-/* 00798 809790C8 24490008 */  addiu   $t1, $v0, 0x0008           ## $t1 = 00000008
-/* 0079C 809790CC AE0902C0 */  sw      $t1, 0x02C0($s0)           ## 000002C0
-/* 007A0 809790D0 AC4A0000 */  sw      $t2, 0x0000($v0)           ## 00000000
-/* 007A4 809790D4 8FAB0050 */  lw      $t3, 0x0050($sp)           
-/* 007A8 809790D8 3C068098 */  lui     $a2, %hi(D_8097C010)       ## $a2 = 80980000
-/* 007AC 809790DC 24C6C010 */  addiu   $a2, $a2, %lo(D_8097C010)  ## $a2 = 8097C010
-/* 007B0 809790E0 AC4B0004 */  sw      $t3, 0x0004($v0)           ## 00000004
-/* 007B4 809790E4 8E0202C0 */  lw      $v0, 0x02C0($s0)           ## 000002C0
-/* 007B8 809790E8 27A40030 */  addiu   $a0, $sp, 0x0030           ## $a0 = FFFFFFE8
-/* 007BC 809790EC 02002825 */  or      $a1, $s0, $zero            ## $a1 = 00000000
-/* 007C0 809790F0 244C0008 */  addiu   $t4, $v0, 0x0008           ## $t4 = 00000008
-/* 007C4 809790F4 AE0C02C0 */  sw      $t4, 0x02C0($s0)           ## 000002C0
-/* 007C8 809790F8 24070491 */  addiu   $a3, $zero, 0x0491         ## $a3 = 00000491
-/* 007CC 809790FC AC4E0004 */  sw      $t6, 0x0004($v0)           ## 00000004
-/* 007D0 80979100 0C031AD5 */  jal     Graph_CloseDisps              
-/* 007D4 80979104 AC4D0000 */  sw      $t5, 0x0000($v0)           ## 00000000
-.L80979108:
-/* 007D8 80979108 8FBF001C */  lw      $ra, 0x001C($sp)           
-/* 007DC 8097910C 8FB00018 */  lw      $s0, 0x0018($sp)           
-/* 007E0 80979110 27BD0048 */  addiu   $sp, $sp, 0x0048           ## $sp = 00000000
-/* 007E4 80979114 03E00008 */  jr      $ra                        
-/* 007E8 80979118 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979FD0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979FD0.s
deleted file mode 100644
index b480d16b7f..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979FD0.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_80979FD0
-/* 016A0 80979FD0 27BDFFE0 */  addiu   $sp, $sp, 0xFFE0           ## $sp = FFFFFFE0
-/* 016A4 80979FD4 3C0E0600 */  lui     $t6, %hi(D_06001F70)                ## $t6 = 06000000
-/* 016A8 80979FD8 AFBF001C */  sw      $ra, 0x001C($sp)           
-/* 016AC 80979FDC 25CE1F70 */  addiu   $t6, $t6, %lo(D_06001F70)           ## $t6 = 06001F70
-/* 016B0 80979FE0 AFAE0010 */  sw      $t6, 0x0010($sp)           
-/* 016B4 80979FE4 24060001 */  addiu   $a2, $zero, 0x0001         ## $a2 = 00000001
-/* 016B8 80979FE8 0C25E3F3 */  jal     func_80978FCC              
-/* 016BC 80979FEC 24070002 */  addiu   $a3, $zero, 0x0002         ## $a3 = 00000002
-/* 016C0 80979FF0 8FBF001C */  lw      $ra, 0x001C($sp)           
-/* 016C4 80979FF4 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
-/* 016C8 80979FF8 03E00008 */  jr      $ra                        
-/* 016CC 80979FFC 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A160.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A160.s
deleted file mode 100644
index 576bebeece..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A160.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_8097A160
-/* 01830 8097A160 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 01834 8097A164 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 01838 8097A168 AFA40018 */  sw      $a0, 0x0018($sp)           
-/* 0183C 8097A16C 0C25E3B9 */  jal     func_80978EE4              
-/* 01840 8097A170 AFA5001C */  sw      $a1, 0x001C($sp)           
-/* 01844 8097A174 8FA40018 */  lw      $a0, 0x0018($sp)           
-/* 01848 8097A178 0C25E839 */  jal     func_8097A0E4              
-/* 0184C 8097A17C 8FA5001C */  lw      $a1, 0x001C($sp)           
-/* 01850 8097A180 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 01854 8097A184 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 01858 8097A188 03E00008 */  jr      $ra                        
-/* 0185C 8097A18C 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1C0.s
deleted file mode 100644
index 9305e37aed..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1C0.s
+++ /dev/null
@@ -1,10 +0,0 @@
-glabel func_8097A1C0
-/* 01890 8097A1C0 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 01894 8097A1C4 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 01898 8097A1C8 3C060600 */  lui     $a2, %hi(D_06001D20)                ## $a2 = 06000000
-/* 0189C 8097A1CC 0C25E40C */  jal     func_80979030              
-/* 018A0 8097A1D0 24C61D20 */  addiu   $a2, $a2, %lo(D_06001D20)           ## $a2 = 06001D20
-/* 018A4 8097A1D4 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 018A8 8097A1D8 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 018AC 8097A1DC 03E00008 */  jr      $ra                        
-/* 018B0 8097A1E0 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A39C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A39C.s
deleted file mode 100644
index d03c20137a..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A39C.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_8097A39C
-/* 01A6C 8097A39C 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 01A70 8097A3A0 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 01A74 8097A3A4 AFA40018 */  sw      $a0, 0x0018($sp)           
-/* 01A78 8097A3A8 0C25E3B9 */  jal     func_80978EE4              
-/* 01A7C 8097A3AC AFA5001C */  sw      $a1, 0x001C($sp)           
-/* 01A80 8097A3B0 8FA40018 */  lw      $a0, 0x0018($sp)           
-/* 01A84 8097A3B4 0C25E8C8 */  jal     func_8097A320              
-/* 01A88 8097A3B8 8FA5001C */  lw      $a1, 0x001C($sp)           
-/* 01A8C 8097A3BC 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 01A90 8097A3C0 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 01A94 8097A3C4 03E00008 */  jr      $ra                        
-/* 01A98 8097A3C8 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3CC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3CC.s
deleted file mode 100644
index 4cd5ef3fa1..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3CC.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_8097A3CC
-/* 01A9C 8097A3CC 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 01AA0 8097A3D0 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 01AA4 8097A3D4 AFA40018 */  sw      $a0, 0x0018($sp)           
-/* 01AA8 8097A3D8 0C25E88E */  jal     func_8097A238              
-/* 01AAC 8097A3DC AFA5001C */  sw      $a1, 0x001C($sp)           
-/* 01AB0 8097A3E0 8FA40018 */  lw      $a0, 0x0018($sp)           
-/* 01AB4 8097A3E4 0C25E8DB */  jal     func_8097A36C              
-/* 01AB8 8097A3E8 8FA5001C */  lw      $a1, 0x001C($sp)           
-/* 01ABC 8097A3EC 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 01AC0 8097A3F0 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 01AC4 8097A3F4 03E00008 */  jr      $ra                        
-/* 01AC8 8097A3F8 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3FC.s
deleted file mode 100644
index 0b8bfe002f..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3FC.s
+++ /dev/null
@@ -1,10 +0,0 @@
-glabel func_8097A3FC
-/* 01ACC 8097A3FC 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 01AD0 8097A400 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 01AD4 8097A404 3C060600 */  lui     $a2, %hi(D_06002160)                ## $a2 = 06000000
-/* 01AD8 8097A408 0C25E40C */  jal     func_80979030              
-/* 01ADC 8097A40C 24C62160 */  addiu   $a2, $a2, %lo(D_06002160)           ## $a2 = 06002160
-/* 01AE0 8097A410 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 01AE4 8097A414 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 01AE8 8097A418 03E00008 */  jr      $ra                        
-/* 01AEC 8097A41C 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A420.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A420.s
deleted file mode 100644
index b87dba36d1..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A420.s
+++ /dev/null
@@ -1,10 +0,0 @@
-glabel func_8097A420
-/* 01AF0 8097A420 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 01AF4 8097A424 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 01AF8 8097A428 3C060600 */  lui     $a2, %hi(D_06002160)                ## $a2 = 06000000
-/* 01AFC 8097A42C 0C25E447 */  jal     func_8097911C              
-/* 01B00 8097A430 24C62160 */  addiu   $a2, $a2, %lo(D_06002160)           ## $a2 = 06002160
-/* 01B04 8097A434 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 01B08 8097A438 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 01B0C 8097A43C 03E00008 */  jr      $ra                        
-/* 01B10 8097A440 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A444.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A444.s
deleted file mode 100644
index c71e8c20c1..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A444.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_8097A444
-/* 01B14 8097A444 27BDFFE0 */  addiu   $sp, $sp, 0xFFE0           ## $sp = FFFFFFE0
-/* 01B18 8097A448 3C0E0600 */  lui     $t6, %hi(D_06002850)                ## $t6 = 06000000
-/* 01B1C 8097A44C AFBF001C */  sw      $ra, 0x001C($sp)           
-/* 01B20 8097A450 25CE2850 */  addiu   $t6, $t6, %lo(D_06002850)           ## $t6 = 06002850
-/* 01B24 8097A454 AFAE0010 */  sw      $t6, 0x0010($sp)           
-/* 01B28 8097A458 24060003 */  addiu   $a2, $zero, 0x0003         ## $a2 = 00000003
-/* 01B2C 8097A45C 0C25E3F3 */  jal     func_80978FCC              
-/* 01B30 8097A460 24070004 */  addiu   $a3, $zero, 0x0004         ## $a3 = 00000004
-/* 01B34 8097A464 8FBF001C */  lw      $ra, 0x001C($sp)           
-/* 01B38 8097A468 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
-/* 01B3C 8097A46C 03E00008 */  jr      $ra                        
-/* 01B40 8097A470 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A56C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A56C.s
deleted file mode 100644
index 7c474221df..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A56C.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_8097A56C
-/* 01C3C 8097A56C 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 01C40 8097A570 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 01C44 8097A574 AFA40018 */  sw      $a0, 0x0018($sp)           
-/* 01C48 8097A578 0C25E3B9 */  jal     func_80978EE4              
-/* 01C4C 8097A57C AFA5001C */  sw      $a1, 0x001C($sp)           
-/* 01C50 8097A580 8FA40018 */  lw      $a0, 0x0018($sp)           
-/* 01C54 8097A584 0C25E93C */  jal     func_8097A4F0              
-/* 01C58 8097A588 8FA5001C */  lw      $a1, 0x001C($sp)           
-/* 01C5C 8097A58C 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 01C60 8097A590 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 01C64 8097A594 03E00008 */  jr      $ra                        
-/* 01C68 8097A598 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A59C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A59C.s
deleted file mode 100644
index fcacdd5b96..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A59C.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_8097A59C
-/* 01C6C 8097A59C 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 01C70 8097A5A0 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 01C74 8097A5A4 AFA40018 */  sw      $a0, 0x0018($sp)           
-/* 01C78 8097A5A8 0C25E91D */  jal     func_8097A474              
-/* 01C7C 8097A5AC AFA5001C */  sw      $a1, 0x001C($sp)           
-/* 01C80 8097A5B0 8FA40018 */  lw      $a0, 0x0018($sp)           
-/* 01C84 8097A5B4 0C25E94F */  jal     func_8097A53C              
-/* 01C88 8097A5B8 8FA5001C */  lw      $a1, 0x001C($sp)           
-/* 01C8C 8097A5BC 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 01C90 8097A5C0 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 01C94 8097A5C4 03E00008 */  jr      $ra                        
-/* 01C98 8097A5C8 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5CC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5CC.s
deleted file mode 100644
index 7dac85f11e..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5CC.s
+++ /dev/null
@@ -1,10 +0,0 @@
-glabel func_8097A5CC
-/* 01C9C 8097A5CC 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 01CA0 8097A5D0 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 01CA4 8097A5D4 3C060600 */  lui     $a2, %hi(D_06002600)                ## $a2 = 06000000
-/* 01CA8 8097A5D8 0C25E40C */  jal     func_80979030              
-/* 01CAC 8097A5DC 24C62600 */  addiu   $a2, $a2, %lo(D_06002600)           ## $a2 = 06002600
-/* 01CB0 8097A5E0 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 01CB4 8097A5E4 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 01CB8 8097A5E8 03E00008 */  jr      $ra                        
-/* 01CBC 8097A5EC 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5F0.s
deleted file mode 100644
index e303713b56..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5F0.s
+++ /dev/null
@@ -1,10 +0,0 @@
-glabel func_8097A5F0
-/* 01CC0 8097A5F0 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 01CC4 8097A5F4 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 01CC8 8097A5F8 3C060600 */  lui     $a2, %hi(D_06002600)                ## $a2 = 06000000
-/* 01CCC 8097A5FC 0C25E447 */  jal     func_8097911C              
-/* 01CD0 8097A600 24C62600 */  addiu   $a2, $a2, %lo(D_06002600)           ## $a2 = 06002600
-/* 01CD4 8097A604 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 01CD8 8097A608 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 01CDC 8097A60C 03E00008 */  jr      $ra                        
-/* 01CE0 8097A610 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A614.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A614.s
deleted file mode 100644
index aff5ea12a9..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A614.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_8097A614
-/* 01CE4 8097A614 27BDFFE0 */  addiu   $sp, $sp, 0xFFE0           ## $sp = FFFFFFE0
-/* 01CE8 8097A618 3C0E0600 */  lui     $t6, %hi(D_06002D28)                ## $t6 = 06000000
-/* 01CEC 8097A61C AFBF001C */  sw      $ra, 0x001C($sp)           
-/* 01CF0 8097A620 25CE2D28 */  addiu   $t6, $t6, %lo(D_06002D28)           ## $t6 = 06002D28
-/* 01CF4 8097A624 AFAE0010 */  sw      $t6, 0x0010($sp)           
-/* 01CF8 8097A628 24060004 */  addiu   $a2, $zero, 0x0004         ## $a2 = 00000004
-/* 01CFC 8097A62C 0C25E3F3 */  jal     func_80978FCC              
-/* 01D00 8097A630 24070005 */  addiu   $a3, $zero, 0x0005         ## $a3 = 00000005
-/* 01D04 8097A634 8FBF001C */  lw      $ra, 0x001C($sp)           
-/* 01D08 8097A638 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
-/* 01D0C 8097A63C 03E00008 */  jr      $ra                        
-/* 01D10 8097A640 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A73C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A73C.s
deleted file mode 100644
index 4622a9e198..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A73C.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_8097A73C
-/* 01E0C 8097A73C 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 01E10 8097A740 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 01E14 8097A744 AFA40018 */  sw      $a0, 0x0018($sp)           
-/* 01E18 8097A748 0C25E3B9 */  jal     func_80978EE4              
-/* 01E1C 8097A74C AFA5001C */  sw      $a1, 0x001C($sp)           
-/* 01E20 8097A750 8FA40018 */  lw      $a0, 0x0018($sp)           
-/* 01E24 8097A754 0C25E9B0 */  jal     func_8097A6C0              
-/* 01E28 8097A758 8FA5001C */  lw      $a1, 0x001C($sp)           
-/* 01E2C 8097A75C 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 01E30 8097A760 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 01E34 8097A764 03E00008 */  jr      $ra                        
-/* 01E38 8097A768 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A76C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A76C.s
deleted file mode 100644
index 09df6c1eae..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A76C.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_8097A76C
-/* 01E3C 8097A76C 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 01E40 8097A770 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 01E44 8097A774 AFA40018 */  sw      $a0, 0x0018($sp)           
-/* 01E48 8097A778 0C25E991 */  jal     func_8097A644              
-/* 01E4C 8097A77C AFA5001C */  sw      $a1, 0x001C($sp)           
-/* 01E50 8097A780 8FA40018 */  lw      $a0, 0x0018($sp)           
-/* 01E54 8097A784 0C25E9C3 */  jal     func_8097A70C              
-/* 01E58 8097A788 8FA5001C */  lw      $a1, 0x001C($sp)           
-/* 01E5C 8097A78C 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 01E60 8097A790 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 01E64 8097A794 03E00008 */  jr      $ra                        
-/* 01E68 8097A798 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A79C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A79C.s
deleted file mode 100644
index a847e67d2e..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A79C.s
+++ /dev/null
@@ -1,10 +0,0 @@
-glabel func_8097A79C
-/* 01E6C 8097A79C 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 01E70 8097A7A0 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 01E74 8097A7A4 3C060600 */  lui     $a2, %hi(D_06002A40)                ## $a2 = 06000000
-/* 01E78 8097A7A8 0C25E40C */  jal     func_80979030              
-/* 01E7C 8097A7AC 24C62A40 */  addiu   $a2, $a2, %lo(D_06002A40)           ## $a2 = 06002A40
-/* 01E80 8097A7B0 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 01E84 8097A7B4 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 01E88 8097A7B8 03E00008 */  jr      $ra                        
-/* 01E8C 8097A7BC 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7C0.s
deleted file mode 100644
index 8b2a63892f..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7C0.s
+++ /dev/null
@@ -1,10 +0,0 @@
-glabel func_8097A7C0
-/* 01E90 8097A7C0 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
-/* 01E94 8097A7C4 AFBF0014 */  sw      $ra, 0x0014($sp)           
-/* 01E98 8097A7C8 3C060600 */  lui     $a2, %hi(D_06002A40)                ## $a2 = 06000000
-/* 01E9C 8097A7CC 0C25E447 */  jal     func_8097911C              
-/* 01EA0 8097A7D0 24C62A40 */  addiu   $a2, $a2, %lo(D_06002A40)           ## $a2 = 06002A40
-/* 01EA4 8097A7D4 8FBF0014 */  lw      $ra, 0x0014($sp)           
-/* 01EA8 8097A7D8 27BD0018 */  addiu   $sp, $sp, 0x0018           ## $sp = 00000000
-/* 01EAC 8097A7DC 03E00008 */  jr      $ra                        
-/* 01EB0 8097A7E0 00000000 */  nop
diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7E4.s
deleted file mode 100644
index 412e0009e0..0000000000
--- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7E4.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_8097A7E4
-/* 01EB4 8097A7E4 27BDFFE0 */  addiu   $sp, $sp, 0xFFE0           ## $sp = FFFFFFE0
-/* 01EB8 8097A7E8 3C0E0600 */  lui     $t6, %hi(D_06002FE4)                ## $t6 = 06000000
-/* 01EBC 8097A7EC AFBF001C */  sw      $ra, 0x001C($sp)           
-/* 01EC0 8097A7F0 25CE2FE4 */  addiu   $t6, $t6, %lo(D_06002FE4)           ## $t6 = 06002FE4
-/* 01EC4 8097A7F4 AFAE0010 */  sw      $t6, 0x0010($sp)           
-/* 01EC8 8097A7F8 24060005 */  addiu   $a2, $zero, 0x0005         ## $a2 = 00000005
-/* 01ECC 8097A7FC 0C25E3F3 */  jal     func_80978FCC              
-/* 01ED0 8097A800 24070006 */  addiu   $a3, $zero, 0x0006         ## $a3 = 00000006
-/* 01ED4 8097A804 8FBF001C */  lw      $ra, 0x001C($sp)           
-/* 01ED8 8097A808 27BD0020 */  addiu   $sp, $sp, 0x0020           ## $sp = 00000000
-/* 01EDC 8097A80C 03E00008 */  jr      $ra                        
-/* 01EE0 8097A810 00000000 */  nop
diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
index 22e278ca7e..64816dbde0 100644
--- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
+++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
@@ -12,13 +12,13 @@ void DemoGj_Draw(Actor* thisx, GlobalContext* globalCtx);
 extern UNK_TYPE D_06000DC0;
 extern UNK_TYPE D_06000EA0;
 extern UNK_TYPE D_06001B70;
-extern UNK_TYPE D_06001D20;
-extern UNK_TYPE D_06001F70;
-extern UNK_TYPE D_06002160;
+extern Gfx D_06001D20;
+extern CollisionHeader D_06001F70;
+extern Gfx D_06002160;
 extern UNK_TYPE D_06002448;
-extern UNK_TYPE D_06002600;
+extern Gfx D_06002600;
 extern UNK_TYPE D_06002850;
-extern UNK_TYPE D_06002A40;
+extern Gfx D_06002A40;
 extern UNK_TYPE D_06002D28;
 extern UNK_TYPE D_06002E80;
 extern UNK_TYPE D_06002FE4;
@@ -176,6 +176,13 @@ void func_80978AC4(DemoGj* this, GlobalContext* globalCtx) {
     Audio_PlaySoundAtPosition(globalCtx, &this->dyna.actor.world.pos, 0x32, NA_SE_EV_GRAVE_EXPLOSION);
 }
 
+void func_80978AFC(GlobalContext *globalCtx, Vec3f *arg1, f32 arg2);
+/*
+void func_80978AFC(GlobalContext *globalCtx, Vec3f *arg1, f32 arg2) {
+    arg2 = arg2;
+    func_800283D4(globalCtx, arg1, &D_8097BE64, &D_8097BE70, &D_8097BE7C, &D_8097BE80, (s32) ((Rand_ZeroOne() * (arg2 * 0.2f)) + arg2), 0xF, 0x5A);
+}
+*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978AFC.s")
 
 void func_80978B90(DemoGj* this, GlobalContext* globalCtx);
@@ -207,10 +214,37 @@ s32 func_80978EBC(void) {
     return 1;
 }
 
+void func_80978EE4(DemoGj* this, GlobalContext* globalCtx);
+/*
+void func_80978EE4(DemoGj* this, GlobalContext* globalCtx) {
+    Actor *temp_v0;
+    char *temp_v0_2;
+    char *phi_v0;
+
+    if (this->unk_178 == 0) {
+        temp_v0 = globalCtx->actorCtx.actorLists[9].head;
+        phi_v0 = (char *) temp_v0;
+        if (temp_v0 != 0) {
+loop_2:
+            if (phi_v0->unk0 == 0x17A) {
+                this->unk_178 = phi_v0;
+                osSyncPrintf((const char *) "Demo_Gj_Search_Boss_Ganon %d:ガノン発見!!!!\n", this->dyna.actor.params, this);
+                return;
+            }
+            temp_v0_2 = phi_v0->unk124;
+            phi_v0 = temp_v0_2;
+            if (temp_v0_2 != 0) {
+                goto loop_2;
+            }
+        }
+        osSyncPrintf((const char *) "Demo_Gj_Search_Boss_Ganon %d:ガノン発見出来ず\n", this->dyna.actor.params, this);
+    }
+}
+*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978EE4.s")
 
 #ifdef NON_MATCHING
-void func_80978F60(DemoGj* this, GlobalContext* globalCtx, void *arg2) {
+void func_80978F60(DemoGj* this, GlobalContext* globalCtx, CollisionHeader *arg2) {
     GlobalContext* glb_ctx;
     Actor* actor;
     DynaCollisionContext* colctx_dyna;
@@ -232,95 +266,391 @@ void func_80978F60(DemoGj* this, GlobalContext* globalCtx, void *arg2) {
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978F60.s")
 #endif
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978FCC.s")
+s32 func_80978FCC(DemoGj* this, GlobalContext* globalCtx, s32 arg2, s32 arg3, CollisionHeader* arg4) {
+    if (func_80978EBC() == 0) {
+        this->unk_164 = arg2;
+        this->unk_168 = arg3;
+        func_80978F60(this, globalCtx, arg4);
+        return 1;
+    }
+    Actor_Kill((Actor *) this);
+    return 0;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s")
+void func_80979030(DemoGj* this, GlobalContext* globalCtx, Gfx* displayList) {
+    if (gGameInfo->data[2592] == 0) {
+        GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
+        OPEN_DISPS(gfxCtx, "../z_demo_gj.c", 1163);
 
+        func_80093D18(gfxCtx);
+
+        gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_gj.c", 1165), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+
+        gSPDisplayList(POLY_OPA_DISP++, displayList);
+        gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
+
+        CLOSE_DISPS(gfxCtx, "../z_demo_gj.c", 1169);
+    }
+}
+
+#ifdef NON_MATCHING
+void func_8097911C(DemoGj* this, GlobalContext* globalCtx, Gfx* displayList) {
+    GraphicsContext *gfxCtx;
+    Mtx* matrix;
+    
+    s16 sp56;
+    s16 sp54;
+    s16 sp52;
+
+    sp56 = this->unk_16C.x;
+    sp54 = this->unk_16C.y;
+    sp52 = this->unk_16C.z;
+
+    gfxCtx = globalCtx->state.gfxCtx;
+
+    matrix = Graph_Alloc(gfxCtx, 0x40);
+
+    OPEN_DISPS(gfxCtx, "../z_demo_gj.c", 1187);
+
+    Matrix_Push();
+    Matrix_RotateRPY(sp56, sp54, sp52, MTXMODE_APPLY);
+    Matrix_ToMtx(matrix, "../z_demo_gj.c", 1193);
+    Matrix_Pull();
+
+    func_80093D18(gfxCtx);
+
+    gSPMatrix(POLY_OPA_DISP++, matrix, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(POLY_OPA_DISP++, displayList);
+    gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
+
+    CLOSE_DISPS(gfxCtx, "../z_demo_gj.c", 1201);
+}
+#else
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s")
+#endif
 
+void func_8097923C(DemoGj* this, UNK_TYPE arg1);
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097923C.s")
 
+/*
+s32 func_809797E4(void* arg0, s32 arg1) {
+    void *temp_v0;
+
+    temp_v0 = this->arg0;
+    if ((temp_v0 != 0) && ((arg1 & 0xFF) == arg0->unk314)) {
+        return 1;
+    }
+    return 0;
+}
+*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809797E4.s")
 
+/*
+void func_80979818(? arg1) {
+    func_809797E4(1);
+}
+*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979818.s")
 
+/*
+void func_8097983C(? arg1) {
+    func_809797E4(2);
+}
+*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097983C.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s")
 
+/*
+void func_80979F9C(void *arg0) {
+    if (func_809797E4(3) != 0) {
+        arg0->unk17C = 1;
+    }
+}
+*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979F9C.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979FD0.s")
+void func_80979FD0(DemoGj* this, GlobalContext* globalCtx) {
+    func_80978FCC(this, globalCtx, 1, 2, &D_06001F70);
+}
 
+void func_8097A000(DemoGj* this, s32 arg1);
+#ifdef NON_MATCHING
+void func_8097A000(DemoGj *this, s32 arg1) {
+    Actor_MoveForward(&this->dyna.actor);
+    this->unk_16C.x += gGameInfo->data[2610];
+    this->unk_16C.y += 0x3E8 + gGameInfo->data[2611];
+    this->unk_16C.z = 0xBB8 + gGameInfo->data[2612] + this->unk_16C.z;
+    func_8097923C(this, arg1);
+}
+#else
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A000.s")
+#endif
 
+//s32 func_8097A07C(DemoGj* this, GlobalContext* globalCtx);
+/*
+s32 func_8097A07C(DemoGj* this, GlobalContext* globalCtx) {
+    s32 phi_return;
+
+    phi_return = globalCtx + 0x10000;
+    if (this->unk17C == 0) {
+        if (((u32) globalCtx->gameplayFrames % 3U) == 0) {
+            this = this;
+            func_80978AFC(globalCtx, &D_8097BE88, 300.0f);
+        }
+        phi_return = func_80979F9C(this);
+    }
+    return phi_return;
+}
+*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A07C.s")
 
+void func_8097A0E4(DemoGj *this, GlobalContext *globalCtx);
+#ifdef NON_MATCHING
+void func_8097A0E4(DemoGj *this, GlobalContext *globalCtx) {
+    if (func_80979818() != 0) {
+        func_80979860(this, globalCtx);
+        this->unk_164 = 8;
+        this->unk_168 = 9;
+    }
+}
+#else
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A0E4.s")
+#endif
 
+/*
+void func_8097A130(DemoGj *this) {
+    if (func_8097983C() != 0) {
+        Actor_Kill(&this->dyna.actor);
+    }
+}
+*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A130.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A160.s")
+void func_8097A160(DemoGj* this, GlobalContext* globalCtx) {
+    func_80978EE4(this, globalCtx);
+    func_8097A0E4(this, globalCtx);
+}
 
+void func_8097A190(DemoGj* this, s32 arg1);
+/*
+void func_8097A190(DemoGj* this, s32 arg1) {
+    func_8097A000(this, arg1);
+    func_8097A130(this, arg1);
+}
+*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A190.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1C0.s")
+void func_8097A1C0(DemoGj* this, GlobalContext* globalCtx) {
+    func_80979030(this, globalCtx, &D_06001D20);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1E4.s")
+void func_8097A1E4(DemoGj* this, GlobalContext* globalCtx) {
+    func_8097911C(this, globalCtx, &D_06001D20);
+}
+//#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1E4.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A208.s")
+void func_8097A208(DemoGj* this, GlobalContext* globalCtx) {
+    func_80978FCC(this, globalCtx, 2, 3, &D_06002448);
+}
+//#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A208.s")
 
+void func_8097A238(DemoGj* this, s32 arg1);
+#ifdef NON_MATCHING
+void func_8097A238(DemoGj *this, s32 arg1) {
+    Actor_MoveForward(&this->dyna.actor);
+    this->unk_16C.x = this->unk_16C.x + gGameInfo->data[2623];
+    this->unk_16C.y = this->unk_16C.y + (gGameInfo->data[2624] + 0x3E8);
+    this->unk_16C.z = this->unk_16C.z + (gGameInfo->data[2625] + 0xBB8);
+    func_8097923C(this, arg1);
+}
+#else
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A238.s")
+#endif
 
+/*
+s32 func_8097A2B4(void *arg0, GlobalContext* globalCtx) {
+    s32 phi_return;
+
+    phi_return = globalCtx + 0x10000;
+    if (arg0->unk17C == 0) {
+        if (((u32) globalCtx->gameplayFrames % 3U) == 1) {
+            arg0 = arg0;
+            func_80978AFC(globalCtx, &D_8097BE94, 300.0f);
+        }
+        phi_return = func_80979F9C(arg0);
+    }
+    return phi_return;
+}
+*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A2B4.s")
 
+/*
+void func_8097A320(DemoGj* this, s32 arg1) {
+    if (func_80979818() != 0) {
+        func_80979860(this, arg1);
+        this->unk_164 = 9;
+        this->unk_168 = 0xA;
+    }
+}
+*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A320.s")
 
+/*
+void func_8097A36C(DemoGj* this) {
+    if (func_8097983C() != 0) {
+        Actor_Kill(&this->dyna.actor);
+    }
+}*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A36C.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A39C.s")
+void func_8097A39C(DemoGj* this, GlobalContext* globalCtx) {
+    func_80978EE4(this, globalCtx);
+    func_8097A320(this, globalCtx);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3CC.s")
+void func_8097A3CC(DemoGj* this, s32 arg1) {
+    func_8097A238(this, arg1);
+    func_8097A36C(this, arg1);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A3FC.s")
+void func_8097A3FC(DemoGj* this, GlobalContext* globalCtx) {
+    func_80979030(this, globalCtx, &D_06002160);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A420.s")
+void func_8097A420(DemoGj* this, GlobalContext* globalCtx) {
+    func_8097911C(this, globalCtx, &D_06002160);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A444.s")
+void func_8097A444(DemoGj* this, GlobalContext* globalCtx) {
+    func_80978FCC(this, globalCtx, 3, 4, &D_06002850);
+}
 
+void func_8097A474(DemoGj* this, s32 arg1);
+#ifdef NON_MATCHING
+void func_8097A474(DemoGj* this, s32 arg1) {
+    Actor_MoveForward(&this->dyna.actor);
+    this->unk_16C.x = this->unk_16C.x + gGameInfo->data[2636];
+    this->unk_16C.y = this->unk_16C.y + (gGameInfo->data[2637] + 0x3E8);
+    this->unk_16C.z = this->unk_16C.z + (gGameInfo->data[2638] + 0xBB8);
+    func_8097923C(this, arg1);
+}
+#else
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A474.s")
+#endif
 
+void func_8097A4F0(DemoGj* this, s32 arg1);
+/*
+void func_8097A4F0(DemoGj* this, s32 arg1) {
+    if (func_80979818() != 0) {
+        func_80979860(this, arg1);        
+        this->unk_164 = 0xA;
+        this->unk_168 = 0xB;
+    }
+}
+*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A4F0.s")
 
+/*
+void func_8097A53C(DemoGj* this) {
+    if (func_8097983C() != 0) {
+        Actor_Kill(&this->dyna.actor);
+    }
+}
+*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A53C.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A56C.s")
+void func_8097A56C(DemoGj* this, GlobalContext* globalCtx) {
+    func_80978EE4(this, globalCtx);
+    func_8097A4F0(this, (s32) globalCtx); // TODO: check this.
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A59C.s")
+void func_8097A59C(DemoGj* this, s32 arg1) {
+    func_8097A474(this, arg1);
+    func_8097A53C(this, arg1);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5CC.s")
+void func_8097A5CC(DemoGj* this, GlobalContext* globalCtx) {
+    func_80979030(this, globalCtx, &D_06002600);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A5F0.s")
+void func_8097A5F0(DemoGj* this, GlobalContext* globalCtx) {
+    func_8097911C(this, globalCtx, &D_06002600);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A614.s")
+void func_8097A614(DemoGj* this, GlobalContext* globalCtx) {
+    func_80978FCC(this, globalCtx, 4, 5, &D_06002D28);
+}
 
+void func_8097A644(DemoGj* this, s32 arg1);
+#ifdef NON_MATCHING
+void func_8097A644(DemoGj* this, s32 arg1) {
+    Actor_MoveForward(&this->dyna.actor);
+    this->unk_16C.x = this->unk_16C.x + gGameInfo->data[2649];
+    this->unk_16C.y = this->unk_16C.y + (gGameInfo->data[2650] + 0x3E8);
+    this->unk_16C.z = this->unk_16C.z + (gGameInfo->data[2651] + 0xBB8);
+    func_8097923C(this, arg1);
+}
+#else
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A644.s")
+#endif
 
+void func_8097A6C0(DemoGj* this, s32 arg1);
+/*
+void func_8097A6C0(DemoGj* this, s32 arg1) {
+    if (func_80979818() != 0) {
+        func_80979860(this, arg1);
+        this->unk_164 = 0xB;
+        this->unk_168 = 0xC;
+    }
+}
+*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A6C0.s")
 
+void func_8097A70C(DemoGj* this, s32 arg1);
+/*
+void func_8097A70C(DemoGj* this, s32 arg1) {
+    if (func_8097983C() != 0) {
+        Actor_Kill(&this->dyna.actor);
+    }
+}
+*/
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A70C.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A73C.s")
+void func_8097A73C(DemoGj* this, GlobalContext* globalCtx) {
+    func_80978EE4(this, globalCtx);
+    func_8097A6C0(this, (s32) globalCtx);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A76C.s")
+void func_8097A76C(DemoGj* this, s32 arg1) {
+    func_8097A644(this, arg1);
+    func_8097A70C(this, arg1);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A79C.s")
+void func_8097A79C(DemoGj* this, GlobalContext* globalCtx) {
+    func_80979030(this, globalCtx, &D_06002A40);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7C0.s")
+void func_8097A7C0(DemoGj* this, GlobalContext* globalCtx) {
+    func_8097911C(this, globalCtx, &D_06002A40);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A7E4.s")
+void func_8097A7E4(DemoGj* this, GlobalContext* globalCtx) {
+    func_80978FCC(this, globalCtx, 5, 6, &D_06002FE4);
+}
 
+void func_8097A814(DemoGj* this, s32 arg1);
+#ifdef NON_MATCHING
+void func_8097A814(DemoGj* this, s32 arg1) {
+    Actor_MoveForward(&this->dyna.actor);
+    this->unk_16C.x = (s16) (this->unk_16C.x + gGameInfo->data[2662]);
+    this->unk_16C.y = (s16) (this->unk_16C.y+ (gGameInfo->data[2663] + 0x3E8));
+    this->unk_16C.z = (s16) (this->unk_16C.z + (gGameInfo->data[2664] + 0xBB8));
+    func_8097923C(this, arg1);
+}
+#else
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A814.s")
+#endif
 
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A890.s")
 
diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h
index f27c96e191..f438c18049 100644
--- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h
+++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h
@@ -8,7 +8,11 @@ struct DemoGj;
 
 typedef struct DemoGj {
     /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x0164 */ char unk_164[0x20];
+    /* 0x0164 */ s32 unk_164;
+    /* 0x0168 */ s32 unk_168;
+    /* 0x016C */ Vec3s unk_16C; // x,y,z?
+    /* 0x0172 */ char unk_172[0x06];
+    /* 0x0178 */ char unk_178[0x0C];
     /* 0x0184 */ ColliderCylinder unk_184;
     /* 0x01D0 */ ColliderCylinder unk_1D0;
     /* 0x021C */ ColliderCylinder unk_21C;