From 7b15d34a2f5863c62af2dd6cc50814d313f0f6ea Mon Sep 17 00:00:00 2001 From: Ilya Shurumov Date: Mon, 6 Sep 2021 21:57:27 +0600 Subject: [PATCH] - misc changes --- src_rebuild/Game/C/envsound.c | 94 +++++++++++++-------------- src_rebuild/Game/C/gamesnd.c | 7 +- src_rebuild/Game/C/mc_snd.c | 2 +- src_rebuild/PsyCross/src/psx/LIBSPU.C | 2 +- 4 files changed, 52 insertions(+), 53 deletions(-) diff --git a/src_rebuild/Game/C/envsound.c b/src_rebuild/Game/C/envsound.c index 3a3ea374..0ee19dc8 100644 --- a/src_rebuild/Game/C/envsound.c +++ b/src_rebuild/Game/C/envsound.c @@ -11,67 +11,67 @@ void AddEnvSounds(int level, int time) switch (level) { case 0: - AddEnvSnd(1, 0, 4, 2, 0, -225275, 674800, -207350, 657910); - AddEnvSnd(1, 0, 4, 2, 0, 73730, -359430, 88070, -387080); - AddEnvSnd(1, 0x10, 4, 3, 0, 177700, 77500, 222200, 61700); + AddEnvSnd(1, 0, SOUND_BANK_ENVIRONMENT, 2, 0, -225275, 674800, -207350, 657910); + AddEnvSnd(1, 0, SOUND_BANK_ENVIRONMENT, 2, 0, 73730, -359430, 88070, -387080); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, 0, 177700, 77500, 222200, 61700); case 4: - AddEnvSnd(1, 0x10, 4, 0, -5000, 36250, -167050, 70250, -275700); - AddEnvSnd(1, 0x10, 4, 0, -5000, 36250, -157500, 70250, -126900); - AddEnvSnd(1, 0x10, 4, 0, -5000, 36250, -79500, 70250, -113500); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 0, -5000, 36250, -167050, 70250, -275700); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 0, -5000, 36250, -157500, 70250, -126900); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 0, -5000, 36250, -79500, 70250, -113500); break; case 1: - AddEnvSnd(3, 0, 4, 2, 2000, -232360, -266390, -232360, -266390); - AddEnvSnd(3, 0, 4, 2, 2000, 252200, -119500, 252200, -119500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 2, 2000, -232360, -266390, -232360, -266390); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 2, 2000, 252200, -119500, 252200, -119500); case 5: - AddEnvSnd(1, 0, 4, 4, -3500, 324150, -363950, 339500, -323200); - AddEnvSnd(1, 0, 4, 4, -3500, 339500, -326600, 354100, -332600); + AddEnvSnd(1, 0, SOUND_BANK_ENVIRONMENT, 4, -3500, 324150, -363950, 339500, -323200); + AddEnvSnd(1, 0, SOUND_BANK_ENVIRONMENT, 4, -3500, 339500, -326600, 354100, -332600); if (level == 5) { - AddEnvSnd(1, 0x10, 4, 3, -4500, -113900, -181000, -82500, -2424832); - AddEnvSnd(1, 0x10, 4, 3, -4500, -100700, -258250, -89500, -292600); - AddEnvSnd(1, 0x10, 4, 3, -4500, -186100, -321800, -89500, -292600); - AddEnvSnd(1, 0x10, 4, 3, -4500, -282100, -302500, -191100, -321800); - AddEnvSnd(1, 0x10, 4, 3, -4500, -273000, -301500, -294000, -247500); - AddEnvSnd(1, 0x10, 4, 3, -4500, -3145728, -208600, -282500, -246500); - AddEnvSnd(1, 0x10, 4, 3, -4500, -142500, -128100, -90300, -163500); - AddEnvSnd(1, 0x10, 4, 3, -4500, -272700, -114500, -157500, -151900); - AddEnvSnd(1, 0x10, 4, 3, -4500, -154200, -126300, -134700, -65950); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -113900, -181000, -82500, -2424832); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -100700, -258250, -89500, -292600); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -186100, -321800, -89500, -292600); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -282100, -302500, -191100, -321800); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -273000, -301500, -294000, -247500); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -3145728, -208600, -282500, -246500); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -142500, -128100, -90300, -163500); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -272700, -114500, -157500, -151900); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -154200, -126300, -134700, -65950); } break; case 2: case 6: - AddEnvSnd(1, 0x10, 4, 1, -6000, 177100, 918100, 207600, 874100); - AddEnvSnd(1, 0x10, 4, 1, -6000, 17000, 785500, -598016, 985750); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 1, -6000, 177100, 918100, 207600, 874100); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 1, -6000, 17000, 785500, -598016, 985750); break; case 3: case 7: - AddEnvSnd(1, 0x10, 4, 3, -5000, -330600, 156700, -199100, 73750); - AddEnvSnd(1, 0x10, 4, 3, -5000, -84500, 406700, 256500, 378400); - AddEnvSnd(1, 0x10, 4, 3, -5000, -226200, -520600, 32300, -533400); - AddEnvSnd(1, 0x10, 4, 3, -5000, 37250, -402500, 561152, -533400); - AddEnvSnd(4, 0x18, 4, 3, -5000, 38000, -397500, 165000, -305000); - AddEnvSnd(1, 0x10, 4, 3, -5000, 162300, -1245184, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, 176400, -196000, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, 162500, -195400, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -479232, -370100, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -602112, -370700, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -110800, -371700, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -124300, -385000, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -143900, -385000, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -163600, -383700, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -187100, -384100, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -192600, -381300, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -199000, -364700, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -210700, -363500, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -212700, -313800, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -211800, -266500, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -117450, -279600, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -130100, -300200, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -141300, -329500, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -109850, -331800, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -87350, -332450, 265250, -192500); - AddEnvSnd(3, 0, 4, 0, -1000, -76150, -336150, 265250, -192500); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -5000, -330600, 156700, -199100, 73750); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -5000, -84500, 406700, 256500, 378400); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -5000, -226200, -520600, 32300, -533400); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -5000, 37250, -402500, 561152, -533400); + AddEnvSnd(4, 0x18, SOUND_BANK_ENVIRONMENT, 3, -5000, 38000, -397500, 165000, -305000); + AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -5000, 162300, -1245184, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, 176400, -196000, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, 162500, -195400, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -479232, -370100, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -602112, -370700, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -110800, -371700, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -124300, -385000, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -143900, -385000, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -163600, -383700, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -187100, -384100, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -192600, -381300, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -199000, -364700, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -210700, -363500, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -212700, -313800, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -211800, -266500, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -117450, -279600, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -130100, -300200, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -141300, -329500, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -109850, -331800, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -87350, -332450, 265250, -192500); + AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -76150, -336150, 265250, -192500); break; } } diff --git a/src_rebuild/Game/C/gamesnd.c b/src_rebuild/Game/C/gamesnd.c index 6c0db351..2d638683 100644 --- a/src_rebuild/Game/C/gamesnd.c +++ b/src_rebuild/Game/C/gamesnd.c @@ -459,12 +459,11 @@ void LoadLevelSFX(int missionNum) i = 0; - do { + for (i = 0; i < 3; i++) + { if (MissionHeader->residentModels[i] == MissionHeader->residentModels[3]) cop_model = i; - - i++; - } while (i < 3); + } } else { diff --git a/src_rebuild/Game/C/mc_snd.c b/src_rebuild/Game/C/mc_snd.c index 63feb98d..b70b1417 100644 --- a/src_rebuild/Game/C/mc_snd.c +++ b/src_rebuild/Game/C/mc_snd.c @@ -394,7 +394,7 @@ void InitializeMissionSound(void) { es_mobile[0] = AddEnvSnd(3, 0x20, SOUND_BANK_MISSION, GetMissionSound(14), 0, -10000, 0, 0, 0); } - else if (gCurrentMissionNumber == 0x14) + else if (gCurrentMissionNumber == 20) { jericho_in_back = 1; } diff --git a/src_rebuild/PsyCross/src/psx/LIBSPU.C b/src_rebuild/PsyCross/src/psx/LIBSPU.C index 8eda5fba..c1e51ac1 100644 --- a/src_rebuild/PsyCross/src/psx/LIBSPU.C +++ b/src_rebuild/PsyCross/src/psx/LIBSPU.C @@ -393,7 +393,7 @@ unsigned long SpuWrite(unsigned char* addr, unsigned long size) //if (0x7EFF0 < size) // size = 0x7EFF0; - int wptr_ofs = s_SpuMemory.writeptr - s_SpuMemory.samplemem; + volatile int wptr_ofs = s_SpuMemory.writeptr - s_SpuMemory.samplemem; if (wptr_ofs+size > SPU_REALMEMSIZE) {