summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorfullgrowngaming <42490167+fullgrowngaming@users.noreply.github.com>2020-08-20 18:28:41 -0700
committerGitHub <noreply@github.com>2020-08-20 21:28:41 -0400
commitb406e041b3fff45d4c0c98d637ae8bb91299acec (patch)
tree970d5d66021eeb815fdec9bd84564d7e1e718ac9 /src/code
parent4bd417aebac788852e822186a51db52e33a0774d (diff)
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>
Diffstat (limited to 'src/code')
-rw-r--r--src/code/z_demo.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index 1e03b4e61..8bbc1d9b5 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -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;