compress bg music to reduce memory footprint. reorder init to init

snes9x memory earlier so it goes into MEM1.
This commit is contained in:
Daryl Borth 2018-08-11 15:54:25 -06:00
parent 5866fd20db
commit d895bf6300
4 changed files with 33 additions and 1461 deletions

File diff suppressed because it is too large Load Diff

View File

@ -189,6 +189,12 @@
Nintendo Co., Limited and its subsidiary companies. Nintendo Co., Limited and its subsidiary companies.
***********************************************************************************/ ***********************************************************************************/
#ifdef GEKKO
void S9xResetLogger (void) { }
void S9xCloseLogger (void) { }
void S9xVideoLogger (void *pixels, int width, int height, int depth, int bytes_per_line) { }
void S9xAudioLogger (void *samples, int length) { }
#else
#include "snes9x.h" #include "snes9x.h"
#include "movie.h" #include "movie.h"
@ -280,3 +286,5 @@ void S9xAudioLogger (void *samples, int length)
ignore = fwrite(samples, 1, length, audio); ignore = fwrite(samples, 1, length, audio);
} }
} }
#endif

View File

@ -366,6 +366,29 @@ extern "C" {
s32 __STM_Init(); s32 __STM_Init();
} }
void InitializeSnes9x() {
S9xUnmapAllControls ();
SetDefaultButtonMap ();
// Allocate SNES Memory
if (!Memory.Init ())
ExitApp();
// Allocate APU
if (!S9xInitAPU ())
ExitApp();
S9xSetRenderPixelFormat (RGB565); // Set Pixel Renderer to match 565
S9xInitSound (64, 0); // Initialise Sound System
// Initialise Graphics
setGFX ();
if (!S9xGraphicsInit ())
ExitApp();
AllocGfxMem();
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#ifdef USE_VM #ifdef USE_VM
@ -391,7 +414,9 @@ int main(int argc, char *argv[])
USBGeckoOutput(); USBGeckoOutput();
__exception_setreload(8); __exception_setreload(8);
DefaultSettings (); // Set defaults
InitGCVideo(); // Initialise video InitGCVideo(); // Initialise video
InitializeSnes9x();
ResetVideo_Menu (); // change to menu video mode ResetVideo_Menu (); // change to menu video mode
#ifdef HW_RVL #ifdef HW_RVL
@ -423,27 +448,6 @@ int main(int argc, char *argv[])
InitMem2Manager(); InitMem2Manager();
#endif #endif
DefaultSettings (); // Set defaults
S9xUnmapAllControls ();
SetDefaultButtonMap ();
// Allocate SNES Memory
if (!Memory.Init ())
ExitApp();
// Allocate APU
if (!S9xInitAPU ())
ExitApp();
S9xSetRenderPixelFormat (RGB565); // Set Pixel Renderer to match 565
S9xInitSound (64, 0); // Initialise Sound System
// Initialise Graphics
setGFX ();
if (!S9xGraphicsInit ())
ExitApp();
AllocGfxMem();
S9xInitSync(); // initialize frame sync S9xInitSync(); // initialize frame sync
InitFreeType((u8*)font_ttf, font_ttf_size); // Initialize font system InitFreeType((u8*)font_ttf, font_ttf_size); // Initialize font system
#ifdef HW_RVL #ifdef HW_RVL

Binary file not shown.