mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-11 03:39:59 +00:00
Code Issues Projects Releases Wiki Activity

PR suggestions

Browse source
This commit is contained in:
Ethan Roseman 2020-03-25 18:39:51 -04:00
parent 73cc2073fd
commit 36119f6c65
4 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/variables.h
View file

@ -185,7 +185,8 @@ extern EffectTableInfo EffectSS2Info; // 801158B0
//extern ? D_80115F68; //extern ? D_80115F68;
//extern ? D_80115F6C; //extern ? D_80115F6C;
//extern ? D_80115F70; //extern ? D_80115F70;
extern ActorOverlay gActorOverlayTable[471]; // original name: "actor_dlftbls" extern Gfx D_80116280[];
extern ActorOverlay gActorOverlayTable[471]; // original name: "actor_dlftbls" 801162A0
extern s32 gMaxProfile; extern s32 gMaxProfile;
//extern ? D_80119E2C; //extern ? D_80119E2C;
//extern ? D_80119E52; //extern ? D_80119E52;

1
src/code/z_actor.c
View file

@ -4064,7 +4064,6 @@ void func_8003555C(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* ar
Vec3f D_80116268 = { 0.0f, -1.5f, 0.0f }; Vec3f D_80116268 = { 0.0f, -1.5f, 0.0f };
Vec3f D_80116274 = { 0.0f, -0.2f, 0.0f }; Vec3f D_80116274 = { 0.0f, -0.2f, 0.0f };
// unused
Gfx D_80116280[] = { Gfx D_80116280[] = {
gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL |
GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA), GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA),

19
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View file

@ -6,6 +6,8 @@
#include "z_en_ru2.h" #include "z_en_ru2.h"
#include <vt.h>
#define ROOM 0x00 #define ROOM 0x00
#define FLAGS 0x00000010 #define FLAGS 0x00000010
@ -42,10 +44,9 @@ static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx);
static void func_80AF2AB4(EnRu2* this, GlobalContext* globalCtx); static void func_80AF2AB4(EnRu2* this, GlobalContext* globalCtx);
static ColliderCylinderInit D_80AF40E0 = { static ColliderCylinderInit D_80AF40E0 = {
{ 0x0A, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x00 }, 0x0A, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
{ 0x00, 0x00, 0x00, 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x00000080, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x00000080, 0x00, 0x00, 0x00, 0x00,
0x00 }, 0x00, 0x01, 0x00, 0x00, 0x001E, 0x0064, 0x0000, 0x0000, 0x0000, 0x0000,
{ 0x001E, 0x0064, 0x0000, 0x0000, 0x0000, 0x0000 },
}; };
static u32 D_80AF410C[] = { static u32 D_80AF410C[] = {
@ -93,8 +94,6 @@ extern u32 D_06000DE8;
extern u32 D_0600E630; extern u32 D_0600E630;
extern u32 D_0600F03C; extern u32 D_0600F03C;
extern u32 D_0600F8B8; extern u32 D_0600F8B8;
extern u32 D_80116280; // z_actor.c
extern u32 D_80116290;
static void func_80AF2550(EnRu2* this, GlobalContext* globalCtx) { static void func_80AF2550(EnRu2* this, GlobalContext* globalCtx) {
EnRu2* thisLocal = this; EnRu2* thisLocal = this;
@ -480,7 +479,7 @@ static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) {
gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr));
gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr));
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, this->unk_2B4); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, this->unk_2B4);
gSPSegment(gfxCtx->polyXlu.p++, 0x0C, &D_80116280); gSPSegment(gfxCtx->polyXlu.p++, 0x0C, &D_80116280[0]);
gfxCtx->polyXlu.p = func_800A273C(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, skelAnime->dListCount, gfxCtx->polyXlu.p = func_800A273C(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, skelAnime->dListCount,
0, 0, 0, gfxCtx->polyXlu.p); 0, 0, 0, gfxCtx->polyXlu.p);
@ -751,7 +750,7 @@ static void func_80AF3D60(EnRu2* this, GlobalContext* globalCtx) {
static void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx) { static void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx) {
if (this->action < 0 || this->action >= 20 || D_80AF50BC[this->action] == 0) { if (this->action < 0 || this->action >= 20 || D_80AF50BC[this->action] == 0) {
osSyncPrintf("メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n"); osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
return; return;
} }
D_80AF50BC[this->action](this, globalCtx); D_80AF50BC[this->action](this, globalCtx);
@ -798,7 +797,7 @@ static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) {
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr));
gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr));
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF);
gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116290); gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]);
func_800A1AC8(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL, func_800A1AC8(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL,
&this->actor); &this->actor);
@ -807,7 +806,7 @@ static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) {
static void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx) { static void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx) {
if (this->drawConfig < 0 || this->drawConfig >= 3 || D_80AF510C[this->drawConfig] == 0) { if (this->drawConfig < 0 || this->drawConfig >= 3 || D_80AF510C[this->drawConfig] == 0) {
osSyncPrintf("描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n"); osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
return; return;
} }
D_80AF510C[this->drawConfig](this, globalCtx); D_80AF510C[this->drawConfig](this, globalCtx);

2
undefined_syms.txt
View file

@ -416,8 +416,6 @@ D_06000DE8 = 0x06000DE8;
D_0600E630 = 0x0600E630; D_0600E630 = 0x0600E630;
D_0600F03C = 0x0600F03C; D_0600F03C = 0x0600F03C;
D_0600F8B8 = 0x0600F8B8; D_0600F8B8 = 0x0600F8B8;
D_80116280 = 0x80116280;
D_80116290 = 0x80116290;
// z_bg_mjin // z_bg_mjin
D_06000140 = 0x06000140; D_06000140 = 0x06000140;