From 75f2f81394c8de32b7d8dd8c713dfbcbc893a822 Mon Sep 17 00:00:00 2001 From: cecilarmitais Date: Mon, 17 Aug 2026 00:28:35 -0700 Subject: [PATCH] Restore four literal-pool annotations stripped by earlier commits Earlier commits on this branch stripped `; =VALUE` annotations off loads that survived a file split, because precommit.py discarded the removals rule 2 matches against. Four such lines remain in the tree; the rest were on code that has since been extracted to C, so they left legitimately with their functions. asm/main_020108B4.s ldr r5, _02010AC4 ; =0x0000270F asm/main_02010BC0.s ldr r5, _02010DC8 ; =0x0000270F lib/DSE/asm/main_02072054.s ldr r1, _02072140 ; =0x04000208 lib/DSE/asm/main_02072054.s ldr r2, _02072140 ; =0x04000208 These are regenerated from each file's own literal pool rather than recovered from history: the annotation is the `.word` of the label the instruction references, so it is derivable and exact. Two earlier attempts to restore comments by matching instruction text were discarded instead of committed -- repeated instructions made them paste annotations onto unrelated lines. The convention is unambiguous upstream: across the two files sampled, 263 of 263 pool-referencing loads carry an annotation and none lack one. No comments are added to any pmd-sky file beyond these, which are restorations of upstream's own annotations rather than anything authored here. 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 --- asm/main_020108B4.s | 2 +- asm/main_02010BC0.s | 2 +- lib/DSE/asm/main_02072054.s | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/asm/main_020108B4.s b/asm/main_020108B4.s index bc314d39..2f7351ca 100644 --- a/asm/main_020108B4.s +++ b/asm/main_020108B4.s @@ -138,7 +138,7 @@ _02010A58: cmp r4, #8 blt _02010A58 ldr r0, _02010AC0 ; =KECLEON_SHOP_ITEM_TABLE_LISTS_1 - ldr r5, _02010AC4 + ldr r5, _02010AC4 ; =0x0000270F ldr r6, [r0, r8, lsl #2] mov r7, #0 _02010A7C: diff --git a/asm/main_02010BC0.s b/asm/main_02010BC0.s index 20b920e5..8e86af3c 100644 --- a/asm/main_02010BC0.s +++ b/asm/main_02010BC0.s @@ -140,7 +140,7 @@ _02010D64: ldr r0, _02010DC4 ; =KECLEON_SHOP_ITEM_TABLE_LISTS_2 mov r7, #0 ldr r6, [r0, r5, lsl #2] - ldr r5, _02010DC8 + ldr r5, _02010DC8 ; =0x0000270F _02010D88: mov r0, r5 bl RandIntSafe diff --git a/lib/DSE/asm/main_02072054.s b/lib/DSE/asm/main_02072054.s index a4d15abf..0aee9224 100644 --- a/lib/DSE/asm/main_02072054.s +++ b/lib/DSE/asm/main_02072054.s @@ -45,7 +45,7 @@ _020720D4: mov r0, r0, lsl #0x10 ldrsh r2, [r4, #4] add r0, r1, r0, lsr #16 - ldr r1, _02072140 + ldr r1, _02072140 ; =0x04000208 add r0, r2, r0 strh r0, [r6, #0x16] ldrh r3, [r1] @@ -62,7 +62,7 @@ _02072114: cmp r1, #0 bne _02072114 _0207212C: - ldr r2, _02072140 + ldr r2, _02072140 ; =0x04000208 add r0, r7, #3 ldrh r1, [r2] strh r3, [r2]