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 build

Browse Source
This commit is contained in:
Fazana
2021-12-17 12:45:05 +00:00
parent 236498a201
commit 112761e484
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/title_screen_bg.c
View File

@@ -143,7 +143,7 @@ const Gfx title_screen_bg_dl_face_easter_egg_end[] = {
};
#endif
#if ENABLE_RUMBLE
#if defined(VERSION_SH)
ALIGNED8 static const Texture title_texture_rumble_pak[] = {
#include "textures/title_screen_bg/title_screen_bg.06648.rgba16.inc.c"
};

4
levels/intro/geo.c
View File

@@ -72,7 +72,7 @@ const GeoLayout intro_geo_mario_head_regular[] = {
GEO_CLOSE_NODE(),
#endif
GEO_CLOSE_NODE(),
#if ENABLE_RUMBLE
#if defined(VERSION_SH)
GEO_ZBUFFER(0),
GEO_OPEN_NODE(),
GEO_ASM(INTRO_CONTEXT_NORMAL, geo_intro_rumble_pak_graphic),
@@ -105,7 +105,7 @@ const GeoLayout intro_geo_mario_head_dizzy[] = {
GEO_CLOSE_NODE(),
#endif
GEO_CLOSE_NODE(),
#if ENABLE_RUMBLE
#if defined(VERSION_SH)
GEO_ZBUFFER(0),
GEO_OPEN_NODE(),
GEO_ASM(INTRO_CONTEXT_GAME_OVER, geo_intro_rumble_pak_graphic),

2
src/game/mario.c
View File

@@ -1791,7 +1791,7 @@ s32 execute_mario_action(UNUSED struct Object *obj) {
play_infinite_stairs_music();
gMarioState->marioObj->oInteractStatus = INT_STATUS_NONE;
#if ENABLE_RUMBLE
queue_rumble_particles(m);
queue_rumble_particles(gMarioState);
#endif
return gMarioState->particleFlags;

2
src/game/rumble_init.c
View File

@@ -120,7 +120,7 @@ static void update_rumble_data_queue(void) {
if (gRumbleDataQueue[0].comm) {
gCurrRumbleSettings.count = 0;
gCurrRumbleSettings.start = 4;
gCurrRumbleSettings.comm = gRumbleDataQueue[0].comm;
gCurrRumbleSettings.event = gRumbleDataQueue[0].comm;
gCurrRumbleSettings.timer = gRumbleDataQueue[0].time;
gCurrRumbleSettings.level = gRumbleDataQueue[0].level;
gCurrRumbleSettings.decay = gRumbleDataQueue[0].decay;

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 ENABLE_RUMBLE
#if defined(VERSION_SH)
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 ENABLE_RUMBLE
#if defined(VERSION_SH)
Gfx *geo_intro_rumble_pak_graphic(s32 callContext, struct GraphNode *node, UNUSED void *context) {
struct GraphNodeGenerated *genNode = (struct GraphNodeGenerated *)node;
Gfx *dlIter;