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

Match remaining CScriptWorldTeleporter constructor

This commit is contained in:
Phillip Stephens 2022-11-16 13:19:24 -08:00
parent 58dfd69437
commit 6a293cfa82
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/MetroidPrime/ScriptLoader.s
View File

@ -8713,7 +8713,7 @@ lbl_800CCF34:
/* 800CCFA4 000C9F04 38 A1 00 80 */ addi r5, r1, 0x80 /* 800CCFA4 000C9F04 38 A1 00 80 */ addi r5, r1, 0x80
/* 800CCFA8 000C9F08 92 C1 00 14 */ stw r22, 0x14(r1) /* 800CCFA8 000C9F08 92 C1 00 14 */ stw r22, 0x14(r1)
/* 800CCFAC 000C9F0C 93 E1 00 18 */ stw r31, 0x18(r1) /* 800CCFAC 000C9F0C 93 E1 00 18 */ stw r31, 0x18(r1)
/* 800CCFB0 000C9F10 48 10 9C 15 */ bl "__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUiUsUcUcUiUibfff" /* 800CCFB0 000C9F10 48 10 9C 15 */ bl "__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUiiUcUcUiUibfff"
/* 800CCFB4 000C9F14 7C 6E 1B 78 */ mr r14, r3 /* 800CCFB4 000C9F14 7C 6E 1B 78 */ mr r14, r3
lbl_800CCFB8: lbl_800CCFB8:
/* 800CCFB8 000C9F18 38 61 00 80 */ addi r3, r1, 0x80 /* 800CCFB8 000C9F18 38 61 00 80 */ addi r3, r1, 0x80

4
asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s
View File

@ -241,8 +241,8 @@ lbl_801D6BA8:
/* 801D6BBC 001D3B1C 38 21 00 10 */ addi r1, r1, 0x10 /* 801D6BBC 001D3B1C 38 21 00 10 */ addi r1, r1, 0x10
/* 801D6BC0 001D3B20 4E 80 00 20 */ blr /* 801D6BC0 001D3B20 4E 80 00 20 */ blr
.global "__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUiUsUcUcUiUibfff" .global "__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUiiUcUcUiUibfff"
"__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUiUsUcUcUiUibfff": "__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUiiUcUcUiUibfff":
/* 801D6BC4 001D3B24 94 21 FF 90 */ stwu r1, -0x70(r1) /* 801D6BC4 001D3B24 94 21 FF 90 */ stwu r1, -0x70(r1)
/* 801D6BC8 001D3B28 7C 08 02 A6 */ mflr r0 /* 801D6BC8 001D3B28 7C 08 02 A6 */ mflr r0
/* 801D6BCC 001D3B2C 90 01 00 74 */ stw r0, 0x74(r1) /* 801D6BCC 001D3B2C 90 01 00 74 */ stw r0, 0x74(r1)

2
include/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.hpp
View File

@ -18,7 +18,7 @@ public:
CAssetId backgroundModel, const CVector3f& backgroundScale, CAssetId backgroundModel, const CVector3f& backgroundScale,
bool upElevator, ushort soundId, uchar volume, uchar panning); bool upElevator, ushort soundId, uchar volume, uchar panning);
CScriptWorldTeleporter(TUniqueId uid, const rstl::string& name, const CEntityInfo& info, CScriptWorldTeleporter(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
bool active, CAssetId worldId, CAssetId areaId, ushort soundId, bool active, CAssetId worldId, CAssetId areaId, int soundId,
uchar volume, uchar panning, CAssetId fontId, CAssetId stringId, uchar volume, uchar panning, CAssetId fontId, CAssetId stringId,
bool fadeWhite, float charFadeIn, float charsPerSecond, float showDelay); bool fadeWhite, float charFadeIn, float charsPerSecond, float showDelay);
~CScriptWorldTeleporter(); ~CScriptWorldTeleporter();

2
src/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.cpp
View File

@ -63,7 +63,7 @@ CScriptWorldTeleporter::CScriptWorldTeleporter(
CScriptWorldTeleporter::CScriptWorldTeleporter(TUniqueId uid, const rstl::string& name, CScriptWorldTeleporter::CScriptWorldTeleporter(TUniqueId uid, const rstl::string& name,
const CEntityInfo& info, bool active, const CEntityInfo& info, bool active,
CAssetId worldId, CAssetId areaId, ushort soundId, CAssetId worldId, CAssetId areaId, int soundId,
uchar volume, uchar panning, CAssetId fontId, uchar volume, uchar panning, CAssetId fontId,
CAssetId stringId, bool fadeWhite, float charFadeIn, CAssetId stringId, bool fadeWhite, float charFadeIn,
float charsPerSecond, float showDelay) float charsPerSecond, float showDelay)