Some cleanup of zTalkBox before I moved on - #785
Open
AARJL wants to merge 24 commits into
Open
Conversation
…o used code formmatting tool
All other functions in zTalkBox.cpp have a 100% match
Made sure all functions use DWARF local variables when possible
Reordered functions in zTalkBox to try to match objdiff, not all are in the correct order but most are
Completed .bss (8f38) with 100% match
Completed .ctors (4) with 100% match
Completed .data (118) with 100% match
Completed .rodata (1c8) with 100% match
Completed .sbss (20) with 100% match
Completed .sbss2 (8) with 100% match
Completed .sdata (10) with 100% match
Completed .sdata2 (20) with 100% match but [.sdata2-0] is still at 85%
.text (3434) is at a 98% match
.text (224) is at a 96% match
.text (1bc) has 4 100% macthes and one 73% match
Remaining functions in zTalkBox.cpp have 100% match Made sure all functions use DWARF local variables when possible Reordered functions in zTalkBox to try to match objdiff, not all are in the correct order but most are Completed .bss (8f38) with 100% match Completed .ctors (4) with 100% match Completed .data (118) with 100% match Completed .rodata (1c8) with 100% match Completed .sbss (20) with 100% match Completed .sbss2 (8) with 100% match Completed .sdata (10) with 100% match Completed .sdata2 (20) with 100% match but [.sdata2-0] is still at 85% .text (3434) is at a 98% match .text (224) is at a 96% match .text (1bc) has 4 100% macthes and one 73% match
Modified it to get some matches but caused a small regression
I will work through the regression after the PR is discuseed
Removed redundant structs from zTalkBox.h causing errors in other files
Now has a 100% match with fixed_queue<aqua_beam::ring_segment, 31>::iterator::operator+=(int) and with fixed_queue<@unnamed@zTalkBox_cpp@::trigger_pair, 32>::iterator::operator+=(int) Reverted zTalkBox.cpp DWARF to it's original state
As a bonus, also got a 100% match here Updated MasterLovesSlaves to use correct Base tags Updated .xSnd.h and moved sound_queue methods into the template class Other minor cleanups
I moved it to the front, but it caused ObjDiff to not recongize the functions.
|
| Section | From | To | Bytes | |
|---|---|---|---|---|
| ️ |
.data |
99.22% | 91.43% | --24 |
| ️ |
.text |
90.99% | 90.70% | --32 |
| Function | From | To | Bytes | |
|---|---|---|---|---|
| ️ |
ztalkbox::callback::callback() |
100.00% | 0.00% | --16 |
| ️ |
ztalkbox::callback::on_signal(unsigned int) |
100.00% | 0.00% | --4 |
| ️ |
ztalkbox::callback::on_start() |
100.00% | 0.00% | --4 |
| ️ |
ztalkbox::callback::on_stop() |
100.00% | 0.00% | --4 |
| ️ |
ztalkbox::callback::on_answer(ztalkbox::answer_enum) |
100.00% | 0.00% | --4 |
main/SB/Game/zTalkBox
| Section | From | To | Bytes | |
|---|---|---|---|---|
| 📈 | .text |
98.13% | 99.09% | +138 |
| Function | From | To | Bytes | |
|---|---|---|---|---|
| 📈 | @unnamed@zTalkBox_cpp@::trigger_sound(const xtextbox::jot&) |
94.91% | 97.95% | +19 |
| ✅ | @unnamed@zTalkBox_cpp@::stop_audio_effect() |
87.38% | 100.00% | +10 |
| ✅ | @unnamed@zTalkBox_cpp@::refresh_prompts() |
96.48% | 100.00% | +12 |
| ✅ | ztalkbox::update_all(xScene&, float) |
95.57% | 100.00% | +16 |
| 📈 | @unnamed@zTalkBox_cpp@::next_state_type::start() |
90.83% | 97.92% | +27 |
| 📈 | @unnamed@zTalkBox_cpp@::wait_state_type::stop() |
93.40% | 97.57% | +11 |
| ✅ | pointer_asset::type_name() |
0.00% | 100.00% | +16 |
| ✅ | location_asset::type_name() |
0.00% | 100.00% | +16 |
| ✅ | xtextbox::layout::jots() const |
0.00% | 100.00% | +8 |
made in zTalkBox.h
|
| Section | From | To | Bytes | |
|---|---|---|---|---|
| 📈 | .text |
98.13% | 99.09% | +138 |
| Function | From | To | Bytes | |
|---|---|---|---|---|
| 📈 | @unnamed@zTalkBox_cpp@::trigger_sound(const xtextbox::jot&) |
94.91% | 97.95% | +19 |
| ✅ | @unnamed@zTalkBox_cpp@::stop_audio_effect() |
87.38% | 100.00% | +10 |
| ✅ | @unnamed@zTalkBox_cpp@::refresh_prompts() |
96.48% | 100.00% | +12 |
| ✅ | ztalkbox::update_all(xScene&, float) |
95.57% | 100.00% | +16 |
| 📈 | @unnamed@zTalkBox_cpp@::next_state_type::start() |
90.83% | 97.92% | +27 |
| 📈 | @unnamed@zTalkBox_cpp@::wait_state_type::stop() |
93.40% | 97.57% | +11 |
| ✅ | pointer_asset::type_name() |
0.00% | 100.00% | +16 |
| ✅ | location_asset::type_name() |
0.00% | 100.00% | +16 |
| ✅ | xtextbox::layout::jots() const |
0.00% | 100.00% | +8 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
No description provided.