PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove hack 

Former-commit-id: b876430ed3
This commit is contained in:
Phillip Stephens 2022-12-18 09:43:09 -08:00
parent 5bc355e432
commit 758b61fc47
6 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
asm/Dolphin/os/OSMemory.s
View File

@ -10,23 +10,24 @@ lbl_803F22E0:
.section .text, "ax" .section .text, "ax"
OnReset: .fn OnReset, local
/* 80382A14 0037F974 7C 08 02 A6 */ mflr r0 /* 80382A14 0037F974 7C 08 02 A6 */ mflr r0
/* 80382A18 0037F978 2C 03 00 00 */ cmpwi r3, 0 /* 80382A18 0037F978 2C 03 00 00 */ cmpwi r3, 0
/* 80382A1C 0037F97C 90 01 00 04 */ stw r0, 4(r1) /* 80382A1C 0037F97C 90 01 00 04 */ stw r0, 4(r1)
/* 80382A20 0037F980 94 21 FF F8 */ stwu r1, -8(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 /* 80382A28 0037F988 3C 60 CC 00 */ lis r3, 0xCC004010@ha
/* 80382A2C 0037F98C 38 00 00 FF */ li r0, 0xff /* 80382A2C 0037F98C 38 00 00 FF */ li r0, 0xff
/* 80382A30 0037F990 B0 03 40 10 */ sth r0, 0xCC004010@l(r3) /* 80382A30 0037F990 B0 03 40 10 */ sth r0, 0xCC004010@l(r3)
/* 80382A34 0037F994 3C 60 F0 00 */ lis r3, 0xf000 /* 80382A34 0037F994 3C 60 F0 00 */ lis r3, 0xf000
/* 80382A38 0037F998 4B FF EF F1 */ bl __OSMaskInterrupts /* 80382A38 0037F998 4B FF EF F1 */ bl __OSMaskInterrupts
lbl_80382A3C: .L_80382A3C:
/* 80382A3C 0037F99C 38 60 00 01 */ li r3, 1 /* 80382A3C 0037F99C 38 60 00 01 */ li r3, 1
/* 80382A40 0037F9A0 80 01 00 0C */ lwz r0, 0xc(r1) /* 80382A40 0037F9A0 80 01 00 0C */ lwz r0, 0xc(r1)
/* 80382A44 0037F9A4 38 21 00 08 */ addi r1, r1, 8 /* 80382A44 0037F9A4 38 21 00 08 */ addi r1, r1, 8
/* 80382A48 0037F9A8 7C 08 03 A6 */ mtlr r0 /* 80382A48 0037F9A8 7C 08 03 A6 */ mtlr r0
/* 80382A4C 0037F9AC 4E 80 00 20 */ blr /* 80382A4C 0037F9AC 4E 80 00 20 */ blr
.endfn OnReset
.global MEMIntrruptHandler .global MEMIntrruptHandler
MEMIntrruptHandler: MEMIntrruptHandler:

2
configure.py
View File

@ -816,7 +816,7 @@ LIBS = [
["Dolphin/os/OSInterrupt", True], ["Dolphin/os/OSInterrupt", True],
["Dolphin/os/OSLink", True], ["Dolphin/os/OSLink", True],
["Dolphin/os/OSMessage", True], ["Dolphin/os/OSMessage", True],
"Dolphin/os/OSMemory", ["Dolphin/os/OSMemory", False],
["Dolphin/os/OSMutex", True], ["Dolphin/os/OSMutex", True],
"Dolphin/os/OSReboot", "Dolphin/os/OSReboot",
["Dolphin/os/OSReset", True], ["Dolphin/os/OSReset", True],

2
include/MetroidPrime/CAnimationDatabaseGame.hpp
View File

@ -30,7 +30,7 @@ private:
rstl::optional_object< CToken > x4_; rstl::optional_object< CToken > x4_;
}; };
class CAnimationDatabaseGame final : public CAnimationDatabase { class CAnimationDatabaseGame : public CAnimationDatabase {
public: public:
explicit CAnimationDatabaseGame(const rstl::vector< CAnimation >& anims); explicit CAnimationDatabaseGame(const rstl::vector< CAnimation >& anims);

2
include/MetroidPrime/CFluidPlaneDoor.hpp
View File

@ -3,7 +3,7 @@
#include "MetroidPrime/CFluidPlane.hpp" #include "MetroidPrime/CFluidPlane.hpp"
class CFluidPlaneDoor final : public CFluidPlane { class CFluidPlaneDoor : public CFluidPlane {
private: private:
float xa0_tileSize; float xa0_tileSize;
int xa4_tileSubdivisions; int xa4_tileSubdivisions;

12
include/MetroidPrime/GameObjectLists.hpp
View File

@ -3,37 +3,37 @@
#include "MetroidPrime/CObjectList.hpp" #include "MetroidPrime/CObjectList.hpp"
class CActorList final : public CObjectList { class CActorList : public CObjectList {
public: public:
CActorList(); CActorList();
uchar IsQualified(const CEntity& ent) override; uchar IsQualified(const CEntity& ent) override;
}; };
class CPhysicsActorList final : public CObjectList { class CPhysicsActorList : public CObjectList {
public: public:
CPhysicsActorList(); CPhysicsActorList();
uchar IsQualified(const CEntity& ent) override; uchar IsQualified(const CEntity& ent) override;
}; };
class CGameCameraList final : public CObjectList { class CGameCameraList : public CObjectList {
public: public:
CGameCameraList(); CGameCameraList();
uchar IsQualified(const CEntity& ent) override; uchar IsQualified(const CEntity& ent) override;
}; };
class CListeningAiList final : public CObjectList { class CListeningAiList : public CObjectList {
public: public:
CListeningAiList(); CListeningAiList();
uchar IsQualified(const CEntity& ent) override; uchar IsQualified(const CEntity& ent) override;
}; };
class CAiWaypointList final : public CObjectList { class CAiWaypointList : public CObjectList {
public: public:
CAiWaypointList(); CAiWaypointList();
uchar IsQualified(const CEntity& ent) override; uchar IsQualified(const CEntity& ent) override;
}; };
class CPlatformAndDoorList final : public CObjectList { class CPlatformAndDoorList : public CObjectList {
public: public:
CPlatformAndDoorList(); CPlatformAndDoorList();
uchar IsQualified(const CEntity& ent) override; uchar IsQualified(const CEntity& ent) override;

3
include/dolphin/types.h
View File

@ -68,9 +68,6 @@ typedef int BOOL;
#ifndef nullptr #ifndef nullptr
#define nullptr NULL #define nullptr NULL
#endif #endif
#ifndef final
#define final
#endif
#if defined(__MWERKS__) #if defined(__MWERKS__)
#ifndef override #ifndef override