falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Name some unused NTSC stuff

This commit is contained in:
Dragorn421 2025-06-08 18:03:46 +02:00
parent e94e89d8b9
commit a326042581
No known key found for this signature in database
GPG Key ID: 381AEBAF3D429335
17 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c
View File

@ -2,10 +2,10 @@
#include "item_drops_ntsc.h"
#include "gfx.h"
Vtx gameplay_keep_Vtx_039970[] = {
#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_039970.inc.c"
Vtx gUnusedBombIconVtx[] = {
#include "assets/objects/gameplay_keep/gUnusedBombIconVtx.inc.c"
};
Gfx gGameplayKeepDL_399B0[17] = {
#include "assets/objects/gameplay_keep/gGameplayKeepDL_399B0.inc.c"
Gfx gUnusedBombIconDL[17] = {
#include "assets/objects/gameplay_keep/gUnusedBombIconDL.inc.c"
};

4
assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h
View File

@ -5,8 +5,8 @@
#include "region.h"
#if OOT_REGION != REGION_EU
extern Vtx gameplay_keep_Vtx_039970[];
extern Gfx gGameplayKeepDL_399B0[17];
extern Vtx gUnusedBombIconVtx[];
extern Gfx gUnusedBombIconDL[17];
#endif
#endif

8
assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c
View File

@ -2,10 +2,10 @@
#include "item_drops_ntsc.h"
#include "gfx.h"
Vtx gameplay_keep_Vtx_039A40[] = {
#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_039A40.inc.c"
Vtx gUnusedHeartIconVtx[] = {
#include "assets/objects/gameplay_keep/gUnusedHeartIconVtx.inc.c"
};
Gfx gGameplayKeepDL_39A80[17] = {
#include "assets/objects/gameplay_keep/gGameplayKeepDL_39A80.inc.c"
Gfx gUnusedHeartIconDL[17] = {
#include "assets/objects/gameplay_keep/gUnusedHeartIconDL.inc.c"
};

4
assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h
View File

@ -5,8 +5,8 @@
#include "region.h"
#if OOT_REGION != REGION_EU
extern Vtx gameplay_keep_Vtx_039A40[];
extern Gfx gGameplayKeepDL_39A80[17];
extern Vtx gUnusedHeartIconVtx[];
extern Gfx gUnusedHeartIconDL[17];
#endif
#endif

8
assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c
View File

@ -2,10 +2,10 @@
#include "item_drops_ntsc.h"
#include "gfx.h"
Vtx gameplay_keep_Vtx_039B10[] = {
#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_039B10.inc.c"
Vtx gUnusedArrowIconVtx[] = {
#include "assets/objects/gameplay_keep/gUnusedArrowIconVtx.inc.c"
};
Gfx gGameplayKeepDL_39B50[17] = {
#include "assets/objects/gameplay_keep/gGameplayKeepDL_39B50.inc.c"
Gfx gUnusedArrowIconDL[17] = {
#include "assets/objects/gameplay_keep/gUnusedArrowIconDL.inc.c"
};

4
assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h
View File

@ -5,8 +5,8 @@
#include "region.h"
#if OOT_REGION != REGION_EU
extern Vtx gameplay_keep_Vtx_039B10[];
extern Gfx gGameplayKeepDL_39B50[17];
extern Vtx gUnusedArrowIconVtx[];
extern Gfx gUnusedArrowIconDL[17];
#endif
#endif

8
assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c
View File

@ -2,10 +2,10 @@
#include "gameplay_keep_ntsc_0x46A40.h"
#include "gfx.h"
Vtx gameplay_keep_Vtx_03D220[] = {
#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_03D220.inc.c"
Vtx gUnusedHeartContainerIconVtx[] = {
#include "assets/objects/gameplay_keep/gUnusedHeartContainerIconVtx.inc.c"
};
Gfx gGameplayKeepDL_3D260[17] = {
#include "assets/objects/gameplay_keep/gGameplayKeepDL_3D260.inc.c"
Gfx gUnusedHeartContainerIconDL[17] = {
#include "assets/objects/gameplay_keep/gUnusedHeartContainerIconDL.inc.c"
};

4
assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h
View File

@ -5,8 +5,8 @@
#include "region.h"
#if OOT_REGION != REGION_EU
extern Vtx gameplay_keep_Vtx_03D220[];
extern Gfx gGameplayKeepDL_3D260[17];
extern Vtx gUnusedHeartContainerIconVtx[];
extern Gfx gUnusedHeartContainerIconDL[17];
#endif
#endif

4
assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.c
View File

@ -1,7 +1,7 @@
#include "gameplay_keep_ntsc_0x3FD80.h"
u64 gGameplayKeepTex_3FD80[TEX_LEN(u64, gGameplayKeepTex_3FD80_WIDTH, gGameplayKeepTex_3FD80_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gGameplayKeepTex_3FD80.rgba16.inc.c"
u64 gUnusedBombchuIconTex[TEX_LEN(u64, gUnusedBombchuIconTex_WIDTH, gUnusedBombchuIconTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gUnusedBombchuIconTex.rgba16.inc.c"
};
u64 gGameplayKeepTex_40580[TEX_LEN(u64, gGameplayKeepTex_40580_WIDTH, gGameplayKeepTex_40580_HEIGHT, 16)] = {

6
assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h
View File

@ -6,9 +6,9 @@
#include "region.h"
#if OOT_REGION != REGION_EU
#define gGameplayKeepTex_3FD80_WIDTH 32
#define gGameplayKeepTex_3FD80_HEIGHT 32
extern u64 gGameplayKeepTex_3FD80[TEX_LEN(u64, gGameplayKeepTex_3FD80_WIDTH, gGameplayKeepTex_3FD80_HEIGHT, 16)];
#define gUnusedBombchuIconTex_WIDTH 32
#define gUnusedBombchuIconTex_HEIGHT 32
extern u64 gUnusedBombchuIconTex[TEX_LEN(u64, gUnusedBombchuIconTex_WIDTH, gUnusedBombchuIconTex_HEIGHT, 16)];
#define gGameplayKeepTex_40580_WIDTH 32
#define gGameplayKeepTex_40580_HEIGHT 32
extern u64 gGameplayKeepTex_40580[TEX_LEN(u64, gGameplayKeepTex_40580_WIDTH, gGameplayKeepTex_40580_HEIGHT, 16)];

4
assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c
View File

@ -1,5 +1,5 @@
#include "gameplay_keep_ntsc_0x41580.h"
u64 gGameplayKeepTex_41580[TEX_LEN(u64, gGameplayKeepTex_41580_WIDTH, gGameplayKeepTex_41580_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gGameplayKeepTex_41580.rgba16.inc.c"
u64 gUnusedHeartPieceIconTex[TEX_LEN(u64, gUnusedHeartPieceIconTex_WIDTH, gUnusedHeartPieceIconTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gUnusedHeartPieceIconTex.rgba16.inc.c"
};

6
assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h
View File

@ -6,9 +6,9 @@
#include "region.h"
#if OOT_REGION != REGION_EU
#define gGameplayKeepTex_41580_WIDTH 32
#define gGameplayKeepTex_41580_HEIGHT 32
extern u64 gGameplayKeepTex_41580[TEX_LEN(u64, gGameplayKeepTex_41580_WIDTH, gGameplayKeepTex_41580_HEIGHT, 16)];
#define gUnusedHeartPieceIconTex_WIDTH 32
#define gUnusedHeartPieceIconTex_HEIGHT 32
extern u64 gUnusedHeartPieceIconTex[TEX_LEN(u64, gUnusedHeartPieceIconTex_WIDTH, gUnusedHeartPieceIconTex_HEIGHT, 16)];
#endif
#endif

8
assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c
View File

@ -4,10 +4,10 @@ u64 gGameplayKeepTex_46A40[TEX_LEN(u64, gGameplayKeepTex_46A40_WIDTH, gGameplayK
#include "assets/objects/gameplay_keep/gGameplayKeepTex_46A40.rgba16.inc.c"
};
u64 gGameplayKeepTex_46A60[TEX_LEN(u64, gGameplayKeepTex_46A60_WIDTH, gGameplayKeepTex_46A60_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gGameplayKeepTex_46A60.rgba16.inc.c"
u64 gUnusedHeartContainerIconTex[TEX_LEN(u64, gUnusedHeartContainerIconTex_WIDTH, gUnusedHeartContainerIconTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gUnusedHeartContainerIconTex.rgba16.inc.c"
};
u64 gGameplayKeepTex_47260[TEX_LEN(u64, gGameplayKeepTex_47260_WIDTH, gGameplayKeepTex_47260_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gGameplayKeepTex_47260.rgba16.inc.c"
u64 gUnusedTreeBarkTex[TEX_LEN(u64, gUnusedTreeBarkTex_WIDTH, gUnusedTreeBarkTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gUnusedTreeBarkTex.rgba16.inc.c"
};

12
assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.h
View File

@ -7,11 +7,11 @@
#define gGameplayKeepTex_46A40_WIDTH 4
#define gGameplayKeepTex_46A40_HEIGHT 4
extern u64 gGameplayKeepTex_46A40[TEX_LEN(u64, gGameplayKeepTex_46A40_WIDTH, gGameplayKeepTex_46A40_HEIGHT, 16)];
#define gGameplayKeepTex_46A60_WIDTH 32
#define gGameplayKeepTex_46A60_HEIGHT 32
extern u64 gGameplayKeepTex_46A60[TEX_LEN(u64, gGameplayKeepTex_46A60_WIDTH, gGameplayKeepTex_46A60_HEIGHT, 16)];
#define gGameplayKeepTex_47260_WIDTH 32
#define gGameplayKeepTex_47260_HEIGHT 32
extern u64 gGameplayKeepTex_47260[TEX_LEN(u64, gGameplayKeepTex_47260_WIDTH, gGameplayKeepTex_47260_HEIGHT, 16)];
#define gUnusedHeartContainerIconTex_WIDTH 32
#define gUnusedHeartContainerIconTex_HEIGHT 32
extern u64 gUnusedHeartContainerIconTex[TEX_LEN(u64, gUnusedHeartContainerIconTex_WIDTH, gUnusedHeartContainerIconTex_HEIGHT, 16)];
#define gUnusedTreeBarkTex_WIDTH 32
#define gUnusedTreeBarkTex_HEIGHT 32
extern u64 gUnusedTreeBarkTex[TEX_LEN(u64, gUnusedTreeBarkTex_WIDTH, gUnusedTreeBarkTex_HEIGHT, 16)];
#endif

12
assets/objects/gameplay_keep/item_drops_ntsc.c
View File

@ -1,13 +1,13 @@
#include "item_drops_ntsc.h"
u64 gGameplayKeepTex_45220[TEX_LEN(u64, gGameplayKeepTex_45220_WIDTH, gGameplayKeepTex_45220_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gGameplayKeepTex_45220.rgba16.inc.c"
u64 gUnusedHeartIconTex[TEX_LEN(u64, gUnusedHeartIconTex_WIDTH, gUnusedHeartIconTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gUnusedHeartIconTex.rgba16.inc.c"
};
u64 gGameplayKeepTex_45A20[TEX_LEN(u64, gGameplayKeepTex_45A20_WIDTH, gGameplayKeepTex_45A20_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gGameplayKeepTex_45A20.rgba16.inc.c"
u64 gUnusedBombIconTex[TEX_LEN(u64, gUnusedBombIconTex_WIDTH, gUnusedBombIconTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gUnusedBombIconTex.rgba16.inc.c"
};
u64 gGameplayKeepTex_46220[TEX_LEN(u64, gGameplayKeepTex_46220_WIDTH, gGameplayKeepTex_46220_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gGameplayKeepTex_46220.rgba16.inc.c"
u64 gUnusedArrowIconTex[TEX_LEN(u64, gUnusedArrowIconTex_WIDTH, gUnusedArrowIconTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gUnusedArrowIconTex.rgba16.inc.c"
};

18
assets/objects/gameplay_keep/item_drops_ntsc.h
View File

@ -6,15 +6,15 @@
#include "region.h"
#if OOT_REGION != REGION_EU
#define gGameplayKeepTex_45220_WIDTH 32
#define gGameplayKeepTex_45220_HEIGHT 32
extern u64 gGameplayKeepTex_45220[TEX_LEN(u64, gGameplayKeepTex_45220_WIDTH, gGameplayKeepTex_45220_HEIGHT, 16)];
#define gGameplayKeepTex_45A20_WIDTH 32
#define gGameplayKeepTex_45A20_HEIGHT 32
extern u64 gGameplayKeepTex_45A20[TEX_LEN(u64, gGameplayKeepTex_45A20_WIDTH, gGameplayKeepTex_45A20_HEIGHT, 16)];
#define gGameplayKeepTex_46220_WIDTH 32
#define gGameplayKeepTex_46220_HEIGHT 32
extern u64 gGameplayKeepTex_46220[TEX_LEN(u64, gGameplayKeepTex_46220_WIDTH, gGameplayKeepTex_46220_HEIGHT, 16)];
#define gUnusedHeartIconTex_WIDTH 32
#define gUnusedHeartIconTex_HEIGHT 32
extern u64 gUnusedHeartIconTex[TEX_LEN(u64, gUnusedHeartIconTex_WIDTH, gUnusedHeartIconTex_HEIGHT, 16)];
#define gUnusedBombIconTex_WIDTH 32
#define gUnusedBombIconTex_HEIGHT 32
extern u64 gUnusedBombIconTex[TEX_LEN(u64, gUnusedBombIconTex_WIDTH, gUnusedBombIconTex_HEIGHT, 16)];
#define gUnusedArrowIconTex_WIDTH 32
#define gUnusedArrowIconTex_HEIGHT 32
extern u64 gUnusedArrowIconTex[TEX_LEN(u64, gUnusedArrowIconTex_WIDTH, gUnusedArrowIconTex_HEIGHT, 16)];
#endif
#endif

30
assets/xml/objects/gameplay_keep.xml
View File

@ -1129,18 +1129,18 @@
<Vtx/>
</Array>
<DList Name="gGameplayKeepDL_39890" Offset="0x39890"/>
<Array Name="gameplay_keep_Vtx_039970" Count="4" Offset="0x39970">
<Array Name="gUnusedBombIconVtx" Count="4" Offset="0x39970">
<Vtx/>
</Array>
<DList Name="gGameplayKeepDL_399B0" Offset="0x399B0"/>
<Array Name="gameplay_keep_Vtx_039A40" Count="4" Offset="0x39A40">
<DList Name="gUnusedBombIconDL" Offset="0x399B0"/>
<Array Name="gUnusedHeartIconVtx" Count="4" Offset="0x39A40">
<Vtx/>
</Array>
<DList Name="gGameplayKeepDL_39A80" Offset="0x39A80"/>
<Array Name="gameplay_keep_Vtx_039B10" Count="4" Offset="0x39B10">
<DList Name="gUnusedHeartIconDL" Offset="0x39A80"/>
<Array Name="gUnusedArrowIconVtx" Count="4" Offset="0x39B10">
<Vtx/>
</Array>
<DList Name="gGameplayKeepDL_39B50" Offset="0x39B50"/>
<DList Name="gUnusedArrowIconDL" Offset="0x39B50"/>
<Collision Name="gLargerCubeCol" Offset="0x39CE0"/> <!-- unused in game -->
<Array Name="gLiftableRockVtx" Count="24" Offset="0x39D10">
@ -1205,10 +1205,10 @@
</Array>
<DList Name="gGameplayKeepDL_3CFD0" Offset="0x3CFD0"/>
<DList Name="gGameplayKeepDL_3D108" Offset="0x3D108"/>
<Array Name="gameplay_keep_Vtx_03D220" Count="4" Offset="0x3D220">
<Array Name="gUnusedHeartContainerIconVtx" Count="4" Offset="0x3D220">
<Vtx/>
</Array>
<DList Name="gGameplayKeepDL_3D260" Offset="0x3D260"/>
<DList Name="gUnusedHeartContainerIconDL" Offset="0x3D260"/>
<Array Name="gSignRectangularVtx" Count="39" Offset="0x3D2F0">
<Vtx/>
@ -1223,12 +1223,12 @@
<Texture Name="gDropArrows3Tex" Format="rgba16" Width="32" Height="32" Offset="0x3ED80"/>
<Texture Name="gDropBombTex" Format="rgba16" Width="32" Height="32" Offset="0x3F580"/>
<Texture Name="gGameplayKeepTex_3FD80" Format="rgba16" Width="32" Height="32" Offset="0x3FD80"/>
<Texture Name="gUnusedBombchuIconTex" Format="rgba16" Width="32" Height="32" Offset="0x3FD80"/>
<Texture Name="gGameplayKeepTex_40580" Format="rgba16" Width="32" Height="32" Offset="0x40580"/>
<Texture Name="gDropRecoveryHeartTex" Format="rgba16" Width="32" Height="32" Offset="0x40D80"/>
<Texture Name="gGameplayKeepTex_41580" Format="rgba16" Width="32" Height="32" Offset="0x41580"/>
<Texture Name="gUnusedHeartPieceIconTex" Format="rgba16" Width="32" Height="32" Offset="0x41580"/>
<DList Name="gItemDropDL" Offset="0x41D80"/>
<Array Name="gItemDropVtx" Count="4" Offset="0x41E08">
@ -1251,15 +1251,15 @@
</Array>
<DList Name="gRupeeDL" Offset="0x45150"/>
<Texture Name="gGameplayKeepTex_45220" Format="rgba16" Width="32" Height="32" Offset="0x45220"/>
<Texture Name="gGameplayKeepTex_45A20" Format="rgba16" Width="32" Height="32" Offset="0x45A20"/>
<Texture Name="gGameplayKeepTex_46220" Format="rgba16" Width="32" Height="32" Offset="0x46220"/>
<Texture Name="gUnusedHeartIconTex" Format="rgba16" Width="32" Height="32" Offset="0x45220"/>
<Texture Name="gUnusedBombIconTex" Format="rgba16" Width="32" Height="32" Offset="0x45A20"/>
<Texture Name="gUnusedArrowIconTex" Format="rgba16" Width="32" Height="32" Offset="0x46220"/>
<Texture Name="gRupeeLightRedTex" Format="rgba16" Width="4" Height="4" Offset="0x46A20"/>
<Texture Name="gGameplayKeepTex_46A40" Format="rgba16" Width="4" Height="4" Offset="0x46A40"/>
<Texture Name="gGameplayKeepTex_46A60" Format="rgba16" Width="32" Height="32" Offset="0x46A60"/>
<Texture Name="gGameplayKeepTex_47260" Format="rgba16" Width="32" Height="32" Offset="0x47260"/>
<Texture Name="gUnusedHeartContainerIconTex" Format="rgba16" Width="32" Height="32" Offset="0x46A60"/>
<Texture Name="gUnusedTreeBarkTex" Format="rgba16" Width="32" Height="32" Offset="0x47260"/>
<Texture Name="gUnknownStone1Tex" Format="rgba16" Width="32" Height="32" Offset="0x47A60"/>
<Texture Name="gUnknownStone2Tex" Format="rgba16" Width="32" Height="32" Offset="0x48260"/>