mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-27 07:07:09 +00:00
Code Issues Projects Releases Wiki Activity

Replace more constants with proper asset symbols (#1071)

Browse source
This commit is contained in:
Dragorn421 2021-12-07 20:10:44 +01:00 committed by GitHub
parent 70b858b724
commit 15d3796574
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 70 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
assets/xml/objects/object_bdoor.xml
View file

@ -1,10 +1,15 @@
<Root>
<ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="objects/gameplay_dangeon_keep/"/>
<File Name="object_bdoor" Segment="6">
<Blob Name="object_bdoor_Blob_000000" Size="0x1000" Offset="0x0"/>
<Texture Name="object_bdoor_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="64" Offset="0x0"/>
<DList Name="object_bdoor_DL_0010C0" Offset="0x10C0"/>
<DList Name="object_bdoor_DL_001400" Offset="0x1400"/>
<DList Name="object_bdoor_DL_001530" Offset="0x1530"/>
<Blob Name="object_bdoor_Blob_0015C0" Size="0x6000" Offset="0x15C0"/>
<Texture Name="object_bdoor_Tex_0015C0" OutName="tex_000015C0" Format="rgba16" Width="32" Height="64" Offset="0x15C0"/>
<Texture Name="object_bdoor_Tex_0025C0" OutName="tex_000025C0" Format="rgba16" Width="32" Height="64" Offset="0x25C0"/>
<Texture Name="object_bdoor_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
<Texture Name="object_bdoor_Tex_0045C0" OutName="tex_000045C0" Format="rgba16" Width="32" Height="64" Offset="0x45C0"/>
<Texture Name="object_bdoor_Tex_0055C0" OutName="tex_000055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
<Texture Name="object_bdoor_Tex_0065C0" OutName="tex_000065C0" Format="rgba16" Width="32" Height="64" Offset="0x65C0"/>
</File>
</Root>

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

@ -21,7 +21,9 @@
<Texture Name="object_bob_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
<Texture Name="object_bob_Tex_000388" OutName="tex_00000388" Format="ci8" Width="32" Height="32" Offset="0x388" TlutOffset="0x108"/>
<Texture Name="object_bob_Tex_000788" OutName="tex_00000788" Format="ci8" Width="8" Height="8" Offset="0x788" TlutOffset="0x108"/>
<Blob Name="object_bob_Blob_0007C8" Size="0x1800" Offset="0x7C8"/>
<Texture Name="object_bob_Tex_0007C8" OutName="tex_000007C8" Format="rgba16" Width="32" Height="32" Offset="0x7C8"/>
<Texture Name="object_bob_Tex_000FC8" OutName="tex_00000FC8" Format="rgba16" Width="32" Height="32" Offset="0xFC8"/>
<Texture Name="object_bob_Tex_0017C8" OutName="tex_000017C8" Format="rgba16" Width="32" Height="32" Offset="0x17C8"/>
<Texture Name="object_bob_Tex_001FC8" OutName="tex_00001FC8" Format="ci8" Width="16" Height="16" Offset="0x1FC8" TlutOffset="0x108"/>
<Texture Name="object_bob_Tex_0020C8" OutName="tex_000020C8" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x108"/>
<Texture Name="object_bob_Tex_0021C8" OutName="tex_000021C8" Format="ci8" Width="8" Height="8" Offset="0x21C8" TlutOffset="0x108"/>

5
assets/xml/objects/object_bxa.xml
View file

@ -5,8 +5,9 @@
<Texture Name="object_bxa_Tex_001440" OutName="tex_00001440" Format="rgba16" Width="32" Height="32" Offset="0x1440"/>
<DList Name="object_bxa_DL_001D80" Offset="0x1D80"/>
<DList Name="object_bxa_DL_0022F0" Offset="0x22F0"/>
<Blob Name="object_bxa_Blob_0024F0" Size="0x200" Offset="0x24F0"/>
<Texture Name="object_bxa_Tex_0024F0" OutName="tex_000024F0" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
<Texture Name="object_bxa_Tex_0026F0" OutName="tex_000026F0" Format="i8" Width="16" Height="16" Offset="0x26F0"/>
<Blob Name="object_bxa_Blob_0027F0" Size="0x400" Offset="0x27F0"/>
<Texture Name="object_bxa_Tex_0027F0" OutName="tex_000027F0" Format="rgba16" Width="16" Height="16" Offset="0x27F0"/>
<Texture Name="object_bxa_Tex_0029F0" OutName="tex_000029F0" Format="rgba16" Width="16" Height="16" Offset="0x29F0"/>
</File>
</Root>

3
assets/xml/objects/object_fr.xml
View file

@ -11,7 +11,8 @@
<Texture Name="object_fr_Tex_004BA0" OutName="tex_00004BA0" Format="rgba16" Width="16" Height="16" Offset="0x4BA0"/>
<Texture Name="object_fr_Tex_004DA0" OutName="tex_00004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0"/>
<Texture Name="object_fr_Tex_0055A0" OutName="tex_000055A0" Format="i8" Width="32" Height="32" Offset="0x55A0"/>
<Blob Name="object_fr_Blob_0059A0" Size="0x400" Offset="0x59A0"/>
<Texture Name="object_fr_Tex_0059A0" OutName="tex_000059A0" Format="rgba16" Width="16" Height="16" Offset="0x59A0"/>
<Texture Name="object_fr_Tex_005BA0" OutName="tex_00005BA0" Format="rgba16" Width="16" Height="16" Offset="0x5BA0"/>
<Texture Name="object_fr_Tex_005DA0" OutName="tex_00005DA0" Format="ia16" Width="32" Height="32" Offset="0x5DA0"/>
<Texture Name="object_fr_Tex_0065A0" OutName="tex_000065A0" Format="ia16" Width="32" Height="32" Offset="0x65A0"/>
<DList Name="object_fr_DL_008EC0" Offset="0x8EC0"/>

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

@ -108,6 +108,14 @@
<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"/>
<Collision Name="object_kingdodongo_Col_0264A8" Offset="0x264A8"/>
<Texture Name="object_kingdodongo_Tex_0264E0" OutName="tex_000264E0" Format="ia8" Width="64" Height="64" Offset="0x264E0"/>
<Texture Name="object_kingdodongo_Tex_0274E0" OutName="tex_000274E0" Format="ia8" Width="64" Height="64" Offset="0x274E0"/>
<Texture Name="object_kingdodongo_Tex_0284E0" OutName="tex_000284E0" Format="ia8" Width="64" Height="64" Offset="0x284E0"/>
<Texture Name="object_kingdodongo_Tex_0294E0" OutName="tex_000294E0" Format="ia8" Width="64" Height="64" Offset="0x294E0"/>
<Texture Name="object_kingdodongo_Tex_02A4E0" OutName="tex_0002A4E0" Format="ia8" Width="64" Height="64" Offset="0x2A4E0"/>
<Texture Name="object_kingdodongo_Tex_02B4E0" OutName="tex_0002B4E0" Format="ia8" Width="64" Height="64" Offset="0x2B4E0"/>
<Texture Name="object_kingdodongo_Tex_02C4E0" OutName="tex_0002C4E0" Format="ia8" Width="64" Height="64" Offset="0x2C4E0"/>
<Texture Name="object_kingdodongo_Tex_02D4E0" OutName="tex_0002D4E0" Format="ia8" Width="64" Height="64" Offset="0x2D4E0"/>
<Texture Name="object_kingdodongo_Tex_02E4E0" OutName="tex_0002E4E0" Format="i4" Width="32" Height="64" Offset="0x2E4E0"/>
<Texture Name="object_kingdodongo_Tex_02E8E0" OutName="tex_0002E8E0" Format="i4" Width="32" Height="64" Offset="0x2E8E0"/>
<Texture Name="object_kingdodongo_Tex_02ECE0" OutName="tex_0002ECE0" Format="i4" Width="32" Height="64" Offset="0x2ECE0"/>

36
src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
View file

@ -5,16 +5,24 @@
*/
#include "z_door_shutter.h"
#include "objects/object_demo_kekkai/object_demo_kekkai.h"
#include "overlays/actors/ovl_Boss_Goma/z_boss_goma.h"
#include "objects/object_ydan_objects/object_ydan_objects.h"
#include "objects/object_gnd/object_gnd.h"
#include "objects/object_goma/object_goma.h"
#include "objects/object_ydan_objects/object_ydan_objects.h"
#include "objects/object_ddan_objects/object_ddan_objects.h"
#include "objects/object_bdan_objects/object_bdan_objects.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_bdoor/object_bdoor.h"
#include "objects/object_hidan_objects/object_hidan_objects.h"
#include "objects/object_ganon_objects/object_ganon_objects.h"
#include "objects/object_jya_door/object_jya_door.h"
#include "objects/object_mizu_objects/object_mizu_objects.h"
#include "objects/object_bdan_objects/object_bdan_objects.h"
#include "objects/object_haka_door/object_haka_door.h"
#include "objects/object_ice_objects/object_ice_objects.h"
#include "objects/object_menkuri_objects/object_menkuri_objects.h"
#include "objects/object_demo_kekkai/object_demo_kekkai.h"
#include "objects/object_ouke_haka/object_ouke_haka.h"
#define FLAGS ACTOR_FLAG_4
@ -89,24 +97,24 @@ typedef struct {
static ShutterInfo sShutterInfo[] = {
{ gDTDungeonDoor1DL, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ gDTDungeonDoor2DL, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ 0x060000C0, 0x060001F0, 240, 14, 70, 15 },
{ gJabuDoorSection1DL, 0x06006460, 0, 110, 50, 15 },
{ gDodongoDoorDL, gDodongoBarsDL, 240, 14, 70, 15 },
{ gJabuDoorSection1DL, gJabuWebDoorDL, 0, 110, 50, 15 },
{ gPhantomGanonBarsDL, NULL, 130, 12, 50, 15 },
{ gGohmaDoorDL, NULL, 130, 12, 50, 15 },
{ gSpiritDoorDL, gJyaDoorMetalBarsDL, 240, 14, 50, 15 },
{ 0x060010C0, NULL, 130, 12, 50, 15 },
{ object_bdoor_DL_0010C0, NULL, 130, 12, 50, 15 },
{ gDungeonDoorDL, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ gFireTempleDoorFrontDL, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ gFireTempleDoorBackDL, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ 0x060000C0, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ object_ganon_objects_DL_0000C0, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ gObjectMizuObjectsDoorShutterDL_005D90, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ gObjectMizuObjectsDoorShutterDL_007000, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ 0x06002620, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ 0x06003890, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ 0x06001D10, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ 0x060010D0, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ object_haka_door_DL_002620, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ object_haka_door_DL_003890, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ object_ice_objects_DL_001D10, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ gGTGDoorDL, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ gGanonsCastleDoorDL, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ 0x060000C0, gDoorMetalBarsDL, 130, 12, 20, 15 },
{ object_ouke_haka_DL_0000C0, gDoorMetalBarsDL, 130, 12, 20, 15 },
};
static s8 D_80998224[] = {
@ -155,9 +163,9 @@ static Gfx* sJabuDoorDLists[] = {
gJabuDoorSection5DL, gJabuDoorSection4DL, gJabuDoorSection3DL, gJabuDoorSection2DL,
};
// boss door textures?
static void* D_809982D4[] = {
0x060065C0, 0x060035C0, 0x060055C0, 0x060045C0, 0x06000000, 0x060025C0, 0x060015C0,
object_bdoor_Tex_0065C0, object_bdoor_Tex_0035C0, object_bdoor_Tex_0055C0, object_bdoor_Tex_0045C0,
object_bdoor_Tex_000000, object_bdoor_Tex_0025C0, object_bdoor_Tex_0015C0,
};
void DoorShutter_SetupAction(DoorShutter* this, DoorShutterActionFunc actionFunc) {

6
src/overlays/actors/ovl_En_Ba/z_en_ba.c
View file

@ -465,7 +465,11 @@ void EnBa_Update(Actor* thisx, GlobalContext* globalCtx) {
}
}
static Gfx* D_809B8118[] = { 0x060024F0, 0x060027F0, 0x060029F0 };
static void* D_809B8118[] = {
object_bxa_Tex_0024F0,
object_bxa_Tex_0027F0,
object_bxa_Tex_0029F0,
};
void EnBa_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnBa* this = (EnBa*)thisx;

4
src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c
View file

@ -196,7 +196,9 @@ void EnBdfire_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnBdfire_DrawFire(EnBdfire* this, GlobalContext* globalCtx) {
static void* D_809BCB10[] = {
0x060264E0, 0x060274E0, 0x060284E0, 0x060294E0, 0x0602A4E0, 0x0602B4E0, 0x0602C4E0, 0x0602D4E0,
object_kingdodongo_Tex_0264E0, object_kingdodongo_Tex_0274E0, object_kingdodongo_Tex_0284E0,
object_kingdodongo_Tex_0294E0, object_kingdodongo_Tex_02A4E0, object_kingdodongo_Tex_02B4E0,
object_kingdodongo_Tex_02C4E0, object_kingdodongo_Tex_02D4E0,
};
s16 temp;
s32 pad;

6
src/overlays/actors/ovl_En_Bx/z_en_bx.c
View file

@ -195,7 +195,11 @@ void EnBx_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* D_809D2560[] = { 0x060024F0, 0x060027F0, 0x060029F0 };
static void* D_809D2560[] = {
object_bxa_Tex_0024F0,
object_bxa_Tex_0027F0,
object_bxa_Tex_0029F0,
};
EnBx* this = (EnBx*)thisx;
s32 pad;
Mtx* mtx = Graph_Alloc(globalCtx->state.gfxCtx, 4 * sizeof(Mtx));

3
src/overlays/actors/ovl_En_Door/z_en_door.c
View file

@ -9,6 +9,7 @@
#include "objects/gameplay_field_keep/gameplay_field_keep.h"
#include "objects/object_hidan_objects/object_hidan_objects.h"
#include "objects/object_mizu_objects/object_mizu_objects.h"
#include "objects/object_haka_door/object_haka_door.h"
#define FLAGS ACTOR_FLAG_4
@ -71,7 +72,7 @@ static Gfx* D_809FCEE4[5][2] = {
{ gDoorLeftDL, gDoorRightDL },
{ gFireTempleDoorWithHandleFrontDL, gFireTempleDoorWithHandleBackDL },
{ gWaterTempleDoorLeftDL, gWaterTempleDoorRightDL },
{ 0x060013B8, 0x06001420 },
{ object_haka_door_DL_0013B8, object_haka_door_DL_001420 },
{ gFieldDoor1DL, gFieldDoor2DL },
};

5
src/overlays/actors/ovl_En_Fr/z_en_fr.c
View file

@ -1057,7 +1057,10 @@ void EnFr_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
}
void EnFr_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* eyeTextures[] = { 0x060059A0, 0x06005BA0 };
static void* eyeTextures[] = {
object_fr_Tex_0059A0,
object_fr_Tex_005BA0,
};
s16 lightRadius;
EnFr* this = (EnFr*)thisx;
s16 frogIndex = this->actor.params - 1;

6
src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
View file

@ -276,9 +276,9 @@ void EnGe3_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
void EnGe3_Draw(Actor* thisx, GlobalContext* globalCtx2) {
static void* eyeTextures[] = {
0x06005FE8, // Half-open
0x060065A8, // Quarter-open
0x06006D28, // Closed
gGerudoRedEyeOpenTex,
gGerudoRedEyeHalfTex,
gGerudoRedEyeShutTex,
};
EnGe3* this = (EnGe3*)thisx;
GlobalContext* globalCtx = globalCtx2;

6
src/overlays/actors/ovl_En_Hy/z_en_hy.c
View file

@ -67,12 +67,12 @@ static ColliderCylinderInit sColCylInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
// NULL-terminated arrays of eye textures
static void* sEyeTexturesAOB[] = { 0x060005C8, 0x06000DC8, 0x060015C8, NULL };
static void* sEyeTexturesAOB[] = { gDogLadyEyeOpenTex, gDogLadyEyeHalfTex, gDogLadyEyeClosedTex, NULL };
static void* sEyeTexturesAHG7[] = { 0x0600057C, 0x0600067C, 0x0600077C, NULL };
static void* sEyeTexturesBBA[] = { 0x060004C8, NULL };
static void* sEyeTexturesBBA[] = { object_bba_Tex_0004C8, NULL };
static void* sEyeTexturesBJI13[] = { 0x060005FC, 0x060009FC, 0x06000DFC, NULL };
static void* sEyeTexturesBOJ2[] = { 0x060005FC, 0x060006FC, 0x060007FC, NULL };
static void* sEyeTexturesBOB[] = { 0x060007C8, 0x06000FC8, 0x060017C8, NULL };
static void* sEyeTexturesBOB[] = { object_bob_Tex_0007C8, object_bob_Tex_000FC8, object_bob_Tex_0017C8, NULL };
typedef struct {
/* 0x00 */ s16 objectId;