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

z_En_Ossan and dependencies (#824)

Browse source 
* fix colliderinit typo

* fix initchain

* reloc

* progress

* progress

* Pick off a few easy functions, reduce number of warnings

* more tough OKs

* Getting closer to all OK, fix en_girla header

* some hard OKs, 7 to go

* two funcs remaining

* func_80AC7094 OK!

* Fix warnings, begin documentation

* get most of object_ossan documented, document some of en_ossan

* improve en_girla function names

* more EnOssan documentation

* more documentation

* en_tana basically complete, en_girla vars all named, en_ossan documentation improvements

* delete TIME ITSELF

* object_oF1d_map OK

* more names, fixed a poition typo

* Nearly all en_ossan functions named, all variables named

* format.sh

* forgot to delete data

* implement pr changes

* EnOssan OK! implement most of Roman's suggestions

* ugh

* implement figs suggestions

* implement roman's suggestion

* Can't tell my left from my other left

Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
mzxrules 2021-07-04 11:23:18 -04:00 • committed by GitHub
parent 7446e5eb80
commit 3fd05c9147
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
134 changed files with 3479 additions and 7998 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,7 @@
*/
#include "z_en_tana.h"
#include "objects/object_shop_dungen/object_shop_dungen.h"
#define FLAGS 0x00000009
@ -13,8 +14,8 @@
void EnTana_Init(Actor* thisx, GlobalContext* globalCtx);
void EnTana_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnTana_Update(Actor* thisx, GlobalContext* globalCtx);
void func_80B17FC4(Actor* thisx, GlobalContext* globalCtx);
void func_80B1809C(Actor* thisx, GlobalContext* globalCtx);
void EnTana_DrawWoodenShelves(Actor* thisx, GlobalContext* globalCtx);
void EnTana_DrawStoneShelves(Actor* thisx, GlobalContext* globalCtx);
const ActorInit En_Tana_InitVars = {
ACTOR_EN_TANA,
@ -34,21 +35,21 @@ static char* sShelfTypes[] = {
};
static const ActorFunc sDrawFuncs[] = {
func_80B17FC4,
func_80B1809C,
func_80B1809C,
EnTana_DrawWoodenShelves,
EnTana_DrawStoneShelves,
EnTana_DrawStoneShelves,
};
static Gfx* sDLists1[] = {
0x06000B80,
0x060027E8,
0x060027E8,
static Gfx* sShelfDLists[] = {
gShopDungenWoodenShelvesDL,
gShopDungenStoneShelvesDL,
gShopDungenStoneShelvesDL,
};
static UNK_PTR sUnkSegments[] = {
static void* sStoneTextures[] = {
NULL,
0x06000E08,
0x06001608,
gShopDungenStone1Tex,
gShopDungenStone2Tex,
};
void EnTana_Init(Actor* thisx, GlobalContext* globalCtx) {
@ -66,7 +67,7 @@ void EnTana_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void EnTana_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void func_80B17FC4(Actor* thisx, GlobalContext* globalCtx) {
void EnTana_DrawWoodenShelves(Actor* thisx, GlobalContext* globalCtx) {
EnTana* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tana.c", 148);
@ -74,21 +75,21 @@ void func_80B17FC4(Actor* thisx, GlobalContext* globalCtx) {
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 152),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sDLists1[thisx->params]);
gSPDisplayList(POLY_OPA_DISP++, sShelfDLists[thisx->params]);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_tana.c", 157);
}
void func_80B1809C(Actor* thisx, GlobalContext* globalCtx) {
void EnTana_DrawStoneShelves(Actor* thisx, GlobalContext* globalCtx) {
EnTana* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tana.c", 163);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sUnkSegments[thisx->params]));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sStoneTextures[thisx->params]));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 169),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sDLists1[thisx->params]);
gSPDisplayList(POLY_OPA_DISP++, sShelfDLists[thisx->params]);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_tana.c", 174);
}