mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-21 14:25:22 +00:00
Code Issues Projects Releases Wiki Activity

Proper name for Water Medallion cutscene data

Browse source
This commit is contained in:
JordanLongstaff 2024-11-08 12:54:02 -05:00
parent d9c2f825c4
commit edd9879159
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View file

@ -313,7 +313,7 @@ void EnRu2_SetupWaterMedallionCutscene(EnRu2* this, PlayState* play) {
if ((gSaveContext.chamberCutsceneNum == CHAMBER_CS_WATER) && !IS_CUTSCENE_LAYER) {
player = GET_PLAYER(play);
this->action = ENRU2_AWAIT_BLUE_WARP;
play->csCtx.script = D_80AF411C;
play->csCtx.script = gWaterMedallionCS;
gSaveContext.cutsceneTrigger = 2;
Item_Give(play, ITEM_MEDALLION_WATER);
temp = this->actor.world.rot.y + 0x8000;

2
src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c
View file

@ -2,7 +2,7 @@
#include "z64cutscene_commands.h"
// clang-format off
static CutsceneData D_80AF411C[] = {
static CutsceneData gWaterMedallionCS[] = {
CS_BEGIN_CUTSCENE(35, 3338),
CS_UNK_DATA_LIST(0x00000020, 1),
CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000),

2
tools/csdis_re.py
View file

@ -36,7 +36,7 @@ HARDCODED_SYM_ROM = {
"D_80B4C5D0": 0xF022D0,
"D_80ABF9D0": 0xE75A40,
"D_80ABFB40": 0xE75BB0,
"D_80AF411C": 0xEAA0FC,
"gWaterMedallionCS": 0xEAA0FC,
"D_80A88164": 0xE3ED34,
"D_808BB2F0": 0xC89FF0,
"D_808BB7A0": 0xC8A4A0,