Skip to content
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

Reduce Number of concurrent sounds on O3DS. #82

Open
wants to merge 18 commits into
base: 3ds-port
Choose a base branch
from
+24 −7
Open

Reduce Number of concurrent sounds on O3DS. #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
887574d
Initial commit
RetroGamer02 Nov 4, 2022
b675f04
Remove personal bin path
RetroGamer02 Nov 4, 2022
f90e1f8
Add missing lib files
RetroGamer02 Nov 4, 2022
264ddc7
No need for old GFX select buttons
RetroGamer02 Nov 4, 2022
bfaa0ee
APT_SetAppCpuTimeLimit to %70 not 80% its actually faster
RetroGamer02 Nov 4, 2022
2c8a605
Remove custom libctru for easier merging
RetroGamer02 Nov 4, 2022
ebf4a50
Reenable GFX buttons
RetroGamer02 Nov 4, 2022
421e421
Code Cleanup
RetroGamer02 Nov 4, 2022
d2eb4fe
More cleanup
RetroGamer02 Nov 4, 2022
2ee0cd3
Remove one last comment
RetroGamer02 Nov 4, 2022
6e28f71
Slight Speed Up
RetroGamer02 Feb 12, 2023
c88c640
Merge branch 'mkst:3ds-port' into 3ds-port
RetroGamer02 Feb 12, 2023
0a87e2e
Bitshift left instead of multiply
RetroGamer02 Feb 13, 2023
dd2e35d
Small Optimizations
RetroGamer02 Feb 18, 2023
30c0d9e
Reduce Number of concurrent sounds on O3DS.
RetroGamer02 Sep 12, 2023
479fba6
Fix for EU as well
RetroGamer02 Sep 12, 2023
c2e9662
Add ifdef __3DS__
RetroGamer02 Sep 12, 2023
d7a1eda
Update external.c
RetroGamer02 Sep 12, 2023
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
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ else
ifeq ($(TARGET_WEB),1)
OPT_FLAGS := -O2 -g4 --source-map-base http://localhost:8080/
else
OPT_FLAGS := -O2
OPT_FLAGS := -O3
endif
endif

Expand Down Expand Up @@ -498,7 +498,7 @@ ifeq ($(TARGET_N3DS),1)
CTRULIB := $(DEVKITPRO)/libctru
LIBDIRS := $(CTRULIB)
export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
PLATFORM_CFLAGS := -mtp=soft -DTARGET_N3DS -DARM11 -DosGetTime=n64_osGetTime -D_3DS -D__3DS__ -march=armv6k -mtune=mpcore -mfloat-abi=hard -mword-relocations -fomit-frame-pointer -ffast-math $(foreach dir,$(LIBDIRS),-I$(dir)/include)
PLATFORM_CFLAGS := -mtp=soft -DTARGET_N3DS -DARM11 -DosGetTime=n64_osGetTime -D_3DS -D__3DS__ -march=armv6k -mtune=mpcore -mfloat-abi=hard -mword-relocations -fomit-frame-pointer $(foreach dir,$(LIBDIRS),-I$(dir)/include)
PLATFORM_LDFLAGS := $(LIBPATHS) -lcitro3d -lctru -lm -specs=3dsx.specs -g -marm -mthumb-interwork -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft
ifeq ($(DISABLE_AUDIO),1)
PLATFORM_CFLAGS += -DDISABLE_AUDIO
Expand Down Expand Up @@ -545,7 +545,7 @@ else
endif

CC_CHECK := $(CC) -fsyntax-only -fsigned-char $(INCLUDE_CFLAGS) -Wall -Wextra -Wno-format-security -D_LANGUAGE_C $(VERSION_CFLAGS) $(MATCH_CFLAGS) $(PLATFORM_CFLAGS) $(GFX_CFLAGS) $(GRUCODE_CFLAGS)
CFLAGS := -O3 $(INCLUDE_CFLAGS) -D_LANGUAGE_C $(VERSION_CFLAGS) $(MATCH_CFLAGS) $(PLATFORM_CFLAGS) $(GFX_CFLAGS) $(GRUCODE_CFLAGS) $(MARCH_FLAGS) -fno-strict-aliasing -fwrapv
CFLAGS := $(OPT_FLAGS) $(INCLUDE_CFLAGS) -D_LANGUAGE_C $(VERSION_CFLAGS) $(MATCH_CFLAGS) $(PLATFORM_CFLAGS) $(GFX_CFLAGS) $(GRUCODE_CFLAGS) $(MARCH_FLAGS) -fno-strict-aliasing -fwrapv

ASFLAGS := -I include -I $(BUILD_DIR) $(VERSION_ASFLAGS)

Expand Down
8 changes: 4 additions & 4 deletions src/audio/data.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ struct ReverbSettingsEU sReverbSettings[] = {
{ 0x04, 0x0a, 0x37ff }
};
struct AudioSessionSettingsEU gAudioSessionPresets[] = {
{ 0x00007d00, 0x01, 0x10, 0x01, 0x00, &sReverbSettings[0], 0x7fff, 0x0000, 0x00003a40, 0x00006d00,
{ 0x00007d00, 0x01, 16, 0x01, 0x00, &sReverbSettings[0], 0x7fff, 0x0000, 0x00003a40, 0x00006d00,
0x00004400, 0x00002a00 },
{ 0x00007d00, 0x01, 0x10, 0x01, 0x00, &sReverbSettings[1], 0x7fff, 0x0000, 0x00003a40, 0x00006d00,
{ 0x00007d00, 0x01, 9, 0x01, 0x00, &sReverbSettings[0], 0x7fff, 0x0000, 0x00003a40, 0x00006d00,
0x00004400, 0x00002a00 },
{ 0x00007d00, 0x01, 0x10, 0x01, 0x00, &sReverbSettings[2], 0x7fff, 0x0000, 0x00003a40, 0x00006d00,
0x00004400, 0x00002a00 },
Expand Down Expand Up @@ -52,7 +52,7 @@ struct AudioSessionSettingsEU gAudioSessionPresets[] = {
struct AudioSessionSettings gAudioSessionPresets[18] = {
#ifdef VERSION_JP
{ 32000, 16, 1, 0x0800, 0x2FFF, 0x7FFF, 0x3900, 0x6000, 0x4400, 0x2A00 },
{ 32000, 16, 1, 0x0A00, 0x47FF, 0x7FFF, 0x3900, 0x6000, 0x4400, 0x2A00 },
{ 32000, 9, 1, 0x0800, 0x2FFF, 0x7FFF, 0x3900, 0x6000, 0x4400, 0x2A00 },
{ 32000, 16, 1, 0x1000, 0x2FFF, 0x7FFF, 0x3900, 0x6000, 0x4400, 0x2A00 },
{ 32000, 16, 1, 0x0E00, 0x3FFF, 0x7FFF, 0x3900, 0x6000, 0x4400, 0x2A00 },
{ 32000, 16, 1, 0x0C00, 0x4FFF, 0x7FFF, 0x3900, 0x6000, 0x4400, 0x2A00 },
Expand All @@ -61,7 +61,7 @@ struct AudioSessionSettings gAudioSessionPresets[18] = {
{ 32000, 20, 1, 0x0800, 0x37FF, 0x7FFF, 0x3300, 0x5500, 0x4000, 0x1B00 },
#else
{ 32000, 16, 1, 0x0C00, 0x2FFF, 0x7FFF, 0x3A00, 0x6D00, 0x4400, 0x2A00 },
{ 32000, 16, 1, 0x0A00, 0x47FF, 0x7FFF, 0x3A00, 0x6D00, 0x4400, 0x2A00 },
{ 32000, 9, 1, 0x0C00, 0x2FFF, 0x7FFF, 0x3A00, 0x6D00, 0x4400, 0x2A00 },
{ 32000, 16, 1, 0x1000, 0x2FFF, 0x7FFF, 0x3A00, 0x6D00, 0x4400, 0x2A00 },
{ 32000, 16, 1, 0x0E00, 0x3FFF, 0x7FFF, 0x3A00, 0x6D00, 0x4400, 0x2A00 },
{ 32000, 16, 1, 0x0C00, 0x4FFF, 0x7FFF, 0x3A00, 0x6D00, 0x4400, 0x2A00 },
Expand Down
17 changes: 17 additions & 0 deletions src/audio/external.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2438,13 +2438,30 @@ void play_toads_jingle(void) {
func_803200E4(50);
}

#ifdef __3DS__
static uint8_t is_new_n3ds()
{
uint8_t is_new_n3ds = 0;
APT_CheckNew3DS(&is_new_n3ds);
return is_new_n3ds;
}
#endif

void sound_reset(u8 presetId) {
#ifndef VERSION_JP
if (presetId >= 8) {
presetId = 0;
sUnused8033323C = 0;
}
#endif

#ifdef __3DS__
if(!is_new_n3ds())
{
presetId = 1;
}
#endif

sGameLoopTicked = 0;
disable_all_sequence_players();
sound_init();
Expand Down