From 5ed7c3999bb3e9a87fbbe1ed3f679c314648ddd5 Mon Sep 17 00:00:00 2001 From: Sirius902 <3645979-Sirius902@users.noreply.gitlab.com> Date: Sat, 14 Nov 2020 15:27:16 -0800 Subject: [PATCH] Cleanup more data --- .../ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c | 33 ++++++------------- .../z_bg_ganon_otyuka_gfx.c | 15 +++++---- 2 files changed, 18 insertions(+), 30 deletions(-) diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index 0207f69cb4..87f208014e 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -31,8 +31,7 @@ const ActorInit Bg_Ganon_Otyuka_InitVars = { (ActorFunc)BgGanonOtyuka_Draw, }; -// sInitChain -InitChainEntry D_80876A60[] = { +static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; @@ -67,19 +66,16 @@ UNK_TYPE D_80876AD0[] = { #include "z_bg_ganon_otyuka_gfx.c" -// cameraDataList -CamData D_80877DA8[] = { { 0, 0, 0 } }; +static CamData gCameraDataList[] = { { 0, 0, 0 } }; -// surfaceTypeList -UNK_TYPE D_80877DB0[] = { +static UNK_TYPE gSurfaceTypeList[] = { 0x00000000, 0x000007C0, 0x00000000, 0x000007C2, }; -// polyList -CollisionPoly D_80877DC0[] = { +static CollisionPoly gPolyList[] = { { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02 }, { 32767, 0, 0 }, -60 }, { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x03 }, { 32767, 0, 0 }, -60 }, { { 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x04 }, { 0, 0, -32767 }, -60 }, @@ -92,23 +88,14 @@ CollisionPoly D_80877DC0[] = { { { 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x07 }, { 0, 32767, 0 }, 0 }, }; -// vtxList -Vec3s D_80877E60[] = { +static Vec3s gVtxList[] = { { 60, 0, 60 }, { 60, -60, 60 }, { 60, -60, -60 }, { 60, 0, -60 }, { -60, -60, -60 }, { -60, 0, -60 }, { -60, -60, 60 }, { -60, 0, 60 }, }; -CollisionHeader D_80877E90 = { - { -60, -60, -60 }, - { 60, 0, 60 }, - ARRAY_COUNT(D_80877E60), - D_80877E60, - ARRAY_COUNT(D_80877DC0), - D_80877DC0, - D_80877DB0, - D_80877DA8, - 0, - NULL, +static CollisionHeader gColHeader = { + { -60, -60, -60 }, { 60, 0, 60 }, ARRAY_COUNT(gVtxList), gVtxList, ARRAY_COUNT(gPolyList), + gPolyList, gSurfaceTypeList, gCameraDataList, 0, NULL, }; void BgGanonOtyuka_Init(Actor* thisx, GlobalContext* globalCtx) { @@ -116,9 +103,9 @@ void BgGanonOtyuka_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; CollisionHeader* colHeader = NULL; - Actor_ProcessInitChain(thisx, &D_80876A60); + Actor_ProcessInitChain(thisx, &sInitChain); DynaPolyInfo_SetActorMove(&this->dyna, 0); - DynaPolyInfo_Alloc(&D_80877E90, &colHeader); + DynaPolyInfo_Alloc(&gColHeader, &colHeader); this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); if (thisx->params != 0x23) { thisx->draw = NULL; diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka_gfx.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka_gfx.c index 04e50edb59..88646789b5 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka_gfx.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka_gfx.c @@ -2,7 +2,7 @@ extern Gfx D_08000000[]; -UNK_TYPE D_80876AE0[] = { +static UNK_TYPE D_80876AE0[] = { 0x19033187, 0x39C74207, 0x4A495247, 0x5A494A09, 0x498749C5, 0x5A476247, 0x62076287, 0x734F8393, 0x6A8B6A09, 0x5A495207, 0x49C54A89, 0x4A895289, 0x5AC95A89, 0x5A4B5A8B, 0x5A896249, 0x52095207, 0x19033185, 0x420949C7, 0x52095207, 0x5A075A45, 0x41C749C5, 0x62075207, 0x62896A49, 0x6B4F7B51, 0x62C75A49, 0x52095247, 0x4A475249, @@ -62,9 +62,10 @@ UNK_TYPE D_80876AE0[] = { 0x11072105, 0x19031943, 0x190518C5, 0x214518C5, 0x21432145, 0x11032103, 0x19051905, 0x19031903, }; -UNK_TYPE D_808772E0[] = { 0x00000000, 0x00000000 }; +// probably unused? +static UNK_TYPE D_808772E0[] = { 0x00000000, 0x00000000 }; -Vtx D_808772E8[] = { +static Vtx D_808772E8[] = { VTX(60, 0, 60, 2048, -1024, 0xFF, 0xFF, 0xFF, 0xFF), VTX(60, 0, -60, 0, -1024, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-60, 0, -60, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF), @@ -92,7 +93,7 @@ Gfx D_808773B0[] = { gsSPEndDisplayList(), }; -Vtx D_808773C8[] = { +static Vtx D_808773C8[] = { VTX(60, -60, 60, 2048, -1024, 0x32, 0x32, 0x32, 0xFF), VTX(60, -60, -60, 0, -1024, 0x32, 0x32, 0x32, 0xFF), VTX(-60, -60, -60, 0, 1024, 0x32, 0x32, 0x32, 0xFF), @@ -105,7 +106,7 @@ Gfx D_80877408[] = { gsSPEndDisplayList(), }; -Vtx D_80877420[] = { +static Vtx D_80877420[] = { VTX(-60, 0, 0, 2048, -1024, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-60, -60, 0, 2048, 1024, 0x32, 0x32, 0x32, 0xFF), VTX(60, -60, 0, 0, 1024, 0x32, 0x32, 0x32, 0xFF), @@ -118,7 +119,7 @@ Gfx D_80877460[] = { gsSPEndDisplayList(), }; -UNK_TYPE D_80877478[] = { +static UNK_TYPE D_80877478[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000102, 0x01000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000204, 0x02000101, 0x00000000, 0x00000000, 0x00010101, 0x00000001, 0x00000001, @@ -178,7 +179,7 @@ UNK_TYPE D_80877478[] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, }; -Vtx D_80877C78[] = { +static Vtx D_80877C78[] = { VTX(-180, 300, 0, 256, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-360, 0, 0, 0, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(-180, 0, 0, 256, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-360, 300, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0x00), VTX(180, 300, 0, 768, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(180, 0, 0, 768, 2048, 0xFF, 0xFF, 0xFF, 0xFF),