mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 06:54:33 +00:00
Code Issues Projects Releases Wiki Activity

en_dog OK

Browse source
This commit is contained in:
fig02 2020-03-20 08:04:35 -04:00
parent 898a103b78
commit f3b509eb68
32 changed files with 373 additions and 1383 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/code/z_actor.c
View file

@ -3763,7 +3763,7 @@ void Actor_SetTextWithPrefix(GlobalContext* globalCtx, Actor* actor, s16 baseTex
case SCENE_HAKADAN_BS:
case SCENE_KAKARIKO:
case SCENE_KAKARIKO3:
case SCENE_IMPA:
case SCENE_BACK_ALLEY:
case SCENE_HUT:
case SCENE_HAKAANA:
case SCENE_HAKASITARELAY:
@ -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;

2
src/code/z_common_data.c
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.richardIsLost = 1;
gSaveContext.transition_type = 0xFF;
gSaveContext.unk_13EE = 50;
}

2
src/code/z_parameter.c
View file

@ -72,7 +72,7 @@ RestrictionFlags sRestrictionFlags[] =
{ SCENE_KOKIRI_HOME5, 0x10, 0x10, 0x15 },
{ SCENE_MALON_STABLE, 0x10, 0x10, 0x15 },
{ SCENE_HUT, 0x10, 0x10, 0x15 },
{ SCENE_IMPA, 0x10, 0x10, 0x15 },
{ SCENE_BACK_ALLEY, 0x10, 0x10, 0x15 },
{ SCENE_LABO, 0x10, 0x10, 0x15 },
{ SCENE_HYLIA_LABO, 0x00, 0x10, 0x15 },
{ SCENE_TENT, 0x10, 0x10, 0x15 },