Match ActorType::Unregister

asm/main/Actor/ActorType_Unregister.inc

@@ -1,21 +0,0 @@
-
-	ldr r1, sActorTypeList
-	ldr r2, sActorTypeList2
-	ldr r1, [r1]
-	mov r3, #0
-	cmp r1, #0
-	beq _0203e84c
-_0203e830:
-	cmp r1, r0
-	beq _0203e84c
-	mov r3, r2
-	add r2, r1, #0x10
-	ldr r1, [r1, #0x10]
-	cmp r1, #0
-	bne _0203e830
-_0203e84c:
-	cmp r3, #0
-	ldrne r1, [r0, #0x10]
-	ldrne r0, [r3]
-	strne r1, [r0, #0x10]
-	bx lr

src/Main/Actor/ActorType.cpp

@@ -1,7 +1,6 @@
 #include "Actor/ActorType.hpp"
 
 ActorTypeList sActorTypeList;
-ActorTypeList sActorTypeList2;
 
 // Kill duplicate dtors
 KILL(_ZN9ActorTypeC2EjPFP5ActorvEPFivE)
@@ -39,13 +38,10 @@ ARM void ActorType::Register() {
     *tail = this;
 }
 
-ARM void NONMATCH(ActorType::Unregister)() {
-    #ifndef NONMATCHING
-    #include "../asm/main/Actor/ActorType_Unregister.inc"
-    #else
+ARM void ActorType::Unregister() {
     ActorType *actorType;
 
-    ActorType **current = &sActorTypeList2.head;
+    ActorType **current = &sActorTypeList.head;
     ActorType **previous = NULL;
 
     for (actorType = sActorTypeList.head; actorType != NULL; actorType = actorType->next) {
@@ -57,7 +53,6 @@ ARM void NONMATCH(ActorType::Unregister)() {
     if (previous != NULL) {
         (*previous)->next = this->next;
     }
-    #endif
 }
 
 ARM ActorType *ActorType::Find(ActorTypeId id) {