From 26e5708818765e2abaab29b6ffdfa8f01a5600b7 Mon Sep 17 00:00:00 2001
From: Dennis <dhilhorst2000@gmail.com>
Date: Sun, 1 Aug 2021 21:09:13 +0200
Subject: More pokemon related decomp (#48)

* add struct names

* decompile SaveRecruitedPokemon

* decompile ReadRecruitedPokemon

* decomp anotha one

* some renaming

* another save function

* more backup functions

* sub_808E400

* only one function left in pokemon_2.s

* decomp one more function

* merge 2 structs
---
 src/save.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/save.c')

diff --git a/src/save.c b/src/save.c
index 9ad7670..cef5b27 100644
--- a/src/save.c
+++ b/src/save.c
@@ -152,11 +152,9 @@ extern void sub_8014114();
 extern void sub_80141B4(const char *r0, u32 r1, u8 *r2, u16 r3);
 extern u32 sub_80144A4(u32 *a);
 extern u32 SaveRecruitedPokemon(u8 *, u32);
-extern u32 ReadRecruitedPokemon(void* a, s32 b);
-extern u32 sub_808F154(u8 *, u32);
-extern u32 sub_808F2B0(void* a, s32 b);
-extern u32 sub_8091C68(u8 *, u32);
-extern u32 sub_8091D14(void* a, s32 b);
+extern u32 RestoreRecruitedPokemon(void* a, s32 b);
+extern u32 SavePokemonStruct2(u8 *, u32);
+extern u32 RestorePokemonStruct2(void* a, s32 b);
 extern u32 sub_80921C4(u8 *, u32);
 extern u8 *sub_8095100(void);
 extern u32 *sub_8095108(void);
@@ -365,17 +363,17 @@ u32 ReadSaveFromPak(u32 *a)
     }
     if (!r7)
     {
-        r1 = ReadRecruitedPokemon(r4, 0x4650);
+        r1 = RestoreRecruitedPokemon(r4, 0x4650);
         if (r1 != r5->savedRecruitedPokemon) {
             r7 = 3;
         }
         r4 += 0x4650;
-        r1 = sub_808F2B0(r4, 0x258);
+        r1 = RestorePokemonStruct2(r4, 0x258);
         if (r1 != r5->unk428) {
             r7 = 3;
         }
         r4 += 0x258;
-        r1 = sub_8091D14(r4, 0x1D8);
+        r1 = RestoreTeamInventory(r4, 0x1D8);
         if (r1 != r5->unk430) {
             r7 = 3;
         }
@@ -488,9 +486,9 @@ u32 WriteSavetoPak(s32 *param_1,u32 param_2)
 
   iVar1->savedRecruitedPokemon = SaveRecruitedPokemon(array_ptr,0x4650);
   array_ptr += 0x4650;
-  iVar1->unk428 = sub_808F154(array_ptr,0x258);
+  iVar1->unk428 = SavePokemonStruct2(array_ptr,0x258);
   array_ptr += 0x258;
-  iVar1->unk430 = sub_8091C68(array_ptr,0x1D8);
+  iVar1->unk430 = SaveTeamInventory(array_ptr,0x1D8);
   array_ptr += 0x1D8;
   iVar1->savedRescueTeamInfo = SaveRescueTeamInfo(array_ptr,0x10);
   array_ptr += 0x10;
-- 
cgit v1.2.3