diff --git a/assets/xml/scenes/overworld/spot20.xml b/assets/xml/scenes/overworld/spot20.xml index 6e09a5de82..3d305508ad 100644 --- a/assets/xml/scenes/overworld/spot20.xml +++ b/assets/xml/scenes/overworld/spot20.xml @@ -1,6 +1,16 @@ + + + + + + + + + + diff --git a/assets/xml/scenes/overworld/spot20_pal.xml b/assets/xml/scenes/overworld/spot20_pal.xml index cc94f8443c..0ba9380e13 100644 --- a/assets/xml/scenes/overworld/spot20_pal.xml +++ b/assets/xml/scenes/overworld/spot20_pal.xml @@ -1,6 +1,16 @@ + + + + + + + + + + diff --git a/include/z64cutscene.h b/include/z64cutscene.h index 7fcddc8d78..c9200c24f9 100644 --- a/include/z64cutscene.h +++ b/include/z64cutscene.h @@ -299,8 +299,8 @@ typedef enum CutsceneDestination { /* 0x4A */ CS_DEST_LON_LON_RANCH_CREDITS_PART_2, /* 0x4B */ CS_DEST_LON_LON_RANCH_CREDITS_PART_3, /* 0x4C */ CS_DEST_LON_LON_RANCH_CREDITS_PART_4, - /* 0x4D */ CS_DEST_LON_LON_RANCH_CREDITS_PART_5, - /* 0x4E */ CS_DEST_LON_LON_RANCH_CREDITS_PART_6, + /* 0x4D */ CS_DEST_LON_LON_RANCH_CREDITS_PART_6, + /* 0x4E */ CS_DEST_LON_LON_RANCH_CREDITS_PART_5, /* 0x4F */ CS_DEST_LON_LON_RANCH_1, // unused /* 0x50 */ CS_DEST_LON_LON_RANCH_2, // unused /* 0x51 */ CS_DEST_LON_LON_RANCH_3, // unused diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 58a2b690a4..89726c6a29 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -1134,7 +1134,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti play->transitionType = TRANS_TYPE_FADE_BLACK; break; - case CS_DEST_LON_LON_RANCH_CREDITS_PART_5: + case CS_DEST_LON_LON_RANCH_CREDITS_PART_6: play->linkAgeOnLoad = LINK_AGE_CHILD; play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; play->transitionTrigger = TRANS_TRIGGER_START; @@ -1142,7 +1142,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti play->transitionType = TRANS_TYPE_FADE_BLACK; break; - case CS_DEST_LON_LON_RANCH_CREDITS_PART_6: + case CS_DEST_LON_LON_RANCH_CREDITS_PART_5: play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.save.cutsceneIndex = 0xFFF7; diff --git a/tools/ZAPDConfigs/EnumData.xml b/tools/ZAPDConfigs/EnumData.xml index 9ab185a2b8..bbe0b2d07a 100644 --- a/tools/ZAPDConfigs/EnumData.xml +++ b/tools/ZAPDConfigs/EnumData.xml @@ -297,8 +297,8 @@ - - + + diff --git a/tools/csdis.py b/tools/csdis.py index 2d299e2fab..1d96c48e4f 100755 --- a/tools/csdis.py +++ b/tools/csdis.py @@ -94,8 +94,8 @@ cutscene_destinations = { 0x4A: "CS_DEST_LON_LON_RANCH_CREDITS_PART_2", 0x4B: "CS_DEST_LON_LON_RANCH_CREDITS_PART_3", 0x4C: "CS_DEST_LON_LON_RANCH_CREDITS_PART_4", - 0x4D: "CS_DEST_LON_LON_RANCH_CREDITS_PART_5", - 0x4E: "CS_DEST_LON_LON_RANCH_CREDITS_PART_6", + 0x4D: "CS_DEST_LON_LON_RANCH_CREDITS_PART_6", + 0x4E: "CS_DEST_LON_LON_RANCH_CREDITS_PART_5", 0x4F: "CS_DEST_LON_LON_RANCH_1", 0x50: "CS_DEST_LON_LON_RANCH_2", 0x51: "CS_DEST_LON_LON_RANCH_3",