mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-03 22:44:30 +00:00
z_en_weather_tag decomp (#329)
* Initial commit of weather_tag actor decomp * Formatted source files and updated spec. * Fixed references to the environment context variable that I changed. * Deleted the last of the asm (forgot the stuff in the data folder) * Made all requested changes to z_en_weather_tag * Forgot to change basereg * Removed unnecessary field in weather tag struct * Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * That field in the header was totally necessary, not sure what I was thinking, sorry for all the commits * Renamed what I thought was struct padding to more accurately represent the fact that that field is an unused variable. * Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
parent
4bd417aeba
commit
b406e041b3
31 changed files with 335 additions and 1163 deletions
|
@ -329,16 +329,16 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase*
|
|||
break;
|
||||
case 27:
|
||||
if (globalCtx->state.frames & 8) {
|
||||
if (globalCtx->envCtx.unk_8C[0] < 40) {
|
||||
globalCtx->envCtx.unk_8C[0] += 2;
|
||||
globalCtx->envCtx.unk_8C[4] -= 3;
|
||||
globalCtx->envCtx.unk_8C[5] -= 3;
|
||||
if (globalCtx->envCtx.unk_8C[0][0] < 40) {
|
||||
globalCtx->envCtx.unk_8C[0][0] += 2;
|
||||
globalCtx->envCtx.unk_8C[1][1] -= 3;
|
||||
globalCtx->envCtx.unk_8C[1][2] -= 3;
|
||||
}
|
||||
} else {
|
||||
if (globalCtx->envCtx.unk_8C[0] > 2) {
|
||||
globalCtx->envCtx.unk_8C[0] -= 2;
|
||||
globalCtx->envCtx.unk_8C[4] += 3;
|
||||
globalCtx->envCtx.unk_8C[5] += 3;
|
||||
if (globalCtx->envCtx.unk_8C[0][0] > 2) {
|
||||
globalCtx->envCtx.unk_8C[0][0] -= 2;
|
||||
globalCtx->envCtx.unk_8C[1][1] += 3;
|
||||
globalCtx->envCtx.unk_8C[1][2] += 3;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue