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

Actor Cleanups (#177)

Browse source 
* rename init chains, colchkinfo, colider inits, damage tables

* actor cleanups

* fix collider init script names

* small fixes

* ichain arg name

* change dynapoly types and names

* revert enru1 data name

* and the type

* pr suggestions
This commit is contained in:
fig02 2020-05-31 05:55:48 -04:00 • committed by GitHub
parent 13a94482e5
commit 78d0883f04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
108 changed files with 786 additions and 869 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/overlays/actors/ovl_En_Tana/z_en_tana.c
View file

@ -28,24 +28,24 @@ const ActorInit En_Tana_InitVars = {
NULL,
};
static char* shelfTypes[] = {
static char* sShelfTypes[] = {
"木の棚", // "Wooden Shelves"
"石の棚", // "Stone Shelves"
};
static const ActorFunc drawFuncs[] = {
static const ActorFunc sDrawFuncs[] = {
func_80B17FC4,
func_80B1809C,
func_80B1809C,
};
static Gfx* dListTbl[] = {
static Gfx* sDLists1[] = {
0x06000B80,
0x060027E8,
0x060027E8,
};
static Gfx* dListTbl2[] = {
static UNK_PTR sUnkSegments[] = {
NULL,
0x06000E08,
0x06001608,
@ -54,10 +54,10 @@ static Gfx* dListTbl2[] = {
void EnTana_Init(Actor* thisx, GlobalContext* globalCtx) {
EnTana* this = THIS;
osSyncPrintf("☆☆☆ %s ☆☆☆\n", shelfTypes[thisx->params]);
osSyncPrintf("☆☆☆ %s ☆☆☆\n", sShelfTypes[thisx->params]);
Actor_SetScale(thisx, 1.0f);
thisx->flags &= ~1;
thisx->draw = drawFuncs[thisx->params];
thisx->draw = sDrawFuncs[thisx->params];
}
void EnTana_Destroy(Actor* thisx, GlobalContext* globalCtx) {
@ -76,7 +76,7 @@ void func_80B17FC4(Actor* thisx, GlobalContext* globalCtx) {
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 152),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyOpa.p++, dListTbl[thisx->params]);
gSPDisplayList(gfxCtx->polyOpa.p++, sDLists1[thisx->params]);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tana.c", 157);
}
@ -88,9 +88,9 @@ void func_80B1809C(Actor* thisx, GlobalContext* globalCtx) {
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tana.c", 163);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(dListTbl2[thisx->params]));
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sUnkSegments[thisx->params]));
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 169),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyOpa.p++, dListTbl[thisx->params]);
gSPDisplayList(gfxCtx->polyOpa.p++, sDLists1[thisx->params]);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tana.c", 174);
}