scrcmd_party: address review comments

4 files changed, 14 insertions, 12 deletions

diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index b4870310..e40bd803 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -561,7 +561,7 @@ gScriptCmdTable: ; 0x020F355C
 	.word ScrCmd_CheckPartyMonOTID
 	.word ScrCmd_CountPartyMons_OmitEggs
 	.word ScrCmd_CountAvailablePartyMons_IgnoreSlot
-	.word ScrCmd_CountAvailablePartyMonsAndPCMons
+	.word ScrCmd_CountAvailablePartyAndPCMons
 	.word ScrCmd_GetPartyEggCount
 	.word ScrCmd_Unk019E
 	.word ScrCmd_Unk019F
@@ -592,7 +592,7 @@ gScriptCmdTable: ; 0x020F355C
 	.word ScrCmd_Unk01B8
 	.word ScrCmd_GetPartyMonFriendship
 	.word ScrCmd_AddPartyMonFriendship
-	.word ScrCmd_DepletePartyMonFriendship
+	.word ScrCmd_SubtractPartyMonFriendship
 	.word ScrCmd_Unk01BC
 	.word ScrCmd_Unk01BD
 	.word ScrCmd_Unk01BE
@@ -708,7 +708,7 @@ gScriptCmdTable: ; 0x020F355C
 	.word ScrCmd_Unk022C
 	.word ScrCmd_Unk022D
 	.word ScrCmd_CountPartyMonRibbons
-	.word ScrCmd_Unk022F
+	.word ScrCmd_CountTotalPartyRibbons
 	.word ScrCmd_PartyMonHasRibbon
 	.word ScrCmd_GivePartyMonRibbon
 	.word ScrCmd_GetRibbonName
diff --git a/arm9/global.inc b/arm9/global.inc
index e449b23c..adcc0e36 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -3329,14 +3329,14 @@
 .extern ScrCmd_FindPartyMonWithNature
 .extern ScrCmd_GetPartyMonFriendship
 .extern ScrCmd_AddPartyMonFriendship
-.extern ScrCmd_DepletePartyMonFriendship
+.extern ScrCmd_SubtractPartyMonFriendship
 .extern ScrCmd_GetPartyMonContestCondition
 .extern ScrCmd_GetLeadingPartyMonSlot
 .extern ScrCmd_GetPartyMonTypes
 .extern ScrCmd_CountPartyMons
 .extern ScrCmd_CountPartyMons_OmitEggs
 .extern ScrCmd_CountAvailablePartyMons_IgnoreSlot
-.extern ScrCmd_CountAvailablePartyMonsAndPCMons
+.extern ScrCmd_CountAvailablePartyAndPCMons
 .extern ScrCmd_GetPartyEggCount
 .extern ScrCmd_CheckPartyForPokerus
 .extern ScrCmd_GetPartyMonGender
@@ -3347,7 +3347,7 @@
 .extern ScrCmd_ResetPartyMonHeldItem
 .extern ScrCmd_CheckPartyForSpecies
 .extern ScrCmd_CountPartyMonRibbons
-.extern ScrCmd_Unk022F
+.extern ScrCmd_CountTotalPartyRibbons
 .extern ScrCmd_PartyMonHasRibbon
 .extern ScrCmd_GivePartyMonRibbon
 .extern ScrCmd_CheckPartyForBadEgg
diff --git a/arm9/src/scrcmd_party.c b/arm9/src/scrcmd_party.c
index 3cc024e1..48d558c9 100644
--- a/arm9/src/scrcmd_party.c
+++ b/arm9/src/scrcmd_party.c
@@ -343,7 +343,7 @@ THUMB_FUNC BOOL ScrCmd_AddPartyMonFriendship(struct ScriptContext* ctx)
     return FALSE;

 }

 

-THUMB_FUNC BOOL ScrCmd_DepletePartyMonFriendship(struct ScriptContext* ctx)

+THUMB_FUNC BOOL ScrCmd_SubtractPartyMonFriendship(struct ScriptContext* ctx)

 {

     struct UnkSavStruct80* sav_ptr = ctx->unk80;

     u16 friendship_to_deplete = VarGet(ctx->unk80, ScriptReadHalfword(ctx));

@@ -471,7 +471,7 @@ THUMB_FUNC BOOL ScrCmd_CountAvailablePartyMons_IgnoreSlot(struct ScriptContext*
     return FALSE;

 }

 

-THUMB_FUNC BOOL ScrCmd_CountAvailablePartyMonsAndPCMons(struct ScriptContext* ctx)

+THUMB_FUNC BOOL ScrCmd_CountAvailablePartyAndPCMons(struct ScriptContext* ctx)

 {

     s32 party_count;

     struct PCStorage* pc;

@@ -714,7 +714,7 @@ THUMB_FUNC BOOL ScrCmd_CountPartyMonRibbons(struct ScriptContext* ctx)
     return FALSE;

 }

 

-THUMB_FUNC BOOL ScrCmd_Unk022F(struct ScriptContext* ctx)

+THUMB_FUNC BOOL ScrCmd_CountTotalPartyRibbons(struct ScriptContext* ctx)

 {

     struct PlayerParty* party;

     u16 ribbon_idx;

@@ -733,6 +733,8 @@ THUMB_FUNC BOOL ScrCmd_Unk022F(struct ScriptContext* ctx)
             BOOL party_mon_is_egg = (BOOL)GetMonData(party_mon, MON_DATA_IS_EGG, NULL);

             if (party_mon_is_egg)

             {

+                // BUG: This `break` should be a `continue`, as any party mons after a detected

+                //      egg would have their ribbons ignored.

                 break;

             }

 

diff --git a/include/scrcmd.h b/include/scrcmd.h
index 4f68e728..826b74d3 100644
--- a/include/scrcmd.h
+++ b/include/scrcmd.h
@@ -262,14 +262,14 @@ BOOL ScrCmd_GetPartyMonNature(struct ScriptContext* ctx);
 BOOL ScrCmd_FindPartyMonWithNature(struct ScriptContext* ctx);
 BOOL ScrCmd_GetPartyMonFriendship(struct ScriptContext* ctx);
 BOOL ScrCmd_AddPartyMonFriendship(struct ScriptContext* ctx);
-BOOL ScrCmd_DepletePartyMonFriendship(struct ScriptContext* ctx);
+BOOL ScrCmd_SubtractPartyMonFriendship(struct ScriptContext* ctx);
 BOOL ScrCmd_GetPartyMonContestCondition(struct ScriptContext* ctx);
 BOOL ScrCmd_GetLeadingPartyMonSlot(struct ScriptContext* ctx);
 BOOL ScrCmd_GetPartyMonTypes(struct ScriptContext* ctx);
 BOOL ScrCmd_CountPartyMons(struct ScriptContext* ctx);
 BOOL ScrCmd_CountPartyMons_OmitEggs(struct ScriptContext* ctx);
 BOOL ScrCmd_CountAvailablePartyMons_IgnoreSlot(struct ScriptContext* ctx);
-BOOL ScrCmd_CountAvailablePartyMonsAndPCMons(struct ScriptContext* ctx);
+BOOL ScrCmd_CountAvailablePartyAndPCMons(struct ScriptContext* ctx);
 BOOL ScrCmd_GetPartyEggCount(struct ScriptContext* ctx);
 BOOL ScrCmd_CheckPartyForPokerus(struct ScriptContext* ctx);
 BOOL ScrCmd_GetPartyMonGender(struct ScriptContext* ctx);
@@ -280,7 +280,7 @@ BOOL ScrCmd_GetPartyMonHeldItem(struct ScriptContext* ctx);
 BOOL ScrCmd_ResetPartyMonHeldItem(struct ScriptContext* ctx);
 BOOL ScrCmd_CheckPartyForSpecies(struct ScriptContext* ctx);
 BOOL ScrCmd_CountPartyMonRibbons(struct ScriptContext* ctx);
-BOOL ScrCmd_Unk022F(struct ScriptContext* ctx);
+BOOL ScrCmd_CountTotalPartyRibbons(struct ScriptContext* ctx);
 BOOL ScrCmd_PartyMonHasRibbon(struct ScriptContext* ctx);
 BOOL ScrCmd_GivePartyMonRibbon(struct ScriptContext* ctx);
 BOOL ScrCmd_CheckPartyForBadEgg(struct ScriptContext* ctx);