From f2ca3ad9e7e5a7fbd2b231efb67cfc9cf1611fc0 Mon Sep 17 00:00:00 2001 From: sourcehold Date: Sat, 22 Aug 2026 22:41:42 +0200 Subject: [PATCH 1/2] reimplement OpenSHC::Map::Rocks 100% --- src/OpenSHC/Map/Rocks/UpdateRockFunc1.cpp | 13 +++++++++++++ src/OpenSHC/Map/Rocks/UpdateRockFunc10.cpp | 16 ++++++++++++++++ src/OpenSHC/Map/Rocks/UpdateRockFunc11.cpp | 16 ++++++++++++++++ src/OpenSHC/Map/Rocks/UpdateRockFunc12.cpp | 16 ++++++++++++++++ src/OpenSHC/Map/Rocks/UpdateRockFunc13.cpp | 16 ++++++++++++++++ src/OpenSHC/Map/Rocks/UpdateRockFunc14.cpp | 16 ++++++++++++++++ src/OpenSHC/Map/Rocks/UpdateRockFunc15.cpp | 16 ++++++++++++++++ src/OpenSHC/Map/Rocks/UpdateRockFunc16.cpp | 16 ++++++++++++++++ src/OpenSHC/Map/Rocks/UpdateRockFunc2.cpp | 16 ++++++++++++++++ src/OpenSHC/Map/Rocks/UpdateRockFunc3.cpp | 16 ++++++++++++++++ src/OpenSHC/Map/Rocks/UpdateRockFunc4.cpp | 16 ++++++++++++++++ src/OpenSHC/Map/Rocks/UpdateRockFunc5.cpp | 16 ++++++++++++++++ src/OpenSHC/Map/Rocks/UpdateRockFunc6.cpp | 16 ++++++++++++++++ src/OpenSHC/Map/Rocks/UpdateRockFunc7.cpp | 16 ++++++++++++++++ src/OpenSHC/Map/Rocks/UpdateRockFunc8.cpp | 16 ++++++++++++++++ src/OpenSHC/Map/Rocks/UpdateRockFunc9.cpp | 16 ++++++++++++++++ 16 files changed, 253 insertions(+) create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc1.cpp create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc10.cpp create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc11.cpp create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc12.cpp create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc13.cpp create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc14.cpp create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc15.cpp create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc16.cpp create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc2.cpp create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc3.cpp create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc4.cpp create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc5.cpp create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc6.cpp create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc7.cpp create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc8.cpp create mode 100644 src/OpenSHC/Map/Rocks/UpdateRockFunc9.cpp diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc1.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc1.cpp new file mode 100644 index 00000000..287ee48b --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc1.cpp @@ -0,0 +1,13 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2A20 + void __cdecl Rocks::UpdateRockFunc1() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 529; } + +} +} diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc10.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc10.cpp new file mode 100644 index 00000000..b550ac4d --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc10.cpp @@ -0,0 +1,16 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2B40 + void __cdecl Rocks ::UpdateRockFunc10() + { + DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x165; + } + +} +} diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc11.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc11.cpp new file mode 100644 index 00000000..a4f2bf6f --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc11.cpp @@ -0,0 +1,16 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2B60 + void __cdecl Rocks ::UpdateRockFunc11() + { + DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x189; + } + +} +} diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc12.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc12.cpp new file mode 100644 index 00000000..3ae6dcef --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc12.cpp @@ -0,0 +1,16 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2B80 + void __cdecl Rocks ::UpdateRockFunc12() + { + DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x1ad; + } + +} +} diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc13.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc13.cpp new file mode 100644 index 00000000..a5241f29 --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc13.cpp @@ -0,0 +1,16 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2BA0 + void __cdecl Rocks ::UpdateRockFunc13() + { + DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x41; + } + +} +} diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc14.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc14.cpp new file mode 100644 index 00000000..09615f68 --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc14.cpp @@ -0,0 +1,16 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2BC0 + void __cdecl Rocks ::UpdateRockFunc14() + { + DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x81; + } + +} +} diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc15.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc15.cpp new file mode 100644 index 00000000..999c3db2 --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc15.cpp @@ -0,0 +1,16 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2BE0 + void __cdecl Rocks ::UpdateRockFunc15() + { + DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0xc1; + } + +} +} diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc16.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc16.cpp new file mode 100644 index 00000000..c3c471af --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc16.cpp @@ -0,0 +1,16 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2C00 + void __cdecl Rocks ::UpdateRockFunc16() + { + DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 257; + } + +} +} diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc2.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc2.cpp new file mode 100644 index 00000000..15a4ba5f --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc2.cpp @@ -0,0 +1,16 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2A40 + void __cdecl Rocks::UpdateRockFunc2() + { + DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x215; + } + +} +} diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc3.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc3.cpp new file mode 100644 index 00000000..d3ecfe28 --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc3.cpp @@ -0,0 +1,16 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2A60 + void __cdecl Rocks::UpdateRockFunc3() + { + DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x219; + } + +} +} diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc4.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc4.cpp new file mode 100644 index 00000000..fff1cc67 --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc4.cpp @@ -0,0 +1,16 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2A80 + void __cdecl Rocks::UpdateRockFunc4() + { + DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x21d; + } + +} +} diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc5.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc5.cpp new file mode 100644 index 00000000..eeaa4cc2 --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc5.cpp @@ -0,0 +1,16 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2AA0 + void __cdecl Rocks ::UpdateRockFunc5() + { + DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x1d1; + } + +} +} diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc6.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc6.cpp new file mode 100644 index 00000000..89b751ea --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc6.cpp @@ -0,0 +1,16 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2AC0 + void __cdecl Rocks ::UpdateRockFunc6() + { + DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x1e1; + } + +} +} diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc7.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc7.cpp new file mode 100644 index 00000000..4de4c7e7 --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc7.cpp @@ -0,0 +1,16 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2AE0 + void __cdecl Rocks ::UpdateRockFunc7() + { + DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x1f1; + } + +} +} diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc8.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc8.cpp new file mode 100644 index 00000000..73550022 --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc8.cpp @@ -0,0 +1,16 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2B00 + void __cdecl Rocks ::UpdateRockFunc8() + { + DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x201; + } + +} +} diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc9.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc9.cpp new file mode 100644 index 00000000..c64d330f --- /dev/null +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc9.cpp @@ -0,0 +1,16 @@ +#include "OpenSHC/Map/Rocks.func.hpp" + +#include "OpenSHC/Globals/DAT_CurrentRockID.hpp" +#include "OpenSHC/Globals/DAT_LandscapeState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x004F2B20 + void __cdecl Rocks ::UpdateRockFunc9() + { + DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x141; + } + +} +} From d8f76de84b44c2bdde1551921103240c6dfeca0e Mon Sep 17 00:00:00 2001 From: sourcehold Date: Sun, 23 Aug 2026 14:13:20 +0200 Subject: [PATCH 2/2] included status update, improved prettiness of code --- src/OpenSHC/Map/Rocks/UpdateRockFunc1.cpp | 2 +- src/OpenSHC/Map/Rocks/UpdateRockFunc10.cpp | 5 +--- src/OpenSHC/Map/Rocks/UpdateRockFunc11.cpp | 5 +--- src/OpenSHC/Map/Rocks/UpdateRockFunc12.cpp | 5 +--- src/OpenSHC/Map/Rocks/UpdateRockFunc13.cpp | 5 +--- src/OpenSHC/Map/Rocks/UpdateRockFunc14.cpp | 5 +--- src/OpenSHC/Map/Rocks/UpdateRockFunc15.cpp | 5 +--- src/OpenSHC/Map/Rocks/UpdateRockFunc16.cpp | 5 +--- src/OpenSHC/Map/Rocks/UpdateRockFunc2.cpp | 5 +--- src/OpenSHC/Map/Rocks/UpdateRockFunc3.cpp | 5 +--- src/OpenSHC/Map/Rocks/UpdateRockFunc4.cpp | 5 +--- src/OpenSHC/Map/Rocks/UpdateRockFunc5.cpp | 5 +--- src/OpenSHC/Map/Rocks/UpdateRockFunc6.cpp | 5 +--- src/OpenSHC/Map/Rocks/UpdateRockFunc7.cpp | 5 +--- src/OpenSHC/Map/Rocks/UpdateRockFunc8.cpp | 5 +--- src/OpenSHC/Map/Rocks/UpdateRockFunc9.cpp | 5 +--- status/addresses-SHC-3BB0A8C1.txt | 33 +++++++++++----------- 17 files changed, 33 insertions(+), 77 deletions(-) diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc1.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc1.cpp index 287ee48b..57cd0d63 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc1.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc1.cpp @@ -7,7 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2A20 - void __cdecl Rocks::UpdateRockFunc1() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 529; } + void Rocks::UpdateRockFunc1() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 529; } } } diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc10.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc10.cpp index b550ac4d..4293e40c 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc10.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc10.cpp @@ -7,10 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2B40 - void __cdecl Rocks ::UpdateRockFunc10() - { - DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x165; - } + void Rocks::UpdateRockFunc10() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x165; } } } diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc11.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc11.cpp index a4f2bf6f..c9c176b2 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc11.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc11.cpp @@ -7,10 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2B60 - void __cdecl Rocks ::UpdateRockFunc11() - { - DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x189; - } + void Rocks::UpdateRockFunc11() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x189; } } } diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc12.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc12.cpp index 3ae6dcef..f99d3405 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc12.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc12.cpp @@ -7,10 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2B80 - void __cdecl Rocks ::UpdateRockFunc12() - { - DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x1ad; - } + void Rocks::UpdateRockFunc12() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x1ad; } } } diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc13.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc13.cpp index a5241f29..726ec3bb 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc13.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc13.cpp @@ -7,10 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2BA0 - void __cdecl Rocks ::UpdateRockFunc13() - { - DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x41; - } + void Rocks::UpdateRockFunc13() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x41; } } } diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc14.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc14.cpp index 09615f68..d3297951 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc14.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc14.cpp @@ -7,10 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2BC0 - void __cdecl Rocks ::UpdateRockFunc14() - { - DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x81; - } + void Rocks::UpdateRockFunc14() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x81; } } } diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc15.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc15.cpp index 999c3db2..4a7a800c 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc15.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc15.cpp @@ -7,10 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2BE0 - void __cdecl Rocks ::UpdateRockFunc15() - { - DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0xc1; - } + void Rocks::UpdateRockFunc15() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0xc1; } } } diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc16.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc16.cpp index c3c471af..0bd8d941 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc16.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc16.cpp @@ -7,10 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2C00 - void __cdecl Rocks ::UpdateRockFunc16() - { - DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 257; - } + void Rocks::UpdateRockFunc16() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 257; } } } diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc2.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc2.cpp index 15a4ba5f..2be289ed 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc2.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc2.cpp @@ -7,10 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2A40 - void __cdecl Rocks::UpdateRockFunc2() - { - DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x215; - } + void Rocks::UpdateRockFunc2() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x215; } } } diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc3.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc3.cpp index d3ecfe28..4e2f9bb1 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc3.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc3.cpp @@ -7,10 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2A60 - void __cdecl Rocks::UpdateRockFunc3() - { - DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x219; - } + void Rocks::UpdateRockFunc3() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x219; } } } diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc4.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc4.cpp index fff1cc67..07da8d16 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc4.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc4.cpp @@ -7,10 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2A80 - void __cdecl Rocks::UpdateRockFunc4() - { - DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x21d; - } + void Rocks::UpdateRockFunc4() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x21d; } } } diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc5.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc5.cpp index eeaa4cc2..df253200 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc5.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc5.cpp @@ -7,10 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2AA0 - void __cdecl Rocks ::UpdateRockFunc5() - { - DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x1d1; - } + void Rocks::UpdateRockFunc5() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x1d1; } } } diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc6.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc6.cpp index 89b751ea..dfa114db 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc6.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc6.cpp @@ -7,10 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2AC0 - void __cdecl Rocks ::UpdateRockFunc6() - { - DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x1e1; - } + void Rocks::UpdateRockFunc6() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x1e1; } } } diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc7.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc7.cpp index 4de4c7e7..e4043215 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc7.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc7.cpp @@ -7,10 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2AE0 - void __cdecl Rocks ::UpdateRockFunc7() - { - DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x1f1; - } + void Rocks::UpdateRockFunc7() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x1f1; } } } diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc8.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc8.cpp index 73550022..4cfdb3e4 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc8.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc8.cpp @@ -7,10 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2B00 - void __cdecl Rocks ::UpdateRockFunc8() - { - DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x201; - } + void Rocks::UpdateRockFunc8() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x201; } } } diff --git a/src/OpenSHC/Map/Rocks/UpdateRockFunc9.cpp b/src/OpenSHC/Map/Rocks/UpdateRockFunc9.cpp index c64d330f..d44e0811 100644 --- a/src/OpenSHC/Map/Rocks/UpdateRockFunc9.cpp +++ b/src/OpenSHC/Map/Rocks/UpdateRockFunc9.cpp @@ -7,10 +7,7 @@ namespace OpenSHC { namespace Map { // FUNCTION: STRONGHOLDCRUSADER 0x004F2B20 - void __cdecl Rocks ::UpdateRockFunc9() - { - DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x141; - } + void Rocks::UpdateRockFunc9() { DAT_LandscapeState::instance.rocks[DAT_CurrentRockID::instance].gfx = 0x141; } } } diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index c00bd8f3..4108e80a 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -38473,37 +38473,37 @@ SHC_3BB0A8C1_0x004F29C0 | 0.0% | Pending SHC_3BB0A8C1_0x004F2A10 | 0.0% | Pending -SHC_3BB0A8C1_0x004F2A20 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2A20 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004F2A40 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2A40 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004F2A60 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2A60 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004F2A80 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2A80 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004F2AA0 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2AA0 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004F2AC0 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2AC0 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004F2AE0 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2AE0 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004F2B00 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2B00 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004F2B20 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2B20 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004F2B40 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2B40 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004F2B60 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2B60 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004F2B80 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2B80 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004F2BA0 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2BA0 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004F2BC0 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2BC0 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004F2BE0 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2BE0 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004F2C00 | 0.0% | Pending +SHC_3BB0A8C1_0x004F2C00 | 100.0% | Reimplemented SHC_3BB0A8C1_0x004F2C20 | 0.0% | Pending @@ -88158,3 +88158,4 @@ SHC_3BB0A8C1_0x02490930 | 0.0% | Pending SHC_3BB0A8C1_0x02490936 | 0.0% | Pending SHC_3BB0A8C1_0x02490954 | 0.0% | Pending +