Skip to content

refactor: name unnamed functions with a best guess #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gynt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: name unnamed functions with a best guess #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/OpenSHC/AI/AICState.func.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,8 +587,8 @@ namespace AI {
decideOnTribeAttackLocation;

MACRO_FUNCTION_RESOLVER(
void (AICState::*)(int), false, Address::SHC_3BB0A8C1_0x004D1D60, &AICState::FUN_004d1d60)
FUN_004d1d60;
void (AICState::*)(int), false, Address::SHC_3BB0A8C1_0x004D1D60, &AICState::sellExcessGoods)
sellExcessGoods;

MACRO_FUNCTION_RESOLVER(void (AICState::*)(int, ResourceType, undefined4), false,
Address::SHC_3BB0A8C1_0x004D1F00, &AICState::requestGoods)
Expand Down Expand Up @@ -671,8 +671,8 @@ namespace AI {
makeOutpostTribesAttack;

MACRO_FUNCTION_RESOLVER(
void (AICState::*)(int), false, Address::SHC_3BB0A8C1_0x004D39B0, &AICState::FUN_004d39b0)
FUN_004d39b0;
void (AICState::*)(int), false, Address::SHC_3BB0A8C1_0x004D39B0, &AICState::buyRequiredGoods)
buyRequiredGoods;

MACRO_FUNCTION_RESOLVER(
void (AICState::*)(int), false, Address::SHC_3BB0A8C1_0x004D3AE0, &AICState::aiRecruitUnits)
Expand Down
4 changes: 2 additions & 2 deletions src/OpenSHC/AI/AICState.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ namespace AI {

void decideOnTribeAttackLocation(uint tribeID__moatWasHit);

void FUN_004d1d60(int param_1);
void sellExcessGoods(int param_1);

void requestGoods(int playerID, ResourceType resourceType, undefined4 amount);

Expand Down Expand Up @@ -384,7 +384,7 @@ namespace AI {

void makeOutpostTribesAttack();

void FUN_004d39b0(int param_1);
void buyRequiredGoods(int param_1);

void aiRecruitUnits(int playerID);

Expand Down
8 changes: 4 additions & 4 deletions src/OpenSHC/Audio/SFX/SFXState.func.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ namespace Audio {
someVolumeAdjustmentFunction;

MACRO_FUNCTION_RESOLVER(
void (SFXState::*)(), false, Address::SHC_3BB0A8C1_0x00449FF0, &SFXState::FUN_00449ff0)
FUN_00449ff0;
void (SFXState::*)(), false, Address::SHC_3BB0A8C1_0x00449FF0, &SFXState::resetScheduledSoundRequests)
resetScheduledSoundRequests;

MACRO_FUNCTION_RESOLVER(
void (SFXState::*)(), false, Address::SHC_3BB0A8C1_0x0044A050, &SFXState::meth_0x44a050)
meth_0x44a050;
void (SFXState::*)(), false, Address::SHC_3BB0A8C1_0x0044A050, &SFXState::resetAmbientEventCounters)
resetAmbientEventCounters;

MACRO_FUNCTION_RESOLVER(
void (SFXState::*)(int), false, Address::SHC_3BB0A8C1_0x0044A0D0, &SFXState::notifyAmbientSoundEvent)
Expand Down
4 changes: 2 additions & 2 deletions src/OpenSHC/Audio/SFX/SFXState.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ namespace Audio {

void someVolumeAdjustmentFunction(int param_1, int param_2, int param_3);

void FUN_00449ff0();
void resetScheduledSoundRequests();

void meth_0x44a050();
void resetAmbientEventCounters();

void notifyAmbientSoundEvent(int ambientSoundType);

Expand Down
50 changes: 25 additions & 25 deletions src/OpenSHC/Audio/mss/SoundSystem.func.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ namespace Audio {
using OpenSHC::DE::SHCDE::eMusicIDs;
using OpenSHC::WindowsHelper::Enums::BOOLEnum;

MACRO_FUNCTION_RESOLVER(
void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x00424700, &SoundSystem::meth_0x424700)
meth_0x424700;
MACRO_FUNCTION_RESOLVER(void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x00424700,
&SoundSystem::endSpeechStreamsAndResetLoopFlags)
endSpeechStreamsAndResetLoopFlags;

MACRO_FUNCTION_RESOLVER(
void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x00467810, &SoundSystem::stopMusicPlayback)
Expand All @@ -45,13 +45,13 @@ namespace Audio {
Address::SHC_3BB0A8C1_0x00479AF0, &SoundSystem::setStreamAndSampleVolumeUnk)
setStreamAndSampleVolumeUnk;

MACRO_FUNCTION_RESOLVER(
void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x00479B70, &SoundSystem::meth_0x479b70)
meth_0x479b70;
MACRO_FUNCTION_RESOLVER(void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x00479B70,
&SoundSystem::restoreMusicVolumeAfterSpeechEnds)
restoreMusicVolumeAfterSpeechEnds;

MACRO_FUNCTION_RESOLVER(
int (SoundSystem::*)(char*), false, Address::SHC_3BB0A8C1_0x00479C20, &SoundSystem::meth_0x479c20)
meth_0x479c20;
MACRO_FUNCTION_RESOLVER(int (SoundSystem::*)(char*), false, Address::SHC_3BB0A8C1_0x00479C20,
&SoundSystem::loadSoundFileAndGetIndex)
loadSoundFileAndGetIndex;

MACRO_FUNCTION_RESOLVER(void (SoundSystem::*)(int), false, Address::SHC_3BB0A8C1_0x00479C80,
&SoundSystem::findSamplePlaceForSoundUnk)
Expand Down Expand Up @@ -98,8 +98,8 @@ namespace Audio {
setupVolumeAndSoundIDWithMultiplier;

MACRO_FUNCTION_RESOLVER(
void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x0047A290, &SoundSystem::meth_0x47a290)
meth_0x47a290;
void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x0047A290, &SoundSystem::markMusicChangePending)
markMusicChangePending;

MACRO_FUNCTION_RESOLVER(
void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x0047A2A0, &SoundSystem::setSomeSoundTime)
Expand All @@ -109,17 +109,17 @@ namespace Audio {
&SoundSystem::setupVolumeAndSoundID0xF0_100)
setupVolumeAndSoundID0xF0_100;

MACRO_FUNCTION_RESOLVER(
void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x0047A340, &SoundSystem::FUN_0047a340)
FUN_0047a340;
MACRO_FUNCTION_RESOLVER(void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x0047A340,
&SoundSystem::selectAndPlayMoodBasedMusic)
selectAndPlayMoodBasedMusic;

MACRO_FUNCTION_RESOLVER(
void (SoundSystem::*)(int), false, Address::SHC_3BB0A8C1_0x0047A570, &SoundSystem::setSection1079_28_4_)
setSection1079_28_4_;

MACRO_FUNCTION_RESOLVER(
void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x0047A580, &SoundSystem::meth_0x47a580)
meth_0x47a580;
MACRO_FUNCTION_RESOLVER(void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x0047A580,
&SoundSystem::playBattleGloryMusicIfConditionsMet)
playBattleGloryMusicIfConditionsMet;

MACRO_FUNCTION_RESOLVER(
void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x0047A5E0, &SoundSystem::playDarMehqOrGlory)
Expand All @@ -142,8 +142,8 @@ namespace Audio {
playMusicUnk;

MACRO_FUNCTION_RESOLVER(
void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x0047A9E0, &SoundSystem::meth_0x47a9e0)
meth_0x47a9e0;
void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x0047A9E0, &SoundSystem::stopAllActiveSounds)
stopAllActiveSounds;

MACRO_FUNCTION_RESOLVER(
void (SoundSystem::*)(), false, Address::SHC_3BB0A8C1_0x0047AA70, &SoundSystem::endSpeechSoundStreams)
Expand All @@ -161,9 +161,9 @@ namespace Audio {
Address::SHC_3BB0A8C1_0x0047B060, &SoundSystem::playSoundStreamUnk)
playSoundStreamUnk;

MACRO_FUNCTION_RESOLVER(
void (SoundSystem::*)(char*), false, Address::SHC_3BB0A8C1_0x0047B250, &SoundSystem::meth_0x47b250)
meth_0x47b250;
MACRO_FUNCTION_RESOLVER(void (SoundSystem::*)(char*), false, Address::SHC_3BB0A8C1_0x0047B250,
&SoundSystem::playMusicFileByName)
playMusicFileByName;

MACRO_FUNCTION_RESOLVER(void (SoundSystem::*)(char*, int), false, Address::SHC_3BB0A8C1_0x0047B2F0,
&SoundSystem::playOrSetupMusicUnk)
Expand Down Expand Up @@ -193,9 +193,9 @@ namespace Audio {
void (SoundSystem::*)(char*), false, Address::SHC_3BB0A8C1_0x0047B670, &SoundSystem::playSpeechSfx)
playSpeechSfx;

MACRO_FUNCTION_RESOLVER(
void (SoundSystem::*)(char*), false, Address::SHC_3BB0A8C1_0x0047B700, &SoundSystem::meth_0x47b700)
meth_0x47b700;
MACRO_FUNCTION_RESOLVER(void (SoundSystem::*)(char*), false, Address::SHC_3BB0A8C1_0x0047B700,
&SoundSystem::playAmbientStreamWithLoop)
playAmbientStreamWithLoop;

MACRO_FUNCTION_RESOLVER(void (SoundSystem::*)(char*, SoundFlagsAndLoopCount), false,
Address::SHC_3BB0A8C1_0x0047B760, &SoundSystem::playSomeMusicUnk)
Expand Down
18 changes: 9 additions & 9 deletions src/OpenSHC/Audio/mss/SoundSystem.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ namespace Audio {
SoundSystem() {};
~SoundSystem() {};

void meth_0x424700();
void endSpeechStreamsAndResetLoopFlags();

void stopMusicPlayback();

Expand All @@ -89,9 +89,9 @@ namespace Audio {

void setStreamAndSampleVolumeUnk(SHC_SoundStream sndStreamIndex, int volumeParam);

void meth_0x479b70();
void restoreMusicVolumeAfterSpeechEnds();

int meth_0x479c20(char* fileName);
int loadSoundFileAndGetIndex(char* fileName);

void findSamplePlaceForSoundUnk(int soundIndex);

Expand All @@ -115,17 +115,17 @@ namespace Audio {

void setupVolumeAndSoundIDWithMultiplier(eMusicIDs soundID, int soundMultiplier);

void meth_0x47a290();
void markMusicChangePending();

void setSomeSoundTime();

void setupVolumeAndSoundID0xF0_100();

void FUN_0047a340();
void selectAndPlayMoodBasedMusic();

void setSection1079_28_4_(int param_1);

void meth_0x47a580();
void playBattleGloryMusicIfConditionsMet();

void playDarMehqOrGlory();

Expand All @@ -137,7 +137,7 @@ namespace Audio {

void playMusicUnk();

void meth_0x47a9e0();
void stopAllActiveSounds();

void endSpeechSoundStreams();

Expand All @@ -148,7 +148,7 @@ namespace Audio {
void playSoundStreamUnk(
SHC_SoundStream sndStreamIndex, char* filename, SoundFlagsAndLoopCount flagsAndLoopCount);

void meth_0x47b250(char* filename);
void playMusicFileByName(char* filename);

void playOrSetupMusicUnk(char* filename, int someVolumeUnk);

Expand All @@ -164,7 +164,7 @@ namespace Audio {

void playSpeechSfx(char* soundFileName);

void meth_0x47b700(char* param_1);
void playAmbientStreamWithLoop(char* param_1);

void playSomeMusicUnk(char* filename, SoundFlagsAndLoopCount flagsAndLoop);

Expand Down
20 changes: 10 additions & 10 deletions src/OpenSHC/Commands.func.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,12 @@ namespace Commands_Func {
ClickExtendRallyPoint;

MACRO_FUNCTION_RESOLVER(
void(__stdcall*)(), false, Address::SHC_3BB0A8C1_0x00484960, &OpenSHC::Commands::FUN_00484960)
FUN_00484960;
void(__stdcall*)(), false, Address::SHC_3BB0A8C1_0x00484960, &OpenSHC::Commands::SiegeEngineRelated)
SiegeEngineRelated;

MACRO_FUNCTION_RESOLVER(
void(__stdcall*)(), false, Address::SHC_3BB0A8C1_0x00484A00, &OpenSHC::Commands::FUN_00484a00)
FUN_00484a00;
void(__stdcall*)(), false, Address::SHC_3BB0A8C1_0x00484A00, &OpenSHC::Commands::TribeRelated1)
TribeRelated1;

MACRO_FUNCTION_RESOLVER(
void(__stdcall*)(), false, Address::SHC_3BB0A8C1_0x00484A70, &OpenSHC::Commands::ReleaseDogs)
Expand All @@ -236,8 +236,8 @@ namespace Commands_Func {
DeselectUnit;

MACRO_FUNCTION_RESOLVER(
void(__stdcall*)(), false, Address::SHC_3BB0A8C1_0x00484E10, &OpenSHC::Commands::FUN_00484e10)
FUN_00484e10;
void(__stdcall*)(), false, Address::SHC_3BB0A8C1_0x00484E10, &OpenSHC::Commands::SetField45To100)
SetField45To100;

MACRO_FUNCTION_RESOLVER(void(__stdcall*)(), false, Address::SHC_3BB0A8C1_0x00484E70, &OpenSHC::Commands::ResyncZone)
ResyncZone;
Expand All @@ -259,8 +259,8 @@ namespace Commands_Func {
VoteKick_K_D_B_G_J;

MACRO_FUNCTION_RESOLVER(
void(__stdcall*)(), false, Address::SHC_3BB0A8C1_0x00485210, &OpenSHC::Commands::FUN_00485210)
FUN_00485210;
void(__stdcall*)(), false, Address::SHC_3BB0A8C1_0x00485210, &OpenSHC::Commands::SyncPacketSizeAnnouncement)
SyncPacketSizeAnnouncement;

MACRO_FUNCTION_RESOLVER(
void(__stdcall*)(), false, Address::SHC_3BB0A8C1_0x004852D0, &OpenSHC::Commands::ShareAnnouncementWithHost)
Expand All @@ -279,8 +279,8 @@ namespace Commands_Func {
FlagsAndBraziersCommandUnk;

MACRO_FUNCTION_RESOLVER(
void(__stdcall*)(), false, Address::SHC_3BB0A8C1_0x004855C0, &OpenSHC::Commands::FUN_004855c0)
FUN_004855c0;
void(__stdcall*)(), false, Address::SHC_3BB0A8C1_0x004855C0, &OpenSHC::Commands::NotifyLaggingPlayer)
NotifyLaggingPlayer;

MACRO_FUNCTION_RESOLVER(
void(__stdcall*)(), false, Address::SHC_3BB0A8C1_0x00485650, &OpenSHC::Commands::SomeKindOfMultiplayerPingUnk)
Expand Down
10 changes: 5 additions & 5 deletions src/OpenSHC/Commands.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ namespace Commands {

void __stdcall ClickExtendRallyPoint();

void __stdcall FUN_00484960();
void __stdcall SiegeEngineRelated();

void __stdcall FUN_00484a00();
void __stdcall TribeRelated1();

void __stdcall ReleaseDogs();

Expand All @@ -123,7 +123,7 @@ namespace Commands {

void __stdcall DeselectUnit();

void __stdcall FUN_00484e10();
void __stdcall SetField45To100();

void __stdcall ResyncZone();

Expand All @@ -135,7 +135,7 @@ namespace Commands {

void __stdcall VoteKick_K_D_B_G_J();

void __stdcall FUN_00485210();
void __stdcall SyncPacketSizeAnnouncement();

void __stdcall ShareAnnouncementWithHost();

Expand All @@ -145,7 +145,7 @@ namespace Commands {

void __stdcall FlagsAndBraziersCommandUnk();

void __stdcall FUN_004855c0();
void __stdcall NotifyLaggingPlayer();

void __stdcall SomeKindOfMultiplayerPingUnk();

Expand Down
Loading