Merge pull request #261 from PikalaxALT/pikalax_work

Name some scrcmds; save block 2 struct resolution

1 files changed, 16 insertions, 17 deletions

diff --git a/arm9/src/party.c b/arm9/src/party.c
index d7799fe2..1b9c505f 100644
--- a/arm9/src/party.c
+++ b/arm9/src/party.c
@@ -1,42 +1,41 @@
 #include "global.h"
 #include "party.h"
 #include "heap.h"
-#include "proto.h"
 
 #pragma thumb on
 
-void FUN_0206B8C0(struct PlayerParty * party);
-void FUN_0206B8CC(struct PlayerParty * party, int count);
+void SavArray_Party_init(struct PlayerParty * party);
+void InitPartyWithMaxSize(struct PlayerParty * party, int count);
 
-u32 FUN_0206B8A4(void)
+u32 SavArray_Party_sizeof(void)
 {
     return sizeof(struct PlayerParty);
 }
 
-struct PlayerParty * FUN_0206B8AC(u32 heap_id)
+struct PlayerParty * SavArray_Party_alloc(u32 heap_id)
 {
     struct PlayerParty * ret = (struct PlayerParty *)AllocFromHeap(heap_id, sizeof(struct PlayerParty));
-    FUN_0206B8C0(ret);
+    SavArray_Party_init(ret);
     return ret;
 }
 
-void FUN_0206B8C0(struct PlayerParty * party)
+void SavArray_Party_init(struct PlayerParty * party)
 {
-    FUN_0206B8CC(party, PARTY_SIZE);
+    InitPartyWithMaxSize(party, PARTY_SIZE);
 }
 
-void FUN_0206B8CC(struct PlayerParty * party, int count)
+void InitPartyWithMaxSize(struct PlayerParty * party, int count)
 {
     int i;
     GF_ASSERT(count <= PARTY_SIZE);
     memset(party, 0, sizeof(struct PlayerParty));
     party->curCount = 0;
     party->maxCount = count;
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
         ZeroMonData(&party->mons[i]);
 }
 
-BOOL FUN_0206B900(struct PlayerParty * party, struct Pokemon * pokemon)
+BOOL AddMonToParty(struct PlayerParty * party, struct Pokemon * pokemon)
 {
     if (party->curCount >= party->maxCount)
         return FALSE;
@@ -45,7 +44,7 @@ BOOL FUN_0206B900(struct PlayerParty * party, struct Pokemon * pokemon)
     return TRUE;
 }
 
-BOOL FUN_0206B938(struct PlayerParty * party, int pos)
+BOOL RemoveMonFromParty(struct PlayerParty * party, int pos)
 {
     int i;
 
@@ -77,7 +76,7 @@ struct Pokemon * GetPartyMonByIndex(struct PlayerParty * party, int pos)
     return &party->mons[pos];
 }
 
-void FUN_0206B9DC(struct PlayerParty * party, int pos, struct Pokemon * pokemon)
+void ReplacePartySlotWithMon(struct PlayerParty * party, int pos, struct Pokemon * pokemon)
 {
     int r2;
     GF_ASSERT(pos >= 0);
@@ -88,7 +87,7 @@ void FUN_0206B9DC(struct PlayerParty * party, int pos, struct Pokemon * pokemon)
     party->curCount += r2;
 }
 
-BOOL FUN_0206BA38(struct PlayerParty * party, int pos1, int pos2)
+BOOL SwapSlotsInParty(struct PlayerParty * party, int pos1, int pos2)
 {
     struct Pokemon * buffer;
     GF_ASSERT(pos1 >= 0);
@@ -105,7 +104,7 @@ BOOL FUN_0206BA38(struct PlayerParty * party, int pos1, int pos2)
     return FALSE;
 }
 
-void FUN_0206BAD0(struct PlayerParty * src, struct PlayerParty * dest)
+void CopyPlayerParty(struct PlayerParty * src, struct PlayerParty * dest)
 {
     *dest = *src;
 }
@@ -121,7 +120,7 @@ BOOL PartyHasMon(struct PlayerParty * party, u16 species)
     return i != party->curCount;
 }
 
-struct PlayerParty * FUN_0206BB1C(void * ptr)
+struct PlayerParty * SavArray_PlayerParty_get(struct SaveBlock2 * ptr)
 {
-    return (struct PlayerParty *)FUN_02022610(ptr, 2);
+    return (struct PlayerParty *)SavArray_get(ptr, 2);
 }