mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #2021 from galaxyhaxz/namefixes 

Fix function/var names (effects/sound)
pull/681/head
Robin Eklind 6 years ago committed by GitHub
parent
c632e2d1d0 f89204e7dd
commit
cf19c4f019
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 93 additions and 93 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      Source/diablo.cpp
  2. 52
      Source/effects.cpp
  3. 16
      Source/effects.h
  4. 4
      Source/gamemenu.cpp
  5. 2
      Source/interfac.cpp
  6. 2
      Source/movie.cpp
  7. 2
      Source/player.cpp
  8. 34
      Source/sound.cpp
  9. 4
      Source/sound.h
  10. 10
      Source/stores.cpp
  11. 2
      Source/stores.h
  12. 2
      Source/towners.cpp
  13. 20
      comparer-config/diablo.toml
  14. 20
      comparer-config/spawn.toml

16
Source/diablo.cpp
Unescape View File

@ -86,7 +86,7 @@ void FreeGameMem()
FreeMissiles(); FreeMissiles();
FreeMonsters(); FreeMonsters();
FreeObjectGFX(); FreeObjectGFX();
FreeEffects(); FreeMonsterSnd();
FreeTownerGFX(); FreeTownerGFX();
} }
@ -286,7 +286,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
diablo_init_screen(); diablo_init_screen();
diablo_parse_flags(lpCmdLine); diablo_parse_flags(lpCmdLine);
init_create_window(nCmdShow); init_create_window(nCmdShow);
sound_init(); ui_sound_init();
UiInitialize(); UiInitialize();
#ifdef SPAWN #ifdef SPAWN
UiSetSpawned(TRUE); UiSetSpawned(TRUE);
@ -619,7 +619,7 @@ BOOL PressEscKey()
if (qtextflag) { if (qtextflag) {
qtextflag = FALSE; qtextflag = FALSE;
sfx_stop(); stream_stop();
rv = TRUE; rv = TRUE;
} else if (stextflag) { } else if (stextflag) {
STextESC(); STextESC();
@ -772,7 +772,7 @@ LRESULT CALLBACK GM_Game(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
pfile_write_hero(); pfile_write_hero();
nthread_ignore_mutex(TRUE); nthread_ignore_mutex(TRUE);
PaletteFadeOut(8); PaletteFadeOut(8);
FreeMonsterSnd(); sound_stop();
music_stop(); music_stop();
track_repeat_walk(FALSE); track_repeat_walk(FALSE);
sgbMouseDown = 0; sgbMouseDown = 0;
@ -808,7 +808,7 @@ BOOL LeftMouseDown(int wParam)
QuestlogESC(); QuestlogESC();
} else if (qtextflag) { } else if (qtextflag) {
qtextflag = FALSE; qtextflag = FALSE;
sfx_stop(); stream_stop();
} else if (chrflag && MouseX < 320) { } else if (chrflag && MouseX < 320) {
CheckChrBtns(); CheckChrBtns();
} else if (invflag && MouseX > RIGHT_PANEL) { } else if (invflag && MouseX > RIGHT_PANEL) {
@ -1092,7 +1092,7 @@ void PressKey(int vkey)
spselflag = FALSE; spselflag = FALSE;
if (qtextflag && leveltype == DTYPE_TOWN) { if (qtextflag && leveltype == DTYPE_TOWN) {
qtextflag = FALSE; qtextflag = FALSE;
sfx_stop(); stream_stop();
} }
questlog = FALSE; questlog = FALSE;
automapflag = FALSE; automapflag = FALSE;
@ -1214,7 +1214,7 @@ void PressKey(int vkey)
spselflag = FALSE; spselflag = FALSE;
if (qtextflag && leveltype == DTYPE_TOWN) { if (qtextflag && leveltype == DTYPE_TOWN) {
qtextflag = FALSE; qtextflag = FALSE;
sfx_stop(); stream_stop();
} }
questlog = FALSE; questlog = FALSE;
automapflag = FALSE; automapflag = FALSE;
@ -1231,7 +1231,7 @@ void diablo_pause_game()
PauseMode = 0; PauseMode = 0;
} else { } else {
PauseMode = 2; PauseMode = 2;
FreeMonsterSnd(); sound_stop();
track_repeat_walk(FALSE); track_repeat_walk(FALSE);
} }
force_redraw = 255; force_redraw = 255;

52
Source/effects.cpp
Unescape View File

@ -8,8 +8,8 @@
int sfxdelay; int sfxdelay;
int sfxdnum; int sfxdnum;
HANDLE sfx_stream; HANDLE sghStream;
TSFX *sfx_data_cur; TSFX *sgpStreamSFX;
/** /**
* Monster sound type prefix * Monster sound type prefix
@ -919,18 +919,18 @@ BOOL effect_is_playing(int nSFX)
return snd_playing(sfx->pSnd); return snd_playing(sfx->pSnd);
if (sfx->bFlags & SFX_STREAM) if (sfx->bFlags & SFX_STREAM)
return sfx == sfx_data_cur; return sfx == sgpStreamSFX;
return FALSE; return FALSE;
} }
void sfx_stop() void stream_stop()
{ {
if (sfx_stream) { if (sghStream) {
SFileDdaEnd(sfx_stream); SFileDdaEnd(sghStream);
SFileCloseFile(sfx_stream); SFileCloseFile(sghStream);
sfx_stream = NULL; sghStream = NULL;
sfx_data_cur = NULL; sgpStreamSFX = NULL;
} }
} }
@ -961,7 +961,7 @@ void InitMonsterSND(int monst)
} }
} }
void FreeEffects() void FreeMonsterSnd()
{ {
int mtype, i, j, k; int mtype, i, j, k;
char *file; char *file;
@ -1080,7 +1080,7 @@ void stream_play(TSFX *pSFX, int lVolume, int lPan)
/// ASSERT: assert(pSFX); /// ASSERT: assert(pSFX);
/// ASSERT: assert(pSFX->bFlags & sfx_STREAM); /// ASSERT: assert(pSFX->bFlags & sfx_STREAM);
sfx_stop(); stream_stop();
lVolume += sound_get_or_set_sound_volume(1); lVolume += sound_get_or_set_sound_volume(1);
if (lVolume >= VOLUME_MIN) { if (lVolume >= VOLUME_MIN) {
if (lVolume > VOLUME_MAX) if (lVolume > VOLUME_MAX)
@ -1088,17 +1088,17 @@ void stream_play(TSFX *pSFX, int lVolume, int lPan)
#ifdef _DEBUG #ifdef _DEBUG
SFileEnableDirectAccess(FALSE); SFileEnableDirectAccess(FALSE);
#endif #endif
success = SFileOpenFile(pSFX->pszName, &sfx_stream); success = SFileOpenFile(pSFX->pszName, &sghStream);
#ifdef _DEBUG #ifdef _DEBUG
SFileEnableDirectAccess(TRUE); SFileEnableDirectAccess(TRUE);
#endif #endif
if (!success) { if (!success) {
sfx_stream = 0; sghStream = 0;
} else { } else {
if (!SFileDdaBeginEx(sfx_stream, 0x40000, 0, 0, lVolume, lPan, 0)) if (!SFileDdaBeginEx(sghStream, 0x40000, 0, 0, lVolume, lPan, 0))
sfx_stop(); stream_stop();
else else
sfx_data_cur = pSFX; sgpStreamSFX = pSFX;
} }
} }
} }
@ -1155,13 +1155,13 @@ void PlaySfxLoc(int psfx, int x, int y)
PlaySFX_priv(&sgSFX[psfx], TRUE, x, y); PlaySFX_priv(&sgSFX[psfx], TRUE, x, y);
} }
void FreeMonsterSnd() void sound_stop()
{ {
int i, j, k; int i, j, k;
snd_update(TRUE); snd_update(TRUE);
stream_stop();
sfx_stop(); sfx_stop();
sound_stop();
for (i = 0; i < nummtypes; i++) { for (i = 0; i < nummtypes; i++) {
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
@ -1172,7 +1172,7 @@ void FreeMonsterSnd()
} }
} }
void sound_stop() void sfx_stop()
{ {
int i; int i;
TSFX *snd; TSFX *snd;
@ -1192,15 +1192,15 @@ void sound_update()
} }
snd_update(FALSE); snd_update(FALSE);
effects_update(); stream_update();
} }
void effects_update() void stream_update()
{ {
DWORD current, end; DWORD current, end;
if (sfx_stream != NULL && SFileDdaGetPos(sfx_stream, &current, &end) && current >= end) { if (sghStream != NULL && SFileDdaGetPos(sghStream, &current, &end) && current >= end) {
sfx_stop(); stream_stop();
} }
} }
@ -1208,7 +1208,7 @@ void effects_cleanup_sfx()
{ {
DWORD i; DWORD i;
FreeMonsterSnd(); sound_stop();
for (i = 0; i < sizeof(sgSFX) / sizeof(TSFX); i++) { for (i = 0; i < sizeof(sgSFX) / sizeof(TSFX); i++) {
if (sgSFX[i].pSnd) { if (sgSFX[i].pSnd) {
@ -1218,7 +1218,7 @@ void effects_cleanup_sfx()
} }
} }
void stream_update() void sound_init()
{ {
BYTE mask = 0; BYTE mask = 0;
if (gbMaxPlayers > 1) { if (gbMaxPlayers > 1) {
@ -1269,7 +1269,7 @@ void priv_sound_init(BYTE bLoadMask)
} }
} }
void sound_init() void ui_sound_init()
{ {
priv_sound_init(SFX_UI); priv_sound_init(SFX_UI);
} }

16
Source/effects.h
Unescape View File

@ -8,13 +8,13 @@
extern int sfxdelay; extern int sfxdelay;
extern int sfxdnum; extern int sfxdnum;
extern HANDLE sfx_stream; extern HANDLE sghStream;
extern TSFX *sfx_data_cur; extern TSFX *sgpStreamSFX;
BOOL effect_is_playing(int nSFX); BOOL effect_is_playing(int nSFX);
void sfx_stop(); void stream_stop();
void InitMonsterSND(int monst); void InitMonsterSND(int monst);
void FreeEffects(); void FreeMonsterSnd();
void PlayEffect(int i, int mode); void PlayEffect(int i, int mode);
BOOL calc_snd_position(int x, int y, int *plVolume, int *plPan); BOOL calc_snd_position(int x, int y, int *plVolume, int *plPan);
void PlaySFX(int psfx); void PlaySFX(int psfx);
@ -22,14 +22,14 @@ void PlaySFX_priv(TSFX *pSFX, BOOL loc, int x, int y);
void stream_play(TSFX *pSFX, int lVolume, int lPan); void stream_play(TSFX *pSFX, int lVolume, int lPan);
int RndSFX(int psfx); int RndSFX(int psfx);
void PlaySfxLoc(int psfx, int x, int y); void PlaySfxLoc(int psfx, int x, int y);
void FreeMonsterSnd();
void sound_stop(); void sound_stop();
void sfx_stop();
void sound_update(); void sound_update();
void effects_update();
void effects_cleanup_sfx();
void stream_update(); void stream_update();
void priv_sound_init(BYTE bLoadMask); void effects_cleanup_sfx();
void sound_init(); void sound_init();
void priv_sound_init(BYTE bLoadMask);
void ui_sound_init();
void __stdcall effects_play_sound(char *snd_file); void __stdcall effects_play_sound(char *snd_file);
/* rdata */ /* rdata */

4
Source/gamemenu.cpp
Unescape View File

@ -262,7 +262,7 @@ void gamemenu_sound_volume(BOOL bActivate)
if (bActivate) { if (bActivate) {
if (gbSoundOn) { if (gbSoundOn) {
gbSoundOn = FALSE; gbSoundOn = FALSE;
FreeMonsterSnd(); sound_stop();
sound_get_or_set_sound_volume(VOLUME_MIN); sound_get_or_set_sound_volume(VOLUME_MIN);
} else { } else {
gbSoundOn = TRUE; gbSoundOn = TRUE;
@ -274,7 +274,7 @@ void gamemenu_sound_volume(BOOL bActivate)
if (volume == VOLUME_MIN) { if (volume == VOLUME_MIN) {
if (gbSoundOn) { if (gbSoundOn) {
gbSoundOn = FALSE; gbSoundOn = FALSE;
FreeMonsterSnd(); sound_stop();
} }
} else if (!gbSoundOn) { } else if (!gbSoundOn) {
gbSoundOn = TRUE; gbSoundOn = TRUE;

2
Source/interfac.cpp
Unescape View File

@ -87,7 +87,7 @@ void ShowProgress(unsigned int uMsg)
DrawCutscene(); DrawCutscene();
PaletteFadeIn(8); PaletteFadeIn(8);
IncProgress(); IncProgress();
stream_update(); sound_init();
IncProgress(); IncProgress();
switch (uMsg) { switch (uMsg) {

2
Source/movie.cpp
Unescape View File

@ -25,7 +25,7 @@ void play_movie(char *pszMovie, BOOL user_can_close)
UpdateWindow(ghMainWnd); UpdateWindow(ghMainWnd);
movie_playing = TRUE; movie_playing = TRUE;
sound_disable_music(TRUE); sound_disable_music(TRUE);
sfx_stop(); stream_stop();
effects_play_sound("Sfx\\Misc\\blank.wav"); effects_play_sound("Sfx\\Misc\\blank.wav");
SVidPlayBegin(pszMovie, 0, 0, 0, 0, loop_movie ? 0x100C0808 : 0x10280808, &video_stream); SVidPlayBegin(pszMovie, 0, 0, 0, 0, loop_movie ? 0x100C0808 : 0x10280808, &video_stream);

2
Source/player.cpp
Unescape View File

@ -1988,7 +1988,7 @@ void InitLevelChange(int pnum)
RemovePlrMissiles(pnum); RemovePlrMissiles(pnum);
if (pnum == myplr && qtextflag) { if (pnum == myplr && qtextflag) {
qtextflag = FALSE; qtextflag = FALSE;
sfx_stop(); stream_stop();
} }
RemovePlrFromMap(pnum); RemovePlrFromMap(pnum);

34
Source/sound.cpp
Unescape View File

@ -7,7 +7,7 @@ BOOLEAN gbSndInited;
int sglMusicVolume; int sglMusicVolume;
int sglSoundVolume; int sglSoundVolume;
HMODULE hDsound_dll; HMODULE hDsound_dll;
HANDLE sgpMusicTrack; HANDLE sghMusic;
LPDIRECTSOUNDBUFFER sglpDSB; LPDIRECTSOUNDBUFFER sglpDSB;
/* data */ /* data */
@ -306,10 +306,10 @@ void sound_file_cleanup(TSnd *sound_file)
void snd_init(HWND hWnd) void snd_init(HWND hWnd)
{ {
int error_code; int error_code;
sound_load_volume("Sound Volume", &sglSoundVolume); snd_get_volume("Sound Volume", &sglSoundVolume);
gbSoundOn = sglSoundVolume > VOLUME_MIN; gbSoundOn = sglSoundVolume > VOLUME_MIN;
sound_load_volume("Music Volume", &sglMusicVolume); snd_get_volume("Music Volume", &sglMusicVolume);
gbMusicOn = sglMusicVolume > VOLUME_MIN; gbMusicOn = sglMusicVolume > VOLUME_MIN;
error_code = sound_DirectSoundCreate(NULL, &sglpDS, NULL); error_code = sound_DirectSoundCreate(NULL, &sglpDS, NULL);
@ -329,7 +329,7 @@ void snd_init(HWND hWnd)
gbSndInited = sglpDS != NULL; gbSndInited = sglpDS != NULL;
} }
void sound_load_volume(char *value_name, int *value) void snd_get_volume(char *value_name, int *value)
{ {
int v = *value; int v = *value;
if (!SRegLoadValue("Diablo", value_name, 0, &v)) { if (!SRegLoadValue("Diablo", value_name, 0, &v)) {
@ -433,22 +433,22 @@ void sound_cleanup()
if (gbSndInited) { if (gbSndInited) {
gbSndInited = FALSE; gbSndInited = FALSE;
sound_store_volume("Sound Volume", sglSoundVolume); snd_set_volume("Sound Volume", sglSoundVolume);
sound_store_volume("Music Volume", sglMusicVolume); snd_set_volume("Music Volume", sglMusicVolume);
} }
} }
void sound_store_volume(char *key, int value) void snd_set_volume(char *key, int value)
{ {
SRegSaveValue("Diablo", key, 0, value); SRegSaveValue("Diablo", key, 0, value);
} }
void music_stop() void music_stop()
{ {
if (sgpMusicTrack) { if (sghMusic) {
SFileDdaEnd(sgpMusicTrack); SFileDdaEnd(sghMusic);
SFileCloseFile(sgpMusicTrack); SFileCloseFile(sghMusic);
sgpMusicTrack = NULL; sghMusic = NULL;
sgnMusicTrack = NUM_MUSIC; sgnMusicTrack = NUM_MUSIC;
} }
} }
@ -463,15 +463,15 @@ void music_start(int nTrack)
#ifdef _DEBUG #ifdef _DEBUG
SFileEnableDirectAccess(FALSE); SFileEnableDirectAccess(FALSE);
#endif #endif
success = SFileOpenFile(sgszMusicTracks[nTrack], &sgpMusicTrack); success = SFileOpenFile(sgszMusicTracks[nTrack], &sghMusic);
#ifdef _DEBUG #ifdef _DEBUG
SFileEnableDirectAccess(TRUE); SFileEnableDirectAccess(TRUE);
#endif #endif
sound_create_primary_buffer(sgpMusicTrack); sound_create_primary_buffer(sghMusic);
if (!success) { if (!success) {
sgpMusicTrack = NULL; sghMusic = NULL;
} else { } else {
SFileDdaBeginEx(sgpMusicTrack, 0x40000, 0x40000, 0, sglMusicVolume, 0, 0); SFileDdaBeginEx(sghMusic, 0x40000, 0x40000, 0, sglMusicVolume, 0, 0);
sgnMusicTrack = nTrack; sgnMusicTrack = nTrack;
} }
} }
@ -493,8 +493,8 @@ int sound_get_or_set_music_volume(int volume)
sglMusicVolume = volume; sglMusicVolume = volume;
if (sgpMusicTrack) if (sghMusic)
SFileDdaSetVolume(sgpMusicTrack, volume, 0); SFileDdaSetVolume(sghMusic, volume, 0);
return sglMusicVolume; return sglMusicVolume;
} }

4
Source/sound.h
Unescape View File

@ -16,11 +16,11 @@ TSnd *sound_file_load(char *path);
void sound_CreateSoundBuffer(TSnd *sound_file); void sound_CreateSoundBuffer(TSnd *sound_file);
void sound_file_cleanup(TSnd *sound_file); void sound_file_cleanup(TSnd *sound_file);
void snd_init(HWND hWnd); void snd_init(HWND hWnd);
void sound_load_volume(char *value_name, int *value); void snd_get_volume(char *value_name, int *value);
void sound_create_primary_buffer(HANDLE music_track); void sound_create_primary_buffer(HANDLE music_track);
HRESULT sound_DirectSoundCreate(LPGUID lpGuid, LPDIRECTSOUND *ppDS, LPUNKNOWN pUnkOuter); HRESULT sound_DirectSoundCreate(LPGUID lpGuid, LPDIRECTSOUND *ppDS, LPUNKNOWN pUnkOuter);
void sound_cleanup(); void sound_cleanup();
void sound_store_volume(char *key, int value); void snd_set_volume(char *key, int value);
void music_stop(); void music_stop();
void music_start(int nTrack); void music_start(int nTrack);
void sound_disable_music(BOOL disable); void sound_disable_music(BOOL disable);

10
Source/stores.cpp
Unescape View File

@ -242,7 +242,7 @@ void DrawSLine(int y)
#endif #endif
} }
void DrawSArrows(int y1, int y2) void DrawSSlider(int y1, int y2)
{ {
int yd1, yd2, yd3; int yd1, yd2, yd3;
@ -1583,7 +1583,7 @@ void DrawSText()
} }
if (stextscrl) if (stextscrl)
DrawSArrows(4, 20); DrawSSlider(4, 20);
InStoreFlag = (InStoreFlag & 7) + 1; InStoreFlag = (InStoreFlag & 7) + 1;
} }
@ -1593,7 +1593,7 @@ void STextESC()
if (qtextflag) { if (qtextflag) {
qtextflag = FALSE; qtextflag = FALSE;
if (leveltype == DTYPE_TOWN) if (leveltype == DTYPE_TOWN)
sfx_stop(); stream_stop();
} else { } else {
switch (stextflag) { switch (stextflag) {
case STORE_SMITH: case STORE_SMITH:
@ -2679,7 +2679,7 @@ void STextEnter()
if (qtextflag) { if (qtextflag) {
qtextflag = FALSE; qtextflag = FALSE;
if (leveltype == DTYPE_TOWN) if (leveltype == DTYPE_TOWN)
sfx_stop(); stream_stop();
} else { } else {
PlaySFX(IS_TITLSLCT); PlaySFX(IS_TITLSLCT);
switch (stextflag) { switch (stextflag) {
@ -2763,7 +2763,7 @@ void CheckStoreBtn()
if (qtextflag) { if (qtextflag) {
qtextflag = FALSE; qtextflag = FALSE;
if (leveltype == DTYPE_TOWN) if (leveltype == DTYPE_TOWN)
sfx_stop(); stream_stop();
} else if (stextsel != -1 && MouseY >= 32 && MouseY <= 320) { } else if (stextsel != -1 && MouseY >= 32 && MouseY <= 320) {
if (!stextsize) { if (!stextsize) {
if (MouseX < 344 + PANEL_LEFT || MouseX > 616 + PANEL_LEFT) if (MouseX < 344 + PANEL_LEFT || MouseX > 616 + PANEL_LEFT)

2
Source/stores.h
Unescape View File

@ -42,7 +42,7 @@ void FreeStoreMem();
void DrawSTextBack(); void DrawSTextBack();
void PrintSString(int x, int y, BOOL cjustflag, char *str, char col, int val); void PrintSString(int x, int y, BOOL cjustflag, char *str, char col, int val);
void DrawSLine(int y); void DrawSLine(int y);
void DrawSArrows(int y1, int y2); void DrawSSlider(int y1, int y2);
void DrawSTextHelp(); void DrawSTextHelp();
void ClearSText(int s, int e); void ClearSText(int s, int e);
void AddSLine(int y); void AddSLine(int y);

2
Source/towners.cpp
Unescape View File

@ -418,7 +418,7 @@ void TownCtrlMsg(int i)
towner[i]._tbtcnt = 0; towner[i]._tbtcnt = 0;
if (!towner[i]._tbtcnt) { if (!towner[i]._tbtcnt) {
qtextflag = FALSE; qtextflag = FALSE;
sfx_stop(); stream_stop();
} }
} }
} }

20
comparer-config/diablo.toml
Unescape View File

@ -1628,7 +1628,7 @@ addr = 0x4158B9
size = 0x29 size = 0x29
[[func]] [[func]]
name = "sfx_stop" name = "stream_stop"
addr = 0x4158E2 addr = 0x4158E2
size = 0x29 size = 0x29
@ -1638,7 +1638,7 @@ addr = 0x41590B
size = 0xD0 size = 0xD0
[[func]] [[func]]
name = "FreeEffects" name = "FreeMonsterSnd"
addr = 0x4159DB addr = 0x4159DB
size = 0x6A size = 0x6A
@ -1678,12 +1678,12 @@ addr = 0x415D01
size = 0x38 size = 0x38
[[func]] [[func]]
name = "FreeMonsterSnd" name = "sound_stop"
addr = 0x415D39 addr = 0x415D39
size = 0x61 size = 0x61
[[func]] [[func]]
name = "sound_stop" name = "sfx_stop"
addr = 0x415D9A addr = 0x415D9A
size = 0x20 size = 0x20
@ -1693,7 +1693,7 @@ addr = 0x415DBA
size = 0x16 size = 0x16
[[func]] [[func]]
name = "effects_update" name = "stream_update"
addr = 0x415DD0 addr = 0x415DD0
size = 0x2F size = 0x2F
@ -1703,7 +1703,7 @@ addr = 0x415DFF
size = 0x2B size = 0x2B
[[func]] [[func]]
name = "stream_update" name = "sound_init"
addr = 0x415E2A addr = 0x415E2A
size = 0x4D size = 0x4D
@ -1713,7 +1713,7 @@ addr = 0x415E77
size = 0x61 size = 0x61
[[func]] [[func]]
name = "sound_init" name = "ui_sound_init"
addr = 0x415ED8 addr = 0x415ED8
size = 0x7 size = 0x7
@ -8153,7 +8153,7 @@ addr = 0x45708B
size = 0xA0 size = 0xA0
[[func]] [[func]]
name = "sound_load_volume" name = "snd_get_volume"
addr = 0x45712B addr = 0x45712B
size = 0x51 size = 0x51
@ -8173,7 +8173,7 @@ addr = 0x4572FF
size = 0x59 size = 0x59
[[func]] [[func]]
name = "sound_store_volume" name = "snd_set_volume"
addr = 0x457358 addr = 0x457358
size = 0xF size = 0xF
@ -8268,7 +8268,7 @@ addr = 0x457DE2
size = 0x80 size = 0x80
[[func]] [[func]]
name = "DrawSArrows" name = "DrawSSlider"
addr = 0x457E62 addr = 0x457E62
size = 0xF0 size = 0xF0

20
comparer-config/spawn.toml
Unescape View File

@ -1098,7 +1098,7 @@ addr = 0x40D741
size = 0x29 size = 0x29
[[func]] [[func]]
name = "sfx_stop" name = "stream_stop"
addr = 0x40D76A addr = 0x40D76A
size = 0x29 size = 0x29
@ -1108,7 +1108,7 @@ addr = 0x40D793
size = 0xD0 size = 0xD0
[[func]] [[func]]
name = "FreeEffects" name = "FreeMonsterSnd"
addr = 0x40D863 addr = 0x40D863
size = 0x6A size = 0x6A
@ -1148,12 +1148,12 @@ addr = 0x40DB71
size = 0x38 size = 0x38
[[func]] [[func]]
name = "FreeMonsterSnd" name = "sound_stop"
addr = 0x40DBA9 addr = 0x40DBA9
size = 0x61 size = 0x61
[[func]] [[func]]
name = "sound_stop" name = "sfx_stop"
addr = 0x40DC0A addr = 0x40DC0A
size = 0x20 size = 0x20
@ -1163,7 +1163,7 @@ addr = 0x40DC2A
size = 0x16 size = 0x16
[[func]] [[func]]
name = "effects_update" name = "stream_update"
addr = 0x40DC40 addr = 0x40DC40
size = 0x2F size = 0x2F
@ -1173,7 +1173,7 @@ addr = 0x40DC6F
size = 0x2B size = 0x2B
[[func]] [[func]]
name = "stream_update" name = "sound_init"
addr = 0x40DC9A addr = 0x40DC9A
size = 0x4D size = 0x4D
@ -1183,7 +1183,7 @@ addr = 0x40DCE7
size = 0x61 size = 0x61
[[func]] [[func]]
name = "sound_init" name = "ui_sound_init"
addr = 0x40DD48 addr = 0x40DD48
size = 0x7 size = 0x7
@ -7528,7 +7528,7 @@ addr = 0x44C454
size = 0xA0 size = 0xA0
[[func]] [[func]]
name = "sound_load_volume" name = "snd_get_volume"
addr = 0x44C4F4 addr = 0x44C4F4
size = 0x51 size = 0x51
@ -7548,7 +7548,7 @@ addr = 0x44C6C8
size = 0x59 size = 0x59
[[func]] [[func]]
name = "sound_store_volume" name = "snd_set_volume"
addr = 0x44C721 addr = 0x44C721
size = 0xF size = 0xF
@ -7643,7 +7643,7 @@ addr = 0x44D1AB
size = 0x80 size = 0x80
[[func]] [[func]]
name = "DrawSArrows" name = "DrawSSlider"
addr = 0x44D22B addr = 0x44D22B
size = 0xF0 size = 0xF0

Write Preview
Loading…
Cancel
Save