cadey
/
sm64pc
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

gamebridge: Twitch Control #2

Merged
cadey merged 29 commits from gamebridge into master 2020-05-11 22:40:05 +00:00
Conversation 0 Commits 29 Files Changed 24 +6 -5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 80cfdd2a11 - Show all commits

3
src/game/mario.c
View File

@ -1457,6 +1457,7 @@ void set_submerged_cam_preset_and_spawn_bubbles(struct MarioState *m) {
* Both increments and decrements Mario's HP. * Both increments and decrements Mario's HP.
*/ */
void update_mario_health(struct MarioState *m) { void update_mario_health(struct MarioState *m) {
return;
s32 terrainIsSnow; s32 terrainIsSnow;
if (m->health >= 0x100) { if (m->health >= 0x100) {
@ -1865,7 +1866,7 @@ void init_mario_from_save_file(void) {
save_file_get_total_star_count(gCurrSaveFileNum - 1, COURSE_MIN - 1, COURSE_MAX - 1); save_file_get_total_star_count(gCurrSaveFileNum - 1, COURSE_MIN - 1, COURSE_MAX - 1);
gMarioState->numKeys = 0; gMarioState->numKeys = 0;
gMarioState->numLives = 4; gMarioState->numLives = 99;
gMarioState->health = 0x880; gMarioState->health = 0x880;
gMarioState->unkB8 = gMarioState->numStars; gMarioState->unkB8 = gMarioState->numStars;

8
src/game/mario_actions_cutscene.c
View File

@ -1183,7 +1183,7 @@ s32 act_death_exit(struct MarioState *m) {
#else #else
play_sound(SOUND_MARIO_OOOF2, m->marioObj->header.gfx.cameraToObject); play_sound(SOUND_MARIO_OOOF2, m->marioObj->header.gfx.cameraToObject);
#endif #endif
m->numLives--; //m->numLives--;
// restore 7.75 units of health // restore 7.75 units of health
m->healCounter = 31; m->healCounter = 31;
} }
@ -1199,7 +1199,7 @@ s32 act_unused_death_exit(struct MarioState *m) {
#else #else
play_sound(SOUND_MARIO_OOOF2, m->marioObj->header.gfx.cameraToObject); play_sound(SOUND_MARIO_OOOF2, m->marioObj->header.gfx.cameraToObject);
#endif #endif
m->numLives--; //m->numLives--;
// restore 7.75 units of health // restore 7.75 units of health
m->healCounter = 31; m->healCounter = 31;
} }
@ -1215,7 +1215,7 @@ s32 act_falling_death_exit(struct MarioState *m) {
#else #else
play_sound(SOUND_MARIO_OOOF2, m->marioObj->header.gfx.cameraToObject); play_sound(SOUND_MARIO_OOOF2, m->marioObj->header.gfx.cameraToObject);
#endif #endif
m->numLives--; //m->numLives--;
// restore 7.75 units of health // restore 7.75 units of health
m->healCounter = 31; m->healCounter = 31;
} }
@ -1259,7 +1259,7 @@ s32 act_special_death_exit(struct MarioState *m) {
} }
if (launch_mario_until_land(m, ACT_HARD_BACKWARD_GROUND_KB, MARIO_ANIM_BACKWARD_AIR_KB, -24.0f)) { if (launch_mario_until_land(m, ACT_HARD_BACKWARD_GROUND_KB, MARIO_ANIM_BACKWARD_AIR_KB, -24.0f)) {
m->numLives--; //m->numLives--;
m->healCounter = 31; m->healCounter = 31;
} }
// show mario // show mario