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

Delete CInstruction, fix --no-static-libs build, fix all_source build

This commit is contained in:
Luke Street 2023-01-19 00:31:19 -08:00
parent 4eae00e6a2
commit f02833c84e
9 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
asm/MetroidPrime/CInstruction.s
View File

@ -1,16 +0,0 @@
.include "macros.inc"
.section .text, "ax"
.global PageInvoke__12CInstructionCFR16CFontRenderStateP17CTextRenderBuffer
PageInvoke__12CInstructionCFR16CFontRenderStateP17CTextRenderBuffer:
/* 8002947C 000263DC 4E 80 00 20 */ blr
.global "GetAssets__12CInstructionCFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>"
"GetAssets__12CInstructionCFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>":
/* 80029480 000263E0 4E 80 00 20 */ blr
.global GetAssetCount__12CInstructionCFv
GetAssetCount__12CInstructionCFv:
/* 80029484 000263E4 38 60 00 00 */ li r3, 0
/* 80029488 000263E8 4E 80 00 20 */ blr

25
asm/MetroidPrime/CSplashScreen.s
View File

@ -93,8 +93,8 @@ lbl_805AA0E8:
.section .data .section .data
.balign 8 .balign 8
.global lbl_803D9A50 .global __vt__13CSplashScreen
lbl_803D9A50: __vt__13CSplashScreen:
# ROM: 0x3D6A50 # ROM: 0x3D6A50
.4byte 0 .4byte 0
.4byte 0 .4byte 0
@ -151,9 +151,9 @@ __dt__13CSplashScreenFv:
/* 80028218 00025178 93 C1 00 08 */ stw r30, 8(r1) /* 80028218 00025178 93 C1 00 08 */ stw r30, 8(r1)
/* 8002821C 0002517C 7C 7E 1B 79 */ or. r30, r3, r3 /* 8002821C 0002517C 7C 7E 1B 79 */ or. r30, r3, r3
/* 80028220 00025180 41 82 00 40 */ beq lbl_80028260 /* 80028220 00025180 41 82 00 40 */ beq lbl_80028260
/* 80028224 00025184 3C 60 80 3E */ lis r3, lbl_803D9A50@ha /* 80028224 00025184 3C 60 80 3E */ lis r3, __vt__13CSplashScreen@ha
/* 80028228 00025188 34 1E 00 28 */ addic. r0, r30, 0x28 /* 80028228 00025188 34 1E 00 28 */ addic. r0, r30, 0x28
/* 8002822C 0002518C 38 03 9A 50 */ addi r0, r3, lbl_803D9A50@l /* 8002822C 0002518C 38 03 9A 50 */ addi r0, r3, __vt__13CSplashScreen@l
/* 80028230 00025190 90 1E 00 00 */ stw r0, 0(r30) /* 80028230 00025190 90 1E 00 00 */ stw r0, 0(r30)
/* 80028234 00025194 41 82 00 10 */ beq lbl_80028244 /* 80028234 00025194 41 82 00 10 */ beq lbl_80028244
/* 80028238 00025198 38 7E 00 28 */ addi r3, r30, 0x28 /* 80028238 00025198 38 7E 00 28 */ addi r3, r30, 0x28
@ -1290,9 +1290,9 @@ __ct__13CSplashScreenFQ213CSplashScreen13ESplashScreen:
/* 80029234 00026194 48 02 99 D9 */ bl "__ct__6CIOWinFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>" /* 80029234 00026194 48 02 99 D9 */ bl "__ct__6CIOWinFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
/* 80029238 00026198 38 61 00 10 */ addi r3, r1, 0x10 /* 80029238 00026198 38 61 00 10 */ addi r3, r1, 0x10
/* 8002923C 0002619C 48 31 48 A5 */ bl "internal_dereference__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>Fv" /* 8002923C 0002619C 48 31 48 A5 */ bl "internal_dereference__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>Fv"
/* 80029240 000261A0 3C 80 80 3E */ lis r4, lbl_803D9A50@ha /* 80029240 000261A0 3C 80 80 3E */ lis r4, __vt__13CSplashScreen@ha
/* 80029244 000261A4 3C 60 80 3D */ lis r3, lbl_803CCCD0@ha /* 80029244 000261A4 3C 60 80 3D */ lis r3, lbl_803CCCD0@ha
/* 80029248 000261A8 38 04 9A 50 */ addi r0, r4, lbl_803D9A50@l /* 80029248 000261A8 38 04 9A 50 */ addi r0, r4, __vt__13CSplashScreen@l
/* 8002924C 000261AC C0 22 83 C8 */ lfs f1, lbl_805AA0E8@sda21(r2) /* 8002924C 000261AC C0 22 83 C8 */ lfs f1, lbl_805AA0E8@sda21(r2)
/* 80029250 000261B0 90 1E 00 00 */ stw r0, 0(r30) /* 80029250 000261B0 90 1E 00 00 */ stw r0, 0(r30)
/* 80029254 000261B4 38 80 00 00 */ li r4, 0 /* 80029254 000261B4 38 80 00 00 */ li r4, 0
@ -1452,6 +1452,19 @@ lbl_80029468:
/* 80029474 000263D4 38 21 00 10 */ addi r1, r1, 0x10 /* 80029474 000263D4 38 21 00 10 */ addi r1, r1, 0x10
/* 80029478 000263D8 4E 80 00 20 */ blr /* 80029478 000263D8 4E 80 00 20 */ blr
.global PageInvoke__12CInstructionCFR16CFontRenderStateP17CTextRenderBuffer
PageInvoke__12CInstructionCFR16CFontRenderStateP17CTextRenderBuffer:
/* 8002947C 000263DC 4E 80 00 20 */ blr
.global "GetAssets__12CInstructionCFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>"
"GetAssets__12CInstructionCFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>":
/* 80029480 000263E0 4E 80 00 20 */ blr
.global GetAssetCount__12CInstructionCFv
GetAssetCount__12CInstructionCFv:
/* 80029484 000263E4 38 60 00 00 */ li r3, 0
/* 80029488 000263E8 4E 80 00 20 */ blr
.section .rodata .section .rodata
.balign 8 .balign 8
.global lbl_803CCCD0 .global lbl_803CCCD0

1
configure.py
View File

@ -31,7 +31,6 @@ LIBS = [
"MetroidPrime/CMFGame", "MetroidPrime/CMFGame",
"MetroidPrime/CCredits", "MetroidPrime/CCredits",
"MetroidPrime/CSplashScreen", "MetroidPrime/CSplashScreen",
["MetroidPrime/CInstruction", True],
["MetroidPrime/CAnimData", False], ["MetroidPrime/CAnimData", False],
"MetroidPrime/Factories/CCharacterFactory", "MetroidPrime/Factories/CCharacterFactory",
"MetroidPrime/Factories/CAssetFactory", "MetroidPrime/Factories/CAssetFactory",

6
include/Kyoto/Text/CInstruction.hpp
View File

@ -14,9 +14,9 @@ class CInstruction {
public: public:
virtual ~CInstruction() {} virtual ~CInstruction() {}
virtual void Invoke(CFontRenderState& state, CTextRenderBuffer* buf) const = 0; virtual void Invoke(CFontRenderState& state, CTextRenderBuffer* buf) const = 0;
virtual void PageInvoke(CFontRenderState& state, CTextRenderBuffer* buf) const;// {} virtual void PageInvoke(CFontRenderState& state, CTextRenderBuffer* buf) const {}
virtual void GetAssets(rstl::vector< CToken >& assetsOut) const;// {} virtual void GetAssets(rstl::vector< CToken >& assetsOut) const {}
virtual uint GetAssetCount() const;// { return 0; } virtual uint GetAssetCount() const { return 0; }
}; };
#endif // _CINSTRUCTION #endif // _CINSTRUCTION

2
include/rstl/string.hpp
View File

@ -156,7 +156,7 @@ string operator+(const string& a, const string& b);
// return result; // return result;
// } // }
string operator+(const string& a, char c) { static inline string operator+(const string& a, char c) {
string result(a); string result(a);
result.append(1, c); result.append(1, c);
return result; return result;

8
src/MetroidPrime/CInstruction.cpp
View File

@ -1,8 +0,0 @@
#include "Kyoto/Text/CInstruction.hpp"
/* TODO: These get ODR'd into CSplashScreen, so match and link that and put these in the header where they belong */
uint CInstruction::GetAssetCount() const { return 0; }
void CInstruction::GetAssets(rstl::vector< CToken >& assetsOut) const {}
void CInstruction::PageInvoke(CFontRenderState& state, CTextRenderBuffer* buf) const {}

2
src/MetroidPrime/Enemies/CNewIntroBoss.cpp
View File

@ -8,6 +8,8 @@
#include "MetroidPrime/Player/CPlayer.hpp" #include "MetroidPrime/Player/CPlayer.hpp"
#include "MetroidPrime/Weapons/CBeamProjectile.hpp" #include "MetroidPrime/Weapons/CBeamProjectile.hpp"
#include "Kyoto/Animation/CInt32POINode.hpp"
#include "Collision/CRayCastResult.hpp" #include "Collision/CRayCastResult.hpp"
// TODO move // TODO move

5
src/MetroidPrime/Player/CPlayerGun.cpp
View File

@ -215,8 +215,9 @@ CPlayerGun::CPlayerGun(TUniqueId playerId)
, x538_playerId(playerId) , x538_playerId(playerId)
, x53a_powerBomb(kInvalidUniqueId) , x53a_powerBomb(kInvalidUniqueId)
, x53c_lightId(kInvalidUniqueId) , x53c_lightId(kInvalidUniqueId)
, x550_camBob(CPlayerCameraBob::kCBT_One, CPlayerCameraBob::kCameraBobPeriod, , x550_camBob(CPlayerCameraBob::kCBT_One,
CVector2f(CPlayerCameraBob::kCameraBobExtentX, CPlayerCameraBob::kCameraBobExtentY)) CVector2f(CPlayerCameraBob::kCameraBobExtentX, CPlayerCameraBob::kCameraBobExtentY),
CPlayerCameraBob::kCameraBobPeriod)
, x658_(1) , x658_(1)
, x65c_(0.f) , x65c_(0.f)
, x660_(0.f) , x660_(0.f)

3
src/MetroidPrime/ScriptObjects/CScriptStreamedAudio.cpp
View File

@ -6,7 +6,8 @@
#include "Kyoto/CDvdFile.hpp" #include "Kyoto/CDvdFile.hpp"
#include "Kyoto/Audio/CStreamAudioManager.hpp" #include "Kyoto/Audio/CStreamAudioManager.hpp"
#include "Kyoto/rstl/StringExtras.hpp"
#include "rstl/StringExtras.hpp"
extern "C" void nullsub_42(CScriptStreamedMusic*); extern "C" void nullsub_42(CScriptStreamedMusic*);
int sub_8020c154(const rstl::string&, int, int); int sub_8020c154(const rstl::string&, int, int);