From b876430ed3da236e7aab3d00140940f5286a534d Mon Sep 17 00:00:00 2001
From: Phillip Stephens <antidote.crk@gmail.com>
Date: Sun, 18 Dec 2022 09:43:09 -0800
Subject: [PATCH] Remove  hack

---
 asm/Dolphin/os/OSMemory.s                       |  7 ++++---
 configure.py                                    |  2 +-
 include/MetroidPrime/CAnimationDatabaseGame.hpp |  2 +-
 include/MetroidPrime/CFluidPlaneDoor.hpp        |  2 +-
 include/MetroidPrime/GameObjectLists.hpp        | 12 ++++++------
 include/dolphin/types.h                         |  3 ---
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/asm/Dolphin/os/OSMemory.s b/asm/Dolphin/os/OSMemory.s
index 6454db92..f4b9f70e 100644
--- a/asm/Dolphin/os/OSMemory.s
+++ b/asm/Dolphin/os/OSMemory.s
@@ -10,23 +10,24 @@ lbl_803F22E0:
 
 .section .text, "ax"
 
-OnReset:
+.fn OnReset, local
 /* 80382A14 0037F974  7C 08 02 A6 */	mflr r0
 /* 80382A18 0037F978  2C 03 00 00 */	cmpwi r3, 0
 /* 80382A1C 0037F97C  90 01 00 04 */	stw r0, 4(r1)
 /* 80382A20 0037F980  94 21 FF F8 */	stwu r1, -8(r1)
-/* 80382A24 0037F984  41 82 00 18 */	beq lbl_80382A3C
+/* 80382A24 0037F984  41 82 00 18 */	beq .L_80382A3C
 /* 80382A28 0037F988  3C 60 CC 00 */	lis r3, 0xCC004010@ha
 /* 80382A2C 0037F98C  38 00 00 FF */	li r0, 0xff
 /* 80382A30 0037F990  B0 03 40 10 */	sth r0, 0xCC004010@l(r3)
 /* 80382A34 0037F994  3C 60 F0 00 */	lis r3, 0xf000
 /* 80382A38 0037F998  4B FF EF F1 */	bl __OSMaskInterrupts
-lbl_80382A3C:
+.L_80382A3C:
 /* 80382A3C 0037F99C  38 60 00 01 */	li r3, 1
 /* 80382A40 0037F9A0  80 01 00 0C */	lwz r0, 0xc(r1)
 /* 80382A44 0037F9A4  38 21 00 08 */	addi r1, r1, 8
 /* 80382A48 0037F9A8  7C 08 03 A6 */	mtlr r0
 /* 80382A4C 0037F9AC  4E 80 00 20 */	blr
+.endfn OnReset
 
 .global MEMIntrruptHandler
 MEMIntrruptHandler:
diff --git a/configure.py b/configure.py
index e285ea1c..366ce8fa 100755
--- a/configure.py
+++ b/configure.py
@@ -816,7 +816,7 @@ LIBS = [
             ["Dolphin/os/OSInterrupt", True],
             ["Dolphin/os/OSLink", True],
             ["Dolphin/os/OSMessage", True],
-            "Dolphin/os/OSMemory",
+            ["Dolphin/os/OSMemory", False],
             ["Dolphin/os/OSMutex", True],
             "Dolphin/os/OSReboot",
             ["Dolphin/os/OSReset", True],
diff --git a/include/MetroidPrime/CAnimationDatabaseGame.hpp b/include/MetroidPrime/CAnimationDatabaseGame.hpp
index ba4713e6..7c3e5b02 100644
--- a/include/MetroidPrime/CAnimationDatabaseGame.hpp
+++ b/include/MetroidPrime/CAnimationDatabaseGame.hpp
@@ -30,7 +30,7 @@ private:
   rstl::optional_object< CToken > x4_;
 };
 
-class CAnimationDatabaseGame final : public CAnimationDatabase {
+class CAnimationDatabaseGame : public CAnimationDatabase {
 public:
   explicit CAnimationDatabaseGame(const rstl::vector< CAnimation >& anims);
 
diff --git a/include/MetroidPrime/CFluidPlaneDoor.hpp b/include/MetroidPrime/CFluidPlaneDoor.hpp
index 4102b12e..54b32a5b 100644
--- a/include/MetroidPrime/CFluidPlaneDoor.hpp
+++ b/include/MetroidPrime/CFluidPlaneDoor.hpp
@@ -3,7 +3,7 @@
 
 #include "MetroidPrime/CFluidPlane.hpp"
 
-class CFluidPlaneDoor final : public CFluidPlane {
+class CFluidPlaneDoor : public CFluidPlane {
 private:
   float xa0_tileSize;
   int xa4_tileSubdivisions;
diff --git a/include/MetroidPrime/GameObjectLists.hpp b/include/MetroidPrime/GameObjectLists.hpp
index c08b176c..2bf17aba 100644
--- a/include/MetroidPrime/GameObjectLists.hpp
+++ b/include/MetroidPrime/GameObjectLists.hpp
@@ -3,37 +3,37 @@
 
 #include "MetroidPrime/CObjectList.hpp"
 
-class CActorList final : public CObjectList {
+class CActorList : public CObjectList {
 public:
   CActorList();
   uchar IsQualified(const CEntity& ent) override;
 };
 
-class CPhysicsActorList final : public CObjectList {
+class CPhysicsActorList : public CObjectList {
 public:
   CPhysicsActorList();
   uchar IsQualified(const CEntity& ent) override;
 };
 
-class CGameCameraList final : public CObjectList {
+class CGameCameraList : public CObjectList {
 public:
   CGameCameraList();
   uchar IsQualified(const CEntity& ent) override;
 };
 
-class CListeningAiList final : public CObjectList {
+class CListeningAiList : public CObjectList {
 public:
   CListeningAiList();
   uchar IsQualified(const CEntity& ent) override;
 };
 
-class CAiWaypointList final : public CObjectList {
+class CAiWaypointList : public CObjectList {
 public:
   CAiWaypointList();
   uchar IsQualified(const CEntity& ent) override;
 };
 
-class CPlatformAndDoorList final : public CObjectList {
+class CPlatformAndDoorList : public CObjectList {
 public:
   CPlatformAndDoorList();
   uchar IsQualified(const CEntity& ent) override;
diff --git a/include/dolphin/types.h b/include/dolphin/types.h
index fc63ba67..7180dc04 100644
--- a/include/dolphin/types.h
+++ b/include/dolphin/types.h
@@ -68,9 +68,6 @@ typedef int BOOL;
 #ifndef nullptr
 #define nullptr NULL
 #endif
-#ifndef final
-#define final
-#endif
 
 #if defined(__MWERKS__)
 #ifndef override