Toy matches #2147
Open
Toy matches #2147
+2,127
−106
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
All three functions matched at 100%.
Integrated 5 functions that achieved high sandbox matches but failed automatic integration: - un_80309338 (99.88%) - Vec3 distance calculation - un_803062EC (99.91%) - Debug text display - un_80307018 (99.91%) - Background/fog setup - un_8030813C (99.86%) - Trophy model lookup - un_803078E4 (96.76%) - Light/sprite setup Fixed multiline string issues and prototype mismatches during integration.
- un_803053C4: 97.5% - Trophy_SetUnlockState: 94.9% - un_80305918: 98.7% - un_80306C5C: 91.1% - un_803075E8: 96.3% - un_803078E4: 96.8% - un_80307F64: 98.4% - un_80308354: 68.1% - un_803082F8: 91.2% - un_803102D0: 72.4% - un_803109A0: 87.7% - un_80311788: 81.3% - un_80312050: 91.8% Also add missing header includes for gobjgxlink.h, gobjobject.h, gobjplink.h
- un_80305FB8 (70.8% match) - C-stick Y input - un_80306D70 (82.6% match) - Sound play helper These are best-effort decompilations. The code is functionally equivalent but doesn't match byte-for-byte due to compiler code generation differences.
- un_80306EEC (96.3%) - Light object loading - un_8030715C (92.2%) - Camera/light position update - un_80307BA0 (99.4%) - Trophy JObj setup - un_80310324 (89.2%) - Trophy display initialization Also fix related header prototypes for un_8030FE48, un_803087F4, un_8030FA50.
Contributor
Report for GALE01 (762fb72 - 2553449)📈 Matched code: 51.38% (+0.08%, +2940 bytes) ✅ 11 new matches
📈 19 improvements in unmatched functions
|
The asm function definition was causing syntax errors. Call un_803063D4 directly instead of going through the call_text_func wrapper.
- un_8030813C: Change first param back to s16 (restores gm_1601 matches) - un_803063D4: Change to s32 return with s16 first param (restores un_803082F8/un_80308328) These prototype fixes restore cross-file compatibility at the cost of reducing un_803063D4 match from 100% to 90.32%.
Contributor
Author
|
Running permuter on 99% matches, then doing my own review, then flagging for review, please be patient 😆 |
- un_8030663C: Add temp variable in else branch for register alloc - un_80307018: Stack padding + variable reorder (applied by agent) - un_80306A48: Temp variables + declaration order changes - un_80311680: Split increment into separate load and add All 4 functions now 100% matched.
- Fix stale match percentages (un_80305FB8, un_80306EEC, un_8030715C, un_80310324) - Remove 100% match comment from un_803082F8 (now matches) - Add missing match comments for un_803063D4, un_80306D70, un_8030813C, un_80310660 - Add FAKE MATCH comment for dead code in un_80306EEC - Remove duplicate forward declaration of un_80306BB8
ribbanya
requested changes
Jan 30, 2026
Comment on lines
+647
to
+648
| // Decompilation of un_803062EC | ||
| // Unit: main/melee/ty/toy |
Collaborator
There was a problem hiding this comment.
Can you get it to stop doing this?
Comment on lines
+369
to
+372
| skip = 1; | ||
|
|
||
| check_skip: | ||
| if (skip == 0) { |
Collaborator
There was a problem hiding this comment.
I wonder if you can teach it to create an inline function every time it wants to create a label. In this case, this is clearly an inline bool whose result is being checked.
Comment on lines
+407
to
+409
| next_iter: | ||
| var_r25++; | ||
| var_r27 += 2; |
Collaborator
There was a problem hiding this comment.
This whole thing is a for loop and any goto next_iter should be continue.
Comment on lines
+742
to
+749
| typedef struct { | ||
| s16 x0; | ||
| s16 x2; | ||
| s16 x4; | ||
| s16 x6; | ||
| s16 x8; | ||
| s16 xA; | ||
| } ToyNameData; |
Collaborator
There was a problem hiding this comment.
Please put type definitions at the top of the file. Maybe use your static checker to flag them and then just move them up manually.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
More vacuuming work