From 024c5e0b5fe78f9e60db03f5cc073f7843175074 Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Sun, 10 Sep 2023 19:21:56 +0200 Subject: Sync asset names with decomp documentation (#3153) * sync asset names with decomp * whitespace and tweak --- soh/src/code/code_80097A00.c | 230 +++++++++++++++++++-------------------- soh/src/code/z_actor.c | 6 +- soh/src/code/z_en_item00.c | 2 +- soh/src/code/z_fbdemo_circle.c | 6 +- soh/src/code/z_fbdemo_triforce.c | 4 +- soh/src/code/z_fbdemo_wipe1.c | 6 +- soh/src/code/z_kankyo.c | 4 +- soh/src/code/z_message_PAL.c | 2 +- 8 files changed, 130 insertions(+), 130 deletions(-) (limited to 'soh/src/code') diff --git a/soh/src/code/code_80097A00.c b/soh/src/code/code_80097A00.c index 00fdb0a4d..e2c8a61ef 100644 --- a/soh/src/code/code_80097A00.c +++ b/soh/src/code/code_80097A00.c @@ -37,96 +37,96 @@ u32 gGsFlagsMasks[] = { 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 }; u32 gGsFlagsShifts[] = { 0, 8, 16, 24 }; void* gItemIcons[] = { - gDekuStickIconTex, - gDekuNutIconTex, - gBombIconTex, - gFairyBowIconTex, - gFireArrowIconTex, - gDinsFireIconTex, - gFairySlingshotIconTex, - gFairyOcarinaIconTex, - gOcarinaofTimeIconTex, - gBombchuIconTex, - gHookshotIconTex, - gLongshotIconTex, - gIceArrowIconTex, - gFaroresWindIconTex, - gBoomerangIconTex, - gLensofTruthIconTex, - gMagicBeansIconTex, - gMegatonHammerIconTex, - gLightArrowIconTex, - gNayrusLoveIconTex, - gEmptyBottleIconTex, - gRedPotionIconTex, - gGreenPotionIconTex, - gBluePotionIconTex, - gBottledFairyIconTex, - gFishIconTex, - gMilkFullIconTex, - gRutosLetterIconTex, - gBlueFireIconTex, - gBugIconTex, - gBigPoeIconTex, - gMilkhalfIconTex, - gPoeIconTex, - gWeirdEggIconTex, - gCuccoIconTex, - gZeldasLetterIconTex, - gKeatonMaskIconTex, - gSkullMaskIconTex, - gSpookyMaskIconTex, - gBunnyHoodIconTex, - gGoronMaskIconTex, - gZoraMaskIconTex, - gGerudoMaskIconTex, - gMaskofTruthIconTex, - gSoldOutIconTex, - gPocketEggIconTex, - gPocketCuccoIconTex, - gCojiroIconTex, - gOddMushroomIconTex, - gOddPotionIconTex, - gPoachersSawIconTex, - gBrokenBiggoronSwordIconTex, - gPrescriptionIconTex, - gEyeBallFrogIconTex, - gEyeDropsIconTex, - gClaimCheckIconTex, - gFairyBowFireIconTex, - gFairyBowIceIconTex, - gFairyBowLightIconTex, - gKokiriSwordIconTex, - gMasterSwordIconTex, - gBiggoronSwordIconTex, - gDekuShieldIconTex, - gHylianShieldIconTex, - gMirrorShieldIconTex, - gKokiriTunicIconTex, - gGoronTunicIconTex, - gZoraTunicIconTex, - gKokiriBootsIconTex, - gIronBootsIconTex, - gHoverBootsIconTex, - gBulletBag30IconTex, - gBulletBag40IconTex, - gBulletBag50IconTex, - gQuiver30IconTex, - gQuiver40IconTex, - gQuiver50IconTex, - gBombBag20IconTex, - gBombBag30IconTex, - gBombBag40IconTex, - gGoronsBraceletIconTex, - gSilverGauntletsIconTex, - gGoldenGauntletsIconTex, - gSilverScaleIconTex, - gGoldenScaleIconTex, - gBrokenGiantsKnifeIconTex, - gAdultsWalletIconTex, - gGiantsWalletIconTex, - gDekuSeedsIconTex, - gFishingPoleIconTex, + gItemIconDekuStickTex, + gItemIconDekuNutTex, + gItemIconBombTex, + gItemIconBowTex, + gItemIconArrowFireTex, + gItemIconDinsFireTex, + gItemIconSlingshotTex, + gItemIconOcarinaFairyTex, + gItemIconOcarinaOfTimeTex, + gItemIconBombchuTex, + gItemIconHookshotTex, + gItemIconLongshotTex, + gItemIconArrowIceTex, + gItemIconFaroresWindTex, + gItemIconBoomerangTex, + gItemIconLensOfTruthTex, + gItemIconMagicBeanTex, + gItemIconHammerTex, + gItemIconArrowLightTex, + gItemIconNayrusLoveTex, + gItemIconBottleEmptyTex, + gItemIconBottlePotionRedTex, + gItemIconBottlePotionGreenTex, + gItemIconBottlePotionBlueTex, + gItemIconBottleFairyTex, + gItemIconBottleFishTex, + gItemIconBottleMilkFullTex, + gItemIconBottleRutosLetterTex, + gItemIconBottleBlueFireTex, + gItemIconBottleBugTex, + gItemIconBottleBigPoeTex, + gItemIconBottleMilkHalfTex, + gItemIconBottlePoeTex, + gItemIconWeirdEggTex, + gItemIconChickenTex, + gItemIconZeldasLetterTex, + gItemIconMaskKeatonTex, + gItemIconMaskSkullTex, + gItemIconMaskSpookyTex, + gItemIconMaskBunnyHoodTex, + gItemIconMaskGoronTex, + gItemIconMaskZoraTex, + gItemIconMaskGerudoTex, + gItemIconMaskTruthTex, + gItemIconSoldOutTex, + gItemIconPocketEggTex, + gItemIconPocketCuccoTex, + gItemIconCojiroTex, + gItemIconOddMushroomTex, + gItemIconOddPotionTex, + gItemIconPoachersSawTex, + gItemIconBrokenGoronsSwordTex, + gItemIconPrescriptionTex, + gItemIconEyeballFrogTex, + gItemIconEyeDropsTex, + gItemIconClaimCheckTex, + gItemIconBowFireTex, + gItemIconBowIceTex, + gItemIconBowLightTex, + gItemIconSwordKokiriTex, + gItemIconSwordMasterTex, + gItemIconSwordBiggoronTex, + gItemIconShieldDekuTex, + gItemIconShieldHylianTex, + gItemIconShieldMirrorTex, + gItemIconTunicKokiriTex, + gItemIconTunicGoronTex, + gItemIconTunicZoraTex, + gItemIconBootsKokiriTex, + gItemIconBootsIronTex, + gItemIconBootsHoverTex, + gItemIconBulletBag30Tex, + gItemIconBulletBag40Tex, + gItemIconBulletBag50Tex, + gItemIconQuiver30Tex, + gItemIconQuiver40Tex, + gItemIconQuiver50Tex, + gItemIconBombBag20Tex, + gItemIconBombBag30Tex, + gItemIconBombBag40Tex, + gItemIconGoronsBraceletTex, + gItemIconSilverGauntletsTex, + gItemIconGoldenGauntletsTex, + gItemIconScaleSilverTex, + gItemIconScaleGoldenTex, + gItemIconBrokenGiantsKnifeTex, + gItemIconAdultsWalletTex, + gItemIconGiantsWalletTex, + gItemIconDekuSeedsTex, + gItemIconFishingPoleTex, gSongNoteTex, gSongNoteTex, gSongNoteTex, @@ -139,34 +139,34 @@ void* gItemIcons[] = { gSongNoteTex, gSongNoteTex, gSongNoteTex, - gForestMedallionIconTex, - gFireMedallionIconTex, - gWaterMedallionIconTex, - gSpiritMedallionIconTex, - gShadowMedallionIconTex, - gLightMedallionIconTex, - gKokiriEmeraldIconTex, - gGoronRubyIconTex, - gZoraSapphireIconTex, - gStoneOfAgonyIconTex, - gGerudosCardIconTex, - gGoldSkulltulaIconTex, - gHeartContainerIconTex, - gUnusedPieceOfHeartIconTex, - gBossKeyIconTex, - gCompassIconTex, - gDungeonMapIconTex, - gSmallKeyIconTex, - gSmallMagicJarIconTex, - gBigMagicJarIconTex, + gQuestIconMedallionForestTex, + gQuestIconMedallionFireTex, + gQuestIconMedallionWaterTex, + gQuestIconMedallionSpiritTex, + gQuestIconMedallionShadowTex, + gQuestIconMedallionLightTex, + gQuestIconKokiriEmeraldTex, + gQuestIconGoronRubyTex, + gQuestIconZoraSapphireTex, + gQuestIconStoneOfAgonyTex, + gQuestIconGerudosCardTex, + gQuestIconGoldSkulltulaTex, + gQuestIconHeartContainerTex, + gQuestIconHeartPieceTex, + gQuestIconDungeonBossKeyTex, + gQuestIconDungeonCompassTex, + gQuestIconDungeonMapTex, + gQuestIconSmallKeyTex, + gQuestIconMagicJarSmallTex, + gQuestIconMagicJarBigTex, gHeartPieceIcon1Tex, gHeartPieceIcon2Tex, gHeartPieceIcon3Tex, - gOcarinaCUpTex, - gOcarinaCDownTex, - gOcarinaCLeftTex, - gOcarinaCRightTex, - gOcarinaATex, + gOcarinaBtnIconCUpTex, + gOcarinaBtnIconCDownTex, + gOcarinaBtnIconCLeftTex, + gOcarinaBtnIconCRightTex, + gOcarinaBtnIconATex, }; // Used to map item IDs to inventory slots diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c index e8d2d9791..e39a29abd 100644 --- a/soh/src/code/z_actor.c +++ b/soh/src/code/z_actor.c @@ -3965,9 +3965,9 @@ typedef struct { } DoorLockInfo; // size = 0x1C static DoorLockInfo sDoorLocksInfo[] = { - /* DOORLOCK_NORMAL */ { 0.54f, 6000.0f, 5000.0f, 1.0f, 0.0f, gDoorChainsDL, gDoorLockDL }, - /* DOORLOCK_BOSS */ { 0.644f, 12000.0f, 8000.0f, 1.0f, 0.0f, object_bdoor_DL_001530, object_bdoor_DL_001400 }, - /* DOORLOCK_NORMAL_SPIRIT */ { 0.64000005f, 8500.0f, 8000.0f, 1.75f, 0.1f, gDoorChainsDL, gDoorLockDL }, + /* DOORLOCK_NORMAL */ { 0.54f, 6000.0f, 5000.0f, 1.0f, 0.0f, gDoorChainDL, gDoorLockDL }, + /* DOORLOCK_BOSS */ { 0.644f, 12000.0f, 8000.0f, 1.0f, 0.0f, gBossDoorChainDL, gBossDoorLockDL }, + /* DOORLOCK_NORMAL_SPIRIT */ { 0.64000005f, 8500.0f, 8000.0f, 1.75f, 0.1f, gDoorChainDL, gDoorLockDL }, }; /** diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c index ad7c93ea4..22a03ea32 100644 --- a/soh/src/code/z_en_item00.c +++ b/soh/src/code/z_en_item00.c @@ -1397,7 +1397,7 @@ void EnItem00_DrawCollectible(EnItem00* this, PlayState* play) { gDPSetTextureFilter(POLY_OPA_DISP++, G_TF_BILERP); gDPSetTextureConvert(POLY_OPA_DISP++, G_TC_FILT); gDPSetTextureLUT(POLY_OPA_DISP++, G_TT_NONE); - gDPLoadTextureBlock(POLY_OPA_DISP++, gBombchuIconTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0, + gDPLoadTextureBlock(POLY_OPA_DISP++, gItemIconBombchuTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPVertex(POLY_OPA_DISP++, customDropVtx, 4, 0); diff --git a/soh/src/code/z_fbdemo_circle.c b/soh/src/code/z_fbdemo_circle.c index b9e71d7ab..a3ebbabd4 100644 --- a/soh/src/code/z_fbdemo_circle.c +++ b/soh/src/code/z_fbdemo_circle.c @@ -22,7 +22,7 @@ Gfx __sCircleDList[] = { gsDPLoadTextureBlock(SEG_ADDR(8, 0), G_IM_FMT_I, G_IM_SIZ_8b, 16, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, // 7 G_TX_NOMIRROR | G_TX_CLAMP, 4, 6, G_TX_NOLOD, G_TX_NOLOD), gsSPDisplayList(SEG_ADDR(9, 0)), // 8 - gsSPVertex(sCircleWipeVtx, 32, 0), // 9 + gsSPVertex(sTransCircleVtx, 32, 0), // 9 gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0), // 10 gsSP2Triangles(3, 5, 6, 0, 5, 7, 8, 0), // 11 gsSP2Triangles(7, 9, 10, 0, 9, 11, 12, 0), // 12 @@ -31,7 +31,7 @@ Gfx __sCircleDList[] = { gsSP2Triangles(19, 21, 22, 0, 21, 23, 24, 0), // 15 gsSP2Triangles(23, 25, 26, 0, 25, 27, 28, 0), // 16 gsSP1Triangle(27, 29, 30, 0), // 17 - gsSPVertex(&sCircleWipeVtx[31], 3, 0), // 18 + gsSPVertex(&sTransCircleVtx[31], 3, 0), // 18 gsSP1Triangle(0, 1, 2, 0), // 19 gsSPEndDisplayList(), // 20 }; @@ -174,7 +174,7 @@ void TransitionCircle_Draw(void* thisx, Gfx** gfxP) { } // OTRTODO: This is an ugly hack but it will do for now... - Vtx* vtx = ResourceMgr_LoadVtxByName(sCircleWipeVtx); + Vtx* vtx = ResourceMgr_LoadVtxByName(sTransCircleVtx); Gfx var1 = gsSPVertex(vtx, 32, 0); Gfx var2 = gsSPVertex(&vtx[31], 3, 0); __sCircleDList[0xe] = var1; diff --git a/soh/src/code/z_fbdemo_triforce.c b/soh/src/code/z_fbdemo_triforce.c index 417ae3d8a..66268836e 100644 --- a/soh/src/code/z_fbdemo_triforce.c +++ b/soh/src/code/z_fbdemo_triforce.c @@ -83,14 +83,14 @@ void TransitionTriforce_Draw(void* thisx, Gfx** gfxP) { guRotate(&modelView[1], rotation, 0.0f, 0.0f, 1.0f); guTranslate(&modelView[2], 0.0f, 0.0f, 0.0f); gDPPipeSync(gfx++); - gSPDisplayList(gfx++, sTriforceWipeDL); + gSPDisplayList(gfx++, sTransTriforceDL); gDPSetColor(gfx++, G_SETPRIMCOLOR, this->color.rgba); gDPSetCombineMode(gfx++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); gSPMatrix(gfx++, &this->projection, G_MTX_LOAD | G_MTX_PROJECTION); gSPMatrix(gfx++, &modelView[0], G_MTX_LOAD); gSPMatrix(gfx++, &modelView[1], G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_MUL); gSPMatrix(gfx++, &modelView[2], G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_MUL); - gSPVertex(gfx++, sTriforceWipeVtx, 10, 0); + gSPVertex(gfx++, sTransTriforceVtx, 10, 0); if (!TransitionTriforce_IsDone(this)) { switch (this->fadeDirection) { case 1: diff --git a/soh/src/code/z_fbdemo_wipe1.c b/soh/src/code/z_fbdemo_wipe1.c index da473d8af..df5cbbc2d 100644 --- a/soh/src/code/z_fbdemo_wipe1.c +++ b/soh/src/code/z_fbdemo_wipe1.c @@ -14,14 +14,14 @@ Gfx sWipeDList[] = { gsDPSetCombineLERP(TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, COMBINED, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE, 0), gsDPSetPrimDepth(0, 0), - gsDPLoadTextureBlock_4b(sWipe1Tex, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6, 6, + gsDPLoadTextureBlock_4b(sTransWipeTex, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6, 6, 11, G_TX_NOLOD), - gsDPLoadMultiBlock_4b(sWipe1Tex, 0x0100, 1, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadMultiBlock_4b(sTransWipeTex, 0x0100, 1, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6, 6, 11, 1), gsDPSetTextureLUT(G_TT_NONE), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsSPDisplayList(SEG_ADDR(8, 0)), - gsSPVertex(sWipe1Vtx, 25, 0), + gsSPVertex(sTransWipeVtx, 25, 0), gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0), gsSP2Triangles(5, 6, 7, 0, 6, 8, 9, 0), gsSP2Triangles(8, 10, 11, 0, 10, 12, 13, 0), diff --git a/soh/src/code/z_kankyo.c b/soh/src/code/z_kankyo.c index 0745a76d3..4474c2d8b 100644 --- a/soh/src/code/z_kankyo.c +++ b/soh/src/code/z_kankyo.c @@ -1367,10 +1367,10 @@ void Environment_DrawSunAndMoon(PlayState* play) { // Replacement for gSunDL gSPMatrix(POLY_OPA_DISP++, SEG_ADDR(1, 0), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPPipeSync(POLY_OPA_DISP++); - gDPLoadTextureBlock_4b(POLY_OPA_DISP++, gSunTex, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, + gDPLoadTextureBlock_4b(POLY_OPA_DISP++, gSun1Tex, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); - gDPLoadMultiBlock_4b(POLY_OPA_DISP++, gSunEveningTex, 0x0100, 1, G_IM_FMT_I, 64, 64, 0, + gDPLoadMultiBlock_4b(POLY_OPA_DISP++, gSunEvening1Tex, 0x0100, 1, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); gSPVertex(POLY_OPA_DISP++, vertices, 4, 0); diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c index 6ba8712b4..c595f4516 100644 --- a/soh/src/code/z_message_PAL.c +++ b/soh/src/code/z_message_PAL.c @@ -2003,7 +2003,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { }; static s16 sOcarinaEffectActorParams[] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000 }; static void* sOcarinaNoteTextures[] = { - gOcarinaATex, gOcarinaCDownTex, gOcarinaCRightTex, gOcarinaCLeftTex, gOcarinaCUpTex, + gOcarinaBtnIconATex, gOcarinaBtnIconCDownTex, gOcarinaBtnIconCRightTex, gOcarinaBtnIconCLeftTex, gOcarinaBtnIconCUpTex, }; static Color_RGB8 sOcarinaNoteAPrimColors[2] = { { 80, 150, 255 }, -- cgit v1.2.3