Merge branch 'alekmaul:develop' into develop

and some other fixes from previous commit
alekmaul · Apr 3, 2024 · 9f06c3e · 9f06c3e
2 parents 7385179 + 58e1146
commit 9f06c3e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/pvsneslib/include/snes/sprite.h b/pvsneslib/include/snes/sprite.h
@@ -251,8 +251,8 @@ void oamClear(u16 first, u8 numEntries);
     \param tileSource	address of sprites graphics entry
     \param tileSize	size of sprites graphics
     \param tilePalette	address of sprites palette entry
-    \param tilePaletteNumber	palette number (0..8)
     \param paletteSize	size of palette
+    \param tilePaletteNumber	palette number (0..8)
     \param address	address of sprite graphics (8K-word steps)
     \param oamsize	default OAM size (OBJ_SIZE8_L16, OBJ_SIZE8_L32, OBJ_SIZE8_L64, OBJ_SIZE16_L32, OBJ_SIZE16_L64 and OBJ_SIZE32_L64)
 */

diff --git a/pvsneslib/source/consoles.asm b/pvsneslib/source/consoles.asm
@@ -444,9 +444,12 @@ consoleInit:
     lda.w #0                                                  ; Begin counting vblank
     sta.w snes_vblank_count
 
+    sta.w mouseConnect                                        ; Mouse init
+
     sep #$20
     sta scr_txt_dirty                                         ; Nothing to print on screen
     sta snes_mplay5                                           ; For Pad function
+    sta snes_mouse                                            ; Set mouse usage disabled by default
 
     phb
     pha

diff --git a/pvsneslib/source/crt0_snes.asm b/pvsneslib/source/crt0_snes.asm
@@ -343,9 +343,6 @@ fast_start:
     stz.w snes_frame_count
     stz.w snes_frame_count_svg
 
-    stz.b snes_mouse    ; set mouse usage disabled by default
-    stz.w mouseConnect;
-
     jsr.l main
 
     ; write exit code to $fffd

diff --git a/snes-examples/pads/mouse/mouse.c b/snes-examples/pads/mouse/mouse.c
@@ -40,15 +40,15 @@ bool speedset[2] = {true};
 //---------------------------------------------------------------------------------
 int main(void)
 {
-    snes_mouse = true; // Let's tell the system we're using mouse bios
+    // Initialize SNES
+    consoleInit();
+
+    snes_mouse = true; // Let's tell the system we're using mouse bios (after init)
 
     // we set mouse speed, or it will just output a random speed. We can change it later manually
     mouseSpeedSet[0] = slow;
     mouseSpeedSet[1] = slow;
 
-    // Initialize SNES
-    consoleInit();
-
     // Init cursors sprite
     oamInitGfxSet(&cursorsprite, (&cursorsprite_end - &cursorsprite), &cursorpal, 48 * 2, 0, 0x0000, OBJ_SIZE16_L32);