Merged
Conversation
Report for GZ2E01 (e8e3644 - bfdb4d8)📈 Matched code: 62.09% (+0.11%, +13120 bytes) ✅ 69 new matches:
...and 39 more new matches 📈 24 improvements in unmatched functions:
|
hatal175
reviewed
May 29, 2025
include/d/actor/d_a_npc_ks.h
Outdated
| /* 0x5C4 */ f32 field_0x5c4; | ||
| /* 0x5C8 */ s16 field_0x5c8; | ||
| /* 0x5CA */ u8 field_0x5ca[0x5ea - 0x5ca]; | ||
| /* 0x5CA */ u8 field_0x5ca[0x5cc - 0x5ca]; |
Contributor
There was a problem hiding this comment.
field_0x5ca can be removed
include/d/actor/d_a_npc_ks.h
Outdated
| /* 0x604 */ s16 field_0x604; | ||
| /* 0x606 */ s16 field_0x606; | ||
| /* 0x608 */ s16 field_0x608; | ||
| /* 0x60A */ u8 field_0x60a[0x60c - 0x60a]; |
Contributor
There was a problem hiding this comment.
field_0x60a can be removed
include/d/actor/d_a_npc_ks.h
Outdated
| /* 0x60A */ u8 field_0x60a[0x60c - 0x60a]; | ||
| /* 0x60C */ f32 field_0x60c; | ||
| /* 0x610 */ s16 field_0x610; | ||
| /* 0x612 */ u8 field_0x612[0x614 - 0x612]; |
Contributor
There was a problem hiding this comment.
I think field_0x612 can be removed
include/d/actor/d_a_npc_ks.h
Outdated
| /* 0x860 */ Z2Creature mSound; | ||
| /* 0x8F0 */ cXyz field_0x8f0; | ||
| /* 0x8FC */ csXyz field_0x8fc; | ||
| /* 0x902 */ u8 field_0x902[0x904 - 0x902]; |
Contributor
There was a problem hiding this comment.
field_0x902 can be removed
include/d/actor/d_a_npc_ks.h
Outdated
| /* 0x904 */ int field_0x904; | ||
| /* 0x908 */ f32 field_0x908; | ||
| /* 0x90C */ s8 field_0x90c; | ||
| /* 0x90D */ u8 field_0x90d[0x910 - 0x90d]; |
Contributor
There was a problem hiding this comment.
field_0x90d can be removed
src/d/actor/d_a_npc_ks.cpp
Outdated
|
|
||
| sVar1 = start_pya - sw_p->current.angle.y; | ||
| if (sVar1 < 0x4000 && sVar1 > -0x4000) { | ||
| a_this->home.angle.y = sVar1 + (u16)-0x8000; |
Contributor
There was a problem hiding this comment.
is (u16)-0x8000 not just +0x8000?
src/d/actor/d_a_npc_ks.cpp
Outdated
| } | ||
| } | ||
|
|
||
| cLib_addCalcAngleS2(&a_this->current.angle.y, cage_p->shape_angle.y + (u16)-0x8000, 2, 0x1000); |
Contributor
There was a problem hiding this comment.
is (u16)-0x8000 not just +0x8000?
src/d/actor/d_a_npc_ks.cpp
Outdated
| #pragma force_active on | ||
| static u8 data_80A5FFA0[4]; | ||
| #pragma pop | ||
| // /* 80A5DEB8-80A5DEE8 015018 0030+00 1/1 0/0 0/0 .text dComIfGs_onEventBit__FUs */ |
| i_this->mMode++; | ||
| i_this->mSound.startCreatureSound(Z2SE_FN_ROPE_CREAK, 0, -1); | ||
| sw_p->field_0x8fc = 20.0f; | ||
| // sw_p->field_0xd10[i_this->field_0x630] = 10; |
Contributor
There was a problem hiding this comment.
Just debug? if so put in #ifdef
Contributor
Author
There was a problem hiding this comment.
No, it's commented out because I know that field_0xd10 is supposed to be an array, I just don't know the size. Likely going to work on obj_sw next so maybe that will shed light on it.
| i_this->mSound.startCreatureVoice(Z2SE_KOSARU_V_CATCH, -1); | ||
| i_this->mSound.startCreatureSound(Z2SE_FN_ROPE_CREAK, 0, -1); | ||
| sw_p->field_0x8fc = 20.0f; | ||
| // sw_p->field_0xd10[i_this->field_0x630] = 10; |
Contributor
|
So do you want to properly write the struct for paths or just merge as is? |
Contributor
Author
|
Go ahead and merge as is. I’m going to continue to work on the TU regardless! |
hatal175
approved these changes
May 30, 2025
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
2 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.
No description provided.