From 2f7f53fccc69a7f5f5686b1af932d112f93700fa Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Mon, 20 Nov 2023 21:17:53 -0600
Subject: [PATCH 1/2] some updates related to announcements

---
 df.announcements.xml | 10 +++++-----
 df.world.xml         |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/df.announcements.xml b/df.announcements.xml
index acef37714..e49c8272e 100644
--- a/df.announcements.xml
+++ b/df.announcements.xml
@@ -460,7 +460,7 @@
         <bool name='bright' init-value='true'/>
     </struct-type>
 
-    <struct-type type-name='report_init' comment='allocated on the stack, included in df-structures to assist with disassembly'>
+    <struct-type type-name='announcement_infost' comment='allocated on the stack, included in df-structures to assist with disassembly'>
         <enum base-type='int16_t' type-name='announcement_type' name='type'/>
         <int16_t name='color'/>
         <bool name='bright'/>
@@ -469,10 +469,10 @@
         <compound type-name='coord' name='pos2'/>
         <enum base-type='int32_t' type-name='report_zoom_type' name='zoom_type2'/>
         <int16_t name='display_timer' init-value='2000' comment='graphical frames for announcement bar to linger on last line with no new announcement'/>
-        <pointer type-name='unit' name='unit1'/>
-        <pointer type-name='unit' name='unit2'/>
-        <int32_t name='unk_v40_1' init-value='-1' comment='same as unknown field in report'/>
-        <int32_t name='unk_v40_2' init-value='-1' comment='same as unknown field in report'/>
+        <pointer type-name='unit' name='unit_a'/>
+        <pointer type-name='unit' name='unit_d'/>
+        <int32_t name='activity_id' init-value='-1' comment='same as unknown field in report'/>
+        <int32_t name='activity_event_id' init-value='-1' comment='same as unknown field in report'/>
         <int32_t name='speaker_id' ref-target='unit'/>
         <bitfield base-type='uint8_t' name='flags'>
             <flag-bit name='hostile_combat' comment='hunting or combat report, not sparring'/>
diff --git a/df.world.xml b/df.world.xml
index e205dcd8d..9442ba56b 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -1050,12 +1050,12 @@
 
         -- Reports and announcements
 
-        <compound name='status'>
+        <compound name='status'> announcement_handlerst
             dtor 85356e0
             <stl-vector name='reports' pointer-type='report'/>
             <stl-vector name='announcements' pointer-type='report'/>
             <stl-vector name='popups' pointer-type='popup_message'/>
-            <compound name='unk_v50_1' type-name='markup_text_boxst'/>
+            <compound name='mega_text' type-name='markup_text_boxst'/>
 
             <int32_t name='next_report_id'/>
             <bitfield name='flags'>
@@ -1068,8 +1068,8 @@
             <stl-vector name='mission_reports' pointer-type='mission_report'/>
             <stl-vector name='spoils_reports' pointer-type='spoils_report' since='v0.44.06'/>
             <stl-vector name='interrogation_reports' pointer-type='interrogation_report' since='v0.47.01'/>
-            <stl-vector name='unk_v50_2'/>
-            <stl-vector name='unk_v50_3'/>
+            <stl-vector name='announcement_alert'/>
+            <stl-vector name='alert_button_announcement_id'/>
             <int32_t name='display_timer'/>
 
             <compound name='slots'>

From 97104c5f7531f1a73258c7ac626678318cef9c94 Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Tue, 21 Nov 2023 04:59:35 -0600
Subject: [PATCH 2/2] add correlated changes to `report`

---
 df.announcements.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/df.announcements.xml b/df.announcements.xml
index e49c8272e..39f2a19e0 100644
--- a/df.announcements.xml
+++ b/df.announcements.xml
@@ -411,7 +411,7 @@
         <pointer name='unused' comment='needed to fix alignment on 64-bit platforms'/>
     </struct-type>
 
-    <struct-type type-name='report'
+    <struct-type type-name='report' original-name='announcementst'
                  instance-vector='$global.world.status.reports' key-field='id'>
         <enum base-type='int16_t' name='type' type-name='announcement_type'
               comment='valid only if coordinates are'/>
@@ -442,8 +442,8 @@
         <int32_t name='year'/>
         <int32_t name='time'/>
 
-        <int32_t name='unk_v40_1' init-value='-1' since='v0.40.01'/>
-        <int32_t name='unk_v40_2' init-value='-1' since='v0.40.01'/>
+        <int32_t name='activity_id' init-value='-1' since='v0.40.01'/>
+        <int32_t name='activity_event_id' init-value='-1' since='v0.40.01'/>
         <int32_t name='speaker_id' ref-target='unit' since='v0.40.01' comment='unit speaking the conversation'/>
     </struct-type>