pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix codestyle

Browse Source 
Bitten by my own script. Damn.
This commit is contained in:
Alex Bates 2020-08-20 17:07:05 +01:00
parent 130ebd5401
commit 325fec679c
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/code_80850_len_3060.c
View File

@ -732,8 +732,8 @@ s32 is_ability_active(s32 arg0) {
iVar5 = 0;
//iVar7 = 0;
for(i = 5; i >= 0; i--) {
local_20[i] = 0;
for (i = 5; i >= 0; i--) {
local_20[i] = 0;
}
if (((*gGameStatusPtr)->unk_7E & 1) == 0) {
@ -744,7 +744,7 @@ s32 is_ability_active(s32 arg0) {
s32 index = i;
badge = playerData->equippedBadges[index];
if (playerData->equippedBadges[index] != 0) {
uVar4 = gItemTable[badge].moveID;
uVar4 = gItemTable[badge].moveID;
}
switch (arg0) {
case 0:
@ -766,10 +766,10 @@ s32 is_ability_active(s32 arg0) {
break;
case 6:
if (uVar4 == 0x53) {
iVar7++;
iVar7++;
}
if (playerData->hasActionCommands != 0) {
iVar7++;
iVar7++;
}
continue;
case 7:
@ -798,40 +798,40 @@ s32 is_ability_active(s32 arg0) {
break;
case 0xf:
if (uVar4 == 0x54) {
local_20[piVar6] = 1;
piVar6++;
iVar5++;
iVar7 = -1;
local_20[piVar6] = 1;
piVar6++;
iVar5++;
iVar7 = -1;
}
if (uVar4 == 0x55) {
local_20[piVar6] = 2;
piVar6++;
iVar5++;
iVar7 = -1;
local_20[piVar6] = 2;
piVar6++;
iVar5++;
iVar7 = -1;
}
if (uVar4 == 0x56) {
local_20[piVar6] = 3;
piVar6++;
iVar5++;
iVar7 = -1;
local_20[piVar6] = 3;
piVar6++;
iVar5++;
iVar7 = -1;
}
if (uVar4 == 0x57) {
local_20[piVar6] = 4;
piVar6++;
iVar5++;
iVar7 = -1;
local_20[piVar6] = 4;
piVar6++;
iVar5++;
iVar7 = -1;
}
if (uVar4 == 0x58) {
local_20[piVar6] = 5;
piVar6++;
iVar5++;
iVar7 = -1;
local_20[piVar6] = 5;
piVar6++;
iVar5++;
iVar7 = -1;
}
if (uVar4 == 0x59) {
local_20[piVar6] = 6;
piVar6++;
iVar5++;
iVar7 = -1;
local_20[piVar6] = 6;
piVar6++;
iVar5++;
iVar7 = -1;
}
continue;
case 0x10:
@ -955,7 +955,7 @@ s32 is_ability_active(s32 arg0) {
uVar3 = 0x4a;
}
if (uVar4 == uVar3) {
iVar7++;
iVar7++;
}
}
if (iVar7 < 0) {

2
src/code_e79b0_len_1920.c
View File

@ -317,7 +317,7 @@ void clear_script_flags(ScriptInstance* script, s32 flags) {
clear_script_flags(childScript, flags);
}
for(i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
scriptContextPtr = (*gCurrentScriptListPtr)[i];
if (scriptContextPtr != NULL && scriptContextPtr->parentScript == script) {
clear_script_flags(script->parentScript, flags);