fixed castle grounds tile floor + tweaked mario dive swish

Author: stalechilibeans

levels/castle_grounds/3.rgba16.png

@@ -101,7 +101,7 @@ Gfx mat_castle_grounds_ColoredTileMaterial_Variation1[] = {
 	gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT),
 	gsDPSetAlphaDither(G_AD_NOISE),
 	gsSPTexture(65535, 65535, 0, 0, 1),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, castle_grounds_seg7_texture_07003000),
+	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, outside_09003000),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 1023, 256),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 0),
@@ -261,7 +261,7 @@ Gfx mat_castle_grounds_ColoredTileMaterial[] = {
 	gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT),
 	gsDPSetAlphaDither(G_AD_NOISE),
 	gsSPTexture(65535, 65535, 0, 0, 1),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, castle_grounds_seg7_texture_07003000),
+	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, outside_09003000),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 1023, 256),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 0),

levels/castle_grounds/4.rgba16.png

@@ -13,15 +13,18 @@ ALIGNED8 static const u8 castle_grounds_seg7_texture_07002000[] = {
 #include "levels/castle_grounds/2.rgba16.inc.c"
 };
 
+/*
 // 0x07003000 - 0x07004000
 ALIGNED8 static const u8 castle_grounds_seg7_texture_07003000[] = {
 #include "levels/castle_grounds/3.rgba16.inc.c"
 };
 
+
 // 0x07004000 - 0x07005000
 ALIGNED8 static const u8 castle_grounds_seg7_texture_07004000[] = {
 #include "levels/castle_grounds/4.rgba16.inc.c"
 };
+*/
 
 // 0x07005000 - 0x07006800
 ALIGNED8 static const u8 castle_grounds_seg7_texture_07005000[] = {

levels/castle_grounds/material.inc.c

@@ -568,7 +568,7 @@ s32 act_twirling(struct MarioState *m) {
 
 s32 act_dive(struct MarioState *m) {
     if (m->actionArg == 0) {
-        play_mario_sound(m, SOUND_ACTION_THROW, SOUND_MARIO_HAUGH);
+        play_mario_sound(m, SOUND_ACTION_SPIN, SOUND_MARIO_HAUGH);
     } else {
         play_mario_sound(m, SOUND_ACTION_TERRAIN_JUMP, 0);
     }