diff options
| author | Roman971 <32455037+Roman971@users.noreply.github.com> | 2020-03-22 00:46:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 00:46:28 +0100 |
| commit | f0026cee247837b70601823a389f4c03eec69fe6 (patch) | |
| tree | 1ccde043ac70fdd13b6ba2bcc62b021f2c5cd020 /src/code | |
| parent | af62b0e7d7d78a4060cf909b4ac1a4182a04a9db (diff) | |
| parent | 8c17271ca3eca71427d06a3a16765ae346a5f030 (diff) | |
Merge pull request #16 from fig02/en_dog
en_dog OK
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 11 | ||||
| -rw-r--r-- | src/code/z_common_data.c | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 71bba11f2..e6a7ec6d0 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4344,17 +4344,6 @@ s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3) return arg2; } -// Some animation related structure -typedef struct -{ - /* 0x00 */ u32 animation; - /* 0x04 */ f32 playbackSpeed; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 frameCount; - /* 0x10 */ u8 unk_10; - /* 0x14 */ f32 transitionRate; -} struct_80034EC0_Entry; // size = 0x18 - void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* arg1, s32 arg2) { f32 frameCount; diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c index 63802a742..0625a2b54 100644 --- a/src/code/z_common_data.c +++ b/src/code/z_common_data.c @@ -14,7 +14,7 @@ void SaveContext_Init(void) gSaveContext.chamber_cutscene_num = 0; gSaveContext.next_day_time = 0xFFFF; gSaveContext.environment_time = 0; - gSaveContext.unk_141C = 1; + gSaveContext.dogIsLost = 1; gSaveContext.transition_type = 0xFF; gSaveContext.unk_13EE = 50; } |