diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index 4323de1380..f2938f2b0a 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -201,7 +201,7 @@ void DemoDu_CsFireMedallion_AdvanceTo01(DemoDu* this, PlayState* play) { Player* player = GET_PLAYER(play); this->updateIndex = CS_FIREMEDALLION_SUBSCENE(1); - play->csCtx.script = D_8096C1A4; + play->csCtx.script = gFireMedallionCs; gSaveContext.cutsceneTrigger = 2; Item_Give(play, ITEM_MEDALLION_FIRE); diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c index 461cc6da7f..d25fd37efb 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c @@ -2,7 +2,7 @@ #include "z64cutscene_commands.h" // clang-format off -static CutsceneData D_8096C1A4[] = { +static CutsceneData gFireMedallionCs[] = { CS_HEADER(31, 3000), CS_UNK_DATA_LIST(0x00000020, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000), diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index ac9afd8d84..f51f0c4c84 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -333,7 +333,7 @@ void func_8098544C(DemoIm* this, PlayState* play) { Player* player = GET_PLAYER(play); this->action = 1; - play->csCtx.script = D_8098786C; + play->csCtx.script = gShadowMedallionCs; gSaveContext.cutsceneTrigger = 2; Item_Give(play, ITEM_MEDALLION_SHADOW); player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000; diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c index a4cead47ee..b188907984 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c @@ -2,7 +2,7 @@ #include "z64cutscene_commands.h" // clang-format off -static CutsceneData D_8098786C[] = { +static CutsceneData gShadowMedallionCs[] = { CS_HEADER(32, 3000), CS_UNK_DATA_LIST(0x00000020, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000), diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 63ab50cee7..8f8867de3e 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -261,7 +261,7 @@ void func_8098E960(DemoSa* this, PlayState* play) { if ((gSaveContext.chamberCutsceneNum == CHAMBER_CS_FOREST) && !IS_CUTSCENE_LAYER) { player = GET_PLAYER(play); this->action = 1; - play->csCtx.script = D_8099010C; + play->csCtx.script = gForestMedallionCs; gSaveContext.cutsceneTrigger = 2; Item_Give(play, ITEM_MEDALLION_FOREST); player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000; diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c index 87acb35903..466b1f7362 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c @@ -2,7 +2,7 @@ #include "z64cutscene_commands.h" // clang-format off -static CutsceneData D_8099010C[] = { +static CutsceneData gForestMedallionCs[] = { CS_HEADER(29, 3001), CS_UNK_DATA_LIST(0x00000020, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000), diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index 6c30a3ec0d..d074cdee65 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -349,7 +349,7 @@ void EnNb_SetupChamberCsImpl(EnNb* this, PlayState* play) { if ((gSaveContext.chamberCutsceneNum == CHAMBER_CS_SPIRIT) && !IS_CUTSCENE_LAYER) { player = GET_PLAYER(play); this->action = NB_CHAMBER_UNDERGROUND; - play->csCtx.script = D_80AB431C; + play->csCtx.script = gSpiritMedallionCs; gSaveContext.cutsceneTrigger = 2; Item_Give(play, ITEM_MEDALLION_SPIRIT); player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000; diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c index 451ad76052..e11e7634b1 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c @@ -2,7 +2,7 @@ #include "z64cutscene_commands.h" // clang-format off -static CutsceneData D_80AB431C[] = { +static CutsceneData gSpiritMedallionCs[] = { CS_HEADER(27, 3011), CS_UNK_DATA_LIST(0x00000020, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000), diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 15fab2fa1d..a1c078f25d 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -345,7 +345,7 @@ void EnRu2_CheckWaterMedallionCutscene(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 = gWaterMedallionCS; + play->csCtx.script = gWaterMedallionCs; gSaveContext.cutsceneTrigger = 2; Item_Give(play, ITEM_MEDALLION_WATER); temp = this->actor.world.rot.y + 0x8000; diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c index 2e9d4bb60f..0521b53b12 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c @@ -2,7 +2,7 @@ #include "z64cutscene_commands.h" // clang-format off -static CutsceneData gWaterMedallionCS[] = { +static CutsceneData gWaterMedallionCs[] = { CS_HEADER(35, 3338), CS_UNK_DATA_LIST(0x00000020, 1), CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000), diff --git a/tools/csdis_re.py b/tools/csdis_re.py index ec9bdd12f2..18309f5209 100644 --- a/tools/csdis_re.py +++ b/tools/csdis_re.py @@ -23,7 +23,7 @@ MAPFILE_P = Path("build/gc-eu-mq-dbg/oot-gc-eu-mq-dbg.map") BASEROM_SEGMENTS_P = Path("extracted/gc-eu-mq-dbg/baserom/") HARDCODED_SYM_ROM = { - "D_8096C1A4": 0xD25834, + "gFireMedallionCs": 0xD25834, "D_80AF0880": 0xEA6860, "D_80AF10A4": 0xEA7084, "D_80AF1728": 0xEA7708, @@ -31,12 +31,12 @@ HARDCODED_SYM_ROM = { "D_808BD2A0": 0xC8BFA0, "D_808BD520": 0xC8C220, "D_808BD790": 0xC8C490, - "D_80AB431C": 0xE6A38C, - "D_8098786C": 0xD40EFC, + "gSpiritMedallionCs": 0xE6A38C, + "gShadowMedallionCs": 0xD40EFC, "D_80B4C5D0": 0xF022D0, "D_80ABF9D0": 0xE75A40, "D_80ABFB40": 0xE75BB0, - "gWaterMedallionCS": 0xEAA0FC, + "gWaterMedallionCs": 0xEAA0FC, "D_80A88164": 0xE3ED34, "D_808BB2F0": 0xC89FF0, "D_808BB7A0": 0xC8A4A0, @@ -49,7 +49,7 @@ HARDCODED_SYM_ROM = { "gAdultWarpInCS": 0xD44FA0, "gChildWarpOutCS": 0xD45590, "gAdultWarpOutCS": 0xD450B0, - "D_8099010C": 0xD4974C, + "gForestMedallionCs": 0xD4974C, } mapfile = mapfile_parser.MapFile()