diff options
| author | fig02 <fig02srl@gmail.com> | 2020-03-20 08:04:35 -0400 |
|---|---|---|
| committer | fig02 <fig02srl@gmail.com> | 2020-03-20 08:04:35 -0400 |
| commit | f3b509eb68a3563b48d4cc2226e93a213d6bf427 (patch) | |
| tree | e707301b9146644287b7f06e6d3fdbcfbfe0c9c7 /src/code | |
| parent | 898a103b78d458d727bbf7ff9110f6544c86c837 (diff) | |
en_dog OK
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 13 | ||||
| -rw-r--r-- | src/code/z_common_data.c | 2 | ||||
| -rw-r--r-- | src/code/z_parameter.c | 2 |
3 files changed, 3 insertions, 14 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 3b6698c30..9c9690299 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -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; diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c index 63802a742..23197ea6c 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.richardIsLost = 1; gSaveContext.transition_type = 0xFF; gSaveContext.unk_13EE = 50; } diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index cb5fb307c..0ec248605 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -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 }, |