mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-21 22:41:14 +00:00
Extract the assets from most of the overlays (#985)
* remove fake match * Fire and Ice arrows * Light arrows * Ganon otyuka and end title * Oceff_Spot * Add missing Vtx to arrows * Update assets/xml/overlays/ovl_Arrow_Ice.xml Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Update assets/xml/overlays/ovl_Arrow_Light.xml Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Fix fire arrows * Update assets/xml/overlays/ovl_Arrow_Fire.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update ovl_Bg_Ganon_Otyuka.xml * Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Change a comment and rename a DList * rename DList * Jya cobra * shd and elf_msg * elf msg 2 * En Bili * Remove extern form ice piece * remove some externs * en holl * kanban * make * sda * ssh and some cleanup * replace undefined sym in en_kusa * st * oceff wipe 3 * oceff wipe * oceff spot * oceff spot * oceff wipe 4 * Update VTXDIS * update VTXDIS again * fix sun song * magic dark * magic wind and oceff wipe 2 * magic fire and oceff storm * Update src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/overlays/ovl_En_Sth.xml.ignore Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/overlays/ovl_Elf_Msg.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/overlays/ovl_Magic_Wind.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * fix emptyDL, run formatter on en_ssh * run formatter * Update format.sh * update to VTXDIS * small change * textureDL -> materialDL, vtxDL -> modelDL * upper CASE * setupDL -> materialDL * GeometryDL->ModelDL and VisualDL->MaterialDL * revert rcp.c * revert holl.c * another revert in rcp.c * some u32 DL -> Gfx* DL * the rest of dragorns comments * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "3e9ed72e2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "3e9ed72e2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * start updating overlays with static * en sth OK * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "d0cd6b397" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "d0cd6b397" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * fix names of the overlays * remove segment 128, add gameplay keep to global config file * Fix end title and remove hex mode from VTXdis.c * add code assets Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
louist103
GitHub
parent
fd512f02e9
commit
781d497264
105 changed files with 737 additions and 4801 deletions
|
|
@ -37,56 +37,6 @@ static InitChainEntry sInitChain[] = {
|
|||
ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
// Draw properties
|
||||
static Gfx D_809AD278[] = {
|
||||
gsDPPipeSync(),
|
||||
gsDPSetTextureLUT(G_TT_NONE),
|
||||
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
|
||||
gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED),
|
||||
gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2),
|
||||
gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR),
|
||||
gsSPSetGeometryMode(G_LIGHTING),
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
|
||||
static Vtx sCylinderVertices[] = {
|
||||
VTX(100, 0, 0, 0, 0, 0x59, 0xA7, 0x00, 0xFF), VTX(70, 0, 70, 0, 0, 0x49, 0xB7, 0x49, 0xFF),
|
||||
VTX(0, 0, 100, 0, 0, 0x00, 0xA7, 0x59, 0xFF), VTX(-70, 0, 70, 0, 0, 0xB7, 0xB7, 0x49, 0xFF),
|
||||
VTX(-100, 0, 0, 0, 0, 0xA7, 0xA7, 0x00, 0xFF), VTX(-70, 0, -70, 0, 0, 0xB7, 0xB7, 0xB7, 0xFF),
|
||||
VTX(0, 0, -100, 0, 0, 0x00, 0xA7, 0xA7, 0xFF), VTX(70, 0, -70, 0, 0, 0x49, 0xB7, 0xB7, 0xFF),
|
||||
VTX(100, 100, 0, 0, 0, 0x59, 0x59, 0x00, 0xFF), VTX(70, 100, 70, 0, 0, 0x49, 0x49, 0x49, 0xFF),
|
||||
VTX(0, 100, 100, 0, 0, 0x00, 0x59, 0x59, 0xFF), VTX(-70, 100, 70, 0, 0, 0xB7, 0x49, 0x49, 0xFF),
|
||||
VTX(-100, 100, 0, 0, 0, 0xA7, 0x59, 0x00, 0xFF), VTX(-70, 100, -70, 0, 0, 0xB7, 0x49, 0xB7, 0xFF),
|
||||
VTX(0, 100, -100, 0, 0, 0x00, 0x59, 0xA7, 0xFF), VTX(70, 100, -70, 0, 0, 0x49, 0x49, 0xB7, 0xFF),
|
||||
};
|
||||
|
||||
// Polygons for cylinder
|
||||
static Gfx D_809AD3B8[] = {
|
||||
gsSPVertex(sCylinderVertices, 16, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
|
||||
gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0),
|
||||
gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), gsSP2Triangles(8, 11, 12, 0, 8, 12, 13, 0),
|
||||
gsSP2Triangles(8, 13, 14, 0, 8, 14, 15, 0), gsSP2Triangles(0, 1, 8, 0, 1, 8, 9, 0),
|
||||
gsSP2Triangles(1, 2, 9, 0, 2, 9, 10, 0), gsSP2Triangles(2, 3, 10, 0, 3, 10, 11, 0),
|
||||
gsSP2Triangles(3, 4, 11, 0, 4, 11, 12, 0), gsSP2Triangles(4, 5, 12, 0, 5, 12, 13, 0),
|
||||
gsSP2Triangles(5, 6, 13, 0, 6, 13, 14, 0), gsSP2Triangles(6, 7, 14, 0, 7, 14, 15, 0),
|
||||
gsSP2Triangles(7, 0, 15, 0, 0, 15, 8, 0), gsSPEndDisplayList(),
|
||||
};
|
||||
|
||||
static Vtx sCuboidVertices[] = {
|
||||
VTX(100, 0, 100, 0, 0, 0x49, 0xB7, 0x49, 0xFF), VTX(100, 0, -100, 0, 0, 0x49, 0xB7, 0xB7, 0xFF),
|
||||
VTX(-100, 0, -100, 0, 0, 0xB7, 0xB7, 0xB7, 0xFF), VTX(-100, 0, 100, 0, 0, 0xB7, 0xB7, 0x49, 0xFF),
|
||||
VTX(100, 100, 100, 0, 0, 0x49, 0x49, 0x49, 0xFF), VTX(100, 100, -100, 0, 0, 0x49, 0x49, 0xB7, 0xFF),
|
||||
VTX(-100, 100, -100, 0, 0, 0xB7, 0x49, 0xB7, 0xFF), VTX(-100, 100, 100, 0, 0, 0xB7, 0x49, 0x49, 0xFF),
|
||||
};
|
||||
|
||||
// Polygons for cuboid
|
||||
static Gfx D_809AD4B8[] = {
|
||||
gsSPVertex(sCuboidVertices, 8, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
|
||||
gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), gsSP2Triangles(0, 1, 4, 0, 1, 4, 5, 0),
|
||||
gsSP2Triangles(1, 2, 5, 0, 2, 5, 6, 0), gsSP2Triangles(2, 3, 6, 0, 3, 6, 7, 0),
|
||||
gsSP2Triangles(3, 0, 7, 0, 0, 7, 4, 0), gsSPEndDisplayList(),
|
||||
};
|
||||
|
||||
void ElfMsg_SetupAction(ElfMsg* this, ElfMsgActionFunc actionFunc) {
|
||||
this->actionFunc = actionFunc;
|
||||
}
|
||||
|
|
@ -96,25 +46,24 @@ void ElfMsg_SetupAction(ElfMsg* this, ElfMsgActionFunc actionFunc) {
|
|||
* Can also set a switch flag from params while killing.
|
||||
*/
|
||||
s32 ElfMsg_KillCheck(ElfMsg* this, GlobalContext* globalCtx) {
|
||||
|
||||
if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) &&
|
||||
(Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1))) {
|
||||
Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1)) {
|
||||
LOG_STRING("共倒れ", "../z_elf_msg.c", 161); // "Mutual destruction"
|
||||
if (((this->actor.params >> 8) & 0x3F) != 0x3F) {
|
||||
Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F));
|
||||
Flags_SetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F);
|
||||
}
|
||||
Actor_Kill(&this->actor);
|
||||
return 1;
|
||||
} else if ((this->actor.world.rot.y == -1) && Flags_GetClear(globalCtx, this->actor.room)) {
|
||||
LOG_STRING("共倒れ", "../z_elf_msg.c", 172); // "Mutual destruction"
|
||||
if (((this->actor.params >> 8) & 0x3F) != 0x3F) {
|
||||
Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F));
|
||||
Flags_SetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F);
|
||||
}
|
||||
Actor_Kill(&this->actor);
|
||||
return 1;
|
||||
} else if (((this->actor.params >> 8) & 0x3F) == 0x3F) {
|
||||
return 0;
|
||||
} else if (Flags_GetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F))) {
|
||||
} else if (Flags_GetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F)) {
|
||||
Actor_Kill(&this->actor);
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -216,6 +165,8 @@ void ElfMsg_Update(Actor* thisx, GlobalContext* globalCtx) {
|
|||
}
|
||||
}
|
||||
|
||||
#include "overlays/ovl_Elf_Msg/ovl_Elf_Msg.c"
|
||||
|
||||
void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg.c", 436);
|
||||
|
||||
|
|
@ -235,9 +186,9 @@ void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
|||
gSPDisplayList(POLY_XLU_DISP++, D_809AD278);
|
||||
|
||||
if (thisx->params & 0x4000) {
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_809AD4B8);
|
||||
gSPDisplayList(POLY_XLU_DISP++, sCubeDL);
|
||||
} else {
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_809AD3B8);
|
||||
gSPDisplayList(POLY_XLU_DISP++, sCylinderDL);
|
||||
}
|
||||
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg.c", 457);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue