feat: port DisplayGfx slots 4 (set_layer_color) and 6 (get_sprite_info)

Port two more DisplayGfx vtable methods to pure Rust (20/38 total):

- Slot 4 (set_layer_color): palette slot allocator scans slot_table for
consecutive free entries, allocates and initializes a PaletteContext
with the claimed palette range.
- Slot 6 (get_sprite_info): dispatches to Sprite or SpriteBank paths,
returning sprite metadata (data, flags, width) via output pointers.
Fixed vtable signature from 3 to 4 stack params (RET 0x10).

Type safety improvements:
- Define SpriteBank (0x17C), SpriteBankFrame (0xC) structs
- Add typed SpriteVtable (8 slots) and SpriteBankVtable (3 slots)
- Rename DisplayBase fields: sprite_array_0/1/2 → sprite_palettes/
sprite_ptrs/sprite_banks; _field_312c/352c → slot_table_guard/sentinel
- Move Sprite/SpriteBank/PaletteContext addresses to home modules
- Move SpriteId enum to dedicated sprite_id module
- Delete obsolete dd_display_sprite_offsets and sprite_vtable modules
- Label 7 functions + STR_SPRITE in Ghidra

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

crates/openwa-core/src/address.rs

@@ -86,6 +86,16 @@ pub mod va {
     pub use crate::input::controller::INPUT_CTRL_VTABLE;
     pub use crate::task::game_task::SOUND_EMITTER_VTABLE;
 
+    // Sprite, SpriteBank, PaletteContext — defined alongside their structs
+    pub use crate::render::palette::{
+        PALETTE_CONTEXT_INIT, PALETTE_CONTEXT_INIT_RANGE, PALETTE_CONTEXT_MAP_COLOR,
+    };
+    pub use crate::render::sprite::SPRITE_BANK_VTABLE;
+    pub use crate::render::sprite::{
+        CONSTRUCT_SPRITE, DESTROY_SPRITE, LOAD_SPRITE_FROM_VFS, PROCESS_SPRITE,
+        SPRITE_BANK_GET_INFO, SPRITE_GET_INFO, SPRITE_VTABLE,
+    };
+
     crate::define_addresses! {
         class "DDGameWrapper" {
             /// DDGameWrapper vtable
@@ -200,21 +210,6 @@ pub mod va {
             vtable WATER_EFFECT_VTABLE = 0x0066_B268;
         }
 
-        class "Sprite" {
-            /// Sprite vtable (0x70-byte objects, 8 entries)
-            vtable SPRITE_VTABLE = 0x0066_418C;
-            /// ConstructSprite — usercall EAX=sprite_ptr, ECX=context_ptr
-            ctor/Usercall CONSTRUCT_SPRITE = 0x004F_AA30;
-            /// Sprite destructor — thiscall, vtable slot 0
-            fn/Thiscall DESTROY_SPRITE = 0x004F_AA80;
-            /// LoadSpriteFromVfs
-            fn/Usercall LOAD_SPRITE_FROM_VFS = 0x004F_AAF0;
-            /// ProcessSprite — parses .spr binary format
-            fn/Usercall PROCESS_SPRITE = 0x004F_AB80;
-            // Note: vtable 0x664144 is BitGrid display-layer vtable,
-            // now defined via #[vtable] macro as BITGRID_DISPLAY_VTABLE.
-        }
-
         class "GfxHandler" {
             /// GfxHandler vtable
             vtable GFX_DIR_VTABLE = 0x0066_B280;
@@ -228,6 +223,11 @@ pub mod va {
             fn GFX_DIR_LOAD_IMAGE = 0x0056_66D0;
         }
 
+        class "DisplayBase" {
+            /// DisplayBase__AllocPaletteSlots — usercall EAX=count, 1 stack(this)
+            fn/Usercall DISPLAY_BASE_ALLOC_PALETTE_SLOTS = 0x0052_3190;
+        }
+
         class "DisplayGfx" {
             /// DisplayGfx constructor
             ctor/Stdcall DISPLAYGFX_CTOR = 0x0056_9C10;
@@ -237,8 +237,13 @@ pub mod va {
             fn/Stdcall DISPLAYGFX_CONSTRUCT_FULL = 0x0056_3FC0;
             /// DisplayGfx init team palette display objects
             fn/Stdcall DISPLAY_GFX_INIT_TEAM_PALETTE_DISPLAY = 0x0057_03E0;
+            /// DisplayGfx__LoadSpriteEx (vtable slot 30) — thiscall
+            fn/Thiscall DISPLAY_GFX_LOAD_SPRITE_EX = 0x0052_3310;
         }
 
+        /// "sprite" type-tag string in .rdata — returned by Sprite/SpriteBank GetInfo
+        global STR_SPRITE = 0x0066_4170;
+
     }
 
     // Backward-compat aliases (not registered separately — same address)
@@ -473,10 +478,6 @@ pub mod va {
         fn OPENGL_INIT = 0x0059_F000;
         /// GfxResource__Create_Maybe
         fn GFX_RESOURCE_CREATE = 0x004F_6300;
-        /// PaletteContext__Init
-        fn/Usercall PALETTE_CONTEXT_INIT = 0x0054_11A0;
-        /// PaletteContext__MapColor — thiscall(palette_ctx, rgb_u32), returns nearest palette index
-        fn/Thiscall PALETTE_CONTEXT_MAP_COLOR = 0x0054_12B0;
         /// SpriteGfxTable__Init
         fn/Fastcall SPRITE_GFX_TABLE_INIT = 0x0054_1620;
         /// RingBuffer__Init

crates/openwa-core/src/display/base.rs

@@ -33,13 +33,15 @@ pub struct DisplayBase<V: Vtable = *const DisplayBaseVtable> {
     pub vtable: V,
     // +0x004: sprite cache wrapper (0x28-byte SpriteCacheWrapper)
     pub sprite_cache: Ptr32,
-    // +0x008..0x1008: sprite pointer array 0 (0x400 entries), zeroed by ctor.
-    // IsSpriteLoaded checks this at offset 0x1008 (which is array 1 below).
-    pub sprite_array_0: [u32; 0x400],
-    // +0x1008..0x2008: sprite pointer array 1 (0x400 entries), zeroed by ctor.
-    pub sprite_array_1: [u32; 0x400],
-    // +0x2008..0x3008: sprite pointer array 2 (0x400 entries), zeroed by ctor.
-    pub sprite_array_2: [u32; 0x400],
+    // +0x008..0x1008: per-slot palette/layer ID (0x400 entries), zeroed by ctor.
+    // Stores which layer (1-3) each sprite slot belongs to.
+    pub sprite_palettes: [u32; 0x400],
+    // +0x1008..0x2008: per-slot Sprite* pointers (0x400 entries), zeroed by ctor.
+    // Points to Sprite objects (0x70 bytes, vtable 0x66418C). Checked by IsSpriteLoaded/GetSpriteInfo.
+    pub sprite_ptrs: [u32; 0x400],
+    // +0x2008..0x3008: per-slot SpriteBank* pointers (0x400 entries), zeroed by ctor.
+    // Points to SpriteBank objects (0x17C bytes). Fallback path in GetSpriteInfo/LoadSpriteComplex.
+    pub sprite_banks: [u32; 0x400],
     // +0x3008..0x3018: gap (0x10 bytes, 4 u32s: indices 0xC02..0xC05)
     pub _gap_3008: [u32; 4],
     // +0x3018: field at u32 index 0xC06, zeroed by ctor
@@ -53,12 +55,16 @@ pub struct DisplayBase<V: Vtable = *const DisplayBaseVtable> {
     // Indexed by layer (valid range 1-3). Returned by set_active_layer (vtable slot 5).
     // Used as palette data input for update_palette (vtable slot 24).
     pub layer_contexts: [u32; 4],
-    // +0x312C: index 0xC4B, zeroed by ctor
-    pub _field_312c: u32,
-    // +0x3130..0x352C: slot_table — 0xFF entries, all initialized to 1 by ctor
+    // +0x312C: Palette slot table guard. Always 0 — prevents palette_slot_alloc
+    // from allocating starting at index 0. Part of the contiguous scan area:
+    // [slot_table_guard(0)] [slot_table(1s)...] [slot_table_sentinel(-1)].
+    pub slot_table_guard: u32,
+    // +0x3130..0x352C: Palette slot table — 0xFF entries, all initialized to 1 by ctor.
+    // Value 1 = available, 0 = in-use. Scanned by palette_slot_alloc (set_layer_color).
     pub slot_table: [u32; 0xFF],
-    // +0x352C: index 0xD4B = 0xFFFFFFFF
-    pub _field_352c: u32,
+    // +0x352C: Palette slot table sentinel. Initialized to -1 (0xFFFFFFFF).
+    // Terminates the palette_slot_alloc scan with failure if no free slots found.
+    pub slot_table_sentinel: u32,
     // +0x3530..0x3540: layer visibility flags (4 entries), zeroed by ctor.
     // Indexed by layer. Cleared to 0 by set_layer_visibility when visible < 0.
     pub layer_visibility: [u32; 4],
@@ -187,8 +193,8 @@ impl DisplayBase {
             *slot = 1;
         }
 
-        // Sentinel value
-        (*this)._field_352c = 0xFFFF_FFFF;
+        // Sentinel value — terminates palette_slot_alloc scan
+        (*this).slot_table_sentinel = 0xFFFF_FFFF;
 
         // Create sprite cache: 0x28 wrapper → 0x3C buffer ctrl → 0x80020 buffer.
         //

crates/openwa-core/src/display/display_vtable.rs

@@ -47,8 +47,19 @@ pub struct DisplayVtable {
     #[slot(5)]
     pub set_active_layer: fn(this: *mut DisplayGfx, layer: i32) -> *mut u8,
     /// get sprite info by layer and id (0x523500, RET 0x10)
+    ///
+    /// Looks up sprite metadata for the given layer ID. Checks sprite_ptrs
+    /// (Sprite* pointers) first, then sprite_banks. On success, writes
+    /// sprite data, flags, and width to the output pointers.
+    /// Returns a pointer to the string "sprite" on success, or 0 on failure.
     #[slot(6)]
-    pub get_sprite_info: fn(this: *mut DisplayGfx, layer: i32, p3: u32, p4: u32) -> u32,
+    pub get_sprite_info: fn(
+        this: *mut DisplayGfx,
+        layer: i32,
+        out_data: *mut u32,
+        out_flags: *mut u32,
+        out_width: *mut u32,
+    ) -> u32,
     /// draw text onto a bitmap surface (0x5236B0, RET 0x1C)
     ///
     /// font_id low 16 bits = font slot (1-based), high 16 bits = extra flags.
@@ -272,10 +283,12 @@ bind_DisplayVtable!(DisplayGfx, base.vtable);
 // Ported DisplayGfx vtable methods
 // =========================================================================
 
+use super::base::DisplayBase;
 use super::gfx::DisplayGfx;
 use super::line_draw;
 use crate::bitgrid::DisplayBitGrid;
 use crate::render::palette::PaletteContext;
+use crate::render::sprite::{Sprite, SpriteBank};
 
 /// Port of DisplayGfx::GetDimensions (vtable slot 1, 0x56A460).
 ///
@@ -770,7 +783,7 @@ pub unsafe extern "thiscall" fn draw_polyline(
 /// Port of DisplayGfx::IsSpriteLoaded (vtable slot 32, 0x56A480).
 ///
 /// Returns 1 if the sprite ID is loaded in any of the three sprite arrays
-/// (DisplayBase sprite_array_1/sprite_array_2, DisplayGfx sprite_table).
+/// (DisplayBase sprite_ptrs/sprite_banks, DisplayGfx sprite_table).
 /// ID must be in range [1, 0x400).
 ///
 /// # Safety
@@ -782,8 +795,8 @@ pub unsafe extern "thiscall" fn is_sprite_loaded(this: *mut DisplayGfx, id: i32)
     }
 
     let base = &(*this).base;
-    if base.sprite_array_1[id as usize] != 0
-        || base.sprite_array_2[id as usize] != 0
+    if base.sprite_ptrs[id as usize] != 0
+        || base.sprite_banks[id as usize] != 0
         || (*this).sprite_table[id as usize] != 0
     {
         1
@@ -792,6 +805,132 @@ pub unsafe extern "thiscall" fn is_sprite_loaded(this: *mut DisplayGfx, id: i32)
     }
 }
 
+/// Port of DisplayGfx::GetSpriteInfo (vtable slot 6, 0x523500).
+///
+/// Looks up sprite metadata for `layer` (valid: 1..=0x3FF). Checks
+/// `sprite_ptrs` (Sprite* pointers) first, then `sprite_banks`
+/// (indexed sprite containers). On success, writes data, flags, and
+/// width to the output pointers and returns a pointer to the static
+/// string "sprite" (0x664170). Returns 0 on failure.
+///
+/// # Safety
+/// `this` must be a valid `*mut DisplayGfx`.
+/// Output pointers must be valid for writing.
+pub unsafe extern "thiscall" fn get_sprite_info(
+    this: *mut DisplayGfx,
+    layer: i32,
+    out_data: *mut u32,
+    out_flags: *mut u32,
+    out_width: *mut u32,
+) -> u32 {
+    if (layer as u32).wrapping_sub(1) > 0x3FE {
+        return 0;
+    }
+
+    let base = &(*this).base;
+
+    // Path 1: Sprite* in sprite_ptrs
+    let sprite_ptr = base.sprite_ptrs[layer as usize];
+    if sprite_ptr != 0 {
+        return sprite_info_from_sprite(
+            sprite_ptr as *const Sprite,
+            out_data,
+            out_flags,
+            out_width,
+        );
+    }
+
+    // Path 2: SpriteBank* in sprite_banks
+    let bank_ptr = base.sprite_banks[layer as usize];
+    if bank_ptr != 0 {
+        return sprite_info_from_bank(
+            bank_ptr as *const SpriteBank,
+            layer,
+            out_data,
+            out_flags,
+            out_width,
+        );
+    }
+
+    0
+}
+
+/// Address of the static "sprite" string in WA.exe .rdata.
+/// Used as a type-tag return value by sprite info functions.
+const SPRITE_STRING: u32 = va::STR_SPRITE;
+
+/// Extract sprite info from a Sprite object — port of Sprite__GetInfo (0x4FAEC0).
+///
+/// Usercall: EAX=Sprite*, ESI=out_data, ECX=out_width, stack=out_flags.
+/// Reads frame_meta_ptr (validity check), packed _unknown_08/fps as data,
+/// max_frames as width (doubled-minus-one if flags & 2), and flags & 1.
+unsafe fn sprite_info_from_sprite(
+    sprite: *const Sprite,
+    out_data: *mut u32,
+    out_flags: *mut u32,
+    out_width: *mut u32,
+) -> u32 {
+    let s = &*sprite;
+
+    // Validity check: frame_meta_ptr must be non-null
+    if s.frame_meta_ptr.is_null() {
+        return 0;
+    }
+
+    // out_data = packed DWORD: _unknown_08 (u16) | fps (u16) << 16
+    *out_data = (s._unknown_08 as u32) | ((s.fps as u32) << 16);
+
+    // Width from max_frames, doubled-minus-one if flags bit 1 set
+    let mut width = s.max_frames as u32;
+    if s.flags & 2 != 0 {
+        width = width * 2 - 1;
+    }
+    *out_width = width;
+
+    *out_flags = (s.flags & 1) as u32;
+
+    crate::rebase::rb(SPRITE_STRING)
+}
+
+/// Extract sprite info from a SpriteBank — port of SpriteBank__GetInfo (0x4F98C0).
+///
+/// Usercall: EAX=layer, ECX=SpriteBank*, ESI=out_width, stack=out_data+out_flags.
+/// Uses the bank's index table to map the layer ID to a frame entry, then
+/// reads width/flags/data from the SpriteBankFrame.
+unsafe fn sprite_info_from_bank(
+    bank: *const SpriteBank,
+    layer: i32,
+    out_data: *mut u32,
+    out_flags: *mut u32,
+    out_width: *mut u32,
+) -> u32 {
+    let b = &*bank;
+
+    if b.frame_table.is_null() {
+        return 0;
+    }
+
+    let entry_idx = *b.index_table.offset((layer - b.base_id) as isize);
+    if entry_idx < 0 || entry_idx >= b.frame_count {
+        return 0;
+    }
+
+    let frame = &*b.frame_table.add(entry_idx as usize);
+
+    *out_data = (frame.data_value as u32) << 8;
+    *out_flags = (frame.flags & 1) as u32;
+
+    if frame.width & 0x8000 != 0 {
+        *out_width = 1;
+    } else if frame.flags & 2 != 0 {
+        *out_width = (frame.width as u32) * 2 - 1;
+    } else {
+        *out_width = frame.width as u32;
+    }
+
+    crate::rebase::rb(SPRITE_STRING)
+}
+
 /// Port of DisplayGfx::DrawViaCallback (vtable slot 21, 0x56B7C0).
 ///
 /// Acquires the render lock, applies camera offset to fixed-point coordinates,
@@ -998,6 +1137,113 @@ pub unsafe extern "thiscall" fn draw_pixel_strip(
     }
 }
 
+/// Port of DisplayGfx::SetLayerColor (vtable slot 4, 0x5231E0).
+///
+/// Allocates a `PaletteContext` for the given layer (1-3) if one doesn't exist.
+/// Finds `color` consecutive available entries in the slot table, claims them,
+/// and initializes a PaletteContext with that palette index range.
+///
+/// # Safety
+/// `this` must be a valid `*mut DisplayGfx`.
+pub unsafe extern "thiscall" fn set_layer_color(this: *mut DisplayGfx, layer: i32, color: i32) {
+    // Layer must be 1, 2, or 3
+    if (layer as u32).wrapping_sub(1) >= 3 {
+        return;
+    }
+
+    // Only allocate if no context exists for this layer
+    if (*this).base.layer_contexts[layer as usize] != 0 {
+        return;
+    }
+
+    // Find `color` consecutive available (non-zero) entries in the slot table area.
+    // The scan covers slot_table_guard (guard=0) + slot_table[0..255] + slot_table_sentinel (sentinel=-1).
+    let start = palette_slot_alloc(&mut (*this).base, color);
+
+    // Allocate PaletteContext (0x72C total, zero first 0x70C)
+    let ctx = crate::wa_alloc::wa_malloc(0x72C);
+    core::ptr::write_bytes(ctx, 0, 0x70C);
+
+    let result = if ctx.is_null() {
+        0u32
+    } else {
+        let ctx = ctx as *mut PaletteContext;
+        palette_context_init(ctx, start as i16, (start as i32 + color - 1) as i16);
+        ctx as u32
+    };
+
+    (*this).base.layer_contexts[layer as usize] = result;
+    (*this).base.layer_visibility[layer as usize] = 0;
+}
+
+/// Palette slot allocator — port of FUN_00523190.
+///
+/// Scans the slot table area (this+0x312C) for `count` consecutive entries
+/// with value > 0 (available). Zeros the found entries to mark them as claimed.
+/// Returns the start index, or -1 if a negative sentinel is hit.
+///
+/// The scan area is: `slot_table_guard` (guard=0) + `slot_table[0..255]` + `slot_table_sentinel` (sentinel=-1).
+/// The guard at index 0 is always 0, so allocations start from index 1.
+/// The sentinel (-1) at index 256 terminates the scan with failure.
+unsafe fn palette_slot_alloc(base: &mut DisplayBase<*const DisplayVtable>, count: i32) -> i32 {
+    let count = count as usize;
+    let table = &base.slot_table_guard as *const u32;
+    // Total entries: slot_table_guard(1) + slot_table(255) + slot_table_sentinel(1) = 257
+    let total = 1 + 0xFF + 1;
+
+    let mut consecutive = 0usize;
+    let mut scan = 0usize;
+
+    loop {
+        if consecutive == count {
+            let start = scan - count;
+            for i in start..scan {
+                *(table.add(i) as *mut u32) = 0;
+            }
+            return start as i32;
+        }
+        if scan >= total {
+            return -1;
+        }
+        let val = *table.add(scan) as i32;
+        scan += 1;
+        if val == 0 {
+            consecutive = 0;
+        } else if val < 0 {
+            return -1;
+        } else {
+            consecutive += 1;
+        }
+    }
+}
+
+/// Initialize a PaletteContext with a palette index range — port of FUN_00541170 + FUN_005411a0.
+///
+/// Sets dirty_range_min/max, fills the free stack with descending indices,
+/// clears in_use flags and cache, then clears the dirty flag.
+unsafe fn palette_context_init(ctx: *mut PaletteContext, range_min: i16, range_max: i16) {
+    (*ctx).dirty_range_min = range_min;
+    (*ctx).dirty_range_max = range_max;
+
+    // PaletteContext__Init (0x5411A0)
+    let range_size = range_max - range_min + 1;
+    (*ctx).cache_count = 0;
+    (*ctx).free_count = range_size;
+
+    // Fill free_stack with [range_max, range_max-1, ..., range_min]
+    if range_size > 0 {
+        for i in 0..range_size as usize {
+            (*ctx).free_stack[i] = (range_max as u8).wrapping_sub(i as u8);
+        }
+    }
+
+    (*ctx).cache_iter = 0;
+    core::ptr::write_bytes((*ctx).in_use.as_mut_ptr(), 0, 256);
+
+    // FUN_00541170 epilogue
+    (*ctx).dirty = 0;
+}
+
 /// Port of DisplayGfx::SetActiveLayer (vtable slot 5, 0x523270).
 ///
 /// Returns the layer context pointer for `layer` (valid: 1, 2, 3), or null

crates/openwa-core/src/render/mod.rs

@@ -4,6 +4,7 @@ pub mod palette;
 pub mod queue;
 pub mod spr;
 pub mod sprite;
+pub mod sprite_id;
 pub mod turn_order;
 
 pub use landscape::{DirtyRect, PCLandscape};

crates/openwa-core/src/render/palette.rs

@@ -101,3 +101,14 @@ pub unsafe fn palette_map_color(ctx: *mut PaletteContext, rgb: u32) -> u32 {
 
     slot_idx as u32
 }
+
+crate::define_addresses! {
+    class "PaletteContext" {
+        /// PaletteContext__Init — usercall EAX=ctx* (no stack params)
+        fn/Usercall PALETTE_CONTEXT_INIT = 0x0054_11A0;
+        /// PaletteContext__InitRange — usercall ESI=ctx*, 2 stack params (range_min, range_max)
+        fn/Usercall PALETTE_CONTEXT_INIT_RANGE = 0x0054_1170;
+        /// PaletteContext__MapColor — thiscall(palette_ctx, rgb_u32), returns nearest palette index
+        fn/Thiscall PALETTE_CONTEXT_MAP_COLOR = 0x0054_12B0;
+    }
+}

crates/openwa-core/src/render/sprite.rs

@@ -1,728 +1,7 @@
-/// Sprite/animation frame IDs. Range 1-696 with gaps at 620-621.
-///
-/// Names preserved from the original sprite file names in the game data.
-/// The original names are terse 8-character identifiers from the game's
-/// sprite sheets.
-///
-/// Source: wkJellyWorm Constants.h
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-#[repr(u32)]
-pub enum SpriteId {
-    Cdrom = 1,
-    CrshairR = 2,
-    CrshairB = 3,
-    CrshairG = 4,
-    CrshairY = 5,
-    CrshairP = 6,
-    CrshairC = 7,
-    SpangleR = 8,
-    SpangleB = 9,
-    SpangleG = 10,
-    SpangleY = 11,
-    SpangleP = 12,
-    SpangleC = 13,
-    Grave1 = 14,
-    Grave2 = 15,
-    Grave3 = 16,
-    Grave4 = 17,
-    Grave5 = 18,
-    Grave6 = 19,
-    ArrowDnR = 20,
-    ArrowDnB = 21,
-    ArrowDnG = 22,
-    ArrowDnY = 23,
-    ArrowDnP = 24,
-    ArrowDnC = 25,
-    ArrowSdR = 26,
-    ArrowSdB = 27,
-    ArrowSdG = 28,
-    ArrowSdY = 29,
-    ArrowSdP = 30,
-    ArrowSdC = 31,
-    CursorR = 32,
-    CursorB = 33,
-    CursorG = 34,
-    CursorY = 35,
-    CursorP = 36,
-    CursorC = 37,
-    MarkerR = 38,
-    MarkerB = 39,
-    MarkerG = 40,
-    MarkerY = 41,
-    MarkerP = 42,
-    MarkerC = 43,
-    CMarker = 44,
-    MineOn = 45,
-    Arrow = 46,
-    MineOff = 47,
-    Missile = 48,
-    Bullet = 49,
-    Grenade = 50,
-    Banana = 51,
-    Mortar = 52,
-    Cluster = 53,
-    Clustlet = 54,
-    PetrolBm = 55,
-    HGrenade = 56,
-    Tamborin = 57,
-    HMissil1 = 58,
-    HMissil2 = 59,
-    AirMisl = 60,
-    SheepFal = 61,
-    Carpet1 = 62,
-    Carpet2 = 63,
-    SheepBrn = 64,
-    SheepLau = 65,
-    Meteor = 66,
-    Drill = 67,
-    RopeTip = 68,
-    RopeCuff = 69,
-    Phone = 70,
-    MbBomb = 71,
-    Letter1 = 72,
-    Letter2 = 73,
-    Vase = 74,
-    VaseBit1 = 75,
-    VaseBit2 = 76,
-    VaseBit3 = 77,
-    Dynamite = 78,
-    FireHit = 79,
-    KamiSmk = 80,
-    BaseHit = 81,
-    Donkey = 82,
-    Fireball = 83,
-    Flame1 = 84,
-    Flame2 = 85,
-    AirJetB = 86,
-    AirJetG = 87,
-    AirJetO = 88,
-    PostBox = 89,
-    ShpTruck = 90,
-    CptTruck = 91,
-    Targets = 92,
-    TargetsV = 93,
-    TargetW = 94,
-    TargetWV = 95,
-    WCrate1 = 96,
-    MCrate1 = 97,
-    UCrate1 = 98,
-    WCrate2 = 99,
-    MCrate2 = 100,
-    UCrate2 = 101,
-    Donor = 102,
-    WCrateV = 103,
-    MCrateV = 104,
-    UCrateV = 105,
-    Fallout = 106,
-    WCrate0 = 107,
-    MCrate0 = 108,
-    UCrate0 = 109,
-    OilDrum1 = 110,
-    OilDrum2 = 111,
-    OilDrum3 = 112,
-    OilDrum4 = 113,
-    UziHit = 114,
-    UziCase = 115,
-    ShotHit = 116,
-    ShotCase = 117,
-    WormHit1 = 118,
-    WormHit2 = 119,
-    Petrol1_ = 120,
-    Petrol2_ = 121,
-    Petrol3_ = 122,
-    Petrol4_ = 123,
-    Petrol1 = 124,
-    Petrol2 = 125,
-    Petrol3 = 126,
-    Petrol4 = 127,
-    Petrol5 = 128,
-    Petrol6 = 129,
-    Exhaust = 130,
-    HExhaust = 131,
-    WExhaust = 132,
-    QExhaust = 133,
-    Feather = 134,
-    MExhaust = 135,
-    TCloud = 136,
-    WWalk = 137,
-    WWalkU = 138,
-    WWalkD = 139,
-    WBlowW = 140,
-    WBlowWU = 141,
-    WBlowWD = 142,
-    WBlowA = 143,
-    WBlowAU = 144,
-    WBlowAD = 145,
-    WBungee = 146,
-    WBatRope = 147,
-    WRoll = 148,
-    WFly1 = 149,
-    WFly2 = 150,
-    WFly3 = 151,
-    LShpWlk = 152,
-    SheepWlk = 153,
-    SpSheep1 = 154,
-    SpSheep2 = 155,
-    AquaShp1 = 156,
-    AquaShp2 = 157,
-    MoleDive = 158,
-    MoleDig1 = 159,
-    MoleDig2 = 160,
-    MoleDig3 = 161,
-    Woman = 162,
-    Sally = 163,
-    CowWalk = 164,
-    CowJump = 165,
-    MoleWalk = 166,
-    WJetFly1 = 167,
-    WJetFly2 = 168,
-    WJetFly3 = 169,
-    WJetFly4 = 170,
-    WJetFlmB = 171,
-    WJetFlmD = 172,
-    Skunk1 = 173,
-    Skunk2 = 174,
-    PigeonR0 = 175,
-    PigeonR1 = 176,
-    PigeonR2 = 177,
-    PigeonR3 = 178,
-    WpBrth = 179,
-    WpBrthU = 180,
-    WpBrthD = 181,
-    WCough = 182,
-    WCoughU = 183,
-    WCoughD = 184,
-    WBrth1 = 185,
-    WBrth1U = 186,
-    WBrth1D = 187,
-    WBrth2 = 188,
-    WBrth2U = 189,
-    WBrth2D = 190,
-    WBlink1 = 191,
-    WBlink1U = 192,
-    WBlink1D = 193,
-    WBlink2 = 194,
-    WBlink2U = 195,
-    WBlink2D = 196,
-    WGlnce1 = 197,
-    WGlnce1U = 198,
-    WGlnce1D = 199,
-    WGlnce2 = 200,
-    WGlnce2U = 201,
-    WGlnce2D = 202,
-    WBgHead = 203,
-    WBgHeadU = 204,
-    WBgHeadD = 205,
-    WFist = 206,
-    WFistU = 207,
-    WFistD = 208,
-    WPeek = 209,
-    WPeekU = 210,
-    WPeekD = 211,
-    WULook = 212,
-    WULookU = 213,
-    WULookD = 214,
-    WOLook = 215,
-    WOLookU = 216,
-    WOLookD = 217,
-    WScarey = 218,
-    WScareyU = 219,
-    WScareyD = 220,
-    WKami1 = 221,
-    WKami2 = 222,
-    WKami3 = 223,
-    WKami4 = 224,
-    WKami5 = 225,
-    WScrtch = 226,
-    WScrtchU = 227,
-    WScrtchD = 228,
-    WAccuse = 229,
-    WAccuseU = 230,
-    WAccuseD = 231,
-    WTache = 232,
-    WTacheU = 233,
-    WTacheD = 234,
-    WMunch = 235,
-    WMunchU = 236,
-    WMunchD = 237,
-    WLazy = 238,
-    WLazyU = 239,
-    WLazyD = 240,
-    WWinner = 241,
-    WSurndr = 242,
-    WSurndrU = 243,
-    WSurndrD = 244,
-    WSvR = 245,
-    WSvRU = 246,
-    WSvRD = 247,
-    WSvB = 248,
-    WSvBU = 249,
-    WSvBD = 250,
-    WSvG = 251,
-    WSvGU = 252,
-    WSvGD = 253,
-    WSvY = 254,
-    WSvYU = 255,
-    WSvYD = 256,
-    WSvP = 257,
-    WSvPU = 258,
-    WSvPD = 259,
-    WSvC = 260,
-    WSvCU = 261,
-    WSvCD = 262,
-    WSkipGo = 263,
-    WSkipGoU = 264,
-    WSkipGoD = 265,
-    WSelect = 266,
-    WSelectU = 267,
-    WSelectD = 268,
-    WJump = 269,
-    WJumpU = 270,
-    WJumpD = 271,
-    WLand1 = 272,
-    WLand1U = 273,
-    WLand1D = 274,
-    WLand2 = 275,
-    WLand2U = 276,
-    WLand2D = 277,
-    WFlyLnk = 278,
-    WBackFlp = 279,
-    WPncLnk = 280,
-    WPncLnkU = 281,
-    WPncLnkD = 282,
-    WPncTop = 283,
-    WPncBak = 284,
-    WPncBakU = 285,
-    WPncBakD = 286,
-    WParaLnk = 287,
-    WParaCht = 288,
-    WParBak = 289,
-    WParBakU = 290,
-    WParBakD = 291,
-    WTwang = 292,
-    WTwangU = 293,
-    WTwangD = 294,
-    WSldLk1 = 295,
-    WSldLk1U = 296,
-    WSldLk1D = 297,
-    WSldLk2 = 298,
-    WSldLk2U = 299,
-    WSldLk2D = 300,
-    WpBrtLk = 301,
-    WpBrtLkU = 302,
-    WpBrtLkD = 303,
-    WBlowLk = 304,
-    WBlowLkU = 305,
-    WBlowLkD = 306,
-    WHatLnk = 307,
-    WHatLnkU = 308,
-    WHatLnkD = 309,
-    WNukeLk = 310,
-    WNukeLkU = 311,
-    WNukeLkD = 312,
-    WGrnLnk = 313,
-    WGrnLnkU = 314,
-    WGrnLnkD = 315,
-    WClsLnk = 316,
-    WClsLnkU = 317,
-    WClsLnkD = 318,
-    WBanLnk = 319,
-    WBanLnkU = 320,
-    WBanLnkD = 321,
-    WPbmLnk = 322,
-    WPbmLnkU = 323,
-    WPbmLnkD = 324,
-    WHgrLnk = 325,
-    WHgrLnkU = 326,
-    WHgrLnkD = 327,
-    WUtlLnk = 328,
-    WUtlLnkU = 329,
-    WUtlLnkD = 330,
-    WJetLnk = 331,
-    WJetLnkU = 332,
-    WJetLnkD = 333,
-    WDynLnk = 334,
-    WDynLnkU = 335,
-    WDynLnkD = 336,
-    WVasLnk = 337,
-    WVasLnkU = 338,
-    WVasLnkD = 339,
-    WCowLnk = 340,
-    WCowLnkU = 341,
-    WCowLnkD = 342,
-    WShpLnk = 343,
-    WShpLnkU = 344,
-    WShpLnkD = 345,
-    WWmnLnk = 346,
-    WWmnLnkU = 347,
-    WWmnLnkD = 348,
-    WSknLnk = 349,
-    WSknLnkU = 350,
-    WSknLnkD = 351,
-    WMolLnk = 352,
-    WMolLnkU = 353,
-    WMolLnkD = 354,
-    WWmn2Lk = 355,
-    WWmn2LkU = 356,
-    WWmn2LkD = 357,
-    WDrlLnk = 358,
-    WDrlLnkU = 359,
-    WDrlLnkD = 360,
-    WDrill = 361,
-    WPrdLnk = 362,
-    WPrdLnkU = 363,
-    WPrdLnkD = 364,
-    WProd = 365,
-    WProdU = 366,
-    WProdD = 367,
-    WPrdBk2 = 368,
-    WPrdBk2U = 369,
-    WPrdBk2D = 370,
-    WKamLnk = 371,
-    WKamLnkU = 372,
-    WKamLnkD = 373,
-    WKamJmp = 374,
-    WKamBmr = 375,
-    WKamBmrU = 376,
-    WKamBmrD = 377,
-    WFirBl1 = 378,
-    WFirBl1U = 379,
-    WFirBl1D = 380,
-    WFirBl2 = 381,
-    WFirBl2U = 382,
-    WFirBl2D = 383,
-    WFirAir = 384,
-    WJapBak = 385,
-    WJapBakU = 386,
-    WJapBakD = 387,
-    WMinLnk = 388,
-    WMinLnkU = 389,
-    WMinLnkD = 390,
-    WSkpLnk = 391,
-    WSkpLnkU = 392,
-    WSkpLnkD = 393,
-    WSelLnk = 394,
-    WSelLnkU = 395,
-    WSelLnkD = 396,
-    WAxeLnk = 397,
-    WAxeLnkU = 398,
-    WAxeLnkD = 399,
-    WAxeLk2 = 400,
-    WAxeLk2U = 401,
-    WAxeLk2D = 402,
-    WAxeSwn = 403,
-    WAxeSwnU = 404,
-    WAxeSwnD = 405,
-    WAxeBak = 406,
-    WAxeBakU = 407,
-    WAxeBakD = 408,
-    WBndLnk = 409,
-    WBndLnkU = 410,
-    WBndLnkD = 411,
-    WAirLnk = 412,
-    WAirLnkU = 413,
-    WAirLnkD = 414,
-    WAirTlk = 415,
-    WAirTlkU = 416,
-    WAirTlkD = 417,
-    WTelLnk = 418,
-    WTelLnkU = 419,
-    WTelLnkD = 420,
-    WTelTlk = 421,
-    WTelTlkU = 422,
-    WTelTlkD = 423,
-    WTelDsv = 424,
-    WTelDsvU = 425,
-    WTelDsvD = 426,
-    WThrBak = 427,
-    WThrBakU = 428,
-    WThrBakD = 429,
-    WBsbLnk = 430,
-    WBsbLnkU = 431,
-    WBsbLnkD = 432,
-    WBsbBk2 = 433,
-    WBsbBk2U = 434,
-    WBsbBk2D = 435,
-    WBazLnk = 436,
-    WBazLnkU = 437,
-    WBazLnkD = 438,
-    WFlmLnk = 439,
-    WFlmLnkU = 440,
-    WFlmLnkD = 441,
-    WBz2Lnk = 442,
-    WBz2LnkU = 443,
-    WBz2LnkD = 444,
-    WBz3Lnk = 445,
-    WBz3LnkU = 446,
-    WBz3LnkD = 447,
-    WSurLnk = 448,
-    WSurLnkU = 449,
-    WSurLnkD = 450,
-    WSvrLnk = 451,
-    WSvrLnkU = 452,
-    WSvrLnkD = 453,
-    WSvbLnk = 454,
-    WSvbLnkU = 455,
-    WSvbLnkD = 456,
-    WSvgLnk = 457,
-    WSvgLnkU = 458,
-    WSvgLnkD = 459,
-    WSvyLnk = 460,
-    WSvyLnkU = 461,
-    WSvyLnkD = 462,
-    WSvpLnk = 463,
-    WSvpLnkU = 464,
-    WSvpLnkD = 465,
-    WSvcLnk = 466,
-    WSvcLnkU = 467,
-    WSvcLnkD = 468,
-    WIceLnk = 469,
-    WIceLnkU = 470,
-    WIceLnkD = 471,
-    WIceLk2 = 472,
-    WIceLk2U = 473,
-    WIceLk2D = 474,
-    WIceLk3 = 475,
-    WIceLk3U = 476,
-    WIceLk3D = 477,
-    WIceLook = 478,
-    WIceBlnk = 479,
-    WIceGlnt = 480,
-    WIceStnd = 481,
-    WBatLnk = 482,
-    WBatLnkU = 483,
-    WBatLnkD = 484,
-    WBatBk2 = 485,
-    WBatBk2U = 486,
-    WBatBk2D = 487,
-    WUziLnk = 488,
-    WUziLnkU = 489,
-    WUziLnkD = 490,
-    WShgLnk = 491,
-    WShgLnkU = 492,
-    WShgLnkD = 493,
-    WBowLnk = 494,
-    WBowLnkU = 495,
-    WBowLnkD = 496,
-    WBowBk2 = 497,
-    WBowBk2U = 498,
-    WBowBk2D = 499,
-    WHgnLnk = 500,
-    WHgnLnkU = 501,
-    WHgnLnkD = 502,
-    WMgnLnk = 503,
-    WMgnLnkU = 504,
-    WMgnLnkD = 505,
-    WDie = 506,
-    SkdSmoke = 507,
-    WFlyUp = 508,
-    WFlyDn = 509,
-    WFall = 510,
-    WFallDn = 511,
-    WPncUp = 512,
-    WSlide = 513,
-    WSlideU = 514,
-    WSlideD = 515,
-    WBow = 516,
-    WBowU = 517,
-    WBowD = 518,
-    WBsbAim = 519,
-    WBsbAimU = 520,
-    WBsbAimD = 521,
-    WBsbSwn = 522,
-    WBsbSwnU = 523,
-    WBsbSwnD = 524,
-    WBaz = 525,
-    WBazU = 526,
-    WBazD = 527,
-    WFlm = 528,
-    WFlmU = 529,
-    WFlmD = 530,
-    WBaz2 = 531,
-    WBaz2U = 532,
-    WBaz2D = 533,
-    WBaz3 = 534,
-    WBaz3U = 535,
-    WBaz3D = 536,
-    WBatAim = 537,
-    WBatAimU = 538,
-    WBatAimD = 539,
-    WBatFrd = 540,
-    WBatFrdU = 541,
-    WBatFrdD = 542,
-    WShotG = 543,
-    WShotGU = 544,
-    WShotGD = 545,
-    WShotP = 546,
-    WShotPU = 547,
-    WShotPD = 548,
-    WShotF = 549,
-    WShotFU = 550,
-    WShotFD = 551,
-    WBowP = 552,
-    WBowPU = 553,
-    WBowPD = 554,
-    WBowF = 555,
-    WBowFU = 556,
-    WBowFD = 557,
-    WHandG = 558,
-    WHandGU = 559,
-    WHandGD = 560,
-    WHandF = 561,
-    WHandFU = 562,
-    WHandFD = 563,
-    WUzi = 564,
-    WUziU = 565,
-    WUziD = 566,
-    WUziF = 567,
-    WUziFU = 568,
-    WUziFD = 569,
-    WMini = 570,
-    WMiniU = 571,
-    WMiniD = 572,
-    WMiniF = 573,
-    WMiniFU = 574,
-    WMiniFD = 575,
-    WThrGrn = 576,
-    WThrGrnU = 577,
-    WThrGrnD = 578,
-    WThrCls = 579,
-    WThrClsU = 580,
-    WThrClsD = 581,
-    WThrBan = 582,
-    WThrBanU = 583,
-    WThrBanD = 584,
-    WThrPbm = 585,
-    WThrPbmU = 586,
-    WThrPbmD = 587,
-    WThrHgr = 588,
-    WThrHgrU = 589,
-    WThrHgrD = 590,
-    WThrow = 591,
-    WThrowU = 592,
-    WThrowD = 593,
-    Replay = 594,
-    NetBreak = 595,
-    ExFoom = 596,
-    ExBiff = 597,
-    ExPoot = 598,
-    ExPow = 599,
-    Circle25 = 600,
-    Circle50 = 601,
-    Circle75 = 602,
-    Circl100 = 603,
-    Elipse25 = 604,
-    Elipse50 = 605,
-    Elipse75 = 606,
-    Elips100 = 607,
-    GassGrn = 608,
-    SmkLt25 = 609,
-    SmkLt50 = 610,
-    SmkLt75 = 611,
-    SmkLt100 = 612,
-    SmkDrk20 = 613,
-    SmkDrk30 = 614,
-    SmkDrk40 = 615,
-    Clouds = 616,
-    CloudM = 617,
-    CloudL = 618,
-    Blob = 619,
-    // gap: 620-621 unused
-    Debris = 622,
-    Bubble1 = 623,
-    Bubble2 = 624,
-    Bubble3 = 625,
-    Bubble4 = 626,
-    WfDrown = 627,
-    Grave1V2 = 628,
-    Grave2V2 = 629,
-    Grave3V2 = 630,
-    Grave4V2 = 631,
-    Grave5V2 = 632,
-    Grave6V2 = 633,
-    TargetsV2 = 634,
-    TargetWV2 = 635,
-    WCrate1V2 = 636,
-    MCrate1V2 = 637,
-    UCrate1V2 = 638,
-    DonorV2 = 639,
-    WDrown = 640,
-    OilDrum = 641,
-    MeteorV2 = 642,
-    MineOnV2 = 643,
-    MineOffV2 = 644,
-    MissileV2 = 645,
-    AirMislV2 = 646,
-    GrenadeV2 = 647,
-    MortarV2 = 648,
-    ClusterV2 = 649,
-    ClustletV2 = 650,
-    BulletV2 = 651,
-    ArrowV2 = 652,
-    Sheep = 653,
-    Carpet1V2 = 654,
-    Carpet2V2 = 655,
-    SheepFalV2 = 656,
-    SheepBrnV2 = 657,
-    MbBombV2 = 658,
-    DrillV2 = 659,
-    WomanV2 = 660,
-    SallyV2 = 661,
-    SkunkV2 = 662,
-    Mole = 663,
-    CowWalkV2 = 664,
-    PigeonR0V2 = 665,
-    PigeonR1V2 = 666,
-    PigeonR2V2 = 667,
-    PigeonR3V2 = 668,
-    BananaV2 = 669,
-    PetrolBmV2 = 670,
-    TamborinV2 = 671,
-    HGrenadeV2 = 672,
-    HMissil1V2 = 673,
-    HMissil2V2 = 674,
-    AquaShp1V2 = 675,
-    AquaShp2V2 = 676,
-    VaseV2 = 677,
-    VaseBit1V2 = 678,
-    VaseBit2V2 = 679,
-    VaseBit3V2 = 680,
-    DynamiteV2 = 681,
-    Letter1V2 = 682,
-    Letter2V2 = 683,
-    DonkeyV2 = 684,
-    WBaz4 = 685,
-    WBaz4U = 686,
-    WBaz4D = 687,
-    WBaz5 = 688,
-    WBaz5U = 689,
-    WBaz5D = 690,
-    WBz4Lnk = 691,
-    WBz4LnkU = 692,
-    WBz4LnkD = 693,
-    WBz5Lnk = 694,
-    WBz5LnkU = 695,
-    WBz5LnkD = 696,
-}
-
-impl TryFrom<u32> for SpriteId {
-    type Error = u32;
-
-    fn try_from(value: u32) -> Result<Self, Self::Error> {
-        match value {
-            1..=619 | 622..=696 => {
-                // SAFETY: all matched values correspond to valid variants
-                Ok(unsafe { core::mem::transmute(value) })
-            }
-            _ => Err(value),
-        }
-    }
-}
-
-// ---------------------------------------------------------------------------
-// Sprite struct layout (from Ghidra + wkJellyWorm Sprites.h)
-// ---------------------------------------------------------------------------
+// Re-export SpriteId from its own module to keep this file focused on struct layouts.
+pub use super::sprite_id::SpriteId;
 
+// (SpriteId enum moved to sprite_id.rs)
 /// Per-frame metadata within a Sprite (0x0C bytes).
 ///
 /// Describes the bounding box and bitmap data offset for one animation frame.
@@ -752,13 +31,13 @@ const _: () = assert!(core::mem::size_of::<SpriteFrame>() == 0x0C);
 /// (0x4FAA30), populated by ProcessSprite (0x4FAB80) from `.spr` file data.
 ///
 /// Contains frame metadata, palette data, and bitmap pixel data for all frames.
-/// Managed by DD_Display's 1024-slot sprite table.
+/// Managed by DisplayBase's 1024-slot sprite table (`sprite_ptrs`).
 ///
 /// Source: wkJellyWorm `Sprites.h`, Ghidra decompilation of ConstructSprite + ProcessSprite.
 #[repr(C)]
 pub struct Sprite {
-    /// 0x00: Vtable pointer (0x66418C, 8 entries)
-    pub vtable: *mut u8,
+    /// 0x00: Vtable pointer (0x66418C, 8 slots)
+    pub vtable: *const SpriteVtable,
     /// 0x04: Context/parent pointer (ECX from ConstructSprite)
     pub context_ptr: *mut u8,
     /// 0x08: Unknown
@@ -812,37 +91,110 @@ pub struct Sprite {
 
 const _: () = assert!(core::mem::size_of::<Sprite>() == 0x70);
 
-/// DD_Display sprite storage byte offsets (from DD_Display base pointer).
+/// SpriteBank — indexed sprite container (0x17C bytes).
+///
+/// Alternative to Sprite for storing sprite data in DisplayBase's 1024-slot table.
+/// While Sprite (sprite_ptrs, 0x1008) stores individual sprites loaded from `.spr` files,
+/// SpriteBank (sprite_banks, 0x2008) stores collections of sprite frames accessed via
+/// an index table that maps sprite IDs to frame indices.
 ///
-/// DD_Display manages a 1024-slot sprite table. Each slot stores a palette ID
-/// and a Sprite pointer. Sprites are organized into 3 palettes.
-pub mod dd_display_sprite_offsets {
-    /// `sprite_palette[1024]` — u32 per slot, palette ID (1-3)
-    pub const SPRITE_PALETTE_ARRAY: usize = 0x0008;
-    /// `sprite_ptrs[1024]` — Sprite* per slot
-    pub const SPRITE_PTR_ARRAY: usize = 0x1008;
-    /// `gfx_dirs[3]` — GfxDir* per palette
-    pub const GFX_DIRS: usize = 0x311C;
-    /// `sprite_counts[3]` — loaded count per palette
-    pub const SPRITE_COUNTS: usize = 0x3530;
+/// Created by LoadSpriteEx (0x523310): allocated 0x17C bytes, first 0x15C zeroed,
+/// then constructed and initialized via FUN_004f95a0.
+///
+/// Used by GetSpriteInfo (0x523500) and LoadSpriteComplex (0x5237C0) as the
+/// fallback path when sprite_ptrs[id] is null.
+#[repr(C)]
+pub struct SpriteBank {
+    /// 0x00: Vtable pointer (0x664180, 3 slots)
+    pub vtable: *const SpriteBankVtable,
+    /// 0x04: Unknown (context pointer?)
+    pub _unknown_04: u32,
+    /// 0x08: Base sprite ID — subtracted from the lookup ID to compute the index table offset.
+    pub base_id: i32,
+    /// 0x0C: Index table pointer — maps `(id - base_id)` to frame indices in the frame table.
+    pub index_table: *const i32,
+    /// 0x10: Frame table pointer — array of SpriteFrame entries (0xC bytes each).
+    pub frame_table: *const SpriteBankFrame,
+    /// 0x14: Number of valid entries in the frame table (bounds check for lookups).
+    pub frame_count: i32,
+    /// 0x18 - 0x17B: Remaining fields (unknown)
+    pub _unknown_18: [u8; 0x17C - 0x18],
 }
 
-/// Sprite vtable method addresses (vtable at 0x66418C, 8 entries).
-pub mod sprite_vtable {
-    /// Slot 0: Destructor (0x4FAA80) — thiscall
-    pub const DESTRUCTOR: u32 = 0x004F_AA80;
-    /// Slot 1: Unknown (0x4FAAD0)
-    pub const SLOT_1: u32 = 0x004F_AAD0;
-    /// Slot 2: Unknown (0x4FB5C0)
-    pub const SLOT_2: u32 = 0x004F_B5C0;
-    /// Slot 3: Unknown (0x4FE550)
-    pub const SLOT_3: u32 = 0x004F_E550;
-    /// Slot 4: Unknown (0x4FE2F0)
-    pub const SLOT_4: u32 = 0x004F_E2F0;
-    /// Slot 5: Unknown (0x4FE9C0)
-    pub const SLOT_5: u32 = 0x004F_E9C0;
-    /// Slot 6: CTask common stub (0x5613D0)
-    pub const STUB_6: u32 = 0x0056_13D0;
-    /// Slot 7: CTask common stub (0x5613D0)
-    pub const STUB_7: u32 = 0x0056_13D0;
+const _: () = assert!(core::mem::size_of::<SpriteBank>() == 0x17C);
+
+/// Frame entry in a SpriteBank's frame table (0xC bytes).
+///
+/// Structurally identical to SpriteFrame but fields have different semantics
+/// when accessed by SpriteBank__GetInfo (FUN_004f98c0):
+/// - `flags` byte 0: bit 0 = transparency flag, bit 1 = double-width flag
+/// - `width` at +0x08: frame width (bit 15 = single-width override)
+/// - `data_value` at +0x0A: data reference (shifted left 8 for output)
+#[repr(C)]
+#[derive(Clone, Copy, Debug)]
+pub struct SpriteBankFrame {
+    /// 0x00: Flags byte. Bit 0 = has transparency, bit 1 = double-width.
+    pub flags: u8,
+    /// 0x01-0x07: Padding / other fields
+    pub _pad_01: [u8; 7],
+    /// 0x08: Frame width in pixels. Bit 15 set = force width to 1.
+    pub width: u16,
+    /// 0x0A: Data reference value (shifted left 8 when returned by GetSpriteInfo).
+    pub data_value: u16,
+}
+
+const _: () = assert!(core::mem::size_of::<SpriteBankFrame>() == 0x0C);
+
+/// Sprite vtable (0x66418C, 8 slots).
+///
+/// Slots 6-7 are CTask common stubs (0x5613D0).
+#[openwa_core::vtable(size = 8, va = 0x0066_418C, class = "Sprite")]
+pub struct SpriteVtable {
+    /// destructor (0x4FAA80)
+    pub destructor: fn(this: *mut Sprite, flags: u32),
+    /// unknown (0x4FAAD0)
+    pub slot_1: fn(this: *mut Sprite),
+    /// unknown (0x4FB5C0)
+    pub slot_2: fn(this: *mut Sprite),
+    /// unknown (0x4FE550)
+    pub slot_3: fn(this: *mut Sprite),
+    /// unknown (0x4FE2F0)
+    pub slot_4: fn(this: *mut Sprite),
+    /// unknown (0x4FE9C0)
+    pub slot_5: fn(this: *mut Sprite),
+    /// CTask common stub (0x5613D0)
+    pub slot_6: fn(this: *mut Sprite),
+    /// CTask common stub (0x5613D0)
+    pub slot_7: fn(this: *mut Sprite),
+}
+
+/// SpriteBank vtable (0x664180, 3 slots).
+#[openwa_core::vtable(size = 3, va = 0x0066_4180, class = "SpriteBank")]
+pub struct SpriteBankVtable {
+    /// destructor (0x4F94E0)
+    pub destructor: fn(this: *mut SpriteBank, flags: u32),
+    /// init/load (0x4F9580)
+    pub slot_1: fn(this: *mut SpriteBank),
+    /// unknown (0x4FA910)
+    pub slot_2: fn(this: *mut SpriteBank),
+}
+
+crate::define_addresses! {
+    class "Sprite" {
+        /// ConstructSprite — usercall EAX=sprite_ptr, ECX=context_ptr
+        ctor/Usercall CONSTRUCT_SPRITE = 0x004F_AA30;
+        /// Sprite destructor — thiscall, vtable slot 0
+        fn/Thiscall DESTROY_SPRITE = 0x004F_AA80;
+        /// LoadSpriteFromVfs
+        fn/Usercall LOAD_SPRITE_FROM_VFS = 0x004F_AAF0;
+        /// ProcessSprite — parses .spr binary format
+        fn/Usercall PROCESS_SPRITE = 0x004F_AB80;
+        /// Sprite__GetInfo — usercall EAX=Sprite*, ESI=out_data, ECX=out_width, stack=out_flags
+        fn/Usercall SPRITE_GET_INFO = 0x004F_AEC0;
+    }
+
+    class "SpriteBank" {
+        /// SpriteBank__GetInfo — usercall EAX=layer, ECX=bank*, ESI=out_width, 2 stack params
+        fn/Usercall SPRITE_BANK_GET_INFO = 0x004F_98C0;
+    }
 }

crates/openwa-core/src/render/sprite_id.rs

@@ -0,0 +1,720 @@
+/// Sprite/animation frame IDs. Range 1-696 with gaps at 620-621.
+///
+/// Names preserved from the original sprite file names in the game data.
+/// The original names are terse 8-character identifiers from the game's
+/// sprite sheets.
+///
+/// Source: wkJellyWorm Constants.h
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[repr(u32)]
+pub enum SpriteId {
+    Cdrom = 1,
+    CrshairR = 2,
+    CrshairB = 3,
+    CrshairG = 4,
+    CrshairY = 5,
+    CrshairP = 6,
+    CrshairC = 7,
+    SpangleR = 8,
+    SpangleB = 9,
+    SpangleG = 10,
+    SpangleY = 11,
+    SpangleP = 12,
+    SpangleC = 13,
+    Grave1 = 14,
+    Grave2 = 15,
+    Grave3 = 16,
+    Grave4 = 17,
+    Grave5 = 18,
+    Grave6 = 19,
+    ArrowDnR = 20,
+    ArrowDnB = 21,
+    ArrowDnG = 22,
+    ArrowDnY = 23,
+    ArrowDnP = 24,
+    ArrowDnC = 25,
+    ArrowSdR = 26,
+    ArrowSdB = 27,
+    ArrowSdG = 28,
+    ArrowSdY = 29,
+    ArrowSdP = 30,
+    ArrowSdC = 31,
+    CursorR = 32,
+    CursorB = 33,
+    CursorG = 34,
+    CursorY = 35,
+    CursorP = 36,
+    CursorC = 37,
+    MarkerR = 38,
+    MarkerB = 39,
+    MarkerG = 40,
+    MarkerY = 41,
+    MarkerP = 42,
+    MarkerC = 43,
+    CMarker = 44,
+    MineOn = 45,
+    Arrow = 46,
+    MineOff = 47,
+    Missile = 48,
+    Bullet = 49,
+    Grenade = 50,
+    Banana = 51,
+    Mortar = 52,
+    Cluster = 53,
+    Clustlet = 54,
+    PetrolBm = 55,
+    HGrenade = 56,
+    Tamborin = 57,
+    HMissil1 = 58,
+    HMissil2 = 59,
+    AirMisl = 60,
+    SheepFal = 61,
+    Carpet1 = 62,
+    Carpet2 = 63,
+    SheepBrn = 64,
+    SheepLau = 65,
+    Meteor = 66,
+    Drill = 67,
+    RopeTip = 68,
+    RopeCuff = 69,
+    Phone = 70,
+    MbBomb = 71,
+    Letter1 = 72,
+    Letter2 = 73,
+    Vase = 74,
+    VaseBit1 = 75,
+    VaseBit2 = 76,
+    VaseBit3 = 77,
+    Dynamite = 78,
+    FireHit = 79,
+    KamiSmk = 80,
+    BaseHit = 81,
+    Donkey = 82,
+    Fireball = 83,
+    Flame1 = 84,
+    Flame2 = 85,
+    AirJetB = 86,
+    AirJetG = 87,
+    AirJetO = 88,
+    PostBox = 89,
+    ShpTruck = 90,
+    CptTruck = 91,
+    Targets = 92,
+    TargetsV = 93,
+    TargetW = 94,
+    TargetWV = 95,
+    WCrate1 = 96,
+    MCrate1 = 97,
+    UCrate1 = 98,
+    WCrate2 = 99,
+    MCrate2 = 100,
+    UCrate2 = 101,
+    Donor = 102,
+    WCrateV = 103,
+    MCrateV = 104,
+    UCrateV = 105,
+    Fallout = 106,
+    WCrate0 = 107,
+    MCrate0 = 108,
+    UCrate0 = 109,
+    OilDrum1 = 110,
+    OilDrum2 = 111,
+    OilDrum3 = 112,
+    OilDrum4 = 113,
+    UziHit = 114,
+    UziCase = 115,
+    ShotHit = 116,
+    ShotCase = 117,
+    WormHit1 = 118,
+    WormHit2 = 119,
+    Petrol1_ = 120,
+    Petrol2_ = 121,
+    Petrol3_ = 122,
+    Petrol4_ = 123,
+    Petrol1 = 124,
+    Petrol2 = 125,
+    Petrol3 = 126,
+    Petrol4 = 127,
+    Petrol5 = 128,
+    Petrol6 = 129,
+    Exhaust = 130,
+    HExhaust = 131,
+    WExhaust = 132,
+    QExhaust = 133,
+    Feather = 134,
+    MExhaust = 135,
+    TCloud = 136,
+    WWalk = 137,
+    WWalkU = 138,
+    WWalkD = 139,
+    WBlowW = 140,
+    WBlowWU = 141,
+    WBlowWD = 142,
+    WBlowA = 143,
+    WBlowAU = 144,
+    WBlowAD = 145,
+    WBungee = 146,
+    WBatRope = 147,
+    WRoll = 148,
+    WFly1 = 149,
+    WFly2 = 150,
+    WFly3 = 151,
+    LShpWlk = 152,
+    SheepWlk = 153,
+    SpSheep1 = 154,
+    SpSheep2 = 155,
+    AquaShp1 = 156,
+    AquaShp2 = 157,
+    MoleDive = 158,
+    MoleDig1 = 159,
+    MoleDig2 = 160,
+    MoleDig3 = 161,
+    Woman = 162,
+    Sally = 163,
+    CowWalk = 164,
+    CowJump = 165,
+    MoleWalk = 166,
+    WJetFly1 = 167,
+    WJetFly2 = 168,
+    WJetFly3 = 169,
+    WJetFly4 = 170,
+    WJetFlmB = 171,
+    WJetFlmD = 172,
+    Skunk1 = 173,
+    Skunk2 = 174,
+    PigeonR0 = 175,
+    PigeonR1 = 176,
+    PigeonR2 = 177,
+    PigeonR3 = 178,
+    WpBrth = 179,
+    WpBrthU = 180,
+    WpBrthD = 181,
+    WCough = 182,
+    WCoughU = 183,
+    WCoughD = 184,
+    WBrth1 = 185,
+    WBrth1U = 186,
+    WBrth1D = 187,
+    WBrth2 = 188,
+    WBrth2U = 189,
+    WBrth2D = 190,
+    WBlink1 = 191,
+    WBlink1U = 192,
+    WBlink1D = 193,
+    WBlink2 = 194,
+    WBlink2U = 195,
+    WBlink2D = 196,
+    WGlnce1 = 197,
+    WGlnce1U = 198,
+    WGlnce1D = 199,
+    WGlnce2 = 200,
+    WGlnce2U = 201,
+    WGlnce2D = 202,
+    WBgHead = 203,
+    WBgHeadU = 204,
+    WBgHeadD = 205,
+    WFist = 206,
+    WFistU = 207,
+    WFistD = 208,
+    WPeek = 209,
+    WPeekU = 210,
+    WPeekD = 211,
+    WULook = 212,
+    WULookU = 213,
+    WULookD = 214,
+    WOLook = 215,
+    WOLookU = 216,
+    WOLookD = 217,
+    WScarey = 218,
+    WScareyU = 219,
+    WScareyD = 220,
+    WKami1 = 221,
+    WKami2 = 222,
+    WKami3 = 223,
+    WKami4 = 224,
+    WKami5 = 225,
+    WScrtch = 226,
+    WScrtchU = 227,
+    WScrtchD = 228,
+    WAccuse = 229,
+    WAccuseU = 230,
+    WAccuseD = 231,
+    WTache = 232,
+    WTacheU = 233,
+    WTacheD = 234,
+    WMunch = 235,
+    WMunchU = 236,
+    WMunchD = 237,
+    WLazy = 238,
+    WLazyU = 239,
+    WLazyD = 240,
+    WWinner = 241,
+    WSurndr = 242,
+    WSurndrU = 243,
+    WSurndrD = 244,
+    WSvR = 245,
+    WSvRU = 246,
+    WSvRD = 247,
+    WSvB = 248,
+    WSvBU = 249,
+    WSvBD = 250,
+    WSvG = 251,
+    WSvGU = 252,
+    WSvGD = 253,
+    WSvY = 254,
+    WSvYU = 255,
+    WSvYD = 256,
+    WSvP = 257,
+    WSvPU = 258,
+    WSvPD = 259,
+    WSvC = 260,
+    WSvCU = 261,
+    WSvCD = 262,
+    WSkipGo = 263,
+    WSkipGoU = 264,
+    WSkipGoD = 265,
+    WSelect = 266,
+    WSelectU = 267,
+    WSelectD = 268,
+    WJump = 269,
+    WJumpU = 270,
+    WJumpD = 271,
+    WLand1 = 272,
+    WLand1U = 273,
+    WLand1D = 274,
+    WLand2 = 275,
+    WLand2U = 276,
+    WLand2D = 277,
+    WFlyLnk = 278,
+    WBackFlp = 279,
+    WPncLnk = 280,
+    WPncLnkU = 281,
+    WPncLnkD = 282,
+    WPncTop = 283,
+    WPncBak = 284,
+    WPncBakU = 285,
+    WPncBakD = 286,
+    WParaLnk = 287,
+    WParaCht = 288,
+    WParBak = 289,
+    WParBakU = 290,
+    WParBakD = 291,
+    WTwang = 292,
+    WTwangU = 293,
+    WTwangD = 294,
+    WSldLk1 = 295,
+    WSldLk1U = 296,
+    WSldLk1D = 297,
+    WSldLk2 = 298,
+    WSldLk2U = 299,
+    WSldLk2D = 300,
+    WpBrtLk = 301,
+    WpBrtLkU = 302,
+    WpBrtLkD = 303,
+    WBlowLk = 304,
+    WBlowLkU = 305,
+    WBlowLkD = 306,
+    WHatLnk = 307,
+    WHatLnkU = 308,
+    WHatLnkD = 309,
+    WNukeLk = 310,
+    WNukeLkU = 311,
+    WNukeLkD = 312,
+    WGrnLnk = 313,
+    WGrnLnkU = 314,
+    WGrnLnkD = 315,
+    WClsLnk = 316,
+    WClsLnkU = 317,
+    WClsLnkD = 318,
+    WBanLnk = 319,
+    WBanLnkU = 320,
+    WBanLnkD = 321,
+    WPbmLnk = 322,
+    WPbmLnkU = 323,
+    WPbmLnkD = 324,
+    WHgrLnk = 325,
+    WHgrLnkU = 326,
+    WHgrLnkD = 327,
+    WUtlLnk = 328,
+    WUtlLnkU = 329,
+    WUtlLnkD = 330,
+    WJetLnk = 331,
+    WJetLnkU = 332,
+    WJetLnkD = 333,
+    WDynLnk = 334,
+    WDynLnkU = 335,
+    WDynLnkD = 336,
+    WVasLnk = 337,
+    WVasLnkU = 338,
+    WVasLnkD = 339,
+    WCowLnk = 340,
+    WCowLnkU = 341,
+    WCowLnkD = 342,
+    WShpLnk = 343,
+    WShpLnkU = 344,
+    WShpLnkD = 345,
+    WWmnLnk = 346,
+    WWmnLnkU = 347,
+    WWmnLnkD = 348,
+    WSknLnk = 349,
+    WSknLnkU = 350,
+    WSknLnkD = 351,
+    WMolLnk = 352,
+    WMolLnkU = 353,
+    WMolLnkD = 354,
+    WWmn2Lk = 355,
+    WWmn2LkU = 356,
+    WWmn2LkD = 357,
+    WDrlLnk = 358,
+    WDrlLnkU = 359,
+    WDrlLnkD = 360,
+    WDrill = 361,
+    WPrdLnk = 362,
+    WPrdLnkU = 363,
+    WPrdLnkD = 364,
+    WProd = 365,
+    WProdU = 366,
+    WProdD = 367,
+    WPrdBk2 = 368,
+    WPrdBk2U = 369,
+    WPrdBk2D = 370,
+    WKamLnk = 371,
+    WKamLnkU = 372,
+    WKamLnkD = 373,
+    WKamJmp = 374,
+    WKamBmr = 375,
+    WKamBmrU = 376,
+    WKamBmrD = 377,
+    WFirBl1 = 378,
+    WFirBl1U = 379,
+    WFirBl1D = 380,
+    WFirBl2 = 381,
+    WFirBl2U = 382,
+    WFirBl2D = 383,
+    WFirAir = 384,
+    WJapBak = 385,
+    WJapBakU = 386,
+    WJapBakD = 387,
+    WMinLnk = 388,
+    WMinLnkU = 389,
+    WMinLnkD = 390,
+    WSkpLnk = 391,
+    WSkpLnkU = 392,
+    WSkpLnkD = 393,
+    WSelLnk = 394,
+    WSelLnkU = 395,
+    WSelLnkD = 396,
+    WAxeLnk = 397,
+    WAxeLnkU = 398,
+    WAxeLnkD = 399,
+    WAxeLk2 = 400,
+    WAxeLk2U = 401,
+    WAxeLk2D = 402,
+    WAxeSwn = 403,
+    WAxeSwnU = 404,
+    WAxeSwnD = 405,
+    WAxeBak = 406,
+    WAxeBakU = 407,
+    WAxeBakD = 408,
+    WBndLnk = 409,
+    WBndLnkU = 410,
+    WBndLnkD = 411,
+    WAirLnk = 412,
+    WAirLnkU = 413,
+    WAirLnkD = 414,
+    WAirTlk = 415,
+    WAirTlkU = 416,
+    WAirTlkD = 417,
+    WTelLnk = 418,
+    WTelLnkU = 419,
+    WTelLnkD = 420,
+    WTelTlk = 421,
+    WTelTlkU = 422,
+    WTelTlkD = 423,
+    WTelDsv = 424,
+    WTelDsvU = 425,
+    WTelDsvD = 426,
+    WThrBak = 427,
+    WThrBakU = 428,
+    WThrBakD = 429,
+    WBsbLnk = 430,
+    WBsbLnkU = 431,
+    WBsbLnkD = 432,
+    WBsbBk2 = 433,
+    WBsbBk2U = 434,
+    WBsbBk2D = 435,
+    WBazLnk = 436,
+    WBazLnkU = 437,
+    WBazLnkD = 438,
+    WFlmLnk = 439,
+    WFlmLnkU = 440,
+    WFlmLnkD = 441,
+    WBz2Lnk = 442,
+    WBz2LnkU = 443,
+    WBz2LnkD = 444,
+    WBz3Lnk = 445,
+    WBz3LnkU = 446,
+    WBz3LnkD = 447,
+    WSurLnk = 448,
+    WSurLnkU = 449,
+    WSurLnkD = 450,
+    WSvrLnk = 451,
+    WSvrLnkU = 452,
+    WSvrLnkD = 453,
+    WSvbLnk = 454,
+    WSvbLnkU = 455,
+    WSvbLnkD = 456,
+    WSvgLnk = 457,
+    WSvgLnkU = 458,
+    WSvgLnkD = 459,
+    WSvyLnk = 460,
+    WSvyLnkU = 461,
+    WSvyLnkD = 462,
+    WSvpLnk = 463,
+    WSvpLnkU = 464,
+    WSvpLnkD = 465,
+    WSvcLnk = 466,
+    WSvcLnkU = 467,
+    WSvcLnkD = 468,
+    WIceLnk = 469,
+    WIceLnkU = 470,
+    WIceLnkD = 471,
+    WIceLk2 = 472,
+    WIceLk2U = 473,
+    WIceLk2D = 474,
+    WIceLk3 = 475,
+    WIceLk3U = 476,
+    WIceLk3D = 477,
+    WIceLook = 478,
+    WIceBlnk = 479,
+    WIceGlnt = 480,
+    WIceStnd = 481,
+    WBatLnk = 482,
+    WBatLnkU = 483,
+    WBatLnkD = 484,
+    WBatBk2 = 485,
+    WBatBk2U = 486,
+    WBatBk2D = 487,
+    WUziLnk = 488,
+    WUziLnkU = 489,
+    WUziLnkD = 490,
+    WShgLnk = 491,
+    WShgLnkU = 492,
+    WShgLnkD = 493,
+    WBowLnk = 494,
+    WBowLnkU = 495,
+    WBowLnkD = 496,
+    WBowBk2 = 497,
+    WBowBk2U = 498,
+    WBowBk2D = 499,
+    WHgnLnk = 500,
+    WHgnLnkU = 501,
+    WHgnLnkD = 502,
+    WMgnLnk = 503,
+    WMgnLnkU = 504,
+    WMgnLnkD = 505,
+    WDie = 506,
+    SkdSmoke = 507,
+    WFlyUp = 508,
+    WFlyDn = 509,
+    WFall = 510,
+    WFallDn = 511,
+    WPncUp = 512,
+    WSlide = 513,
+    WSlideU = 514,
+    WSlideD = 515,
+    WBow = 516,
+    WBowU = 517,
+    WBowD = 518,
+    WBsbAim = 519,
+    WBsbAimU = 520,
+    WBsbAimD = 521,
+    WBsbSwn = 522,
+    WBsbSwnU = 523,
+    WBsbSwnD = 524,
+    WBaz = 525,
+    WBazU = 526,
+    WBazD = 527,
+    WFlm = 528,
+    WFlmU = 529,
+    WFlmD = 530,
+    WBaz2 = 531,
+    WBaz2U = 532,
+    WBaz2D = 533,
+    WBaz3 = 534,
+    WBaz3U = 535,
+    WBaz3D = 536,
+    WBatAim = 537,
+    WBatAimU = 538,
+    WBatAimD = 539,
+    WBatFrd = 540,
+    WBatFrdU = 541,
+    WBatFrdD = 542,
+    WShotG = 543,
+    WShotGU = 544,
+    WShotGD = 545,
+    WShotP = 546,
+    WShotPU = 547,
+    WShotPD = 548,
+    WShotF = 549,
+    WShotFU = 550,
+    WShotFD = 551,
+    WBowP = 552,
+    WBowPU = 553,
+    WBowPD = 554,
+    WBowF = 555,
+    WBowFU = 556,
+    WBowFD = 557,
+    WHandG = 558,
+    WHandGU = 559,
+    WHandGD = 560,
+    WHandF = 561,
+    WHandFU = 562,
+    WHandFD = 563,
+    WUzi = 564,
+    WUziU = 565,
+    WUziD = 566,
+    WUziF = 567,
+    WUziFU = 568,
+    WUziFD = 569,
+    WMini = 570,
+    WMiniU = 571,
+    WMiniD = 572,
+    WMiniF = 573,
+    WMiniFU = 574,
+    WMiniFD = 575,
+    WThrGrn = 576,
+    WThrGrnU = 577,
+    WThrGrnD = 578,
+    WThrCls = 579,
+    WThrClsU = 580,
+    WThrClsD = 581,
+    WThrBan = 582,
+    WThrBanU = 583,
+    WThrBanD = 584,
+    WThrPbm = 585,
+    WThrPbmU = 586,
+    WThrPbmD = 587,
+    WThrHgr = 588,
+    WThrHgrU = 589,
+    WThrHgrD = 590,
+    WThrow = 591,
+    WThrowU = 592,
+    WThrowD = 593,
+    Replay = 594,
+    NetBreak = 595,
+    ExFoom = 596,
+    ExBiff = 597,
+    ExPoot = 598,
+    ExPow = 599,
+    Circle25 = 600,
+    Circle50 = 601,
+    Circle75 = 602,
+    Circl100 = 603,
+    Elipse25 = 604,
+    Elipse50 = 605,
+    Elipse75 = 606,
+    Elips100 = 607,
+    GassGrn = 608,
+    SmkLt25 = 609,
+    SmkLt50 = 610,
+    SmkLt75 = 611,
+    SmkLt100 = 612,
+    SmkDrk20 = 613,
+    SmkDrk30 = 614,
+    SmkDrk40 = 615,
+    Clouds = 616,
+    CloudM = 617,
+    CloudL = 618,
+    Blob = 619,
+    // gap: 620-621 unused
+    Debris = 622,
+    Bubble1 = 623,
+    Bubble2 = 624,
+    Bubble3 = 625,
+    Bubble4 = 626,
+    WfDrown = 627,
+    Grave1V2 = 628,
+    Grave2V2 = 629,
+    Grave3V2 = 630,
+    Grave4V2 = 631,
+    Grave5V2 = 632,
+    Grave6V2 = 633,
+    TargetsV2 = 634,
+    TargetWV2 = 635,
+    WCrate1V2 = 636,
+    MCrate1V2 = 637,
+    UCrate1V2 = 638,
+    DonorV2 = 639,
+    WDrown = 640,
+    OilDrum = 641,
+    MeteorV2 = 642,
+    MineOnV2 = 643,
+    MineOffV2 = 644,
+    MissileV2 = 645,
+    AirMislV2 = 646,
+    GrenadeV2 = 647,
+    MortarV2 = 648,
+    ClusterV2 = 649,
+    ClustletV2 = 650,
+    BulletV2 = 651,
+    ArrowV2 = 652,
+    Sheep = 653,
+    Carpet1V2 = 654,
+    Carpet2V2 = 655,
+    SheepFalV2 = 656,
+    SheepBrnV2 = 657,
+    MbBombV2 = 658,
+    DrillV2 = 659,
+    WomanV2 = 660,
+    SallyV2 = 661,
+    SkunkV2 = 662,
+    Mole = 663,
+    CowWalkV2 = 664,
+    PigeonR0V2 = 665,
+    PigeonR1V2 = 666,
+    PigeonR2V2 = 667,
+    PigeonR3V2 = 668,
+    BananaV2 = 669,
+    PetrolBmV2 = 670,
+    TamborinV2 = 671,
+    HGrenadeV2 = 672,
+    HMissil1V2 = 673,
+    HMissil2V2 = 674,
+    AquaShp1V2 = 675,
+    AquaShp2V2 = 676,
+    VaseV2 = 677,
+    VaseBit1V2 = 678,
+    VaseBit2V2 = 679,
+    VaseBit3V2 = 680,
+    DynamiteV2 = 681,
+    Letter1V2 = 682,
+    Letter2V2 = 683,
+    DonkeyV2 = 684,
+    WBaz4 = 685,
+    WBaz4U = 686,
+    WBaz4D = 687,
+    WBaz5 = 688,
+    WBaz5U = 689,
+    WBaz5D = 690,
+    WBz4Lnk = 691,
+    WBz4LnkU = 692,
+    WBz4LnkD = 693,
+    WBz5Lnk = 694,
+    WBz5LnkU = 695,
+    WBz5LnkD = 696,
+}
+
+impl TryFrom<u32> for SpriteId {
+    type Error = u32;
+
+    fn try_from(value: u32) -> Result<Self, Self::Error> {
+        match value {
+            1..=619 | 622..=696 => {
+                // SAFETY: all matched values correspond to valid variants
+                Ok(unsafe { core::mem::transmute(value) })
+            }
+            _ => Err(value),
+        }
+    }
+}

crates/openwa-dll/src/replacements/display.rs

@@ -673,6 +673,9 @@ pub fn install() -> Result<(), String> {
         // Patch DisplayGfx vtable (0x66A218): replace ported methods with Rust.
         vtable_replace!(DisplayVtable, va::DISPLAY_GFX_VTABLE, {
             get_dimensions      => display_vtable::get_dimensions,
+            set_layer_color     => display_vtable::set_layer_color,
+            set_active_layer    => display_vtable::set_active_layer,
+            get_sprite_info     => display_vtable::get_sprite_info,
             draw_polyline       => display_vtable::draw_polyline,
             draw_line           => display_vtable::draw_line,
             draw_line_clipped   => display_vtable::draw_line_clipped,
@@ -686,12 +689,11 @@ pub fn install() -> Result<(), String> {
             set_clip_rect       => display_vtable::set_clip_rect,
             is_sprite_loaded    => display_vtable::is_sprite_loaded,
             draw_scaled_sprite  => draw_scaled_sprite,
-            set_active_layer    => display_vtable::set_active_layer,
             set_layer_visibility => display_vtable::set_layer_visibility,
             update_palette      => display_vtable::update_palette,
             slot 19 => blit_sprite,
         })?;
-        let _ = log_line("[Display]   DisplayGfx: patched 18 methods → Rust");
+        let _ = log_line("[Display]   DisplayGfx: patched 20 methods → Rust");
     }
 
     Ok(())

crates/openwa-dll/src/replacements/sprite.rs

@@ -7,7 +7,7 @@
 use openwa_core::address::va;
 use openwa_core::rebase::rb;
 use openwa_core::render::palette::PaletteContext;
-use openwa_core::render::sprite::{Sprite, SpriteFrame};
+use openwa_core::render::sprite::{Sprite, SpriteFrame, SpriteVtable};
 
 use crate::hook::{self, usercall_trampoline};
 
@@ -22,7 +22,7 @@ unsafe extern "cdecl" fn construct_sprite_impl(sprite: *mut Sprite, context: *mu
     // Zero the entire 0x70-byte struct first
     core::ptr::write_bytes(sprite as *mut u8, 0, core::mem::size_of::<Sprite>());
 
-    (*sprite).vtable = rb(va::SPRITE_VTABLE) as *mut u8;
+    (*sprite).vtable = rb(va::SPRITE_VTABLE) as *const SpriteVtable;
     (*sprite).context_ptr = context;
     (*sprite).bitgrid_vtable = rb(va::BIT_GRID_DISPLAY_VTABLE) as *mut u8;
 

crates/openwa-dll/src/startup_checks.rs

@@ -13,6 +13,7 @@ use openwa_core::registry::{self, AddrKind};
 /// Valid first bytes for x86 function prologues (MSVC).
 /// This covers standard prologues plus common non-standard function starts.
 const VALID_PROLOGUES: &[u8] = &[
+    0x2B, // sub reg, r/m32 (e.g. SpriteBank__GetInfo starts with SUB EAX, [ECX+8])
     0x33, // xor reg, reg
     0x51, // push ecx
     0x52, // push edx