Correct DDGame field offsets from constructor decompilation

Major fixes from analyzing the full 884-line DDGame__Constructor:
- task_ptrs were at wrong offset (0x11B0 vs correct 0x46C-0x488)
- Map 0x000-0x510 range densely: arrows, sprite regions, collision
- DDGameWrapper is ~28KB+ (not 0x500), accesses DWORD 0x1BBA
- Add 5 new function addresses: SpriteRegion ctor, GfxHandler/Dir ops
- Rename 5 functions in Ghidra (SpriteRegion__Constructor, etc.)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

crates/openwa-types/src/address.rs

@@ -140,10 +140,15 @@ pub mod va {
     pub const LOAD_SPRITE: u32 = 0x0052_3400;
     pub const CONSTRUCT_OPENGL_CPU: u32 = 0x005A_0850;
     pub const OPENGL_INIT: u32 = 0x0059_F000;
+    pub const DDGAME_INIT_FIELDS: u32 = 0x0052_6120;
+    pub const GFX_HANDLER_LOAD_DIR: u32 = 0x0056_63E0;
+    pub const GFX_DIR_FIND_ENTRY: u32 = 0x0056_6520;
+    pub const GFX_DIR_LOAD_IMAGE: u32 = 0x0056_66D0;
 
     // === Landscape ===
 
     pub const CONSTRUCT_PC_LANDSCAPE: u32 = 0x0057_ACB0;
+    pub const CONSTRUCT_SPRITE_REGION: u32 = 0x0057_DB20;
     pub const REDRAW_LAND_REGION: u32 = 0x0057_CC10;
     pub const WRITE_LAND_RAW: u32 = 0x0057_C300;
 

crates/openwa-types/src/ddgame.rs

@@ -6,98 +6,123 @@ use crate::task::Ptr32;
 /// display, landscape, sound, graphics handlers, and task state machines.
 ///
 /// Allocated in DDGame__Constructor (0x56E220).
-/// Vtable set via DDGameWrapper at 0x66A30C.
+/// The DDGame pointer is stored at DDGameWrapper+0x488 (DWORD index 0x122).
 ///
-/// PARTIAL: Only landmark offsets are defined. The vast majority of fields
-/// are unknown. Use the offset constants below for field access.
+/// PARTIAL: Fields up to 0x510 are densely mapped from the constructor.
+/// Beyond that, only scattered fields are known — use the `offsets` module.
 ///
-/// Note: Ghidra decompiles DDGame constructor with DWORD-indexed offsets
-/// (param_2[0x122] etc.), but these are byte offsets in the struct below.
-/// Conversion: dword_index * 4 = byte_offset.
+/// Note on offsets: The constructor accesses DDGame fields via
+/// `*(param_2[0x122] + byte_offset)` — these are byte offsets, NOT DWORD-indexed.
+/// DWORD indexing only applies to param_2 (DDGameWrapper) itself.
 #[repr(C)]
 pub struct DDGame {
-    /// 0x0000-0x0023: Header region
-    pub _header: [u8; 0x24],
-    /// 0x0024: Game state pointer
+    /// 0x000: Base value (param_5 from constructor)
+    pub _base_000: Ptr32,
+    /// 0x004: Context pointer (param_3)
+    pub _context: Ptr32,
+    /// 0x008: param_4
+    pub _param_008: Ptr32,
+    /// 0x00C: Allocated object (0x608 bytes, conditional)
+    pub _object_00c: Ptr32,
+    /// 0x010: param_6
+    pub _param_010: Ptr32,
+    /// 0x014: param_7
+    pub _param_014: Ptr32,
+    /// 0x018: param_8
+    pub _param_018: Ptr32,
+    /// 0x01C: Caller/parent pointer (param_1)
+    pub _caller: Ptr32,
+    /// 0x020: PCLandscape pointer (copied from DDGameWrapper[0x133])
+    pub landscape: Ptr32,
+    /// 0x024: Game state pointer (param_10)
     pub game_state: Ptr32,
-    /// 0x0028: Unknown parameter from constructor
-    pub _param_28: Ptr32,
-    /// 0x002C-0x11AF: Unknown fields
-    pub _unknown_002c: [u8; 0x1184],
-    /// 0x11B0-0x11BF: Task objects region (5 state machine pointers)
-    /// Ghidra: param[0x46C..0x47C] (dword-indexed)
-    pub task_ptrs: [Ptr32; 5],
-    /// 0x11C4-0x1217: Unknown
-    pub _unknown_11c4: [u8; 0x54],
-    /// 0x1218-0x1223: Game global / WormKit-known offsets area
-    /// Note: WormKit documents DDGame+0x488 as game_global, but that's
-    /// relative to the DDGame ptr held in DDGameWrapper[0x122].
-    /// Since DDGameWrapper[0x122] points to THIS struct at offset 0,
-    /// these WormKit offsets map directly.
-    pub _unknown_1218: [u8; 0x270],
-    /// 0x1488-0x3547: Unknown fields
-    pub _unknown_1488: [u8; 0x20C0],
-    /// 0x3548: Display mode pointer
-    pub display_mode: Ptr32,
-    /// 0x354C: Display width
-    pub display_width: u32,
-    /// 0x3550: Display param (init 0)
-    pub _display_3550: u32,
-    /// 0x3554: Display param (init 0)
-    pub _display_3554: u32,
-    /// 0x3558-0x355F: Unknown
-    pub _unknown_3558: [u8; 8],
-    /// 0x3560: Display center X (width / 2)
-    pub display_center_x: u32,
-    /// 0x3564: Display center Y (height / 2)
-    pub display_center_y: u32,
-    /// 0x3568-0x3577: Unknown
-    pub _unknown_3568: [u8; 0x10],
-    /// 0x3578: Window handle (HWND)
-    pub hwnd: Ptr32,
-    /// 0x357C-0x358C: Unknown
-    pub _unknown_357c: [u8; 0x11],
-    /// 0x358D-0x398C: Palette entries (0x100 * 4 = 1024 bytes)
-    pub palette: [u8; 0x400],
-    /// 0x398D-0x3D8F: Unknown display fields
-    pub _unknown_398d: [u8; 0x403],
-    /// 0x3D90: Graphics constant (init 0x100)
-    pub _gfx_3d90: u32,
-    /// 0x3D94: Graphics constant (init 0xFFFFFFFF)
-    pub _gfx_3d94: u32,
-    /// 0x3D98: Graphics object pointers (4 entries)
-    pub gfx_objects: [Ptr32; 4],
-    /// 0x3DA8-0x98B7: Remaining fields
-    pub _unknown_3da8: [u8; 0x5B10],
+    /// 0x028: param_9
+    pub _param_028: Ptr32,
+    /// 0x02C: Secondary GfxDir object (0x70C bytes, conditional on GfxHandler 1)
+    pub secondary_gfxdir: Ptr32,
+    /// 0x030: Gradient image pointer
+    pub gradient_image: Ptr32,
+    /// 0x034: Gradient image 2 pointer
+    pub gradient_image_2: Ptr32,
+    /// 0x038-0x0B4: Arrow sprite object pointers (32 entries)
+    pub arrow_sprites: [Ptr32; 32],
+    /// 0x0B8-0x134: Arrow GfxDir pointers (32 entries, conditional)
+    pub arrow_gfxdirs: [Ptr32; 32],
+    /// 0x138: DisplayGfx object pointer (vtable 0x664144)
+    pub display_gfx: Ptr32,
+    /// 0x13C-0x37F: Unknown
+    pub _unknown_13c: [u8; 0x244],
+    /// 0x380: TaskStateMachine pointer (vtable 0x664118, 0x2C bytes)
+    pub task_state_machine: Ptr32,
+    /// 0x384-0x467: Unknown
+    pub _unknown_384: [u8; 0xE4],
+    /// 0x468: Landscape-derived value
+    pub _landscape_val: Ptr32,
+    /// 0x46C-0x488: 8 SpriteRegion pointers (0x9C bytes each, vtable 0x66B268)
+    /// Created by SpriteRegion__Constructor (0x57DB20).
+    /// Each contains 32 TaskStateMachine sub-objects.
+    pub sprite_regions: [Ptr32; 8],
+    /// 0x48C-0x508: Arrow collision region pointers (32 entries)
+    pub arrow_collision_regions: [Ptr32; 32],
+    /// 0x50C: Coordinate list object (capacity 600, 0x12C0 data buffer)
+    pub coord_list: Ptr32,
+    /// 0x510-0x98B7: Remaining fields (sparse — see offsets module)
+    ///
+    /// Known landmarks in this region:
+    /// - 0x64D8: cleared by init
+    /// - 0x72A4: cleared by init
+    /// - 0x730C-0x732C: 9 GfxDir color entries
+    /// - 0x7338: fill pixel value
+    /// - 0x77C4: display-related value
+    /// - 0x7EF8: flag from game_state+0xF914
+    /// - 0x7EFC: init 1
+    /// - 0x8CBC-0x8CF0: 4x 0x10-byte entries (zeroed at +0, +4)
+    /// - 0x9850-0x9884: 4x 0x10-byte entries (zeroed at +0, +4)
+    ///
+    /// Also includes FUN_00526120 zeroed offsets at stride 0x194:
+    /// 0x379C, 0x3930, 0x3AC4, 0x3C58, 0x3DEC, 0x3F80, 0x4114, 0x42A8, 0x443C, 0x45D0
+    pub _remaining: [u8; 0x93A8],
 }
 
 const _: () = assert!(core::mem::size_of::<DDGame>() == 0x98B8);
 
 /// Well-known byte offsets into DDGame, for use with raw pointer access.
 ///
-/// These are sourced from WormKit, wkJellyWorm, and Ghidra decompilation.
-/// WormKit documents offsets relative to DDGameWrapper[0x122] which points
-/// to the DDGame allocation.
+/// The DDGame pointer is at DDGameWrapper+0x488 (DWORD index 0x122).
 pub mod offsets {
-    /// Game state pointer
-    pub const GAME_STATE: usize = 0x0024;
+    // === Header / init params (0x000-0x02C) ===
+    pub const LANDSCAPE: usize = 0x020;
+    pub const GAME_STATE: usize = 0x024;
+    pub const SECONDARY_GFXDIR: usize = 0x02C;
+    pub const GRADIENT_IMAGE: usize = 0x030;
 
-    /// Task state machine pointers (5 entries, each Ptr32)
-    pub const TASK_PTRS: usize = 0x11B0;
+    // === Sprite arrays (0x038-0x138) ===
+    pub const ARROW_SPRITES: usize = 0x038;
+    pub const ARROW_GFXDIRS: usize = 0x0B8;
+    pub const DISPLAY_GFX: usize = 0x138;
 
-    /// Display mode pointer
-    pub const DISPLAY_MODE: usize = 0x3548;
-    /// Display width
-    pub const DISPLAY_WIDTH: usize = 0x354C;
-    /// Display center X
-    pub const DISPLAY_CENTER_X: usize = 0x3560;
-    /// Display center Y
-    pub const DISPLAY_CENTER_Y: usize = 0x3564;
-    /// Window handle (HWND)
-    pub const HWND: usize = 0x3578;
-    /// Palette start (0x400 bytes)
-    pub const PALETTE: usize = 0x358D;
+    // === Task/state machines (0x380-0x488) ===
+    pub const TASK_STATE_MACHINE: usize = 0x380;
+    pub const SPRITE_REGIONS: usize = 0x46C;
 
-    /// Graphics object pointers (from DDDisplay__Init)
-    pub const GFX_OBJECTS: usize = 0x3D98;
+    // === Arrow collision (0x48C-0x50C) ===
+    pub const ARROW_COLLISION_REGIONS: usize = 0x48C;
+    pub const COORD_LIST: usize = 0x50C;
+
+    // === WormKit-documented offsets ===
+    pub const WEAPON_TABLE: usize = 0x510;
+    pub const WEAPON_PANEL: usize = 0x548;
+
+    // === FUN_00526120 init offsets (stride 0x194, 10 entries) ===
+    pub const INIT_TABLE_BASE: usize = 0x379C;
+    pub const INIT_TABLE_STRIDE: usize = 0x194;
+
+    // === Sparse fields in upper region ===
+    pub const FIELD_64D8: usize = 0x64D8;
+    pub const FIELD_72A4: usize = 0x72A4;
+    pub const GFX_COLOR_ENTRIES: usize = 0x730C;
+    pub const FILL_PIXEL: usize = 0x7338;
+    pub const DISPLAY_77C4: usize = 0x77C4;
+    pub const FLAG_7EF8: usize = 0x7EF8;
+    pub const FIELD_7EFC: usize = 0x7EFC;
 }

crates/openwa-types/src/ddgame_wrapper.rs

@@ -1,23 +1,27 @@
 use crate::task::Ptr32;
 
-/// DDGameWrapper — thin wrapper around DDGame.
+/// DDGameWrapper — large wrapper around DDGame.
 ///
-/// This is the top-level object created by DDGameWrapper__Constructor (0x56DEF0).
-/// It holds a pointer to the DDGame allocation and graphics handler references.
+/// Created by DDGameWrapper__Constructor (0x56DEF0).
+/// Holds the DDGame pointer, graphics handlers, landscape, and display state.
 ///
 /// Vtable: 0x66A30C
 ///
-/// Note: Ghidra shows DWORD-indexed offsets (param_1[0x122] etc.).
+/// Note: Ghidra shows DWORD-indexed offsets (param_2[0x122] etc.).
 /// Byte offset = dword_index * 4.
 ///
-/// PARTIAL: Only confirmed fields from the constructor are defined.
+/// The constructor accesses at least up to DWORD index 0x1BBA (byte offset 0x6EE8),
+/// making this object at least ~28KB. Total size is not yet determined.
+///
+/// PARTIAL: Only confirmed fields are defined. The repr(C) struct uses
+/// a conservative size that covers known fields. The actual object is larger.
 #[repr(C)]
 pub struct DDGameWrapper {
     /// 0x000: Vtable pointer (0x66A30C)
     pub vtable: Ptr32,
     /// 0x004-0x487: Unknown fields
     pub _unknown_004: [u8; 0x484],
-    /// 0x488: Pointer to DDGame allocation
+    /// 0x488: Pointer to DDGame allocation (DWORD index 0x122)
     pub ddgame: Ptr32,
     /// 0x48C: Secondary DDGame struct pointer (0x2C bytes, conditional)
     pub ddgame_secondary: Ptr32,
@@ -27,19 +31,28 @@ pub struct DDGameWrapper {
     pub gfx_handler_0: Ptr32,
     /// 0x4C4: Graphics handler 1 pointer (optional)
     pub gfx_handler_1: Ptr32,
-    /// 0x4C8: Graphics mode flag
+    /// 0x4C8: Graphics mode flag (DWORD index 0x132)
     pub gfx_mode: u32,
-    /// 0x4CC: PCLandscape object pointer
+    /// 0x4CC: PCLandscape object pointer (DWORD index 0x133)
     pub landscape: Ptr32,
-    /// 0x4D0: Constructor param_2
-    pub _param_4d0: u32,
-    /// 0x4D4: Constructor param_3
-    pub _param_4d4: u32,
-    /// 0x4D8-end: Unknown trailing fields
-    /// Size uncertain — DDGameWrapper total size not yet determined
-    pub _unknown_4d8: [u8; 0x28],
+    /// 0x4D0: DDDisplay/display object pointer (DWORD index 0x134)
+    /// Has vtable methods at +0x10, +0x5C, +0x7C, +0x94
+    pub display: Ptr32,
+    /// 0x4D4: Unknown
+    pub _field_4d4: u32,
+    /// 0x4D8: Init 0 (DWORD index 0x136)
+    pub _field_4d8: u32,
+    /// 0x4DC: Calculated value (DWORD index 0x137)
+    pub _field_4dc: u32,
+    /// 0x4E0: Init -100 / 0xFFFFFF9C (DWORD index 0x138)
+    pub _field_4e0: u32,
+    /// 0x4E4-0x6EEB: Unknown fields (extends to at least DWORD 0x1BBA)
+    pub _unknown_4e4: [u8; 0x6A08],
+    /// 0x6EEC: Init 0 (DWORD index 0x1BBA)
+    pub _field_6eec: u32,
+    /// 0x6EF0-end: Unknown trailing fields
+    pub _unknown_6ef0: [u8; 0x10],
 }
 
-// DDGameWrapper total size is uncertain. This is a minimum based on known fields.
-// Remove or update this assertion when the true size is determined.
-const _: () = assert!(core::mem::size_of::<DDGameWrapper>() == 0x500);
+// This is a minimum estimate. The actual object is likely larger.
+const _: () = assert!(core::mem::size_of::<DDGameWrapper>() == 0x6F00);