BossSB2 and BossPlankton work - #779
Open
LivewireCB wants to merge 4 commits into
Open
Conversation
|
| Section | From | To | Bytes | |
|---|---|---|---|---|
| 📈 | .data |
81.58% | 81.81% | +2 |
| 📈 | .sbss2 |
0.00% | 20.00% | +8 |
| 📈 | .text |
44.07% | 45.67% | +598 |
| Function | From | To | Bytes | |
|---|---|---|---|---|
| ️ |
zNPCB_SB2::Init(xEntAsset*) |
90.86% | 86.65% | --14 |
| ✅ | zNPCB_SB2::ParseINI() |
0.00% | 100.00% | +64 |
| 📈 | zNPCB_SB2::player_platform() |
22.40% | 59.60% | +37 |
| ✅ | zNPCB_SB2::activate_hand(zNPCB_SB2::hand_enum, bool) |
77.22% | 100.00% | +8 |
| ✅ | zNPCB_SB2::deactivate_hand(zNPCB_SB2::hand_enum) |
76.67% | 100.00% | +8 |
| ✅ | zNPCB_SB2::player_on_ground() const |
2.75% | 100.00% | +198 |
| 📈 | zNPCB_SB2::slugs_ready() const |
0.00% | 88.24% | +59 |
| ✅ | zNPCB_SB2::slugs_inactive() const |
0.00% | 100.00% | +52 |
| 📈 | zNPCB_SB2::set_vulnerable(bool) |
0.00% | 4.76% | +4 |
| ✅ | zNPCB_SB2::show_nodes() |
75.00% | 100.00% | +21 |
| 📈 | zNPCGoalBossSB2Chop::can_start() const |
0.00% | 18.96% | +43 |
| ✅ | zNPCGoalBossSB2Karate::Enter(float, void*) |
21.62% | 100.00% | +116 |
main/SB/Game/zNPCTypeBossPlankton
| Section | From | To | Bytes | |
|---|---|---|---|---|
| 📈 | .text |
48.52% | 50.22% | +529 |
| Function | From | To | Bytes | |
|---|---|---|---|---|
| ✅ | zNPCBPlankton::Init(xEntAsset*) |
83.97% | 100.00% | +20 |
| ✅ | zNPCBPlankton::Reset() |
18.93% | 100.00% | +304 |
| ✅ | zNPCBPlankton::Process(xScene*, float) |
57.14% | 100.00% | +202 |
| 📈 | zNPCBPlankton::check_player_damage() |
11.11% | 15.56% | +1 |
SquareMan
approved these changes
Aug 9, 2026
SquareMan
left a comment
SquareMan
left a comment
Member
There was a problem hiding this comment.
Looks pretty good, just a couple of minor things.
Comment on lines
+1136
to
+1141
| psy_instinct->GoalSet(0x4e47424b, 1); // 'NGBK' | ||
| } | ||
| else | ||
| { | ||
| vanish(); | ||
| psy_instinct->GoalSet(0x4e47424d, 1); // 'NGBM' |
Member
There was a problem hiding this comment.
why are we not just writing psy_instinct->GoalSet('NGBK', 1); here?
| this->update_move(dt); | ||
| this->update_animation(dt); | ||
|
|
||
| if (this->check_player_damage() & 0xFF) |
Member
There was a problem hiding this comment.
This mask seems like an automatic type conversion, likely why mp casted this function's return value to U8 at the callsite in his PR. Can you play with the return type of check_player_damage to see if you can trigger this conversion automatically? I seem to recall some type like char or bool would generate these conversions at the callsite
Collaborator
Author
There was a problem hiding this comment.
I had changed the return type to U8 which originally solved the problem. Simply forgot to delete the "& 0xFF"
|
| Section | From | To | Bytes | |
|---|---|---|---|---|
| ️ |
.rodata |
25.03% | 24.46% | --83 |
| 📈 | .sbss |
88.44% | 90.33% | +8 |
| ️ |
.sbss2 |
40.00% | 33.33% | --1 |
| ️ |
.sdata2 |
78.38% | 74.11% | --40 |
| 📈 | .text |
60.96% | 65.44% | +7865 |
| Function | From | To | Bytes | |
|---|---|---|---|---|
| 📈 | zEntPlayer_Update(xEnt*, xScene*, float) |
0.00% | 42.12% | +7661 |
| 📈 | xSweptSphere::operator=(const xSweptSphere&) |
0.00% | 15.32% | +72 |
| ✅ | xiMat4x3Union::operator=(const xiMat4x3Union&) |
0.00% | 100.00% | +132 |
main/SB/Game/zNPCTypeBossSB2
| Section | From | To | Bytes | |
|---|---|---|---|---|
| 📈 | .data |
81.58% | 81.81% | +2 |
| 📈 | .sbss2 |
0.00% | 20.00% | +8 |
| 📈 | .text |
44.07% | 45.67% | +598 |
| Function | From | To | Bytes | |
|---|---|---|---|---|
| ️ |
zNPCB_SB2::Init(xEntAsset*) |
90.86% | 86.65% | --14 |
| ✅ | zNPCB_SB2::ParseINI() |
0.00% | 100.00% | +64 |
| 📈 | zNPCB_SB2::player_platform() |
22.40% | 59.60% | +37 |
| ✅ | zNPCB_SB2::activate_hand(zNPCB_SB2::hand_enum, bool) |
77.22% | 100.00% | +8 |
| ✅ | zNPCB_SB2::deactivate_hand(zNPCB_SB2::hand_enum) |
76.67% | 100.00% | +8 |
| ✅ | zNPCB_SB2::player_on_ground() const |
2.75% | 100.00% | +198 |
| 📈 | zNPCB_SB2::slugs_ready() const |
0.00% | 88.24% | +59 |
| ✅ | zNPCB_SB2::slugs_inactive() const |
0.00% | 100.00% | +52 |
| 📈 | zNPCB_SB2::set_vulnerable(bool) |
0.00% | 4.76% | +4 |
| ✅ | zNPCB_SB2::show_nodes() |
75.00% | 100.00% | +21 |
| 📈 | zNPCGoalBossSB2Chop::can_start() const |
0.00% | 18.96% | +43 |
| ✅ | zNPCGoalBossSB2Karate::Enter(float, void*) |
21.62% | 100.00% | +116 |
main/SB/Game/zNPCTypeBossPlankton
| Section | From | To | Bytes | |
|---|---|---|---|---|
| 📈 | .text |
48.52% | 50.22% | +529 |
| Function | From | To | Bytes | |
|---|---|---|---|---|
| ✅ | zNPCBPlankton::Init(xEntAsset*) |
83.97% | 100.00% | +20 |
| ✅ | zNPCBPlankton::Reset() |
18.93% | 100.00% | +304 |
| ✅ | zNPCBPlankton::Process(xScene*, float) |
57.14% | 100.00% | +202 |
| 📈 | zNPCBPlankton::check_player_damage() |
11.11% | 15.56% | +1 |
|
| Section | From | To | Bytes | |
|---|---|---|---|---|
| ️ |
.rodata |
25.03% | 24.46% | --83 |
| 📈 | .sbss |
88.44% | 90.33% | +8 |
| ️ |
.sbss2 |
40.00% | 33.33% | --1 |
| ️ |
.sdata2 |
78.38% | 74.11% | --40 |
| 📈 | .text |
60.96% | 65.45% | +7867 |
| Function | From | To | Bytes | |
|---|---|---|---|---|
| 📈 | zEntPlayer_Update(xEnt*, xScene*, float) |
0.00% | 42.13% | +7663 |
| 📈 | xSweptSphere::operator=(const xSweptSphere&) |
0.00% | 15.32% | +72 |
| ✅ | xiMat4x3Union::operator=(const xiMat4x3Union&) |
0.00% | 100.00% | +132 |
main/SB/Game/zNPCTypeBossSB2
| Section | From | To | Bytes | |
|---|---|---|---|---|
| 📈 | .data |
81.58% | 81.81% | +2 |
| 📈 | .sbss2 |
0.00% | 20.00% | +8 |
| 📈 | .text |
44.07% | 45.67% | +598 |
| Function | From | To | Bytes | |
|---|---|---|---|---|
| ️ |
zNPCB_SB2::Init(xEntAsset*) |
90.86% | 86.65% | --14 |
| ✅ | zNPCB_SB2::ParseINI() |
0.00% | 100.00% | +64 |
| 📈 | zNPCB_SB2::player_platform() |
22.40% | 59.60% | +37 |
| ✅ | zNPCB_SB2::activate_hand(zNPCB_SB2::hand_enum, bool) |
77.22% | 100.00% | +8 |
| ✅ | zNPCB_SB2::deactivate_hand(zNPCB_SB2::hand_enum) |
76.67% | 100.00% | +8 |
| ✅ | zNPCB_SB2::player_on_ground() const |
2.75% | 100.00% | +198 |
| 📈 | zNPCB_SB2::slugs_ready() const |
0.00% | 88.24% | +59 |
| ✅ | zNPCB_SB2::slugs_inactive() const |
0.00% | 100.00% | +52 |
| 📈 | zNPCB_SB2::set_vulnerable(bool) |
0.00% | 4.76% | +4 |
| ✅ | zNPCB_SB2::show_nodes() |
75.00% | 100.00% | +21 |
| 📈 | zNPCGoalBossSB2Chop::can_start() const |
0.00% | 18.96% | +43 |
| ✅ | zNPCGoalBossSB2Karate::Enter(float, void*) |
21.62% | 100.00% | +116 |
main/SB/Game/zNPCTypeBossPlankton
| Section | From | To | Bytes | |
|---|---|---|---|---|
| 📈 | .text |
48.52% | 50.22% | +529 |
| Function | From | To | Bytes | |
|---|---|---|---|---|
| ✅ | zNPCBPlankton::Init(xEntAsset*) |
83.97% | 100.00% | +20 |
| ✅ | zNPCBPlankton::Reset() |
18.93% | 100.00% | +304 |
| ✅ | zNPCBPlankton::Process(xScene*, float) |
57.14% | 100.00% | +202 |
| 📈 | zNPCBPlankton::check_player_damage() |
11.11% | 15.56% | +1 |
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.
Matches and Clean-Up in BossSB2 and BossPlankton