mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-04-07 15:16:31 +00:00
Code Issues Projects Releases Wiki Activity

Symbol cleanup 4 (#1050)

Browse source 
* Replace some hardcoded constants with proper asset symbols

* Remove Blob which turned out to be a texture
This commit is contained in:
Dragorn421 2021-12-02 01:21:32 +01:00 • committed by GitHub
parent 4a3809d4d2
commit ff49ace524
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 98 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/xml/objects/object_bwall.xml
View file

@ -1,7 +1,7 @@
<Root>
<File Name="object_bwall" Segment="6">
<DList Name="object_bwall_DL_000040" Offset="0x40"/>
<Blob Name="object_bwall_Blob_0000D0" Size="0x80" Offset="0xD0"/>
<Collision Name="object_bwall_Col_000118" Offset="0x118"/>
<Texture Name="object_bwall_Tex_000150" OutName="tex_00000150" Format="rgba16" Width="32" Height="64" Offset="0x150"/>
</File>
</Root>

12
assets/xml/objects/object_haka_objects.xml
View file

@ -7,17 +7,17 @@
<DList Name="object_haka_objects_DL_002ED0" Offset="0x2ED0"/>
<DList Name="object_haka_objects_DL_003CF0" Offset="0x3CF0"/>
<DList Name="object_haka_objects_DL_0040F0" Offset="0x40F0"/>
<Blob Name="object_haka_objects_Blob_0042A8" Size="0xB8" Offset="0x42A8"/>
<Collision Name="object_haka_objects_Col_004330" Offset="0x4330"/>
<DList Name="object_haka_objects_DL_0043B0" Offset="0x43B0"/>
<Blob Name="object_haka_objects_Blob_004448" Size="0xB8" Offset="0x4448"/>
<Collision Name="object_haka_objects_Col_0044D0" Offset="0x44D0"/>
<DList Name="object_haka_objects_DL_0045A0" Offset="0x45A0"/>
<Blob Name="object_haka_objects_Blob_004688" Size="0x128" Offset="0x4688"/>
<Collision Name="object_haka_objects_Col_004780" Offset="0x4780"/>
<DList Name="object_haka_objects_DL_0047F0" Offset="0x47F0"/>
<Blob Name="object_haka_objects_Blob_0048C0" Size="0xB0" Offset="0x48C0"/>
<Collision Name="object_haka_objects_Col_004940" Offset="0x4940"/>
<DList Name="object_haka_objects_DL_0049B0" Offset="0x49B0"/>
<Blob Name="object_haka_objects_Blob_004A80" Size="0xB0" Offset="0x4A80"/>
<Collision Name="object_haka_objects_Col_004B00" Offset="0x4B00"/>
<DList Name="object_haka_objects_DL_004B70" Offset="0x4B70"/>
<Blob Name="object_haka_objects_Blob_004C40" Size="0xB0" Offset="0x4C40"/>
<Collision Name="object_haka_objects_Col_004CC0" Offset="0x4CC0"/>
<DList Name="object_haka_objects_DL_005000" Offset="0x5000"/>
<Collision Name="object_haka_objects_Col_005334" Offset="0x5334"/>
<DList Name="object_haka_objects_DL_005A70" Offset="0x5A70"/>

4
assets/xml/objects/object_kingdodongo.xml
View file

@ -104,9 +104,9 @@
<DList Name="object_kingdodongo_DL_01D950" Offset="0x1D950"/><!--Blob Name="object_kingdodongo_Blob_01D9F0" Size="0x8000" Offset="0x1D9F0" /-->
<DList Name="object_kingdodongo_DL_0259F0" Offset="0x259F0"/>
<DList Name="object_kingdodongo_DL_025A90" Offset="0x25A90"/>
<Blob Name="object_kingdodongo_Blob_025B30" Size="0x60" Offset="0x25B30"/>
<Collision Name="object_kingdodongo_Col_025B64" Offset="0x25B64"/>
<DList Name="object_kingdodongo_DL_025BD0" Offset="0x25BD0"/>
<Texture Name="object_kingdodongo_Tex_025C58" OutName="tex_00025C58" Format="rgba16" Width="32" Height="32" Offset="0x25C58"/>
<Blob Name="object_kingdodongo_Blob_026458" Size="0xA888" Offset="0x26458"/>
<Collision Name="object_kingdodongo_Col_0264A8" Offset="0x264A8"/>
</File>
</Root>

13
assets/xml/objects/object_spot02_objects.xml
View file

@ -5,7 +5,6 @@
<DList Name="object_spot02_objects_DL_0013F0" Offset="0x13F0"/>
<Blob Name="object_spot02_objects_Blob_0015D8" Size="0x0008" Offset="0x15D8"/>
<DList Name="object_spot02_objects_DL_009620" Offset="0x9620"/>
<Blob Name="object_spot02_objects_Blob_0096A8" Size="0x9008" Offset="0x96A8"/>
<DList Name="object_spot02_objects_DL_0126F0" Offset="0x126F0"/>
<DList Name="object_spot02_objects_DL_0127C0" Offset="0x127C0"/>
<Collision Name="object_spot02_objects_Col_0128D8" Offset="0x128D8"/>
@ -29,5 +28,17 @@
<Texture Name="gEffSunGraveSpark6Tex" OutName="eff_sun_grave_spark_6" Format="i8" Width="64" Height="64" Offset="0x65E0"/>
<Texture Name="gEffSunGraveSpark7Tex" OutName="eff_sun_grave_spark_7" Format="i8" Width="64" Height="64" Offset="0x75E0"/>
<Texture Name="gEffSunGraveSpark8Tex" OutName="eff_sun_grave_spark_8" Format="i8" Width="64" Height="64" Offset="0x85E0"/>
<Texture Name="object_spot02_objects_Tex_0096B0" OutName="tex_000096B0" Format="i8" Width="32" Height="96" Offset="0x96B0"/>
<Texture Name="object_spot02_objects_Tex_00A2B0" OutName="tex_0000A2B0" Format="i8" Width="32" Height="96" Offset="0xA2B0"/>
<Texture Name="object_spot02_objects_Tex_00AEB0" OutName="tex_0000AEB0" Format="i8" Width="32" Height="96" Offset="0xAEB0"/>
<Texture Name="object_spot02_objects_Tex_00BAB0" OutName="tex_0000BAB0" Format="i8" Width="32" Height="96" Offset="0xBAB0"/>
<Texture Name="object_spot02_objects_Tex_00C6B0" OutName="tex_0000C6B0" Format="i8" Width="32" Height="96" Offset="0xC6B0"/>
<Texture Name="object_spot02_objects_Tex_00D2B0" OutName="tex_0000D2B0" Format="i8" Width="32" Height="96" Offset="0xD2B0"/>
<Texture Name="object_spot02_objects_Tex_00DEB0" OutName="tex_0000DEB0" Format="i8" Width="32" Height="96" Offset="0xDEB0"/>
<Texture Name="object_spot02_objects_Tex_00EAB0" OutName="tex_0000EAB0" Format="i8" Width="32" Height="96" Offset="0xEAB0"/>
<Texture Name="object_spot02_objects_Tex_00F6B0" OutName="tex_0000F6B0" Format="i8" Width="32" Height="96" Offset="0xF6B0"/>
<Texture Name="object_spot02_objects_Tex_0102B0" OutName="tex_000102B0" Format="i8" Width="32" Height="96" Offset="0x102B0"/>
<Texture Name="object_spot02_objects_Tex_010EB0" OutName="tex_00010EB0" Format="i8" Width="32" Height="96" Offset="0x10EB0"/>
<Texture Name="object_spot02_objects_Tex_011AB0" OutName="tex_00011AB0" Format="i8" Width="32" Height="96" Offset="0x11AB0"/>
</File>
</Root>

12
assets/xml/objects/object_tw.xml
View file

@ -50,7 +50,7 @@
<Texture Name="object_tw_Tex_009E38" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
<Texture Name="object_tw_Tex_00A038" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
<Texture Name="object_tw_Tex_00A238" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
<!--Blob Name="object_tw_Blob_00A438" Size="0x400" Offset="0xA438" /-->
<Texture Name="object_tw_Tex_00A438" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
<Texture Name="object_tw_Tex_00A838" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838" TlutOffset="0x9490"/>
<Texture Name="object_tw_Tex_00A8B8" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8" TlutOffset="0x9490"/>
<Texture Name="object_tw_Tex_00A8F8" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
@ -62,7 +62,8 @@
<Texture Name="object_tw_Tex_00B138" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
<Texture Name="object_tw_Tex_00B1B8" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8" TlutOffset="0x9490"/>
<Texture Name="object_tw_Tex_00B1F8" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8" TlutOffset="0x9490"/>
<!--Blob Name="object_tw_Blob_00B238" Size="0x800" Offset="0xB238" /-->
<Texture Name="object_tw_Tex_00B238" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
<Texture Name="object_tw_Tex_00B638" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
<Texture Name="object_tw_Tex_00BA38" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
<Texture Name="object_tw_Tex_00BE38" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
<Texture Name="object_tw_Tex_00C238" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
@ -206,6 +207,7 @@
<Limb Name="object_tw_Limb_01F808" LimbType="Standard" Offset="0x1F808"/>
<Limb Name="object_tw_Limb_01F814" LimbType="Standard" Offset="0x1F814"/>
<Skeleton Name="object_tw_Skel_01F888" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
<Texture Name="object_tw_Tex_02A070" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
<Animation Name="object_tw_Anim_0216DC" Offset="0x216DC"/>
<Animation Name="object_tw_Anim_022700" Offset="0x22700"/>
<Animation Name="object_tw_Anim_023750" Offset="0x23750"/>
@ -245,11 +247,11 @@
<DList Name="object_tw_DL_0299F8" Offset="0x299F8"/>
<DList Name="object_tw_DL_029B10" Offset="0x29B10"/>
<Texture Name="object_tw_TLUT_029E50" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
<Texture Name="object_tw_TLUT_02A020" OutName="tlut_02A020" Format="rgba16" Width="16" Height="16" Offset="0x2A020"/>
<!--Blob Name="object_tw_Blob_02A220" Size="0x650" Offset="0x2A220" /-->
<Texture Name="object_tw_TLUT_02A020" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
<Texture Name="object_tw_Tex_02A470" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
<Texture Name="object_tw_Tex_02A870" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870" TlutOffset="0x29e50"/>
<Texture Name="object_tw_Tex_02A970" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
<!--Blob Name="object_tw_Blob_02A9B0" Size="0x400" Offset="0x2A9B0" /-->
<Texture Name="object_tw_Tex_02A9B0" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
<Texture Name="object_tw_Tex_02ADB0" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
<Texture Name="object_tw_Tex_02ADF0" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0" TlutOffset="0x2A020"/>
<Texture Name="object_tw_Tex_02AE30" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30" TlutOffset="0x29e50"/>

3
src/code/z_draw.c
View file

@ -76,6 +76,7 @@
#include "objects/object_gi_dekupouch/object_gi_dekupouch.h"
#include "objects/object_gi_rupy/object_gi_rupy.h"
#include "objects/object_gi_sword_1/object_gi_sword_1.h"
#include "objects/object_st/object_st.h"
// "Get Item" Model Draw Functions
void GetItem_DrawMaskOrBombchu(GlobalContext* globalCtx, s16 drawId);
@ -365,7 +366,7 @@ DrawItemTableEntry sDrawItemTable[] = {
// kokiri sword, OBJECT_GI_SWORD_1
{ GetItem_DrawOpa0, { gGiKokiriSwordDL } },
// gold skulltula token, OBJECT_ST
{ GetItem_DrawSkullToken, { 0x06004DB0, 0x06004EB8 } }, // TODO symbols from this object
{ GetItem_DrawSkullToken, { object_st_DL_004DB0, object_st_DL_004EB8 } },
};
/**

10
src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
View file

@ -6,6 +6,8 @@
#include "z_bg_breakwall.h"
#include "scenes/dungeons/ddan/ddan_scene.h"
#include "objects/object_bwall/object_bwall.h"
#include "objects/object_kingdodongo/object_kingdodongo.h"
#define FLAGS 0x00000010
@ -59,10 +61,10 @@ static ColliderQuadInit sQuadInit = {
};
static BombableWallInfo sBombableWallInfo[] = {
{ 0x06000118, 0x06000040, 0 },
{ 0x06000118, 0x06000040, 0 },
{ 0x060264A8, 0x06025BD0, 1 },
{ 0x06025B64, NULL, -1 },
{ &object_bwall_Col_000118, object_bwall_DL_000040, 0 },
{ &object_bwall_Col_000118, object_bwall_DL_000040, 0 },
{ &object_kingdodongo_Col_0264A8, object_kingdodongo_DL_025BD0, 1 },
{ &object_kingdodongo_Col_025B64, NULL, -1 },
};
static InitChainEntry sInitChain[] = {

7
src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
View file

@ -338,7 +338,12 @@ void BgHakaGate_DrawFlame(BgHakaGate* this, GlobalContext* globalCtx) {
}
void BgHakaGate_Draw(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* displayLists[] = { 0x06012270, 0x06010A10, 0x0600A860, 0x0600F1B0 };
static Gfx* displayLists[] = {
object_haka_objects_DL_012270,
object_haka_objects_DL_010A10,
object_haka_objects_DL_00A860,
object_haka_objects_DL_00F1B0,
};
BgHakaGate* this = THIS;
MtxF currentMtxF;

34
src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c
View file

@ -6,6 +6,7 @@
#include "z_bg_haka_megane.h"
#include "objects/object_hakach_objects/object_hakach_objects.h"
#include "objects/object_haka_objects/object_haka_objects.h"
#define FLAGS 0x000000B0
@ -37,24 +38,27 @@ static InitChainEntry sInitChain[] = {
};
static CollisionHeader* sCollisionHeaders[] = {
&gBotw1Col, &gBotw2Col, NULL, 0x06004330, 0x060044D0, NULL, 0x06004780,
0x06004940, NULL, 0x06004B00, NULL, 0x06004CC0, NULL,
&gBotw1Col,
&gBotw2Col,
NULL,
&object_haka_objects_Col_004330,
&object_haka_objects_Col_0044D0,
NULL,
&object_haka_objects_Col_004780,
&object_haka_objects_Col_004940,
NULL,
&object_haka_objects_Col_004B00,
NULL,
&object_haka_objects_Col_004CC0,
NULL,
};
static Gfx* sDLists[] = {
gBotwFakeWallsAndFloorsDL,
gBotwThreeFakeFloorsDL,
gBotwHoleTrap2DL,
0x060040F0,
0x060043B0,
0x06001120,
0x060045A0,
0x060047F0,
0x060018F0,
0x060049B0,
0x06003CF0,
0x06004B70,
0x06002ED0,
gBotwFakeWallsAndFloorsDL, gBotwThreeFakeFloorsDL, gBotwHoleTrap2DL,
object_haka_objects_DL_0040F0, object_haka_objects_DL_0043B0, object_haka_objects_DL_001120,
object_haka_objects_DL_0045A0, object_haka_objects_DL_0047F0, object_haka_objects_DL_0018F0,
object_haka_objects_DL_0049B0, object_haka_objects_DL_003CF0, object_haka_objects_DL_004B70,
object_haka_objects_DL_002ED0,
};
void BgHakaMegane_Init(Actor* thisx, GlobalContext* globalCtx) {

3
src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
View file

@ -518,7 +518,8 @@ void func_80880D68(BgHakaTrap* this) {
void BgHakaTrap_Draw(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* sDLists[5] = {
0x06007610, 0x06009860, 0x06007EF0, 0x06008A20, 0x060072C0,
object_haka_objects_DL_007610, object_haka_objects_DL_009860, object_haka_objects_DL_007EF0,
object_haka_objects_DL_008A20, object_haka_objects_DL_0072C0,
};
static Color_RGBA8 D_8088103C = { 0, 0, 0, 0 };
BgHakaTrap* this = THIS;

7
src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c
View file

@ -402,7 +402,12 @@ void BgHakaZou_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaZou_Draw(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* dLists[] = { 0x060064E0, 0x06005CE0, gBotwBombSpotDL, 0x06005CE0 };
static Gfx* dLists[] = {
object_haka_objects_DL_0064E0,
object_haka_objects_DL_005CE0,
gBotwBombSpotDL,
object_haka_objects_DL_005CE0,
};
Gfx_DrawDListOpa(globalCtx, dLists[thisx->params]);
}

6
src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c
View file

@ -204,7 +204,11 @@ void BgJyaHaheniron_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaHaheniron_Draw(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* dLists[] = { 0x06000880, 0x06000AE0, 0x06000600 };
static Gfx* dLists[] = {
gObjectJyaIronDL_000880,
gObjectJyaIronDL_000AE0,
gObjectJyaIronDL_000600,
};
s32 pad;
BgJyaHaheniron* this = THIS;

8
src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
View file

@ -48,10 +48,10 @@ static InitChainEntry sInitChain[] = {
};
static Gfx* sDLists[] = {
0x060024E0,
0x06001980,
0x060020F0,
0x06002B70,
object_mori_hineri1_DL_0024E0,
object_mori_hineri1a_DL_001980,
object_mori_hineri2_DL_0020F0,
object_mori_hineri2a_DL_002B70,
};
void BgMoriHineri_Init(Actor* thisx, GlobalContext* globalCtx) {

5
src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
View file

@ -39,7 +39,10 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
static Gfx* D_808AC510[] = { 0x06001EB0, 0x06002780, 0x06003078, 0x06001228, 0x06001528 };
static Gfx* D_808AC510[] = {
gKakarikoPotionShopSignDL, gKakarikoShootingGallerySignDL, gKakarikoBazaarSignDL,
gKakarikoConstructionSiteDL, gKakarikoShootingGalleryDL,
};
void BgSpot01Objects2_Init(Actor* thisx, GlobalContext* globalCtx) {
BgSpot01Objects2* this = THIS;

12
src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
View file

@ -27,8 +27,10 @@ void func_808ACC34(BgSpot02Objects* this, GlobalContext* globalCtx);
void func_808AD3D4(BgSpot02Objects* this, GlobalContext* globalCtx);
static void* D_808AD850[] = {
0x060096B0, 0x0600A2B0, 0x0600AEB0, 0x0600BAB0, 0x0600C6B0, 0x0600D2B0,
0x0600DEB0, 0x0600EAB0, 0x0600F6B0, 0x060102B0, 0x06010EB0, 0x06011AB0,
object_spot02_objects_Tex_0096B0, object_spot02_objects_Tex_00A2B0, object_spot02_objects_Tex_00AEB0,
object_spot02_objects_Tex_00BAB0, object_spot02_objects_Tex_00C6B0, object_spot02_objects_Tex_00D2B0,
object_spot02_objects_Tex_00DEB0, object_spot02_objects_Tex_00EAB0, object_spot02_objects_Tex_00F6B0,
object_spot02_objects_Tex_0102B0, object_spot02_objects_Tex_010EB0, object_spot02_objects_Tex_011AB0,
};
const ActorInit Bg_Spot02_Objects_InitVars = {
@ -190,7 +192,11 @@ void BgSpot02Objects_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgSpot02Objects_Draw(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* dLists[] = { 0x06012A50, 0x060127C0, 0x060130B0 };
static Gfx* dLists[] = {
object_spot02_objects_DL_012A50,
object_spot02_objects_DL_0127C0,
object_spot02_objects_DL_0130B0,
};
Gfx_DrawDListOpa(globalCtx, dLists[thisx->params]);
}

14
src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
View file

@ -3482,9 +3482,9 @@ void func_80943028(Actor* thisx, GlobalContext* globalCtx) {
}
static void* sEyeTextures[] = {
0x0600A438,
0x0600B238,
0x0600B638,
object_tw_Tex_00A438,
object_tw_Tex_00B238,
object_tw_Tex_00B638,
};
void BossTw_Draw(Actor* thisx, GlobalContext* globalCtx2) {
@ -3568,10 +3568,10 @@ void BossTw_Draw(Actor* thisx, GlobalContext* globalCtx2) {
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7123);
}
Gfx* D_8094A9B0[] = {
0x0602A9B0,
0x0602A070,
0x0602A470,
void* D_8094A9B0[] = {
object_tw_Tex_02A9B0,
object_tw_Tex_02A070,
object_tw_Tex_02A470,
};
s32 BossTw_TwinrovaOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,