From 8e96fba1fbbab67a682bec4a4cf573faa3ab927a Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Wed, 16 Nov 2022 13:19:24 -0800 Subject: [PATCH] Match remaining CScriptWorldTeleporter constructor Former-commit-id: 6a293cfa826c034df6725988dfbf4c938166f529 --- asm/MetroidPrime/ScriptLoader.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s | 4 ++-- include/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.hpp | 2 +- src/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/asm/MetroidPrime/ScriptLoader.s b/asm/MetroidPrime/ScriptLoader.s index 250aefc4..86b33574 100644 --- a/asm/MetroidPrime/ScriptLoader.s +++ b/asm/MetroidPrime/ScriptLoader.s @@ -8713,7 +8713,7 @@ lbl_800CCF34: /* 800CCFA4 000C9F04 38 A1 00 80 */ addi r5, r1, 0x80 /* 800CCFA8 000C9F08 92 C1 00 14 */ stw r22, 0x14(r1) /* 800CCFAC 000C9F0C 93 E1 00 18 */ stw r31, 0x18(r1) -/* 800CCFB0 000C9F10 48 10 9C 15 */ bl "__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUiUsUcUcUiUibfff" +/* 800CCFB0 000C9F10 48 10 9C 15 */ bl "__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUiiUcUcUiUibfff" /* 800CCFB4 000C9F14 7C 6E 1B 78 */ mr r14, r3 lbl_800CCFB8: /* 800CCFB8 000C9F18 38 61 00 80 */ addi r3, r1, 0x80 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s b/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s index 057e22c3..be8f2f30 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s @@ -241,8 +241,8 @@ lbl_801D6BA8: /* 801D6BBC 001D3B1C 38 21 00 10 */ addi r1, r1, 0x10 /* 801D6BC0 001D3B20 4E 80 00 20 */ blr -.global "__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUiUsUcUcUiUibfff" -"__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUiUsUcUcUiUibfff": +.global "__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUiiUcUcUiUibfff" +"__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUiiUcUcUiUibfff": /* 801D6BC4 001D3B24 94 21 FF 90 */ stwu r1, -0x70(r1) /* 801D6BC8 001D3B28 7C 08 02 A6 */ mflr r0 /* 801D6BCC 001D3B2C 90 01 00 74 */ stw r0, 0x74(r1) diff --git a/include/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.hpp b/include/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.hpp index 4cd6c4a1..485e7bbf 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.hpp @@ -18,7 +18,7 @@ public: CAssetId backgroundModel, const CVector3f& backgroundScale, bool upElevator, ushort soundId, uchar volume, uchar panning); 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, bool fadeWhite, float charFadeIn, float charsPerSecond, float showDelay); ~CScriptWorldTeleporter(); diff --git a/src/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.cpp b/src/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.cpp index 9b5f2741..237d2521 100644 --- a/src/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.cpp +++ b/src/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.cpp @@ -63,7 +63,7 @@ CScriptWorldTeleporter::CScriptWorldTeleporter( CScriptWorldTeleporter::CScriptWorldTeleporter(TUniqueId uid, const rstl::string& name, const CEntityInfo& info, bool active, - CAssetId worldId, CAssetId areaId, ushort soundId, + CAssetId worldId, CAssetId areaId, int soundId, uchar volume, uchar panning, CAssetId fontId, CAssetId stringId, bool fadeWhite, float charFadeIn, float charsPerSecond, float showDelay)