diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index 0afe1ee1..1d4d4641 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -281,7 +281,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine return msg.wParam; } -// FUNCTION: ISLE 0x401c40 SYNTHETIC +// FUNCTION: ISLE 0x401c40 // MxDSObject::SetAtomId // FUNCTION: ISLE 0x401ca0 diff --git a/LEGO1/act1state.cpp b/LEGO1/act1state.cpp index 8aaffffb..c013b502 100644 --- a/LEGO1/act1state.cpp +++ b/LEGO1/act1state.cpp @@ -1,6 +1,6 @@ #include "act1state.h" -// FUNCTION: LEGO1 0x100334b0 STUB +// STUB: LEGO1 0x100334b0 Act1State::Act1State() { // TODO diff --git a/LEGO1/act2brick.cpp b/LEGO1/act2brick.cpp index 8c0a9840..01face28 100644 --- a/LEGO1/act2brick.cpp +++ b/LEGO1/act2brick.cpp @@ -1,18 +1,18 @@ #include "act2brick.h" -// FUNCTION: LEGO1 0x1007a2b0 STUB +// STUB: LEGO1 0x1007a2b0 Act2Brick::Act2Brick() { // TODO } -// FUNCTION: LEGO1 0x1007a470 STUB +// STUB: LEGO1 0x1007a470 Act2Brick::~Act2Brick() { // TODO } -// FUNCTION: LEGO1 0x1007a7f0 STUB +// STUB: LEGO1 0x1007a7f0 MxResult Act2Brick::Tickle() { // TODO @@ -20,7 +20,7 @@ MxResult Act2Brick::Tickle() return SUCCESS; } -// FUNCTION: LEGO1 0x1007a8c0 STUB +// STUB: LEGO1 0x1007a8c0 MxLong Act2Brick::Notify(MxParam& p) { // TODO diff --git a/LEGO1/act2policestation.cpp b/LEGO1/act2policestation.cpp index 7d8c7426..aa6c024b 100644 --- a/LEGO1/act2policestation.cpp +++ b/LEGO1/act2policestation.cpp @@ -1,6 +1,6 @@ #include "act2policestation.h" -// FUNCTION: LEGO1 0x1004e0e0 STUB +// STUB: LEGO1 0x1004e0e0 MxLong Act2PoliceStation::Notify(MxParam& p) { // TODO diff --git a/LEGO1/act3.cpp b/LEGO1/act3.cpp index 7ce97b3a..149e19a7 100644 --- a/LEGO1/act3.cpp +++ b/LEGO1/act3.cpp @@ -2,13 +2,13 @@ DECOMP_SIZE_ASSERT(Act3, 0x4274) -// FUNCTION: LEGO1 0x10072270 STUB +// STUB: LEGO1 0x10072270 Act3::Act3() { // TODO } -// FUNCTION: LEGO1 0x100726a0 STUB +// STUB: LEGO1 0x100726a0 Act3::~Act3() { // TODO diff --git a/LEGO1/ambulancemissionstate.cpp b/LEGO1/ambulancemissionstate.cpp index ce022859..54f32b41 100644 --- a/LEGO1/ambulancemissionstate.cpp +++ b/LEGO1/ambulancemissionstate.cpp @@ -2,7 +2,7 @@ DECOMP_SIZE_ASSERT(AmbulanceMissionState, 0x24); -// FUNCTION: LEGO1 0x100373a0 STUB +// STUB: LEGO1 0x100373a0 AmbulanceMissionState::AmbulanceMissionState() { // TODO diff --git a/LEGO1/animstate.cpp b/LEGO1/animstate.cpp index c8b194de..7377475b 100644 --- a/LEGO1/animstate.cpp +++ b/LEGO1/animstate.cpp @@ -1,12 +1,12 @@ #include "animstate.h" -// FUNCTION: LEGO1 0x10064ff0 STUB +// STUB: LEGO1 0x10064ff0 AnimState::AnimState() { // TODO } -// FUNCTION: LEGO1 0x10065150 STUB +// STUB: LEGO1 0x10065150 AnimState::~AnimState() { // TODO diff --git a/LEGO1/beachhouseentity.cpp b/LEGO1/beachhouseentity.cpp index ced72254..60d58285 100644 --- a/LEGO1/beachhouseentity.cpp +++ b/LEGO1/beachhouseentity.cpp @@ -1,6 +1,6 @@ #include "beachhouseentity.h" -// FUNCTION: LEGO1 0x100150a0 STUB +// STUB: LEGO1 0x100150a0 MxLong BeachHouseEntity::Notify(MxParam& p) { // TODO diff --git a/LEGO1/buildingentity.cpp b/LEGO1/buildingentity.cpp index 268525a8..37a09f2f 100644 --- a/LEGO1/buildingentity.cpp +++ b/LEGO1/buildingentity.cpp @@ -1,12 +1,12 @@ #include "buildingentity.h" -// FUNCTION: LEGO1 0x10014e20 STUB +// STUB: LEGO1 0x10014e20 BuildingEntity::BuildingEntity() { // TODO } -// FUNCTION: LEGO1 0x10015030 STUB +// STUB: LEGO1 0x10015030 BuildingEntity::~BuildingEntity() { // TODO diff --git a/LEGO1/carrace.cpp b/LEGO1/carrace.cpp index 41fdea2f..6da96168 100644 --- a/LEGO1/carrace.cpp +++ b/LEGO1/carrace.cpp @@ -1,6 +1,6 @@ #include "carrace.h" -// FUNCTION: LEGO1 0x10016a90 STUB +// STUB: LEGO1 0x10016a90 CarRace::CarRace() { // TODO diff --git a/LEGO1/elevatorbottom.cpp b/LEGO1/elevatorbottom.cpp index 725eacc6..434db69e 100644 --- a/LEGO1/elevatorbottom.cpp +++ b/LEGO1/elevatorbottom.cpp @@ -1,18 +1,18 @@ #include "elevatorbottom.h" -// FUNCTION: LEGO1 0x10017e90 STUB +// STUB: LEGO1 0x10017e90 ElevatorBottom::ElevatorBottom() { // TODO } -// FUNCTION: LEGO1 0x10018060 STUB +// STUB: LEGO1 0x10018060 ElevatorBottom::~ElevatorBottom() { // TODO } -// FUNCTION: LEGO1 0x10018150 STUB +// STUB: LEGO1 0x10018150 MxLong ElevatorBottom::Notify(MxParam& p) { // TODO diff --git a/LEGO1/gasstation.cpp b/LEGO1/gasstation.cpp index c5bd0ee9..dc5c441b 100644 --- a/LEGO1/gasstation.cpp +++ b/LEGO1/gasstation.cpp @@ -1,18 +1,18 @@ #include "gasstation.h" -// FUNCTION: LEGO1 0x100046a0 STUB +// STUB: LEGO1 0x100046a0 GasStation::GasStation() { // TODO } -// FUNCTION: LEGO1 0x100048c0 STUB +// STUB: LEGO1 0x100048c0 GasStation::~GasStation() { // TODO } -// FUNCTION: LEGO1 0x10004a60 STUB +// STUB: LEGO1 0x10004a60 MxLong GasStation::Notify(MxParam& p) { // TODO @@ -20,7 +20,7 @@ MxLong GasStation::Notify(MxParam& p) return 0; } -// FUNCTION: LEGO1 0x10005c90 STUB +// STUB: LEGO1 0x10005c90 MxResult GasStation::Tickle() { // TODO diff --git a/LEGO1/gifmanager.h b/LEGO1/gifmanager.h index 394b1fce..b5c52971 100644 --- a/LEGO1/gifmanager.h +++ b/LEGO1/gifmanager.h @@ -45,7 +45,7 @@ public: // VTABLE: LEGO1 0x100d86d4 class GifManagerBase { public: - // FUNCTION: LEGO1 0x1005a310 STUB + // STUB: LEGO1 0x1005a310 virtual ~GifManagerBase() {} // vtable+00 inline GifData* Get(const char* name) { return m_unk8.Get(name); } @@ -59,7 +59,7 @@ protected: // VTABLE: LEGO1 0x100d86fc class GifManager : public GifManagerBase { public: - // FUNCTION: LEGO1 0x1005a580 STUB + // STUB: LEGO1 0x1005a580 virtual ~GifManager() {} // vtable+00 protected: diff --git a/LEGO1/helicopter.h b/LEGO1/helicopter.h index df2e9fb7..2c85e289 100644 --- a/LEGO1/helicopter.h +++ b/LEGO1/helicopter.h @@ -27,7 +27,7 @@ public: virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18 virtual void VTable0xe4() override; - // FUNCTION: LEGO1 0x10003210 SYNTHETIC + // SYNTHETIC: LEGO1 0x10003210 // Helicopter::`scalar deleting destructor' virtual ~Helicopter() override; // vtable+0x0 diff --git a/LEGO1/historybook.cpp b/LEGO1/historybook.cpp index dfdd94e2..f41930e6 100644 --- a/LEGO1/historybook.cpp +++ b/LEGO1/historybook.cpp @@ -1,18 +1,18 @@ #include "historybook.h" -// FUNCTION: LEGO1 0x100822f0 STUB +// STUB: LEGO1 0x100822f0 HistoryBook::HistoryBook() { // TODO } -// FUNCTION: LEGO1 0x100824d0 STUB +// STUB: LEGO1 0x100824d0 HistoryBook::~HistoryBook() { // TODO } -// FUNCTION: LEGO1 0x10082680 STUB +// STUB: LEGO1 0x10082680 MxLong HistoryBook::Notify(MxParam& p) { // TODO diff --git a/LEGO1/hospital.cpp b/LEGO1/hospital.cpp index b07d7b3a..09e9c1e0 100644 --- a/LEGO1/hospital.cpp +++ b/LEGO1/hospital.cpp @@ -1,18 +1,18 @@ #include "hospital.h" -// FUNCTION: LEGO1 0x100745e0 STUB +// STUB: LEGO1 0x100745e0 Hospital::Hospital() { // TODO } -// FUNCTION: LEGO1 0x100747f0 STUB +// STUB: LEGO1 0x100747f0 Hospital::~Hospital() { // TODO } -// FUNCTION: LEGO1 0x10074990 STUB +// STUB: LEGO1 0x10074990 MxLong Hospital::Notify(MxParam& p) { // TODO diff --git a/LEGO1/hospitalstate.cpp b/LEGO1/hospitalstate.cpp index 2499cea3..b1727b74 100644 --- a/LEGO1/hospitalstate.cpp +++ b/LEGO1/hospitalstate.cpp @@ -1,6 +1,6 @@ #include "hospitalstate.h" -// FUNCTION: LEGO1 0x10076370 STUB +// STUB: LEGO1 0x10076370 HospitalState::HospitalState() { // TODO diff --git a/LEGO1/infocenter.cpp b/LEGO1/infocenter.cpp index e204c764..35968db9 100644 --- a/LEGO1/infocenter.cpp +++ b/LEGO1/infocenter.cpp @@ -1,18 +1,18 @@ #include "infocenter.h" -// FUNCTION: LEGO1 0x1006ea20 STUB +// STUB: LEGO1 0x1006ea20 Infocenter::Infocenter() { // TODO } -// FUNCTION: LEGO1 0x1006ec90 STUB +// STUB: LEGO1 0x1006ec90 Infocenter::~Infocenter() { // TODO } -// FUNCTION: LEGO1 0x1006ef10 STUB +// STUB: LEGO1 0x1006ef10 MxLong Infocenter::Notify(MxParam& p) { // TODO @@ -20,7 +20,7 @@ MxLong Infocenter::Notify(MxParam& p) return 0; } -// FUNCTION: LEGO1 0x10070af0 STUB +// STUB: LEGO1 0x10070af0 MxResult Infocenter::Tickle() { // TODO diff --git a/LEGO1/infocenterdoor.cpp b/LEGO1/infocenterdoor.cpp index 1508fba2..ed23a6ac 100644 --- a/LEGO1/infocenterdoor.cpp +++ b/LEGO1/infocenterdoor.cpp @@ -1,18 +1,18 @@ #include "infocenterdoor.h" -// FUNCTION: LEGO1 0x10037730 STUB +// STUB: LEGO1 0x10037730 InfocenterDoor::InfocenterDoor() { // TODO } -// FUNCTION: LEGO1 0x100378f0 STUB +// STUB: LEGO1 0x100378f0 InfocenterDoor::~InfocenterDoor() { // TODO } -// FUNCTION: LEGO1 0x100379e0 STUB +// STUB: LEGO1 0x100379e0 MxLong InfocenterDoor::Notify(MxParam& p) { // TODO diff --git a/LEGO1/infocenterstate.cpp b/LEGO1/infocenterstate.cpp index 2a4efb37..47a31fbb 100644 --- a/LEGO1/infocenterstate.cpp +++ b/LEGO1/infocenterstate.cpp @@ -2,13 +2,13 @@ DECOMP_SIZE_ASSERT(InfocenterState, 0x94); -// FUNCTION: LEGO1 0x10071600 STUB +// STUB: LEGO1 0x10071600 InfocenterState::InfocenterState() { // TODO } -// FUNCTION: LEGO1 0x10071920 STUB +// STUB: LEGO1 0x10071920 InfocenterState::~InfocenterState() { // TODO diff --git a/LEGO1/isle.cpp b/LEGO1/isle.cpp index 5958b51a..dc81f0be 100644 --- a/LEGO1/isle.cpp +++ b/LEGO1/isle.cpp @@ -1,6 +1,6 @@ #include "isle.h" -// FUNCTION: LEGO1 0x10030820 STUB +// STUB: LEGO1 0x10030820 Isle::Isle() { // TODO diff --git a/LEGO1/islepathactor.cpp b/LEGO1/islepathactor.cpp index c8cfad58..805fc287 100644 --- a/LEGO1/islepathactor.cpp +++ b/LEGO1/islepathactor.cpp @@ -3,31 +3,31 @@ DECOMP_SIZE_ASSERT(IslePathActor, 0x160) // Probably in header -// FUNCTION: LEGO1 0x10002df0 STUB +// STUB: LEGO1 0x10002df0 void IslePathActor::VTable0xd0() { // TODO } -// FUNCTION: LEGO1 0x10002e00 STUB +// STUB: LEGO1 0x10002e00 void IslePathActor::VTable0xdc() { // TODO } -// FUNCTION: LEGO1 0x10002e70 STUB +// STUB: LEGO1 0x10002e70 void IslePathActor::VTable0xcc() { // TODO } -// FUNCTION: LEGO1 0x10002e80 STUB +// STUB: LEGO1 0x10002e80 void IslePathActor::VTable0xd4() { // TODO } -// FUNCTION: LEGO1 0x10002e90 STUB +// STUB: LEGO1 0x10002e90 void IslePathActor::VTable0xd8() { // TODO @@ -49,25 +49,25 @@ MxResult IslePathActor::Create(MxDSObject& p_dsObject) return MxEntity::Create(p_dsObject); } -// FUNCTION: LEGO1 0x1001a350 STUB +// STUB: LEGO1 0x1001a350 void IslePathActor::VTable0xe0() { // TODO } -// FUNCTION: LEGO1 0x1001a3f0 STUB +// STUB: LEGO1 0x1001a3f0 void IslePathActor::VTable0xe4() { // TODO } -// FUNCTION: LEGO1 0x1001b2a0 STUB +// STUB: LEGO1 0x1001b2a0 void IslePathActor::VTable0xe8(MxU32 p_1, MxBool p_2, MxU8 p_3) { // TODO } -// FUNCTION: LEGO1 0x1001b5b0 STUB +// STUB: LEGO1 0x1001b5b0 void IslePathActor::VTable0xec() { // TODO diff --git a/LEGO1/islepathactor.h b/LEGO1/islepathactor.h index 4706ad12..32e5100d 100644 --- a/LEGO1/islepathactor.h +++ b/LEGO1/islepathactor.h @@ -24,7 +24,7 @@ public: return !strcmp(name, IslePathActor::ClassName()) || LegoPathActor::IsA(name); } - // FUNCTION: LEGO1 0x10002ff0 SYNTHETIC + // SYNTHETIC: LEGO1 0x10002ff0 // IslePathActor::`scalar deleting destructor' inline virtual ~IslePathActor() override { IslePathActor::Destroy(TRUE); } diff --git a/LEGO1/jukebox.cpp b/LEGO1/jukebox.cpp index eebc5bc2..b13b1f82 100644 --- a/LEGO1/jukebox.cpp +++ b/LEGO1/jukebox.cpp @@ -1,6 +1,6 @@ #include "jukebox.h" -// FUNCTION: LEGO1 0x1005d660 STUB +// STUB: LEGO1 0x1005d660 JukeBox::JukeBox() { // TODO diff --git a/LEGO1/jukeboxentity.cpp b/LEGO1/jukeboxentity.cpp index 97049935..73071896 100644 --- a/LEGO1/jukeboxentity.cpp +++ b/LEGO1/jukeboxentity.cpp @@ -1,12 +1,12 @@ #include "jukeboxentity.h" -// FUNCTION: LEGO1 0x10085bc0 STUB +// STUB: LEGO1 0x10085bc0 JukeBoxEntity::JukeBoxEntity() { // TODO } -// FUNCTION: LEGO1 0x10085dd0 STUB +// STUB: LEGO1 0x10085dd0 JukeBoxEntity::~JukeBoxEntity() { // TODO diff --git a/LEGO1/legoactioncontrolpresenter.cpp b/LEGO1/legoactioncontrolpresenter.cpp index 2d76a1a5..88c3143f 100644 --- a/LEGO1/legoactioncontrolpresenter.cpp +++ b/LEGO1/legoactioncontrolpresenter.cpp @@ -10,13 +10,13 @@ DECOMP_SIZE_ASSERT(LegoActionControlPresenter, 0x68) -// FUNCTION: LEGO1 0x10043ce0 STUB +// STUB: LEGO1 0x10043ce0 void LegoActionControlPresenter::ReadyTickle() { // TODO } -// FUNCTION: LEGO1 0x10043d40 STUB +// STUB: LEGO1 0x10043d40 void LegoActionControlPresenter::RepeatingTickle() { // TODO diff --git a/LEGO1/legoactioncontrolpresenter.h b/LEGO1/legoactioncontrolpresenter.h index cef06b83..6e2f2500 100644 --- a/LEGO1/legoactioncontrolpresenter.h +++ b/LEGO1/legoactioncontrolpresenter.h @@ -26,7 +26,7 @@ public: } // TODO: Find proper compilation unit to put this - // FUNCTION: LEGO1 0x1000d1d0 SYNTHETIC + // SYNTHETIC: LEGO1 0x1000d1d0 // LegoActionControlPresenter::`scalar deleting destructor' virtual void ReadyTickle() override; // vtable+0x18 diff --git a/LEGO1/legoanimationmanager.cpp b/LEGO1/legoanimationmanager.cpp index 93b78945..c615f51c 100644 --- a/LEGO1/legoanimationmanager.cpp +++ b/LEGO1/legoanimationmanager.cpp @@ -9,31 +9,31 @@ void LegoAnimationManager::configureLegoAnimationManager(int param_1) g_legoAnimationManagerConfig = param_1; } -// FUNCTION: LEGO1 0x1005eb60 STUB +// STUB: LEGO1 0x1005eb60 LegoAnimationManager::LegoAnimationManager() { // TODO } -// FUNCTION: LEGO1 0x1005ed30 STUB +// STUB: LEGO1 0x1005ed30 LegoAnimationManager::~LegoAnimationManager() { // TODO } -// FUNCTION: LEGO1 0x1005f130 STUB +// STUB: LEGO1 0x1005f130 void LegoAnimationManager::Init() { // TODO } -// FUNCTION: LEGO1 0x1005f6d0 STUB +// STUB: LEGO1 0x1005f6d0 void LegoAnimationManager::FUN_1005f6d0(MxBool p) { // TODO } -// FUNCTION: LEGO1 0x100619f0 STUB +// STUB: LEGO1 0x100619f0 MxLong LegoAnimationManager::Notify(MxParam& p) { // TODO @@ -41,7 +41,7 @@ MxLong LegoAnimationManager::Notify(MxParam& p) return 0; } -// FUNCTION: LEGO1 0x10061cc0 STUB +// STUB: LEGO1 0x10061cc0 MxResult LegoAnimationManager::Tickle() { // TODO diff --git a/LEGO1/legoanimmmpresenter.cpp b/LEGO1/legoanimmmpresenter.cpp index 1f32d1af..a6e20919 100644 --- a/LEGO1/legoanimmmpresenter.cpp +++ b/LEGO1/legoanimmmpresenter.cpp @@ -1,6 +1,6 @@ #include "legoanimmmpresenter.h" -// FUNCTION: LEGO1 0x1004a8d0 STUB +// STUB: LEGO1 0x1004a8d0 LegoAnimMMPresenter::LegoAnimMMPresenter() { // TODO diff --git a/LEGO1/legoanimpresenter.cpp b/LEGO1/legoanimpresenter.cpp index c6646f87..2bdd7475 100644 --- a/LEGO1/legoanimpresenter.cpp +++ b/LEGO1/legoanimpresenter.cpp @@ -1,12 +1,12 @@ #include "legoanimpresenter.h" -// FUNCTION: LEGO1 0x10068420 STUB +// STUB: LEGO1 0x10068420 LegoAnimPresenter::LegoAnimPresenter() { // TODO } -// FUNCTION: LEGO1 0x100686f0 STUB +// STUB: LEGO1 0x100686f0 void LegoAnimPresenter::Init() { // TODO diff --git a/LEGO1/legobuildingmanager.cpp b/LEGO1/legobuildingmanager.cpp index ecbea70a..ee43d8e2 100644 --- a/LEGO1/legobuildingmanager.cpp +++ b/LEGO1/legobuildingmanager.cpp @@ -15,13 +15,13 @@ LegoBuildingManager::LegoBuildingManager() Init(); } -// FUNCTION: LEGO1 0x1002f960 STUB +// STUB: LEGO1 0x1002f960 LegoBuildingManager::~LegoBuildingManager() { // TODO } -// FUNCTION: LEGO1 0x1002f9d0 STUB +// STUB: LEGO1 0x1002f9d0 void LegoBuildingManager::Init() { // TODO diff --git a/LEGO1/legocachesound.cpp b/LEGO1/legocachesound.cpp index 53d8128d..eb58278c 100644 --- a/LEGO1/legocachesound.cpp +++ b/LEGO1/legocachesound.cpp @@ -6,13 +6,13 @@ LegoCacheSound::LegoCacheSound() Init(); } -// FUNCTION: LEGO1 0x10006630 STUB +// STUB: LEGO1 0x10006630 LegoCacheSound::~LegoCacheSound() { // TODO } -// FUNCTION: LEGO1 0x100066d0 STUB +// STUB: LEGO1 0x100066d0 void LegoCacheSound::Init() { // TODO diff --git a/LEGO1/legocameracontroller.cpp b/LEGO1/legocameracontroller.cpp index 70233df8..cf68f0d1 100644 --- a/LEGO1/legocameracontroller.cpp +++ b/LEGO1/legocameracontroller.cpp @@ -1,12 +1,12 @@ #include "legocameracontroller.h" -// FUNCTION: LEGO1 0x10011d50 STUB +// STUB: LEGO1 0x10011d50 LegoCameraController::LegoCameraController() { // TODO } -// FUNCTION: LEGO1 0x10011f70 STUB +// STUB: LEGO1 0x10011f70 LegoCameraController::~LegoCameraController() { // TODO diff --git a/LEGO1/legocarbuild.cpp b/LEGO1/legocarbuild.cpp index bb75b0db..86c9ba09 100644 --- a/LEGO1/legocarbuild.cpp +++ b/LEGO1/legocarbuild.cpp @@ -1,18 +1,18 @@ #include "legocarbuild.h" -// FUNCTION: LEGO1 0x100226d0 STUB +// STUB: LEGO1 0x100226d0 LegoCarBuild::LegoCarBuild() { // TODO } -// FUNCTION: LEGO1 0x10022a80 STUB +// STUB: LEGO1 0x10022a80 LegoCarBuild::~LegoCarBuild() { // TODO } -// FUNCTION: LEGO1 0x100238b0 STUB +// STUB: LEGO1 0x100238b0 MxResult LegoCarBuild::Tickle() { // TODO @@ -20,7 +20,7 @@ MxResult LegoCarBuild::Tickle() return 0; } -// FUNCTION: LEGO1 0x10024050 STUB +// STUB: LEGO1 0x10024050 MxLong LegoCarBuild::Notify(MxParam& p) { // TODO diff --git a/LEGO1/legocarbuildanimpresenter.cpp b/LEGO1/legocarbuildanimpresenter.cpp index ac7f7501..0b5ba549 100644 --- a/LEGO1/legocarbuildanimpresenter.cpp +++ b/LEGO1/legocarbuildanimpresenter.cpp @@ -1,12 +1,12 @@ #include "legocarbuildanimpresenter.h" -// FUNCTION: LEGO1 0x10078400 STUB +// STUB: LEGO1 0x10078400 LegoCarBuildAnimPresenter::LegoCarBuildAnimPresenter() { // TODO } -// FUNCTION: LEGO1 0x10078680 STUB +// STUB: LEGO1 0x10078680 LegoCarBuildAnimPresenter::~LegoCarBuildAnimPresenter() { // TODO diff --git a/LEGO1/legocontrolmanager.cpp b/LEGO1/legocontrolmanager.cpp index 16babad2..f3c70c50 100644 --- a/LEGO1/legocontrolmanager.cpp +++ b/LEGO1/legocontrolmanager.cpp @@ -1,30 +1,30 @@ #include "legocontrolmanager.h" -// FUNCTION: LEGO1 0x10028520 STUB +// STUB: LEGO1 0x10028520 LegoControlManager::LegoControlManager() { // TODO } -// FUNCTION: LEGO1 0x10028d60 STUB +// STUB: LEGO1 0x10028d60 LegoControlManager::~LegoControlManager() { // TODO } -// FUNCTION: LEGO1 0x10028e10 STUB +// STUB: LEGO1 0x10028e10 void LegoControlManager::Register(MxCore* p_listener) { // TODO } -// FUNCTION: LEGO1 0x10028ea0 STUB +// STUB: LEGO1 0x10028ea0 void LegoControlManager::Unregister(MxCore* p_listener) { // TODO } -// FUNCTION: LEGO1 0x10029600 STUB +// STUB: LEGO1 0x10029600 MxResult LegoControlManager::Tickle() { // TODO diff --git a/LEGO1/legoentity.cpp b/LEGO1/legoentity.cpp index 8863d8bc..7e8a953f 100644 --- a/LEGO1/legoentity.cpp +++ b/LEGO1/legoentity.cpp @@ -7,7 +7,7 @@ DECOMP_SIZE_ASSERT(LegoEntity, 0x68) -// FUNCTION: LEGO1 0x10001090 SYNTHETIC +// FUNCTION: LEGO1 0x10001090 // LegoEntity::SetWorldSpeed // FUNCTION: LEGO1 0x1000c290 @@ -32,13 +32,13 @@ void LegoEntity::Init() m_unk59 = 4; } -// FUNCTION: LEGO1 0x10010650 STUB +// STUB: LEGO1 0x10010650 void LegoEntity::ResetWorldTransform(MxBool p_inVehicle) { // TODO } -// FUNCTION: LEGO1 0x10010790 STUB +// STUB: LEGO1 0x10010790 void LegoEntity::SetWorldTransform(Vector3Impl& p_loc, Vector3Impl& p_dir, Vector3Impl& p_up) { // TODO @@ -53,7 +53,7 @@ MxResult LegoEntity::Create(MxDSObject& p_dsObject) return SUCCESS; } -// FUNCTION: LEGO1 0x10010810 STUB +// STUB: LEGO1 0x10010810 void LegoEntity::Destroy(MxBool p_fromDestructor) { if (m_roi) { @@ -73,7 +73,7 @@ void LegoEntity::SetWorld() } } -// FUNCTION: LEGO1 0x100108a0 STUB +// STUB: LEGO1 0x100108a0 void LegoEntity::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) { // TODO @@ -102,49 +102,49 @@ void LegoEntity::ParseAction(char* p_extra) } } -// FUNCTION: LEGO1 0x10010f10 STUB +// STUB: LEGO1 0x10010f10 void LegoEntity::VTable0x34() { // TODO } -// FUNCTION: LEGO1 0x10011070 STUB +// STUB: LEGO1 0x10011070 void LegoEntity::VTable0x38() { // TODO } -// FUNCTION: LEGO1 0x10011300 STUB +// STUB: LEGO1 0x10011300 void LegoEntity::VTable0x3c() { // TODO } -// FUNCTION: LEGO1 0x10011360 STUB +// STUB: LEGO1 0x10011360 void LegoEntity::VTable0x40() { // TODO } -// FUNCTION: LEGO1 0x100113c0 STUB +// STUB: LEGO1 0x100113c0 void LegoEntity::VTable0x44() { // TODO } -// FUNCTION: LEGO1 0x10011420 STUB +// STUB: LEGO1 0x10011420 void LegoEntity::VTable0x48() { // TODO } -// FUNCTION: LEGO1 0x10011470 STUB +// STUB: LEGO1 0x10011470 void LegoEntity::VTable0x4c() { // TODO } -// FUNCTION: LEGO1 0x100114f0 STUB +// STUB: LEGO1 0x100114f0 MxLong LegoEntity::Notify(MxParam& p) { // TODO diff --git a/LEGO1/legoflctexturepresenter.cpp b/LEGO1/legoflctexturepresenter.cpp index 6cfc42c9..29a49814 100644 --- a/LEGO1/legoflctexturepresenter.cpp +++ b/LEGO1/legoflctexturepresenter.cpp @@ -1,6 +1,6 @@ #include "legoflctexturepresenter.h" -// FUNCTION: LEGO1 0x1005de80 STUB +// STUB: LEGO1 0x1005de80 LegoFlcTexturePresenter::LegoFlcTexturePresenter() { // TODO diff --git a/LEGO1/legogamestate.cpp b/LEGO1/legogamestate.cpp index fb60ffeb..627a8b97 100644 --- a/LEGO1/legogamestate.cpp +++ b/LEGO1/legogamestate.cpp @@ -116,7 +116,7 @@ MxResult LegoGameState::Save(MxULong p_slot) return result; } -// FUNCTION: LEGO1 0x10039c60 STUB +// STUB: LEGO1 0x10039c60 MxResult LegoGameState::Load(MxULong) { // TODO @@ -166,19 +166,19 @@ void LegoGameState::GetFileSavePath(MxString* p_outPath, MxULong p_slotn) *p_outPath = MxString(path); } -// FUNCTION: LEGO1 0x1003a2e0 STUB +// STUB: LEGO1 0x1003a2e0 void LegoGameState::SerializePlayersInfo(MxS16 p) { // TODO } -// FUNCTION: LEGO1 0x1003a720 STUB +// STUB: LEGO1 0x1003a720 void LegoGameState::FUN_1003a720(MxU32 p_unk) { // TODO } -// FUNCTION: LEGO1 0x1003b060 STUB +// STUB: LEGO1 0x1003b060 void LegoGameState::HandleAction(MxU32 p_unk) { // TODO @@ -255,7 +255,7 @@ void LegoGameState::RegisterState(LegoState* p_state) m_stateArray[targetIndex] = p_state; } -// FUNCTION: LEGO1 0x1003cdd0 STUB +// STUB: LEGO1 0x1003cdd0 void LegoGameState::SerializeScoreHistory(MxS16 p) { // TODO diff --git a/LEGO1/legohideanimpresenter.cpp b/LEGO1/legohideanimpresenter.cpp index 56b3803c..f13165cc 100644 --- a/LEGO1/legohideanimpresenter.cpp +++ b/LEGO1/legohideanimpresenter.cpp @@ -6,7 +6,7 @@ LegoHideAnimPresenter::LegoHideAnimPresenter() Init(); } -// FUNCTION: LEGO1 0x1006da50 STUB +// STUB: LEGO1 0x1006da50 void LegoHideAnimPresenter::Init() { } diff --git a/LEGO1/legoinputmanager.cpp b/LEGO1/legoinputmanager.cpp index e5919566..3572c9bd 100644 --- a/LEGO1/legoinputmanager.cpp +++ b/LEGO1/legoinputmanager.cpp @@ -34,7 +34,7 @@ LegoInputManager::LegoInputManager() m_timeout = 1000; } -// FUNCTION: LEGO1 0x1005b8b0 STUB +// STUB: LEGO1 0x1005b8b0 MxResult LegoInputManager::Tickle() { ProcessEvents(); @@ -56,25 +56,25 @@ MxResult LegoInputManager::Create(HWND p_hwnd) return SUCCESS; } -// FUNCTION: LEGO1 0x1005bb80 SYNTHETIC +// TEMPLATE: LEGO1 0x1005bb80 // MxCollection::Compare -// FUNCTION: LEGO1 0x1005bc30 SYNTHETIC +// TEMPLATE: LEGO1 0x1005bc30 // MxCollection::Destroy -// FUNCTION: LEGO1 0x1005bc80 SYNTHETIC +// TEMPLATE: LEGO1 0x1005bc80 // MxList::~MxList -// FUNCTION: LEGO1 0x1005bd50 SYNTHETIC +// SYNTHETIC: LEGO1 0x1005bd50 // MxCollection::`scalar deleting destructor' -// FUNCTION: LEGO1 0x1005bdc0 SYNTHETIC +// SYNTHETIC: LEGO1 0x1005bdc0 // MxList::`scalar deleting destructor' -// FUNCTION: LEGO1 0x1005beb0 SYNTHETIC +// SYNTHETIC: LEGO1 0x1005beb0 // LegoEventQueue::`scalar deleting destructor' -// FUNCTION: LEGO1 0x1005bf70 SYNTHETIC +// SYNTHETIC: LEGO1 0x1005bf70 // MxQueue::`scalar deleting destructor' // FUNCTION: LEGO1 0x1005bfe0 @@ -210,13 +210,13 @@ MxResult LegoInputManager::GetJoystickState( return FAILURE; } -// FUNCTION: LEGO1 0x1005c470 STUB +// STUB: LEGO1 0x1005c470 void LegoInputManager::Register(MxCore*) { // TODO } -// FUNCTION: LEGO1 0x1005c5c0 STUB +// STUB: LEGO1 0x1005c5c0 void LegoInputManager::UnRegister(MxCore*) { // TODO @@ -269,7 +269,7 @@ void LegoInputManager::ProcessEvents() } } -// FUNCTION: LEGO1 0x1005c9c0 STUB +// STUB: LEGO1 0x1005c9c0 MxBool LegoInputManager::ProcessOneEvent(LegoEventNotificationParam& p_param) { // TODO @@ -293,5 +293,5 @@ void LegoInputManager::KillTimer() } } -// FUNCTION: LEGO1 0x1005d010 SYNTHETIC +// TEMPLATE: LEGO1 0x1005d010 // MxListEntry::GetValue diff --git a/LEGO1/legoloadcachesoundpresenter.cpp b/LEGO1/legoloadcachesoundpresenter.cpp index c33f6a6a..4bc2cbd6 100644 --- a/LEGO1/legoloadcachesoundpresenter.cpp +++ b/LEGO1/legoloadcachesoundpresenter.cpp @@ -6,13 +6,13 @@ LegoLoadCacheSoundPresenter::LegoLoadCacheSoundPresenter() Init(); } -// FUNCTION: LEGO1 0x10018480 STUB +// STUB: LEGO1 0x10018480 LegoLoadCacheSoundPresenter::~LegoLoadCacheSoundPresenter() { // TODO } -// FUNCTION: LEGO1 0x100184e0 STUB +// STUB: LEGO1 0x100184e0 void LegoLoadCacheSoundPresenter::Init() { // TODO diff --git a/LEGO1/legolocomotionanimpresenter.cpp b/LEGO1/legolocomotionanimpresenter.cpp index 965d6ed9..27d6e421 100644 --- a/LEGO1/legolocomotionanimpresenter.cpp +++ b/LEGO1/legolocomotionanimpresenter.cpp @@ -6,7 +6,7 @@ LegoLocomotionAnimPresenter::LegoLocomotionAnimPresenter() Init(); } -// FUNCTION: LEGO1 0x1006d0b0 STUB +// STUB: LEGO1 0x1006d0b0 void LegoLocomotionAnimPresenter::Init() { // TODO diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp index 5d0d19b5..af160a7b 100644 --- a/LEGO1/legoomni.cpp +++ b/LEGO1/legoomni.cpp @@ -216,20 +216,20 @@ void PlayMusic(MxU32 p_index) LegoOmni::GetInstance()->GetBackgroundAudioManager()->PlayMusic(action, 5, 4); } -// FUNCTION: LEGO1 0x1001a700 STUB +// STUB: LEGO1 0x1001a700 void FUN_1001a700() { // TODO } -// FUNCTION: LEGO1 0x1003dd70 STUB +// STUB: LEGO1 0x1003dd70 LegoROI* PickROI(MxLong, MxLong) { // TODO return NULL; } -// FUNCTION: LEGO1 0x1003ddc0 STUB +// STUB: LEGO1 0x1003ddc0 LegoEntity* PickEntity(MxLong, MxLong) { // TODO @@ -372,7 +372,7 @@ void LegoOmni::Init() m_transitionManager = NULL; } -// FUNCTION: LEGO1 0x10058c30 STUB +// STUB: LEGO1 0x10058c30 void LegoOmni::Destroy() { // TODO @@ -464,20 +464,20 @@ LegoOmni* LegoOmni::GetInstance() return (LegoOmni*) MxOmni::GetInstance(); } -// FUNCTION: LEGO1 0x1005af10 STUB +// STUB: LEGO1 0x1005af10 void LegoOmni::RemoveWorld(const MxAtomId& p1, MxLong p2) { // TODO } -// FUNCTION: LEGO1 0x1005b0c0 STUB +// STUB: LEGO1 0x1005b0c0 LegoEntity* LegoOmni::FindByEntityIdOrAtomId(const MxAtomId& p_atom, MxS32 p_entityid) { // TODO return NULL; } -// FUNCTION: LEGO1 0x1005b1d0 STUB +// STUB: LEGO1 0x1005b1d0 MxResult LegoOmni::DeleteObject(MxDSAction& ds) { // TODO @@ -520,7 +520,7 @@ MxBool LegoOmni::DoesEntityExist(MxDSAction& ds) return FALSE; } -// FUNCTION: LEGO1 0x1005b400 STUB +// STUB: LEGO1 0x1005b400 int LegoOmni::GetCurrPathInfo(LegoPathBoundary**, int&) { // TODO @@ -544,7 +544,7 @@ MxResult LegoOmni::Start(MxDSAction* action) return result; } -// FUNCTION: LEGO1 0x1005b5f0 STUB +// STUB: LEGO1 0x1005b5f0 MxLong LegoOmni::Notify(MxParam& p) { // TODO diff --git a/LEGO1/legopathactor.cpp b/LEGO1/legopathactor.cpp index c2e4946b..a87355f6 100644 --- a/LEGO1/legopathactor.cpp +++ b/LEGO1/legopathactor.cpp @@ -3,164 +3,164 @@ DECOMP_SIZE_ASSERT(LegoPathActor, 0x154) // Probably in header -// FUNCTION: LEGO1 0x10002d20 STUB +// STUB: LEGO1 0x10002d20 void LegoPathActor::VTable0x78() { // TODO } -// FUNCTION: LEGO1 0x10002d30 STUB +// STUB: LEGO1 0x10002d30 void LegoPathActor::VTable0x7c() { // TODO } -// FUNCTION: LEGO1 0x10002d40 STUB +// STUB: LEGO1 0x10002d40 void LegoPathActor::VTable0x90() { // TODO } -// FUNCTION: LEGO1 0x10002d50 STUB +// STUB: LEGO1 0x10002d50 void LegoPathActor::VTable0x94() { // TODO } -// FUNCTION: LEGO1 0x10002d60 STUB +// STUB: LEGO1 0x10002d60 void LegoPathActor::VTable0xa0() { // TODO } -// FUNCTION: LEGO1 0x10002d70 STUB +// STUB: LEGO1 0x10002d70 void LegoPathActor::VTable0xac() { // TODO } -// FUNCTION: LEGO1 0x10002d80 STUB +// STUB: LEGO1 0x10002d80 void LegoPathActor::VTable0xb0() { // TODO } -// FUNCTION: LEGO1 0x10002d90 STUB +// STUB: LEGO1 0x10002d90 void LegoPathActor::VTable0xb4() { // TODO } -// FUNCTION: LEGO1 0x10002da0 STUB +// STUB: LEGO1 0x10002da0 void LegoPathActor::VTable0xb8() { // TODO } -// FUNCTION: LEGO1 0x10002db0 STUB +// STUB: LEGO1 0x10002db0 void LegoPathActor::VTable0xbc() { // TODO } -// FUNCTION: LEGO1 0x10002dc0 STUB +// STUB: LEGO1 0x10002dc0 void LegoPathActor::VTable0xc0() { // TODO } -// FUNCTION: LEGO1 0x10002dd0 STUB +// STUB: LEGO1 0x10002dd0 void LegoPathActor::VTable0xc4() { // TODO } -// FUNCTION: LEGO1 0x10002de0 STUB +// STUB: LEGO1 0x10002de0 void LegoPathActor::VTable0xc8() { // TODO } // End header -// FUNCTION: LEGO1 0x1002d700 STUB +// STUB: LEGO1 0x1002d700 LegoPathActor::LegoPathActor() { // TODO } -// FUNCTION: LEGO1 0x1002d820 STUB +// STUB: LEGO1 0x1002d820 LegoPathActor::~LegoPathActor() { // TODO } -// FUNCTION: LEGO1 0x1002d8d0 STUB +// STUB: LEGO1 0x1002d8d0 void LegoPathActor::VTable0x80() { // TODO } -// FUNCTION: LEGO1 0x1002d9c0 STUB +// STUB: LEGO1 0x1002d9c0 void LegoPathActor::VTable0x88() { // TODO } -// FUNCTION: LEGO1 0x1002de10 STUB +// STUB: LEGO1 0x1002de10 void LegoPathActor::VTable0x84() { // TODO } -// FUNCTION: LEGO1 0x1002e100 STUB +// STUB: LEGO1 0x1002e100 void LegoPathActor::VTable0x8c() { // TODO } -// FUNCTION: LEGO1 0x1002e740 STUB +// STUB: LEGO1 0x1002e740 void LegoPathActor::VTable0x74() { // TODO } -// FUNCTION: LEGO1 0x1002e790 STUB +// STUB: LEGO1 0x1002e790 void LegoPathActor::VTable0x70() { // TODO } -// FUNCTION: LEGO1 0x1002e8b0 STUB +// STUB: LEGO1 0x1002e8b0 void LegoPathActor::VTable0x98() { // TODO } -// FUNCTION: LEGO1 0x1002e8d0 STUB +// STUB: LEGO1 0x1002e8d0 void LegoPathActor::VTable0x6c() { // TODO } -// FUNCTION: LEGO1 0x1002ebe0 STUB +// STUB: LEGO1 0x1002ebe0 void LegoPathActor::VTable0x68() { // TODO } -// FUNCTION: LEGO1 0x1002f1b0 STUB +// STUB: LEGO1 0x1002f1b0 void LegoPathActor::VTable0x9c() { // TODO } -// FUNCTION: LEGO1 0x1002f650 STUB +// STUB: LEGO1 0x1002f650 void LegoPathActor::VTable0xa4() { // TODO } -// FUNCTION: LEGO1 0x1002f700 STUB +// STUB: LEGO1 0x1002f700 void LegoPathActor::VTable0xa8() { // TODO diff --git a/LEGO1/legopathcontroller.cpp b/LEGO1/legopathcontroller.cpp index 5b3f7a1e..a636253a 100644 --- a/LEGO1/legopathcontroller.cpp +++ b/LEGO1/legopathcontroller.cpp @@ -1,18 +1,18 @@ #include "legopathcontroller.h" -// FUNCTION: LEGO1 0x10044f40 STUB +// STUB: LEGO1 0x10044f40 LegoPathController::LegoPathController() { // TODO } -// FUNCTION: LEGO1 0x10045740 STUB +// STUB: LEGO1 0x10045740 LegoPathController::~LegoPathController() { // TODO } -// FUNCTION: LEGO1 0x10045c10 STUB +// STUB: LEGO1 0x10045c10 MxResult LegoPathController::Tickle() { // TODO diff --git a/LEGO1/legopathcontrollerlist.cpp b/LEGO1/legopathcontrollerlist.cpp index aeba7264..457729a4 100644 --- a/LEGO1/legopathcontrollerlist.cpp +++ b/LEGO1/legopathcontrollerlist.cpp @@ -11,19 +11,19 @@ MxS8 LegoPathControllerList::Compare(LegoPathController* p_a, LegoPathController return p_a == p_b ? 0 : p_a < p_b ? -1 : 1; } -// FUNCTION: LEGO1 0x1001d230 SYNTHETIC +// TEMPLATE: LEGO1 0x1001d230 // MxCollection::Compare -// FUNCTION: LEGO1 0x1001d240 SYNTHETIC +// TEMPLATE: LEGO1 0x1001d240 // MxList::MxList -// FUNCTION: LEGO1 0x1001d2d0 SYNTHETIC +// TEMPLATE: LEGO1 0x1001d2d0 // MxCollection::~MxCollection -// FUNCTION: LEGO1 0x1001d320 SYNTHETIC +// TEMPLATE: LEGO1 0x1001d320 // MxCollection::Destroy -// FUNCTION: LEGO1 0x1001d330 SYNTHETIC +// TEMPLATE: LEGO1 0x1001d330 // MxList::~MxList // FUNCTION: LEGO1 0x1001d3c0 @@ -32,11 +32,11 @@ void LegoPathControllerList::Destroy(LegoPathController* p_controller) delete p_controller; } -// FUNCTION: LEGO1 0x1001d490 SYNTHETIC +// SYNTHETIC: LEGO1 0x1001d490 // MxCollection::`scalar deleting destructor' -// FUNCTION: LEGO1 0x1001d500 SYNTHETIC +// SYNTHETIC: LEGO1 0x1001d500 // MxList::`scalar deleting destructor' -// FUNCTION: LEGO1 0x1001d5b0 SYNTHETIC +// SYNTHETIC: LEGO1 0x1001d5b0 // MxPtrList::`scalar deleting destructor' diff --git a/LEGO1/legopathpresenter.cpp b/LEGO1/legopathpresenter.cpp index 563306b9..b8ab8faf 100644 --- a/LEGO1/legopathpresenter.cpp +++ b/LEGO1/legopathpresenter.cpp @@ -60,7 +60,7 @@ void LegoPathPresenter::RepeatingTickle() EndAction(); } -// FUNCTION: LEGO1 0x10044d60 STUB +// STUB: LEGO1 0x10044d60 void LegoPathPresenter::ParseExtra() { // TODO diff --git a/LEGO1/legoplantmanager.cpp b/LEGO1/legoplantmanager.cpp index 74fc6810..4b93d8d7 100644 --- a/LEGO1/legoplantmanager.cpp +++ b/LEGO1/legoplantmanager.cpp @@ -6,19 +6,19 @@ LegoPlantManager::LegoPlantManager() Init(); } -// FUNCTION: LEGO1 0x100262c0 STUB +// STUB: LEGO1 0x100262c0 LegoPlantManager::~LegoPlantManager() { // TODO } -// FUNCTION: LEGO1 0x10026330 STUB +// STUB: LEGO1 0x10026330 void LegoPlantManager::Init() { // TODO } -// FUNCTION: LEGO1 0x10026e00 STUB +// STUB: LEGO1 0x10026e00 MxResult LegoPlantManager::Tickle() { // TODO diff --git a/LEGO1/legorace.cpp b/LEGO1/legorace.cpp index 76b546ea..2ff6ca01 100644 --- a/LEGO1/legorace.cpp +++ b/LEGO1/legorace.cpp @@ -10,7 +10,7 @@ undefined4 LegoRace::VTable0x78(undefined4) return 0; } -// FUNCTION: LEGO1 0x1000dac0 STUB +// STUB: LEGO1 0x1000dac0 void LegoRace::VTable0x7c(undefined4, undefined4) { // TODO @@ -61,27 +61,27 @@ MxBool LegoRace::VTable0x64() return FALSE; } -// FUNCTION: LEGO1 0x10015ce0 STUB +// STUB: LEGO1 0x10015ce0 MxResult LegoRace::Create(MxDSObject& p_dsObject) { // TODO return SUCCESS; } -// FUNCTION: LEGO1 0x10015d40 STUB +// STUB: LEGO1 0x10015d40 LegoRace::~LegoRace() { // TODO } -// FUNCTION: LEGO1 0x10015e00 STUB +// STUB: LEGO1 0x10015e00 MxLong LegoRace::Notify(MxParam& p) { // TODO return 0; } -// FUNCTION: LEGO1 0x10015ed0 STUB +// STUB: LEGO1 0x10015ed0 void LegoRace::VTable0x68(MxBool p_add) { // TODO diff --git a/LEGO1/legosoundmanager.cpp b/LEGO1/legosoundmanager.cpp index c3f9f6e9..028fa092 100644 --- a/LEGO1/legosoundmanager.cpp +++ b/LEGO1/legosoundmanager.cpp @@ -21,12 +21,12 @@ void LegoSoundManager::Init() unk0x3c = 0; } -// FUNCTION: LEGO1 0x100299b0 STUB +// STUB: LEGO1 0x100299b0 void LegoSoundManager::Destroy(MxBool p_fromDestructor) { } -// FUNCTION: LEGO1 0x100299f0 STUB +// STUB: LEGO1 0x100299f0 MxResult LegoSoundManager::Create(MxU32 p_frequencyMS, MxBool p_createThread) { return FAILURE; @@ -38,7 +38,7 @@ void LegoSoundManager::Destroy() Destroy(FALSE); } -// FUNCTION: LEGO1 0x1002a3a0 STUB +// STUB: LEGO1 0x1002a3a0 MxResult LegoSoundManager::Tickle() { MxMediaManager::Tickle(); diff --git a/LEGO1/legoutil.cpp b/LEGO1/legoutil.cpp index a0d991f2..b1ba6add 100644 --- a/LEGO1/legoutil.cpp +++ b/LEGO1/legoutil.cpp @@ -102,7 +102,7 @@ void ConvertHSVToRGB(float h, float s, float v, float* r_out, float* b_out, floa } } -// FUNCTION: LEGO1 0x1003ee00 STUB +// STUB: LEGO1 0x1003ee00 void FUN_1003ee00(MxAtomId& p_atomId, MxS32 p_id) { } diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/legovideomanager.cpp index 96e5e44a..0ec7ec07 100644 --- a/LEGO1/legovideomanager.cpp +++ b/LEGO1/legovideomanager.cpp @@ -75,7 +75,7 @@ void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable) EnableFullScreenMovie(p_enable, TRUE); } -// FUNCTION: LEGO1 0x1007c310 STUB +// STUB: LEGO1 0x1007c310 void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable, MxBool p_scale) { // TODO @@ -97,14 +97,14 @@ void LegoVideoManager::SetSkyColor(float p_red, float p_green, float p_blue) // m_3dManager->m_pViewport->vtable1c(red, green, blue) } -// FUNCTION: LEGO1 0x1007c560 STUB +// STUB: LEGO1 0x1007c560 int LegoVideoManager::EnableRMDevice() { // TODO return 0; } -// FUNCTION: LEGO1 0x1007c740 STUB +// STUB: LEGO1 0x1007c740 int LegoVideoManager::DisableRMDevice() { // TODO diff --git a/LEGO1/legoworld.cpp b/LEGO1/legoworld.cpp index 1d5bbb4b..938abe3a 100644 --- a/LEGO1/legoworld.cpp +++ b/LEGO1/legoworld.cpp @@ -16,13 +16,13 @@ void LegoWorld::VTable0x60() { } -// FUNCTION: LEGO1 0x10015820 STUB +// STUB: LEGO1 0x10015820 void FUN_10015820(MxU32 p_unk1, MxU32 p_unk2) { // TODO } -// FUNCTION: LEGO1 0x10015910 STUB +// STUB: LEGO1 0x10015910 void FUN_10015910(MxU32 p_unk1) { // TODO @@ -36,7 +36,7 @@ void SetIsWorldActive(MxBool p_isWorldActive) g_isWorldActive = p_isWorldActive; } -// FUNCTION: LEGO1 0x1001ca40 STUB +// STUB: LEGO1 0x1001ca40 LegoWorld::LegoWorld() { // TODO @@ -54,13 +54,13 @@ MxBool LegoWorld::VTable0x64() return FALSE; } -// FUNCTION: LEGO1 0x1001dfa0 STUB +// STUB: LEGO1 0x1001dfa0 LegoWorld::~LegoWorld() { // TODO } -// FUNCTION: LEGO1 0x1001e0b0 STUB +// STUB: LEGO1 0x1001e0b0 MxResult LegoWorld::SetAsCurrentWorld(MxDSObject& p_dsObject) { // TODO @@ -85,24 +85,24 @@ MxLong LegoWorld::Notify(MxParam& p_param) return ret; } -// FUNCTION: LEGO1 0x1001f630 STUB +// STUB: LEGO1 0x1001f630 void LegoWorld::VTable0x54() { // TODO } -// FUNCTION: LEGO1 0x10020220 STUB +// STUB: LEGO1 0x10020220 void LegoWorld::VTable0x58(MxCore* p_object) { // TODO } -// FUNCTION: LEGO1 0x10020f10 STUB +// STUB: LEGO1 0x10020f10 void LegoWorld::EndAction(MxPresenter* p_presenter) { } -// FUNCTION: LEGO1 0x10021a70 STUB +// STUB: LEGO1 0x10021a70 void LegoWorld::VTable0x68(MxBool p_add) { // TODO diff --git a/LEGO1/legoworldpresenter.cpp b/LEGO1/legoworldpresenter.cpp index 0ba511e2..5278c6da 100644 --- a/LEGO1/legoworldpresenter.cpp +++ b/LEGO1/legoworldpresenter.cpp @@ -15,7 +15,7 @@ LegoWorldPresenter::LegoWorldPresenter() m_unk50 = 50000; } -// FUNCTION: LEGO1 0x10066770 STUB +// STUB: LEGO1 0x10066770 LegoWorldPresenter::~LegoWorldPresenter() { // TODO diff --git a/LEGO1/mxbitmap.cpp b/LEGO1/mxbitmap.cpp index d6beb393..4e7e07de 100644 --- a/LEGO1/mxbitmap.cpp +++ b/LEGO1/mxbitmap.cpp @@ -231,12 +231,12 @@ MxResult MxBitmap::LoadFile(HANDLE p_handle) return result; } -// FUNCTION: LEGO1 0x100bce70 STUB +// STUB: LEGO1 0x100bce70 void MxBitmap::vtable2c(int, int, int, int, int, int, int) { } -// FUNCTION: LEGO1 0x100bd020 STUB +// STUB: LEGO1 0x100bd020 void MxBitmap::vtable30(int, int, int, int, int, int, int) { } diff --git a/LEGO1/mxcompositemediapresenter.cpp b/LEGO1/mxcompositemediapresenter.cpp index 3b25840d..7bbaf6bf 100644 --- a/LEGO1/mxcompositemediapresenter.cpp +++ b/LEGO1/mxcompositemediapresenter.cpp @@ -1,6 +1,6 @@ #include "mxcompositemediapresenter.h" -// FUNCTION: LEGO1 0x10073ea0 STUB +// STUB: LEGO1 0x10073ea0 MxCompositeMediaPresenter::MxCompositeMediaPresenter() { // TODO diff --git a/LEGO1/mxcompositepresenter.cpp b/LEGO1/mxcompositepresenter.cpp index 27ae15d9..acc4002e 100644 --- a/LEGO1/mxcompositepresenter.cpp +++ b/LEGO1/mxcompositepresenter.cpp @@ -25,19 +25,19 @@ MxCompositePresenter::~MxCompositePresenter() NotificationManager()->Unregister(this); } -// FUNCTION: LEGO1 0x100b67f0 STUB +// STUB: LEGO1 0x100b67f0 void MxCompositePresenter::VTable0x58() { // TODO } -// FUNCTION: LEGO1 0x100b69b0 STUB +// STUB: LEGO1 0x100b69b0 void MxCompositePresenter::VTable0x5c() { // TODO } -// FUNCTION: LEGO1 0x100b6b40 STUB +// STUB: LEGO1 0x100b6b40 void MxCompositePresenter::VTable0x60(undefined4 p_unknown) { // TODO diff --git a/LEGO1/mxcore.h b/LEGO1/mxcore.h index 39151e7f..51383d86 100644 --- a/LEGO1/mxcore.h +++ b/LEGO1/mxcore.h @@ -9,10 +9,10 @@ class MxParam; // TODO: Find proper compilation unit to put these -// FUNCTION: LEGO1 0x100140d0 SYNTHETIC +// FUNCTION: LEGO1 0x100140d0 // MxCore::IsA -// FUNCTION: LEGO1 0x100144c0 SYNTHETIC +// FUNCTION: LEGO1 0x100144c0 // MxCore::ClassName // VTABLE: LEGO1 0x100dc0f8 diff --git a/LEGO1/mxdirect3d.cpp b/LEGO1/mxdirect3d.cpp index 41cb40c7..64c39984 100644 --- a/LEGO1/mxdirect3d.cpp +++ b/LEGO1/mxdirect3d.cpp @@ -111,7 +111,7 @@ BOOL MxDirect3D::CreateIDirect3D() return TRUE; } -// FUNCTION: LEGO1 0x1009b310 STUB +// STUB: LEGO1 0x1009b310 BOOL MxDirect3D::D3DSetMode() { // TODO @@ -137,7 +137,7 @@ MxDeviceModeFinder::~MxDeviceModeFinder() } } -// FUNCTION: LEGO1 0x1009c070 STUB +// STUB: LEGO1 0x1009c070 BOOL MxDeviceEnumerate::FUN_1009c070() { // TODO @@ -180,14 +180,14 @@ MxResult MxDeviceEnumerate::_DoEnumerate() return SUCCESS; } -// FUNCTION: LEGO1 0x1009c710 STUB +// STUB: LEGO1 0x1009c710 BOOL FAR PASCAL EnumerateCallback(GUID FAR*, LPSTR, LPSTR, LPVOID) { // TODO return FALSE; } -// FUNCTION: LEGO1 0x1009c730 STUB +// STUB: LEGO1 0x1009c730 const char* MxDeviceEnumerate::EnumerateErrorToString(HRESULT p_error) { // TODO: This is a list of error messages, similar to the function in diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/mxdiskstreamcontroller.cpp index 64a7dd28..70fdecaa 100644 --- a/LEGO1/mxdiskstreamcontroller.cpp +++ b/LEGO1/mxdiskstreamcontroller.cpp @@ -13,19 +13,19 @@ MxDiskStreamController::MxDiskStreamController() m_unk8c = 0; } -// FUNCTION: LEGO1 0x100c7330 SYNTHETIC +// TEMPLATE: LEGO1 0x100c7330 // list >::_Buynode -// FUNCTION: LEGO1 0x100c7420 SYNTHETIC +// TEMPLATE: LEGO1 0x100c7420 // list >::~list > -// FUNCTION: LEGO1 0x100c7490 SYNTHETIC +// TEMPLATE: LEGO1 0x100c7490 // list >::_Buynode -// FUNCTION: LEGO1 0x100c74e0 SYNTHETIC +// TEMPLATE: LEGO1 0x100c74e0 // List::~List -// FUNCTION: LEGO1 0x100c7530 STUB +// STUB: LEGO1 0x100c7530 MxDiskStreamController::~MxDiskStreamController() { // TODO @@ -69,35 +69,35 @@ MxResult MxDiskStreamController::vtable0x34(undefined4 p_unknown) return FAILURE; } -// FUNCTION: LEGO1 0x100c7ac0 STUB +// STUB: LEGO1 0x100c7ac0 MxResult MxDiskStreamController::vtable0x28() { // TODO return FAILURE; } -// FUNCTION: LEGO1 0x100c7c00 STUB +// STUB: LEGO1 0x100c7c00 MxResult MxDiskStreamController::vtable0x30(undefined4 p_unknown) { // TODO return FAILURE; } -// FUNCTION: LEGO1 0x100c7ff0 STUB +// STUB: LEGO1 0x100c7ff0 MxResult MxDiskStreamController::vtable0x20(MxDSAction* p_action) { // TODO return FAILURE; } -// FUNCTION: LEGO1 0x100c8160 STUB +// STUB: LEGO1 0x100c8160 MxResult MxDiskStreamController::vtable0x24(undefined4 p_unknown) { // TODO return FAILURE; } -// FUNCTION: LEGO1 0x100c8640 STUB +// STUB: LEGO1 0x100c8640 MxResult MxDiskStreamController::Tickle() { // TODO diff --git a/LEGO1/mxdiskstreamprovider.cpp b/LEGO1/mxdiskstreamprovider.cpp index e5e04ad4..614aab48 100644 --- a/LEGO1/mxdiskstreamprovider.cpp +++ b/LEGO1/mxdiskstreamprovider.cpp @@ -32,7 +32,7 @@ MxDiskStreamProvider::MxDiskStreamProvider() this->m_unk35 = 0; } -// FUNCTION: LEGO1 0x100d1240 STUB +// STUB: LEGO1 0x100d1240 MxDiskStreamProvider::~MxDiskStreamProvider() { // TODO @@ -70,7 +70,7 @@ done: return result; } -// FUNCTION: LEGO1 0x100d15e0 STUB +// STUB: LEGO1 0x100d15e0 void MxDiskStreamProvider::vtable0x20(undefined4 p_unknown1) { // TODO @@ -87,7 +87,7 @@ MxResult MxDiskStreamProvider::WaitForWorkToComplete() return SUCCESS; } -// FUNCTION: LEGO1 0x100d18f0 STUB +// STUB: LEGO1 0x100d18f0 void MxDiskStreamProvider::PerformWork() { // TODO diff --git a/LEGO1/mxdisplaysurface.cpp b/LEGO1/mxdisplaysurface.cpp index 85b6d170..52cb56d9 100644 --- a/LEGO1/mxdisplaysurface.cpp +++ b/LEGO1/mxdisplaysurface.cpp @@ -28,7 +28,7 @@ void MxDisplaySurface::Reset() memset(&this->m_surfaceDesc, 0, sizeof(this->m_surfaceDesc)); } -// FUNCTION: LEGO1 0x100ba640 STUB +// STUB: LEGO1 0x100ba640 void MxDisplaySurface::FUN_100ba640() { // TODO @@ -179,18 +179,18 @@ void MxDisplaySurface::Clear() this->Reset(); } -// FUNCTION: LEGO1 0x100baae0 STUB +// STUB: LEGO1 0x100baae0 void MxDisplaySurface::SetPalette(MxPalette* p_palette) { } -// FUNCTION: LEGO1 0x100bacc0 STUB +// STUB: LEGO1 0x100bacc0 MxBool MxDisplaySurface::vtable28(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4, undefined4) { return 0; } -// FUNCTION: LEGO1 0x100bb1d0 STUB +// STUB: LEGO1 0x100bb1d0 MxBool MxDisplaySurface::vtable30( undefined4, undefined4, @@ -205,13 +205,13 @@ MxBool MxDisplaySurface::vtable30( return 0; } -// FUNCTION: LEGO1 0x100bb850 STUB +// STUB: LEGO1 0x100bb850 undefined4 MxDisplaySurface::vtable34(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4) { return 0; } -// FUNCTION: LEGO1 0x100bba50 STUB +// STUB: LEGO1 0x100bba50 void MxDisplaySurface::Display(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4) { } @@ -232,13 +232,13 @@ void MxDisplaySurface::ReleaseDC(HDC p_hdc) this->m_ddSurface2->ReleaseDC(p_hdc); } -// FUNCTION: LEGO1 0x100bbc60 STUB +// STUB: LEGO1 0x100bbc60 undefined4 MxDisplaySurface::vtable44(undefined4, undefined4*, undefined4, undefined4) { return 0; } -// FUNCTION: LEGO1 0x100bc200 STUB +// STUB: LEGO1 0x100bc200 void MxDisplaySurface::vtable24( LPDDSURFACEDESC, MxBitmap*, @@ -252,7 +252,7 @@ void MxDisplaySurface::vtable24( { } -// FUNCTION: LEGO1 0x100bc630 STUB +// STUB: LEGO1 0x100bc630 MxBool MxDisplaySurface:: vtable2c(LPDDSURFACEDESC, MxBitmap*, undefined4, undefined4, undefined4, undefined4, undefined4, undefined4, MxBool) { diff --git a/LEGO1/mxdsactionlist.cpp b/LEGO1/mxdsactionlist.cpp index a1790b32..a664f53e 100644 --- a/LEGO1/mxdsactionlist.cpp +++ b/LEGO1/mxdsactionlist.cpp @@ -18,17 +18,17 @@ void MxDSActionList::Destroy(MxDSAction* p_action) delete p_action; } -// FUNCTION: LEGO1 0x100c9cc0 SYNTHETIC +// TEMPLATE: LEGO1 0x100c9cc0 // MxCollection::Compare -// FUNCTION: LEGO1 0x100c9d20 SYNTHETIC +// TEMPLATE: LEGO1 0x100c9d20 // MxCollection::Destroy -// FUNCTION: LEGO1 0x100c9d30 SYNTHETIC +// TEMPLATE: LEGO1 0x100c9d30 // MxList::~MxList -// FUNCTION: LEGO1 0x100c9e30 SYNTHETIC +// SYNTHETIC: LEGO1 0x100c9e30 // MxCollection::`scalar deleting destructor' -// FUNCTION: LEGO1 0x100c9ea0 SYNTHETIC +// SYNTHETIC: LEGO1 0x100c9ea0 // MxList::`scalar deleting destructor' diff --git a/LEGO1/mxdsobject.h b/LEGO1/mxdsobject.h index 62eaa196..d4563d9a 100644 --- a/LEGO1/mxdsobject.h +++ b/LEGO1/mxdsobject.h @@ -7,7 +7,7 @@ #include "mxdstypes.h" // TODO: Find proper compilation unit to put this -// FUNCTION: LEGO1 0x10005530 SYNTHETIC +// FUNCTION: LEGO1 0x10005530 // MxDSObject::SetAtomId // VTABLE: LEGO1 0x100dc868 diff --git a/LEGO1/mxdssubscriber.cpp b/LEGO1/mxdssubscriber.cpp index 84091978..b7a6d50b 100644 --- a/LEGO1/mxdssubscriber.cpp +++ b/LEGO1/mxdssubscriber.cpp @@ -2,40 +2,40 @@ DECOMP_SIZE_ASSERT(MxDSSubscriber, 0x4c); -// FUNCTION: LEGO1 0x100b7bb0 STUB +// STUB: LEGO1 0x100b7bb0 MxDSSubscriber::MxDSSubscriber() { // TODO } -// FUNCTION: LEGO1 0x100b7e00 STUB +// STUB: LEGO1 0x100b7e00 MxDSSubscriber::~MxDSSubscriber() { // TODO } -// FUNCTION: LEGO1 0x100b7ed0 STUB +// STUB: LEGO1 0x100b7ed0 MxResult MxDSSubscriber::FUN_100b7ed0(MxStreamController*, MxU32, MxS16) { // TODO return SUCCESS; } -// FUNCTION: LEGO1 0x100b8250 STUB +// STUB: LEGO1 0x100b8250 MxStreamChunk* MxDSSubscriber::FUN_100b8250() { // TODO return NULL; } -// FUNCTION: LEGO1 0x100b8360 STUB +// STUB: LEGO1 0x100b8360 MxStreamChunk* MxDSSubscriber::FUN_100b8360() { // TODO return NULL; } -// FUNCTION: LEGO1 0x100b8390 STUB +// STUB: LEGO1 0x100b8390 void MxDSSubscriber::FUN_100b8390(MxStreamChunk*) { // TODO diff --git a/LEGO1/mxloopingflcpresenter.cpp b/LEGO1/mxloopingflcpresenter.cpp index 1c75fc29..c06c8f42 100644 --- a/LEGO1/mxloopingflcpresenter.cpp +++ b/LEGO1/mxloopingflcpresenter.cpp @@ -24,7 +24,7 @@ void MxLoopingFlcPresenter::Init() this->m_flags &= 0xfb; } -// FUNCTION: LEGO1 0x100b4432 STUB +// STUB: LEGO1 0x100b4432 void MxLoopingFlcPresenter::Destroy(MxBool p_fromDestructor) { // TODO diff --git a/LEGO1/mxloopingmidipresenter.cpp b/LEGO1/mxloopingmidipresenter.cpp index b351cf09..3d58e56b 100644 --- a/LEGO1/mxloopingmidipresenter.cpp +++ b/LEGO1/mxloopingmidipresenter.cpp @@ -7,13 +7,13 @@ DECOMP_SIZE_ASSERT(MxLoopingMIDIPresenter, 0x58); -// FUNCTION: LEGO1 0x100b1830 SYNTHETIC +// FUNCTION: LEGO1 0x100b1830 // MxLoopingMIDIPresenter::ClassName -// FUNCTION: LEGO1 0x100b1840 SYNTHETIC +// FUNCTION: LEGO1 0x100b1840 // MxLoopingMIDIPresenter::IsA -// FUNCTION: LEGO1 0x100b19c0 SYNTHETIC +// SYNTHETIC: LEGO1 0x100b19c0 // MxLoopingMIDIPresenter::`scalar deleting destructor' // FUNCTION: LEGO1 0x100c2a80 diff --git a/LEGO1/mxloopingsmkpresenter.cpp b/LEGO1/mxloopingsmkpresenter.cpp index 297893bf..ce4f41c2 100644 --- a/LEGO1/mxloopingsmkpresenter.cpp +++ b/LEGO1/mxloopingsmkpresenter.cpp @@ -24,7 +24,7 @@ void MxLoopingSmkPresenter::Init() this->m_flags &= 0xfb; } -// FUNCTION: LEGO1 0x100b49d0 STUB +// STUB: LEGO1 0x100b49d0 void MxLoopingSmkPresenter::Destroy(MxBool p_fromDestructor) { } diff --git a/LEGO1/mxmusicmanager.cpp b/LEGO1/mxmusicmanager.cpp index 7d18a6dc..4541cf19 100644 --- a/LEGO1/mxmusicmanager.cpp +++ b/LEGO1/mxmusicmanager.cpp @@ -136,7 +136,7 @@ MxS32 MxMusicManager::CalculateVolume(MxS32 p_volume) return (result << 0x10) | result; } -// FUNCTION: LEGO1 0x100c09c0 STUB +// STUB: LEGO1 0x100c09c0 undefined4 MxMusicManager::FUN_100c09c0(MxU8* p_data, MxS32 p_loopCount) { // TODO diff --git a/LEGO1/mxomni.cpp b/LEGO1/mxomni.cpp index 55f631b4..b17cae7c 100644 --- a/LEGO1/mxomni.cpp +++ b/LEGO1/mxomni.cpp @@ -310,14 +310,14 @@ MxResult MxOmni::Start(MxDSAction* p_dsAction) return result; } -// FUNCTION: LEGO1 0x100b00c0 STUB +// STUB: LEGO1 0x100b00c0 MxResult MxOmni::DeleteObject(MxDSAction& p_dsAction) { // TODO return FAILURE; } -// FUNCTION: LEGO1 0x100b00e0 STUB +// STUB: LEGO1 0x100b00e0 void MxOmni::Vtable0x2c() { // TODO @@ -349,7 +349,7 @@ MxLong MxOmni::Notify(MxParam& p) return HandleNotificationType2(p); } -// FUNCTION: LEGO1 0x100b0880 STUB +// STUB: LEGO1 0x100b0880 MxResult MxOmni::HandleNotificationType2(MxParam& p_param) { // TODO STUB diff --git a/LEGO1/mxpresenterlist.cpp b/LEGO1/mxpresenterlist.cpp index dded32d5..6dc0a0f2 100644 --- a/LEGO1/mxpresenterlist.cpp +++ b/LEGO1/mxpresenterlist.cpp @@ -11,26 +11,26 @@ MxS8 MxPresenterList::Compare(MxPresenter* p_a, MxPresenter* p_b) return p_a == p_b ? 0 : p_a < p_b ? -1 : 1; } -// FUNCTION: LEGO1 0x1001cd20 SYNTHETIC +// TEMPLATE: LEGO1 0x1001cd20 // MxCollection::Compare -// FUNCTION: LEGO1 0x1001cd30 SYNTHETIC +// TEMPLATE: LEGO1 0x1001cd30 // MxCollection::Destroy -// FUNCTION: LEGO1 0x1001cd40 SYNTHETIC +// TEMPLATE: LEGO1 0x1001cd40 // MxList::MxList -// FUNCTION: LEGO1 0x1001cdd0 SYNTHETIC +// TEMPLATE: LEGO1 0x1001cdd0 // MxCollection::~MxCollection -// FUNCTION: LEGO1 0x1001ce20 SYNTHETIC +// TEMPLATE: LEGO1 0x1001ce20 // MxList::~MxList -// FUNCTION: LEGO1 0x1001cf70 SYNTHETIC +// SYNTHETIC: LEGO1 0x1001cf70 // MxCollection::`scalar deleting destructor' -// FUNCTION: LEGO1 0x1001cfe0 SYNTHETIC +// SYNTHETIC: LEGO1 0x1001cfe0 // MxList::`scalar deleting destructor' -// FUNCTION: LEGO1 0x1001d090 SYNTHETIC +// SYNTHETIC: LEGO1 0x1001d090 // MxPtrList::`scalar deleting destructor' diff --git a/LEGO1/mxramstreamcontroller.cpp b/LEGO1/mxramstreamcontroller.cpp index d124294d..e16e6190 100644 --- a/LEGO1/mxramstreamcontroller.cpp +++ b/LEGO1/mxramstreamcontroller.cpp @@ -35,21 +35,21 @@ MxResult MxRAMStreamController::Open(const char* p_filename) return FAILURE; } -// FUNCTION: LEGO1 0x100c6210 STUB +// STUB: LEGO1 0x100c6210 MxResult MxRAMStreamController::vtable0x20(MxDSAction* p_action) { // TODO STUB return FAILURE; } -// FUNCTION: LEGO1 0x100c6320 STUB +// STUB: LEGO1 0x100c6320 MxResult MxRAMStreamController::vtable0x24(undefined4 p_unknown) { // TODO STUB return FAILURE; } -// FUNCTION: LEGO1 0x100d0d80 STUB +// STUB: LEGO1 0x100d0d80 undefined* __cdecl FUN_100d0d80(MxU32* p_fileSizeBuffer, MxU32 p_fileSize) { return NULL; diff --git a/LEGO1/mxramstreamprovider.cpp b/LEGO1/mxramstreamprovider.cpp index 4ee340bd..82c498cd 100644 --- a/LEGO1/mxramstreamprovider.cpp +++ b/LEGO1/mxramstreamprovider.cpp @@ -53,7 +53,7 @@ MxRAMStreamProvider::~MxRAMStreamProvider() m_bufferForDWords = NULL; } -// FUNCTION: LEGO1 0x100d0ae0 STUB +// STUB: LEGO1 0x100d0ae0 MxResult MxRAMStreamProvider::SetResourceToGet(MxStreamController* p_resource) { return FAILURE; diff --git a/LEGO1/mxregionlist.cpp b/LEGO1/mxregionlist.cpp index aadbde69..c1abb0e7 100644 --- a/LEGO1/mxregionlist.cpp +++ b/LEGO1/mxregionlist.cpp @@ -2,10 +2,10 @@ #include "mxregion.h" -// FUNCTION: LEGO1 0x100c32e0 SYNTHETIC +// TEMPLATE: LEGO1 0x100c32e0 // MxCollection::Compare -// FUNCTION: LEGO1 0x100c3340 SYNTHETIC +// TEMPLATE: LEGO1 0x100c3340 // MxCollection::Destroy // FUNCTION: LEGO1 0x100c33e0 @@ -18,19 +18,19 @@ void MxRegionList::Destroy(MxRegionTopBottom* p_topBottom) } } -// FUNCTION: LEGO1 0x100c34d0 SYNTHETIC +// SYNTHETIC: LEGO1 0x100c34d0 // MxCollection::`scalar deleting destructor' -// FUNCTION: LEGO1 0x100c3540 SYNTHETIC +// SYNTHETIC: LEGO1 0x100c3540 // MxList::`scalar deleting destructor' -// FUNCTION: LEGO1 0x100c35f0 SYNTHETIC +// SYNTHETIC: LEGO1 0x100c35f0 // MxPtrList::`scalar deleting destructor' -// FUNCTION: LEGO1 0x100c4d80 SYNTHETIC +// TEMPLATE: LEGO1 0x100c4d80 // MxCollection::Compare -// FUNCTION: LEGO1 0x100c4de0 SYNTHETIC +// TEMPLATE: LEGO1 0x100c4de0 // MxCollection::Destroy // FUNCTION: LEGO1 0x100c4e80 @@ -39,26 +39,26 @@ void MxRegionLeftRightList::Destroy(MxRegionLeftRight* p_leftRight) delete p_leftRight; } -// FUNCTION: LEGO1 0x100c4f50 SYNTHETIC +// SYNTHETIC: LEGO1 0x100c4f50 // MxCollection::`scalar deleting destructor' -// FUNCTION: LEGO1 0x100c4fc0 SYNTHETIC +// SYNTHETIC: LEGO1 0x100c4fc0 // MxList::`scalar deleting destructor' -// FUNCTION: LEGO1 0x100c5070 SYNTHETIC +// SYNTHETIC: LEGO1 0x100c5070 // MxPtrList::`scalar deleting destructor' -// FUNCTION: LEGO1 0x100c54f0 SYNTHETIC +// TEMPLATE: LEGO1 0x100c54f0 // MxListCursor::MxListCursor -// FUNCTION: LEGO1 0x100c58c0 SYNTHETIC +// TEMPLATE: LEGO1 0x100c58c0 // MxList::_InsertEntry -// FUNCTION: LEGO1 0x100c5970 SYNTHETIC +// TEMPLATE: LEGO1 0x100c5970 // MxList::_InsertEntry -// FUNCTION: LEGO1 0x100c5a20 SYNTHETIC +// TEMPLATE: LEGO1 0x100c5a20 // MxListEntry::MxListEntry -// FUNCTION: LEGO1 0x100c5a40 SYNTHETIC +// TEMPLATE: LEGO1 0x100c5a40 // MxList::_DeleteEntry diff --git a/LEGO1/mxsmkpresenter.cpp b/LEGO1/mxsmkpresenter.cpp index d9a2cb4e..e77e525b 100644 --- a/LEGO1/mxsmkpresenter.cpp +++ b/LEGO1/mxsmkpresenter.cpp @@ -41,7 +41,7 @@ void MxSmkPresenter::Destroy(MxBool p_fromDestructor) } } -// FUNCTION: LEGO1 0x100b3940 STUB +// STUB: LEGO1 0x100b3940 void MxSmkPresenter::LoadHeader(MxStreamChunk* p_chunk) { // TODO @@ -57,7 +57,7 @@ void MxSmkPresenter::CreateBitmap() m_bitmap->SetSize(m_mxSmack.m_smack.m_width, m_mxSmack.m_smack.m_height, NULL, FALSE); } -// FUNCTION: LEGO1 0x100b3a00 STUB +// STUB: LEGO1 0x100b3a00 void MxSmkPresenter::LoadFrame(MxStreamChunk* p_chunk) { // TODO diff --git a/LEGO1/mxsoundmanager.cpp b/LEGO1/mxsoundmanager.cpp index 9c04f636..73555515 100644 --- a/LEGO1/mxsoundmanager.cpp +++ b/LEGO1/mxsoundmanager.cpp @@ -15,7 +15,7 @@ MxSoundManager::MxSoundManager() Init(); } -// FUNCTION: LEGO1 0x100ae7b0 SYNTHETIC +// SYNTHETIC: LEGO1 0x100ae7b0 // MxSoundManager::`scalar deleting destructor' // FUNCTION: LEGO1 0x100ae7d0 diff --git a/LEGO1/mxstillpresenter.cpp b/LEGO1/mxstillpresenter.cpp index a18300c4..6ed20ea6 100644 --- a/LEGO1/mxstillpresenter.cpp +++ b/LEGO1/mxstillpresenter.cpp @@ -9,7 +9,7 @@ DECOMP_SIZE_ASSERT(MxStillPresenter, 0x6c); // 0x10101eb0 const char* g_strBMP_ISMAP = "BMP_ISMAP"; -// FUNCTION: LEGO1 0x10043550 SYNTHETIC +// FUNCTION: LEGO1 0x10043550 // MxStillPresenter::~MxStillPresenter // FUNCTION: LEGO1 0x100435b0 @@ -18,13 +18,13 @@ void MxStillPresenter::Destroy() Destroy(FALSE); } -// FUNCTION: LEGO1 0x100435c0 SYNTHETIC +// FUNCTION: LEGO1 0x100435c0 // MxStillPresenter::ClassName -// FUNCTION: LEGO1 0x100435d0 SYNTHETIC +// FUNCTION: LEGO1 0x100435d0 // MxStillPresenter::IsA -// FUNCTION: LEGO1 0x100436e0 SYNTHETIC +// SYNTHETIC: LEGO1 0x100436e0 // MxStillPresenter::`scalar deleting destructor' // FUNCTION: LEGO1 0x100b9c70 @@ -74,43 +74,43 @@ void MxStillPresenter::NextFrame() m_subscriber->FUN_100b8390(chunk); } -// FUNCTION: LEGO1 0x100b9dd0 STUB +// STUB: LEGO1 0x100b9dd0 void MxStillPresenter::LoadFrame(MxStreamChunk* p_chunk) { // TODO } -// FUNCTION: LEGO1 0x100b9f30 STUB +// STUB: LEGO1 0x100b9f30 void MxStillPresenter::VTable0x70() { // TODO } -// FUNCTION: LEGO1 0x100b9f60 STUB +// STUB: LEGO1 0x100b9f60 void MxStillPresenter::StartingTickle() { // TODO } -// FUNCTION: LEGO1 0x100b9f90 STUB +// STUB: LEGO1 0x100b9f90 void MxStillPresenter::StreamingTickle() { // TODO } -// FUNCTION: LEGO1 0x100b9ff0 STUB +// STUB: LEGO1 0x100b9ff0 void MxStillPresenter::RepeatingTickle() { // TODO } -// FUNCTION: LEGO1 0x100ba040 STUB +// STUB: LEGO1 0x100ba040 void MxStillPresenter::VTable0x88(undefined4, undefined4) { // TODO } -// FUNCTION: LEGO1 0x100ba140 STUB +// STUB: LEGO1 0x100ba140 void MxStillPresenter::Enable(MxBool p_enable) { // TODO @@ -149,7 +149,7 @@ void MxStillPresenter::ParseExtra() } } -// FUNCTION: LEGO1 0x100ba2c0 STUB +// STUB: LEGO1 0x100ba2c0 MxStillPresenter* MxStillPresenter::Clone() { // TODO diff --git a/LEGO1/mxstreamchunklist.cpp b/LEGO1/mxstreamchunklist.cpp index 87530262..3c4bee9c 100644 --- a/LEGO1/mxstreamchunklist.cpp +++ b/LEGO1/mxstreamchunklist.cpp @@ -18,17 +18,17 @@ void MxStreamChunkList::Destroy(MxStreamChunk* p_chunk) delete p_chunk; } -// FUNCTION: LEGO1 0x100b5930 SYNTHETIC +// TEMPLATE: LEGO1 0x100b5930 // MxCollection::Compare -// FUNCTION: LEGO1 0x100b5990 SYNTHETIC +// TEMPLATE: LEGO1 0x100b5990 // MxCollection::Destroy -// FUNCTION: LEGO1 0x100b59a0 SYNTHETIC +// TEMPLATE: LEGO1 0x100b59a0 // MxList::~MxList -// FUNCTION: LEGO1 0x100b5aa0 SYNTHETIC +// SYNTHETIC: LEGO1 0x100b5aa0 // MxCollection::`scalar deleting destructor' -// FUNCTION: LEGO1 0x100b5b10 SYNTHETIC +// SYNTHETIC: LEGO1 0x100b5b10 // MxList::`scalar deleting destructor' diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/mxstreamcontroller.cpp index c1530930..2ecf0b43 100644 --- a/LEGO1/mxstreamcontroller.cpp +++ b/LEGO1/mxstreamcontroller.cpp @@ -34,51 +34,51 @@ MxStreamController::MxStreamController() m_action0x60 = NULL; } -// FUNCTION: LEGO1 0x100c0d60 SYNTHETIC +// TEMPLATE: LEGO1 0x100c0d60 // list >::~list > -// FUNCTION: LEGO1 0x100c0dd0 SYNTHETIC +// TEMPLATE: LEGO1 0x100c0dd0 // list >::~list > -// FUNCTION: LEGO1 0x100c0e40 SYNTHETIC +// TEMPLATE: LEGO1 0x100c0e40 // list >::_Buynode // clang-format off -// FUNCTION: LEGO1 0x100c0e70 SYNTHETIC +// TEMPLATE: LEGO1 0x100c0e70 // list >::~list > // clang-format on -// FUNCTION: LEGO1 0x100c0ee0 SYNTHETIC +// TEMPLATE: LEGO1 0x100c0ee0 // list >::_Buynode -// FUNCTION: LEGO1 0x100c0fc0 SYNTHETIC +// TEMPLATE: LEGO1 0x100c0fc0 // MxStreamListMxDSSubscriber::~MxStreamListMxDSSubscriber -// FUNCTION: LEGO1 0x100c1010 SYNTHETIC +// TEMPLATE: LEGO1 0x100c1010 // MxStreamListMxDSAction::~MxStreamListMxDSAction -// FUNCTION: LEGO1 0x100c1060 SYNTHETIC +// TEMPLATE: LEGO1 0x100c1060 // MxStreamListMxNextActionDataStart::~MxStreamListMxNextActionDataStart -// FUNCTION: LEGO1 0x100c10b0 SYNTHETIC +// TEMPLATE: LEGO1 0x100c10b0 // MxStreamList::~MxStreamList -// FUNCTION: LEGO1 0x100c1100 SYNTHETIC +// TEMPLATE: LEGO1 0x100c1100 // MxStreamList::~MxStreamList -// FUNCTION: LEGO1 0x100c1150 SYNTHETIC +// TEMPLATE: LEGO1 0x100c1150 // MxStreamList::~MxStreamList -// FUNCTION: LEGO1 0x100c11a0 SYNTHETIC +// TEMPLATE: LEGO1 0x100c11a0 // List::~List -// FUNCTION: LEGO1 0x100c11f0 SYNTHETIC +// TEMPLATE: LEGO1 0x100c11f0 // List::~List -// FUNCTION: LEGO1 0x100c1240 SYNTHETIC +// TEMPLATE: LEGO1 0x100c1240 // List::~List -// FUNCTION: LEGO1 0x100c1290 STUB +// STUB: LEGO1 0x100c1290 MxStreamController::~MxStreamController() { // TODO @@ -117,7 +117,7 @@ MxResult MxStreamController::vtable0x20(MxDSAction* p_action) return result; } -// FUNCTION: LEGO1 0x100c1740 STUB +// STUB: LEGO1 0x100c1740 MxResult MxStreamController::vtable0x24(undefined4 p_unknown) { // TODO STUB @@ -137,7 +137,7 @@ MxResult MxStreamController::FUN_100c1800(MxDSAction* p_action, MxU32 p_val) return SUCCESS; } -// FUNCTION: LEGO1 0x100c1a00 STUB +// STUB: LEGO1 0x100c1a00 MxResult MxStreamController::FUN_100c1a00(MxDSAction* p_action, MxU32 p_bufferval) { return FAILURE; @@ -153,13 +153,13 @@ MxResult MxStreamController::vtable0x2c(MxDSAction* p_action, MxU32 p_bufferval) return FUN_100c1800(p_action, (p_bufferval / m_provider->GetFileSize()) * m_provider->GetFileSize()); } -// FUNCTION: LEGO1 0x100c1ce0 STUB +// STUB: LEGO1 0x100c1ce0 MxResult MxStreamController::vtable0x30(undefined4 p_unknown) { return FAILURE; } -// FUNCTION: LEGO1 0x100c20d0 STUB +// STUB: LEGO1 0x100c20d0 MxBool MxStreamController::FUN_100c20d0(MxDSObject& p_obj) { // TODO diff --git a/LEGO1/mxstringlist.cpp b/LEGO1/mxstringlist.cpp index 225a3fea..1c839a85 100644 --- a/LEGO1/mxstringlist.cpp +++ b/LEGO1/mxstringlist.cpp @@ -4,23 +4,23 @@ DECOMP_SIZE_ASSERT(MxListEntry, 0x18) -// FUNCTION: LEGO1 0x100cb3c0 SYNTHETIC +// TEMPLATE: LEGO1 0x100cb3c0 // MxCollection::Compare -// FUNCTION: LEGO1 0x100cb470 SYNTHETIC +// TEMPLATE: LEGO1 0x100cb470 // MxCollection::Destroy -// FUNCTION: LEGO1 0x100cb4c0 SYNTHETIC +// TEMPLATE: LEGO1 0x100cb4c0 // MxList::~MxList -// FUNCTION: LEGO1 0x100cbb40 SYNTHETIC +// TEMPLATE: LEGO1 0x100cbb40 // MxList::Append -// FUNCTION: LEGO1 0x100cc2d0 SYNTHETIC +// TEMPLATE: LEGO1 0x100cc2d0 // MxList::_InsertEntry -// FUNCTION: LEGO1 0x100cc3c0 SYNTHETIC +// TEMPLATE: LEGO1 0x100cc3c0 // MxListEntry::MxListEntry -// FUNCTION: LEGO1 0x100cc450 SYNTHETIC +// TEMPLATE: LEGO1 0x100cc450 // MxListEntry::GetValue diff --git a/LEGO1/mxvariabletable.cpp b/LEGO1/mxvariabletable.cpp index 5b13efeb..dda73bee 100644 --- a/LEGO1/mxvariabletable.cpp +++ b/LEGO1/mxvariabletable.cpp @@ -1,27 +1,27 @@ #include "mxvariabletable.h" -// FUNCTION: LEGO1 0x100afcd0 SYNTHETIC +// TEMPLATE: LEGO1 0x100afcd0 // MxCollection::Compare -// FUNCTION: LEGO1 0x100afce0 SYNTHETIC +// TEMPLATE: LEGO1 0x100afce0 // MxCollection::~MxCollection -// FUNCTION: LEGO1 0x100afd30 SYNTHETIC +// TEMPLATE: LEGO1 0x100afd30 // MxCollection::Destroy -// FUNCTION: LEGO1 0x100afd40 SYNTHETIC +// SYNTHETIC: LEGO1 0x100afd40 // MxCollection::`scalar deleting destructor' -// FUNCTION: LEGO1 0x100afdb0 SYNTHETIC +// TEMPLATE: LEGO1 0x100afdb0 // MxVariableTable::Destroy -// FUNCTION: LEGO1 0x100afdc0 SYNTHETIC +// TEMPLATE: LEGO1 0x100afdc0 // MxHashTable::Hash -// FUNCTION: LEGO1 0x100b0bd0 SYNTHETIC +// TEMPLATE: LEGO1 0x100b0bd0 // MxHashTable::~MxHashTable -// FUNCTION: LEGO1 0x100b0ca0 SYNTHETIC +// SYNTHETIC: LEGO1 0x100b0ca0 // MxHashTable::`scalar deleting destructor' // FUNCTION: LEGO1 0x100b7330 @@ -89,8 +89,8 @@ const char* MxVariableTable::GetVariable(const char* p_key) return value; } -// FUNCTION: LEGO1 0x100b7ab0 SYNTHETIC +// TEMPLATE: LEGO1 0x100b7ab0 // MxHashTable::Resize -// FUNCTION: LEGO1 0x100b7b80 SYNTHETIC +// TEMPLATE: LEGO1 0x100b7b80 // MxHashTable::_NodeInsert diff --git a/LEGO1/mxvideopresenter.cpp b/LEGO1/mxvideopresenter.cpp index f579ea94..09db8738 100644 --- a/LEGO1/mxvideopresenter.cpp +++ b/LEGO1/mxvideopresenter.cpp @@ -312,7 +312,7 @@ MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y) return TRUE; } -// FUNCTION: LEGO1 0x100b2a70 STUB +// STUB: LEGO1 0x100b2a70 void MxVideoPresenter::VTable0x6c() { // TODO diff --git a/LEGO1/pizza.cpp b/LEGO1/pizza.cpp index dc204507..1a07d27a 100644 --- a/LEGO1/pizza.cpp +++ b/LEGO1/pizza.cpp @@ -20,7 +20,7 @@ Pizza::~Pizza() TickleManager()->UnregisterClient(this); } -// FUNCTION: LEGO1 0x100388a0 STUB +// STUB: LEGO1 0x100388a0 MxResult Pizza::Tickle() { // TODO diff --git a/LEGO1/pizzeriastate.cpp b/LEGO1/pizzeriastate.cpp index e7ffc1fd..ea54a028 100644 --- a/LEGO1/pizzeriastate.cpp +++ b/LEGO1/pizzeriastate.cpp @@ -1,6 +1,6 @@ #include "pizzeriastate.h" -// FUNCTION: LEGO1 0x10017af0 STUB +// STUB: LEGO1 0x10017af0 PizzeriaState::PizzeriaState() { // TODO diff --git a/LEGO1/police.cpp b/LEGO1/police.cpp index 2d318e12..a8b409f3 100644 --- a/LEGO1/police.cpp +++ b/LEGO1/police.cpp @@ -1,18 +1,18 @@ #include "police.h" -// FUNCTION: LEGO1 0x1005e130 STUB +// STUB: LEGO1 0x1005e130 Police::Police() { // TODO } -// FUNCTION: LEGO1 0x1005e320 STUB +// STUB: LEGO1 0x1005e320 Police::~Police() { // TODO } -// FUNCTION: LEGO1 0x1005e480 STUB +// STUB: LEGO1 0x1005e480 MxLong Police::Notify(MxParam& p) { // TODO diff --git a/LEGO1/policestate.cpp b/LEGO1/policestate.cpp index 304a4aaa..a2c66a45 100644 --- a/LEGO1/policestate.cpp +++ b/LEGO1/policestate.cpp @@ -1,6 +1,6 @@ #include "policestate.h" -// FUNCTION: LEGO1 0x1005e7c0 STUB +// STUB: LEGO1 0x1005e7c0 PoliceState::PoliceState() { // TODO diff --git a/LEGO1/racecar.cpp b/LEGO1/racecar.cpp index d9cca647..207c02c9 100644 --- a/LEGO1/racecar.cpp +++ b/LEGO1/racecar.cpp @@ -8,7 +8,7 @@ RaceCar::RaceCar() this->m_unk13c = 40.0; } -// FUNCTION: LEGO1 0x10028420 STUB +// STUB: LEGO1 0x10028420 RaceCar::~RaceCar() { // TODO diff --git a/LEGO1/racestate.cpp b/LEGO1/racestate.cpp index 37738a0f..61511536 100644 --- a/LEGO1/racestate.cpp +++ b/LEGO1/racestate.cpp @@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(RaceStateEntry, 0x06) // TODO: Must be 0x2c but current structure is incorrect // DECOMP_SIZE_ASSERT(RaceState, 0x2c) -// FUNCTION: LEGO1 0x10015f30 STUB +// STUB: LEGO1 0x10015f30 RaceState::RaceState() { // TODO diff --git a/LEGO1/radio.cpp b/LEGO1/radio.cpp index 9085be39..e2c8e82d 100644 --- a/LEGO1/radio.cpp +++ b/LEGO1/radio.cpp @@ -1,6 +1,6 @@ #include "radio.h" -// FUNCTION: LEGO1 0x1002c990 STUB +// STUB: LEGO1 0x1002c990 Radio::~Radio() { // TODO diff --git a/LEGO1/radiostate.cpp b/LEGO1/radiostate.cpp index 6f781294..012eea68 100644 --- a/LEGO1/radiostate.cpp +++ b/LEGO1/radiostate.cpp @@ -1,6 +1,6 @@ #include "radiostate.h" -// FUNCTION: LEGO1 0x1002ce10 STUB +// STUB: LEGO1 0x1002ce10 RadioState::RadioState() { // TODO diff --git a/LEGO1/realtime/matrix.cpp b/LEGO1/realtime/matrix.cpp index e7e6d707..8d0c0f5c 100644 --- a/LEGO1/realtime/matrix.cpp +++ b/LEGO1/realtime/matrix.cpp @@ -124,7 +124,7 @@ void Matrix4Impl::EqualsMxProduct(const Matrix4Impl* p_a, const Matrix4Impl* p_b // Not close, Ghidra struggles understinging this method so it will have to // be manually worked out. Included since I at least figured out what it was // doing with rotateIndex and what overall operation it's trying to do. -// FUNCTION: LEGO1 0x10002550 STUB +// STUB: LEGO1 0x10002550 void Matrix4Impl::ToQuaternion(Vector4Impl* p_outQuat) { /* @@ -167,7 +167,7 @@ void Matrix4Impl::ToQuaternion(Vector4Impl* p_outQuat) // No idea what this function is doing and it will be hard to tell until // we have a confirmed usage site. -// FUNCTION: LEGO1 0x10002710 STUB +// STUB: LEGO1 0x10002710 int Matrix4Impl::FUN_10002710(const Vector3Impl* p_vec) { return -1; diff --git a/LEGO1/realtime/orientableroi.h b/LEGO1/realtime/orientableroi.h index 6cfb4634..bb14815b 100644 --- a/LEGO1/realtime/orientableroi.h +++ b/LEGO1/realtime/orientableroi.h @@ -16,7 +16,7 @@ public: ZEROVEC3(m_world_velocity); IDENTMAT4(m_local2world.GetMatrix()); } - // FUNCTION: LEGO1 0x100a4630 SYNTHETIC + // SYNTHETIC: LEGO1 0x100a4630 // OrientableROI::`scalar deleting destructor' virtual const Vector3& GetWorldVelocity() const; diff --git a/LEGO1/realtime/vector.cpp b/LEGO1/realtime/vector.cpp index 3fdb288b..1d41470c 100644 --- a/LEGO1/realtime/vector.cpp +++ b/LEGO1/realtime/vector.cpp @@ -60,7 +60,7 @@ float Vector2Impl::DotImpl(float* p_a, float* p_b) const return p_b[0] * p_a[0] + p_b[1] * p_a[1]; } -// FUNCTION: LEGO1 0x10002060 SYNTHETIC +// FUNCTION: LEGO1 0x10002060 // Vector2Impl::SetData // FUNCTION: LEGO1 0x10002070 @@ -339,7 +339,7 @@ void Vector4Impl::EqualsScalar(float* p_value) // Note close yet, included because I'm at least confident I know what operation // it's trying to do. -// FUNCTION: LEGO1 0x10002b70 STUB +// STUB: LEGO1 0x10002b70 int Vector4Impl::NormalizeQuaternion() { float* v = m_data; diff --git a/LEGO1/realtime/vector.h b/LEGO1/realtime/vector.h index 71375565..ded96918 100644 --- a/LEGO1/realtime/vector.h +++ b/LEGO1/realtime/vector.h @@ -4,7 +4,7 @@ #include // TODO: Find proper compilation unit to put this -// FUNCTION: LEGO1 0x1000c0f0 SYNTHETIC +// FUNCTION: LEGO1 0x1000c0f0 // Vector2Impl::Vector2Impl /* diff --git a/LEGO1/registrationbook.cpp b/LEGO1/registrationbook.cpp index cf53d433..fc7cf39b 100644 --- a/LEGO1/registrationbook.cpp +++ b/LEGO1/registrationbook.cpp @@ -1,18 +1,18 @@ #include "registrationbook.h" -// FUNCTION: LEGO1 0x10076d20 STUB +// STUB: LEGO1 0x10076d20 RegistrationBook::RegistrationBook() { // TODO } -// FUNCTION: LEGO1 0x10076f50 STUB +// STUB: LEGO1 0x10076f50 RegistrationBook::~RegistrationBook() { // TODO } -// FUNCTION: LEGO1 0x100770e0 STUB +// STUB: LEGO1 0x100770e0 MxLong RegistrationBook::Notify(MxParam& p) { // TODO diff --git a/LEGO1/score.h b/LEGO1/score.h index bf0a5341..6bacd554 100644 --- a/LEGO1/score.h +++ b/LEGO1/score.h @@ -28,7 +28,7 @@ public: return !strcmp(name, Score::ClassName()) || LegoWorld::IsA(name); } - // FUNCTION: LEGO1 0x100011e0 SYNTHETIC + // SYNTHETIC: LEGO1 0x100011e0 // Score::`scalar deleting destructor' virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+18 diff --git a/LEGO1/towtrackmissionstate.cpp b/LEGO1/towtrackmissionstate.cpp index de8a5b17..cdef8a88 100644 --- a/LEGO1/towtrackmissionstate.cpp +++ b/LEGO1/towtrackmissionstate.cpp @@ -2,7 +2,7 @@ DECOMP_SIZE_ASSERT(TowTrackMissionState, 0x28) -// FUNCTION: LEGO1 0x1004dd30 STUB +// STUB: LEGO1 0x1004dd30 TowTrackMissionState::TowTrackMissionState() { // TODO diff --git a/LEGO1/viewmanager/viewmanager.cpp b/LEGO1/viewmanager/viewmanager.cpp index c6165835..8ec2aad2 100644 --- a/LEGO1/viewmanager/viewmanager.cpp +++ b/LEGO1/viewmanager/viewmanager.cpp @@ -1,6 +1,6 @@ #include "viewmanager.h" -// FUNCTION: LEGO1 0x100a64d0 STUB +// STUB: LEGO1 0x100a64d0 void ViewManager::RemoveAll(ViewROI*) { // TODO diff --git a/LEGO1/viewmanager/viewroi.cpp b/LEGO1/viewmanager/viewroi.cpp index 609082ad..00af794b 100644 --- a/LEGO1/viewmanager/viewroi.cpp +++ b/LEGO1/viewmanager/viewroi.cpp @@ -35,7 +35,7 @@ void ViewROI::UpdateWorldData(const Matrix4Data& parent2world) } } -// FUNCTION: LEGO1 0x100aa250 SYNTHETIC +// SYNTHETIC: LEGO1 0x100aa250 // ViewROI::`scalar deleting destructor' inline ViewROI::~ViewROI() { diff --git a/tools/README.md b/tools/README.md index 22ce2f24..d8a946cd 100644 --- a/tools/README.md +++ b/tools/README.md @@ -13,7 +13,7 @@ pip install -r tools/requirements.txt * `reccmp`: Compares the original EXE or DLL with a recompiled EXE or DLL, provided a PDB file * `verexp`: Verifies exports by comparing the exports of the original DLL and the recompiled DLL -* `checkorder`: Checks `FUNCTION` declarations, ensuring they appear in ascending order within a unit +* `checkorder`: Checks function declarations, ensuring they appear in ascending order within a unit * `isledecomp`: A library that is used by the above scripts, it has a collection of useful classes and functions ## Testing diff --git a/tools/isledecomp/isledecomp/parser/parser.py b/tools/isledecomp/isledecomp/parser/parser.py index a9366fd1..1039ac41 100644 --- a/tools/isledecomp/isledecomp/parser/parser.py +++ b/tools/isledecomp/isledecomp/parser/parser.py @@ -57,7 +57,7 @@ def find_code_blocks(stream: TextIO) -> List[CodeBlock]: end_line=end_line, offset_comment=offset_match.comment, module=offset_match.module, - is_synthetic=offset_match.is_synthetic, + is_template=offset_match.is_template, is_stub=offset_match.is_stub, ) blocks.append(block) @@ -85,7 +85,7 @@ def find_code_blocks(stream: TextIO) -> List[CodeBlock]: offset_matches.append(new_match) - if new_match.is_synthetic: + if new_match.is_template: state = ReaderState.IN_TEMPLATE else: state = ReaderState.WANT_SIG @@ -100,7 +100,7 @@ def find_code_blocks(stream: TextIO) -> List[CodeBlock]: can_seek = False elif state == ReaderState.IN_TEMPLATE: - # SYNTHETIC functions are a special case. The signature is + # TEMPLATE functions are a special case. The signature is # given on the next line (in a // comment) function_sig = get_template_function_name(line) start_line = line_no diff --git a/tools/isledecomp/isledecomp/parser/util.py b/tools/isledecomp/isledecomp/parser/util.py index 30a7bf69..59fca75b 100644 --- a/tools/isledecomp/isledecomp/parser/util.py +++ b/tools/isledecomp/isledecomp/parser/util.py @@ -14,29 +14,29 @@ CodeBlock = namedtuple( "end_line", "offset_comment", "module", - "is_synthetic", + "is_template", "is_stub", ], ) OffsetMatch = namedtuple( - "OffsetMatch", ["module", "address", "is_synthetic", "is_stub", "comment"] + "OffsetMatch", ["module", "address", "is_template", "is_stub", "comment"] ) # This has not been formally established, but considering that "STUB" # is a temporary state for a function, we assume it will appear last, -# after any other modifiers (i.e. SYNTHETIC) +# after any other modifiers (i.e. TEMPLATE) # To match a reasonable variance of formatting for the offset comment offsetCommentRegex = re.compile( - r"\s*//\s*FUNCTION:\s*(\w+)\s+(?:0x)?([a-f0-9]+)(\s+SYNTHETIC)?(\s+STUB)?", # nopep8 + r"\s*//\s*OFFSET:\s*(\w+)\s+(?:0x)?([a-f0-9]+)(\s+TEMPLATE)?(\s+STUB)?", # nopep8 flags=re.I, ) # To match the exact syntax (text upper case, hex lower case, with spaces) # that is used in most places offsetCommentExactRegex = re.compile( - r"^// FUNCTION: [A-Z0-9]+ (0x[a-f0-9]+)( SYNTHETIC)?( STUB)?$" + r"^// OFFSET: [A-Z0-9]+ (0x[a-f0-9]+)( TEMPLATE)?( STUB)?$" ) # nopep8 @@ -51,7 +51,7 @@ trailingCommentRegex = re.compile(r"(\s*(?://|/\*).*)$") def get_template_function_name(line: str) -> str: - """Parse function signature for special SYNTHETIC functions""" + """Parse function signature for special TEMPLATE functions""" template_match = templateCommentRegex.match(line) # If we don't match, you get whatever is on the line as the signature @@ -92,7 +92,7 @@ def match_offset_comment(line: str) -> OffsetMatch | None: return OffsetMatch( module=match.group(1), address=int(match.group(2), 16), - is_synthetic=match.group(3) is not None, + is_template=match.group(3) is not None, is_stub=match.group(4) is not None, comment=line.strip(), ) diff --git a/tools/isledecomp/tests/samples/basic_class.cpp b/tools/isledecomp/tests/samples/basic_class.cpp index 8b206dec..23ce3c39 100644 --- a/tools/isledecomp/tests/samples/basic_class.cpp +++ b/tools/isledecomp/tests/samples/basic_class.cpp @@ -10,14 +10,14 @@ public: virtual MxResult Tickle() override; // vtable+08 - // FUNCTION: TEST 0x12345678 + // OFFSET: TEST 0x12345678 inline const char* ClassName() const // vtable+0c { // 0xabcd1234 return "TestClass"; } - // FUNCTION: TEST 0xdeadbeef + // OFFSET: TEST 0xdeadbeef inline MxBool IsA(const char* name) const override // vtable+10 { return !strcmp(name, TestClass::ClassName()); diff --git a/tools/isledecomp/tests/samples/basic_file.cpp b/tools/isledecomp/tests/samples/basic_file.cpp index 99930de8..6a4017b5 100644 --- a/tools/isledecomp/tests/samples/basic_file.cpp +++ b/tools/isledecomp/tests/samples/basic_file.cpp @@ -3,19 +3,19 @@ // A very simple well-formed code file -// FUNCTION: TEST 0x1234 +// OFFSET: TEST 0x1234 void function01() { // TODO } -// FUNCTION: TEST 0x2345 +// OFFSET: TEST 0x2345 void function02() { // TODO } -// FUNCTION: TEST 0x3456 +// OFFSET: TEST 0x3456 void function03() { // TODO diff --git a/tools/isledecomp/tests/samples/inline.cpp b/tools/isledecomp/tests/samples/inline.cpp index 8a36c89a..0bfedf6d 100644 --- a/tools/isledecomp/tests/samples/inline.cpp +++ b/tools/isledecomp/tests/samples/inline.cpp @@ -1,8 +1,8 @@ // Sample for python unit tests // Not part of the decomp -// FUNCTION: TEST 0x10000001 +// OFFSET: TEST 0x10000001 inline const char* OneLineWithComment() const { return "MxDSObject"; }; // hi there -// FUNCTION: TEST 0x10000002 +// OFFSET: TEST 0x10000002 inline const char* OneLine() const { return "MxDSObject"; }; diff --git a/tools/isledecomp/tests/samples/missing_offset.cpp b/tools/isledecomp/tests/samples/missing_offset.cpp index 3f6b3811..332fed2c 100644 --- a/tools/isledecomp/tests/samples/missing_offset.cpp +++ b/tools/isledecomp/tests/samples/missing_offset.cpp @@ -9,7 +9,7 @@ int no_offset_comment() return -1; } -// FUNCTION: TEST 0xdeadbeef +// OFFSET: TEST 0xdeadbeef void regular_ole_function() { printf("hi there"); diff --git a/tools/isledecomp/tests/samples/multiple_offsets.cpp b/tools/isledecomp/tests/samples/multiple_offsets.cpp index dc3c5bfa..eecdd95b 100644 --- a/tools/isledecomp/tests/samples/multiple_offsets.cpp +++ b/tools/isledecomp/tests/samples/multiple_offsets.cpp @@ -3,22 +3,22 @@ // Handling multiple offset markers -// FUNCTION: TEST 0x1234 -// FUNCTION: HELLO 0x5555 +// OFFSET: TEST 0x1234 +// OFFSET: HELLO 0x5555 void different_modules() { // TODO } -// FUNCTION: TEST 0x2345 -// FUNCTION: TEST 0x1234 +// OFFSET: TEST 0x2345 +// OFFSET: TEST 0x1234 void same_module() { // TODO } -// FUNCTION: TEST 0x2002 -// FUNCTION: test 0x1001 +// OFFSET: TEST 0x2002 +// OFFSET: test 0x1001 void same_case_insensitive() { // TODO diff --git a/tools/isledecomp/tests/samples/oneline_function.cpp b/tools/isledecomp/tests/samples/oneline_function.cpp index feb82314..8d7fdc5a 100644 --- a/tools/isledecomp/tests/samples/oneline_function.cpp +++ b/tools/isledecomp/tests/samples/oneline_function.cpp @@ -1,10 +1,10 @@ // Sample for python unit tests // Not part of the decomp -// FUNCTION: TEST 0x1234 +// OFFSET: TEST 0x1234 void short_function() { static char* msg = "oneliner"; } -// FUNCTION: TEST 0x5555 +// OFFSET: TEST 0x5555 void function_after_one_liner() { // This function comes after the previous that is on a single line. diff --git a/tools/isledecomp/tests/samples/out_of_order.cpp b/tools/isledecomp/tests/samples/out_of_order.cpp index 951c99e7..749c4f2b 100644 --- a/tools/isledecomp/tests/samples/out_of_order.cpp +++ b/tools/isledecomp/tests/samples/out_of_order.cpp @@ -1,19 +1,19 @@ // Sample for python unit tests // Not part of the decomp -// FUNCTION: TEST 0x1001 +// OFFSET: TEST 0x1001 void function_order01() { // TODO } -// FUNCTION: TEST 0x1003 +// OFFSET: TEST 0x1003 void function_order03() { // TODO } -// FUNCTION: TEST 0x1002 +// OFFSET: TEST 0x1002 void function_order02() { // TODO diff --git a/tools/isledecomp/tests/samples/poorly_formatted.cpp b/tools/isledecomp/tests/samples/poorly_formatted.cpp index 69f365ec..32dd774c 100644 --- a/tools/isledecomp/tests/samples/poorly_formatted.cpp +++ b/tools/isledecomp/tests/samples/poorly_formatted.cpp @@ -4,18 +4,18 @@ // While it's reasonable to expect a well-formed file (and clang-format // will make sure we get one), this will put the parser through its paces. -// FUNCTION: TEST 0x1234 +// OFFSET: TEST 0x1234 void curly_with_spaces() { static char* msg = "hello"; } -// FUNCTION: TEST 0x5555 +// OFFSET: TEST 0x5555 void weird_closing_curly() { int x = 123; } -// FUNCTION: HELLO 0x5656 +// OFFSET: HELLO 0x5656 void bad_indenting() { if (0) { diff --git a/tools/isledecomp/tests/test_parser_util.py b/tools/isledecomp/tests/test_parser_util.py index 7e363d93..91fd285b 100644 --- a/tools/isledecomp/tests/test_parser_util.py +++ b/tools/isledecomp/tests/test_parser_util.py @@ -14,7 +14,7 @@ blank_or_comment_param = [ (True, "\t"), (True, " "), (False, "\tint abc=123;"), - (True, "// FUNCTION: LEGO1 0xdeadbeef"), + (True, "// OFFSET: LEGO1 0xdeadbeef"), (True, " /* Block comment beginning"), (True, "Block comment ending */ "), # TODO: does clang-format have anything to say about these cases? @@ -31,41 +31,41 @@ def test_is_blank_or_comment(line: str, expected: bool): offset_comment_samples = [ # (can_parse: bool, exact_match: bool, line: str) # Should match both expected modules with optional STUB marker - (True, True, "// FUNCTION: LEGO1 0xdeadbeef"), - (True, True, "// FUNCTION: LEGO1 0xdeadbeef STUB"), - (True, True, "// FUNCTION: ISLE 0x12345678"), - (True, True, "// FUNCTION: ISLE 0x12345678 STUB"), + (True, True, "// OFFSET: LEGO1 0xdeadbeef"), + (True, True, "// OFFSET: LEGO1 0xdeadbeef STUB"), + (True, True, "// OFFSET: ISLE 0x12345678"), + (True, True, "// OFFSET: ISLE 0x12345678 STUB"), # No trailing spaces allowed - (True, False, "// FUNCTION: LEGO1 0xdeadbeef "), - (True, False, "// FUNCTION: LEGO1 0xdeadbeef STUB "), + (True, False, "// OFFSET: LEGO1 0xdeadbeef "), + (True, False, "// OFFSET: LEGO1 0xdeadbeef STUB "), # Must have exactly one space between elements - (True, False, "//FUNCTION: ISLE 0xdeadbeef"), - (True, False, "// FUNCTION:ISLE 0xdeadbeef"), - (True, False, "// FUNCTION: ISLE 0xdeadbeef"), - (True, False, "// FUNCTION: ISLE 0xdeadbeef"), - (True, False, "// FUNCTION: ISLE 0xdeadbeef"), - (True, False, "// FUNCTION: ISLE 0xdeadbeef STUB"), + (True, False, "//OFFSET: ISLE 0xdeadbeef"), + (True, False, "// OFFSET:ISLE 0xdeadbeef"), + (True, False, "// OFFSET: ISLE 0xdeadbeef"), + (True, False, "// OFFSET: ISLE 0xdeadbeef"), + (True, False, "// OFFSET: ISLE 0xdeadbeef"), + (True, False, "// OFFSET: ISLE 0xdeadbeef STUB"), # Must have 0x prefix for hex number - (True, False, "// FUNCTION: ISLE deadbeef"), + (True, False, "// OFFSET: ISLE deadbeef"), # Offset, module name, and STUB must be uppercase - (True, False, "// function: ISLE 0xdeadbeef"), - (True, False, "// function: isle 0xdeadbeef"), - (True, False, "// FUNCTION: LEGO1 0xdeadbeef stub"), + (True, False, "// offset: ISLE 0xdeadbeef"), + (True, False, "// offset: isle 0xdeadbeef"), + (True, False, "// OFFSET: LEGO1 0xdeadbeef stub"), # Hex string must be lowercase - (True, False, "// FUNCTION: ISLE 0xDEADBEEF"), + (True, False, "// OFFSET: ISLE 0xDEADBEEF"), # TODO: How flexible should we be with matching the module name? - (True, True, "// FUNCTION: OMNI 0x12345678"), - (True, True, "// FUNCTION: LEG01 0x12345678"), - (True, False, "// FUNCTION: hello 0x12345678"), + (True, True, "// OFFSET: OMNI 0x12345678"), + (True, True, "// OFFSET: LEG01 0x12345678"), + (True, False, "// OFFSET: hello 0x12345678"), # Not close enough to match - (False, False, "// FUNCTION: ISLE0x12345678"), - (False, False, "// FUNCTION: 0x12345678"), + (False, False, "// OFFSET: ISLE0x12345678"), + (False, False, "// OFFSET: 0x12345678"), (False, False, "// LEGO1: 0x12345678"), # Hex string shorter than 8 characters - (True, True, "// FUNCTION: LEGO1 0x1234"), + (True, True, "// OFFSET: LEGO1 0x1234"), # TODO: These match but shouldn't. - # (False, False, '// FUNCTION: LEGO1 0'), - # (False, False, '// FUNCTION: LEGO1 0x'), + # (False, False, '// OFFSET: LEGO1 0'), + # (False, False, '// OFFSET: LEGO1 0x'), ] diff --git a/tools/reccmp/reccmp.py b/tools/reccmp/reccmp.py index 28d328a6..02c16029 100755 --- a/tools/reccmp/reccmp.py +++ b/tools/reccmp/reccmp.py @@ -310,7 +310,7 @@ if __name__ == "__main__": total_effective_accuracy = 0 htmlinsert = [] - # Generate basename of original file, used in locating FUNCTION lines + # Generate basename of original file, used in locating OFFSET lines basename = os.path.basename(os.path.splitext(original)[0]) for srcfilename in walk_source_dir(source): @@ -332,7 +332,7 @@ if __name__ == "__main__": else: continue - if block.is_synthetic: + if block.is_template: recinfo = syminfo.get_recompiled_address_from_name(block.signature) if not recinfo: continue