Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-26 22:40:33 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Small logic cleanup on func_8010EDB8 (#1125)

Browse Source 
I'm working on tracing the logic involved in using weapons.
`func_8010EDB8` is a core part of that process.

I noticed a small improvement that could be made to the control flow,
removing one `goto` statement.

This function could use more work on its overall control flow (there are
so many uses of `goto`), but even a small improvement is still an
improvement.
This commit is contained in:
bismurphy 2024-05-14 14:41:58 -04:00 committed by GitHub
parent a07ad1bc47
commit 11dac7d321
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/dra/6D59C.c
View File

@ -868,24 +868,18 @@ block_32:
goto block_38c;
}
var_s2 = equipped_item->specialMove;
if (var_s2 == 0) {
goto block_38c;
}
// Sword of Dawn
if ((equipped_id == 0x11) && ((g_Player.pl_vram_flag & 0x41) != 1)) {
goto block_38c;
}
if (!(g_Player.pl_vram_flag & 1)) {
if (var_s2 == 0 ||
// Sword of Dawn
((equipped_id == 0x11) && ((g_Player.pl_vram_flag & 0x41) != 1)) ||
!(g_Player.pl_vram_flag & 1)) {
goto block_38c;
}
// Load up the item's special move as the new "virtual" equipped item since
// we're attacking with the special
equipped_item = &g_EquipDefs[var_s2];
equipped_id = var_s2;
if (CheckChainLimit(equipped_id, hand) < 0) {
goto block_38c;
}
if (HasEnoughMp(g_EquipDefs[equipped_id].mpUsage, 0)) {
if (CheckChainLimit(equipped_id, hand) < 0 ||
HasEnoughMp(g_EquipDefs[equipped_id].mpUsage, 0)) {
block_38c:
equipped_item = &g_EquipDefs[g_Status.equipment[hand]];
if (D_80138FC8 == 0xFF) {
@ -900,10 +894,9 @@ block_32:
}
equipped_id = g_Status.equipment[hand];
equipped_item = &g_EquipDefs[g_Status.equipment[hand]];
if (CheckChainLimit(equipped_id, hand) >= 0) {
goto block_45;
if (CheckChainLimit(equipped_id, hand) < 0) {
return 0;
}
return 0;
}
block_45:
if (equipped_id != 0) {