mirror/BFM-decomp
1
0
Fork 0
mirror of https://github.com/Druthulu/BFM-decomp synced 2026-09-26 13:33:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(phase-30 S47-0a.1): the symbol-KIND fix banks 205 members; the residue crosses over to DIFF

Browse Source 
Stage 0a's first defect, and the largest single zero-token bank of the session.

family_remap's kind test asked ONE question — is this address a function in the SIBLING'S OWN sig?
— and defaulted to `D_` on "no". But a body calls outside its image constantly: an overlay calls
resident helpers, an md_* module calls the overlay-range engine. Those addresses are absent from
the sibling's sig, so the test fell through and emitted a DATA NAME FOR A FUNCTION —
`D_800183E0`, `D_800D1EBC`, `D_80171A1C`. None exist anywhere in src/ or config/symbols.us.txt,
while `func_80171A1C` alone has 1,061 references. Measured: 611 member-rows across 45 symbols,
the largest named residue class. "Not in MY sig" means "not mine", not "is data".

Fix — three oracles, strongest first, never a blanket fallback:
 1. the sibling's own sig (authoritative for its image; this is what preserves the Phase-29 T82
    case where a slot is a function in the exemplar and DATA in the member — unioning every sig
    would have re-broken the 251 members T82 fixed),
 2. the always-linked images via extern_fn_addrs() — resident + main, 2,146 addresses whose ranges
    cannot collide with an overlay's,
 3. the exemplar reached it by `jal` — a call target is a function BY DEFINITION, which covers an
    external address neither sig claims (0x80171A1C from an md_* module, 112 rows).
Only a non-call reloc no oracle claims still falls to `D_`.

Result: BANKED 205 member-matches, failures 670 -> 575, derived net = report = 205.
R22 clean-fleet 213 passed / 0 failed of 213.
Fleet 94.4% instr / 88.3% distinct / 96.27 -> 96.33% fn-count; stubs 13,563 -> 13,345.

THE RESIDUE HAS CROSSED OVER: DIFF is now the LARGEST class at 143 of 575 — real byte divergence
outranks plumbing for the first time this session (undefined-ref 611 -> ~8, PLUMBING-other
231 -> 81). The ~5:1 plumbing:DIFF ratio that justified "tooling beats volume" has inverted in this
queue, exactly as the frontier analysis predicted: the declaration-axis vein was one-time.
The new head class is `conflicting types for func_80175414` (27) — the same addresses this fix
started naming correctly, now surfacing the NEXT layer (the symbol resolves; its declared signature
disagrees). That is the conform axis, not the remap axis.

Note for anyone auditing this class: rtu_match MASKS HI16/LO16, so a wrong %hi/%lo symbol still
reports MATCH (the T82 comment records `MATCH (10 ins)` on a member the fleet gate refused). This
defect is invisible to the per-function tool by construction — only the whole-binary gate sees it.
This commit is contained in:
Drew T
2026-08-11 14:02:38 -06:00
parent d5fbd2630f
commit fd80bd7007
80 changed files with 3158 additions and 1144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/backlog.md
+833 -836
View File
File diff suppressed because it is too large Load Diff
docs/progress.fleet.md
+83 -83
View File
@@ -4,16 +4,16 @@
# cross-binary collapsible-byte leverage: docs/duplicates.cross.md.
# THREE progress metrics (all matter — see the labels):
FLEET fn-count byte-ident: 349822 / 363379 = 96.27% (REAL+LINKED+empties; FUNCTION-count, ×134-inflated — one crack counts per overlay)
FLEET instr-weighted : 12766587 / 13523856 = 94.4% (shipped .text across main + resident + 211 overlays; the decomp.dev-DISPLAY number)
FLEET distinct-code(uniq): 5165534 / 5851963 = 88.3% (80238/90928 unique fns; the DISTINCT-RE number)
FLEET fn-count byte-ident: 350027 / 363379 = 96.33% (REAL+LINKED+empties; FUNCTION-count, ×134-inflated — one crack counts per overlay)
FLEET instr-weighted : 12769730 / 13523856 = 94.4% (shipped .text across main + resident + 211 overlays; the decomp.dev-DISPLAY number)
FLEET distinct-code(uniq): 5167601 / 5851963 = 88.3% (80317/90928 unique fns; the DISTINCT-RE number)
MAIN game-code weighted : 436 / 79510 = 0.5% (INCLUDED in the fleet numbers above since 2026-07-22 — roadmap §1 metrics contract; LINKED-excluding Ghidra sig dated 2026-08-05; caveat is R34: no independent second oracle for a PS-X EXE, NOT drift)
(fleet EXCLUDING main, for continuity with pre-2026-07-22 readings: 12766151 / 13444346 = 95.0%)
(fleet EXCLUDING main, for continuity with pre-2026-07-22 readings: 12769294 / 13444346 = 95.0%)
FLEET REAL substantive : 347640 (of which dedup-shared 249221 via 1949 groups / 249295 instances)
FLEET REAL substantive : 347845 (of which dedup-shared 249221 via 1949 groups / 249295 instances)
FLEET LINKED PsyQ objs : 959
FLEET NON_MATCHING : 7 (0 in any default build — G4)
FLEET INCLUDE_ASM stubs : 13550
FLEET INCLUDE_ASM stubs : 13345
FLEET matchable : 363379
| binary | REAL | shared | LINKED | byte-ident | matchable | byte-ident % |
@@ -25,71 +25,71 @@ FLEET matchable : 363379
| md_MAIN_008 | 0 | 0 | 0 | 0 | 6 | 0.0% |
| md_MAIN_011 | 0 | 0 | 0 | 0 | 21 | 0.0% |
| md_MAIN_013 | 5 | 0 | 0 | 5 | 16 | 31.2% |
| md_MAIN_014 | 3 | 0 | 0 | 4 | 13 | 30.8% |
| md_MAIN_015 | 6 | 0 | 0 | 6 | 20 | 30.0% |
| md_MAIN_016 | 3 | 0 | 0 | 4 | 13 | 30.8% |
| md_MAIN_017 | 3 | 0 | 0 | 3 | 10 | 30.0% |
| md_MAIN_014 | 4 | 0 | 0 | 5 | 13 | 38.5% |
| md_MAIN_015 | 8 | 0 | 0 | 8 | 20 | 40.0% |
| md_MAIN_016 | 4 | 0 | 0 | 5 | 13 | 38.5% |
| md_MAIN_017 | 4 | 0 | 0 | 4 | 10 | 40.0% |
| md_MAIN_018 | 3 | 0 | 0 | 4 | 11 | 36.4% |
| md_MAIN_019 | 4 | 0 | 0 | 4 | 22 | 18.2% |
| md_MAIN_020 | 6 | 0 | 0 | 7 | 14 | 50.0% |
| md_MAIN_021 | 3 | 0 | 0 | 4 | 11 | 36.4% |
| md_MAIN_022 | 13 | 0 | 0 | 15 | 33 | 45.5% |
| md_MAIN_023 | 2 | 0 | 0 | 3 | 6 | 50.0% |
| md_MAIN_024 | 2 | 0 | 0 | 4 | 6 | 66.7% |
| md_MAIN_025 | 3 | 0 | 0 | 3 | 30 | 10.0% |
| md_MAIN_026 | 5 | 0 | 0 | 5 | 24 | 20.8% |
| md_MAIN_027 | 7 | 0 | 0 | 9 | 29 | 31.0% |
| md_MAIN_028 | 3 | 0 | 0 | 3 | 22 | 13.6% |
| md_MAIN_019 | 8 | 0 | 0 | 8 | 22 | 36.4% |
| md_MAIN_020 | 8 | 0 | 0 | 9 | 14 | 64.3% |
| md_MAIN_021 | 4 | 0 | 0 | 5 | 11 | 45.5% |
| md_MAIN_022 | 16 | 0 | 0 | 18 | 33 | 54.5% |
| md_MAIN_023 | 3 | 0 | 0 | 4 | 6 | 66.7% |
| md_MAIN_024 | 3 | 0 | 0 | 5 | 6 | 83.3% |
| md_MAIN_025 | 5 | 0 | 0 | 5 | 30 | 16.7% |
| md_MAIN_026 | 7 | 0 | 0 | 7 | 24 | 29.2% |
| md_MAIN_027 | 9 | 0 | 0 | 11 | 29 | 37.9% |
| md_MAIN_028 | 4 | 0 | 0 | 4 | 22 | 18.2% |
| md_MAIN_029 | 3 | 0 | 0 | 4 | 11 | 36.4% |
| md_MAIN_030 | 3 | 0 | 0 | 3 | 10 | 30.0% |
| md_MAIN_031 | 3 | 0 | 0 | 3 | 18 | 16.7% |
| md_MAIN_032 | 3 | 0 | 0 | 3 | 10 | 30.0% |
| md_MAIN_033 | 3 | 0 | 0 | 3 | 19 | 15.8% |
| md_MAIN_034 | 2 | 0 | 0 | 3 | 28 | 10.7% |
| md_MAIN_035 | 7 | 0 | 0 | 8 | 16 | 50.0% |
| md_MAIN_036 | 5 | 0 | 0 | 6 | 28 | 21.4% |
| md_MAIN_037 | 3 | 0 | 0 | 3 | 17 | 17.6% |
| md_MAIN_038 | 6 | 0 | 0 | 6 | 20 | 30.0% |
| md_MAIN_039 | 4 | 0 | 0 | 4 | 26 | 15.4% |
| md_MAIN_040 | 3 | 0 | 0 | 3 | 19 | 15.8% |
| md_MAIN_041 | 3 | 0 | 0 | 3 | 15 | 20.0% |
| md_MAIN_030 | 4 | 0 | 0 | 4 | 10 | 40.0% |
| md_MAIN_031 | 4 | 0 | 0 | 4 | 18 | 22.2% |
| md_MAIN_032 | 5 | 0 | 0 | 5 | 10 | 50.0% |
| md_MAIN_033 | 4 | 0 | 0 | 4 | 19 | 21.1% |
| md_MAIN_034 | 5 | 0 | 0 | 6 | 28 | 21.4% |
| md_MAIN_035 | 10 | 0 | 0 | 11 | 16 | 68.8% |
| md_MAIN_036 | 7 | 0 | 0 | 8 | 28 | 28.6% |
| md_MAIN_037 | 4 | 0 | 0 | 4 | 17 | 23.5% |
| md_MAIN_038 | 7 | 0 | 0 | 7 | 20 | 35.0% |
| md_MAIN_039 | 5 | 0 | 0 | 5 | 26 | 19.2% |
| md_MAIN_040 | 4 | 0 | 0 | 4 | 19 | 21.1% |
| md_MAIN_041 | 5 | 0 | 0 | 5 | 15 | 33.3% |
| md_MAIN_042 | 0 | 0 | 0 | 0 | 4 | 0.0% |
| md_MAIN_043 | 2 | 0 | 0 | 3 | 23 | 13.0% |
| md_MAIN_044 | 7 | 0 | 0 | 8 | 44 | 18.2% |
| md_MAIN_045 | 0 | 0 | 0 | 1 | 21 | 4.8% |
| md_MAIN_046 | 5 | 0 | 0 | 6 | 39 | 15.4% |
| md_MAIN_043 | 4 | 0 | 0 | 5 | 23 | 21.7% |
| md_MAIN_044 | 11 | 0 | 0 | 12 | 44 | 27.3% |
| md_MAIN_045 | 3 | 0 | 0 | 4 | 21 | 19.0% |
| md_MAIN_046 | 8 | 0 | 0 | 9 | 39 | 23.1% |
| md_MAIN_047 | 3 | 0 | 0 | 4 | 12 | 33.3% |
| md_SC02_009 | 4 | 0 | 0 | 4 | 40 | 10.0% |
| md_SC03_073 | 16 | 0 | 0 | 18 | 28 | 64.3% |
| md_SC03_074 | 15 | 0 | 0 | 17 | 29 | 58.6% |
| md_SC03_075 | 17 | 0 | 0 | 19 | 41 | 46.3% |
| md_SC03_076 | 19 | 0 | 0 | 21 | 66 | 31.8% |
| md_SC03_077 | 13 | 0 | 0 | 15 | 35 | 42.9% |
| md_SC03_078 | 13 | 0 | 0 | 15 | 27 | 55.6% |
| md_SC03_079 | 15 | 0 | 0 | 17 | 29 | 58.6% |
| md_SC03_132 | 15 | 0 | 0 | 17 | 28 | 60.7% |
| md_SC03_133 | 16 | 0 | 0 | 18 | 29 | 62.1% |
| md_SC03_134 | 18 | 0 | 0 | 20 | 41 | 48.8% |
| md_SC03_135 | 20 | 0 | 0 | 22 | 66 | 33.3% |
| md_SC03_136 | 14 | 0 | 0 | 16 | 35 | 45.7% |
| md_SC03_137 | 14 | 0 | 0 | 16 | 27 | 59.3% |
| md_SC03_138 | 17 | 0 | 0 | 21 | 37 | 56.8% |
| md_SC04_024 | 15 | 0 | 0 | 17 | 28 | 60.7% |
| md_SC04_025 | 16 | 0 | 0 | 18 | 29 | 62.1% |
| md_SC04_026 | 18 | 0 | 0 | 20 | 41 | 48.8% |
| md_SC04_027 | 20 | 0 | 0 | 22 | 66 | 33.3% |
| md_SC04_028 | 14 | 0 | 0 | 16 | 35 | 45.7% |
| md_SC04_029 | 14 | 0 | 0 | 16 | 27 | 59.3% |
| md_SC04_030 | 16 | 0 | 0 | 20 | 31 | 64.5% |
| md_SC05_023 | 15 | 0 | 0 | 17 | 28 | 60.7% |
| md_SC05_024 | 14 | 0 | 0 | 16 | 29 | 55.2% |
| md_SC05_025 | 16 | 0 | 0 | 18 | 41 | 43.9% |
| md_SC05_026 | 18 | 0 | 0 | 20 | 66 | 30.3% |
| md_SC05_027 | 12 | 0 | 0 | 14 | 35 | 40.0% |
| md_SC05_028 | 12 | 0 | 0 | 14 | 27 | 51.9% |
| md_SC05_029 | 14 | 0 | 0 | 18 | 31 | 58.1% |
| md_SC07_003 | 12 | 0 | 0 | 12 | 100 | 12.0% |
| md_SC07_004 | 40 | 0 | 0 | 40 | 315 | 12.7% |
| md_SC02_009 | 5 | 0 | 0 | 5 | 40 | 12.5% |
| md_SC03_073 | 19 | 0 | 0 | 21 | 28 | 75.0% |
| md_SC03_074 | 18 | 0 | 0 | 20 | 29 | 69.0% |
| md_SC03_075 | 21 | 0 | 0 | 23 | 41 | 56.1% |
| md_SC03_076 | 24 | 0 | 0 | 26 | 66 | 39.4% |
| md_SC03_077 | 18 | 0 | 0 | 20 | 35 | 57.1% |
| md_SC03_078 | 17 | 0 | 0 | 19 | 27 | 70.4% |
| md_SC03_079 | 20 | 0 | 0 | 22 | 29 | 75.9% |
| md_SC03_132 | 20 | 0 | 0 | 22 | 28 | 78.6% |
| md_SC03_133 | 19 | 0 | 0 | 21 | 29 | 72.4% |
| md_SC03_134 | 22 | 0 | 0 | 24 | 41 | 58.5% |
| md_SC03_135 | 25 | 0 | 0 | 27 | 66 | 40.9% |
| md_SC03_136 | 19 | 0 | 0 | 21 | 35 | 60.0% |
| md_SC03_137 | 18 | 0 | 0 | 20 | 27 | 74.1% |
| md_SC03_138 | 22 | 0 | 0 | 26 | 37 | 70.3% |
| md_SC04_024 | 20 | 0 | 0 | 22 | 28 | 78.6% |
| md_SC04_025 | 19 | 0 | 0 | 21 | 29 | 72.4% |
| md_SC04_026 | 22 | 0 | 0 | 24 | 41 | 58.5% |
| md_SC04_027 | 25 | 0 | 0 | 27 | 66 | 40.9% |
| md_SC04_028 | 19 | 0 | 0 | 21 | 35 | 60.0% |
| md_SC04_029 | 18 | 0 | 0 | 20 | 27 | 74.1% |
| md_SC04_030 | 21 | 0 | 0 | 25 | 31 | 80.6% |
| md_SC05_023 | 20 | 0 | 0 | 22 | 28 | 78.6% |
| md_SC05_024 | 17 | 0 | 0 | 19 | 29 | 65.5% |
| md_SC05_025 | 20 | 0 | 0 | 22 | 41 | 53.7% |
| md_SC05_026 | 23 | 0 | 0 | 25 | 66 | 37.9% |
| md_SC05_027 | 17 | 0 | 0 | 19 | 35 | 54.3% |
| md_SC05_028 | 16 | 0 | 0 | 18 | 27 | 66.7% |
| md_SC05_029 | 19 | 0 | 0 | 23 | 31 | 74.2% |
| md_SC07_003 | 17 | 0 | 0 | 17 | 100 | 17.0% |
| md_SC07_004 | 42 | 0 | 0 | 42 | 315 | 13.3% |
| ov_MAIN_012 | 2177 | 1658 | 0 | 2256 | 2403 | 93.9% |
| ov_SC01_000 | 2390 | 1775 | 0 | 2390 | 2403 | 99.5% |
| ov_SC01_001 | 2398 | 1776 | 0 | 2400 | 2466 | 97.3% |
@@ -106,7 +106,7 @@ FLEET matchable : 363379
| ov_SC02_003 | 2524 | 1815 | 0 | 2524 | 2683 | 94.1% |
| ov_SC02_004 | 2391 | 1771 | 0 | 2391 | 2401 | 99.6% |
| ov_SC02_005 | 2541 | 1767 | 0 | 2551 | 2927 | 87.2% |
| ov_SC02_011 | 2628 | 1774 | 0 | 2639 | 2893 | 91.2% |
| ov_SC02_011 | 2629 | 1774 | 0 | 2640 | 2893 | 91.3% |
| ov_SC02_015 | 2401 | 1773 | 0 | 2401 | 2414 | 99.5% |
| ov_SC02_016 | 2484 | 1774 | 0 | 2487 | 2545 | 97.7% |
| ov_SC02_017 | 2553 | 1774 | 0 | 2561 | 2732 | 93.7% |
@@ -119,8 +119,8 @@ FLEET matchable : 363379
| ov_SC02_037 | 2294 | 1658 | 0 | 2376 | 2516 | 94.4% |
| ov_SC02_039 | 2396 | 1771 | 0 | 2396 | 2416 | 99.2% |
| ov_SC02_041 | 2477 | 1771 | 0 | 2480 | 2561 | 96.8% |
| ov_SC03_001 | 2673 | 1772 | 0 | 2690 | 2869 | 93.8% |
| ov_SC03_002 | 2545 | 1776 | 0 | 2560 | 2631 | 97.3% |
| ov_SC03_001 | 2674 | 1772 | 0 | 2691 | 2869 | 93.8% |
| ov_SC03_002 | 2546 | 1776 | 0 | 2561 | 2631 | 97.3% |
| ov_SC03_003 | 2400 | 1771 | 0 | 2401 | 2423 | 99.1% |
| ov_SC03_006 | 2556 | 1778 | 0 | 2565 | 2767 | 92.7% |
| ov_SC03_007 | 2464 | 1771 | 0 | 2468 | 2623 | 94.1% |
@@ -144,7 +144,7 @@ FLEET matchable : 363379
| ov_SC03_094 | 2508 | 1771 | 0 | 2514 | 2577 | 97.6% |
| ov_SC03_095 | 2434 | 1771 | 0 | 2437 | 2474 | 98.5% |
| ov_SC03_096 | 2431 | 1771 | 0 | 2434 | 2465 | 98.7% |
| ov_SC03_097 | 2528 | 1776 | 0 | 2535 | 2603 | 97.4% |
| ov_SC03_097 | 2530 | 1776 | 0 | 2537 | 2603 | 97.5% |
| ov_SC03_098 | 2513 | 1776 | 0 | 2516 | 2541 | 99.0% |
| ov_SC03_099 | 2489 | 1771 | 0 | 2492 | 2504 | 99.5% |
| ov_SC03_100 | 2524 | 1776 | 0 | 2528 | 2539 | 99.6% |
@@ -153,7 +153,7 @@ FLEET matchable : 363379
| ov_SC03_103 | 2497 | 1773 | 0 | 2500 | 2510 | 99.6% |
| ov_SC03_104 | 2545 | 1776 | 0 | 2552 | 2616 | 97.6% |
| ov_SC03_105 | 2451 | 1772 | 0 | 2458 | 2597 | 94.6% |
| ov_SC03_107 | 2218 | 1658 | 0 | 2301 | 2497 | 92.2% |
| ov_SC03_107 | 2219 | 1658 | 0 | 2302 | 2497 | 92.2% |
| ov_SC03_108 | 2401 | 1771 | 0 | 2401 | 2443 | 98.3% |
| ov_SC03_109 | 2409 | 1771 | 0 | 2411 | 2424 | 99.5% |
| ov_SC03_110 | 2442 | 1778 | 0 | 2442 | 2468 | 98.9% |
@@ -165,9 +165,9 @@ FLEET matchable : 363379
| ov_SC03_116 | 2402 | 1771 | 0 | 2405 | 2438 | 98.6% |
| ov_SC03_117 | 2469 | 1771 | 0 | 2475 | 2557 | 96.8% |
| ov_SC03_118 | 2544 | 1796 | 0 | 2545 | 2685 | 94.8% |
| ov_SC03_119 | 2541 | 1796 | 0 | 2542 | 2685 | 94.7% |
| ov_SC03_119 | 2542 | 1796 | 0 | 2543 | 2685 | 94.7% |
| ov_SC03_121 | 2404 | 1771 | 0 | 2407 | 2459 | 97.9% |
| ov_SC03_124 | 2581 | 1767 | 0 | 2601 | 2741 | 94.9% |
| ov_SC03_124 | 2582 | 1767 | 0 | 2602 | 2741 | 94.9% |
| ov_SC03_125 | 2531 | 1771 | 0 | 2543 | 2588 | 98.3% |
| ov_SC03_126 | 2401 | 1773 | 0 | 2401 | 2423 | 99.1% |
| ov_SC04_000 | 2475 | 1775 | 0 | 2484 | 2546 | 97.6% |
@@ -181,11 +181,11 @@ FLEET matchable : 363379
| ov_SC04_009 | 2428 | 1771 | 0 | 2431 | 2441 | 99.6% |
| ov_SC04_010 | 2403 | 1771 | 0 | 2404 | 2419 | 99.4% |
| ov_SC04_011 | 2517 | 1776 | 0 | 2523 | 2803 | 90.0% |
| ov_SC04_012 | 2398 | 1771 | 0 | 2399 | 2420 | 99.1% |
| ov_SC04_012 | 2401 | 1771 | 0 | 2402 | 2420 | 99.3% |
| ov_SC04_015 | 2536 | 1772 | 0 | 2547 | 2611 | 97.5% |
| ov_SC04_016 | 2402 | 1771 | 0 | 2404 | 2440 | 98.5% |
| ov_SC04_018 | 2678 | 1808 | 0 | 2678 | 2857 | 93.7% |
| ov_SC04_019 | 2675 | 1808 | 0 | 2675 | 2857 | 93.6% |
| ov_SC04_018 | 2679 | 1808 | 0 | 2679 | 2857 | 93.8% |
| ov_SC04_019 | 2676 | 1808 | 0 | 2676 | 2857 | 93.7% |
| ov_SC04_020 | 2517 | 1771 | 0 | 2529 | 2567 | 98.5% |
| ov_SC04_021 | 2401 | 1773 | 0 | 2401 | 2423 | 99.1% |
| ov_SC05_000 | 2407 | 1775 | 0 | 2410 | 2422 | 99.5% |
@@ -200,10 +200,10 @@ FLEET matchable : 363379
| ov_SC05_009 | 2410 | 1771 | 0 | 2414 | 2438 | 99.0% |
| ov_SC05_010 | 2450 | 1772 | 0 | 2454 | 2588 | 94.8% |
| ov_SC05_011 | 2397 | 1771 | 0 | 2398 | 2409 | 99.5% |
| ov_SC05_017 | 2652 | 1768 | 0 | 2663 | 2842 | 93.7% |
| ov_SC05_018 | 2549 | 1771 | 0 | 2562 | 2673 | 95.8% |
| ov_SC05_017 | 2653 | 1768 | 0 | 2664 | 2842 | 93.7% |
| ov_SC05_018 | 2550 | 1771 | 0 | 2563 | 2673 | 95.9% |
| ov_SC05_019 | 2401 | 1773 | 0 | 2401 | 2423 | 99.1% |
| ov_SC06_000 | 2533 | 1780 | 0 | 2536 | 2691 | 94.2% |
| ov_SC06_000 | 2534 | 1780 | 0 | 2537 | 2691 | 94.3% |
| ov_SC06_006 | 2424 | 1771 | 0 | 2425 | 2511 | 96.6% |
| ov_SC06_008 | 2489 | 1773 | 0 | 2495 | 2542 | 98.2% |
| ov_SC06_010 | 2461 | 1771 | 0 | 2466 | 2517 | 98.0% |
@@ -222,10 +222,10 @@ FLEET matchable : 363379
| ov_SC06_030 | 2413 | 1772 | 0 | 2413 | 2456 | 98.2% |
| ov_SC06_032 | 2488 | 1772 | 0 | 2495 | 2658 | 93.9% |
| ov_SC06_033 | 2493 | 1772 | 0 | 2500 | 2631 | 95.0% |
| ov_SC07_000 | 2434 | 1775 | 0 | 2436 | 2521 | 96.6% |
| ov_SC07_000 | 2436 | 1775 | 0 | 2438 | 2521 | 96.7% |
| ov_SC07_001 | 2405 | 1771 | 0 | 2407 | 2454 | 98.1% |
| ov_SC07_002 | 2462 | 1772 | 0 | 2466 | 2579 | 95.6% |
| ov_SC07_006 | 2326 | 1595 | 0 | 2406 | 2455 | 98.0% |
| ov_SC07_002 | 2463 | 1772 | 0 | 2467 | 2579 | 95.7% |
| ov_SC07_006 | 2327 | 1595 | 0 | 2407 | 2455 | 98.0% |
| ov_SC07_007 | 2339 | 1628 | 0 | 2423 | 2612 | 92.8% |
| ov_SC07_008 | 2386 | 1771 | 0 | 2386 | 2386 | 100.0% |
| ov_SC07_009 | 2398 | 1771 | 0 | 2400 | 2430 | 98.8% |
src/md_MAIN_014/md_MAIN_014.c
+7 -1
View File
@@ -1,6 +1,12 @@
#include "common.h"
INCLUDE_ASM("asm/md_MAIN_014/nonmatchings/md_MAIN_014", func_800CAE0C);
extern s32 func_800183E0(s32 *a0);
void func_800CAE0C(void) {
extern s32 D_800CB610;
func_800183E0(&D_800CB610);
}
src/md_MAIN_015/md_MAIN_015.c
+12 -2
View File
@@ -1,6 +1,12 @@
#include "common.h"
INCLUDE_ASM("asm/md_MAIN_015/nonmatchings/md_MAIN_015", func_800CAE0C);
extern s32 func_800183E0(s32 *a0);
void func_800CAE0C(void) {
extern s32 D_800CBB88;
func_800183E0(&D_800CBB88);
}
@@ -58,7 +64,11 @@ INCLUDE_ASM("asm/md_MAIN_015/nonmatchings/md_MAIN_015", func_800CB21C);
INCLUDE_ASM("asm/md_MAIN_015/nonmatchings/md_MAIN_015", func_800CB2E0);
INCLUDE_ASM("asm/md_MAIN_015/nonmatchings/md_MAIN_015", func_800CB474);
extern void func_80162CCC(void);
void func_800CB474(void) {
func_80162CCC();
}
extern void func_80146C3C(void);
src/md_MAIN_016/md_MAIN_016.c
+7 -1
View File
@@ -1,6 +1,12 @@
#include "common.h"
INCLUDE_ASM("asm/md_MAIN_016/nonmatchings/md_MAIN_016", func_800CAE0C);
extern s32 func_800183E0(s32 *a0);
void func_800CAE0C(void) {
extern s32 D_800CB570;
func_800183E0(&D_800CB570);
}
src/md_MAIN_017/md_MAIN_017.c
+5 -1
View File
@@ -23,7 +23,11 @@ INCLUDE_ASM("asm/md_MAIN_017/nonmatchings/md_MAIN_017", func_800CAEC0);
INCLUDE_ASM("asm/md_MAIN_017/nonmatchings/md_MAIN_017", func_800CAF2C);
INCLUDE_ASM("asm/md_MAIN_017/nonmatchings/md_MAIN_017", func_800CAF7C);
extern void func_80147364(s32 a, s32 b);
void func_800CAF7C(void) {
func_80147364(0x4, 0x47C);
}
INCLUDE_ASM("asm/md_MAIN_017/nonmatchings/md_MAIN_017", func_800CAFA0);
src/md_MAIN_019/md_MAIN_019.c
+33 -4
View File
@@ -1,6 +1,12 @@
#include "common.h"
INCLUDE_ASM("asm/md_MAIN_019/nonmatchings/md_MAIN_019", func_800CAE0C);
extern s32 func_800183E0(s32 *a0);
void func_800CAE0C(void) {
extern s32 D_800CC160;
func_800183E0(&D_800CC160);
}
@@ -58,7 +64,11 @@ INCLUDE_ASM("asm/md_MAIN_019/nonmatchings/md_MAIN_019", func_800CB324);
INCLUDE_ASM("asm/md_MAIN_019/nonmatchings/md_MAIN_019", func_800CB3FC);
INCLUDE_ASM("asm/md_MAIN_019/nonmatchings/md_MAIN_019", func_800CB4A8);
extern void func_80162CCC(void);
void func_800CB4A8(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_019/nonmatchings/md_MAIN_019", func_800CB4C8);
@@ -68,7 +78,22 @@ INCLUDE_ASM("asm/md_MAIN_019/nonmatchings/md_MAIN_019", func_800CB9F8);
INCLUDE_ASM("asm/md_MAIN_019/nonmatchings/md_MAIN_019", func_800CBC0C);
INCLUDE_ASM("asm/md_MAIN_019/nonmatchings/md_MAIN_019", func_800CBD0C);
extern void func_80162CCC(void);
void func_800CBD0C(void *arg0) {
extern u8 D_80078EC1;
extern void (*D_800CC130[])(void);
if (D_80078EC1 == 0xd) {
u16 v0 = *(u16 *)((u8 *)arg0 + 2);
D_800CC130[v0]();
} else {
func_80162CCC();
}
}
INCLUDE_ASM("asm/md_MAIN_019/nonmatchings/md_MAIN_019", func_800CBD68);
@@ -76,6 +101,10 @@ INCLUDE_ASM("asm/md_MAIN_019/nonmatchings/md_MAIN_019", func_800CBE38);
INCLUDE_ASM("asm/md_MAIN_019/nonmatchings/md_MAIN_019", func_800CBEC0);
INCLUDE_ASM("asm/md_MAIN_019/nonmatchings/md_MAIN_019", func_800CBF60);
extern void func_80162CCC(void);
void func_800CBF60(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_019/nonmatchings/md_MAIN_019", func_800CBF80);
src/md_MAIN_020/md_MAIN_020.c
+14 -2
View File
@@ -1,6 +1,12 @@
#include "common.h"
INCLUDE_ASM("asm/md_MAIN_020/nonmatchings/md_MAIN_020", func_800CAE0C);
extern s32 func_800183E0(s32 *a0);
void func_800CAE0C(void) {
extern s32 D_800CB294;
func_800183E0(&D_800CB294);
}
@@ -61,6 +67,12 @@ INCLUDE_ASM("asm/md_MAIN_020/nonmatchings/md_MAIN_020", func_800CAFFC);
INCLUDE_ASM("asm/md_MAIN_020/nonmatchings/md_MAIN_020", func_800CB034);
INCLUDE_ASM("asm/md_MAIN_020/nonmatchings/md_MAIN_020", func_800CB148);
extern void func_8012A2F4(s32 a0);
extern void func_80154A74(s32 a0, s32 a1);
void func_800CB148(s32 a0) {
func_8012A2F4(a0);
func_80154A74(a0, 0x11);
}
INCLUDE_ASM("asm/md_MAIN_020/nonmatchings/md_MAIN_020", func_800CB17C);
src/md_MAIN_021/md_MAIN_021.c
+7 -1
View File
@@ -1,6 +1,12 @@
#include "common.h"
INCLUDE_ASM("asm/md_MAIN_021/nonmatchings/md_MAIN_021", func_800CAE0C);
extern s32 func_800183E0(s32 *a0);
void func_800CAE0C(void) {
extern s32 D_800CB538;
func_800183E0(&D_800CB538);
}
src/md_MAIN_022/md_MAIN_022.c
+18 -3
View File
@@ -1,6 +1,12 @@
#include "common.h"
INCLUDE_ASM("asm/md_MAIN_022/nonmatchings/md_MAIN_022", func_800CAE0C);
extern s32 func_800183E0(s32 *a0);
void func_800CAE0C(void) {
extern s32 D_800CBD48;
func_800183E0(&D_800CBD48);
}
@@ -19,7 +25,12 @@ void func_800CAE78(void *a0) {
}
INCLUDE_ASM("asm/md_MAIN_022/nonmatchings/md_MAIN_022", func_800CAEB0);
extern void func_801655E4();
void func_800CAEB0(void *a0) {
func_801655E4(a0);
*(u8 *)((s32)a0 + 0x197) += 1;
}
INCLUDE_ASM("asm/md_MAIN_022/nonmatchings/md_MAIN_022", func_800CAEE8);
@@ -76,7 +87,11 @@ INCLUDE_ASM("asm/md_MAIN_022/nonmatchings/md_MAIN_022", func_800CB2F4);
INCLUDE_ASM("asm/md_MAIN_022/nonmatchings/md_MAIN_022", func_800CB354);
INCLUDE_ASM("asm/md_MAIN_022/nonmatchings/md_MAIN_022", func_800CB3D0);
extern void func_80162CCC(void);
void func_800CB3D0(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_022/nonmatchings/md_MAIN_022", func_800CB3F0);
src/md_MAIN_023/md_MAIN_023.c
+7 -1
View File
@@ -1,6 +1,12 @@
#include "common.h"
INCLUDE_ASM("asm/md_MAIN_023/nonmatchings/md_MAIN_023", func_800CAE0C);
extern s32 func_800183E0(s32 *a0);
void func_800CAE0C(void) {
extern s32 D_800CAF6C;
func_800183E0(&D_800CAF6C);
}
src/md_MAIN_024/md_MAIN_024.c
+7 -1
View File
@@ -1,6 +1,12 @@
#include "common.h"
INCLUDE_ASM("asm/md_MAIN_024/nonmatchings/md_MAIN_024", func_800CAE0C);
extern s32 func_800183E0(s32 *a0);
void func_800CAE0C(void) {
extern s32 D_800CAF34;
func_800183E0(&D_800CAF34);
}
src/md_MAIN_025/md_MAIN_025.c
+16 -2
View File
@@ -31,7 +31,15 @@ INCLUDE_ASM("asm/md_MAIN_025/nonmatchings/md_MAIN_025", func_800CB068);
INCLUDE_ASM("asm/md_MAIN_025/nonmatchings/md_MAIN_025", func_800CB0E4);
INCLUDE_ASM("asm/md_MAIN_025/nonmatchings/md_MAIN_025", func_800CB138);
extern void func_801599A4(u8 *a0);
extern void func_80159B3C(void *a0);
void func_800CB138(u8 *a0) {
if (*(u16 *)(a0 + 0xB8) & 0x8000) {
func_801599A4(a0);
func_80159B3C(a0);
}
}
extern void func_800CBBF8(void);
void func_800CB180(void) {
@@ -63,7 +71,13 @@ INCLUDE_ASM("asm/md_MAIN_025/nonmatchings/md_MAIN_025", func_800CB968);
INCLUDE_ASM("asm/md_MAIN_025/nonmatchings/md_MAIN_025", func_800CBA14);
INCLUDE_ASM("asm/md_MAIN_025/nonmatchings/md_MAIN_025", func_800CBA2C);
extern void func_80146E90(s32 *a0, s16 a1);
extern void func_80146CA0(void *a0);
void func_800CBA2C(s32 *a0) {
func_80146E90(a0, 8);
func_80146CA0(a0);
}
INCLUDE_ASM("asm/md_MAIN_025/nonmatchings/md_MAIN_025", func_800CBA60);
src/md_MAIN_026/md_MAIN_026.c
+10 -2
View File
@@ -61,7 +61,11 @@ INCLUDE_ASM("asm/md_MAIN_026/nonmatchings/md_MAIN_026", func_800CB3C0);
INCLUDE_ASM("asm/md_MAIN_026/nonmatchings/md_MAIN_026", func_800CB470);
INCLUDE_ASM("asm/md_MAIN_026/nonmatchings/md_MAIN_026", func_800CB5D4);
extern void func_80162CCC(void);
void func_800CB5D4(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_026/nonmatchings/md_MAIN_026", func_800CB5F4);
@@ -87,7 +91,11 @@ INCLUDE_ASM("asm/md_MAIN_026/nonmatchings/md_MAIN_026", func_800CB6E8);
INCLUDE_ASM("asm/md_MAIN_026/nonmatchings/md_MAIN_026", func_800CB77C);
INCLUDE_ASM("asm/md_MAIN_026/nonmatchings/md_MAIN_026", func_800CB8A4);
extern void func_80162CCC(void);
void func_800CB8A4(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_026/nonmatchings/md_MAIN_026", func_800CB8C4);
src/md_MAIN_027/md_MAIN_027.c
+12 -2
View File
@@ -76,7 +76,13 @@ INCLUDE_ASM("asm/md_MAIN_027/nonmatchings/md_MAIN_027", func_800CB3E0);
INCLUDE_ASM("asm/md_MAIN_027/nonmatchings/md_MAIN_027", func_800CB4A4);
INCLUDE_ASM("asm/md_MAIN_027/nonmatchings/md_MAIN_027", func_800CB7FC);
extern void func_801662F4(void);
extern void func_80162CCC(void);
void func_800CB7FC(s32 a0) {
func_801662F4();
((void (*)(s32))func_80162CCC)(a0);
}
INCLUDE_ASM("asm/md_MAIN_027/nonmatchings/md_MAIN_027", func_800CB82C);
@@ -96,6 +102,10 @@ void func_800CBFE4(void) {
}
INCLUDE_ASM("asm/md_MAIN_027/nonmatchings/md_MAIN_027", func_800CC004);
extern void func_80162CCC(void);
void func_800CC004(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_027/nonmatchings/md_MAIN_027", func_800CC024);
src/md_MAIN_028/md_MAIN_028.c
+5 -1
View File
@@ -23,7 +23,11 @@ INCLUDE_ASM("asm/md_MAIN_028/nonmatchings/md_MAIN_028", func_800CAEC0);
INCLUDE_ASM("asm/md_MAIN_028/nonmatchings/md_MAIN_028", func_800CB0D8);
INCLUDE_ASM("asm/md_MAIN_028/nonmatchings/md_MAIN_028", func_800CB32C);
extern void func_80147364(s32 a, s32 b);
void func_800CB32C(void) {
func_80147364(0x4, 0x838);
}
INCLUDE_ASM("asm/md_MAIN_028/nonmatchings/md_MAIN_028", func_800CB350);
src/md_MAIN_030/md_MAIN_030.c
+5 -1
View File
@@ -23,7 +23,11 @@ INCLUDE_ASM("asm/md_MAIN_030/nonmatchings/md_MAIN_030", func_800CAEC0);
INCLUDE_ASM("asm/md_MAIN_030/nonmatchings/md_MAIN_030", func_800CAF44);
INCLUDE_ASM("asm/md_MAIN_030/nonmatchings/md_MAIN_030", func_800CAF84);
extern void func_80147364(s32 a, s32 b);
void func_800CAF84(void) {
func_80147364(0x4, 0x83F);
}
INCLUDE_ASM("asm/md_MAIN_030/nonmatchings/md_MAIN_030", func_800CAFA8);
src/md_MAIN_031/md_MAIN_031.c
+5 -1
View File
@@ -62,6 +62,10 @@ INCLUDE_ASM("asm/md_MAIN_031/nonmatchings/md_MAIN_031", func_800CBC14);
INCLUDE_ASM("asm/md_MAIN_031/nonmatchings/md_MAIN_031", func_800CBCD4);
INCLUDE_ASM("asm/md_MAIN_031/nonmatchings/md_MAIN_031", func_800CBEB8);
extern void func_80162CCC(void);
void func_800CBEB8(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_031/nonmatchings/md_MAIN_031", func_800CBED8);
src/md_MAIN_032/md_MAIN_032.c
+12 -2
View File
@@ -1,6 +1,12 @@
#include "common.h"
INCLUDE_ASM("asm/md_MAIN_032/nonmatchings/md_MAIN_032", func_800CAE0C);
extern s32 func_800183E0(s32 *a0);
void func_800CAE0C(void) {
extern s32 D_800CB2D4;
func_800183E0(&D_800CB2D4);
}
@@ -48,4 +54,8 @@ INCLUDE_ASM("asm/md_MAIN_032/nonmatchings/md_MAIN_032", func_800CB0B0);
INCLUDE_ASM("asm/md_MAIN_032/nonmatchings/md_MAIN_032", func_800CB188);
INCLUDE_ASM("asm/md_MAIN_032/nonmatchings/md_MAIN_032", func_800CB24C);
extern void func_80162CCC(void);
void func_800CB24C(void) {
func_80162CCC();
}
src/md_MAIN_033/md_MAIN_033.c
+5 -1
View File
@@ -36,7 +36,11 @@ INCLUDE_ASM("asm/md_MAIN_033/nonmatchings/md_MAIN_033", func_800CB190);
INCLUDE_ASM("asm/md_MAIN_033/nonmatchings/md_MAIN_033", func_800CB2C8);
INCLUDE_ASM("asm/md_MAIN_033/nonmatchings/md_MAIN_033", func_800CB384);
extern void func_80162CCC(void);
void func_800CB384(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_033/nonmatchings/md_MAIN_033", func_800CB3A4);
src/md_MAIN_034/md_MAIN_034.c
+19 -3
View File
@@ -24,7 +24,13 @@ INCLUDE_ASM("asm/md_MAIN_034/nonmatchings/md_MAIN_034", func_800CC0A0);
INCLUDE_ASM("asm/md_MAIN_034/nonmatchings/md_MAIN_034", func_800CC110);
INCLUDE_ASM("asm/md_MAIN_034/nonmatchings/md_MAIN_034", func_800CC144);
extern s32 func_800183E0(s32 *a0);
void func_800CC144(void) {
extern s32 D_800CCA7C;
func_800183E0(&D_800CCA7C);
}
@@ -45,7 +51,13 @@ void func_800CC1B0(void *a0) {
INCLUDE_ASM("asm/md_MAIN_034/nonmatchings/md_MAIN_034", func_800CC1E8);
INCLUDE_ASM("asm/md_MAIN_034/nonmatchings/md_MAIN_034", func_800CC260);
extern void func_801599A4(void);
extern void func_80159B3C(void);
void func_800CC260(s32 a0) {
func_801599A4();
((void (*)(s32))func_80159B3C)(a0);
}
void func_800CC290(void) {
}
@@ -62,7 +74,11 @@ INCLUDE_ASM("asm/md_MAIN_034/nonmatchings/md_MAIN_034", func_800CC5E4);
INCLUDE_ASM("asm/md_MAIN_034/nonmatchings/md_MAIN_034", func_800CC658);
INCLUDE_ASM("asm/md_MAIN_034/nonmatchings/md_MAIN_034", func_800CC6A4);
extern void func_80162CCC(void);
void func_800CC6A4(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_034/nonmatchings/md_MAIN_034", func_800CC6C4);
src/md_MAIN_035/md_MAIN_035.c
+23 -3
View File
@@ -1,6 +1,12 @@
#include "common.h"
INCLUDE_ASM("asm/md_MAIN_035/nonmatchings/md_MAIN_035", func_800CAE0C);
extern s32 func_800183E0(s32 *a0);
void func_800CAE0C(void) {
extern s32 D_800CB2C8;
func_800183E0(&D_800CB2C8);
}
@@ -59,7 +65,15 @@ void func_800CAF48(void *a0) {
}
INCLUDE_ASM("asm/md_MAIN_035/nonmatchings/md_MAIN_035", func_800CAF84);
extern s32 func_80161104(s32 a0);
extern void func_800CAFBC(void*);
void func_800CAF84(int param_1)
{
if (((int (*)(void))func_80161104)() != 0) {
((void (*)(int))func_800CAFBC)(param_1);
}
}
INCLUDE_ASM("asm/md_MAIN_035/nonmatchings/md_MAIN_035", func_800CAFBC);
@@ -67,7 +81,13 @@ INCLUDE_ASM("asm/md_MAIN_035/nonmatchings/md_MAIN_035", func_800CAFEC);
INCLUDE_ASM("asm/md_MAIN_035/nonmatchings/md_MAIN_035", func_800CB080);
INCLUDE_ASM("asm/md_MAIN_035/nonmatchings/md_MAIN_035", func_800CB108);
extern void func_80154A74(s32 *a0, s16 a1);
extern void func_800CB1F8(void *a0);
void func_800CB108(s32 *a0) {
func_80154A74(a0, 17);
func_800CB1F8(a0);
}
// @class: other
src/md_MAIN_036/md_MAIN_036.c
+14 -2
View File
@@ -55,7 +55,15 @@ INCLUDE_ASM("asm/md_MAIN_036/nonmatchings/md_MAIN_036", func_800CB218);
INCLUDE_ASM("asm/md_MAIN_036/nonmatchings/md_MAIN_036", func_800CB3B4);
INCLUDE_ASM("asm/md_MAIN_036/nonmatchings/md_MAIN_036", func_800CB570);
extern s32 func_80146E98(s32 a0);
extern s32 func_80146CA0(void *a0);
void func_800CB570(int param_1)
{
if (((int (*)(void))func_80146E98)() != 0) {
((void (*)(int))func_80146CA0)(param_1);
}
}
INCLUDE_ASM("asm/md_MAIN_036/nonmatchings/md_MAIN_036", func_800CB5A8);
@@ -79,7 +87,11 @@ INCLUDE_ASM("asm/md_MAIN_036/nonmatchings/md_MAIN_036", func_800CB634);
INCLUDE_ASM("asm/md_MAIN_036/nonmatchings/md_MAIN_036", func_800CB708);
INCLUDE_ASM("asm/md_MAIN_036/nonmatchings/md_MAIN_036", func_800CB774);
extern void func_80162CCC(void);
void func_800CB774(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_036/nonmatchings/md_MAIN_036", func_800CB794);
src/md_MAIN_037/md_MAIN_037.c
+5 -1
View File
@@ -40,7 +40,11 @@ INCLUDE_ASM("asm/md_MAIN_037/nonmatchings/md_MAIN_037", func_800CB2A8);
INCLUDE_ASM("asm/md_MAIN_037/nonmatchings/md_MAIN_037", func_800CB30C);
INCLUDE_ASM("asm/md_MAIN_037/nonmatchings/md_MAIN_037", func_800CB358);
extern void func_80162CCC(void);
void func_800CB358(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_037/nonmatchings/md_MAIN_037", func_800CB378);
src/md_MAIN_038/md_MAIN_038.c
+5 -1
View File
@@ -58,7 +58,11 @@ INCLUDE_ASM("asm/md_MAIN_038/nonmatchings/md_MAIN_038", func_800CB270);
INCLUDE_ASM("asm/md_MAIN_038/nonmatchings/md_MAIN_038", func_800CB360);
INCLUDE_ASM("asm/md_MAIN_038/nonmatchings/md_MAIN_038", func_800CB4F8);
extern void func_80162CCC(void);
void func_800CB4F8(void) {
func_80162CCC();
}
extern void func_80146C3C(void);
src/md_MAIN_039/md_MAIN_039.c
+5 -1
View File
@@ -36,7 +36,11 @@ INCLUDE_ASM("asm/md_MAIN_039/nonmatchings/md_MAIN_039", func_800CB228);
INCLUDE_ASM("asm/md_MAIN_039/nonmatchings/md_MAIN_039", func_800CB424);
INCLUDE_ASM("asm/md_MAIN_039/nonmatchings/md_MAIN_039", func_800CB4AC);
extern void func_80162CCC(void);
void func_800CB4AC(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_039/nonmatchings/md_MAIN_039", func_800CB4CC);
src/md_MAIN_040/md_MAIN_040.c
+5 -1
View File
@@ -36,7 +36,11 @@ INCLUDE_ASM("asm/md_MAIN_040/nonmatchings/md_MAIN_040", func_800CB114);
INCLUDE_ASM("asm/md_MAIN_040/nonmatchings/md_MAIN_040", func_800CB304);
INCLUDE_ASM("asm/md_MAIN_040/nonmatchings/md_MAIN_040", func_800CB3BC);
extern void func_80162CCC(void);
void func_800CB3BC(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_040/nonmatchings/md_MAIN_040", func_800CB3DC);
src/md_MAIN_041/md_MAIN_041.c
+12 -2
View File
@@ -1,6 +1,12 @@
#include "common.h"
INCLUDE_ASM("asm/md_MAIN_041/nonmatchings/md_MAIN_041", func_800CAE0C);
extern s32 func_800183E0(s32 *a0);
void func_800CAE0C(void) {
extern s32 D_800CB85C;
func_800183E0(&D_800CB85C);
}
@@ -36,7 +42,11 @@ INCLUDE_ASM("asm/md_MAIN_041/nonmatchings/md_MAIN_041", func_800CB118);
INCLUDE_ASM("asm/md_MAIN_041/nonmatchings/md_MAIN_041", func_800CB2B4);
INCLUDE_ASM("asm/md_MAIN_041/nonmatchings/md_MAIN_041", func_800CB338);
extern void func_80162CCC(void);
void func_800CB338(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_041/nonmatchings/md_MAIN_041", func_800CB358);
src/md_MAIN_043/md_MAIN_043.c
+10 -2
View File
@@ -31,7 +31,11 @@ INCLUDE_ASM("asm/md_MAIN_043/nonmatchings/md_MAIN_043", func_800CCF50);
INCLUDE_ASM("asm/md_MAIN_043/nonmatchings/md_MAIN_043", func_800CD054);
INCLUDE_ASM("asm/md_MAIN_043/nonmatchings/md_MAIN_043", func_800CD1D4);
extern void func_80162CCC(void);
void func_800CD1D4(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_043/nonmatchings/md_MAIN_043", func_800CD1F4);
@@ -54,7 +58,11 @@ INCLUDE_ASM("asm/md_MAIN_043/nonmatchings/md_MAIN_043", func_800CD404);
INCLUDE_ASM("asm/md_MAIN_043/nonmatchings/md_MAIN_043", func_800CD57C);
INCLUDE_ASM("asm/md_MAIN_043/nonmatchings/md_MAIN_043", func_800CD650);
extern void func_80162CCC(void);
void func_800CD650(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_043/nonmatchings/md_MAIN_043", func_800CD670);
src/md_MAIN_044/md_MAIN_044.c
+27 -4
View File
@@ -15,7 +15,11 @@ INCLUDE_ASM("asm/md_MAIN_044/nonmatchings/md_MAIN_044", func_800CCD2C);
INCLUDE_ASM("asm/md_MAIN_044/nonmatchings/md_MAIN_044", func_800CCDB0);
INCLUDE_ASM("asm/md_MAIN_044/nonmatchings/md_MAIN_044", func_800CCE68);
extern void func_80162CCC(void);
void func_800CCE68(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_044/nonmatchings/md_MAIN_044", func_800CCE88);
@@ -27,11 +31,22 @@ INCLUDE_ASM("asm/md_MAIN_044/nonmatchings/md_MAIN_044", func_800CCF68);
INCLUDE_ASM("asm/md_MAIN_044/nonmatchings/md_MAIN_044", func_800CCFC8);
INCLUDE_ASM("asm/md_MAIN_044/nonmatchings/md_MAIN_044", func_800CD030);
extern s32 func_80146CA0(void *a0);
void func_800CD030(s32 *a0) {
*(s16 *)((s32)a0 + 0x60) = 0;
((void (*)(void))func_80146CA0)();
}
INCLUDE_ASM("asm/md_MAIN_044/nonmatchings/md_MAIN_044", func_800CD050);
INCLUDE_ASM("asm/md_MAIN_044/nonmatchings/md_MAIN_044", func_800CD178);
extern void func_80162CCC(void);
void func_800CD178(void) {
func_80162CCC();
}
@@ -79,7 +94,15 @@ void func_800CD948(void *a0) {
INCLUDE_ASM("asm/md_MAIN_044/nonmatchings/md_MAIN_044", func_800CD984);
INCLUDE_ASM("asm/md_MAIN_044/nonmatchings/md_MAIN_044", func_800CDA0C);
extern s32 func_80146E98(s32 a0);
extern s32 func_80146C3C(void *a0);
void func_800CDA0C(int param_1)
{
if (((int (*)(void))func_80146E98)() != 0) {
((void (*)(int))func_80146C3C)(param_1);
}
}
src/md_MAIN_045/md_MAIN_045.c
+15 -3
View File
@@ -13,7 +13,11 @@ INCLUDE_ASM("asm/md_MAIN_045/nonmatchings/md_MAIN_045", func_800CCD2C);
INCLUDE_ASM("asm/md_MAIN_045/nonmatchings/md_MAIN_045", func_800CCDD8);
INCLUDE_ASM("asm/md_MAIN_045/nonmatchings/md_MAIN_045", func_800CCE60);
extern void func_80162CCC(void);
void func_800CCE60(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_045/nonmatchings/md_MAIN_045", func_800CCE80);
@@ -21,7 +25,11 @@ INCLUDE_ASM("asm/md_MAIN_045/nonmatchings/md_MAIN_045", func_800CCF28);
INCLUDE_ASM("asm/md_MAIN_045/nonmatchings/md_MAIN_045", func_800CCF58);
INCLUDE_ASM("asm/md_MAIN_045/nonmatchings/md_MAIN_045", func_800CCF84);
extern void func_80147364(s32 a, s32 b);
void func_800CCF84(void) {
func_80147364(0x4, 0x8E0);
}
INCLUDE_ASM("asm/md_MAIN_045/nonmatchings/md_MAIN_045", func_800CCFA8);
@@ -39,7 +47,11 @@ INCLUDE_ASM("asm/md_MAIN_045/nonmatchings/md_MAIN_045", func_800CD390);
INCLUDE_ASM("asm/md_MAIN_045/nonmatchings/md_MAIN_045", func_800CD4BC);
INCLUDE_ASM("asm/md_MAIN_045/nonmatchings/md_MAIN_045", func_800CD5BC);
extern void func_80162CCC(void);
void func_800CD5BC(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_045/nonmatchings/md_MAIN_045", func_800CD5DC);
src/md_MAIN_046/md_MAIN_046.c
+15 -3
View File
@@ -72,7 +72,11 @@ INCLUDE_ASM("asm/md_MAIN_046/nonmatchings/md_MAIN_046", func_800CD7D8);
INCLUDE_ASM("asm/md_MAIN_046/nonmatchings/md_MAIN_046", func_800CD884);
INCLUDE_ASM("asm/md_MAIN_046/nonmatchings/md_MAIN_046", func_800CD94C);
extern void func_80162CCC(void);
void func_800CD94C(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_046/nonmatchings/md_MAIN_046", func_800CD96C);
@@ -92,7 +96,11 @@ void func_800CDBA4(s32 a0) {
}
INCLUDE_ASM("asm/md_MAIN_046/nonmatchings/md_MAIN_046", func_800CDBD4);
extern void func_80162CCC(void);
void func_800CDBD4(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_046/nonmatchings/md_MAIN_046", func_800CDBF4);
@@ -104,7 +112,11 @@ INCLUDE_ASM("asm/md_MAIN_046/nonmatchings/md_MAIN_046", func_800CDD9C);
INCLUDE_ASM("asm/md_MAIN_046/nonmatchings/md_MAIN_046", func_800CDEB4);
INCLUDE_ASM("asm/md_MAIN_046/nonmatchings/md_MAIN_046", func_800CDF64);
extern void func_80162CCC(void);
void func_800CDF64(void) {
func_80162CCC();
}
INCLUDE_ASM("asm/md_MAIN_046/nonmatchings/md_MAIN_046", func_800CDF84);
src/md_SC02_009/md_SC02_009.c
+11 -1
View File
@@ -93,7 +93,17 @@ INCLUDE_ASM("asm/md_SC02_009/nonmatchings/md_SC02_009", func_801E59A4);
INCLUDE_ASM("asm/md_SC02_009/nonmatchings/md_SC02_009", func_801E5A58);
INCLUDE_ASM("asm/md_SC02_009/nonmatchings/md_SC02_009", func_801E5B0C);
extern void func_8012C218(void);
void func_801E5B0C(void) {
extern s32 D_801270C8;
if (D_801270C8 == 13) {
func_8012C218();
}
}
INCLUDE_ASM("asm/md_SC02_009/nonmatchings/md_SC02_009", func_801E5B3C);
src/md_SC03_073/md_SC03_073.c
+17 -3
View File
@@ -24,7 +24,11 @@ s32 func_801EF4F8(s32 param_1) {
INCLUDE_ASM("asm/md_SC03_073/nonmatchings/md_SC03_073", func_801EF544);
INCLUDE_ASM("asm/md_SC03_073/nonmatchings/md_SC03_073", func_801EF5D4);
extern void func_800D1EBC(void);
void func_801EF5D4(void) {
func_800D1EBC();
}
@@ -53,7 +57,13 @@ void func_801EF66C(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_073/nonmatchings/md_SC03_073", func_801EF6A8);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801EF6A8(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC03_073/nonmatchings/md_SC03_073", D_801EF468);
@@ -88,7 +98,11 @@ void func_801EF798(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_073/nonmatchings/md_SC03_073", func_801EF7D4);
extern void func_80171A1C(void*);
void func_801EF7D4(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC03_073/nonmatchings/md_SC03_073", func_801EF7F4);
src/md_SC03_074/md_SC03_074.c
+17 -3
View File
@@ -24,7 +24,11 @@ s32 func_801EF4F8(s32 param_1) {
INCLUDE_ASM("asm/md_SC03_074/nonmatchings/md_SC03_074", func_801EF544);
INCLUDE_ASM("asm/md_SC03_074/nonmatchings/md_SC03_074", func_801EF5D4);
extern void func_800D1EBC(void);
void func_801EF5D4(void) {
func_800D1EBC();
}
@@ -53,7 +57,13 @@ void func_801EF66C(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_074/nonmatchings/md_SC03_074", func_801EF6A8);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801EF6A8(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC03_074/nonmatchings/md_SC03_074", D_801EF468);
@@ -88,7 +98,11 @@ void func_801EF798(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_074/nonmatchings/md_SC03_074", func_801EF7D4);
extern void func_80171A1C(void*);
void func_801EF7D4(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC03_074/nonmatchings/md_SC03_074", func_801EF7F4);
src/md_SC03_075/md_SC03_075.c
+46 -4
View File
@@ -24,7 +24,11 @@ s32 func_801EF4F8(s32 param_1) {
INCLUDE_ASM("asm/md_SC03_075/nonmatchings/md_SC03_075", func_801EF544);
INCLUDE_ASM("asm/md_SC03_075/nonmatchings/md_SC03_075", func_801EF5D4);
extern void func_800D1EBC(void);
void func_801EF5D4(void) {
func_800D1EBC();
}
@@ -53,7 +57,13 @@ void func_801EF66C(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_075/nonmatchings/md_SC03_075", func_801EF6A8);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801EF6A8(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC03_075/nonmatchings/md_SC03_075", D_801EF468);
@@ -88,7 +98,11 @@ void func_801EF798(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_075/nonmatchings/md_SC03_075", func_801EF7D4);
extern void func_80171A1C(void*);
void func_801EF7D4(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC03_075/nonmatchings/md_SC03_075", func_801EF7F4);
@@ -247,7 +261,35 @@ extern s32 func_80029178(s32 arg);
}
INCLUDE_ASM("asm/md_SC03_075/nonmatchings/md_SC03_075", func_801EFCD0);
extern s32 func_80029504(void);
extern s32 func_801877C0(s32);
extern s32 func_80187890(void);
extern s32 func_80187904(void);
extern void func_80187960(void);
void func_801EFCD0(s32 a0) {
extern s32 D_801F0594[];
extern s32 D_801F05A8[];
extern s32 D_801F05C4[];
s32 v1 = func_80029504();
if (v1 < 0xC8) {
s32 v0 = ((s32 (*)(void))func_801877C0)();
*(s32 *)(a0 + 0xE4) = D_801F0594[v0];
} else if (v1 < 0x384) {
s32 v0 = func_80187890();
*(s32 *)(a0 + 0xE4) = D_801F05A8[v0];
} else {
s32 v0 = func_80187904();
*(s32 *)(a0 + 0xE4) = D_801F05C4[v0];
func_80187960();
}
}
INCLUDE_ASM("asm/md_SC03_075/nonmatchings/md_SC03_075", func_801EFD70);
src/md_SC03_076/md_SC03_076.c
+56 -5
View File
@@ -156,7 +156,13 @@ INCLUDE_ASM("asm/md_SC03_076/nonmatchings/md_SC03_076", func_801F1710);
INCLUDE_ASM("asm/md_SC03_076/nonmatchings/md_SC03_076", func_801F1738);
INCLUDE_ASM("asm/md_SC03_076/nonmatchings/md_SC03_076", func_801F1A24);
extern void func_8014B00C(void);
extern void func_80029344(void);
void func_801F1A24(void) {
func_8014B00C();
func_80029344();
}
INCLUDE_ASM("asm/md_SC03_076/nonmatchings/md_SC03_076", func_801F1A4C);
@@ -172,7 +178,11 @@ INCLUDE_ASM("asm/md_SC03_076/nonmatchings/md_SC03_076", func_801F1AC8);
INCLUDE_ASM("asm/md_SC03_076/nonmatchings/md_SC03_076", func_801F1B1C);
INCLUDE_ASM("asm/md_SC03_076/nonmatchings/md_SC03_076", func_801F1BAC);
extern void func_800D1EBC(void);
void func_801F1BAC(void) {
func_800D1EBC();
}
@@ -194,7 +204,13 @@ void func_801F1C74(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_076/nonmatchings/md_SC03_076", func_801F1CB0);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801F1CB0(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_ASM("asm/md_SC03_076/nonmatchings/md_SC03_076", func_801F1CD8);
@@ -227,7 +243,11 @@ void func_801F1DA0(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_076/nonmatchings/md_SC03_076", func_801F1DDC);
extern void func_80171A1C(void*);
void func_801F1DDC(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC03_076/nonmatchings/md_SC03_076", func_801F1DFC);
@@ -380,7 +400,38 @@ INCLUDE_ASM("asm/md_SC03_076/nonmatchings/md_SC03_076", func_801F2458);
INCLUDE_ASM("asm/md_SC03_076/nonmatchings/md_SC03_076", func_801F24DC);
INCLUDE_ASM("asm/md_SC03_076/nonmatchings/md_SC03_076", func_801F25F8);
extern void func_8012C1B8(void);
extern void func_8012CAE4(void *a0);
extern void func_8001C214(s32 a0, s32 a1);
extern void func_8012A828(s32 a0, s32 a1);
extern void func_8012E8E0(s32 a0, s32 a1);
extern s32 func_80178B18(s32 a0, s32 a1);
void func_801F25F8(void *a0) {
extern s32 D_801F968C;
extern s32 D_801C3790;
extern s32 D_801F3534;
extern s32 D_801F3564;
s32 v0;
s32 ptr;
v0 = ((s32 (*)(void))func_8012C1B8)();
*(s32 *)((s32)a0 + 0x20) = v0;
if (v0 == 0) {
func_8012CAE4(a0);
} else {
func_8001C214(v0, (s32)&D_801F968C);
ptr = *(s32 *)((s32)a0 + 0x68);
*(s16 *)(ptr + 0xC) = 0x7FFF;
*(s16 *)((s32)a0 + 0x2) = 1;
func_8012A828((s32)a0, (s32)&D_801C3790);
func_8012E8E0((s32)a0, (s32)&D_801F3534);
*(s16 *)((s32)a0 + 0x34) = 0;
func_80178B18((s32)a0, (s32)&D_801F3564);
}
}
INCLUDE_ASM("asm/md_SC03_076/nonmatchings/md_SC03_076", func_801F2690);
src/md_SC03_077/md_SC03_077.c
+27 -5
View File
@@ -24,7 +24,11 @@ s32 func_801EF50C(s32 param_1) {
INCLUDE_ASM("asm/md_SC03_077/nonmatchings/md_SC03_077", func_801EF558);
INCLUDE_ASM("asm/md_SC03_077/nonmatchings/md_SC03_077", func_801EF608);
extern void func_800D1EBC(void);
void func_801EF608(void) {
func_800D1EBC();
}
@@ -53,7 +57,13 @@ void func_801EF6A0(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_077/nonmatchings/md_SC03_077", func_801EF6DC);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801EF6DC(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC03_077/nonmatchings/md_SC03_077", D_801EF468);
@@ -88,7 +98,11 @@ void func_801EF7CC(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_077/nonmatchings/md_SC03_077", func_801EF808);
extern void func_80171A1C(void*);
void func_801EF808(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC03_077/nonmatchings/md_SC03_077", func_801EF828);
@@ -157,9 +171,17 @@ extern s32 func_80029178(s32 arg);
INCLUDE_ASM("asm/md_SC03_077/nonmatchings/md_SC03_077", func_801EFD60);
INCLUDE_ASM("asm/md_SC03_077/nonmatchings/md_SC03_077", func_801EFE3C);
extern void func_80029514(int);
void func_801EFE3C(void) {
func_80029514(0x181);
}
extern void func_8018D0E4(void);
void func_801EFE5C(void) {
func_8018D0E4();
}
INCLUDE_ASM("asm/md_SC03_077/nonmatchings/md_SC03_077", func_801EFE5C);
INCLUDE_ASM("asm/md_SC03_077/nonmatchings/md_SC03_077", func_801EFE7C);
src/md_SC03_078/md_SC03_078.c
+25 -4
View File
@@ -24,7 +24,11 @@ s32 func_801EF4F8(s32 param_1) {
INCLUDE_ASM("asm/md_SC03_078/nonmatchings/md_SC03_078", func_801EF544);
INCLUDE_ASM("asm/md_SC03_078/nonmatchings/md_SC03_078", func_801EF5D4);
extern void func_800D1EBC(void);
void func_801EF5D4(void) {
func_800D1EBC();
}
@@ -53,7 +57,13 @@ void func_801EF66C(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_078/nonmatchings/md_SC03_078", func_801EF6A8);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801EF6A8(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC03_078/nonmatchings/md_SC03_078", D_801EF468);
@@ -88,7 +98,11 @@ void func_801EF798(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_078/nonmatchings/md_SC03_078", func_801EF7D4);
extern void func_80171A1C(void*);
void func_801EF7D4(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC03_078/nonmatchings/md_SC03_078", func_801EF7F4);
@@ -213,7 +227,14 @@ void func_801EFB84(void *a0) {
INCLUDE_ASM("asm/md_SC03_078/nonmatchings/md_SC03_078", func_801EFBC0);
INCLUDE_ASM("asm/md_SC03_078/nonmatchings/md_SC03_078", func_801EFC60);
extern s32 func_8014CB1C(void);
s32 func_801EFC60(void) {
return (u32)func_8014CB1C() != 0;
}
src/md_SC03_079/md_SC03_079.c
+78 -5
View File
@@ -24,7 +24,11 @@ s32 func_801EF508(s32 param_1) {
INCLUDE_ASM("asm/md_SC03_079/nonmatchings/md_SC03_079", func_801EF554);
INCLUDE_ASM("asm/md_SC03_079/nonmatchings/md_SC03_079", func_801EF5E4);
extern void func_800D1EBC(void);
void func_801EF5E4(void) {
func_800D1EBC();
}
@@ -53,7 +57,13 @@ void func_801EF67C(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_079/nonmatchings/md_SC03_079", func_801EF6B8);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801EF6B8(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC03_079/nonmatchings/md_SC03_079", D_801EF468);
@@ -88,7 +98,11 @@ void func_801EF7A8(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_079/nonmatchings/md_SC03_079", func_801EF7E4);
extern void func_80171A1C(void*);
void func_801EF7E4(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC03_079/nonmatchings/md_SC03_079", func_801EF804);
@@ -247,9 +261,68 @@ extern s32 func_80029178(s32 arg);
}
INCLUDE_ASM("asm/md_SC03_079/nonmatchings/md_SC03_079", func_801EFD9C);
INCLUDE_ASM("asm/md_SC03_079/nonmatchings/md_SC03_079", func_801EFE3C);
extern s32 func_80029504(void);
extern s32 func_801877C0(s32);
extern s32 func_80187890(void);
extern s32 func_80187904(void);
extern void func_80187960(void);
void func_801EFD9C(s32 a0) {
extern s32 D_801F0068[];
extern s32 D_801F007C[];
extern s32 D_801F0098[];
s32 v1 = func_80029504();
if (v1 < 0xC8) {
s32 v0 = ((s32 (*)(void))func_801877C0)();
*(s32 *)(a0 + 0xE4) = D_801F0068[v0];
} else if (v1 < 0x384) {
s32 v0 = func_80187890();
*(s32 *)(a0 + 0xE4) = D_801F007C[v0];
} else {
s32 v0 = func_80187904();
*(s32 *)(a0 + 0xE4) = D_801F0098[v0];
func_80187960();
}
}
extern void func_8012C1B8(void);
extern void func_8012CAE4(void *a0);
extern void func_8001C214(s32 a0, s32 a1);
extern void func_8012A828(s32 a0, s32 a1);
extern void func_8012E8E0(s32 a0, s32 a1);
extern s32 func_80178B18(s32 a0, s32 a1);
void func_801EFE3C(void *a0) {
extern s32 D_801F800C;
extern s32 D_801F8DB8;
extern s32 D_801EFFB8;
extern s32 D_801EFFE8;
s32 v0;
s32 ptr;
v0 = ((s32 (*)(void))func_8012C1B8)();
*(s32 *)((s32)a0 + 0x20) = v0;
if (v0 == 0) {
func_8012CAE4(a0);
} else {
func_8001C214(v0, (s32)&D_801F800C);
ptr = *(s32 *)((s32)a0 + 0x68);
*(s16 *)(ptr + 0xC) = 0x7FFF;
*(s16 *)((s32)a0 + 0x2) = 1;
func_8012A828((s32)a0, (s32)&D_801F8DB8);
func_8012E8E0((s32)a0, (s32)&D_801EFFB8);
*(s16 *)((s32)a0 + 0x34) = 0;
func_80178B18((s32)a0, (s32)&D_801EFFE8);
}
}
u8 func_801EFED4(u32 a0) {
src/md_SC03_132/md_SC03_132.c
+78 -5
View File
@@ -46,7 +46,11 @@ s32 func_801E26BC(s32 param_1) {
}
INCLUDE_ASM("asm/md_SC03_132/nonmatchings/md_SC03_132", func_801E275C);
extern void func_800D1EBC(void);
void func_801E275C(void) {
func_800D1EBC();
}
@@ -75,7 +79,13 @@ void func_801E27F4(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_132/nonmatchings/md_SC03_132", func_801E2830);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801E2830(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_ASM("asm/md_SC03_132/nonmatchings/md_SC03_132", func_801E2858);
@@ -108,7 +118,11 @@ void func_801E2920(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_132/nonmatchings/md_SC03_132", func_801E295C);
extern void func_80171A1C(void*);
void func_801E295C(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC03_132/nonmatchings/md_SC03_132", func_801E297C);
@@ -257,11 +271,70 @@ s32 func_801E2D74(void) {
}
INCLUDE_ASM("asm/md_SC03_132/nonmatchings/md_SC03_132", func_801E2D84);
extern s32 func_80029504(void);
extern s32 func_80184428(s32);
extern s32 func_801844F8(void);
extern s32 func_8018456C(void);
extern void func_801845C8(void);
void func_801E2D84(s32 a0) {
extern s32 D_801E3114[];
extern s32 D_801E3128[];
extern s32 D_801E3144[];
s32 v1 = func_80029504();
if (v1 < 0xC8) {
s32 v0 = ((s32 (*)(void))func_80184428)();
*(s32 *)(a0 + 0xE4) = D_801E3114[v0];
} else if (v1 < 0x384) {
s32 v0 = func_801844F8();
*(s32 *)(a0 + 0xE4) = D_801E3128[v0];
} else {
s32 v0 = func_8018456C();
*(s32 *)(a0 + 0xE4) = D_801E3144[v0];
func_801845C8();
}
}
INCLUDE_ASM("asm/md_SC03_132/nonmatchings/md_SC03_132", func_801E2E24);
INCLUDE_ASM("asm/md_SC03_132/nonmatchings/md_SC03_132", func_801E2F58);
extern void func_8012C1B8(void);
extern void func_8012CAE4(void *a0);
extern void func_8001C214(s32 a0, s32 a1);
extern void func_8012A828(s32 a0, s32 a1);
extern void func_8012E8E0(s32 a0, s32 a1);
extern s32 func_80178B18(s32 a0, s32 a1);
void func_801E2F58(void *a0) {
extern s32 D_801E9750;
extern s32 D_801BEAF8;
extern s32 D_801E30A4;
extern s32 D_801E30AC;
s32 v0;
s32 ptr;
v0 = ((s32 (*)(void))func_8012C1B8)();
*(s32 *)((s32)a0 + 0x20) = v0;
if (v0 == 0) {
func_8012CAE4(a0);
} else {
func_8001C214(v0, (s32)&D_801E9750);
ptr = *(s32 *)((s32)a0 + 0x68);
*(s16 *)(ptr + 0xC) = 0x7FFF;
*(s16 *)((s32)a0 + 0x2) = 1;
func_8012A828((s32)a0, (s32)&D_801BEAF8);
func_8012E8E0((s32)a0, (s32)&D_801E30A4);
*(s16 *)((s32)a0 + 0x34) = 0;
func_80178B18((s32)a0, (s32)&D_801E30AC);
}
}
INCLUDE_RODATA("asm/md_SC03_132/nonmatchings/md_SC03_132", D_801E25E8);
src/md_SC03_133/md_SC03_133.c
+17 -3
View File
@@ -46,7 +46,11 @@ s32 func_801E26C4(s32 param_1) {
}
INCLUDE_ASM("asm/md_SC03_133/nonmatchings/md_SC03_133", func_801E2764);
extern void func_800D1EBC(void);
void func_801E2764(void) {
func_800D1EBC();
}
@@ -75,7 +79,13 @@ void func_801E27FC(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_133/nonmatchings/md_SC03_133", func_801E2838);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801E2838(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC03_133/nonmatchings/md_SC03_133", D_801E25E8);
@@ -110,7 +120,11 @@ void func_801E2928(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_133/nonmatchings/md_SC03_133", func_801E2964);
extern void func_80171A1C(void*);
void func_801E2964(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC03_133/nonmatchings/md_SC03_133", func_801E2984);
src/md_SC03_134/md_SC03_134.c
+46 -4
View File
@@ -46,7 +46,11 @@ s32 func_801E26C4(s32 param_1) {
}
INCLUDE_ASM("asm/md_SC03_134/nonmatchings/md_SC03_134", func_801E2764);
extern void func_800D1EBC(void);
void func_801E2764(void) {
func_800D1EBC();
}
@@ -75,7 +79,13 @@ void func_801E27FC(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_134/nonmatchings/md_SC03_134", func_801E2838);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801E2838(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC03_134/nonmatchings/md_SC03_134", D_801E25E8);
@@ -110,7 +120,11 @@ void func_801E2928(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_134/nonmatchings/md_SC03_134", func_801E2964);
extern void func_80171A1C(void*);
void func_801E2964(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC03_134/nonmatchings/md_SC03_134", func_801E2984);
@@ -275,7 +289,35 @@ extern s32 func_80029178(s32 arg);
}
INCLUDE_ASM("asm/md_SC03_134/nonmatchings/md_SC03_134", func_801E2E68);
extern s32 func_80029504(void);
extern s32 func_80184428(s32);
extern s32 func_801844F8(void);
extern s32 func_8018456C(void);
extern void func_801845C8(void);
void func_801E2E68(s32 a0) {
extern s32 D_801E3724[];
extern s32 D_801E3738[];
extern s32 D_801E3754[];
s32 v1 = func_80029504();
if (v1 < 0xC8) {
s32 v0 = ((s32 (*)(void))func_80184428)();
*(s32 *)(a0 + 0xE4) = D_801E3724[v0];
} else if (v1 < 0x384) {
s32 v0 = func_801844F8();
*(s32 *)(a0 + 0xE4) = D_801E3738[v0];
} else {
s32 v0 = func_8018456C();
*(s32 *)(a0 + 0xE4) = D_801E3754[v0];
func_801845C8();
}
}
INCLUDE_ASM("asm/md_SC03_134/nonmatchings/md_SC03_134", func_801E2F08);
src/md_SC03_135/md_SC03_135.c
+56 -5
View File
@@ -156,7 +156,13 @@ INCLUDE_ASM("asm/md_SC03_135/nonmatchings/md_SC03_135", func_801E4890);
INCLUDE_ASM("asm/md_SC03_135/nonmatchings/md_SC03_135", func_801E48B8);
INCLUDE_ASM("asm/md_SC03_135/nonmatchings/md_SC03_135", func_801E4BA4);
extern void func_8014B00C(void);
extern void func_80029344(void);
void func_801E4BA4(void) {
func_8014B00C();
func_80029344();
}
INCLUDE_ASM("asm/md_SC03_135/nonmatchings/md_SC03_135", func_801E4BCC);
@@ -194,7 +200,11 @@ s32 func_801E4C9C(s32 param_1) {
}
INCLUDE_ASM("asm/md_SC03_135/nonmatchings/md_SC03_135", func_801E4D3C);
extern void func_800D1EBC(void);
void func_801E4D3C(void) {
func_800D1EBC();
}
@@ -216,7 +226,13 @@ void func_801E4E04(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_135/nonmatchings/md_SC03_135", func_801E4E40);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801E4E40(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_ASM("asm/md_SC03_135/nonmatchings/md_SC03_135", func_801E4E68);
@@ -249,7 +265,11 @@ void func_801E4F30(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_135/nonmatchings/md_SC03_135", func_801E4F6C);
extern void func_80171A1C(void*);
void func_801E4F6C(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC03_135/nonmatchings/md_SC03_135", func_801E4F8C);
@@ -419,7 +439,38 @@ INCLUDE_ASM("asm/md_SC03_135/nonmatchings/md_SC03_135", func_801E5624);
INCLUDE_ASM("asm/md_SC03_135/nonmatchings/md_SC03_135", func_801E56A8);
INCLUDE_ASM("asm/md_SC03_135/nonmatchings/md_SC03_135", func_801E57C4);
extern void func_8012C1B8(void);
extern void func_8012CAE4(void *a0);
extern void func_8001C214(s32 a0, s32 a1);
extern void func_8012A828(s32 a0, s32 a1);
extern void func_8012E8E0(s32 a0, s32 a1);
extern s32 func_80178B18(s32 a0, s32 a1);
void func_801E57C4(void *a0) {
extern s32 D_801CEA24;
extern s32 D_801BEAF8;
extern s32 D_801E669C;
extern s32 D_801E66CC;
s32 v0;
s32 ptr;
v0 = ((s32 (*)(void))func_8012C1B8)();
*(s32 *)((s32)a0 + 0x20) = v0;
if (v0 == 0) {
func_8012CAE4(a0);
} else {
func_8001C214(v0, (s32)&D_801CEA24);
ptr = *(s32 *)((s32)a0 + 0x68);
*(s16 *)(ptr + 0xC) = 0x7FFF;
*(s16 *)((s32)a0 + 0x2) = 1;
func_8012A828((s32)a0, (s32)&D_801BEAF8);
func_8012E8E0((s32)a0, (s32)&D_801E669C);
*(s16 *)((s32)a0 + 0x34) = 0;
func_80178B18((s32)a0, (s32)&D_801E66CC);
}
}
INCLUDE_ASM("asm/md_SC03_135/nonmatchings/md_SC03_135", func_801E585C);
src/md_SC03_136/md_SC03_136.c
+27 -5
View File
@@ -46,7 +46,11 @@ s32 func_801E26D8(s32 param_1) {
}
INCLUDE_ASM("asm/md_SC03_136/nonmatchings/md_SC03_136", func_801E2778);
extern void func_800D1EBC(void);
void func_801E2778(void) {
func_800D1EBC();
}
@@ -75,7 +79,13 @@ void func_801E2810(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_136/nonmatchings/md_SC03_136", func_801E284C);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801E284C(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC03_136/nonmatchings/md_SC03_136", D_801E25E8);
@@ -110,7 +120,11 @@ void func_801E293C(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_136/nonmatchings/md_SC03_136", func_801E2978);
extern void func_80171A1C(void*);
void func_801E2978(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC03_136/nonmatchings/md_SC03_136", func_801E2998);
@@ -185,9 +199,17 @@ extern s32 func_80029178(s32 arg);
INCLUDE_ASM("asm/md_SC03_136/nonmatchings/md_SC03_136", func_801E2ED8);
INCLUDE_ASM("asm/md_SC03_136/nonmatchings/md_SC03_136", func_801E2FB4);
extern void func_80029514(int);
void func_801E2FB4(void) {
func_80029514(0x181);
}
extern void func_8018A788(void);
void func_801E2FD4(void) {
func_8018A788();
}
INCLUDE_ASM("asm/md_SC03_136/nonmatchings/md_SC03_136", func_801E2FD4);
INCLUDE_ASM("asm/md_SC03_136/nonmatchings/md_SC03_136", func_801E2FF4);
src/md_SC03_137/md_SC03_137.c
+25 -4
View File
@@ -46,7 +46,11 @@ s32 func_801E26C4(s32 param_1) {
}
INCLUDE_ASM("asm/md_SC03_137/nonmatchings/md_SC03_137", func_801E2764);
extern void func_800D1EBC(void);
void func_801E2764(void) {
func_800D1EBC();
}
@@ -75,7 +79,13 @@ void func_801E27FC(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_137/nonmatchings/md_SC03_137", func_801E2838);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801E2838(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC03_137/nonmatchings/md_SC03_137", D_801E25E8);
@@ -110,7 +120,11 @@ void func_801E2928(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_137/nonmatchings/md_SC03_137", func_801E2964);
extern void func_80171A1C(void*);
void func_801E2964(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC03_137/nonmatchings/md_SC03_137", func_801E2984);
@@ -241,7 +255,14 @@ void func_801E2D1C(void *a0) {
INCLUDE_ASM("asm/md_SC03_137/nonmatchings/md_SC03_137", func_801E2D58);
INCLUDE_ASM("asm/md_SC03_137/nonmatchings/md_SC03_137", func_801E2DF8);
extern s32 func_8014CB1C(void);
s32 func_801E2DF8(void) {
return (u32)func_8014CB1C() != 0;
}
src/md_SC03_138/md_SC03_138.c
+78 -5
View File
@@ -24,7 +24,11 @@ s32 func_801E2678(s32 param_1) {
INCLUDE_ASM("asm/md_SC03_138/nonmatchings/md_SC03_138", func_801E26C4);
INCLUDE_ASM("asm/md_SC03_138/nonmatchings/md_SC03_138", func_801E2764);
extern void func_800D1EBC(void);
void func_801E2764(void) {
func_800D1EBC();
}
@@ -53,7 +57,13 @@ void func_801E27FC(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_138/nonmatchings/md_SC03_138", func_801E2838);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801E2838(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC03_138/nonmatchings/md_SC03_138", D_801E25E8);
@@ -88,7 +98,11 @@ void func_801E2928(void *a0) {
}
INCLUDE_ASM("asm/md_SC03_138/nonmatchings/md_SC03_138", func_801E2964);
extern void func_80171A1C(void*);
void func_801E2964(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC03_138/nonmatchings/md_SC03_138", func_801E2984);
@@ -286,6 +300,65 @@ extern s32 func_80029178(s32 arg);
}
INCLUDE_ASM("asm/md_SC03_138/nonmatchings/md_SC03_138", func_801E31B8);
INCLUDE_ASM("asm/md_SC03_138/nonmatchings/md_SC03_138", func_801E3258);
extern s32 func_80029504(void);
extern s32 func_80184428(s32);
extern s32 func_801844F8(void);
extern s32 func_8018456C(void);
extern void func_801845C8(void);
void func_801E31B8(s32 a0) {
extern s32 D_801E351C[];
extern s32 D_801E3530[];
extern s32 D_801E354C[];
s32 v1 = func_80029504();
if (v1 < 0xC8) {
s32 v0 = ((s32 (*)(void))func_80184428)();
*(s32 *)(a0 + 0xE4) = D_801E351C[v0];
} else if (v1 < 0x384) {
s32 v0 = func_801844F8();
*(s32 *)(a0 + 0xE4) = D_801E3530[v0];
} else {
s32 v0 = func_8018456C();
*(s32 *)(a0 + 0xE4) = D_801E354C[v0];
func_801845C8();
}
}
extern void func_8012C1B8(void);
extern void func_8012CAE4(void *a0);
extern void func_8001C214(s32 a0, s32 a1);
extern void func_8012A828(s32 a0, s32 a1);
extern void func_8012E8E0(s32 a0, s32 a1);
extern s32 func_80178B18(s32 a0, s32 a1);
void func_801E3258(void *a0) {
extern s32 D_801EB4C0;
extern s32 D_801EC26C;
extern s32 D_801E346C;
extern s32 D_801E349C;
s32 v0;
s32 ptr;
v0 = ((s32 (*)(void))func_8012C1B8)();
*(s32 *)((s32)a0 + 0x20) = v0;
if (v0 == 0) {
func_8012CAE4(a0);
} else {
func_8001C214(v0, (s32)&D_801EB4C0);
ptr = *(s32 *)((s32)a0 + 0x68);
*(s16 *)(ptr + 0xC) = 0x7FFF;
*(s16 *)((s32)a0 + 0x2) = 1;
func_8012A828((s32)a0, (s32)&D_801EC26C);
func_8012E8E0((s32)a0, (s32)&D_801E346C);
*(s16 *)((s32)a0 + 0x34) = 0;
func_80178B18((s32)a0, (s32)&D_801E349C);
}
}
src/md_SC04_024/md_SC04_024.c
+78 -5
View File
@@ -46,7 +46,11 @@ s32 func_801E7BFC(s32 param_1) {
}
INCLUDE_ASM("asm/md_SC04_024/nonmatchings/md_SC04_024", func_801E7C9C);
extern void func_800D1EBC(void);
void func_801E7C9C(void) {
func_800D1EBC();
}
@@ -75,7 +79,13 @@ void func_801E7D34(void *a0) {
}
INCLUDE_ASM("asm/md_SC04_024/nonmatchings/md_SC04_024", func_801E7D70);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801E7D70(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_ASM("asm/md_SC04_024/nonmatchings/md_SC04_024", func_801E7D98);
@@ -108,7 +118,11 @@ void func_801E7E60(void *a0) {
}
INCLUDE_ASM("asm/md_SC04_024/nonmatchings/md_SC04_024", func_801E7E9C);
extern void func_80171A1C(void*);
void func_801E7E9C(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC04_024/nonmatchings/md_SC04_024", func_801E7EBC);
@@ -263,11 +277,70 @@ s32 func_801E82DC(void) {
}
INCLUDE_ASM("asm/md_SC04_024/nonmatchings/md_SC04_024", func_801E82EC);
extern s32 func_80029504(void);
extern s32 func_80184D00(s32);
extern s32 func_80184DD0(void);
extern s32 func_80184E44(void);
extern void func_80184EA0(void);
void func_801E82EC(s32 a0) {
extern s32 D_801E867C[];
extern s32 D_801E8690[];
extern s32 D_801E86AC[];
s32 v1 = func_80029504();
if (v1 < 0xC8) {
s32 v0 = ((s32 (*)(void))func_80184D00)();
*(s32 *)(a0 + 0xE4) = D_801E867C[v0];
} else if (v1 < 0x384) {
s32 v0 = func_80184DD0();
*(s32 *)(a0 + 0xE4) = D_801E8690[v0];
} else {
s32 v0 = func_80184E44();
*(s32 *)(a0 + 0xE4) = D_801E86AC[v0];
func_80184EA0();
}
}
INCLUDE_ASM("asm/md_SC04_024/nonmatchings/md_SC04_024", func_801E838C);
INCLUDE_ASM("asm/md_SC04_024/nonmatchings/md_SC04_024", func_801E84C0);
extern void func_8012C1B8(void);
extern void func_8012CAE4(void *a0);
extern void func_8001C214(s32 a0, s32 a1);
extern void func_8012A828(s32 a0, s32 a1);
extern void func_8012E8E0(s32 a0, s32 a1);
extern s32 func_80178B18(s32 a0, s32 a1);
void func_801E84C0(void *a0) {
extern s32 D_801EECB8;
extern s32 D_801B9A50;
extern s32 D_801E860C;
extern s32 D_801E8614;
s32 v0;
s32 ptr;
v0 = ((s32 (*)(void))func_8012C1B8)();
*(s32 *)((s32)a0 + 0x20) = v0;
if (v0 == 0) {
func_8012CAE4(a0);
} else {
func_8001C214(v0, (s32)&D_801EECB8);
ptr = *(s32 *)((s32)a0 + 0x68);
*(s16 *)(ptr + 0xC) = 0x7FFF;
*(s16 *)((s32)a0 + 0x2) = 1;
func_8012A828((s32)a0, (s32)&D_801B9A50);
func_8012E8E0((s32)a0, (s32)&D_801E860C);
*(s16 *)((s32)a0 + 0x34) = 0;
func_80178B18((s32)a0, (s32)&D_801E8614);
}
}
INCLUDE_RODATA("asm/md_SC04_024/nonmatchings/md_SC04_024", D_801E7B28);
src/md_SC04_025/md_SC04_025.c
+17 -3
View File
@@ -44,7 +44,11 @@ s32 func_801E7C04(s32 param_1) {
}
INCLUDE_ASM("asm/md_SC04_025/nonmatchings/md_SC04_025", func_801E7CA4);
extern void func_800D1EBC(void);
void func_801E7CA4(void) {
func_800D1EBC();
}
@@ -73,7 +77,13 @@ void func_801E7D3C(void *a0) {
}
INCLUDE_ASM("asm/md_SC04_025/nonmatchings/md_SC04_025", func_801E7D78);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801E7D78(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC04_025/nonmatchings/md_SC04_025", D_801E7B28);
@@ -108,7 +118,11 @@ void func_801E7E68(void *a0) {
}
INCLUDE_ASM("asm/md_SC04_025/nonmatchings/md_SC04_025", func_801E7EA4);
extern void func_80171A1C(void*);
void func_801E7EA4(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC04_025/nonmatchings/md_SC04_025", func_801E7EC4);
src/md_SC04_026/md_SC04_026.c
+46 -4
View File
@@ -46,7 +46,11 @@ s32 func_801E7C04(s32 param_1) {
}
INCLUDE_ASM("asm/md_SC04_026/nonmatchings/md_SC04_026", func_801E7CA4);
extern void func_800D1EBC(void);
void func_801E7CA4(void) {
func_800D1EBC();
}
@@ -75,7 +79,13 @@ void func_801E7D3C(void *a0) {
}
INCLUDE_ASM("asm/md_SC04_026/nonmatchings/md_SC04_026", func_801E7D78);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801E7D78(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC04_026/nonmatchings/md_SC04_026", D_801E7B28);
@@ -110,7 +120,11 @@ void func_801E7E68(void *a0) {
}
INCLUDE_ASM("asm/md_SC04_026/nonmatchings/md_SC04_026", func_801E7EA4);
extern void func_80171A1C(void*);
void func_801E7EA4(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC04_026/nonmatchings/md_SC04_026", func_801E7EC4);
@@ -281,7 +295,35 @@ extern s32 func_80029178(s32 arg);
}
INCLUDE_ASM("asm/md_SC04_026/nonmatchings/md_SC04_026", func_801E83D0);
extern s32 func_80029504(void);
extern s32 func_80184D00(s32);
extern s32 func_80184DD0(void);
extern s32 func_80184E44(void);
extern void func_80184EA0(void);
void func_801E83D0(s32 a0) {
extern s32 D_801E8C64[];
extern s32 D_801E8C78[];
extern s32 D_801E8C94[];
s32 v1 = func_80029504();
if (v1 < 0xC8) {
s32 v0 = ((s32 (*)(void))func_80184D00)();
*(s32 *)(a0 + 0xE4) = D_801E8C64[v0];
} else if (v1 < 0x384) {
s32 v0 = func_80184DD0();
*(s32 *)(a0 + 0xE4) = D_801E8C78[v0];
} else {
s32 v0 = func_80184E44();
*(s32 *)(a0 + 0xE4) = D_801E8C94[v0];
func_80184EA0();
}
}
INCLUDE_ASM("asm/md_SC04_026/nonmatchings/md_SC04_026", func_801E8470);
src/md_SC04_027/md_SC04_027.c
+56 -5
View File
@@ -156,7 +156,13 @@ INCLUDE_ASM("asm/md_SC04_027/nonmatchings/md_SC04_027", func_801E9DD0);
INCLUDE_ASM("asm/md_SC04_027/nonmatchings/md_SC04_027", func_801E9DF8);
INCLUDE_ASM("asm/md_SC04_027/nonmatchings/md_SC04_027", func_801EA0E4);
extern void func_8014B00C(void);
extern void func_80029344(void);
void func_801EA0E4(void) {
func_8014B00C();
func_80029344();
}
INCLUDE_ASM("asm/md_SC04_027/nonmatchings/md_SC04_027", func_801EA10C);
@@ -194,7 +200,11 @@ s32 func_801EA1DC(s32 param_1) {
}
INCLUDE_ASM("asm/md_SC04_027/nonmatchings/md_SC04_027", func_801EA27C);
extern void func_800D1EBC(void);
void func_801EA27C(void) {
func_800D1EBC();
}
@@ -216,7 +226,13 @@ void func_801EA344(void *a0) {
}
INCLUDE_ASM("asm/md_SC04_027/nonmatchings/md_SC04_027", func_801EA380);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801EA380(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_ASM("asm/md_SC04_027/nonmatchings/md_SC04_027", func_801EA3A8);
@@ -249,7 +265,11 @@ void func_801EA470(void *a0) {
}
INCLUDE_ASM("asm/md_SC04_027/nonmatchings/md_SC04_027", func_801EA4AC);
extern void func_80171A1C(void*);
void func_801EA4AC(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC04_027/nonmatchings/md_SC04_027", func_801EA4CC);
@@ -425,7 +445,38 @@ INCLUDE_ASM("asm/md_SC04_027/nonmatchings/md_SC04_027", func_801EAB8C);
INCLUDE_ASM("asm/md_SC04_027/nonmatchings/md_SC04_027", func_801EAC10);
INCLUDE_ASM("asm/md_SC04_027/nonmatchings/md_SC04_027", func_801EAD2C);
extern void func_8012C1B8(void);
extern void func_8012CAE4(void *a0);
extern void func_8001C214(s32 a0, s32 a1);
extern void func_8012A828(s32 a0, s32 a1);
extern void func_8012E8E0(s32 a0, s32 a1);
extern s32 func_80178B18(s32 a0, s32 a1);
void func_801EAD2C(void *a0) {
extern s32 D_801F1D5C;
extern s32 D_801B9A50;
extern s32 D_801EBC04;
extern s32 D_801EBC34;
s32 v0;
s32 ptr;
v0 = ((s32 (*)(void))func_8012C1B8)();
*(s32 *)((s32)a0 + 0x20) = v0;
if (v0 == 0) {
func_8012CAE4(a0);
} else {
func_8001C214(v0, (s32)&D_801F1D5C);
ptr = *(s32 *)((s32)a0 + 0x68);
*(s16 *)(ptr + 0xC) = 0x7FFF;
*(s16 *)((s32)a0 + 0x2) = 1;
func_8012A828((s32)a0, (s32)&D_801B9A50);
func_8012E8E0((s32)a0, (s32)&D_801EBC04);
*(s16 *)((s32)a0 + 0x34) = 0;
func_80178B18((s32)a0, (s32)&D_801EBC34);
}
}
INCLUDE_ASM("asm/md_SC04_027/nonmatchings/md_SC04_027", func_801EADC4);
src/md_SC04_028/md_SC04_028.c
+27 -5
View File
@@ -46,7 +46,11 @@ s32 func_801E7C18(s32 param_1) {
}
INCLUDE_ASM("asm/md_SC04_028/nonmatchings/md_SC04_028", func_801E7CB8);
extern void func_800D1EBC(void);
void func_801E7CB8(void) {
func_800D1EBC();
}
@@ -75,7 +79,13 @@ void func_801E7D50(void *a0) {
}
INCLUDE_ASM("asm/md_SC04_028/nonmatchings/md_SC04_028", func_801E7D8C);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801E7D8C(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC04_028/nonmatchings/md_SC04_028", D_801E7B28);
@@ -110,7 +120,11 @@ void func_801E7E7C(void *a0) {
}
INCLUDE_ASM("asm/md_SC04_028/nonmatchings/md_SC04_028", func_801E7EB8);
extern void func_80171A1C(void*);
void func_801E7EB8(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC04_028/nonmatchings/md_SC04_028", func_801E7ED8);
@@ -191,9 +205,17 @@ extern s32 func_80029178(s32 arg);
INCLUDE_ASM("asm/md_SC04_028/nonmatchings/md_SC04_028", func_801E8440);
INCLUDE_ASM("asm/md_SC04_028/nonmatchings/md_SC04_028", func_801E851C);
extern void func_80029514(int);
void func_801E851C(void) {
func_80029514(0x181);
}
extern void func_8018CDEC(void);
void func_801E853C(void) {
func_8018CDEC();
}
INCLUDE_ASM("asm/md_SC04_028/nonmatchings/md_SC04_028", func_801E853C);
INCLUDE_ASM("asm/md_SC04_028/nonmatchings/md_SC04_028", func_801E855C);
src/md_SC04_029/md_SC04_029.c
+25 -4
View File
@@ -46,7 +46,11 @@ s32 func_801E7C04(s32 param_1) {
}
INCLUDE_ASM("asm/md_SC04_029/nonmatchings/md_SC04_029", func_801E7CA4);
extern void func_800D1EBC(void);
void func_801E7CA4(void) {
func_800D1EBC();
}
@@ -75,7 +79,13 @@ void func_801E7D3C(void *a0) {
}
INCLUDE_ASM("asm/md_SC04_029/nonmatchings/md_SC04_029", func_801E7D78);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801E7D78(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC04_029/nonmatchings/md_SC04_029", D_801E7B28);
@@ -110,7 +120,11 @@ void func_801E7E68(void *a0) {
}
INCLUDE_ASM("asm/md_SC04_029/nonmatchings/md_SC04_029", func_801E7EA4);
extern void func_80171A1C(void*);
void func_801E7EA4(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC04_029/nonmatchings/md_SC04_029", func_801E7EC4);
@@ -247,7 +261,14 @@ void func_801E8284(void *a0) {
INCLUDE_ASM("asm/md_SC04_029/nonmatchings/md_SC04_029", func_801E82C0);
INCLUDE_ASM("asm/md_SC04_029/nonmatchings/md_SC04_029", func_801E8360);
extern s32 func_8014CB1C(void);
s32 func_801E8360(void) {
return (u32)func_8014CB1C() != 0;
}
src/md_SC04_030/md_SC04_030.c
+78 -5
View File
@@ -46,7 +46,11 @@ s32 func_801E7C04(s32 param_1) {
}
INCLUDE_ASM("asm/md_SC04_030/nonmatchings/md_SC04_030", func_801E7CA4);
extern void func_800D1EBC(void);
void func_801E7CA4(void) {
func_800D1EBC();
}
@@ -75,7 +79,13 @@ void func_801E7D3C(void *a0) {
}
INCLUDE_ASM("asm/md_SC04_030/nonmatchings/md_SC04_030", func_801E7D78);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801E7D78(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC04_030/nonmatchings/md_SC04_030", D_801E7B28);
@@ -110,7 +120,11 @@ void func_801E7E68(void *a0) {
}
INCLUDE_ASM("asm/md_SC04_030/nonmatchings/md_SC04_030", func_801E7EA4);
extern void func_80171A1C(void*);
void func_801E7EA4(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC04_030/nonmatchings/md_SC04_030", func_801E7EC4);
@@ -287,6 +301,65 @@ extern s32 func_80029178(s32 arg);
}
INCLUDE_ASM("asm/md_SC04_030/nonmatchings/md_SC04_030", func_801E849C);
INCLUDE_ASM("asm/md_SC04_030/nonmatchings/md_SC04_030", func_801E853C);
extern s32 func_80029504(void);
extern s32 func_80184D00(s32);
extern s32 func_80184DD0(void);
extern s32 func_80184E44(void);
extern void func_80184EA0(void);
void func_801E849C(s32 a0) {
extern s32 D_801E8738[];
extern s32 D_801E874C[];
extern s32 D_801E8768[];
s32 v1 = func_80029504();
if (v1 < 0xC8) {
s32 v0 = ((s32 (*)(void))func_80184D00)();
*(s32 *)(a0 + 0xE4) = D_801E8738[v0];
} else if (v1 < 0x384) {
s32 v0 = func_80184DD0();
*(s32 *)(a0 + 0xE4) = D_801E874C[v0];
} else {
s32 v0 = func_80184E44();
*(s32 *)(a0 + 0xE4) = D_801E8768[v0];
func_80184EA0();
}
}
extern void func_8012C1B8(void);
extern void func_8012CAE4(void *a0);
extern void func_8001C214(s32 a0, s32 a1);
extern void func_8012A828(s32 a0, s32 a1);
extern void func_8012E8E0(s32 a0, s32 a1);
extern s32 func_80178B18(s32 a0, s32 a1);
void func_801E853C(void *a0) {
extern s32 D_801F06DC;
extern s32 D_801F1488;
extern s32 D_801E8688;
extern s32 D_801E86B8;
s32 v0;
s32 ptr;
v0 = ((s32 (*)(void))func_8012C1B8)();
*(s32 *)((s32)a0 + 0x20) = v0;
if (v0 == 0) {
func_8012CAE4(a0);
} else {
func_8001C214(v0, (s32)&D_801F06DC);
ptr = *(s32 *)((s32)a0 + 0x68);
*(s16 *)(ptr + 0xC) = 0x7FFF;
*(s16 *)((s32)a0 + 0x2) = 1;
func_8012A828((s32)a0, (s32)&D_801F1488);
func_8012E8E0((s32)a0, (s32)&D_801E8688);
*(s16 *)((s32)a0 + 0x34) = 0;
func_80178B18((s32)a0, (s32)&D_801E86B8);
}
}
src/md_SC05_023/md_SC05_023.c
+78 -5
View File
@@ -37,7 +37,11 @@ s32 func_801EDA18(s32 param_1) {
INCLUDE_ASM("asm/md_SC05_023/nonmatchings/md_SC05_023", func_801EDA64);
INCLUDE_ASM("asm/md_SC05_023/nonmatchings/md_SC05_023", func_801EDB1C);
extern void func_800D1EBC(void);
void func_801EDB1C(void) {
func_800D1EBC();
}
@@ -66,7 +70,13 @@ void func_801EDBB4(void *a0) {
}
INCLUDE_ASM("asm/md_SC05_023/nonmatchings/md_SC05_023", func_801EDBF0);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801EDBF0(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC05_023/nonmatchings/md_SC05_023", D_801ED988);
@@ -118,7 +128,11 @@ void func_801EDCE0(void *a0) {
}
INCLUDE_ASM("asm/md_SC05_023/nonmatchings/md_SC05_023", func_801EDD1C);
extern void func_80171A1C(void*);
void func_801EDD1C(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC05_023/nonmatchings/md_SC05_023", func_801EDD3C);
@@ -265,8 +279,67 @@ s32 func_801EE16C(void) {
}
INCLUDE_ASM("asm/md_SC05_023/nonmatchings/md_SC05_023", func_801EE17C);
extern s32 func_80029504(void);
extern s32 func_80184A00(s32);
extern s32 func_80184AD0(void);
extern s32 func_80184B44(void);
extern void func_80184BA0(void);
void func_801EE17C(s32 a0) {
extern s32 D_801EE50C[];
extern s32 D_801EE520[];
extern s32 D_801EE53C[];
s32 v1 = func_80029504();
if (v1 < 0xC8) {
s32 v0 = ((s32 (*)(void))func_80184A00)();
*(s32 *)(a0 + 0xE4) = D_801EE50C[v0];
} else if (v1 < 0x384) {
s32 v0 = func_80184AD0();
*(s32 *)(a0 + 0xE4) = D_801EE520[v0];
} else {
s32 v0 = func_80184B44();
*(s32 *)(a0 + 0xE4) = D_801EE53C[v0];
func_80184BA0();
}
}
INCLUDE_ASM("asm/md_SC05_023/nonmatchings/md_SC05_023", func_801EE21C);
INCLUDE_ASM("asm/md_SC05_023/nonmatchings/md_SC05_023", func_801EE350);
extern void func_8012C1B8(void);
extern void func_8012CAE4(void *a0);
extern void func_8001C214(s32 a0, s32 a1);
extern void func_8012A828(s32 a0, s32 a1);
extern void func_8012E8E0(s32 a0, s32 a1);
extern s32 func_80178B18(s32 a0, s32 a1);
void func_801EE350(void *a0) {
extern s32 D_801F4B48;
extern s32 D_801B9A0C;
extern s32 D_801EE49C;
extern s32 D_801EE4A4;
s32 v0;
s32 ptr;
v0 = ((s32 (*)(void))func_8012C1B8)();
*(s32 *)((s32)a0 + 0x20) = v0;
if (v0 == 0) {
func_8012CAE4(a0);
} else {
func_8001C214(v0, (s32)&D_801F4B48);
ptr = *(s32 *)((s32)a0 + 0x68);
*(s16 *)(ptr + 0xC) = 0x7FFF;
*(s16 *)((s32)a0 + 0x2) = 1;
func_8012A828((s32)a0, (s32)&D_801B9A0C);
func_8012E8E0((s32)a0, (s32)&D_801EE49C);
*(s16 *)((s32)a0 + 0x34) = 0;
func_80178B18((s32)a0, (s32)&D_801EE4A4);
}
}
src/md_SC05_024/md_SC05_024.c
+17 -3
View File
@@ -24,7 +24,11 @@ s32 func_801EDA18(s32 param_1) {
INCLUDE_ASM("asm/md_SC05_024/nonmatchings/md_SC05_024", func_801EDA64);
INCLUDE_ASM("asm/md_SC05_024/nonmatchings/md_SC05_024", func_801EDB1C);
extern void func_800D1EBC(void);
void func_801EDB1C(void) {
func_800D1EBC();
}
@@ -53,7 +57,13 @@ void func_801EDBB4(void *a0) {
}
INCLUDE_ASM("asm/md_SC05_024/nonmatchings/md_SC05_024", func_801EDBF0);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801EDBF0(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC05_024/nonmatchings/md_SC05_024", D_801ED988);
@@ -88,7 +98,11 @@ void func_801EDCE0(void *a0) {
}
INCLUDE_ASM("asm/md_SC05_024/nonmatchings/md_SC05_024", func_801EDD1C);
extern void func_80171A1C(void*);
void func_801EDD1C(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC05_024/nonmatchings/md_SC05_024", func_801EDD3C);
src/md_SC05_025/md_SC05_025.c
+46 -4
View File
@@ -24,7 +24,11 @@ s32 func_801EDA18(s32 param_1) {
INCLUDE_ASM("asm/md_SC05_025/nonmatchings/md_SC05_025", func_801EDA64);
INCLUDE_ASM("asm/md_SC05_025/nonmatchings/md_SC05_025", func_801EDB1C);
extern void func_800D1EBC(void);
void func_801EDB1C(void) {
func_800D1EBC();
}
@@ -53,7 +57,13 @@ void func_801EDBB4(void *a0) {
}
INCLUDE_ASM("asm/md_SC05_025/nonmatchings/md_SC05_025", func_801EDBF0);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801EDBF0(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC05_025/nonmatchings/md_SC05_025", D_801ED988);
@@ -88,7 +98,11 @@ void func_801EDCE0(void *a0) {
}
INCLUDE_ASM("asm/md_SC05_025/nonmatchings/md_SC05_025", func_801EDD1C);
extern void func_80171A1C(void*);
void func_801EDD1C(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC05_025/nonmatchings/md_SC05_025", func_801EDD3C);
@@ -249,7 +263,35 @@ extern s32 func_80029178(s32 arg);
}
INCLUDE_ASM("asm/md_SC05_025/nonmatchings/md_SC05_025", func_801EE258);
extern s32 func_80029504(void);
extern s32 func_80184A00(s32);
extern s32 func_80184AD0(void);
extern s32 func_80184B44(void);
extern void func_80184BA0(void);
void func_801EE258(s32 a0) {
extern s32 D_801EEAEC[];
extern s32 D_801EEB00[];
extern s32 D_801EEB1C[];
s32 v1 = func_80029504();
if (v1 < 0xC8) {
s32 v0 = ((s32 (*)(void))func_80184A00)();
*(s32 *)(a0 + 0xE4) = D_801EEAEC[v0];
} else if (v1 < 0x384) {
s32 v0 = func_80184AD0();
*(s32 *)(a0 + 0xE4) = D_801EEB00[v0];
} else {
s32 v0 = func_80184B44();
*(s32 *)(a0 + 0xE4) = D_801EEB1C[v0];
func_80184BA0();
}
}
INCLUDE_ASM("asm/md_SC05_025/nonmatchings/md_SC05_025", func_801EE2F8);
src/md_SC05_026/md_SC05_026.c
+56 -5
View File
@@ -156,7 +156,13 @@ INCLUDE_ASM("asm/md_SC05_026/nonmatchings/md_SC05_026", func_801EFC30);
INCLUDE_ASM("asm/md_SC05_026/nonmatchings/md_SC05_026", func_801EFC58);
INCLUDE_ASM("asm/md_SC05_026/nonmatchings/md_SC05_026", func_801EFF44);
extern void func_8014B00C(void);
extern void func_80029344(void);
void func_801EFF44(void) {
func_8014B00C();
func_80029344();
}
INCLUDE_ASM("asm/md_SC05_026/nonmatchings/md_SC05_026", func_801EFF6C);
@@ -172,7 +178,11 @@ INCLUDE_ASM("asm/md_SC05_026/nonmatchings/md_SC05_026", func_801EFFE8);
INCLUDE_ASM("asm/md_SC05_026/nonmatchings/md_SC05_026", func_801F003C);
INCLUDE_ASM("asm/md_SC05_026/nonmatchings/md_SC05_026", func_801F00F4);
extern void func_800D1EBC(void);
void func_801F00F4(void) {
func_800D1EBC();
}
@@ -194,7 +204,13 @@ void func_801F01BC(void *a0) {
}
INCLUDE_ASM("asm/md_SC05_026/nonmatchings/md_SC05_026", func_801F01F8);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801F01F8(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_ASM("asm/md_SC05_026/nonmatchings/md_SC05_026", func_801F0220);
@@ -227,7 +243,11 @@ void func_801F02E8(void *a0) {
}
INCLUDE_ASM("asm/md_SC05_026/nonmatchings/md_SC05_026", func_801F0324);
extern void func_80171A1C(void*);
void func_801F0324(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC05_026/nonmatchings/md_SC05_026", func_801F0344);
@@ -393,7 +413,38 @@ INCLUDE_ASM("asm/md_SC05_026/nonmatchings/md_SC05_026", func_801F0A14);
INCLUDE_ASM("asm/md_SC05_026/nonmatchings/md_SC05_026", func_801F0A98);
INCLUDE_ASM("asm/md_SC05_026/nonmatchings/md_SC05_026", func_801F0BB4);
extern void func_8012C1B8(void);
extern void func_8012CAE4(void *a0);
extern void func_8001C214(s32 a0, s32 a1);
extern void func_8012A828(s32 a0, s32 a1);
extern void func_8012E8E0(s32 a0, s32 a1);
extern s32 func_80178B18(s32 a0, s32 a1);
void func_801F0BB4(void *a0) {
extern s32 D_801F7BE4;
extern s32 D_801B9A0C;
extern s32 D_801F1A8C;
extern s32 D_801F1ABC;
s32 v0;
s32 ptr;
v0 = ((s32 (*)(void))func_8012C1B8)();
*(s32 *)((s32)a0 + 0x20) = v0;
if (v0 == 0) {
func_8012CAE4(a0);
} else {
func_8001C214(v0, (s32)&D_801F7BE4);
ptr = *(s32 *)((s32)a0 + 0x68);
*(s16 *)(ptr + 0xC) = 0x7FFF;
*(s16 *)((s32)a0 + 0x2) = 1;
func_8012A828((s32)a0, (s32)&D_801B9A0C);
func_8012E8E0((s32)a0, (s32)&D_801F1A8C);
*(s16 *)((s32)a0 + 0x34) = 0;
func_80178B18((s32)a0, (s32)&D_801F1ABC);
}
}
INCLUDE_ASM("asm/md_SC05_026/nonmatchings/md_SC05_026", func_801F0C4C);
src/md_SC05_027/md_SC05_027.c
+27 -5
View File
@@ -24,7 +24,11 @@ s32 func_801EDA2C(s32 param_1) {
INCLUDE_ASM("asm/md_SC05_027/nonmatchings/md_SC05_027", func_801EDA78);
INCLUDE_ASM("asm/md_SC05_027/nonmatchings/md_SC05_027", func_801EDB30);
extern void func_800D1EBC(void);
void func_801EDB30(void) {
func_800D1EBC();
}
@@ -53,7 +57,13 @@ void func_801EDBC8(void *a0) {
}
INCLUDE_ASM("asm/md_SC05_027/nonmatchings/md_SC05_027", func_801EDC04);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801EDC04(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC05_027/nonmatchings/md_SC05_027", D_801ED988);
@@ -88,7 +98,11 @@ void func_801EDCF4(void *a0) {
}
INCLUDE_ASM("asm/md_SC05_027/nonmatchings/md_SC05_027", func_801EDD30);
extern void func_80171A1C(void*);
void func_801EDD30(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC05_027/nonmatchings/md_SC05_027", func_801EDD50);
@@ -159,9 +173,17 @@ extern s32 func_80029178(s32 arg);
INCLUDE_ASM("asm/md_SC05_027/nonmatchings/md_SC05_027", func_801EE2C8);
INCLUDE_ASM("asm/md_SC05_027/nonmatchings/md_SC05_027", func_801EE3A4);
extern void func_80029514(int);
void func_801EE3A4(void) {
func_80029514(0x181);
}
extern void func_8018CDB0(void);
void func_801EE3C4(void) {
func_8018CDB0();
}
INCLUDE_ASM("asm/md_SC05_027/nonmatchings/md_SC05_027", func_801EE3C4);
INCLUDE_ASM("asm/md_SC05_027/nonmatchings/md_SC05_027", func_801EE3E4);
src/md_SC05_028/md_SC05_028.c
+25 -4
View File
@@ -24,7 +24,11 @@ s32 func_801EDA18(s32 param_1) {
INCLUDE_ASM("asm/md_SC05_028/nonmatchings/md_SC05_028", func_801EDA64);
INCLUDE_ASM("asm/md_SC05_028/nonmatchings/md_SC05_028", func_801EDB1C);
extern void func_800D1EBC(void);
void func_801EDB1C(void) {
func_800D1EBC();
}
@@ -53,7 +57,13 @@ void func_801EDBB4(void *a0) {
}
INCLUDE_ASM("asm/md_SC05_028/nonmatchings/md_SC05_028", func_801EDBF0);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801EDBF0(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC05_028/nonmatchings/md_SC05_028", D_801ED988);
@@ -88,7 +98,11 @@ void func_801EDCE0(void *a0) {
}
INCLUDE_ASM("asm/md_SC05_028/nonmatchings/md_SC05_028", func_801EDD1C);
extern void func_80171A1C(void*);
void func_801EDD1C(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC05_028/nonmatchings/md_SC05_028", func_801EDD3C);
@@ -215,7 +229,14 @@ void func_801EE10C(void *a0) {
INCLUDE_ASM("asm/md_SC05_028/nonmatchings/md_SC05_028", func_801EE148);
INCLUDE_ASM("asm/md_SC05_028/nonmatchings/md_SC05_028", func_801EE1E8);
extern s32 func_8014CB1C(void);
s32 func_801EE1E8(void) {
return (u32)func_8014CB1C() != 0;
}
src/md_SC05_029/md_SC05_029.c
+78 -5
View File
@@ -24,7 +24,11 @@ s32 func_801EDA18(s32 param_1) {
INCLUDE_ASM("asm/md_SC05_029/nonmatchings/md_SC05_029", func_801EDA64);
INCLUDE_ASM("asm/md_SC05_029/nonmatchings/md_SC05_029", func_801EDB1C);
extern void func_800D1EBC(void);
void func_801EDB1C(void) {
func_800D1EBC();
}
@@ -53,7 +57,13 @@ void func_801EDBB4(void *a0) {
}
INCLUDE_ASM("asm/md_SC05_029/nonmatchings/md_SC05_029", func_801EDBF0);
extern void func_80171A1C(void*);
extern void func_80175414(void);
void func_801EDBF0(void) {
((void (*)(void))func_80171A1C)();
func_80175414();
}
INCLUDE_RODATA("asm/md_SC05_029/nonmatchings/md_SC05_029", D_801ED988);
@@ -88,7 +98,11 @@ void func_801EDCE0(void *a0) {
}
INCLUDE_ASM("asm/md_SC05_029/nonmatchings/md_SC05_029", func_801EDD1C);
extern void func_80171A1C(void*);
void func_801EDD1C(void) {
((void (*)(void))func_80171A1C)();
}
INCLUDE_ASM("asm/md_SC05_029/nonmatchings/md_SC05_029", func_801EDD3C);
@@ -255,6 +269,65 @@ extern s32 func_80029178(s32 arg);
}
INCLUDE_ASM("asm/md_SC05_029/nonmatchings/md_SC05_029", func_801EE324);
INCLUDE_ASM("asm/md_SC05_029/nonmatchings/md_SC05_029", func_801EE3C4);
extern s32 func_80029504(void);
extern s32 func_80184A00(s32);
extern s32 func_80184AD0(void);
extern s32 func_80184B44(void);
extern void func_80184BA0(void);
void func_801EE324(s32 a0) {
extern s32 D_801EE5C0[];
extern s32 D_801EE5D4[];
extern s32 D_801EE5F0[];
s32 v1 = func_80029504();
if (v1 < 0xC8) {
s32 v0 = ((s32 (*)(void))func_80184A00)();
*(s32 *)(a0 + 0xE4) = D_801EE5C0[v0];
} else if (v1 < 0x384) {
s32 v0 = func_80184AD0();
*(s32 *)(a0 + 0xE4) = D_801EE5D4[v0];
} else {
s32 v0 = func_80184B44();
*(s32 *)(a0 + 0xE4) = D_801EE5F0[v0];
func_80184BA0();
}
}
extern void func_8012C1B8(void);
extern void func_8012CAE4(void *a0);
extern void func_8001C214(s32 a0, s32 a1);
extern void func_8012A828(s32 a0, s32 a1);
extern void func_8012E8E0(s32 a0, s32 a1);
extern s32 func_80178B18(s32 a0, s32 a1);
void func_801EE3C4(void *a0) {
extern s32 D_801F6564;
extern s32 D_801F7310;
extern s32 D_801EE510;
extern s32 D_801EE540;
s32 v0;
s32 ptr;
v0 = ((s32 (*)(void))func_8012C1B8)();
*(s32 *)((s32)a0 + 0x20) = v0;
if (v0 == 0) {
func_8012CAE4(a0);
} else {
func_8001C214(v0, (s32)&D_801F6564);
ptr = *(s32 *)((s32)a0 + 0x68);
*(s16 *)(ptr + 0xC) = 0x7FFF;
*(s16 *)((s32)a0 + 0x2) = 1;
func_8012A828((s32)a0, (s32)&D_801F7310);
func_8012E8E0((s32)a0, (s32)&D_801EE510);
*(s16 *)((s32)a0 + 0x34) = 0;
func_80178B18((s32)a0, (s32)&D_801EE540);
}
}
src/md_SC07_003/md_SC07_003.c
+27 -5
View File
@@ -62,7 +62,13 @@ INCLUDE_ASM("asm/md_SC07_003/nonmatchings/md_SC07_003", func_801A227C);
INCLUDE_ASM("asm/md_SC07_003/nonmatchings/md_SC07_003", func_801A2318);
INCLUDE_ASM("asm/md_SC07_003/nonmatchings/md_SC07_003", func_801A2384);
extern void func_8012AD80(void);
s32 func_801A2384(s32 arg0) {
((void (*)(s32))func_8012AD80)(*(s32 *)(arg0 + 0xd8));
}
INCLUDE_ASM("asm/md_SC07_003/nonmatchings/md_SC07_003", func_801A23A8);
@@ -86,15 +92,31 @@ INCLUDE_ASM("asm/md_SC07_003/nonmatchings/md_SC07_003", func_801A2E20);
INCLUDE_ASM("asm/md_SC07_003/nonmatchings/md_SC07_003", func_801A2EC8);
INCLUDE_ASM("asm/md_SC07_003/nonmatchings/md_SC07_003", func_801A3014);
extern void func_8017F578(void);
void func_801A3014(void) {
func_8017F578();
}
extern void func_8017F004(void);
void func_801A3034(void) {
func_8017F004();
}
INCLUDE_ASM("asm/md_SC07_003/nonmatchings/md_SC07_003", func_801A3034);
INCLUDE_ASM("asm/md_SC07_003/nonmatchings/md_SC07_003", func_801A3054);
INCLUDE_ASM("asm/md_SC07_003/nonmatchings/md_SC07_003", func_801A30EC);
extern void func_8018672C(int);
void func_801A30EC(void) {
func_8018672C(0x9);
}
extern void func_80186758(void);
void func_801A310C(void) {
func_80186758();
}
INCLUDE_ASM("asm/md_SC07_003/nonmatchings/md_SC07_003", func_801A310C);
INCLUDE_ASM("asm/md_SC07_003/nonmatchings/md_SC07_003", func_801A312C);
src/md_SC07_004/md_SC07_004.c
+10 -2
View File
@@ -48,7 +48,11 @@ INCLUDE_RODATA("asm/md_SC07_004/nonmatchings/md_SC07_004", D_801A0168);
INCLUDE_ASM("asm/md_SC07_004/nonmatchings/md_SC07_004", func_801A1F3C);
INCLUDE_ASM("asm/md_SC07_004/nonmatchings/md_SC07_004", func_801A2310);
extern void func_8017F578(void);
void func_801A2310(void) {
func_8017F578();
}
INCLUDE_ASM("asm/md_SC07_004/nonmatchings/md_SC07_004", func_801A2330);
@@ -73,7 +77,11 @@ s32 func_801A2C54(s32 arg0) {
}
INCLUDE_ASM("asm/md_SC07_004/nonmatchings/md_SC07_004", func_801A2C68);
extern void func_8017C068(void);
void func_801A2C68(void) {
func_8017C068();
}
INCLUDE_ASM("asm/md_SC07_004/nonmatchings/md_SC07_004", func_801A2C88);
src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c
+9 -1
View File
@@ -7134,7 +7134,15 @@ void func_801877C8(int param_1)
}
INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_8017AE2C", func_80187800);
extern s32 func_800D0CE0(void);
extern void func_8012C098(void);
void func_80187800(int param_1)
{
if (((int (*)(void))func_800D0CE0)() != 0) {
((void (*)(int))func_8012C098)(param_1);
}
}
INCLUDE_ASM("asm/ov_SC02_011/nonmatchings/ov_SC02_011_jr_8017AE2C", func_80187838);
src/ov_SC03_001/ov_SC03_001_jr_8018A3A8.c
+146 -11
View File
@@ -3126,22 +3126,13 @@ extern void func_80189030(void);
extern s16 D_800B9A02;
extern u8 D_801151C8[];
extern s32 D_801151D0;
extern s16 D_80115126;
extern u16 D_80115112;
extern u16 D_8011511A;
extern u8 D_80115138[];
extern u8 D_80115148[];
extern s32 D_80115130;
extern u8 D_800B9A15;
extern s16 D_801EF1E8;
extern u16 D_801EF1EC;
extern s16 D_801EF1F0;
extern s32 D_801EF1E0;
extern s32 D_801EF1E4;
extern s16 D_801EF270;
extern s16 D_801EF274;
extern s16 D_801EF278;
extern s16 D_801EF27C;
@@ -3155,7 +3146,6 @@ extern s16 D_801EEB10;
extern s32 D_801F4334;
extern s32 D_801F0D18;
extern s32 D_801F1374;
extern s32 D_801C17F0;
extern u8 D_801C1884[];
extern s32 D_801C184C[];
extern s32 resLoad_lastId;
@@ -3177,6 +3167,19 @@ extern s32 func_8018C000(s32 a0, s16 a1);
extern s16 func_8018C914(s32 a0);
void func_8018A3A8(void) {
/* [T51] scoped in from file scope: a file-scope decl of these symbols constrains every
LATER function in this TU, which blocks a byte-true decl of a different type.
Declaration-only move (cookbook §103); the whole-binary byte-gate is the arbiter. */
extern u8 D_801151C8[];
extern s16 D_801EF1E8;
extern u8 D_800B9A15;
extern u16 D_80115112;
extern s32 D_801EF1E0;
extern s32 D_80115130;
extern s32 D_801C17F0;
extern s16 D_801EF270;
extern s32 D_801EF1E4;
extern u16 D_8011511A;
s32 s0;
s32 pad[2];
(void)&pad;
@@ -3381,7 +3384,139 @@ void func_8018A3A8(void) {
func_80137B80();
}
INCLUDE_ASM("asm/ov_SC03_001/nonmatchings/ov_SC03_001_jr_8018A3A8", func_8018ABAC);
extern s16 func_8014168C(s16 a0);
extern void func_8014BB24(s32 a0, s32 a1, s32 a2);
extern void func_8014B944(s32 a0, s32 a1, s32 a2);
extern void func_8014B2A8(void);
extern void func_801F1A24(s32 a0);
extern void func_8014BD24(s32 a0, s32 a1);
extern void func_8018C960(void);
extern s32 func_801621CC(s32 arg0);
extern void func_801622C4(void);
extern void func_80139954(void);
extern void func_8018B238(void);
extern void func_80137B80(void);
extern s32 func_801376E8(s32 a0, s32 a1);
extern int func_8001AAA0(void);
extern s32 func_801399F0(s32 a0);
extern void func_8002D4C8(s32 a0, s32 a1);
void func_8018ABAC(void)
{
extern s32 D_80126B58;
extern u8 D_801151C8[];
extern s16 D_801EF1E8;
extern s16 D_801C17F4[];
extern u8 D_800B9A15;
extern u16 D_80115112;
extern s32 D_801EF1E0;
extern s32 D_801F437C;
extern s32 D_80115130;
extern s32 D_801C17F0;
extern s16 D_801EF270;
extern s32 D_801EF1E4;
/* [T51] scoped in from file scope: a file-scope decl of these symbols constrains every
LATER function in this TU, which blocks a byte-true decl of a different type.
Declaration-only move (cookbook §103); the whole-binary byte-gate is the arbiter. */
/* [T51] scoped in from file scope: a file-scope decl of these symbols constrains every
LATER function in this TU, which blocks a byte-true decl of a different type.
Declaration-only move (cookbook §103); the whole-binary byte-gate is the arbiter. */
extern u16 D_8011511A;
register s16 s0 __asm__("$16");
register s32 s1 __asm__("$17");
register s32 s2 __asm__("$18");
register s32 base __asm__("$19");
s32 pad[2];
(void)&pad;
D_801151D0 = *(s32 *)&D_801151C8[(u16)D_800B9A02 * 4];
base = (s32)&D_80126B58;
if (D_801EF1E8 != 0) {
D_801EF1E8 = D_801EF1E8 - 1;
s0 = func_8014168C((s16)D_8011511A);
if ((s16)s0 != 3) {
s2 = 8;
s1 = 0x3E7;
} else {
s2 = 3;
s1 = 0x18;
}
if (D_801EF1E8 >= 0x3F) {
if ((s16)D_801EF1EC != 0xFF) {
D_801EF1EC += 0x10;
if ((s16)D_801EF1EC >= 0x100) {
D_801EF1EC = 0xFF;
}
} else {
D_801EF1F0 = *(u16 *)&D_801EF1F0 + 0x10;
if (D_801EF1F0 >= 0x100) {
D_801EF1F0 = 0xFF;
}
}
} else {
if (D_801EF1E8 < 0x20) {
if (D_801EF1F0 != 0) {
D_801EF1F0 -= 0x10;
if ((s16)D_801EF1F0 < 0) {
D_801EF1F0 = 0;
}
} else {
D_801EF1EC -= 0x10;
if ((s16)D_801EF1EC < 0) {
D_801EF1EC = 0;
}
}
} else if (D_801EF1E8 == 0x30) {
s0 = (s16)s0;
func_8014BB24(base, D_801C17F4[s0], 1);
func_8014B944(base, 0x1000000, 1);
if (s0 == 2) {
func_8014B2A8();
}
func_801F1A24(s2);
func_8014BD24(base, s1);
}
}
func_8018C960();
if (D_801EF1E8 == 0) {
if (func_801621CC(s2) != 0) {
func_801622C4();
func_80139954();
D_800B9A15 = 0;
D_80115112 = 4;
return;
}
}
} else {
if (D_801EF1E0 == 0) {
D_801EF1E0 = (s32)&D_801F437C;
D_80115130 = (s32)&D_801F437C;
func_80139954();
D_801EF1E4 = func_801376E8(D_801EF1E0, (s32)&D_801C17F0);
if (D_801EF270 != 0) {
((s32 (*)(s32))func_8001AAA0)(0x16);
}
} else {
if (func_801399F0(D_801EF1E4) != 0) {
D_801EF1E0 = 0;
func_8002D4C8(0x46F, 0);
D_8011511A = 0;
D_80115112 = 2;
}
}
}
func_8018B238();
func_80137B80();
}
src/ov_SC03_002/ov_SC03_002_jr_8017D604.c
+9 -1
View File
@@ -3905,7 +3905,15 @@ extern s32 func_80171990(u8 *a0);
}
INCLUDE_ASM("asm/ov_SC03_002/nonmatchings/ov_SC03_002_jr_8017D604", func_80180710);
extern int func_800D0CE0(void);
extern void func_80171928(void*);
void func_80180710(int param_1)
{
if (((int (*)(void))func_800D0CE0)() != 0) {
((void (*)(int))func_80171928)(param_1);
}
}
extern void func_8016EE40(s32 a0, s32 a1, s32 a2);
extern M2C_UNK D_8018979C;
src/ov_SC03_097/ov_SC03_097_jr_8017D898.c
+10 -2
View File
@@ -3347,7 +3347,11 @@ s32 func_8017EB28(void) {
INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_jr_8017D898", func_8017EB30);
INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_jr_8017D898", func_8017EB98);
extern s32 func_800D1EBC(void);
void func_8017EB98(void) {
((void (*)(void))func_800D1EBC)();
}
extern void (*D_80189B5C[])(void);
@@ -3419,7 +3423,11 @@ s32 func_8017ECF0(void) {
INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_jr_8017D898", func_8017ECF8);
INCLUDE_ASM("asm/ov_SC03_097/nonmatchings/ov_SC03_097_jr_8017D898", func_8017ED58);
extern s32 func_800D1EBC(void);
void func_8017ED58(void) {
((void (*)(void))func_800D1EBC)();
}
extern void func_8016EE40(s32 a0, s32 a1, s32 a2);
void func_8017ED78(void) {
src/ov_SC03_107/ov_SC03_107.c
+5 -1
View File
@@ -25593,7 +25593,11 @@ s32 func_8017CB70(u8 *a0) {
}
INCLUDE_ASM("asm/ov_SC03_107/nonmatchings/ov_SC03_107", func_8017CBEC);
extern void func_800D1EBC(void);
void func_8017CBEC(void) {
func_800D1EBC();
}
src/ov_SC03_119/ov_SC03_119_jr_8017FB84.c
+5 -1
View File
@@ -3629,7 +3629,11 @@ s32 func_801817BC(s32 a0) {
INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_jr_8017FB84", func_801817FC);
INCLUDE_ASM("asm/ov_SC03_119/nonmatchings/ov_SC03_119_jr_8017FB84", func_8018188C);
extern s32 func_800D1EBC(void);
void func_8018188C(void) {
((void (*)(void))func_800D1EBC)();
}
extern void (*D_8018DDB4[])(void);
src/ov_SC03_124/ov_SC03_124_jr_80187010.c
+136 -1
View File
@@ -3247,7 +3247,142 @@ void func_80187010(void) {
func_80137B80();
}
INCLUDE_ASM("asm/ov_SC03_124/nonmatchings/ov_SC03_124_jr_80187010", func_80187814);
extern s16 func_8014168C(s16 a0);
extern void func_8014BB24(s32 a0, s32 a1, s32 a2);
extern void func_8014B944(s32 a0, s32 a1, s32 a2);
extern void func_8014B2A8(void);
extern void func_801E4BA4(s32 a0);
extern void func_8014BD24(s32 a0, s32 a1);
extern void func_801895C8(void);
extern s32 func_801621CC(s32 arg0);
extern void func_801622C4(void);
extern void func_80139954(void);
extern void func_80187EA0(void);
extern void func_80137B80(void);
extern s32 func_801376E8(s32 a0, s32 a1);
extern int func_8001AAA0(void);
extern s32 func_801399F0(s32 a0);
extern void func_8002D4C8(s32 a0, s32 a1);
void func_80187814(void)
{
extern s32 D_80126B58;
extern u8 D_801151C8[];
extern s16 D_801E2360;
extern s16 D_801BCB5C[];
extern u8 D_800B9A15;
extern u16 D_80115112;
extern s32 D_801E2358;
extern s32 D_801E7408;
extern s32 D_80115130;
extern s32 D_801BCB58;
extern s16 D_801E23E8;
extern s32 D_801E235C;
/* [T51] scoped in from file scope: a file-scope decl of these symbols constrains every
LATER function in this TU, which blocks a byte-true decl of a different type.
Declaration-only move (cookbook §103); the whole-binary byte-gate is the arbiter. */
extern u16 D_801E2364;
extern s16 D_801E2368;
/* [T51] scoped in from file scope: a file-scope decl of these symbols constrains every
LATER function in this TU, which blocks a byte-true decl of a different type.
Declaration-only move (cookbook §103); the whole-binary byte-gate is the arbiter. */
extern s32 D_801151D0;
extern u16 D_8011511A;
register s16 s0 __asm__("$16");
register s32 s1 __asm__("$17");
register s32 s2 __asm__("$18");
register s32 base __asm__("$19");
s32 pad[2];
(void)&pad;
D_801151D0 = *(s32 *)&D_801151C8[(u16)D_800B9A02 * 4];
base = (s32)&D_80126B58;
if (D_801E2360 != 0) {
D_801E2360 = D_801E2360 - 1;
s0 = func_8014168C((s16)D_8011511A);
if ((s16)s0 != 3) {
s2 = 8;
s1 = 0x3E7;
} else {
s2 = 3;
s1 = 0x18;
}
if (D_801E2360 >= 0x3F) {
if ((s16)D_801E2364 != 0xFF) {
D_801E2364 += 0x10;
if ((s16)D_801E2364 >= 0x100) {
D_801E2364 = 0xFF;
}
} else {
D_801E2368 = *(u16 *)&D_801E2368 + 0x10;
if (D_801E2368 >= 0x100) {
D_801E2368 = 0xFF;
}
}
} else {
if (D_801E2360 < 0x20) {
if (D_801E2368 != 0) {
D_801E2368 -= 0x10;
if ((s16)D_801E2368 < 0) {
D_801E2368 = 0;
}
} else {
D_801E2364 -= 0x10;
if ((s16)D_801E2364 < 0) {
D_801E2364 = 0;
}
}
} else if (D_801E2360 == 0x30) {
s0 = (s16)s0;
func_8014BB24(base, D_801BCB5C[s0], 1);
func_8014B944(base, 0x1000000, 1);
if (s0 == 2) {
func_8014B2A8();
}
func_801E4BA4(s2);
func_8014BD24(base, s1);
}
}
func_801895C8();
if (D_801E2360 == 0) {
if (func_801621CC(s2) != 0) {
func_801622C4();
func_80139954();
D_800B9A15 = 0;
D_80115112 = 4;
return;
}
}
} else {
if (D_801E2358 == 0) {
D_801E2358 = (s32)&D_801E7408;
D_80115130 = (s32)&D_801E7408;
func_80139954();
D_801E235C = func_801376E8(D_801E2358, (s32)&D_801BCB58);
if (D_801E23E8 != 0) {
((s32 (*)(s32))func_8001AAA0)(0x16);
}
} else {
if (func_801399F0(D_801E235C) != 0) {
D_801E2358 = 0;
func_8002D4C8(0x46F, 0);
D_8011511A = 0;
D_80115112 = 2;
}
}
}
func_80187EA0();
func_80137B80();
}
src/ov_SC04_012/ov_SC04_012_jr_8017AE2C.c
+21 -3
View File
@@ -3947,11 +3947,29 @@ INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_jr_8017AE2C", func_8017D6E
INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_jr_8017AE2C", func_8017D720);
INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_jr_8017AE2C", func_8017D770);
extern void func_800D1724(s32);
void func_8017D770(void) {
INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_jr_8017AE2C", func_8017D798);
extern s32 D_80182010;
((s32 (*)(s32 *))func_800D1724)(&D_80182010);
}
extern void func_800D1724(s32);
void func_8017D798(void) {
extern s32 D_80181FEC;
((s32 (*)(s32 *))func_800D1724)(&D_80181FEC);
}
extern void func_800D1724(s32);
void func_8017D7C0(void) {
extern s32 D_80182034;
((s32 (*)(s32 *))func_800D1724)(&D_80182034);
}
INCLUDE_ASM("asm/ov_SC04_012/nonmatchings/ov_SC04_012_jr_8017AE2C", func_8017D7C0);
void func_8017D7E8(void) {
}
src/ov_SC04_018/ov_SC04_018_jr_8017AE2C.c
+7 -1
View File
@@ -5279,7 +5279,13 @@ s32 func_8018011C(void) {
}
INCLUDE_ASM("asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C", func_80180134);
extern void func_800D1724(s32);
void func_80180134(void) {
extern s32 D_80190F88;
((s32 (*)(s32 *))func_800D1724)(&D_80190F88);
}
DEFINE_func_8018015C() /* dedup: shared engine-core @0x8018015C (src/shared) */
src/ov_SC04_019/ov_SC04_019_jr_8017AE2C.c
+7 -1
View File
@@ -5310,7 +5310,13 @@ s32 func_8018011C(void) {
}
INCLUDE_ASM("asm/ov_SC04_019/nonmatchings/ov_SC04_019_jr_8017AE2C", func_80180134);
extern void func_800D1724(s32);
void func_80180134(void) {
extern s32 D_80190F88;
((s32 (*)(s32 *))func_800D1724)(&D_80190F88);
}
DEFINE_func_8018015C() /* dedup: shared engine-core @0x8018015C (src/shared) */
src/ov_SC05_017/ov_SC05_017_jr_801875E8.c
+148 -10
View File
@@ -2981,17 +2981,9 @@ extern void func_801861AC(void);
extern s16 D_800B9A02;
extern u8 D_801151C8[];
extern u16 D_80115112;
extern u8 D_80115138[];
extern u8 D_80115148[];
extern s32 D_80115130;
extern u8 D_800B9A15;
extern s16 D_801ED568;
extern s32 D_801ED560;
extern s32 D_801ED564;
extern s16 D_801ED5F0;
extern s16 D_801ED5F8;
extern s16 D_801ED5FC;
extern s16 D_801ED600;
@@ -3004,7 +2996,6 @@ extern s16 D_801ECE90;
extern s32 D_801F27B0;
extern s32 D_801EF194;
extern s32 D_801EF7F0;
extern s32 D_801B93CC;
extern u8 D_801B9460[];
extern s32 D_801B9428[];
extern s32 resLoad_lastId;
@@ -3026,6 +3017,18 @@ extern s32 func_80189240(s32 a0, s16 a1);
extern s16 func_80189B54(s32 a0);
void func_801875E8(void) {
/* [T51] scoped in from file scope: a file-scope decl of these symbols constrains every
LATER function in this TU, which blocks a byte-true decl of a different type.
Declaration-only move (cookbook §103); the whole-binary byte-gate is the arbiter. */
extern u8 D_801151C8[];
extern s16 D_801ED568;
extern u8 D_800B9A15;
extern u16 D_80115112;
extern s32 D_801ED560;
extern s32 D_80115130;
extern s32 D_801B93CC;
extern s16 D_801ED5F0;
extern s32 D_801ED564;
/* [T51] scoped in from file scope: a file-scope decl of these symbols constrains every
LATER function in this TU, which blocks a byte-true decl of a different type.
Declaration-only move (cookbook §103); the whole-binary byte-gate is the arbiter. */
@@ -3242,7 +3245,142 @@ void func_801875E8(void) {
func_80137B80();
}
INCLUDE_ASM("asm/ov_SC05_017/nonmatchings/ov_SC05_017_jr_801875E8", func_80187DEC);
extern s16 func_8014168C(s16 a0);
extern void func_8014BB24(s32 a0, s32 a1, s32 a2);
extern void func_8014B944(s32 a0, s32 a1, s32 a2);
extern void func_8014B2A8(void);
extern void func_801EFF44(s32 a0);
extern void func_8014BD24(s32 a0, s32 a1);
extern void func_80189BA0(void);
extern s32 func_801621CC(s32 arg0);
extern void func_801622C4(void);
extern void func_80139954(void);
extern void func_80188478(void);
extern void func_80137B80(void);
extern s32 func_801376E8(s32 a0, s32 a1);
extern int func_8001AAA0(void);
extern s32 func_801399F0(s32 a0);
extern void func_8002D4C8(s32 a0, s32 a1);
void func_80187DEC(void)
{
extern s32 D_80126B58;
extern u8 D_801151C8[];
extern s16 D_801ED568;
extern s16 D_801B93D0[];
extern u8 D_800B9A15;
extern u16 D_80115112;
extern s32 D_801ED560;
extern s32 D_801F27F8;
extern s32 D_80115130;
extern s32 D_801B93CC;
extern s16 D_801ED5F0;
extern s32 D_801ED564;
/* [T51] scoped in from file scope: a file-scope decl of these symbols constrains every
LATER function in this TU, which blocks a byte-true decl of a different type.
Declaration-only move (cookbook §103); the whole-binary byte-gate is the arbiter. */
extern u16 D_801ED56C;
extern s16 D_801ED570;
/* [T51] scoped in from file scope: a file-scope decl of these symbols constrains every
LATER function in this TU, which blocks a byte-true decl of a different type.
Declaration-only move (cookbook §103); the whole-binary byte-gate is the arbiter. */
extern s32 D_801151D0;
extern u16 D_8011511A;
register s16 s0 __asm__("$16");
register s32 s1 __asm__("$17");
register s32 s2 __asm__("$18");
register s32 base __asm__("$19");
s32 pad[2];
(void)&pad;
D_801151D0 = *(s32 *)&D_801151C8[(u16)D_800B9A02 * 4];
base = (s32)&D_80126B58;
if (D_801ED568 != 0) {
D_801ED568 = D_801ED568 - 1;
s0 = func_8014168C((s16)D_8011511A);
if ((s16)s0 != 3) {
s2 = 8;
s1 = 0x3E7;
} else {
s2 = 3;
s1 = 0x18;
}
if (D_801ED568 >= 0x3F) {
if ((s16)D_801ED56C != 0xFF) {
D_801ED56C += 0x10;
if ((s16)D_801ED56C >= 0x100) {
D_801ED56C = 0xFF;
}
} else {
D_801ED570 = *(u16 *)&D_801ED570 + 0x10;
if (D_801ED570 >= 0x100) {
D_801ED570 = 0xFF;
}
}
} else {
if (D_801ED568 < 0x20) {
if (D_801ED570 != 0) {
D_801ED570 -= 0x10;
if ((s16)D_801ED570 < 0) {
D_801ED570 = 0;
}
} else {
D_801ED56C -= 0x10;
if ((s16)D_801ED56C < 0) {
D_801ED56C = 0;
}
}
} else if (D_801ED568 == 0x30) {
s0 = (s16)s0;
func_8014BB24(base, D_801B93D0[s0], 1);
func_8014B944(base, 0x1000000, 1);
if (s0 == 2) {
func_8014B2A8();
}
func_801EFF44(s2);
func_8014BD24(base, s1);
}
}
func_80189BA0();
if (D_801ED568 == 0) {
if (func_801621CC(s2) != 0) {
func_801622C4();
func_80139954();
D_800B9A15 = 0;
D_80115112 = 4;
return;
}
}
} else {
if (D_801ED560 == 0) {
D_801ED560 = (s32)&D_801F27F8;
D_80115130 = (s32)&D_801F27F8;
func_80139954();
D_801ED564 = func_801376E8(D_801ED560, (s32)&D_801B93CC);
if (D_801ED5F0 != 0) {
((s32 (*)(s32))func_8001AAA0)(0x16);
}
} else {
if (func_801399F0(D_801ED564) != 0) {
D_801ED560 = 0;
func_8002D4C8(0x46F, 0);
D_8011511A = 0;
D_80115112 = 2;
}
}
}
func_80188478();
func_80137B80();
}
src/ov_SC05_018/ov_SC05_018_jr_8017D604.c
+7 -1
View File
@@ -3747,7 +3747,13 @@ s32 func_80181720(void) {
}
INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018_jr_8017D604", func_80181738);
extern void func_800D1724(s32);
void func_80181738(void) {
extern s32 D_8018A7D4;
((s32 (*)(s32 *))func_800D1724)(&D_8018A7D4);
}
INCLUDE_ASM("asm/ov_SC05_018/nonmatchings/ov_SC05_018_jr_8017D604", func_80181760);
src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c
+7 -1
View File
@@ -6461,7 +6461,13 @@ extern void func_80181918(void);
}
INCLUDE_ASM("asm/ov_SC06_000/nonmatchings/ov_SC06_000_jr_8017AE2C", func_80184A28);
extern void func_800D1724(s32);
void func_80184A28(void) {
extern s32 D_8018BFF0;
((s32 (*)(s32 *))func_800D1724)(&D_8018BFF0);
}
void func_80184A50(void *a0) {
*(short *)((char *)a0 + 0x2) = 0x2;
src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c
+12 -2
View File
@@ -3813,9 +3813,19 @@ INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_jr_8017BEBC", func_8017E52
INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_jr_8017BEBC", func_8017E554);
INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_jr_8017BEBC", func_8017E56C);
extern int func_8001AAA0(void);
void func_8017E56C(void) {
((void (*)(int))func_8001AAA0)(0x97);
}
extern void func_800D1724(s32);
void func_8017E58C(void) {
extern s32 D_8018608C;
((s32 (*)(s32 *))func_800D1724)(&D_8018608C);
}
INCLUDE_ASM("asm/ov_SC07_000/nonmatchings/ov_SC07_000_jr_8017BEBC", func_8017E58C);
s32 func_8017E5B4(void) {
return 0;
src/ov_SC07_002/ov_SC07_002_jr_8017C8D0.c
+26 -1
View File
@@ -3457,7 +3457,32 @@ s32 func_8017EEB8(s32 a0) {
}
INCLUDE_ASM("asm/ov_SC07_002/nonmatchings/ov_SC07_002_jr_8017C8D0", func_8017EEF8);
extern void func_8002D4C8(s32 a0, s32 a1);
extern void func_8001BFD0(void);
extern void func_800D0C48(s32 a0);
extern void func_80016940(s32 a0);
s32 func_8017EEF8(void *a0) {
s32 v0;
s32 v1 = -1;
v0 = *(s32 *)(a0 + 0x28);
v0 += -1;
*(s32 *)(a0 + 0x28) = v0;
if (v0 == v1) {
func_8002D4C8(0x1C, 0);
func_8001BFD0();
func_8002D4C8(0x1D, 0);
func_800D0C48(1);
func_80016940(4);
*(u8 *)(a0 + 0x15) = *(u8 *)(a0 + 0x15) + 1;
}
return 0;
}
extern s32 func_80016978(s32 arg);
extern void func_80029240(void);
src/ov_SC07_006/ov_SC07_006_jr_80183814.c
+7 -1
View File
@@ -5381,7 +5381,13 @@ s32 func_80189CDC(void *a0) {
}
INCLUDE_ASM("asm/ov_SC07_006/nonmatchings/ov_SC07_006_jr_80183814", func_80189CF0);
extern void func_800D1724(s32);
void func_80189CF0(void) {
extern s32 D_8018DE1C;
((s32 (*)(s32 *))func_800D1724)(&D_8018DE1C);
}
extern void func_8017D040(s8 a0);
void func_80189D18(void) {
tools/family_remap.py
+43 -1
View File
@@ -102,6 +102,32 @@ def fn_addrs(ov):
return frozenset(int(json.loads(l)["addr"], 16) for l in open(f".run/sig.{ov}.jsonl"))
@functools.lru_cache(maxsize=None)
def extern_fn_addrs():
"""FUNCTION start addresses of the ALWAYS-LINKED images (the resident + main).
WHY `fn_addrs(to_ov)` ALONE IS THE WRONG QUESTION (P30 S47, byte-witnessed on 611 rows).
The kind test below spells a reloc target `func_` iff the address is a function IN THE SIBLING'S
OWN SIG, else `D_`. But a body routinely calls OUTSIDE its own image: an overlay calls resident
helpers, an md_* module calls the overlay-range engine. Those addresses are absent from the
sibling's sig, so the test fell through to `D_` and emitted a DATA name for a FUNCTION —
`D_800183E0`, `D_800D1EBC`, `D_80171A1C` — none of which exist anywhere in src/ or the symbol
file, while `func_80171A1C` alone has 1,061 references. Result: `undefined reference` at LINK
time, 611 member-rows across 45 symbols, the largest single residue class in the sweep.
"Not in MY sig" means "not mine", NOT "is data" — so ask the shared images too before defaulting.
Measured: 0x800183E0 is a function only in main's sig; 0x800D1EBC only in the resident's;
0x80171A1C in 141 overlay sigs (so an md_* sibling hit the same fallthrough)."""
out = set()
for b in ("resident", "main"):
p = f".run/sig.{b}.jsonl"
if os.path.exists(p):
try:
out |= {int(json.loads(l)["addr"], 16) for l in open(p)}
except Exception: # a malformed sig must not break remapping
pass
return frozenset(out)
def reloc_targets(ov, addr, data=None):
"""ordered [(kind, resolved_addr)] for jal targets + lui/lo address loads, in instruction order.
Verified against splat .s ground truth (22/22 on func_80141100; 15/15 on func_801407F4 whose
@@ -581,7 +607,23 @@ def symbol_map(addr, from_ov, to_ov, to_addr=None):
# possible way: `rtu_match` MASKS HI16/LO16, so a wrong %hi/%lo symbol still reports
# MATCH (measured: `MATCH (10 ins)` on a member the fleet gate refused). Spell the
# target by what the target address IS in the SIBLING's overlay.
tgt = f"func_{at:08X}" if at in fn_addrs(to_ov) else f"D_{at:08X}"
# ...and ask the ALWAYS-LINKED images too, not just the sibling's own sig — a body
# calls outside its image constantly, and "absent from my sig" is not "is data"
# (see extern_fn_addrs: 611 undefined-reference rows across 45 symbols).
# THREE ORACLES, STRONGEST FIRST — and never a blanket `D_` fallback:
# 1. the SIBLING'S OWN sig: authoritative for its image, and the reason the T82 case
# above still works (a slot that is a function in the exemplar and DATA in the
# member is decided here, by the member's own boundaries).
# 2. the ALWAYS-LINKED images (resident + main): a body calls outside its image
# constantly, and their address ranges cannot collide with an overlay's.
# 3. the EXEMPLAR REACHED IT BY `jal`: a call target is a function BY DEFINITION, so
# for an external address neither sig covers (an md_* module calling the
# overlay-range engine — 0x80171A1C, 112 rows) this is evidence, not a guess.
# Only a non-call reloc whose target no oracle claims falls to `D_`.
if at in fn_addrs(to_ov) or at in extern_fn_addrs() or ke == "call":
tgt = f"func_{at:08X}"
else:
tgt = f"D_{at:08X}"
if ke == "call":
m[f"func_{ae:08X}"] = tgt
else: