move en_dog progress from old repo

Cuphat · Mar 17, 2020 · 898a103 · 898a103
1 parent 458593f
commit 898a103
Show file tree

Hide file tree

Showing 5 changed files with 397 additions and 18 deletions.
diff --git a/include/z64.h b/include/z64.h
@@ -159,7 +159,9 @@ typedef struct
     /* 0x1360 */ s32          scene_setup_index;
     /* 0x1364 */ s32          respawn_flag; // "restart_flag"
     /* 0x1368 */ RespawnData  respawn[3]; // "restart_data"
-    /* 0x13BC */ char         unk_13BC[0x000B];
+    /* 0x13BC */ char         unk_13BC[0x0008];
+    /* 0x13C4 */ s16          dogParams;
+    /* 0x13C6 */ char         unk_13C6[0x0001];
     /* 0x13C7 */ u8           unk_13C7;
     /* 0x13C8 */ u16          nayrus_love_timer;
     /* 0x13CA */ char         unk_13CA[0x0002];
@@ -203,7 +205,7 @@ typedef struct
     /* 0x1418 */ u8           fade_duration;
     /* 0x1419 */ u8           unk_1419; // transition related
     /* 0x141A */ u16          environment_time;
-    /* 0x141C */ u8           unk_141C;
+    /* 0x141C */ u8           richardIsLost;
     /* 0x141D */ u8           transition_type;
     /* 0x141E */ char         unk_141E[0x0002];
     /* 0x1420 */ s16          world_map_area;
@@ -1027,6 +1029,17 @@ typedef struct
     /* 0x3E */ u16 unk_3E; /* Probably Padding */
 } SkelAnime; // size = 0x40
 
+// 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
+
 typedef struct
 {
     /* 0x00 */ u32 unk_00;

diff --git a/include/z64scene.h b/include/z64scene.h
@@ -475,7 +475,7 @@ typedef enum
     /* 0x32 */ SCENE_NIGHT_SHOP,
     /* 0x33 */ SCENE_FACE_SHOP,
     /* 0x34 */ SCENE_LINK_HOME,
-    /* 0x35 */ SCENE_IMPA,
+    /* 0x35 */ SCENE_BACK_ALLEY,
     /* 0x36 */ SCENE_MALON_STABLE,
     /* 0x37 */ SCENE_LABO,
     /* 0x38 */ SCENE_HYLIA_LABO,