Fixed crash in warp_credits
This commit is contained in:
parent
03d6958a30
commit
21583cff0b
|
@ -618,7 +618,9 @@ void warp_credits(void) {
|
||||||
|
|
||||||
set_mario_action(gMarioState, marioAction, 0);
|
set_mario_action(gMarioState, marioAction, 0);
|
||||||
|
|
||||||
|
if (gCurrentArea) {
|
||||||
reset_camera(gCurrentArea->camera);
|
reset_camera(gCurrentArea->camera);
|
||||||
|
}
|
||||||
|
|
||||||
sWarpDest.type = WARP_TYPE_NOT_WARPING;
|
sWarpDest.type = WARP_TYPE_NOT_WARPING;
|
||||||
sDelayedWarpOp = WARP_OP_NONE;
|
sDelayedWarpOp = WARP_OP_NONE;
|
||||||
|
@ -626,8 +628,10 @@ void warp_credits(void) {
|
||||||
play_transition(WARP_TRANSITION_FADE_FROM_COLOR, 0x14, 0x00, 0x00, 0x00);
|
play_transition(WARP_TRANSITION_FADE_FROM_COLOR, 0x14, 0x00, 0x00, 0x00);
|
||||||
|
|
||||||
if (gCurrCreditsEntry == NULL || gCurrCreditsEntry == sCreditsSequence) {
|
if (gCurrCreditsEntry == NULL || gCurrCreditsEntry == sCreditsSequence) {
|
||||||
|
if (gCurrentArea) {
|
||||||
set_background_music(gCurrentArea->musicParam, gCurrentArea->musicParam2, 0);
|
set_background_music(gCurrentArea->musicParam, gCurrentArea->musicParam2, 0);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void check_instant_warp(void) {
|
void check_instant_warp(void) {
|
||||||
|
|
Loading…
Reference in New Issue