falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

En_Weather_Tag (#178) 

* EnWeatherTag: Start

* EnWeatherTag: matching function, but suspicious

* EnWeatherTag: two non-matching functions, rest match

* EnWeatherTag: cleaning and docs

* EnWeatherTag: more docs

* WeatherTag: more docs

* WeatherTag: cleaning

* WeatherTag: pad renamed to unk to match

* Update include/z64save.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update include/z64.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* WeatherTag: requested changes

Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
Isghj 2021-06-11 05:15:09 -07:00 committed by GitHub
parent 70b67402cb
commit bb7247875b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 505 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions.h
View File

@ -899,7 +899,7 @@ Actor* func_800BC270(GlobalContext* globalCtx, Actor* actor, f32 arg2, UNK_TYPE4
void func_800BCB70(Actor* actor, s16 arg1, u8 arg2, u8 arg3, u8 arg4); void func_800BCB70(Actor* actor, s16 arg1, u8 arg2, u8 arg3, u8 arg4);
void func_800BCBF4(Vec3f* uParm1, GlobalContext* globalCtx); void func_800BCBF4(Vec3f* uParm1, GlobalContext* globalCtx);
void func_800BCC68(Vec3f* param_1, GlobalContext* globalCtx); void func_800BCC68(Vec3f* param_1, GlobalContext* globalCtx);
// void func_800BCCDC(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5); UNK_RET func_800BCCDC(Vec3s* points, u8 pathcount, Vec3f* pos1, Vec3f* pos2, UNK_TYPE parm5);
// void func_800BD2B4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6); // void func_800BD2B4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
// void func_800BD384(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE1 param_9); // void func_800BD384(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE1 param_9);
// void func_800BD6E4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5); // void func_800BD6E4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5);
@ -3032,7 +3032,7 @@ void* Play_LoadScene(GlobalContext* globalCtx, RomFile* entry);
void func_8016927C(GlobalContext* globalCtx, s16 sParm2); void func_8016927C(GlobalContext* globalCtx, s16 sParm2);
// void func_801692C4(GlobalContext* globalCtx, UNK_TYPE1 uParm2); // void func_801692C4(GlobalContext* globalCtx, UNK_TYPE1 uParm2);
// void Play_SceneInit(GlobalContext* globalCtx, s32 sceneIndex, UNK_TYPE1 param_3); // void Play_SceneInit(GlobalContext* globalCtx, s32 sceneIndex, UNK_TYPE1 param_3);
// void func_80169474(void); UNK_RET func_80169474(GlobalContext* globalCtx, Vec3f* v1, Vec3f* v2);
s32 func_801694DC(GlobalContext* globalCtx); s32 func_801694DC(GlobalContext* globalCtx);
s32 Play_GetActiveCameraIndex(GlobalContext* globalCtx); s32 Play_GetActiveCameraIndex(GlobalContext* globalCtx);
void func_80169590(GlobalContext* globalCtx, s16 param_2, s16 param_3); void func_80169590(GlobalContext* globalCtx, s16 param_2, s16 param_3);

11
include/z64.h
View File

@ -677,7 +677,8 @@ typedef struct {
/* 0x272 */ char unk_272[0xD6]; /* 0x272 */ char unk_272[0xD6];
} InterfaceContext; // size = 0x348 } InterfaceContext; // size = 0x348
typedef struct { // us rev 1: 803FDB24
typedef struct KankyoContext {
/* 0x00 */ UNK_TYPE1 unk0; /* 0x00 */ UNK_TYPE1 unk0;
/* 0x01 */ UNK_TYPE1 unk1; /* 0x01 */ UNK_TYPE1 unk1;
/* 0x02 */ u16 unk2; /* 0x02 */ u16 unk2;
@ -823,14 +824,14 @@ typedef struct {
/* 0xE0 */ u8 unkE0; /* 0xE0 */ u8 unkE0;
/* 0xE1 */ UNK_TYPE1 unkE1; /* 0xE1 */ UNK_TYPE1 unkE1;
/* 0xE2 */ s8 unkE2; /* 0xE2 */ s8 unkE2;
/* 0xE3 */ UNK_TYPE1 unkE3; /* 0xE3 */ u8 unkE3; // modified by unused func in EnWeatherTag
/* 0xE4 */ UNK_TYPE1 unkE4; /* 0xE4 */ UNK_TYPE1 unkE4;
/* 0xE5 */ UNK_TYPE1 unkE5; /* 0xE5 */ UNK_TYPE1 unkE5;
/* 0xE6 */ UNK_TYPE1 unkE6; /* 0xE6 */ UNK_TYPE1 unkE6;
/* 0xE7 */ UNK_TYPE1 unkE7; /* 0xE7 */ UNK_TYPE1 unkE7;
/* 0xE8 */ UNK_TYPE1 unkE8; /* 0xE8 */ UNK_TYPE1 unkE8;
/* 0xE9 */ UNK_TYPE1 unkE9; /* 0xE9 */ UNK_TYPE1 unkE9;
/* 0xEA */ UNK_TYPE1 unkEA; /* 0xEA */ u8 unkEA;
/* 0xEB */ UNK_TYPE1 unkEB; /* 0xEB */ UNK_TYPE1 unkEB;
/* 0xEC */ UNK_TYPE1 unkEC; /* 0xEC */ UNK_TYPE1 unkEC;
/* 0xED */ UNK_TYPE1 unkED; /* 0xED */ UNK_TYPE1 unkED;
@ -838,7 +839,7 @@ typedef struct {
/* 0xEF */ UNK_TYPE1 unkEF; /* 0xEF */ UNK_TYPE1 unkEF;
/* 0xF0 */ UNK_TYPE1 unkF0; /* 0xF0 */ UNK_TYPE1 unkF0;
/* 0xF1 */ UNK_TYPE1 unkF1; /* 0xF1 */ UNK_TYPE1 unkF1;
/* 0xF2 */ u8 unkF2[0xC]; /* 0xF2 */ u8 unkF2[0xC]; // F2-F6 are used by weather tag
} KankyoContext; // size = 0xFE } KankyoContext; // size = 0xFE
typedef struct { typedef struct {
@ -1553,7 +1554,7 @@ struct GlobalContext {
/* 0x18858 */ UNK_PTR unk18858; /* 0x18858 */ UNK_PTR unk18858;
/* 0x1885C */ EntranceEntry* setupEntranceList; /* 0x1885C */ EntranceEntry* setupEntranceList;
/* 0x18860 */ u16* setupExitList; /* 0x18860 */ u16* setupExitList;
/* 0x18864 */ void* setupPathList; /* 0x18864 */ Path* setupPathList;
/* 0x18868 */ UNK_PTR unk18868; /* 0x18868 */ UNK_PTR unk18868;
/* 0x1886C */ AnimatedMaterial* sceneMaterialAnims; /* 0x1886C */ AnimatedMaterial* sceneMaterialAnims;
/* 0x18870 */ UNK_TYPE1 pad18870[0x4]; /* 0x18870 */ UNK_TYPE1 pad18870[0x4];

3
include/z64save.h
View File

@ -51,7 +51,8 @@ typedef struct {
/* 0x000C */ u16 time; // "zelda_time" /* 0x000C */ u16 time; // "zelda_time"
/* 0x000E */ u16 owlSaveLocation; /* 0x000E */ u16 owlSaveLocation;
/* 0x0010 */ s32 isNight; // "asahiru_fg" /* 0x0010 */ s32 isNight; // "asahiru_fg"
/* 0x0014 */ u32 unk_14; // "change_zelda_time" /* 0x0014 */ u16 unk_14; // "change_zelda_time"
/* 0x0016 */ u16 unk_16;
/* 0x0018 */ s32 day; // "totalday" /* 0x0018 */ s32 day; // "totalday"
/* 0x001C */ u32 daysElapsed; // "eventday" /* 0x001C */ u32 daysElapsed; // "eventday"
/* 0x0020 */ u8 playerForm; // "player_character" /* 0x0020 */ u8 playerForm; // "player_character"

6
linker_scripts/code_script.txt
View File

@ -2625,9 +2625,13 @@ SECTIONS
ovl_En_Weather_Tag : AT(RomLocation) ovl_En_Weather_Tag : AT(RomLocation)
{ {
build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o(.text) build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o(.text)
build/asm/overlays/ovl_En_Weather_Tag_data.o(.data) build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o(.data)
build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o(.rodata) build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o(.rodata)
#ifdef NON_MATCHING
build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag_overlay.o(.ovl)
#else
build/asm/overlays/ovl_En_Weather_Tag_rodata.o(.rodata) build/asm/overlays/ovl_En_Weather_Tag_rodata.o(.rodata)
#endif
} }
SegmentEnd = .; SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart; SegmentSize = SegmentEnd - SegmentStart;

486
src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
View File

@ -9,7 +9,26 @@ void EnWeatherTag_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnWeatherTag_Update(Actor* thisx, GlobalContext* globalCtx); void EnWeatherTag_Update(Actor* thisx, GlobalContext* globalCtx);
void EnWeatherTag_Draw(Actor* thisx, GlobalContext* globalCtx); void EnWeatherTag_Draw(Actor* thisx, GlobalContext* globalCtx);
/* void func_80966A08(EnWeatherTag* this, GlobalContext* globalCtx);
void func_80966A68(EnWeatherTag* this, GlobalContext* globalCtx);
void EnWeatherTag_Die(EnWeatherTag* this, GlobalContext* globalCtx);
void func_80966B08(EnWeatherTag* this, GlobalContext* globalCtx);
void func_80966BF4(EnWeatherTag* this, GlobalContext* globalCtx);
void func_80966D20(EnWeatherTag* this, GlobalContext* globalCtx);
void func_80966E0C(EnWeatherTag* this, GlobalContext* globalCtx);
void func_80966E84(EnWeatherTag* this, GlobalContext* globalCtx);
void func_80966EF0(EnWeatherTag* this, GlobalContext* globalCtx);
void func_80966F74(EnWeatherTag* this, GlobalContext* globalCtx);
void func_80966FEC(EnWeatherTag* this, GlobalContext* globalCtx);
void func_80967060(EnWeatherTag* this, GlobalContext* globalCtx);
void func_80967148(EnWeatherTag* this, GlobalContext* globalCtx);
void EnWeatherTag_DoNothing(EnWeatherTag* this, GlobalContext* globalCtx);
void EnWeatherTag_Unused_80967250(EnWeatherTag* this, GlobalContext* globalCtx);
void EnWeatherTag_Unused_809671B8(EnWeatherTag* this, GlobalContext* globalCtx);
void func_809672DC(EnWeatherTag* this, GlobalContext* globalCtx);
void func_809674C8(EnWeatherTag* this, GlobalContext* globalCtx);
void func_80967608(EnWeatherTag* this, GlobalContext* globalCtx);
const ActorInit En_Weather_Tag_InitVars = { const ActorInit En_Weather_Tag_InitVars = {
ACTOR_EN_WEATHER_TAG, ACTOR_EN_WEATHER_TAG,
ACTORCAT_PROP, ACTORCAT_PROP,
@ -21,58 +40,471 @@ const ActorInit En_Weather_Tag_InitVars = {
(ActorFunc)EnWeatherTag_Update, (ActorFunc)EnWeatherTag_Update,
(ActorFunc)EnWeatherTag_Draw, (ActorFunc)EnWeatherTag_Draw,
}; };
*/
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966410.asm") extern f32 D_801F4E74;
extern u8 D_801BDBB8;
extern u8 D_801BDBB4;
extern u8 D_801BDBB0;
extern u8 D_801F4E30;
extern s16 D_801F4E7A;
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Destroy.asm") void EnWeatherTag_SetupAction(EnWeatherTag* this, EnWeatherTagActionFunc func) {
this->actionFunc = func;
}
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Init.asm") void EnWeatherTag_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966608.asm") void EnWeatherTag_Init(Actor* thisx, GlobalContext* globalCtx) {
EnWeatherTag* this = (EnWeatherTag*)thisx;
s32 pad;
Path* path;
s32 pathID;
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966758.asm") // flag: is targetable. Should do nothing as not set by default above
this->actor.flags &= ~1;
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_8096689C.asm") switch (WEATHER_TAG_TYPE(this)) {
case WEATHERTAG_TYPE_UNK0:
this->unk154 = 0;
this->fadeDistance = this->actor.world.rot.x;
this->unk158 = this->actor.world.rot.y;
EnWeatherTag_SetupAction(this, func_80966A08);
break;
case WEATHERTAG_TYPE_UNK1:
if (gSaveContext.weekEventReg[0x34] & 0x20) { // if cleared STT
Actor_MarkForDeath(&this->actor);
}
EnWeatherTag_SetupAction(this, func_80966B08);
break;
case WEATHERTAG_TYPE_WINTERFOG:
EnWeatherTag_SetupAction(this, func_80966E0C);
break;
case WEATHERTAG_TYPE_UNK3:
if (0) {} // this can move to diff locations and still match
EnWeatherTag_SetupAction(this, func_80966EF0);
break;
case WEATHERTAG_TYPE_UNK4:
EnWeatherTag_SetupAction(this, func_80966FEC);
break;
case WEATHERTAG_TYPE_UNK5:
func_800BC154(globalCtx, &globalCtx->actorCtx, &this->actor, 7);
globalCtx->unk18874 = 3;
globalCtx->kankyoContext.unk1F = 5;
globalCtx->kankyoContext.unk20 = 5;
D_801F4E74 = 1.0f;
EnWeatherTag_SetupAction(this, func_80966BF4);
break;
case WEATHERTAG_TYPE_WATERMURK:
pathID = WEATHER_TAG_PATHID(this);
path = &globalCtx->setupPathList[pathID];
this->pathPoints = Lib_SegmentedToVirtual(path->points);
this->pathCount = path->count;
EnWeatherTag_SetupAction(this, func_809672DC);
break;
case WEATHERTAG_TYPE_LOCALDAY2RAIN:
EnWeatherTag_SetupAction(this, func_809674C8);
}
}
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966A08.asm") // matches but unused params is suspicious
// called WeatherTag_CheckEnableWeatherEffect in OOT, that's where "weatherMode" came from
u8 func_80966608(EnWeatherTag* this, GlobalContext* globalCtx, UNK_TYPE a3, UNK_TYPE a4, u8 new1F, u8 new20, u16 new24,
u8 weatherMode) {
ActorPlayer* player = PLAYER;
u8 returnVal = 0;
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966A68.asm") if (WEATHER_TAG_RANGE100(this) > Actor_XZDistanceBetweenActors(&player->base, &this->actor)) {
if (globalCtx->kankyoContext.unk1F == globalCtx->kankyoContext.unk20) {
D_801BDBB8 = 1;
if (!(globalCtx->kankyoContext.unk1E == 0) ||
((globalCtx->kankyoContext.unk1F != 1) && (globalCtx->kankyoContext.unk21 == 0))) {
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966AE4.asm") D_801BDBB8 = 0;
if (D_801BDBB0 != weatherMode) {
D_801BDBB0 = weatherMode;
globalCtx->kankyoContext.unk21 = 1;
globalCtx->kankyoContext.unk1F = new1F;
globalCtx->kankyoContext.unk20 = new20;
D_801BDBB4 = new20;
globalCtx->kankyoContext.unk24 = new24;
globalCtx->kankyoContext.unk22 = globalCtx->kankyoContext.unk24;
}
returnVal = 1;
}
}
}
return returnVal;
}
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966B08.asm") // again with the unused parameters
// called WeatherTag_CheckRestoreWeather in OOT
u8 func_80966758(EnWeatherTag* this, GlobalContext* globalCtx, UNK_TYPE a3, UNK_TYPE a4, u8 new1F, u8 new20,
u16 new24) {
ActorPlayer* player = PLAYER;
u8 returnVal = 0;
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966BF4.asm") if (WEATHER_TAG_RANGE100(this) < Actor_XZDistanceBetweenActors(&player->base, &this->actor)) {
if (globalCtx->kankyoContext.unk1F == globalCtx->kankyoContext.unk20) {
D_801BDBB8 = 1;
if (!(globalCtx->kankyoContext.unk1E == 0) ||
((globalCtx->kankyoContext.unk1F != 1) && (globalCtx->kankyoContext.unk21 == 0))) {
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966D20.asm") D_801BDBB8 = 0;
D_801BDBB0 = 0;
globalCtx->kankyoContext.unk21 = 1;
globalCtx->kankyoContext.unk1F = new1F;
globalCtx->kankyoContext.unk20 = new20;
D_801BDBB4 = new20;
globalCtx->kankyoContext.unk24 = new24;
globalCtx->kankyoContext.unk22 = globalCtx->kankyoContext.unk24;
returnVal = 1;
}
}
}
return returnVal;
}
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966E0C.asm") // modify wind?
void func_8096689C(EnWeatherTag* this, GlobalContext* globalCtx) {
ActorPlayer* player = PLAYER;
f32 distance;
f32 partialResult;
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966E84.asm") distance = Actor_XZDistanceBetweenActors(&player->base, &this->actor);
if (this->fadeDistance < distance) {
distance = this->fadeDistance;
}
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966EF0.asm") if (this->fadeDistance == 0) {
this->fadeDistance = 1; // div by zero protection
}
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966F74.asm") // this separation is to match, can't be separate temps without regalloc
partialResult = (1.0f - (distance / this->fadeDistance)); // strength based on distance?
partialResult = (this->unk154 / 32768.0f) * partialResult; // another scale applied
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80966FEC.asm") globalCtx->kankyoContext.windClothIntensity = (this->actor.world.rot.z * partialResult) + 30.0f;
if (partialResult > 0.01f) {
globalCtx->kankyoContext.unkEA = 8;
D_801F4E30 = 0x9B;
} else if (globalCtx->kankyoContext.unkEA == 8) {
D_801F4E30 = 0;
globalCtx->kankyoContext.unkEA = 9;
}
}
// WEATHERTAG_TYPE_UNK0
void func_80966A08(EnWeatherTag* this, GlobalContext* globalCtx) {
this->unk154 += this->unk158;
if (this->unk154 >= 0x8001) {
this->unk154 = 0x8000;
EnWeatherTag_SetupAction(this, func_80966A68);
}
func_8096689C(this, globalCtx);
}
// WEATHERTAG_TYPE_UNK0 2
void func_80966A68(EnWeatherTag* this, GlobalContext* globalCtx) {
this->unk154 -= (this->unk158 >> 1);
if (this->unk154 == 0) {
this->unk154 = 1;
}
if ((s16)this->unk154 < 0) { // cast req
this->unk154 = 0;
// @BUG redudant code
Actor_MarkForDeath(&this->actor);
EnWeatherTag_SetupAction(this, EnWeatherTag_Die);
}
func_8096689C(this, globalCtx);
}
void EnWeatherTag_Die(EnWeatherTag* this, GlobalContext* globalCtx) {
Actor_MarkForDeath(&this->actor);
}
// WEATHERTAG_TYPE_UNK1
// areas that use: all of ikana, swamp, termina field,stonetower temple,
// poisoned swamp: placed behind the water fall from ikana
// this tag stops spawning after STT cleared?
void func_80966B08(EnWeatherTag* this, GlobalContext* globalCtx) {
if (func_80966608(this, globalCtx, 0, 0, globalCtx->kankyoContext.unk1F, 5, 100, 2) || D_801BDBB0 == 2) {
globalCtx->unk18874 = 3;
EnWeatherTag_SetupAction(this, func_80966D20);
} else if (D_801F4E74 <= 0.01f) {
globalCtx->unk18874 = 1;
} else {
Math_SmoothStepToF(&D_801F4E74, 0.0f, 0.2f, 0.02f, 0.001f);
}
}
// WEATHERTAG_TYPE_UNK5: only one in ikana canyon, corner of cliff right outside of stone tower entrance
// because it uses cutsecnes.. is this the clear ikana cutcsene?
void func_80966BF4(EnWeatherTag* this, GlobalContext* globalCtx) {
u8 newUnk20;
CsCmdActorAction* tmpAction;
if (func_800EE29C(globalCtx, 0x237) != 0) {
tmpAction = globalCtx->csCtx.actorActions[func_800EE200(globalCtx, 0x237)];
if ((globalCtx->csCtx.frames >= tmpAction->startFrame) && (tmpAction->unk0 >= 2)) {
switch (gSaveContext.day) {
case 0:
case 1:
default:
newUnk20 = 0;
break;
case 2:
newUnk20 = 3;
break;
case 3:
newUnk20 = 4;
break;
}
Math_SmoothStepToF(&D_801F4E74, 0.0f, 0.2f, 0.02f, 0.001f);
if (globalCtx->kankyoContext.unk20 != newUnk20) {
globalCtx->kankyoContext.unk21 = 1;
globalCtx->kankyoContext.unk20 = newUnk20;
globalCtx->kankyoContext.unk24 = 100;
globalCtx->kankyoContext.unk22 = globalCtx->kankyoContext.unk24;
}
}
}
}
// WEATHERTAG_TYPE_UNK1 2
void func_80966D20(EnWeatherTag* this, GlobalContext* globalCtx) {
u8 newUnk20;
switch (gSaveContext.day) {
case 0:
case 1:
default:
newUnk20 = 0;
break;
case 2:
newUnk20 = 3;
break;
case 3:
newUnk20 = 4;
break;
}
Math_SmoothStepToF(&D_801F4E74, 1.0f, 0.2f, 0.02f, 0.001f);
if (func_80966758(this, globalCtx, 1, 0, 5, newUnk20, 100)) {
EnWeatherTag_SetupAction(this, func_80966B08);
}
if (D_801BDBB0 != 2) {
EnWeatherTag_SetupAction(this, func_80966B08);
}
}
// WEATHERTAG_TYPE_WINTERFOG:
// areas affected: winter goron village, path to mountain village,
// path to goron village winter, winter mountain village
void func_80966E0C(EnWeatherTag* this, GlobalContext* globalCtx) {
if (func_80966608(this, globalCtx, 0, 1, 0, 2, 60, 3)) {
globalCtx->kankyoContext.unkF2[3] = 0x80;
EnWeatherTag_SetupAction(this, func_80966E84);
}
}
// WEATHERTAG_TYPE_WINTERFOG 2
void func_80966E84(EnWeatherTag* this, GlobalContext* globalCtx) {
if (func_80966758(this, globalCtx, 1, 0, 2, 0, 60)) {
globalCtx->kankyoContext.unkF2[3] = 0;
EnWeatherTag_SetupAction(this, func_80966E0C);
}
}
// WEATHERTAG_TYPE_UNK3: unused in vanilla?
// just a heavy fog like the winter fog, but unused?
// wait if you enter the scene through a room instead of fog you get a flash rain shower
void func_80966EF0(EnWeatherTag* this, GlobalContext* globalCtx) {
if (func_80966608(this, globalCtx, 0, 1, 0, 2, 100, 4)) {
func_800FD78C(globalCtx);
globalCtx->kankyoContext.unkF2[0] = 60;
EnWeatherTag_SetupAction(this, func_80966F74);
}
}
// WEATHERTAG_TYPE_UNK3 2
void func_80966F74(EnWeatherTag* this, GlobalContext* globalCtx) {
if (func_80966758(this, globalCtx, 1, 0, 2, 0, 100)) {
func_800FD858(globalCtx);
globalCtx->kankyoContext.unkF2[0] = 0;
EnWeatherTag_SetupAction(this, func_80966EF0);
}
}
// WEATHERTAG_TYPE_UNK4: no visible effect, what does it doooo??
// used in south clock town??? romani ranch, clock tower rooftop woodfall..? stt
// all of them have shorter distances though, like 0xA and 0x6, so their locations are important
void func_80966FEC(EnWeatherTag* this, GlobalContext* globalCtx) {
// weirdly, not the same as the other param lookup used in the rest of the file, which is float
s32 distance = WEATHER_TAG_RANGE100INT(this);
if (distance > 0) {
D_801F4E7A = distance;
}
// unique pirates fortress behavior?
if ((globalCtx->sceneNum == SCENE_KAIZOKU) && (globalCtx->actorCtx.unk5 & 2)) {
EnWeatherTag_SetupAction(this, func_80967060);
}
}
#if NON_MATCHING
// non-matching: two instructions are swapped
// type 4_2 pirates fortres only?
void func_80967060(EnWeatherTag* this, GlobalContext* globalCtx) {
Vec3f vec1;
Vec3f vec2;
vec1.x = 1055.0f;
vec1.y = -145.0f;
vec1.z = 181.0f;
func_80169474(globalCtx, &vec1, &vec2);
// 0x428C0000 = 70.0f
// ca4: lwc1 $f0,0x18(sp) | ca4: lui at,0x428c
// ca8: lui at,0x428c | ca8: lwc1 $f0,0x18(sp)
if (globalCtx->view.fovy < 25.0f && (vec2.x >= 70.0f && vec2.x < 250.0f) && (vec2.y >= 30.0f && vec2.y < 210.0f)) {
EnWeatherTag_SetupAction(this, func_80967148);
}
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80967060.asm") #pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80967060.asm")
#endif
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80967148.asm") // type 4_3, start cutscene then die?
void func_80967148(EnWeatherTag* this, GlobalContext* globalCtx) {
s16 tempCutscene;
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_809671A8.asm") tempCutscene = this->actor.cutscene;
if (ActorCutscene_GetCanPlayNext(tempCutscene)) {
ActorCutscene_Start(tempCutscene, &this->actor);
EnWeatherTag_SetupAction(this, EnWeatherTag_DoNothing);
} else {
ActorCutscene_SetIntentToPlay(tempCutscene);
}
}
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_809671B8.asm") void EnWeatherTag_DoNothing(EnWeatherTag* this, GlobalContext* globalCtx) {
}
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80967250.asm") // these two are isolated, they call themselves but nothing calls them?
void EnWeatherTag_Unused_809671B8(EnWeatherTag* this, GlobalContext* globalCtx) {
if (func_80966608(this, globalCtx, 0, 1, 0, 4, 100, 5)) {
func_800FD78C(globalCtx);
globalCtx->kankyoContext.unkE3 = 1;
globalCtx->kankyoContext.unkF2[0] = 60;
EnWeatherTag_SetupAction(this, EnWeatherTag_Unused_80967250);
}
}
// these two are isolated, they call themselves but nothing calls them
void EnWeatherTag_Unused_80967250(EnWeatherTag* this, GlobalContext* globalCtx) {
if (func_80966758(this, globalCtx, 1, 0, 4, 0, 100)) {
func_800FD858(globalCtx);
globalCtx->kankyoContext.unkE3 = 2;
globalCtx->kankyoContext.unkF2[0] = 0;
EnWeatherTag_SetupAction(this, EnWeatherTag_Unused_809671B8);
}
}
#if NON_MATCHING
// non_matching: the parameters for func_800BCCDC are correct, but out of order
// WEATHERTAG_TYPE_WATERMURK: (pinnacle rock, zora cape, zora coast)
void func_809672DC(EnWeatherTag* this, GlobalContext* globalCtx) {
ActorPlayer* player = PLAYER;
s32 pad;
f32 distance;
f32 range;
f32 strength = 0.0f;
// the parameters here are correct but loaded in the wrong order
// eec: addiu a3,s0,0x24 | eec: lw a0,0x150(s0) 4
// ef0: sw v0,0x3c(sp) | ef0: lbu a1,0x14c(s0) 3
// ef4: lbu a1,0x14c(s0) | ef4: sw zero,0x10(sp) 5
// ef8: lw a0,0x150(s0) | ef8: addiu a3,s0,0x24 1
// efc: sw zero,0x10(sp) | efc: sw v0,0x3c(sp) 2
func_800BCCDC(this->pathPoints, this->pathCount, &player->base.world.pos, &this->actor.world.pos, 0);
distance = Actor_XZDistanceBetweenActors(&player->base, &this->actor);
range = WEATHER_TAG_RANGE100(this);
if (distance < range) {
globalCtx->kankyoContext.unkEA = 6;
strength = 1.0f - (distance / range);
if (0.8f < strength) {
strength = 1.0f;
}
D_801F4E30 = (200.0f * strength);
} else {
if (globalCtx->kankyoContext.unkEA == 6) {
D_801F4E30 = 0;
globalCtx->kankyoContext.unkEA = 7;
}
}
Math_SmoothStepToS(&globalCtx->kankyoContext.unkA4, (s16)(-40.0f * strength), 1, 1, 1);
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_809672DC.asm") #pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_809672DC.asm")
#endif
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_809674C8.asm") // WEATHERTAG_TYPE_LOCALDAY2RAIN: rain proximity as approaching rainy scene
// (milk road day 2 approaching ranch it rains, walking away towards termfield no rain)
void func_809674C8(EnWeatherTag* this, GlobalContext* globalCtx) {
ActorPlayer* player = PLAYER;
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/func_80967608.asm") if (Actor_XZDistanceBetweenActors(&player->base, &this->actor) < WEATHER_TAG_RANGE100(this)) {
if (CURRENT_DAY == 2) {
if ((gSaveContext.time >= 0x4AAA) && (gSaveContext.time < 0xBAAA) &&
(globalCtx->kankyoContext.unkF2[2] == 0)) {
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Update.asm") D_801BDBB0 = 1;
func_800FD78C(globalCtx);
globalCtx->kankyoContext.unkF2[4] = 0x20;
EnWeatherTag_SetupAction(this, func_80967608);
}
}
} else {
if ((globalCtx->kankyoContext.unkF2[4] != 0) && !(globalCtx->state.frames & 3)) {
globalCtx->kankyoContext.unkF2[4]--;
if ((globalCtx->kankyoContext.unkF2[4]) == 8) {
func_800FD858(globalCtx);
}
}
}
}
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Draw.asm") // WEATHERTAG_TYPE_LOCALDAY2RAIN 2
void func_80967608(EnWeatherTag* this, GlobalContext* globalCtx) {
if ((WEATHER_TAG_RANGE100(this) + 10.0f) < Actor_XZDistanceBetweenActors(&PLAYER->base, &this->actor)) {
D_801BDBB0 = 0;
EnWeatherTag_SetupAction(this, func_809674C8);
}
}
void EnWeatherTag_Update(Actor* thisx, GlobalContext* globalCtx) {
EnWeatherTag* this = (EnWeatherTag*)thisx;
u16 oldTime;
this->actionFunc(this, globalCtx);
if ((globalCtx->actorCtx.unk5 & 2) && (globalCtx->msgCtx.unk11F23 != 0) &&
(globalCtx->msgCtx.unk11F04 == 0x5E6) && (!FrameAdvance_IsEnabled(globalCtx)) && (globalCtx->unk18875 == 0) &&
(ActorCutscene_GetCurrentIndex() == -1) && (globalCtx->csCtx.state == 0)) {
oldTime = gSaveContext.time;
gSaveContext.time = (u16)REG(0xF) + oldTime; // cast req
if (REG(0xF) != 0) {
oldTime = gSaveContext.time;
gSaveContext.time = (gSaveContext.unk_16) + oldTime;
}
}
}
void EnWeatherTag_Draw(Actor* thisx, GlobalContext* globalCtx) {
}

27
src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h
View File

@ -5,11 +5,36 @@
struct EnWeatherTag; struct EnWeatherTag;
typedef void (*EnWeatherTagActionFunc)(struct EnWeatherTag*, GlobalContext*);
typedef struct EnWeatherTag { typedef struct EnWeatherTag {
/* 0x000 */ Actor actor; /* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x18]; /* 0x144 */ EnWeatherTagActionFunc actionFunc;
/* 0x148 */ u8 pad148[0x4]; // todo attempt remove
/* 0x14C */ u8 pathCount;
/* 0x150 */ Vec3s* pathPoints;
// 154: the code avoids what would be a negative value if signed, but signed wont match
/* 0x154 */ u16 unk154;
/* 0x156 */ u16 fadeDistance;
/* 0x158 */ u16 unk158; // increment/decrement amount for 154
} EnWeatherTag; // size = 0x15C } EnWeatherTag; // size = 0x15C
extern const ActorInit En_Weather_Tag_InitVars; extern const ActorInit En_Weather_Tag_InitVars;
#define WEATHER_TAG_TYPE(x) (x->actor.params & 0xF)
#define WEATHER_TAG_PATHID(x) (x->actor.params >> 4 & 0xF)
#define WEATHER_TAG_RANGE100(x) ((u8)(((x->actor.params >> 8) & 0xFF)) * 100.0f)
#define WEATHER_TAG_RANGE100INT(x) ((u8)(((x->actor.params >> 8))) * 100)
typedef enum {
/* 0 */ WEATHERTAG_TYPE_UNK0,
/* 1 */ WEATHERTAG_TYPE_UNK1,
/* 2 */ WEATHERTAG_TYPE_WINTERFOG,
/* 3 */ WEATHERTAG_TYPE_UNK3,
/* 4 */ WEATHERTAG_TYPE_UNK4,
/* 5 */ WEATHERTAG_TYPE_UNK5,
/* 6 */ WEATHERTAG_TYPE_WATERMURK,
/* 7 */ WEATHERTAG_TYPE_LOCALDAY2RAIN,
} WeatherTagType;
#endif // Z_EN_WEATHER_TAG_H #endif // Z_EN_WEATHER_TAG_H

10
tables/functions.txt
View File

@ -7915,7 +7915,7 @@
0x8096611C:("func_8096611C",), 0x8096611C:("func_8096611C",),
0x809661BC:("EnMm_Update",), 0x809661BC:("EnMm_Update",),
0x80966238:("EnMm_Draw",), 0x80966238:("EnMm_Draw",),
0x80966410:("func_80966410",), 0x80966410:("EnWeatherTag_SetupAction",),
0x8096641C:("EnWeatherTag_Destroy",), 0x8096641C:("EnWeatherTag_Destroy",),
0x8096642C:("EnWeatherTag_Init",), 0x8096642C:("EnWeatherTag_Init",),
0x80966608:("func_80966608",), 0x80966608:("func_80966608",),
@ -7923,7 +7923,7 @@
0x8096689C:("func_8096689C",), 0x8096689C:("func_8096689C",),
0x80966A08:("func_80966A08",), 0x80966A08:("func_80966A08",),
0x80966A68:("func_80966A68",), 0x80966A68:("func_80966A68",),
0x80966AE4:("func_80966AE4",), 0x80966AE4:("EnWeatherTag_Die",),
0x80966B08:("func_80966B08",), 0x80966B08:("func_80966B08",),
0x80966BF4:("func_80966BF4",), 0x80966BF4:("func_80966BF4",),
0x80966D20:("func_80966D20",), 0x80966D20:("func_80966D20",),
@ -7934,9 +7934,9 @@
0x80966FEC:("func_80966FEC",), 0x80966FEC:("func_80966FEC",),
0x80967060:("func_80967060",), 0x80967060:("func_80967060",),
0x80967148:("func_80967148",), 0x80967148:("func_80967148",),
0x809671A8:("func_809671A8",), 0x809671A8:("EnWeatherTag_DoNothing",),
0x809671B8:("func_809671B8",), 0x809671B8:("EnWeatherTag_Unused_809671B8",),
0x80967250:("func_80967250",), 0x80967250:("EnWeatherTag_Unused_80967250",),
0x809672DC:("func_809672DC",), 0x809672DC:("func_809672DC",),
0x809674C8:("func_809674C8",), 0x809674C8:("func_809674C8",),
0x80967608:("func_80967608",), 0x80967608:("func_80967608",),