From a5e19ffbabe0e29c8af83caec479bd0eb97cd07a Mon Sep 17 00:00:00 2001 From: Alex Harrison Date: Sat, 22 Feb 2025 21:26:21 -0700 Subject: [PATCH 1/2] document static match nametags struct --- MexTK/include/match.h | 14 +++++++++++++- MexTK/include/structs.h | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/MexTK/include/match.h b/MexTK/include/match.h index 51a255d7..72e0d83b 100644 --- a/MexTK/include/match.h +++ b/MexTK/include/match.h @@ -612,6 +612,17 @@ struct MatchOffscreen MatchLupe lupe[6]; }; +struct MatchNametags { + JOBJDesc *joint; // 0x0 non-null + void *anim_joint; // 0x4 null + void *mat_anim_joint; // 0x8 non-null + void *shape_anim_joint; // 0xC null + + // initialized in HUD_InitNametag (802fcf38) + // GOBJs for the nametags / player indicators + GOBJ *gobjs[6]; // 0x10 all are non-null +}; + struct ExclamData { GOBJ *gobj; // 0x0 @@ -2817,6 +2828,7 @@ static MatchCamera *stc_matchcam = 0x80452c68; static COBJ **stc_matchcam_cobj = R13 + -0x523c; static MatchHUD *stc_matchhud = 0x804a0fd8; static MatchOffscreen *stc_match_offscreen = 0x804a1de0; +static MatchNametags *stc_match_nametags = 0x804a1ed0; static ExclamData *stc_exclam_data = 0x803f9628; // 8 of these static HSD_Archive **stc_ifall_archive = 0x804d6d5c; static CmSubject **stc_match_camera_subject = 0x804d6468; // linked list of all camera boxes @@ -2899,4 +2911,4 @@ void Match_InitEffects(); void Match_IndexAuxAnim(CharacterKind c_kind, HSD_Archive *archive, int anim_kind); void Match_ClearAuxAnim(); char *Match_GetVIWaitFilename(CharacterKind c_kind); -#endif \ No newline at end of file +#endif diff --git a/MexTK/include/structs.h b/MexTK/include/structs.h index 2057612e..21abeddb 100644 --- a/MexTK/include/structs.h +++ b/MexTK/include/structs.h @@ -111,6 +111,7 @@ typedef struct MatchInit MatchInit; typedef struct Match Match; typedef struct MatchLupe MatchLupe; typedef struct MatchOffscreen MatchOffscreen; +typedef struct MatchNametags MatchNametags; typedef struct MatchHUD MatchHUD; typedef struct MatchHUDElement MatchHUDElement; typedef struct MatchHUDStock MatchHUDStock; @@ -324,4 +325,4 @@ typedef struct MEXPlaylistEntry MEXPlaylistEntry; typedef struct MexCostumeDesc MexCostumeDesc; typedef struct MexCostumeDescAccessory MexCostumeDescAccessory; -#endif \ No newline at end of file +#endif From 5139c31eb4998fa1f431c7e1bc791e65cbafa06c Mon Sep 17 00:00:00 2001 From: Alex Harrison Date: Mon, 24 Feb 2025 13:32:31 -0700 Subject: [PATCH 2/2] add static offscreen arrows HUD struct --- MexTK/include/match.h | 12 +++++++----- MexTK/include/structs.h | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/MexTK/include/match.h b/MexTK/include/match.h index 72e0d83b..eef8696e 100644 --- a/MexTK/include/match.h +++ b/MexTK/include/match.h @@ -611,13 +611,14 @@ struct MatchOffscreen GXColor lupe_color[4]; // 0x4 MatchLupe lupe[6]; }; +struct MatchOffscreenArrows +{ + JOBJSet *rarwmdls_jobjset; + GOBJ *gobjs[4]; +}; struct MatchNametags { - JOBJDesc *joint; // 0x0 non-null - void *anim_joint; // 0x4 null - void *mat_anim_joint; // 0x8 non-null - void *shape_anim_joint; // 0xC null - + JOBJSet nametag_jobjset; // initialized in HUD_InitNametag (802fcf38) // GOBJs for the nametags / player indicators GOBJ *gobjs[6]; // 0x10 all are non-null @@ -2828,6 +2829,7 @@ static MatchCamera *stc_matchcam = 0x80452c68; static COBJ **stc_matchcam_cobj = R13 + -0x523c; static MatchHUD *stc_matchhud = 0x804a0fd8; static MatchOffscreen *stc_match_offscreen = 0x804a1de0; +static MatchOffscreenArrows *stc_match_offscreen_arrows = 0x804a1f10; static MatchNametags *stc_match_nametags = 0x804a1ed0; static ExclamData *stc_exclam_data = 0x803f9628; // 8 of these static HSD_Archive **stc_ifall_archive = 0x804d6d5c; diff --git a/MexTK/include/structs.h b/MexTK/include/structs.h index 21abeddb..2539003c 100644 --- a/MexTK/include/structs.h +++ b/MexTK/include/structs.h @@ -111,6 +111,7 @@ typedef struct MatchInit MatchInit; typedef struct Match Match; typedef struct MatchLupe MatchLupe; typedef struct MatchOffscreen MatchOffscreen; +typedef struct MatchOffscreenArrows MatchOffscreenArrows; typedef struct MatchNametags MatchNametags; typedef struct MatchHUD MatchHUD; typedef struct MatchHUDElement MatchHUDElement;