From 61b79d4e9d3e320bbbe6d6515463b9af1e4b5207 Mon Sep 17 00:00:00 2001 From: "Brandon M. M. Green" Date: Tue, 7 Jul 2026 15:26:55 +0000 Subject: [PATCH] Reconcile data/battle/residual_effects_1.asm for WLA-DX --- WLA_DX_PORTING.md | 19 +++++++++++++++ .../battle/residual_effects_1_reconcile.asm | 24 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 wla/data/battle/residual_effects_1_reconcile.asm diff --git a/WLA_DX_PORTING.md b/WLA_DX_PORTING.md index b226bb63e..ddd8e82fd 100644 --- a/WLA_DX_PORTING.md +++ b/WLA_DX_PORTING.md @@ -101,6 +101,25 @@ This is structural validation, not semantic ROM parity. ## Phase 3: data/battle/stat_mod_names.asm reconciliation **Reconciled file**: `wla/data/battle/stat_mod_names_reconcile.asm` + +## Phase 4: data/battle/residual_effects_1.asm reconciliation + +**Reconciled file**: `wla/data/battle/residual_effects_1_reconcile.asm` +**Original master file**: `data/battle/residual_effects_1.asm` (RGBDS source untouched) +**Validation**: 17 `.DB` entries verified (16 named constants + `-1` terminator), section label `ResidualEffects1:` preserved, RGBDS source untouched, no `wla/pkrd` files modified + +**Data content**: Pure `.DB` table of 16 named move effect constants (CONVERSION_EFFECT/HAZE_EFFECT/SWITCH_AND_TELEPORT_EFFECT/MIST_EFFECT/FOCUS_ENERGY_EFFECT/CONFUSION_EFFECT/HEAL_EFFECT/TRANSFORM_EFFECT/LIGHT_SCREEN_EFFECT/REFLECT_EFFECT/POISON_EFFECT/PARALYZE_EFFECT/SUBSTITUTE_EFFECT/MIMIC_EFFECT/LEECH_SEED_EFFECT/SPLASH_EFFECT) plus `-1` end marker + +**Translation notes**: +- Comments preserved verbatim (not assembly directives) +- Section label `ResidualEffects1:` preserved +- No macros, no conditionals, no pointer relocation +- No asserts to handle + +**Status**: +- RGBDS source: untouched +- Bank files: untouched +- No POC driver modified **Original master file**: `data/battle/stat_mod_names.asm` (RGBDS source untouched) **Commit**: `5aed9e56` **Validation**: WLA-DX .DB syntax with 6 stat mod strings; asserts dropped diff --git a/wla/data/battle/residual_effects_1_reconcile.asm b/wla/data/battle/residual_effects_1_reconcile.asm new file mode 100644 index 000000000..264bde7bb --- /dev/null +++ b/wla/data/battle/residual_effects_1_reconcile.asm @@ -0,0 +1,24 @@ +; Reconciled from master RGBDS source: data/battle/residual_effects_1.asm +; RGBDS source is untouched. +; WLA-DX representation for reconciliation only. + +; These are move effects (second value from the Moves table in bank $E). +ResidualEffects1: +; most non-side effects +.DB CONVERSION_EFFECT +.DB HAZE_EFFECT +.DB SWITCH_AND_TELEPORT_EFFECT +.DB MIST_EFFECT +.DB FOCUS_ENERGY_EFFECT +.DB CONFUSION_EFFECT +.DB HEAL_EFFECT +.DB TRANSFORM_EFFECT +.DB LIGHT_SCREEN_EFFECT +.DB REFLECT_EFFECT +.DB POISON_EFFECT +.DB PARALYZE_EFFECT +.DB SUBSTITUTE_EFFECT +.DB MIMIC_EFFECT +.DB LEECH_SEED_EFFECT +.DB SPLASH_EFFECT +.DB -1