Merge branch 'master' into z_rcp

include/functions.h

@@ -796,10 +796,8 @@ void func_800694A0(GlobalContext* globalCtx, s16 drawId);
 // ? func_8006BA00(?);
 // ? func_8006BA30(?);
 void Audio_PlaySoundAtPosition(GlobalContext* globalCtx, Vec3f* pos2, s32 radius, u16 sfxId);
-// ? func_8006BBC0(?);
-// ? func_8006BE88(?);
-// ? func_8006BF1C(?);
-// ? func_8006C0FC(?);
+u16 ElfMessage_GetSariaText(GlobalContext* globalCtx);
+u16 ElfMessage_GetCUpText(GlobalContext* globalCtx);
 u16 Text_GetFaceReaction(GlobalContext* globalCtx, u32 reactionSet);
 // ? func_8006C3A0(?);
 // ? func_8006C3D0(?);

include/variables.h

@@ -263,8 +263,6 @@ extern s32 D_8011D3AC;
 extern s16 D_8011E0B0;
 extern Color_RGBA8 D_8011E0B4[];
 //extern ? D_8011E0D4;
-//extern ? D_8011F3A0;
-//extern ? D_8011F3D4;
 //extern ? D_8011F830;
 //extern ? D_8011F860;
 //extern ? D_8011F890;

include/z64.h

@@ -803,6 +803,13 @@ typedef struct
     /* 0x00A8 */ View view;
 } SampleContext;
 
+typedef struct {
+    /* 0x00 */ u8 byte0;
+    /* 0x01 */ u8 byte1;
+    /* 0x02 */ u8 byte2;
+    /* 0x03 */ u8 byte3;
+} ElfMessage; // size = 0x4
+
 // Global Context (dbg ram start: 80212020)
 typedef struct GlobalContext {
     /* 0x00000 */ GameState state;
@@ -904,7 +911,7 @@ typedef struct GlobalContext {
     /* 0x11E00 */ EntranceEntry* setupEntranceList;
     /* 0x11E04 */ UNK_PTR setupExitList;
     /* 0x11E08 */ Path* setupPathList;
-    /* 0x11E0C */ UNK_PTR naviMsgSegment;
+    /* 0x11E0C */ ElfMessage* cUpElfMsgs;
     /* 0x11E10 */ char unk_11E10[0x4];
     /* 0x11E14 */ u8 skyboxId;
     /* 0x11E15 */ s8 sceneLoadFlag; // "fade_direction"

include/z64scene.h

@@ -66,7 +66,7 @@ typedef struct {
 
 typedef struct {
     /* 0x00 */ u8  code;
-    /* 0x01 */ u8  naviMsgNum;
+    /* 0x01 */ u8  cUpElfMsgNum;
     /* 0x04 */ u32 keepObjectId;
 } SCmdSpecialFiles;