Merge branch 'emukidid:master' into wii64-wiiflow

saulfabregwiivc · Nov 1, 2023 · 6eb1596 · 6eb1596
2 parents 5ff4435 + 6188ae7
commit 6eb1596
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 21 deletions.
diff --git a/gc_audio/audio.c b/gc_audio/audio.c
@@ -143,7 +143,7 @@ EXPORT void CALL AiLenChanged(void)
 #else
  if (scalePitch || Timers.vis > VILimit)
 #endif
- AESND_SetVoiceFrequency(voice, freq * (Timers.vis / VILimit));
+ AESND_SetVoiceFrequencyRatio(voice, (Timers.vis * freq) / (VILimit * DSP_DEFAULT_FREQ));
 
  IRQ_Restore(level);
  }

diff --git a/gc_input/controller-Classic.c b/gc_input/controller-Classic.c
@@ -105,7 +105,7 @@ static button_t menu_combos[] = {
 
 static unsigned int getButtons(classic_ctrl_t* controller, float maxLMag, float maxRMag)
 {
- unsigned int b = (unsigned)controller->btns;
+ unsigned int b = (unsigned short)controller->btns;
  s8 stickX = getStickValue(&controller->ljs, maxLMag, STICK_X, 7);
  s8 stickY = getStickValue(&controller->ljs, maxLMag, STICK_Y, 7);
  s8 substickX = getStickValue(&controller->rjs, maxRMag, STICK_X, 7);

diff --git a/glN64_GX/gSP.cpp b/glN64_GX/gSP.cpp
@@ -180,7 +180,7 @@ void gSPProcessVertex( u32 v )
 #ifndef __GX__
  Normalize( &gSP.vertices[v].nx );
 #else //!__GX__
- guVecNormalize((guVector*) &gSP.vertices[v].nx );
+ guVecNormalize((guVector*) &gSP.vertices[v].nx,(guVector*) &gSP.vertices[v].nx );
 #endif //__GX__
 
  r = gSP.lights[gSP.numLights].r;
@@ -218,7 +218,7 @@ void gSPProcessVertex( u32 v )
 #ifndef __GX__
  Normalize( &gSP.vertices[v].nx );
 #else //!__GX__
- guVecNormalize((guVector*) &gSP.vertices[v].nx );
+ guVecNormalize((guVector*) &gSP.vertices[v].nx,(guVector*) &gSP.vertices[v].nx );
 #endif //__GX__
 
  if (gSP.geometryMode & G_TEXTURE_GEN_LINEAR)
@@ -480,7 +480,7 @@ void gSPLight( u32 l, s32 n )
 #ifndef __GX__
  Normalize( &gSP.lights[n].x );
 #else //!__GX__
- guVecNormalize((guVector*) &gSP.lights[n].x );
+ guVecNormalize((guVector*) &gSP.lights[n].x,(guVector*) &gSP.lights[n].x );
 #endif //__GX__
  }
 

diff --git a/main/rom_gc.c b/main/rom_gc.c
@@ -154,8 +154,8 @@ int rom_read(fileBrowser_file* file){
 
  //Copy header name as Goodname (in the .ini we can use CRC to identify ROMS)
  memset((char*)buffer,0,1024);
- strncpy(buffer, (char*)ROM_HEADER.Name,32);
- //Maximum ROM name is 32 bytes. Lets make sure we cut off trailing spaces
+ strncpy(buffer, (char*)ROM_HEADER.Name,20);
+ //Maximum ROM name is 20 bytes. Lets make sure we cut off trailing spaces
  for(i = strlen(buffer); i>0; i--)
  {
  if(buffer[i-1] != ' ') {

diff --git a/r4300/compare_core.c b/r4300/compare_core.c
@@ -41,20 +41,6 @@ static long long int comp_reg[32];
 extern unsigned long op;
 static unsigned long old_op;
 
-
-void print_gecko(const char* fmt, ...)
-{
- if(usb_isgeckoalive(1)) {
- char tempstr[2048];
- va_list arglist;
- va_start(arglist, fmt);
- vsprintf(tempstr, fmt, arglist);
- va_end(arglist);
- // write out over usb gecko ;)
- usb_sendbuffer_safe(1,tempstr,strlen(tempstr));
- }
-}
-
 void display_error(char *txt)
 {
  int i;