diff --git a/README.md b/README.md index a8f6086060..2b4ea2f9e6 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ In Golden Sun, lighting the four Elemental Lighthouses releases Alchemy upon the The two games share much of the same code, so Alchemy recovers them side by side. -## Status: ☀️ 55.96% · ⚓️ 0.20% +## Status: ☀️ 56.01% · ⚓️ 0.20% -![ROM contents]() +![ROM contents]() **DONE** measures recovered code: byte-exact C and evidenced permanent assembly, divided by each game's audited executable bytes. ☀️ is The Broken diff --git a/TODO.md b/TODO.md index 4a828c039a..fed9f2bd42 100644 --- a/TODO.md +++ b/TODO.md @@ -8,20 +8,41 @@ that finishes it. ### ☀️ 60% +- Prefer never-drafted unknown; when that pool is too small for 60%, first-try + non-Stubborn draft_c / overlay virgin. Skip Far veneers and asm-manifest + owners (C there does not raise DONE). Bounce at 10 minutes. + Reach 60% of the fixed executable inventory. Read the current verified count with `make progress`; do not maintain a second score in this task list. -- Recheck and adopt what the stopped recovery run found. Exact: - `main:080fa514` (72 bytes) and `main:08092878` (172 bytes). Exact at 54 bytes - each: `resource_39e:02000104` and `resource_3c9:02000104`, the `Effect_Move` - family; eleven more copies differ by one halfword, so the family wants one - shared source with instances. +- `Effect_Move` shared unit is adopted on `cursor/tbs-to-60` (24 overlay + instances). Keep taking fresh twins / named-no-source owners that score + exact quickly; if not exact inside a 10-minute window, park under Stubborn + and switch owners. - Rebuild coverage with `make coverage`, then rank unresolved owners from it, twins of exact owners first. -- Recount the owners still parked because their only match needed a - scheduling trick. The five overlay copies of `0809a65c` still hold a - `do { } while (0)` barrier. `SpawnConfiguredEffect` (23 copies) stays a - recorded compiler gap unless new evidence reopens it. + +### Stubborn (hard-pass later) + +Parked for a stronger model. Agents must not burn a 10-minute window here. + +- `main:080f9a30` SoundNote_Detach (30 B) — retired-from-C allocation wall (note stays in r0; next reg reused for zero); raw already documents no ordinary C spelling. +- `main:08021e28` (32 B) — scheduling-floor, 2 halfwords; bounce. +- `main:08029274` (80 B) — scheduling-floor, 2 halfwords; bounce. +- `main:080a9d3c` (72 B) — instruction-selection wall; bounce. +- `resource_382:02001090` ActorDraw_SetupActorSceneCells twin (172 B) — equivalent to `resource_385:02000c1c`, but instance must place every `actor-motion-event-scene` member; bounce until full resource_382 map exists. +- `main:080fa514` (72 B) — still many differing halfwords (not exact). +- `main:08092878` (172 B) — still many differing halfwords (not exact). +- `resource_3bd:020013f8` FieldScene_RunExtendedActorPresentation (6220 B) — + scheduling-floor, 2 halfwords (arg load order for `Func_02003d20(0,1)`); + no established repair. +- Overlay copies of `0809a65c` with `do { } while (0)` barriers; leave parked. +- `SpawnConfiguredEffect` (23 copies) — recorded compiler gap. +- `main:0800383c`–`main:08003a3c` family (~129 B each) — scheduling-floor, 2 halfwords each; bounce. +- Allocation / instruction-selection walls already labeled + `copy_versus_rematerialise` or `instruction-selection` (e.g. + `main:080b6d30`, `main:080b6e7c`, `resource_380:02004260`, + `resource_3af:02001db0`) — do not respell. ### Reconstruct The Lost Age diff --git a/games/THE BROKEN SEAL/PREVIEW/TBS-EN-ROM.SVG b/games/THE BROKEN SEAL/PREVIEW/TBS-EN-ROM.SVG index 5e7a04d524..11839ac8b6 100644 --- a/games/THE BROKEN SEAL/PREVIEW/TBS-EN-ROM.SVG +++ b/games/THE BROKEN SEAL/PREVIEW/TBS-EN-ROM.SVG @@ -6098,17 +6098,16 @@ - -SHIAN_JIIN: 49,824 bytes · Unknown, Drafted, Assembly, C, Data · 4 items + +SHIAN_JIIN: 49,824 bytes · Unknown, Assembly, C, Data · 4 items - -SHIAN_JIIN: 9,440 bytes · Unknown, Drafted, Assembly, C · 0x087b2078 - - - - + +SHIAN_JIIN: 9,440 bytes · Unknown, Assembly, C · 0x087b2078 + + + SHIAN_JIIN.BIN: 15,412 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 4 items @@ -6658,10 +6657,10 @@ GOMA_IRIGUCHI: 3,028 bytes · Unknown, Drafted, Assembly, C · 0x08798dc4 - - - - + + + + GOMA_IRIGUCHI.BIN: 6,576 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 2 items @@ -6704,16 +6703,17 @@ - -GOMA_SUIRO: 13,028 bytes · Unknown, Assembly, C, Data · 3 items + +GOMA_SUIRO: 13,028 bytes · Unknown, Drafted, Assembly, C, Data · 3 items - -GOMA_SUIRO: 1,660 bytes · Unknown, Assembly, C · 0x0879aad8 + +GOMA_SUIRO: 1,660 bytes · Unknown, Drafted, Assembly, C · 0x0879aad8 - - + + + GOMA_SUIRO.BIN: 10,492 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 4 items @@ -6863,9 +6863,9 @@ HAIDIA_DOU: 5,880 bytes · Unknown, Drafted, Assembly, C · 0x087bdeb0 - - - + + + HAIDIA_DOU.BIN: 16,928 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 6 items @@ -7281,9 +7281,9 @@ KARAGORU_DOU: 4,616 bytes · Unknown, Drafted, Assembly, C · 0x087e636c - - - + + + KARAGORU_DOU.BIN: 16,540 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 6 items @@ -8643,21 +8643,22 @@ KUUPUAPPU_MURA: 4,952 bytes · Unknown, Drafted, Assembly, C · 0x08793768 - - - + + + - -KUUPUAPPU_MURA_SAI: 3,612 bytes · Unknown, Assembly, C · 1 items + +KUUPUAPPU_MURA_SAI: 3,612 bytes · Unknown, Drafted, Assembly, C · 1 items - -KUUPUAPPU_MURA_SAI: 3,612 bytes · Unknown, Assembly, C · 0x08797990 - - - + +KUUPUAPPU_MURA_SAI: 3,612 bytes · Unknown, Drafted, Assembly, C · 0x08797990 + + + + @@ -8717,9 +8718,9 @@ MAKYURI_HEYA: 16,680 bytes · Unknown, Drafted, Assembly, C · 0x087ac2d8 - - - + + + MAKYURI_HEYA.BIN: 27,072 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 8 items @@ -8854,9 +8855,9 @@ MAKYURI_IRIGUCHI: 7,848 bytes · Unknown, Drafted, Assembly, C · 0x087aa430 - - - + + + MAKYURI_IRIGUCHI.BIN: 5,932 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 2 items @@ -9045,9 +9046,9 @@ RAMAKAN_SABAKU: 6,176 bytes · Unknown, Drafted, Assembly, C · 0x087bc690 - - - + + + RAMAKAN_SABAKU.BIN: 35,932 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 8 items @@ -9484,9 +9485,9 @@ RUNPA_MURA: 4,968 bytes · Unknown, Assembly, C · 0x087c460c - - - + + + RUNPA_MURA.BIN: 12,784 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 4 items @@ -9653,9 +9654,9 @@ SHIAN_MURA: 4,392 bytes · Unknown, Drafted, Assembly, C · 0x087b6668 - - - + + + SHIAN_MURA.BIN: 15,964 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 2 items @@ -10447,9 +10448,9 @@ SUHARA_SABAKU: 3,796 bytes · Unknown, Drafted, Assembly, C · 0x087eaf28 - - - + + + SUHARA_SABAKU.BIN: 24,976 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 6 items @@ -10621,9 +10622,9 @@ TAKARA_HASHIRA: 8,792 bytes · Unknown, Drafted, Assembly, C · 0x087d0e88 - - - + + + TAKARA_HASHIRA.BIN: 20,340 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 8 items @@ -11251,9 +11252,9 @@ TORETO_HEYA: 5,572 bytes · Unknown, Drafted, Assembly, C · 0x087a5214 - - - + + + TORETO_HEYA.BIN: 9,244 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 2 items @@ -11321,10 +11322,10 @@ VINASU_CHOJO: 13,960 bytes · Unknown, Drafted, Assembly, C · 0x087f6e64 - - - - + + + + VINASU_CHOJO.BIN: 5,756 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 2 items @@ -32154,1611 +32155,9 @@ CONSTANT_ZERO_RESULT.C · 0x080132cc: 4 bytes · C · 0x080132cc - -RESOURCE.JSON: 12,848,444 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 400 items - - - - -resource_015 · compressed data resource: 189 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x086848d0 - - - -resource_021 · compressed data resource: 6,252 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x086a7248 - - - -resource_025 · compressed data resource: 692 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x086cd614 - - - -resource_0b1 · compressed data resource: 1,088 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0887bee4 - - - -resource_0b2 · compressed data resource: 588 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0887c324 - - - -resource_0b4 · compressed data resource: 2,089 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0887c708 - - - -resource_0ba · compressed data resource: 587 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08880678 - - - -resource_0bb · compressed data resource: 387 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088808c4 - - - -resource_0c1 · compressed data resource: 821 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08885298 - - - -resource_0c2 · compressed data resource: 4,298 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088855d0 - - - -resource_0c3 · compressed data resource: 742 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0888669c - - - -resource_0c4 · compressed data resource: 338 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08886984 - - - -resource_0c8 · compressed data resource: 3,196 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0888aae4 - - - -resource_0c9 · compressed data resource: 41 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0888b760 - - - -resource_0ca · compressed data resource: 42 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0888b78c - - - -resource_0cb · compressed data resource: 1,981 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0888b7b8 - - - -resource_0ce · compressed data resource: 1,318 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0888d820 - - - -resource_0cf · compressed data resource: 1,326 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0888dd48 - - - -resource_0d0 · compressed data resource: 1,520 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0888e278 - - - -resource_0d2 · compressed data resource: 512 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0888eff4 - - - -resource_0d3 · compressed data resource: 1,053 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0888f1f4 - - - -resource_0d7 · compressed data resource: 601 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08890048 - - - -resource_0d8 · compressed data resource: 1,403 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088902a4 - - - -resource_0da · compressed data resource: 2,396 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08890acc - - - -resource_0e9 · compressed data resource: 714 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0889af8c - - - -resource_0ee · compressed data resource: 1,626 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0889db18 - - - -resource_0ef · compressed data resource: 1,322 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0889e174 - - - -resource_0f2 · compressed data resource: 1,761 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088a20f0 - - - -resource_0f3 · compressed data resource: 8,011 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088a27d4 - - - -resource_0f7 · compressed data resource: 1,606 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088a631c - - - -resource_0f8 · compressed data resource: 3,107 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088a6964 - - - -resource_0f9 · compressed data resource: 961 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088a7588 - - - -resource_0fa · compressed data resource: 455 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088a794c - - - -resource_0fb · compressed data resource: 1,354 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088a7b14 - - - -resource_0fc · compressed data resource: 842 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088a8060 - - - -resource_0fd · compressed data resource: 1,900 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088a83ac - - - -resource_102 · compressed data resource: 760 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088a9ec4 - - - -resource_104 · compressed data resource: 253 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088aacec - - - -resource_11a · compressed data resource: 4,039 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088b46d0 - - - -resource_11e · compressed data resource: 436 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088b7350 - - - -resource_121 · compressed data resource: 631 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088b9624 - - - -resource_127 · compressed data resource: 1,083 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088bd758 - - - -resource_12a · compressed data resource: 1,181 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088be288 - - - -resource_12d · compressed data resource: 2,110 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088bf97c - - - -resource_134 · compressed data resource: 442 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088c3c88 - - - -resource_135 · compressed data resource: 443 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088c3e44 - - - -resource_136 · compressed data resource: 2,368 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088c4000 - - - -resource_137 · compressed data resource: 1,047 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088c4940 - - - -resource_160 · compressed data resource: 406 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088d6428 - - - -resource_17e · compressed data resource: 97 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088e3ddc - - - -resource_181 · compressed data resource: 515 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088e474c - - - -resource_189 · compressed data resource: 891 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088eaa68 - - - -resource_18a · compressed data resource: 1,071 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x088eade4 - - - -resource_1be · compressed data resource: 757 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08953b94 - - - -resource_1bf · compressed data resource: 217 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08953e8c - - - -resource_1c0 · compressed data resource: 750 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08953f68 - - - -resource_1c1 · compressed data resource: 146 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08954258 - - - -resource_1c2 · compressed data resource: 2,993 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089542ec - - - -resource_1c3 · compressed data resource: 3,242 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08954ea0 - - - -resource_1c4 · compressed data resource: 2,818 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08955b4c - - - -resource_1c5 · compressed data resource: 3,901 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08956650 - - - -resource_1c6 · compressed data resource: 2,105 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08957590 - - - -resource_1c7 · compressed data resource: 3,104 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08957dcc - - - -resource_1c8 · compressed data resource: 2,178 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089589ec - - - -resource_1c9 · compressed data resource: 2,742 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08959270 - - - -resource_1ca · compressed data resource: 360 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08959d28 - - - -resource_1cb · compressed data resource: 449 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08959e90 - - - -resource_1cc · compressed data resource: 3,842 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0895a054 - - - -resource_1d9 · compressed data resource: 1,224 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08968014 - - - -resource_1da · compressed data resource: 616 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089684dc - - - -resource_1db · compressed data resource: 456 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08968744 - - - -resource_1dc · compressed data resource: 568 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0896890c - - - -resource_1dd · compressed data resource: 559 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08968b44 - - - -resource_1de · compressed data resource: 523 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08968d74 - - - -resource_1df · compressed data resource: 515 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08968f80 - - - -resource_1e0 · compressed data resource: 142 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08969184 - - - -resource_1e1 · compressed data resource: 624 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08969214 - - - -resource_1e2 · compressed data resource: 624 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08969484 - - - -resource_1e3 · compressed data resource: 111 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089696f4 - - - -resource_1e4 · compressed data resource: 91 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08969764 - - - -resource_1e5 · compressed data resource: 50 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089697c0 - - - -resource_1e6 · compressed data resource: 52 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089697f4 - - - -resource_1e7 · compressed data resource: 406 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08969828 - - - -resource_1e8 · compressed data resource: 588 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089699c0 - - - -resource_1e9 · compressed data resource: 226 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08969c0c - - - -resource_1ea · compressed data resource: 92 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08969cf0 - - - -resource_1eb · compressed data resource: 93 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08969d4c - - - -resource_1ec · compressed data resource: 466 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08969dac - - - -resource_1ed · compressed data resource: 152 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08969f80 - - - -resource_1ee · compressed data resource: 34 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0896a018 - - - -resource_1ef · compressed data resource: 338 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0896a03c - - - -resource_1f0 · compressed data resource: 225 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0896a190 - - - -resource_1f1 · compressed data resource: 205 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0896a274 - - - -resource_1f2 · compressed data resource: 291 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0896a344 - - - -resource_1f3 · compressed data resource: 46 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0896a468 - - - -resource_1f4 · compressed data resource: 610 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0896a498 - - - -resource_1f5 · compressed data resource: 155 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0896a6fc - - - -resource_1f6 · compressed data resource: 100 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0896a798 - - - -resource_1f7 · compressed data resource: 1,022 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0896a7fc - - - -resource_1f8 · compressed data resource: 175 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0896abfc - - - -resource_203 · compressed data resource: 21,047 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0896b4f0 - - - -resource_204 · compressed data resource: 12,106 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08970728 - - - -resource_205 · compressed data resource: 15,393 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08973674 - - - -resource_206 · compressed data resource: 8,777 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08977298 - - - -resource_207 · compressed data resource: 21,913 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089794e4 - - - -resource_208 · compressed data resource: 11,348 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0897ea80 - - - -resource_209 · compressed data resource: 3,107 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089816d4 - - - -resource_20a · compressed data resource: 24,169 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089822f8 - - - -resource_20b · compressed data resource: 4,305 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08988164 - - - -resource_20c · compressed data resource: 4,201 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08989238 - - - -resource_20d · compressed data resource: 10,800 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0898a2a4 - - - -resource_20e · compressed data resource: 11,303 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0898ccd4 - - - -resource_20f · compressed data resource: 12,609 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0898f8fc - - - -resource_210 · compressed data resource: 8,349 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08992a40 - - - -resource_211 · compressed data resource: 8,989 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08994ae0 - - - -resource_212 · compressed data resource: 11,382 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08996e00 - - - -resource_213 · compressed data resource: 7,929 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08999a78 - - - -resource_214 · compressed data resource: 14,840 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0899b974 - - - -resource_215 · compressed data resource: 19,273 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x0899f36c - - - -resource_216 · compressed data resource: 9,328 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089a3eb8 - - - -resource_217 · compressed data resource: 14,336 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089a6328 - - - -resource_218 · compressed data resource: 12,303 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089a9b28 - - - -resource_219 · compressed data resource: 11,129 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089acb38 - - - -resource_21a · compressed data resource: 12,596 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089af6b4 - - - -resource_21b · compressed data resource: 14,598 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089b27e8 - - - -resource_21c · compressed data resource: 10,994 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089b60f0 - - - -resource_21d · compressed data resource: 6,894 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089b8be4 - - - -resource_21e · compressed data resource: 10,516 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089ba6d4 - - - -resource_21f · compressed data resource: 13,375 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089bcfe8 - - - -resource_220 · compressed data resource: 18,854 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089c0428 - - - -resource_221 · compressed data resource: 3,994 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089c4dd0 - - - -resource_222 · compressed data resource: 10,025 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089c5d6c - - - -resource_223 · compressed data resource: 5,906 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089c8498 - - - -resource_224 · compressed data resource: 16,884 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089c9bac - - - -resource_225 · compressed data resource: 17,955 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089cdda0 - - - -resource_226 · compressed data resource: 17,095 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089d23c4 - - - -resource_227 · compressed data resource: 22,060 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089d668c - - - -resource_228 · compressed data resource: 8,717 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089dbcb8 - - - -resource_229 · compressed data resource: 6,114 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089ddec8 - - - -resource_22a · compressed data resource: 11,669 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089df6ac - - - -resource_22b · compressed data resource: 4,167 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089e2444 - - - -resource_22c · compressed data resource: 15,332 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089e348c - - - -resource_22d · compressed data resource: 18,859 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089e7070 - - - -resource_22e · compressed data resource: 7,673 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089eba1c - - - -resource_22f · compressed data resource: 5,059 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089ed818 - - - -resource_230 · compressed data resource: 16,800 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089eebdc - - - -resource_231 · compressed data resource: 11,617 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089f2d7c - - - -resource_232 · compressed data resource: 8,958 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089f5ae0 - - - -resource_233 · compressed data resource: 16,832 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089f7de0 - - - -resource_234 · compressed data resource: 4,235 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089fbfa0 - - - -resource_235 · compressed data resource: 8,968 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089fd02c - - - -resource_236 · compressed data resource: 12,534 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x089ff334 - - - -resource_237 · compressed data resource: 8,626 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a0242c - - - -resource_238 · compressed data resource: 6,388 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a045e0 - - - -resource_239 · compressed data resource: 10,353 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a05ed4 - - - -resource_23a · compressed data resource: 12,834 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a08748 - - - -resource_23b · compressed data resource: 5,890 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a0b96c - - - -resource_23c · compressed data resource: 11,420 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a0d070 - - - -resource_23d · compressed data resource: 6,460 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a0fd0c - - - -resource_23e · compressed data resource: 9,742 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a11648 - - - -resource_23f · compressed data resource: 19,204 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a13c58 - - - -resource_240 · compressed data resource: 17,552 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a1875c - - - -resource_241 · compressed data resource: 13,898 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a1cbec - - - -resource_242 · compressed data resource: 12,434 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a20238 - - - -resource_243 · compressed data resource: 10,345 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a232cc - - - -resource_244 · compressed data resource: 3,240 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a25b38 - - - -resource_245 · compressed data resource: 3,654 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a267e0 - - - -resource_246 · compressed data resource: 3,606 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a27628 - - - -resource_247 · compressed data resource: 3,305 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a28440 - - - -resource_248 · compressed data resource: 11,080 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a2912c - - - -resource_249 · compressed data resource: 8,996 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a2bc74 - - - -resource_24a · compressed data resource: 13,812 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a2df98 - - - -resource_24b · compressed data resource: 4,186 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a3158c - - - -resource_24c · compressed data resource: 3,337 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a325e8 - - - -resource_24d · compressed data resource: 2,692 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a332f4 - - - -resource_24e · compressed data resource: 2,013 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a33d78 - - - -resource_24f · compressed data resource: 3,887 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a34558 - - - -resource_250 · compressed data resource: 3,183 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a35488 - - - -resource_251 · compressed data resource: 3,095 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a360f8 - - - -resource_252 · compressed data resource: 1,907 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a36d10 - - - -resource_253 · compressed data resource: 3,096 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a37484 - - - -resource_254 · compressed data resource: 3,191 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a3809c - - - -resource_255 · compressed data resource: 2,509 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a38d14 - - - -resource_256 · compressed data resource: 3,099 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a396e4 - - - -resource_257 · compressed data resource: 9,907 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a3a300 - - - -resource_258 · compressed data resource: 10,002 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a3c9b4 - - - -resource_259 · compressed data resource: 20,307 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a3f0c8 - - - -resource_25a · compressed data resource: 6,384 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a4401c - - - -resource_25b · compressed data resource: 10,809 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a4590c - - - -resource_25c · compressed data resource: 3,050 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a48348 - - - -resource_25d · compressed data resource: 19,379 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a48f34 - - - -resource_25e · compressed data resource: 9,065 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a4dae8 - - - -resource_25f · compressed data resource: 6,559 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a4fe54 - - - -resource_260 · compressed data resource: 15,356 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a517f4 - - - -resource_261 · compressed data resource: 3,269 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a553f0 - - - -resource_262 · compressed data resource: 13,325 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a560b8 - - - -resource_263 · compressed data resource: 16,581 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a594c8 - - - -resource_264 · compressed data resource: 14,022 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a5d590 - - - -resource_265 · compressed data resource: 16,936 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a60c58 - - - -resource_266 · compressed data resource: 15,783 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a64e80 - - - -resource_267 · compressed data resource: 11,036 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a68c28 - - - -resource_268 · compressed data resource: 18,419 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a6b744 - - - -resource_269 · compressed data resource: 20,351 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a6ff38 - - - -resource_26a · compressed data resource: 10,140 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a74eb8 - - - -resource_26b · compressed data resource: 7,880 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a77654 - - - -resource_273 · compressed data resource: 462 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08a7b0b8 - - - -resource_2ab · compressed data resource: 422 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08acbfa0 - - - -resource_2b7 · compressed data resource: 377 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ad91c8 - - - -resource_2ba · compressed data resource: 240 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08adc314 - - - -resource_2c0 · compressed data resource: 430 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ae3b58 - - - -resource_2c8 · compressed data resource: 404 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08aec41c - - - -resource_2cc · compressed data resource: 287 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08aef9f4 - - - -resource_2d2 · compressed data resource: 366 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08af7c10 - - - -resource_2d8 · compressed data resource: 334 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b01aa0 - - - -resource_2de · compressed data resource: 335 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b08d60 - - - -resource_2e4 · compressed data resource: 340 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b10bb0 - - - -resource_2ea · compressed data resource: 266 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b16884 - - - -resource_2f0 · compressed data resource: 256 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b1aae8 - - - -resource_2f6 · compressed data resource: 260 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b1f010 - - - -resource_2fc · compressed data resource: 261 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b2300c - - - -resource_302 · compressed data resource: 333 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b281d8 - - - -resource_308 · compressed data resource: 436 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b33b24 - - - -resource_30e · compressed data resource: 375 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b3cd84 - - - -resource_314 · compressed data resource: 267 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b43f04 - - - -resource_31a · compressed data resource: 256 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b48b0c - - - -resource_320 · compressed data resource: 277 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b4d994 - - - -resource_326 · compressed data resource: 361 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b52bf4 - - - -resource_32c · compressed data resource: 357 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b59b70 - - - -resource_32e · compressed data resource: 374 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b5ad78 - - - -resource_330 · compressed data resource: 362 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b5bad0 - - - -resource_336 · compressed data resource: 260 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b672fc - - - -resource_33c · compressed data resource: 345 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b6f968 - - - -resource_340 · compressed data resource: 233 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b7566c - - - -resource_346 · compressed data resource: 420 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b7cdc8 - - - -resource_34c · compressed data resource: 390 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b84b9c - - - -resource_352 · compressed data resource: 371 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b8a760 - - - -resource_354 · compressed data resource: 386 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b8bc1c - - - -resource_357 · compressed data resource: 243 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b8dfa4 - - - -resource_359 · compressed data resource: 224 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b8f66c - - - -resource_35a · compressed data resource: 317 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b8f74c - - - -resource_35c · compressed data resource: 450 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b91970 - - - -resource_35d · compressed data resource: 368 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b91b34 - - - -resource_35f · compressed data resource: 301 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08b93bf8 - - - -resource_370 · compressed data resource: 335 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08baa9dc - - - -resource_373 · compressed data resource: 335 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08baf0f0 - - - -resource_376 · compressed data resource: 335 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08bb2964 - - - -resource_379 · compressed data resource: 401 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08bb8244 - - - -resource_381 · compressed data resource: 330 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08bc61f0 - - - -resource_38f · compressed data resource: 187 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08bd7c8c - - - -resource_395 · compressed data resource: 282 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08bdbf38 - - - -resource_397 · compressed data resource: 420 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08bde8d4 - - - -resource_39b · compressed data resource: 327 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08be3f90 - - - -resource_3a1 · compressed data resource: 456 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08becaf8 - - - -resource_3a7 · compressed data resource: 411 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08bf505c - - - -resource_3ad · compressed data resource: 411 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08bfcac8 - - - -resource_3af · compressed data resource: 306 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08bff198 - - - -resource_3b5 · compressed data resource: 480 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c070f0 - - - -resource_3bb · compressed data resource: 289 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c11ca4 - - - -resource_3c2 · compressed data resource: 312 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c1c574 - - - -resource_3c8 · compressed data resource: 305 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c25050 - - - -resource_3ca · compressed data resource: 296 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c25b88 - - - -resource_3d0 · compressed data resource: 342 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c2b8f8 - - - -resource_3d6 · compressed data resource: 285 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c33bf4 - - - -resource_3dc · compressed data resource: 358 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c3c16c - - - -resource_3e2 · compressed data resource: 357 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c44608 - - - -resource_3e8 · compressed data resource: 482 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c4d400 - - - -resource_3ea · compressed data resource: 227 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c4e150 - - - -resource_3f0 · compressed data resource: 227 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c528b4 - - - -resource_3f2 · compressed data resource: 227 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c53508 - - - -resource_3f4 · compressed data resource: 227 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c54350 - - - -resource_3f6 · compressed data resource: 227 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c54c3c - - - -resource_3f8 · compressed data resource: 255 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c55780 - - - -resource_3fa · compressed data resource: 250 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c56100 - - - -resource_400 · compressed data resource: 197 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c5a030 - - - -resource_402 · compressed data resource: 193 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c5b010 - - - -resource_408 · compressed data resource: 211 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c5dce8 - - - -resource_40a · compressed data resource: 220 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c5e634 - - - -resource_410 · compressed data resource: 418 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c6140c - - - -resource_41a · compressed data resource: 312 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c6e584 - - - -resource_420 · compressed data resource: 456 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c784b4 - - - -resource_423 · compressed data resource: 369 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c7c200 - - - -resource_429 · compressed data resource: 278 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c86ec8 - - - -resource_42b · compressed data resource: 398 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c883f8 - - - -resource_42d · compressed data resource: 314 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c89fe4 - - - -resource_433 · compressed data resource: 392 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c929f0 - - - -resource_435 · compressed data resource: 475 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c94e24 - - - -resource_43b · compressed data resource: 409 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c9c44c - - - -resource_43c · compressed data resource: 347 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c9c5e8 - - - -resource_43e · compressed data resource: 278 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08c9d6c4 - - - -resource_444 · compressed data resource: 266 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ca3c18 - - - -resource_44a · compressed data resource: 365 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ca9d78 - - - -resource_455 · compressed data resource: 430 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08cb61e4 - - - -resource_459 · compressed data resource: 342 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08cbad0c - - - -resource_45f · compressed data resource: 340 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08cc316c - - - -resource_465 · compressed data resource: 453 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ccc68c - - - -resource_46b · compressed data resource: 226 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08cd1884 - - - -resource_471 · compressed data resource: 353 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08cd757c - - - -resource_478 · compressed data resource: 264 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ce22e0 - - - -resource_486 · compressed data resource: 293 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08cf5464 - - - -resource_488 · compressed data resource: 399 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08cf779c - - - -resource_48e · compressed data resource: 433 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d03d10 - - - -resource_494 · compressed data resource: 291 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d0a3b4 - - - -resource_497 · compressed data resource: 333 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d0ca40 - - - -resource_49a · compressed data resource: 391 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d0f598 - - - -resource_49e · compressed data resource: 307 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d13fc4 - - - -resource_4a4 · compressed data resource: 286 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d18cd4 - - - -resource_4ad · compressed data resource: 373 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d21a60 - - - -resource_4af · compressed data resource: 403 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d24238 - - - -resource_4b1 · compressed data resource: 351 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d25f80 - - - -resource_4ba · compressed data resource: 317 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d33c64 - - - -resource_4bc · compressed data resource: 241 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d35d78 - - - -resource_4c2 · compressed data resource: 329 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d3d930 - - - -resource_4cd · compressed data resource: 298 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d50bd0 - - - -resource_4d3 · compressed data resource: 258 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d57c70 - - - -resource_4d4 · compressed data resource: 318 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d57d74 - - - -resource_4d5 · compressed data resource: 328 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d57eb4 - - - -resource_4d7 · compressed data resource: 245 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d59880 - - - -resource_4d9 · compressed data resource: 422 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d5c7cc - - - -resource_4df · compressed data resource: 341 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d67828 - - - -resource_4e1 · compressed data resource: 457 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d69cf8 - - - -resource_4e7 · compressed data resource: 466 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d740c4 - - - -resource_4ed · compressed data resource: 425 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d7a424 - - - -resource_4f3 · compressed data resource: 368 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d7ffcc - - - -resource_4f5 · compressed data resource: 352 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d8132c - - - -resource_4f7 · compressed data resource: 352 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d821e0 - - - -resource_4f9 · compressed data resource: 352 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d837d0 - - - -resource_4fb · compressed data resource: 352 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d84d14 - - - -resource_4fd · compressed data resource: 363 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d85ae0 - - - -resource_500 · compressed data resource: 292 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d876d4 - - - -resource_502 · compressed data resource: 333 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d88270 - - - -resource_508 · compressed data resource: 382 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d8fadc - - - -resource_50e · compressed data resource: 334 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d98c14 - - - -resource_510 · compressed data resource: 348 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08d9a924 - - - -resource_516 · compressed data resource: 358 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08da2be0 - - - -resource_51c · compressed data resource: 464 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08dab02c - - - -resource_522 · compressed data resource: 378 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08db35dc - - - -resource_526 · compressed data resource: 344 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08db87c0 - - - -resource_52e · compressed data resource: 359 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08dc2920 - - - -resource_530 · compressed data resource: 321 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08dc50ac - - - -resource_533 · compressed data resource: 376 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08dc9a10 - - - -resource_539 · compressed data resource: 403 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08dd3194 - - - -resource_53c · compressed data resource: 469 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08dd681c - - - -resource_541 · compressed data resource: 459 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ddc27c - - - -resource_543 · compressed data resource: 311 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ddddc0 - - - -resource_545 · compressed data resource: 309 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ddf904 - - - -resource_54b · compressed data resource: 370 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08de5ba0 - - - -resource_551 · compressed data resource: 338 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08dedccc - - - -resource_553 · compressed data resource: 473 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08df0aec - - - -resource_558 · compressed data resource: 485 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08df6a84 - - - -resource_559 · compressed data resource: 399 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08df6c6c - - - -resource_55b · compressed data resource: 403 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08df7b84 - - - -resource_563 · compressed data resource: 319 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e01e50 - - - -resource_56a · compressed data resource: 324 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e09df4 - - - -resource_570 · compressed data resource: 381 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e0fad4 - - - -resource_576 · compressed data resource: 284 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e1726c - - - -resource_57c · compressed data resource: 280 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e20bf0 - - - -resource_57f · compressed data resource: 377 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e22644 - - - -resource_58d · compressed data resource: 317 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e348dc - - - -resource_58f · compressed data resource: 295 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e36940 - - - -resource_591 · compressed data resource: 287 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e38b18 - - - -resource_597 · compressed data resource: 488 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e40f88 - - - -resource_59d · compressed data resource: 279 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e4835c - - - -resource_59f · compressed data resource: 351 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e492a0 - - - -resource_5a5 · compressed data resource: 354 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e52734 - - - -resource_5a7 · compressed data resource: 354 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e54078 - - - -resource_5a9 · compressed data resource: 439 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e569d4 - - - -resource_5aa · compressed data resource: 391 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e56b8c - - - -resource_5ac · compressed data resource: 292 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e58538 - - - -resource_5af · compressed data resource: 410 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e5a658 - - - -resource_5b8 · compressed data resource: 366 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e65bbc - - - -resource_5be · compressed data resource: 434 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e6b41c - - - -resource_5cd · compressed data resource: 297 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e7c134 - - - -resource_5ce · compressed data resource: 375 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e7c260 - - - -resource_5cf · compressed data resource: 374 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e7c3d8 - - - -resource_5d0 · compressed data resource: 406 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e7c550 - - - -resource_5d1 · compressed data resource: 399 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e7c6e8 - - - -resource_5d3 · compressed data resource: 279 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e7eb24 - - - -resource_5d9 · compressed data resource: 322 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e84efc - - - -resource_5df · compressed data resource: 338 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e8b4bc - - - -resource_5e5 · compressed data resource: 338 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e918a0 - - - -resource_5eb · compressed data resource: 334 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e97de4 - - - -resource_5ee · compressed data resource: 358 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08e9a640 - - - -resource_5f4 · compressed data resource: 356 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ea1f4c - - - -resource_5f6 · compressed data resource: 370 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ea28ec - - - -resource_5f8 · compressed data resource: 276 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ea3554 - - - -resource_5fa · compressed data resource: 289 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ea4570 - - - -resource_600 · compressed data resource: 337 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08eab258 - - - -resource_602 · compressed data resource: 348 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08eabf5c - - - -resource_608 · compressed data resource: 336 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08eb08b0 - - - -resource_60e · compressed data resource: 40 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08eb68d4 - - - -resource_614 · compressed data resource: 336 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08eb7c30 - - - -resource_61a · compressed data resource: 11 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ebdbe8 - - - -resource_620 · compressed data resource: 11 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ebe81c - - - -resource_626 · compressed data resource: 11 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ebf8fc - - - -resource_62c · compressed data resource: 11 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ec03e8 - - - -resource_632 · compressed data resource: 11 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ec1284 - - - -resource_638 · compressed data resource: 11 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ec1bcc - - - -resource_63e · compressed data resource: 11 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ec2714 - - - -resource_644 · compressed data resource: 11 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified · 0x08ec335c - - - -Cartridge data: 11,563,255 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified - - + +Cartridge data: 12,848,444 bytes · Other data · Last asset build: ROM bytes matched; appearance not verified + RESOURCE.JSON diff --git a/games/THE BROKEN SEAL/SRC/FIELD/BABI_CHIKA/MAP_INIT.C b/games/THE BROKEN SEAL/SRC/FIELD/BABI_CHIKA/MAP_INIT.C index f11f37e6f9..67eca47f48 100644 --- a/games/THE BROKEN SEAL/SRC/FIELD/BABI_CHIKA/MAP_INIT.C +++ b/games/THE BROKEN SEAL/SRC/FIELD/BABI_CHIKA/MAP_INIT.C @@ -1,5 +1,6 @@ #include "TYPES.H" #include "FIELD_EFFECT.H" +#define OverlayObject_IntegrateVelocities Effect_Move #define OverlayObject_CreateAndInitialize Func_020009f4 #define SceneEffect_SpawnNineRadialEffects Func_020011e0 @@ -878,16 +879,6 @@ u8 *OverlayObject_PrepareSpawnedObjectMode4(s32 x, s32 y, s32 z, s32 kind) return ret; } -void OverlayObject_IntegrateVelocities(union FieldObject *object) -{ - object->effect.x += object->effect.velocity_x; - object->effect.y += object->effect.velocity_y; - object->effect.z += object->effect.velocity_z; - object->effect.scale_x += object->effect.scale_rate_x; - object->effect.scale_y += object->effect.scale_rate_y; - object->effect.sprite->rotation += object->effect.spin; -} - /* * resource_3c4 @ 0x02001f70 (84 bytes: 72 code + alignment + two pool words). * diff --git a/games/THE BROKEN SEAL/SRC/FIELD/BABI_IRIGUCHI/BRANCHING_EVENT.C b/games/THE BROKEN SEAL/SRC/FIELD/BABI_IRIGUCHI/BRANCHING_EVENT.C index 788cdf5968..dc993e7c91 100644 --- a/games/THE BROKEN SEAL/SRC/FIELD/BABI_IRIGUCHI/BRANCHING_EVENT.C +++ b/games/THE BROKEN SEAL/SRC/FIELD/BABI_IRIGUCHI/BRANCHING_EVENT.C @@ -53,6 +53,7 @@ #define SceneData_SelectTableB91cByRuntimeSelector Func_020027a0 #include "FIELD_EFFECT.H" +#define OverlayObject_IntegrateVelocities Effect_Move #include "STAGED_ACTOR.H" #include "SPAWN_CONFIGURED_EFFECT.H" #include "SELECT_OVERLAY_DATA_BY_RUNTIME_SELECTOR.H" @@ -1030,16 +1031,6 @@ u8 *OverlayObject_PrepareObjectWithCommand15(s32 x, s32 y, s32 z, s32 kind) return result; } -void OverlayObject_IntegrateVelocities(union FieldObject *object) -{ - object->effect.x += object->effect.velocity_x; - object->effect.y += object->effect.velocity_y; - object->effect.z += object->effect.velocity_z; - object->effect.scale_x += object->effect.scale_rate_x; - object->effect.scale_y += object->effect.scale_rate_y; - object->effect.sprite->rotation += object->effect.spin; -} - void SceneState_SetValue8Mode66(void) { Func_02003c00(8, 66); diff --git a/games/THE BROKEN SEAL/SRC/FIELD/COMMON/EFFECT/MOVE.C b/games/THE BROKEN SEAL/SRC/FIELD/COMMON/EFFECT/MOVE.C new file mode 100644 index 0000000000..404c19f7f5 --- /dev/null +++ b/games/THE BROKEN SEAL/SRC/FIELD/COMMON/EFFECT/MOVE.C @@ -0,0 +1,12 @@ +#include "TYPES.H" +#include "FIELD_EFFECT.H" + +void Effect_Move(union FieldObject *object) +{ + object->effect.x += object->effect.velocity_x; + object->effect.y += object->effect.velocity_y; + object->effect.z += object->effect.velocity_z; + object->effect.scale_x += object->effect.scale_rate_x; + object->effect.scale_y += object->effect.scale_rate_y; + object->effect.sprite->rotation += object->effect.spin; +} diff --git a/games/THE BROKEN SEAL/SRC/FIELD/GOMA_SUIRO/BURST.C b/games/THE BROKEN SEAL/SRC/FIELD/GOMA_SUIRO/BURST.C index 087d1b3f7a..ca4630442f 100644 --- a/games/THE BROKEN SEAL/SRC/FIELD/GOMA_SUIRO/BURST.C +++ b/games/THE BROKEN SEAL/SRC/FIELD/GOMA_SUIRO/BURST.C @@ -161,7 +161,8 @@ void *OverlayObject_CreateConfiguredObject(s32 arg0, s32 arg1, s32 arg2, s32 arg return NULL; } -#define SceneEffect_UpdateMotion Func_02000104 +void Effect_Move(void *object); +#define SceneEffect_UpdateMotion Effect_Move /* The object is accessed through word fields and a linked record. Keep the * shared storage view so the record load follows the position stores. */ @@ -182,18 +183,6 @@ union MotionWork { u8 bytes[102]; }; -void SceneEffect_UpdateMotion(union MotionWork *work) -{ - u16 *record; - - work->fields.x += work->fields.velocity_x; - work->fields.y += work->fields.velocity_y; - work->fields.z += work->fields.velocity_z; - work->fields.accum_x += work->fields.rate_x; - work->fields.accum_y += work->fields.rate_y; - record = work->fields.record; - record[15] += work->fields.angle_step; -} s32 SceneData_GetTable8818OrTable88d8(void) { diff --git a/games/THE BROKEN SEAL/SRC/FIELD/KUUPUAPPU_MURA_SAI/MOTION_EVENT.C b/games/THE BROKEN SEAL/SRC/FIELD/KUUPUAPPU_MURA_SAI/MOTION_EVENT.C index 12411ef4ea..581fa3aa21 100644 --- a/games/THE BROKEN SEAL/SRC/FIELD/KUUPUAPPU_MURA_SAI/MOTION_EVENT.C +++ b/games/THE BROKEN SEAL/SRC/FIELD/KUUPUAPPU_MURA_SAI/MOTION_EVENT.C @@ -12,7 +12,8 @@ #define SetOverlayObjectSlot Func_02001244 #define OverlayObject_CreateConfigured Func_02000048 #define OverlayObject_CreateConfiguredObjectB Func_020000a0 -#define SceneEffect_UpdateMotion Func_02000104 +void Effect_Move(void *object); +#define SceneEffect_UpdateMotion Effect_Move #define SceneDialogue_RunActorFifteenDialogue Func_02000864 #define SceneDialogue_RunActorFourteenFlagDialogue Func_0200058c #define CalculateFixedPointPositionDistance Func_02000314 @@ -663,19 +664,6 @@ void *OverlayObject_CreateConfiguredObjectB(s32 arg0, s32 arg1, s32 arg2, s32 ar #include "CREATE_CONFIGURED_OVERLAY_OBJECT_BODY.INC" } -void SceneEffect_UpdateMotion(union MotionWork *work) -{ - extern u8 Data_03001ebc[]; - - u16 *record; - work->fields.x += work->fields.velocity_x; - work->fields.y += work->fields.velocity_y; - work->fields.z += work->fields.velocity_z; - work->fields.accum_x += work->fields.rate_x; - work->fields.accum_y += work->fields.rate_y; - record = work->fields.record; - record[15] += work->fields.angle_step; -} s32 Func_02000314(s32 *first_position, s32 *second_position) { diff --git a/games/THE BROKEN SEAL/SRC/FIELD/MAKYURI_CHOJO/AERIE.C b/games/THE BROKEN SEAL/SRC/FIELD/MAKYURI_CHOJO/AERIE.C index 318fe41e47..741ffc8207 100644 --- a/games/THE BROKEN SEAL/SRC/FIELD/MAKYURI_CHOJO/AERIE.C +++ b/games/THE BROKEN SEAL/SRC/FIELD/MAKYURI_CHOJO/AERIE.C @@ -1125,7 +1125,8 @@ static __inline__ void Call6(void (*f)(), s32 a0, s32 a1, s32 a2, s32 a3, s32 a4 #define SetOverlayObjectSlot Func_02003844 #define SetOverlayObjectRecordField1 Func_02000030 #define OverlayObject_CreateConfiguredObject Func_020000a0 -#define OverlayObject_ApplyVelocity Func_02000104 +void Effect_Move(union Slot *object); +#define OverlayObject_ApplyVelocity Effect_Move #include "OVERLAY_OBJECT.H" #include "CREATE_CONFIGURED_OVERLAY_OBJECT.H" @@ -1580,19 +1581,6 @@ void *OverlayObject_CreateConfiguredObject(s32 arg0, s32 arg1, s32 arg2, s32 arg #include "CREATE_CONFIGURED_OVERLAY_OBJECT_BODY.INC" } -void OverlayObject_ApplyVelocity(union Slot *object) -{ - u16 *record; - - object[2].w += object[17].w; - object[3].w += object[18].w; - object[4].w += object[19].w; - object[6].w += object[12].w; - object[7].w += object[13].w; - record = (u16 *)object[20].p; - record[15] += object[25].h[0]; -} - void *SceneData_GetTableB938(void) { return Data_0200b938; diff --git a/games/THE BROKEN SEAL/SRC/FIELD/MOGORU_MORI/WAYPOINT.C b/games/THE BROKEN SEAL/SRC/FIELD/MOGORU_MORI/WAYPOINT.C index 3033874458..fefa530992 100644 --- a/games/THE BROKEN SEAL/SRC/FIELD/MOGORU_MORI/WAYPOINT.C +++ b/games/THE BROKEN SEAL/SRC/FIELD/MOGORU_MORI/WAYPOINT.C @@ -62,6 +62,7 @@ #define SceneData_SelectTableBa48ByRuntimeSelector Func_020024ac #include "FIELD_EFFECT.H" +#define OverlayObject_IntegrateVelocities Effect_Move #include "STAGED_ACTOR.H" #include "SELECT_OVERLAY_DATA_BY_RUNTIME_SELECTOR.H" @@ -756,16 +757,6 @@ u8 *OverlayObject_SpawnConfiguredWithMode15(s32 x, s32 y, s32 z, s32 kind) return ret; } -void OverlayObject_IntegrateVelocities(union FieldObject *object) -{ - object->effect.x += object->effect.velocity_x; - object->effect.y += object->effect.velocity_y; - object->effect.z += object->effect.velocity_z; - object->effect.scale_x += object->effect.scale_rate_x; - object->effect.scale_y += object->effect.scale_rate_y; - object->effect.sprite->rotation += object->effect.spin; -} - /* Three sites of the record accessor, so three names. */ /* Five sites of one import. */ diff --git a/games/THE BROKEN SEAL/SRC/FIELD/RUNPA_MURA/EFFECT.C b/games/THE BROKEN SEAL/SRC/FIELD/RUNPA_MURA/EFFECT.C index 8d7afdc842..cdfa7da53b 100644 --- a/games/THE BROKEN SEAL/SRC/FIELD/RUNPA_MURA/EFFECT.C +++ b/games/THE BROKEN SEAL/SRC/FIELD/RUNPA_MURA/EFFECT.C @@ -55,15 +55,6 @@ struct FieldEffect *Effect_Create(s32 x, s32 y, s32 z, s32 type) return NULL; } -void Effect_Move(union FieldObject *object) -{ - object->effect.x += object->effect.velocity_x; - object->effect.y += object->effect.velocity_y; - object->effect.z += object->effect.velocity_z; - object->effect.scale_x += object->effect.scale_rate_x; - object->effect.scale_y += object->effect.scale_rate_y; - object->effect.sprite->rotation += object->effect.spin; -} /* * The motion scripts a spawn chooses from. Each holds the effect for its diff --git a/games/THE BROKEN SEAL/SRC/FIELD/SHIAN_HEYA/FLAGGED_OBJECT.C b/games/THE BROKEN SEAL/SRC/FIELD/SHIAN_HEYA/FLAGGED_OBJECT.C index dcea92958d..33c27da5cb 100644 --- a/games/THE BROKEN SEAL/SRC/FIELD/SHIAN_HEYA/FLAGGED_OBJECT.C +++ b/games/THE BROKEN SEAL/SRC/FIELD/SHIAN_HEYA/FLAGGED_OBJECT.C @@ -7,7 +7,8 @@ #define OverlayObject_SetEntryField Func_02000030 #define OverlayObject_SpawnWithMode14 Func_02000048 #define OverlayObject_CreateConfigured Func_020000a0 -#define OverlayObject_IntegrateVelocities Func_02000104 +void Effect_Move(void *object); +#define OverlayObject_IntegrateVelocities Effect_Move #define SceneData_GetTable8778 Func_02000314 #define SceneData_ReturnZero Func_0200031c #define SceneData_GetTable8868 Func_02000320 @@ -155,20 +156,6 @@ void *OverlayObject_CreateConfigured(s32 arg0, s32 arg1, s32 arg2, s32 arg3) return NULL; } -void OverlayObject_IntegrateVelocities(void *arg0) -{ - union Slot *s = (union Slot *)arg0; - union Slot *obj; - - s[2].w += s[17].w; - s[3].w += s[18].w; - s[4].w += s[19].w; - s[6].w += s[12].w; - s[7].w += s[13].w; - obj = (union Slot *)s[20].p; - obj[7].h[1] += s[25].h[0]; -} - s32 SceneData_GetTable8778(void) { return (s32)Data_02008778; diff --git a/games/THE BROKEN SEAL/SRC/FIELD/SORU_STAR/PARTY_INTRO.C b/games/THE BROKEN SEAL/SRC/FIELD/SORU_STAR/PARTY_INTRO.C index c507497612..bd311b4395 100644 --- a/games/THE BROKEN SEAL/SRC/FIELD/SORU_STAR/PARTY_INTRO.C +++ b/games/THE BROKEN SEAL/SRC/FIELD/SORU_STAR/PARTY_INTRO.C @@ -14,7 +14,8 @@ #define OverlayObject_SetHandleFlagBits2And3 Func_02000030 #define OverlayObject_CreateConfiguredObject Func_020000a0 #define UpdateOverlayObjectAngle Func_02000314 -#define SceneEffect_UpdateMotion Func_02000104 +void Effect_Move(void *object); +#define SceneEffect_UpdateMotion Effect_Move #define SceneData_GetTableCd88 Func_0200036c #define SceneData_ReturnZero Func_02000374 #define SceneData_GetTableCDB8 Func_02000378 @@ -1557,17 +1558,6 @@ void *OverlayObject_CreateConfiguredObject(s32 arg0, s32 arg1, s32 arg2, s32 arg #include "CREATE_CONFIGURED_OVERLAY_OBJECT_BODY.INC" } -void SceneEffect_UpdateMotion(union MotionWork *work) -{ - u16 *record; - work->fields.x += work->fields.velocity_x; - work->fields.y += work->fields.velocity_y; - work->fields.z += work->fields.velocity_z; - work->fields.accum_x += work->fields.rate_x; - work->fields.accum_y += work->fields.rate_y; - record = work->fields.record; - record[15] += work->fields.angle_step; -} s32 UpdateOverlayObjectAngle(struct OverlayObject *object) { diff --git a/games/THE BROKEN SEAL/SRC/FIELD/TAKARA_SHIMA/ISLAND_AND_CAVES.C b/games/THE BROKEN SEAL/SRC/FIELD/TAKARA_SHIMA/ISLAND_AND_CAVES.C index da0aac5930..f527c607cc 100644 --- a/games/THE BROKEN SEAL/SRC/FIELD/TAKARA_SHIMA/ISLAND_AND_CAVES.C +++ b/games/THE BROKEN SEAL/SRC/FIELD/TAKARA_SHIMA/ISLAND_AND_CAVES.C @@ -83,6 +83,7 @@ #include "STAGED_ACTOR.H" #include "FIELD_EFFECT.H" +#define OverlayObject_IntegrateVelocities Effect_Move /* Integrate position, velocity, rate and sprite angle for one scene effect. Signed division preserves decay toward zero for negative Z velocity. */ @@ -1024,16 +1025,6 @@ u8 *SpawnMode15Effect(s32 x, s32 y, s32 z, s32 kind) return 0; } -void OverlayObject_IntegrateVelocities(union FieldObject *object) -{ - object->effect.x += object->effect.velocity_x; - object->effect.y += object->effect.velocity_y; - object->effect.z += object->effect.velocity_z; - object->effect.scale_x += object->effect.scale_rate_x; - object->effect.scale_y += object->effect.scale_rate_y; - object->effect.sprite->rotation += object->effect.spin; -} - /* Deliberate no-op callback. */ void NoOpEffectCallback(void) {} diff --git a/games/THE BROKEN SEAL/SRC/FIELD/VINASU_HEYA/ENTRY_SETUP.C b/games/THE BROKEN SEAL/SRC/FIELD/VINASU_HEYA/ENTRY_SETUP.C index 579ae32e38..0f25593c72 100644 --- a/games/THE BROKEN SEAL/SRC/FIELD/VINASU_HEYA/ENTRY_SETUP.C +++ b/games/THE BROKEN SEAL/SRC/FIELD/VINASU_HEYA/ENTRY_SETUP.C @@ -1,5 +1,6 @@ #include "TYPES.H" #include "FIELD_EFFECT.H" +#define OverlayObject_IntegrateVelocities Effect_Move #define NULL ((void *)0) #define RunOverlayObjectCommand0 Func_02004e8c @@ -1035,16 +1036,6 @@ void *OverlayObject_PrepareObjectWithCommand15(s32 arg0, s32 arg1, s32 arg2, s32 return 0; } -void OverlayObject_IntegrateVelocities(union FieldObject *object) -{ - object->effect.x += object->effect.velocity_x; - object->effect.y += object->effect.velocity_y; - object->effect.z += object->effect.velocity_z; - object->effect.scale_x += object->effect.scale_rate_x; - object->effect.scale_y += object->effect.scale_rate_y; - object->effect.sprite->rotation += object->effect.spin; -} - s32 SceneActor_CalculateFixedPointDistance(s32 *a, s32 *b) { s32 dx = (*a++ - *b++) >> 16; diff --git a/games/THE BROKEN SEAL/raw/overlays/resource_382_overlay.s b/games/THE BROKEN SEAL/raw/overlays/resource_382_overlay.s index 85c94f4e3f..3d096c182f 100644 --- a/games/THE BROKEN SEAL/raw/overlays/resource_382_overlay.s +++ b/games/THE BROKEN SEAL/raw/overlays/resource_382_overlay.s @@ -413,20 +413,8 @@ AlchemyC_02000048: AlchemyC_020000a0: .space 0x62 .2byte 0x0000 - .4byte 0x6c426883 - .4byte 0x6083189b - .4byte 0x68c36c82 - .4byte 0x60c3189b - .4byte 0x69036cc2 - .4byte 0x6103189b - .4byte 0x69836b02 - .4byte 0x6183189b - .4byte 0x69c36b42 - .4byte 0x61c3189b - .4byte 0x30646d01 - .4byte 0x88028bcb - .4byte 0x83cb189b - .2byte 0x4770 +AlchemyC_02000104: + .space 0x36 .2byte 0x0000 push {r5, r6, r7, lr} mov r7, fp diff --git a/games/THE BROKEN SEAL/raw/overlays/resource_385_overlay.s b/games/THE BROKEN SEAL/raw/overlays/resource_385_overlay.s index 03121de5e3..776794a682 100644 --- a/games/THE BROKEN SEAL/raw/overlays/resource_385_overlay.s +++ b/games/THE BROKEN SEAL/raw/overlays/resource_385_overlay.s @@ -252,7 +252,8 @@ AlchemyC_020000a0: .space 0x62 .2byte 0x0000 AlchemyC_02000104: - .space 0x38 + .space 0x36 + .2byte 0x0000 push {r5, r6, r7, lr} mov r7, fp mov r6, sl diff --git a/games/THE BROKEN SEAL/raw/overlays/resource_387_overlay.s b/games/THE BROKEN SEAL/raw/overlays/resource_387_overlay.s index bd9545b7b9..f62865979d 100644 --- a/games/THE BROKEN SEAL/raw/overlays/resource_387_overlay.s +++ b/games/THE BROKEN SEAL/raw/overlays/resource_387_overlay.s @@ -299,20 +299,8 @@ AlchemyC_02000048: AlchemyC_020000a0: .space 0x62 .2byte 0x0000 - .4byte 0x6c426883 - .4byte 0x6083189b - .4byte 0x68c36c82 - .4byte 0x60c3189b - .4byte 0x69036cc2 - .4byte 0x6103189b - .4byte 0x69836b02 - .4byte 0x6183189b - .4byte 0x69c36b42 - .4byte 0x61c3189b - .4byte 0x30646d01 - .4byte 0x88028bcb - .4byte 0x83cb189b - .2byte 0x4770 +AlchemyC_02000104: + .space 0x36 .2byte 0x0000 push {r5, r6, r7, lr} mov r7, fp diff --git a/games/THE BROKEN SEAL/raw/overlays/resource_38a_overlay.s b/games/THE BROKEN SEAL/raw/overlays/resource_38a_overlay.s index 5ed0bb02d1..900d34cf65 100644 --- a/games/THE BROKEN SEAL/raw/overlays/resource_38a_overlay.s +++ b/games/THE BROKEN SEAL/raw/overlays/resource_38a_overlay.s @@ -68,7 +68,8 @@ AlchemyC_020000a0: .space 0x62 .2byte 0x0000 AlchemyC_02000104: - .space 0x38 + .space 0x36 + .2byte 0x0000 push {r5, r6, r7, lr} mov r7, fp mov r6, sl diff --git a/games/THE BROKEN SEAL/raw/overlays/resource_396_overlay.s b/games/THE BROKEN SEAL/raw/overlays/resource_396_overlay.s index 990ef79d90..c328430c51 100644 --- a/games/THE BROKEN SEAL/raw/overlays/resource_396_overlay.s +++ b/games/THE BROKEN SEAL/raw/overlays/resource_396_overlay.s @@ -320,20 +320,8 @@ AlchemyC_02000048: AlchemyC_020000a0: .space 0x62 .2byte 0x0000 - .4byte 0x6c426883 - .4byte 0x6083189b - .4byte 0x68c36c82 - .4byte 0x60c3189b - .4byte 0x69036cc2 - .4byte 0x6103189b - .4byte 0x69836b02 - .4byte 0x6183189b - .4byte 0x69c36b42 - .4byte 0x61c3189b - .4byte 0x30646d01 - .4byte 0x88028bcb - .4byte 0x83cb189b - .2byte 0x4770 +AlchemyC_02000104: + .space 0x36 .2byte 0x0000 push {r5, r6, r7, lr} mov r7, fp diff --git a/games/THE BROKEN SEAL/raw/overlays/resource_39b_overlay.s b/games/THE BROKEN SEAL/raw/overlays/resource_39b_overlay.s index 6360c18e09..940f23c3f7 100644 --- a/games/THE BROKEN SEAL/raw/overlays/resource_39b_overlay.s +++ b/games/THE BROKEN SEAL/raw/overlays/resource_39b_overlay.s @@ -308,20 +308,8 @@ AlchemyC_02000048: AlchemyC_020000a0: .space 0x62 .2byte 0x0000 - .4byte 0x6c426883 - .4byte 0x6083189b - .4byte 0x68c36c82 - .4byte 0x60c3189b - .4byte 0x69036cc2 - .4byte 0x6103189b - .4byte 0x69836b02 - .4byte 0x6183189b - .4byte 0x69c36b42 - .4byte 0x61c3189b - .4byte 0x30646d01 - .4byte 0x88028bcb - .4byte 0x83cb189b - .2byte 0x4770 +AlchemyC_02000104: + .space 0x36 .2byte 0x0000 push {r5, r6, r7, lr} mov r7, fp diff --git a/games/THE BROKEN SEAL/raw/overlays/resource_39c_overlay.s b/games/THE BROKEN SEAL/raw/overlays/resource_39c_overlay.s index 5615e2b11a..a7e081a21a 100644 --- a/games/THE BROKEN SEAL/raw/overlays/resource_39c_overlay.s +++ b/games/THE BROKEN SEAL/raw/overlays/resource_39c_overlay.s @@ -1011,20 +1011,9 @@ AlchemyC_02000048: AlchemyC_020000a0: .space 0x62 .2byte 0x0000 - .4byte 0x6c426883 - .4byte 0x6083189b - .4byte 0x68c36c82 - .4byte 0x60c3189b - .4byte 0x69036cc2 - .4byte 0x6103189b - .4byte 0x69836b02 - .4byte 0x6183189b - .4byte 0x69c36b42 - .4byte 0x61c3189b - .4byte 0x30646d01 - .4byte 0x88028bcb - .4byte 0x83cb189b - .4byte 0x00004770 +AlchemyC_02000104: + .space 0x36 + .2byte 0x0000 push {r5, r6, r7, lr} mov r7, r11 mov r6, r10 diff --git a/games/THE BROKEN SEAL/raw/overlays/resource_39e_overlay.s b/games/THE BROKEN SEAL/raw/overlays/resource_39e_overlay.s index 5721acfd42..59dc5ba987 100644 --- a/games/THE BROKEN SEAL/raw/overlays/resource_39e_overlay.s +++ b/games/THE BROKEN SEAL/raw/overlays/resource_39e_overlay.s @@ -1402,20 +1402,8 @@ AlchemyC_02000048: AlchemyC_020000a0: .space 0x62 .2byte 0x0000 - .4byte 0x6c426883 - .4byte 0x6083189b - .4byte 0x68c36c82 - .4byte 0x60c3189b - .4byte 0x69036cc2 - .4byte 0x6103189b - .4byte 0x69836b02 - .4byte 0x6183189b - .4byte 0x69c36b42 - .4byte 0x61c3189b - .4byte 0x30646d01 - .4byte 0x88028bcb - .4byte 0x83cb189b - .2byte 0x4770 +AlchemyC_02000104: + .space 0x36 .2byte 0x0000 push {r5, r6, r7, lr} mov r7, fp diff --git a/games/THE BROKEN SEAL/raw/overlays/resource_3a0_overlay.s b/games/THE BROKEN SEAL/raw/overlays/resource_3a0_overlay.s index dbfd9a2873..413838036a 100644 --- a/games/THE BROKEN SEAL/raw/overlays/resource_3a0_overlay.s +++ b/games/THE BROKEN SEAL/raw/overlays/resource_3a0_overlay.s @@ -266,20 +266,8 @@ AlchemyC_02000048: AlchemyC_020000a0: .space 0x62 .2byte 0x0000 - .4byte 0x6c426883 - .4byte 0x6083189b - .4byte 0x68c36c82 - .4byte 0x60c3189b - .4byte 0x69036cc2 - .4byte 0x6103189b - .4byte 0x69836b02 - .4byte 0x6183189b - .4byte 0x69c36b42 - .4byte 0x61c3189b - .4byte 0x30646d01 - .4byte 0x88028bcb - .4byte 0x83cb189b - .2byte 0x4770 +AlchemyC_02000104: + .space 0x36 .2byte 0x0000 push {r5, r6, r7, lr} mov r7, fp diff --git a/games/THE BROKEN SEAL/raw/overlays/resource_3a5_overlay.s b/games/THE BROKEN SEAL/raw/overlays/resource_3a5_overlay.s index 1a60920045..833c1bd064 100644 --- a/games/THE BROKEN SEAL/raw/overlays/resource_3a5_overlay.s +++ b/games/THE BROKEN SEAL/raw/overlays/resource_3a5_overlay.s @@ -249,20 +249,9 @@ AlchemyC_02000048: AlchemyC_020000a0: .space 0x62 .2byte 0x0000 - .4byte 0x6c426883 - .4byte 0x6083189b - .4byte 0x68c36c82 - .4byte 0x60c3189b - .4byte 0x69036cc2 - .4byte 0x6103189b - .4byte 0x69836b02 - .4byte 0x6183189b - .4byte 0x69c36b42 - .4byte 0x61c3189b - .4byte 0x30646d01 - .4byte 0x88028bcb - .4byte 0x83cb189b - .4byte 0x00004770 +AlchemyC_02000104: + .space 0x36 + .2byte 0x0000 push {r5, r6, r7, lr} mov r7, r11 mov r6, r10 diff --git a/games/THE BROKEN SEAL/raw/overlays/resource_3a6_overlay.s b/games/THE BROKEN SEAL/raw/overlays/resource_3a6_overlay.s index 4c9be57998..5a9a26f917 100644 --- a/games/THE BROKEN SEAL/raw/overlays/resource_3a6_overlay.s +++ b/games/THE BROKEN SEAL/raw/overlays/resource_3a6_overlay.s @@ -295,20 +295,8 @@ AlchemyC_02000048: AlchemyC_020000a0: .space 0x62 .2byte 0x0000 - .4byte 0x6c426883 - .4byte 0x6083189b - .4byte 0x68c36c82 - .4byte 0x60c3189b - .4byte 0x69036cc2 - .4byte 0x6103189b - .4byte 0x69836b02 - .4byte 0x6183189b - .4byte 0x69c36b42 - .4byte 0x61c3189b - .4byte 0x30646d01 - .4byte 0x88028bcb - .4byte 0x83cb189b - .2byte 0x4770 +AlchemyC_02000104: + .space 0x36 .2byte 0x0000 push {r5, r6, r7, lr} mov r7, fp diff --git a/games/THE BROKEN SEAL/raw/overlays/resource_3b3_overlay.s b/games/THE BROKEN SEAL/raw/overlays/resource_3b3_overlay.s index deed0bd0f0..b13e391559 100644 --- a/games/THE BROKEN SEAL/raw/overlays/resource_3b3_overlay.s +++ b/games/THE BROKEN SEAL/raw/overlays/resource_3b3_overlay.s @@ -362,20 +362,8 @@ AlchemyC_02000048: AlchemyC_020000a0: .space 0x62 .2byte 0x0000 - .4byte 0x6c426883 - .4byte 0x6083189b - .4byte 0x68c36c82 - .4byte 0x60c3189b - .4byte 0x69036cc2 - .4byte 0x6103189b - .4byte 0x69836b02 - .4byte 0x6183189b - .4byte 0x69c36b42 - .4byte 0x61c3189b - .4byte 0x30646d01 - .4byte 0x88028bcb - .4byte 0x83cb189b - .2byte 0x4770 +AlchemyC_02000104: + .space 0x36 .2byte 0x0000 push {r5, r6, r7, lr} mov r7, fp diff --git a/games/THE BROKEN SEAL/raw/overlays/resource_3be_overlay.s b/games/THE BROKEN SEAL/raw/overlays/resource_3be_overlay.s index fff5934c44..1fde1d41ae 100644 --- a/games/THE BROKEN SEAL/raw/overlays/resource_3be_overlay.s +++ b/games/THE BROKEN SEAL/raw/overlays/resource_3be_overlay.s @@ -196,20 +196,8 @@ AlchemyC_02000048: AlchemyC_020000a0: .space 0x62 .2byte 0x0000 - .4byte 0x6c426883 - .4byte 0x6083189b - .4byte 0x68c36c82 - .4byte 0x60c3189b - .4byte 0x69036cc2 - .4byte 0x6103189b - .4byte 0x69836b02 - .4byte 0x6183189b - .4byte 0x69c36b42 - .4byte 0x61c3189b - .4byte 0x30646d01 - .4byte 0x88028bcb - .4byte 0x83cb189b - .2byte 0x4770 +AlchemyC_02000104: + .space 0x36 .2byte 0x0000 push {r5, r6, r7, lr} mov r7, fp diff --git a/games/THE BROKEN SEAL/raw/overlays/resource_3c0_overlay.s b/games/THE BROKEN SEAL/raw/overlays/resource_3c0_overlay.s index ff9ae5e5b9..9a10788b7d 100644 --- a/games/THE BROKEN SEAL/raw/overlays/resource_3c0_overlay.s +++ b/games/THE BROKEN SEAL/raw/overlays/resource_3c0_overlay.s @@ -206,20 +206,8 @@ AlchemyC_02000048: AlchemyC_020000a0: .space 0x62 .2byte 0x0000 - .4byte 0x6c426883 - .4byte 0x6083189b - .4byte 0x68c36c82 - .4byte 0x60c3189b - .4byte 0x69036cc2 - .4byte 0x6103189b - .4byte 0x69836b02 - .4byte 0x6183189b - .4byte 0x69c36b42 - .4byte 0x61c3189b - .4byte 0x30646d01 - .4byte 0x88028bcb - .4byte 0x83cb189b - .2byte 0x4770 +AlchemyC_02000104: + .space 0x36 .2byte 0x0000 push {r5, r6, r7, lr} mov r7, fp diff --git a/games/THE BROKEN SEAL/raw/overlays/resource_3c9_overlay.s b/games/THE BROKEN SEAL/raw/overlays/resource_3c9_overlay.s index d50941111c..8fa1d69323 100644 --- a/games/THE BROKEN SEAL/raw/overlays/resource_3c9_overlay.s +++ b/games/THE BROKEN SEAL/raw/overlays/resource_3c9_overlay.s @@ -1653,20 +1653,8 @@ AlchemyC_02000048: AlchemyC_020000a0: .space 0x62 .2byte 0x0000 - .4byte 0x6c426883 - .4byte 0x6083189b - .4byte 0x68c36c82 - .4byte 0x60c3189b - .4byte 0x69036cc2 - .4byte 0x6103189b - .4byte 0x69836b02 - .4byte 0x6183189b - .4byte 0x69c36b42 - .4byte 0x61c3189b - .4byte 0x30646d01 - .4byte 0x88028bcb - .4byte 0x83cb189b - .2byte 0x4770 +AlchemyC_02000104: + .space 0x36 .2byte 0x0000 push {r5, r6, r7, lr} mov r7, fp diff --git a/games/THE BROKEN SEAL/recon/translation-units.json b/games/THE BROKEN SEAL/recon/translation-units.json index 47590d5da9..4cc1f2311c 100644 --- a/games/THE BROKEN SEAL/recon/translation-units.json +++ b/games/THE BROKEN SEAL/recon/translation-units.json @@ -14136,11 +14136,6 @@ "extent": 98, "state": "exact-c" }, - { - "address": "0x02000104", - "extent": 54, - "state": "exact-c" - }, { "address": "0x02000314", "extent": 8, @@ -27224,11 +27219,6 @@ "extent": 98, "state": "exact-c" }, - { - "address": "0x02000104", - "extent": 56, - "state": "exact-c" - }, { "address": "0x02000314", "extent": 60, @@ -34429,11 +34419,6 @@ "extent": 98, "state": "exact-c" }, - { - "address": "0x02000104", - "extent": 54, - "state": "exact-c" - }, { "address": "0x02000314", "extent": 88, @@ -76764,11 +76749,6 @@ "extent": 98, "state": "exact-c" }, - { - "address": "0x02000104", - "extent": 56, - "state": "exact-c" - }, { "address": "0x02000314", "extent": 48, @@ -82064,11 +82044,6 @@ "address": "0x020000a0", "extent": 98, "state": "exact-c" - }, - { - "address": "0x02000104", - "extent": 54, - "state": "exact-c" } ], "compiler_gaps": [ @@ -82079,10 +82054,6 @@ { "start": "0x0200009e", "end": "0x020000a0" - }, - { - "start": "0x02000102", - "end": "0x02000104" } ], "data": { @@ -92155,11 +92126,6 @@ "extent": 98, "state": "exact-c" }, - { - "address": "0x02000104", - "extent": 54, - "state": "exact-c" - }, { "address": "0x02000314", "extent": 8, @@ -109462,14 +109428,31 @@ "source": "games/COMMON/SRC/SOUND/PCM_KEY_TO_FREQUENCY.C", "compiler_route": "canonical-gcc296", "absolute_symbols": { - "Audio_UmulHigh32": {"address": "0x080f95e0", "kind": "thumb"}, - "Sound_PcmFrequencySteps": {"address": "0x080fb8e4", "kind": "data"}, - "Sound_PcmPitchCodes": {"address": "0x080fb830", "kind": "data"} + "Audio_UmulHigh32": { + "address": "0x080f95e0", + "kind": "thumb" + }, + "Sound_PcmFrequencySteps": { + "address": "0x080fb8e4", + "kind": "data" + }, + "Sound_PcmPitchCodes": { + "address": "0x080fb830", + "kind": "data" + } }, "local_symbols": [], "owners": [ - {"address": "0x080fa1fc", "extent": 100, "state": "exact-c"}, - {"address": "0x080fa260", "extent": 2, "state": "exact-c"} + { + "address": "0x080fa1fc", + "extent": 100, + "state": "exact-c" + }, + { + "address": "0x080fa260", + "extent": 2, + "state": "exact-c" + } ], "overlay": null }, @@ -109479,12 +109462,22 @@ "source": "games/COMMON/SRC/SOUND/MUSIC_TRACK_DISPATCH_STREAM_COMMAND.C", "compiler_route": "canonical-gcc296", "absolute_symbols": { - "Runtime_InvokeWorkEntryWithArgs": {"address": "0x080072ec", "kind": "thumb"}, - "Sound_ExtendedCommandTable": {"address": "0x080fba48", "kind": "data"} + "Runtime_InvokeWorkEntryWithArgs": { + "address": "0x080072ec", + "kind": "thumb" + }, + "Sound_ExtendedCommandTable": { + "address": "0x080fba48", + "kind": "data" + } }, "local_symbols": [], "owners": [ - {"address": "0x080fb670", "extent": 32, "state": "exact-c"} + { + "address": "0x080fb670", + "extent": 32, + "state": "exact-c" + } ], "overlay": null }, @@ -109494,11 +109487,18 @@ "source": "games/COMMON/SRC/SOUND/INITIALIZE_CGB.C", "compiler_route": "canonical-gcc296", "absolute_symbols": { - "Sound_CommandTable": {"address": "0x02004000", "kind": "data"} + "Sound_CommandTable": { + "address": "0x02004000", + "kind": "data" + } }, "local_symbols": [], "owners": [ - {"address": "0x080fa55c", "extent": 280, "state": "exact-c"} + { + "address": "0x080fa55c", + "extent": 280, + "state": "exact-c" + } ], "overlay": null }, @@ -109508,14 +109508,38 @@ "source": "games/COMMON/SRC/SOUND/SOUND.C", "compiler_route": "canonical-gcc296", "absolute_symbols": { - "MusicPlayer_BeginFadeOut": {"address": "0x080fa280", "kind": "thumb"}, - "Sound_CgbNotes": {"address": "0x02004090", "kind": "data"}, - "Sound_Mixer": {"address": "0x080f9674", "kind": "thumb"}, - "Sound_PlayerCount": {"address": "0x00000008", "kind": "data"}, - "Sound_PlayerSlots": {"address": "0x080fc624", "kind": "data"}, - "Sound_SongTable": {"address": "0x080fc684", "kind": "data"}, - "Sound_Work": {"address": "0x02003050", "kind": "data"}, - "Sound_WorkBytes": {"address": "0x02004350", "kind": "data"} + "MusicPlayer_BeginFadeOut": { + "address": "0x080fa280", + "kind": "thumb" + }, + "Sound_CgbNotes": { + "address": "0x02004090", + "kind": "data" + }, + "Sound_Mixer": { + "address": "0x080f9674", + "kind": "thumb" + }, + "Sound_PlayerCount": { + "address": "0x00000008", + "kind": "data" + }, + "Sound_PlayerSlots": { + "address": "0x080fc624", + "kind": "data" + }, + "Sound_SongTable": { + "address": "0x080fc684", + "kind": "data" + }, + "Sound_Work": { + "address": "0x02003050", + "kind": "data" + }, + "Sound_WorkBytes": { + "address": "0x02004350", + "kind": "data" + } }, "local_symbols": [], "owners": [ @@ -125184,11 +125208,6 @@ "extent": 98, "state": "exact-c" }, - { - "address": "0x02000ab0", - "extent": 54, - "state": "exact-c" - }, { "address": "0x02000cc0", "extent": 14, @@ -138567,11 +138586,6 @@ "extent": 98, "state": "exact-c" }, - { - "address": "0x02000ab0", - "extent": 54, - "state": "exact-c" - }, { "address": "0x02000cc0", "extent": 14, @@ -145080,11 +145094,6 @@ "extent": 98, "state": "exact-c" }, - { - "address": "0x02000ab0", - "extent": 54, - "state": "exact-c" - }, { "address": "0x02000cc0", "extent": 14, @@ -151937,11 +151946,6 @@ "extent": 98, "state": "exact-c" }, - { - "address": "0x02000ab0", - "extent": 54, - "state": "exact-c" - }, { "address": "0x02000cc0", "extent": 2, @@ -160196,11 +160200,6 @@ "extent": 72, "state": "exact-c" }, - { - "address": "0x020000e0", - "extent": 54, - "state": "exact-c" - }, { "address": "0x020002f0", "extent": 60, @@ -170412,6 +170411,208 @@ "state": "exact-c" } ] + }, + { + "id": "effect-move", + "game": "tbs", + "source": "games/THE BROKEN SEAL/SRC/FIELD/COMMON/EFFECT/MOVE.C", + "compiler_route": "canonical-gcc296", + "overlay": "resource_3ab", + "absolute_symbols": {}, + "local_symbols": [], + "owners": [ + { + "address": "0x02000104", + "extent": 54, + "state": "exact-c" + } + ], + "instances": { + "resource_380": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_385": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_38a": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_39d": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_39f": { + "owners": { + "Effect_Move": { + "address": "0x02000ab0", + "extent": 54 + } + } + }, + "resource_3a1": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_3b2": { + "owners": { + "Effect_Move": { + "address": "0x02000ab0", + "extent": 54 + } + } + }, + "resource_3c4": { + "owners": { + "Effect_Move": { + "address": "0x02000ab0", + "extent": 54 + } + } + }, + "resource_3c5": { + "owners": { + "Effect_Move": { + "address": "0x02000ab0", + "extent": 54 + } + } + }, + "resource_3c8": { + "owners": { + "Effect_Move": { + "address": "0x020000e0", + "extent": 54 + } + } + }, + "resource_382": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_387": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_396": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_39b": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_39c": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_39e": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_3a0": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_3a5": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_3a6": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_3b3": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_3be": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_3c0": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + }, + "resource_3c9": { + "owners": { + "Effect_Move": { + "address": "0x02000104", + "extent": 54 + } + } + } + } } ] } diff --git a/games/THE BROKEN SEAL/source-paths.json b/games/THE BROKEN SEAL/source-paths.json index 0ba39b01dd..499e76a0d0 100644 --- a/games/THE BROKEN SEAL/source-paths.json +++ b/games/THE BROKEN SEAL/source-paths.json @@ -3,7 +3,7 @@ "owners": { "resource_3ab:02000104": { "name": "Effect_Move", - "source": "FIELD/RUNPA_MURA/EFFECT.C" + "source": "FIELD/COMMON/EFFECT/MOVE.C" }, "resource_3ab:020007f4": { "name": "EastGuard_MindRead", @@ -71,8 +71,8 @@ "source": "FIELD/KUUPUAPPU_MURA_SAI/MOTION_EVENT.C" }, "resource_385:02000104": { - "name": "Effect_UpdateMotion", - "source": "FIELD/KUUPUAPPU_MURA_SAI/MOTION_EVENT.C" + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" }, "resource_3aa:02001494": { "name": "Scene_RunPartySequence", @@ -6833,8 +6833,8 @@ "source": "FIELD/VINASU_CHOJO/SCRIPTED_PRESENTATION.C" }, "resource_3c8:020000e0": { - "name": "OverlayObject_IntegrateVelocities", - "source": "FIELD/VINASU_HEYA/ENTRY_SETUP.C" + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" }, "resource_3b1:020008a8": { "name": "Dialogue_ShowLine1E19Or1D50", @@ -9075,8 +9075,8 @@ "source": "FIELD/KUUPUAPPU_HEYA/PROMPT.C" }, "resource_3a1:02000104": { - "name": "OvObj_IntegrateVelocities", - "source": "FIELD/SHIAN_HEYA/FLAGGED_OBJECT.C" + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" }, "resource_36f:02000030": { "name": "FunctionHead_02000030", @@ -10317,11 +10317,11 @@ "source": "FIELD/KUUPUAPPU_HEYA/PROMPT.C" }, "resource_385:020009f8": { - "name": "Scene_RunScene385", + "name": "FieldScene_RunScene385_020009f8", "source": "FIELD/KUUPUAPPU_MURA_SAI/MOTION_EVENT.C" }, "resource_385:02000d84": { - "name": "Scene_RunScene385", + "name": "FieldScene_RunScene385_02000d84", "source": "FIELD/KUUPUAPPU_MURA_SAI/MOTION_EVENT.C" }, "resource_386:0200011c": { @@ -10887,8 +10887,8 @@ "source": "FIELD/HAIDIA_HEYA/TIMED_EVENTS.C" }, "resource_380:02000104": { - "name": "Effect_UpdateMotion", - "source": "FIELD/SORU_STAR/PARTY_INTRO.C" + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" }, "resource_399:02000f90": { "name": "Scene_RunPrimaryScriptChoreography", @@ -11572,8 +11572,8 @@ "source": "FIELD/GOMA_SUIRO/BURST.C" }, "resource_38a:02000104": { - "name": "SceneEffect_UpdateMotion", - "source": "FIELD/GOMA_SUIRO/BURST.C" + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" }, "resource_38a:020004c4": { "name": "SceneEffect_RotateRecord", @@ -12501,8 +12501,8 @@ "source": "FIELD/MAKYURI_CHOJO/AERIE.C" }, "resource_39d:02000104": { - "name": "OverlayObject_ApplyVelocity", - "source": "FIELD/MAKYURI_CHOJO/AERIE.C" + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" }, "resource_39d:02000030": { "name": "SetOverlayObjectRecordField1", @@ -15600,8 +15600,8 @@ "source": "FIELD/TAKARA_SHIMA/ISLAND_AND_CAVES.C" }, "resource_3b2:02000ab0": { - "name": "OverlayObject_IntegrateVelocities", - "source": "FIELD/TAKARA_SHIMA/ISLAND_AND_CAVES.C" + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" }, "resource_3b2:02001214": { "name": "FieldScene_RunScene3b2SequenceA", @@ -16041,8 +16041,8 @@ "source": "FIELD/BABI_CHIKA/MAP_INIT.C" }, "resource_3c4:02000ab0": { - "name": "OverlayObject_IntegrateVelocities", - "source": "FIELD/BABI_CHIKA/MAP_INIT.C" + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" }, "resource_3c4:02001744": { "name": "FieldScene_RunSupplementalSequenceOne", @@ -17223,8 +17223,8 @@ "source": "FIELD/MOGORU_MORI/WAYPOINT.C" }, "resource_39f:02000ab0": { - "name": "OverlayObject_IntegrateVelocities", - "source": "FIELD/MOGORU_MORI/WAYPOINT.C" + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" }, "resource_39f:02001d04": { "name": "FieldScene_RunScene39fSequenceA", @@ -17689,8 +17689,8 @@ "source": "FIELD/BABI_IRIGUCHI/BRANCHING_EVENT.C" }, "resource_3c5:02000ab0": { - "name": "OverlayObject_IntegrateVelocities", - "source": "FIELD/BABI_IRIGUCHI/BRANCHING_EVENT.C" + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" }, "resource_3c5:02000eac": { "name": "FieldScene_RunScene3c5SequenceA", @@ -18669,6 +18669,58 @@ "resource_3c6:0200120c": { "name": "Scene_Initialize", "source": "FIELD/RARIBERO_MACHI/FLAGGED_CUE.C" + }, + "resource_382:02000104": { + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" + }, + "resource_387:02000104": { + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" + }, + "resource_396:02000104": { + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" + }, + "resource_39b:02000104": { + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" + }, + "resource_39c:02000104": { + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" + }, + "resource_39e:02000104": { + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" + }, + "resource_3a0:02000104": { + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" + }, + "resource_3a5:02000104": { + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" + }, + "resource_3a6:02000104": { + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" + }, + "resource_3b3:02000104": { + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" + }, + "resource_3be:02000104": { + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" + }, + "resource_3c0:02000104": { + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" + }, + "resource_3c9:02000104": { + "name": "Effect_Move", + "source": "FIELD/COMMON/EFFECT/MOVE.C" } } }