hackern64/HackerSM64
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerSM64.git synced 2026-01-21 10:35:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix rumble Issues (#756)

Browse Source 
* Missed important use of thread6 stack define

* Fix build issues with rumble
This commit is contained in:
Gregory Heskett
2024-01-27 00:20:35 -05:00
parent c39b289441
commit 325ee7c5ec
6 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/title_screen_bg.c
View File

@@ -143,7 +143,8 @@ const Gfx title_screen_bg_dl_face_easter_egg_end[] = {
};
#endif
#if defined(VERSION_SH)
// Not part of segment2, but define still covers same use case
#if (defined(COMPLETE_EN_US_SEGMENT2) && ENABLE_RUMBLE)
ALIGNED8 static const Texture title_texture_rumble_pak[] = {
#include "textures/title_screen_bg/title_screen_bg.06648.rgba16.inc.c"
};

2
include/config/config_game.h
View File

@@ -71,7 +71,7 @@
// #define DIALOG_INDICATOR
/**
* Include the English characters that were missing from US segment2
* Include the English characters that were missing from US segment2 and the rumble pak texture if using rumble.
* J, Q, V, X, Z, ¨, !, !!, ?, &, %, ., and the beta key.
* [MAKE SURE TO INCLUDE EU AND JP/SH BASEROMS IN THE REPO TO OBTAIN THE ASSETS]
* If this is disabled, backup assets will be used.

4
levels/intro/geo.c
View File

@@ -75,7 +75,7 @@ const GeoLayout intro_geo_mario_head_regular[] = {
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
#endif
#ifdef ENABLE_RUMBLE
#if (defined(COMPLETE_EN_US_SEGMENT2) && ENABLE_RUMBLE)
GEO_ZBUFFER(0),
GEO_OPEN_NODE(),
GEO_ASM(INTRO_CONTEXT_NORMAL, geo_intro_rumble_pak_graphic),
@@ -111,7 +111,7 @@ const GeoLayout intro_geo_mario_head_dizzy[] = {
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
#endif
#ifdef ENABLE_RUMBLE
#if (defined(COMPLETE_EN_US_SEGMENT2) && ENABLE_RUMBLE)
GEO_ZBUFFER(0),
GEO_OPEN_NODE(),
GEO_ASM(INTRO_CONTEXT_GAME_OVER, geo_intro_rumble_pak_graphic),

2
src/game/rumble_init.c
View File

@@ -261,7 +261,7 @@ void cancel_rumble(void) {
void create_thread_6(void) {
osCreateMesgQueue(&gRumbleThreadVIMesgQueue, gRumbleThreadVIMesgBuf, 1);
osCreateThread(&gRumblePakThread, THREAD_6_RUMBLE, thread6_rumble_loop, NULL, gThread6Stack + 0x400, 30);
osCreateThread(&gRumblePakThread, THREAD_6_RUMBLE, thread6_rumble_loop, NULL, gThread6Stack + THREAD6_STACK, 30);
osStartThread(&gRumblePakThread);
}

4
src/menu/intro_geo.c
View File

@@ -263,7 +263,7 @@ Gfx *geo_intro_gameover_backdrop(s32 callContext, struct GraphNode *node, UNUSED
return dl;
}
#if defined(VERSION_SH)
#if (defined(COMPLETE_EN_US_SEGMENT2) && ENABLE_RUMBLE)
extern Gfx title_screen_bg_dl_rumble_pak[];
#endif
#ifdef GODDARD_EASTER_EGG
@@ -405,7 +405,7 @@ Gfx *geo_intro_face_easter_egg(s32 callContext, struct GraphNode *node, UNUSED v
}
#endif
#if defined(VERSION_SH)
#if (defined(COMPLETE_EN_US_SEGMENT2) && ENABLE_RUMBLE)
Gfx *geo_intro_rumble_pak_graphic(s32 callContext, struct GraphNode *node, UNUSED void *context) {
struct GraphNodeGenerated *genNode = (struct GraphNodeGenerated *)node;
Gfx *dlIter;

2
src/menu/intro_geo.h
View File

@@ -20,7 +20,7 @@ Gfx *geo_intro_gameover_backdrop(s32 callContext, struct GraphNode *node, UNUSED
#ifdef GODDARD_EASTER_EGG
Gfx *geo_intro_face_easter_egg(s32 callContext, struct GraphNode *node, UNUSED void *context);
#endif
#if ENABLE_RUMBLE
#if (defined(COMPLETE_EN_US_SEGMENT2) && ENABLE_RUMBLE)
Gfx *geo_intro_rumble_pak_graphic(s32 callContext, struct GraphNode *node, UNUSED void *context);
#endif