mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-05-31 01:15:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16 from fig02/en_dog

Browse Source 
en_dog OK
This commit is contained in:
Roman971
2020-03-22 00:46:28 +01:00
committed by GitHub
parent af62b0e7d7 8c17271ca3
commit f0026cee24
31 changed files with 620 additions and 1251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
-11
View File
@@ -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;
src/code/z_common_data.c
+1 -1
View File
@@ -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;
}