ov11_02307334 (0x02307334, 1624 instructions in all three regions) is the
TM/HM use flow: a 42-case dense switch over *ov11_02324D8C, driving the bag
inventory menu, the TM info and confirmation dialogues, the gummi/IQ path and
the move-forget flow through menus, text boxes and scroll boxes. It is
function 145 of 215 in asm/overlay_11_022FE5F8.s, so extract_function.py
splits rather than merges: the 70 functions after it move to
asm/overlay_11_02308D1C.s, the function lands in src/overlay_11_02307334.c
with include/overlay_11_02307334.h, and main.lsf lists both new objects where
it listed one.
Unlike the last three functions on this branch there is no stale extern to
reconcile. The symbol has exactly one caller, ov11_02304B4C, in the same
object and still in asm; it has no external linkage today, appears in no
function-pointer table, and a scan of all 512 .s files for the little-endian
encoding of its address finds nothing.
Three declarations elsewhere in the tree are wrong and this function is the
first caller that makes them matter. RemoveItemNoHoleCheck takes an item
index, not a struct item *: asm/main_0200F390.s does mov r1,#6 / smulbb r1,
r0, r1, and SMULBB multiplies the low halfwords, so the argument is a signed
16-bit value scaled by sizeof(struct item). Its only other caller passes
GetFirstUnequippedItemOfType, which likewise returns an index rather than a
pointer, so the two errors cancelled and the pair matched by accident.
ov10_022BCDA8 is declared void but its body ends in sub_02033064, which
returns s32, and both of this function's call sites consume the result. All
three are -W error blockers here, and the matching build confirms the fixes
are byte-neutral.
Case emission order is source order and is not ascending: 0, 2, 1, 3, 17..25,
33, 34, 31, 32, 35..40, 26..30, 41, then 4..16 last. Every case breaks to a
single trailing return 0; case 16 returns 1, and case 15 falls through into
it. The eight function-scope locals are declared in descending stack-address
order because MWCC gives the first-declared local the highest address, which
tiles the frame exactly to 0x5A0.
The 43-instruction block shared by cases 32 and 34 is written out twice
rather than factored into a helper - MWCC 2.0 does not tail-merge blocks of
that size, and the target has both copies. Several shapes that read as
redundant are load-bearing and reproduce the target: case 4's v1 != 8 &&
v1 == 4, the dead field_0x0 = 0x1a in case 38 and field_0x24e = v6->id in
case 1 that the following if/else overwrites in both arms, the guard
if (field_0x8 == -2) ov11_02308EDC() in case 12 that the callee performs
again itself, and case 21's two search loops being written differently.
struct unk_02324D8C is a placeholder for the 0x330-byte state struct
MemAlloc'd by ov11_02307244, with field_0x<off> members, three identified
sub-object types where the arithmetic closes, and u8 filler elsewhere. The
0x14-byte object at 0x238 has to be a real nested struct: the target holds
base + 0x238 in a callee-saved register across two calls, while flat fields
make MWCC round the base to #0x200 and re-offset per use. The 49 callees with
no declaration anywhere are declared extern in the .c with prototypes read
off their own asm; every name is established by a literal bl in the target,
but the argument types are inference.
Region handling: three file-scope offset macros under JAPAN cover the id
families at +0x2D20 (16 sites), +0x1458 and +0x1567, and the two genuine
three-way forks - the StringFromId base in case 1 and the
CreateScrollBoxSingle base in case 10 - are written out per region as
src/get_category_string.c and src/overlay_25_init.c already do. The asm's
four #ifdef JAPAN code forks need no #if here: each exists only because
exactly one of the two constants is an ARM rotated-8-bit immediate, so
writing id + OFFSET and letting MWCC choose mov versus a pool word
reproduces all four. EUROPE differs from NORTH_AMERICA in two constants and
nothing else.
Authored by Claude (Opus 5) under human direction. Confirmed by matching
builds of all three regions: build/pmdsky.us/pmdsky.us.nds: OK,
build/pmdsky.eu/pmdsky.eu.nds: OK, build/pmdsky.jp/pmdsky.jp.nds: OK.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
sub_0203D538 (0x0203D538, 1666 instructions in US and EU, 1640 in JP) is the
mission-reward state machine: a 77-case dense switch over
MISSION_REWARD_STRUCT_MAIN_PTR->field_0x0 driving money, egg, item, rank-up
and recruit rewards through dialogue boxes and menus. It is function 13 of
89 in asm/main_0203CAF0.s, so extract_function.py splits rather than merges:
the 76 functions after it move to asm/main_0203EFD4.s, the function lands in
src/main_0203D538.c with include/main_0203D538.h, and main.lsf lists both new
objects where it listed one.
src/overlay_24_init.c declared sub_0203D538 itself, with a live call site in
a switch. That extern is removed and the file now includes the new header.
Case order is source order and is not ascending - two contiguous runs are
swapped (32,33,34 before 30,31; and 52..57 before 45..51), read off the jump
table. Every case ends `break` with a single `return 0` after the switch,
because the target's exit block itself materialises the value: a `return 0`
per case makes MWCC materialise r0 at each of 77 sites and, worse,
de-predicates the short blocks above them. case 76 keeps its `return 1`,
which is how the target jumps past that shared `mov r0, #0`.
The nine function-scope locals are declared buffer-first then the five
struct item in reverse case order, because MWCC gives the first-declared
local the highest stack address and the target wants the buffer at sp+0x22.
That ordering costs no instructions, so it shows up only as a wrong offset at
every stack access - not as a length difference.
struct unk_020AFE74 is a placeholder for the 0x3C0-byte state struct, with
field_0x<off> members and two u8 filler ranges this function never touches;
it cannot be honestly typed from one caller. The 19 callees with no
declaration anywhere are declared extern in the .c with prototypes read off
their own asm, and two of them - sub_02046C78 and sub_02046D20 - take no
arguments, contradicting src/main_020663C8.c.
Region handling: 35 message ids carry a uniform +0x21D4 under JAPAN via one
file-scope offset macro; one id at 0x2CC shifts by +0x2D20 instead and needs
its own ifdef; StrncpySimple becomes the two-argument StrcpySimple; and JAPAN
omits case 74's item fetch, its name formatting and its early-exit guard,
which is what removes a struct item local and takes the frame from 0x11C to
0x114. EUROPE is byte-identical to NORTH_AMERICA - there is no EUROPE
directive anywhere in this function.
Authored by Claude (Opus 5) under human direction. Confirmed by matching
builds of all three regions: build/pmdsky.us/pmdsky.us.nds: OK,
build/pmdsky.eu/pmdsky.eu.nds: OK, build/pmdsky.jp/pmdsky.jp.nds: OK.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
ApplyItemEffect (0x0231B68C, 1310 instructions in US, 1312 in EU) is the
thrown/eaten item dispatcher: an item-catcher preamble, the sticky-item
block, and then one switch (item->id) over a 183-entry jump table with 85
distinct case bodies, a shared tail that walks
APPLES_AND_BERRIES_ITEM_IDS, and EnemyEvolution. It is the last of ten
functions in asm/overlay_29_0231B33C.s and the next object in main.lsf is
src/overlay_29_0231CBC8.o, so extract_function.py merges rather than
splits and main.lsf is unchanged.
src/dungeon_projectile_throw.c declared ApplyItemEffect itself, with a
live call site. That extern is removed and the file now includes the new
header instead. It is a landed, already-matching object and parameters 1-3
are exactly where a wrong spelling would surface, so its rebuild in all
three regions is a check on the signature rather than tidying.
case ITEM_NOTHING is written explicitly above default even though the jump
table sends id 0 there. The dispatch is cmp r0,#0 / addge pc,pc,r0,lsl #2
with no rebase, and a survey of all 786 such dispatches in asm/ shows
MWCC's table spans the minimum to maximum LABELLED case: 104 of the 105
rebased tables have a real case at index 0, rebases occur for offsets as
small as 3, yet 40 tables have 3-7 leading default entries un-rebased and
82 have trailing default entries, which padding cannot explain. Leading
and trailing default entries are therefore explicit case labels sharing
default's body.
The category-5/10 test that skips the switch is an if/else whose else arm
is the entire switch; both arms fall into the shared tail. Case emission
order is source order and is not ascending (8 before 7, 77 before 74, 136
before 113, 182 before 104, default last).
The 41 callees that are still asm are declared extern in the .c with
prototypes read off their own asm, as the sibling files do, and so are the
28 rodata data symbols - const, with ov10_022C4864 as s32 where the other
25 scalars are s16, which is what makes its load a 32-bit ldr. Two
prototypes deliberately differ from pmdsky-debug: ApplyKeyEffect takes one
parameter, not two, and CalcDamageFixedNoCategory's fifth parameter points
at a one-byte object, not a struct damage_data.
Region handling: seven message ids are file-scope defines at US - 0x2C1
under JAPAN, and one EU-only call to ov29_022FB920 sits inside an
ifdef EUROPE with its prototype. The JP fork of the
exclusive_item_effect_flags offset needs nothing - the header already
models the 4-byte JP struct monster shrink.
Authored by Claude (Opus 5) under human direction. Confirmed by matching
builds of all three regions: build/pmdsky.us/pmdsky.us.nds: OK,
build/pmdsky.eu/pmdsky.eu.nds: OK, build/pmdsky.jp/pmdsky.jp.nds: OK.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
ActivateEndOfTurnEffects (0x0230FC24, 1235 instructions in US) is the
per-turn status tick: the warp-scarf counter, the leader's belly and
hunger messages, weather damage, Shed Skin and Hydration, the burn, poison,
bad-poison, constriction, wrap, ingrain, curse and leech-seed damage
countdowns, perish song and bide. It is the last of five functions in
asm/overlay_29_0230F9A4.s and the next object in main.lsf is
src/overlay_29_02311010.o, so extract_function.py merges rather than
splits and main.lsf is unchanged.
struct monster declared 0xAC as u8 bide_move_id plus u8 field_0xad. Retail
accesses it with ldrh/strh and stores 0x165 = MOVE_BIDE_UNLEASH, which
does not fit in a byte; enum move_id runs to 558, so -enum min sizes it to
two bytes - the width struct move's own enum move_id id at 0x2 already
has. The field becomes enum move_id and absorbs field_0xad. The struct
size and every later offset are unchanged, no other source reads either
member, and InitMove already takes enum move_id so no cast is needed. This
deviates from pmdsky-debug's u8; the reasoning note linked from the PR has
the evidence.
The 29 callees that are still asm are declared extern in the .c with
prototypes read off their own asm, as the sibling files do, and so are the
24 data symbols - const on the read-only rodata ones, which is what places
their loads correctly.
Region handling: the sound-effect guard in the hunger block is a genuine
three-way fork, EU calling ov29_022E34A8_EU where JP omits the
end_floor_no_death_check_flag test that US performs, and nine message ids
are file-scope defines at US - 0x2C0 under JAPAN. The JP struct and
dungeon offset shifts are absorbed by the headers with no directive.
Locals are generic and declared at function scope. That is not cosmetic:
the allocator's unit is the coalesced web, and the function-scope
declaration list is the only thing that orders it, so the declaration
order is what reproduces retail's register assignment.
Authored by Claude (Opus 5) under human direction. Confirmed by matching
builds of all three regions: build/pmdsky.us/pmdsky.us.nds: OK,
build/pmdsky.eu/pmdsky.eu.nds: OK, build/pmdsky.jp/pmdsky.jp.nds: OK.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
sub_02050EBC, SubFixedPoint, sub_02050F78, sub_02050FF8 and
BinToDecFixedPoint are the last five functions in asm/main_020504BC.s and
all operate on struct fixed_point (106 instructions). The next object in
main.lsf is src/number_util.o, which already holds their sibling
CeilFixedPoint, so extract_function.py merges rather than splits and
main.lsf is unchanged. They are landed in reverse address order so each
prepends above the last, leaving number_util.c in ascending address order
with CeilFixedPoint last.
sub_02050EBC and sub_02050F78 keep their sub_<addr> names - this is
decompilation, not identification.
A 4-byte struct fixed_point is passed and returned by value in r0, packed
as integer | fractional << 16. The stmdb sp!, {r0, r1, r2, r3} at entry is
MWCC giving the argument registers stack homes so a by-value struct
parameter can be addressed, and writing to the parameter reuses that home,
which is why SubFixedPoint and sub_02050EBC modify their first argument
and return it. The caller-side sub rX, sp, #4 idiom around these calls is
compiler-generated, not a source construct: src/dungeon_ai_movement.c
already emits it from a plain CeilFixedPoint(pokemon_info->belly).
None of the five blocks carries a region directive, so one source serves
all three regions.
Authored by Claude (Opus 5) under human direction. Confirmed by a matching
build: build/pmdsky.us/pmdsky.us.nds: OK.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
CalcDamage, CalcTypeBasedDamageEffects, ApplyDamage, ApplyDamageAndEffects
and ov11_022ED69C had locals named after what the decompiler inferred them
to mean. A local's meaning is not something the matching build can check,
so every such name is replaced by a type-derived generic one numbered in
declaration order: fixed-point temporaries fp1.., monster pointers mon1..,
scalar values v1.., bool8 flags f1.., pointers p1.. / ent1.. / item1.. /
ls1.., arrays arr / buf. Names that were already generic (i, j, k, n,
result) or are simply the type's own name (diag, weather, tile, member,
entry, spec) are unchanged, and so are all parameters, whose names upstream
syncs from pmdsky-debug. Declaration order is untouched; only identifiers
change, so no object changes.
Authored by Claude (Fable 5.1) under human direction. Confirmed by matching
builds of all three regions after the rename: build/pmdsky.us/pmdsky.us.nds:
OK, build/pmdsky.eu/pmdsky.eu.nds: OK, build/pmdsky.jp/pmdsky.jp.nds: OK.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
CalcDamage (0x0230BBAC, 1290 instructions) is the damage formula: stat
stages, item/ability/IQ-skill modifiers, the fixed-point base formula,
CalcTypeBasedDamageEffects, critical hits, Reflect/Light Screen and the
final multipliers, with its diagnostics in DUNGEON_PTR->last_damage_calc.
It is the first of 26 functions in asm/overlay_29_0230BBAC.s and a rodata
object precedes that object in main.lsf, so extract_function.py splits
rather than merges: the function lands in src/overlay_29_0230BBAC.c with
include/overlay_29_0230BBAC.h, the other 25 move to
asm/overlay_29_0230D088.{s,inc}, and main.lsf lists both objects where it
listed one.
struct damage_calc_diag modelled move_category as a 1-byte enum plus
field_0x5/0x6/0x7 padding (3fc6d8bd). Retail writes that field with a
4-byte str (0x0230BDC8) and reads the eight modifier bytes at 0x30..0x37
unsigned (ldrb at 24 sites), so move_category becomes s32 - the struct
stays 0x54 bytes - and the modifiers become u8 (they were s8). No other
source in the tree reads these members. Both deviate from pmdsky-debug's
declarations; the reasoning note linked from the PR has the evidence.
Region handling follows the neighbouring files: six
DefenderAbilityIsActive__0230A940 calls take three arguments under JAPAN,
and message ids C53/C54/C55/C57/C58 and DC1 are file-scope defines at
US - 0x2C1 under JAPAN. One difference is real source: the defense-side
apparent_id 0x211/0x218 checks compare the attacker's apparent_id under
JAPAN (the JP-only ldrsh r1, [r6, #4]). EU is identical to US.
The 17 callees that are still asm are declared extern in the .c with
prototypes read off their own asm, as the sibling files do. The spelling
of the ability-multiply block (an s32 calc[2] local, two temps and three
volatile s32 * pointers) is match-derived, each element removing one
measured compiler obstacle; the reasoning note explains it.
Authored by Claude (Fable 5.1) under human direction. Confirmed by
matching builds of all three regions: build/pmdsky.us/pmdsky.us.nds: OK,
build/pmdsky.eu/pmdsky.eu.nds: OK, build/pmdsky.jp/pmdsky.jp.nds: OK,
each also passing main.sha1, filesystem.sha1 and arm7.sha1.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
CalcTypeBasedDamageEffects (0x0230AD04, 676 instructions) applies every
type-, ability-, weather- and status-based multiplier to a damage
calculation. It merges into src/type_effectiveness.c, which already held
its callee GetTypeMatchup, so asm/overlay_29_0230AD04.{s,inc} are removed
and main.lsf loses that object with no new object added.
struct damage_calc_diag modelled move_type as a 1-byte enum plus explicit
field_0x1/0x2/0x3 padding, but gave move_category no such padding, so
every member from move_indiv_type_matchups (0x8) to attacker_level (0x16)
compiled below the offset its own comment states. Downstream alignment
before damage_calc re-absorbed the drift, so the struct still totalled
0x54 and no build caught it; the two existing users in the tree both sit
past the re-convergence point. asm/overlay_29_022E0378.s writes 0x188 and
asm/overlay_29_022E335C.s reads 0x184/0x188 with word accesses, so both
fields are four bytes in retail. Adding field_0x5/0x6/0x7 is byte-neutral
for the existing tree.
include/type_effectiveness.h gains overlay_29_02308FBC.h, which defines
the struct unk_02308FE0 its new declaration names.
Region handling follows the neighbouring files: six
DefenderAbilityIsActive__0230A940 calls take three arguments under JAPAN
and four elsewhere, and five message ids are file-scope defines at
US - 0x2C1 under JAPAN. EU is identical to US - the original asm block
carries no EUROPE directive at all.
Authored by Claude (Opus 5) under human direction. Confirmed by matching
builds of all three regions: build/pmdsky.us/pmdsky.us.nds: OK,
build/pmdsky.eu/pmdsky.eu.nds: OK, build/pmdsky.jp/pmdsky.jp.nds: OK,
each also passing main.sha1 and filesystem.sha1.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
ApplyDamageAndEffects (617 instructions, overlay 29 at 0x0230863C) lands in
src/overlay_29_02308FBC.c beside ApplyDamage, with all three regions matching.
JAPAN differs in eleven places: ten DefenderAbilityIsActive__0230A940 calls
drop their fourth argument (the header already declares both forms), and the
counter-damage message id is US - 0x2C1, added as MESSAGE_C3F alongside the
existing per-region defines. EUROPE is byte-identical to US.
ApplyDamage's sixth parameter changes from enum damage_source_non_move to
s16. The caller loads it with ldrsh and passes it in a register; the enum is
all-positive so -enum min makes it unsigned 2-byte, which emits ldrh there.
s16 scores 0 on both functions and all three ROMs still match, so this is a
correction to the type rather than a change in behaviour.
New in this commit: struct unk_023535DC for the exclusive-item effect table at
ov29_023535DC (16-byte stride: effect id, argument, handler), and externs for
the ten ov10_022C* activation-chance globals and six overlay callees.
Three constructs are colouring devices rather than recovered source and should
be read as stand-ins: a (u32) cast on the final return, a (s16) cast on the
counter-attack loop's damage-source argument, and *(u8 *)effect as the effect
loop's condition. Each is plain C, and each is load-bearing for the match.
Authored by Claude (Opus 5 and Fable 5) under human direction. Confirmed by
matching builds of all three ROMs: build/pmdsky.us/pmdsky.us.nds: OK,
build/pmdsky.eu/pmdsky.eu.nds: OK, build/pmdsky.jp/pmdsky.jp.nds: OK -- each
also passing main.sha1, so the ARM9 binaries match and not only the packaged
ROMs.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Follow-up to ff65ac0e, which decompiled the US branch only. One source now
matches all three regions:
build/pmdsky.us/pmdsky.us.nds: OK
build/pmdsky.eu/pmdsky.eu.nds: OK
build/pmdsky.jp/pmdsky.jp.nds: OK
JAPAN, five source differences:
- DefenderAbilityIsActive__0230A940 takes three arguments, not four, at six
call sites. include/overlay_29_0230A994.h already declares this, so the JP
build failed to compile rather than to match.
- every message id is US - 0x2C1. Kept as region-conditional #defines at file
scope, following src/dungeon_ai.c.
- no UpdateStatusIconFlags call before the HP check.
- no end_floor_no_death_check_flag guard on the revival-item path.
- in the reviver-seed block, no ov29_022FBD24; instead ov29_02307DC0 after the
curse handling.
EUROPE, one behavioural difference: the last arm of the defeat-message ladder
records a flag instead of logging, and the message is emitted later at three
points - the reviver-seed path, the revival-item path, and their else. The two
revival paths log from a different table.
That table is four bytes that exist only in the EUROPE branch of
asm/overlay_29_rodata_02352A6C.s, immediately after ov29_02353218 and carrying
no symbol; the extractor could only render both as raw addresses (0x02353E44 and
0x02353E40). This commit labels it. The label and .global add no bytes, and the
EU checksum is what confirms both references resolve where intended - had either
been wrong, pmdsky.eu.nds would not match.
The name ov29_02353E44 is keyed to the symbol's EUROPE address, which breaks the
file's convention of naming by US address. There is no US address to use: the
data does not exist in that build.
One change was needed for the EU register allocation and is byte-neutral for the
other two builds: `dmon` is now assigned after the wild-enemy test rather than
before it, with that test reading through defender->info. Introducing the
variable later flips which web the allocator colours first and unwinds a
whole-function rotation of three callee-saved registers.
Authored by Claude (Opus 5) under human direction. Confirmed by matching builds
of all three regions.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
ApplyDamage (overlay 29, 0x02308FE0). asm/overlay_29_02308FE0.s and its .inc
are removed and the object drops out of main.lsf; the function merges into
src/overlay_29_02308FBC.c alongside EntityIsValid__02308FBC.
Types added: struct unk_02308FE0 (the damage-data argument, in the function's
header), struct unk_023528A4 and struct unk_022C593C (element types for
TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS and ov10_022C593C, local to the .c).
Field types corrected, each required by the match:
struct monster::bide_damage_tally u32 -> s32 (clamped with strgt)
struct monster::field_0x168 / field_0x169 -> s16 field_0x168 (read ldrsh)
struct dungeon_generation_info::music_table_idx u16 -> s16 (read ldrsh)
TalkToSecretBazaarNpcStandard, ov29_022F0618, TalkToSecretBazaarNpcWithYesNoMenu
and the TalkToSecretBazaarNpc extern take a message id in their first parameter,
not a struct entity *. Every caller loads a small constant into r0 - 0xC6B from
ApplyDamage, 0xF32/0xF4A/0xF4B/0xF4C in asm/overlay_29_02344178.s. The three
tree functions are one-line forwarders, so their parameter types were
unconstrained; ApplyDamage is the first C caller.
Two things a reviewer should weigh. DUNGEON_PTR is declared scalar here
(extern struct dungeon *DUNGEON_PTR;) rather than the *DUNGEON_PTR[] idiom the
other files use - the array form lets MWCC CSE the load and costs three
instructions. And one read is qualified volatile
(*(volatile u8 *)&dmon->curse_class_status.curse) to reproduce a reload retail
performs with no intervening call; it is standard C and the ROM matches, but it
is a stand-in rather than recovered source, and a struct curse_class_status *
local gets to within one instruction without it.
Only the US branch is decompiled; the original block carries 50 preprocessor
directives including two wholesale #ifdef EUROPE duplications.
Authored by Claude (Opus 5) under human direction. Confirmed by a matching
build: build/pmdsky.us/pmdsky.us.nds: OK (main.sha1 passes, so the ARM9 binary
matches and not only the packaged ROM).
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Decompiles ov11_022ED69C (410 instructions) out of
asm/overlay_11_022ECD24.s. The function was first in that file, so the
remainder splits to asm/overlay_11_022EDD14.s and main.lsf gains
src/overlay_11_022ED69C.o ahead of it.
include/ground_bg.h:
- MapRender 0x1C -> 0x54, adding unk1C/unk24/unk2C (two pointers each)
and a 0x20 filler. This consumes GroundBg::fillerForNow2[112]
exactly: 0x210 + 2*0x54 == 0x2B8, so no offset after it moves, and
ground_bg.c only ever uses mapRender[0].
- GroundBg::unk1FC: four unreferenced u8 -> one s32.
- BmaHeader::numLayers/hasDataLayer/hasCollision: u16 -> s16. Retail
reads these with ldrsh; the u16 declaration emitted ldrh and produced
three wrong bytes in OVY_11.sbin. This function is their only reader
in the tree -- every other use is a strh, identical either way -- so
no other object changes.
- RGB_Array, the UnkStruct_2324CBC family, the three palette helpers,
ov11_02320C18 and ov11_02320BF4/BE8 move here from src/ground_bg.c,
which now includes them rather than redeclaring them.
asm/overlay_11_022ECD24_data.s has its .include repointed at the .inc
that survived the split; extract_function.py deletes the old one without
knowing about sibling objects in the same address range.
ov11_022EE9B0 and ov11_022EE8CC are still asm and are declared
provisionally in include/overlay_11_022ED69C.h from their call sites.
Authored by Claude (Opus 5) under human direction. Confirmed by a
matching build: build/pmdsky.us/pmdsky.us.nds: OK.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Third cleanup batch. Nine asm/*.s files and their .inc files are removed;
main.lsf drops from 1168 to 1159 objects.
overlay_29_0234921C IsCurrentMissionType, IsCurrentMissionTypeExact
main_02058E8C DisableAllIqSkills, EnableAllLearnableIqSkills
main_02058D04 GetLearnableIqSkills
main_02058C4C GetUnlockedTactics, GetUnlockedTacticFlags
main_020307B8 sub_020307B8, sub_020307EC
overlay_29_02300D50 ov29_02300D50, ov29_02300DC0
overlay_29_022E28D4 IsValidTargetEntity, CanSeePosition
main_0206A750 sub_0206A7CC
overlay_29_022E66D8 ov29_022E66D8, ov29_022E6724
main_0202AAA8.h: the coarse field_0xFC[0x9C] placeholder is split into
field_0xFC[8] / u32 field_0x104 / field_0x108[0x90]. Byte-neutral, and
nothing in the tree referenced the placeholder by name.
Two pre-existing declarations of landed functions are replaced with an
include of the header that now declares them. dungeon_recruitment.c
declared IsCurrentMissionTypeExact as (u32, u32) where it takes
(enum mission_type, u8); both call sites pass enum constants, so the ROM
is unchanged.
TACTICS_UNLOCK_LEVEL_TABLE, sub_02032984 and sub_0204E6FC/0204E770/
0204E780 are declared provisionally at the call site; no header declares
them yet.
Authored by Claude (Opus 5) under human direction. Confirmed by a
matching build: build/pmdsky.us/pmdsky.us.nds: OK.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Second cleanup batch. Eight files are now gone:
asm/overlay_29_022E1618.s asm/main_0202B530.s
asm/overlay_29_022DC65C.s asm/main_0205EC38.s
asm/overlay_29_0232124C.s asm/main_02051788.s
asm/main_02042B20.s asm/main_02065BD8.s
main.lsf falls from 1175 objects to 1167.
Twenty-two functions matched across eleven files, but only seventeen land.
FixedPoint64ToInt, GetSpriteSize and RemoveItemFromKecleonShop1 did not match,
and their files therefore cannot be emptied; landing their already-matched
siblings would have converted two two-function files into two fresh
single-function fragments, so those two are held back as well. This batch
reduces the fragment count without creating any.
Three declarations follow the tree rather than the scratch: ov29_0232119C takes
struct entity * as its first parameter, ov29_023538B4 is already declared as a
u8 array, and ov29_022DC2B8 and ov29_022DC33C are declared u8 * in their
destination file. That last one is inconsistent with poly_text.h, which declares
ov29_022DC2B8 as struct unk_ov29_022DC240_t *; the file already carried the same
split for ov29_022DC240, so its local convention was followed rather than
changing pre-existing code. Worth unifying separately.
Authored by Claude (Opus 5) under human direction. Confirmed by a matching
build: build/pmdsky.us/pmdsky.us.nds: OK.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
First cleanup batch. All twenty matched at score 0, and every file they came
from is now gone:
asm/main_0204F9F4.s 2 functions
asm/main_02017C50.s 4
asm/overlay_29_02344B44.s 2
asm/overlay_11_0230CCE0.s 2
asm/overlay_11_022E9D6C.s 5
asm/main_0201BEB0.s 5
main.lsf drops from 1181 objects to 1175, the first net reduction on this
branch. Each removal also retires the matching asm/include/*.inc.
Most of these reuse types landed earlier and add nothing: the OAM group reuses
unk_0201BCCC with unk_oam_sub and unk_oam_elem, and the overlay_11 fade group
reuses unk_023890A0 and unk_0238916C. Only unk_0238A098 and unk_023531A4 are
new.
Note for later cleanup work: six of the twenty are the last function in their
file, so emptying it leaves them with no following address and the object-level
size check cannot cover them. On a cleanup batch the matching build carries
more of the verification than usual.
Authored by Claude (Opus 5) under human direction. Confirmed by a matching
build: build/pmdsky.us/pmdsky.us.nds: OK.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Ninth 5x10 batch; 48 of 50 matched at score 0 and land here.
overlay_11_022FD308 LivePerformer accessors
main_0204CF9C GLOBAL_PROGRESS_PTR bit-array accessors
main_020022C4 string, thread and card initialisation
overlay_11_022E9D6C screen-fade queries
main_0203C774 state-machine steps
New placeholder structs: unk_022FE490, unk_022FE498, unk_020AFE60, unk_020AFE70,
unk_0209C7F4, unk_0238916C, unk_0229B004, unk_0229AFC0. The overlay_11 fade
group reuses unk_02388FC0 and unk_023890A0 unchanged.
Two are NOT here. SetPositionInitialLivePerformer sits at 225, where an
address computation is scheduled earlier than the target places it; six
variants moved nothing. sub_020024E4 sits at 35, a two-register swap in a
zero-fill loop, after both declaration orderings, a block scope, an extra
temporary and a while form. Both stay as assembly.
Matching finding, now in docs/MATCHING_TIPS.md: a two-word struct copy emits
the same four instructions as two field assignments but schedules both loads
first, which is what the target has. Writing the fields separately interleaves
load and store, and hoisting them into locals merges the stores into an stm.
The OS wrappers drop their local declarations of nitro functions, which reach
every translation unit through the prefix header and disagreed on return type.
OS_ResetSystem keeps its extern; it is declared in no reachable header.
Authored by Claude (Opus 5) under human direction. Confirmed by a matching
build: build/pmdsky.us/pmdsky.us.nds: OK.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Eighth 5x10 batch; 49 of 50 matched at score 0 and land here.
overlay_11_022FAC54 LiveObject accessors
overlay_11_022E46FC coroutine table and special recruitment
main_020325AC further inventory-menu paging
overlay_17_0238A754 menu state setters
main_0201BAC8 OAM attribute copying
New placeholder structs: unk_022FD1A0, unk_02324FA0, unk_02320904,
unk_C_ROUTINES, unk_0238BE00, unk_0201BCCC with unk_oam_sub and unk_oam_elem.
struct unk_020332AC gains field_0xBC and field_0xD0, splitting two byte arrays
without changing its size; no already-landed function changes.
GetCoroutineInfo is NOT here. It reaches 30 -- two rows, a register swap between
the base pointer and the record pointer, with every instruction otherwise
identical. Eight structural variants and six declaration orderings were tried;
restructuring around a record pointer took it from 500 to 30 and nothing since
has moved it. It stays as assembly.
Two matching findings, both in docs/MATCHING_TIPS.md. A switch needs a fourth
case before MWCC emits a binary split rather than a flat compare chain, which is
now the second batch where that closed a function. And x == 4 || x == 5 folds
into a range test at every width tried, where the target keeps cmp/cmpne; the
double negation !(x != 4 && x != 5) blocks the fold and keeps the arm order.
Authored by Claude (Opus 5) under human direction. Confirmed by a matching
build: build/pmdsky.us/pmdsky.us.nds: OK.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Seventh 5x10 batch; all fifty matched at score 0.
overlay_11_022EE5E4 LiveActor accessors
overlay_11 language and string helpers
main_020325AC inventory-menu paging and scaling
overlay_29_0234B4CC alert-box wait, portrait init, message log
overlay_18 further LINK_SHOP_PTR setters
New placeholder structs: unk_022FAB44, unk_020332AC, unk_0234BAC0. struct
unk_0238C950 gains an s8 at offset 4, splitting its leading byte array without
changing its size; no already-landed function changes. struct unk_023537CC is
copied from the neighbouring sources that already define it, and struct iovec
now comes from file.h rather than a local copy.
Seven callees were already declared elsewhere in src/ and are reused verbatim
rather than redeclared: AdvanceFrame, DUNGEON_BUTTON_INPUT, MESSAGE_LOG_INFO,
GetSimpleMenuResult__0202B870, GetLanguage, LoadFileFromRom and
UnkMapRelatedFunc.
docs/MATCHING_TIPS.md gains three entries: a case label sharing default's body
still shapes the compare chain; a masked value promotes to int, so an unsigned
compare needs a cast; and the two malformed disassembly shapes, with the
reachability test that separates a merged block from an ordinary loop.
Authored by Claude (Opus 5) under human direction. Confirmed by a matching
build: build/pmdsky.us/pmdsky.us.nds: OK.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Sixth 5x10 batch; all fifty matched at score 0 and landed.
overlay_29_022DC694 HEAD team-stats forwarders, a 10-argument forwarder,
and a 22-entry table search
overlay_29_022E4714 HEAD PlayEffectAnimationEntity wrappers
overlay_29_022E37DC TAIL same family, merging into overlay_29_022E406C.c
overlay_18 mid LINK_SHOP_PTR state setters
main_020022C4 mid Nitro OS thread and mutex wrappers
New placeholder structs: unk_022DC694, unk_02353518, unk_0238C950,
unk_020027E8, unk_0229B0E0. The OS wrappers use nitro's own OSThread and
OSMutex types, which every translation unit already has through the prefix
header, rather than private tags.
Two spellings a reviewer should weigh, both recorded in the note:
_0229B0E0 is declared volatile because the target reloads it where any
ordinary spelling is common-subexpression-eliminated, and ov29_022DC78C
matches in byte-offset form rather than array indexing because the target
keeps the offset live in a separate mul.
Group selection now rejects malformed disassembly: 0.4% of asm blocks end
without a return (a .global mid-body split one function in two) and 6.5% are
several functions merged into one block (no .global marks the later entry
points). Neither is decompilable as written.
Authored by Claude (Opus 5) under human direction. Confirmed by a matching
build: build/pmdsky.us/pmdsky.us.nds: OK.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
The group from asm/overlay_00_022DB1A4.s that the previous commit could not
land. It does not belong in src/: these are Nintendo Wi-Fi Connection library
functions, and src/** is built with OPTFLAGS -O4,s, which inlines a small callee
whose body is visible in the same translation unit. lib/** is built with
OPTFLAGS_SDK -O4,p, which does not. Landed into lib/src/overlay_00_022DB1A4.c
and listed in main.lsf under OVY_0, all ten are byte-identical to the original
assembly.
A decomp.me scratch cannot see this: it declares every callee extern, so no body
is visible and nothing can be inlined, and the group scored 0 either way.
lib/src was already in LIB_SRC_SUBDIR without existing on disk, so no makefile
change is needed. The object also receives the full defines, not just
GLB_DEFINES; none of these functions carries a region conditional in any case.
docs/MATCHING_TIPS.md carries the mechanism, a minimal reproducer, and a
one-object diagnostic that does not need a full build.
Authored by Claude (Opus 5) under human direction. Confirmed by a matching
build: build/pmdsky.us/pmdsky.us.nds: OK.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
