From 64683e1473d8b3c99f9bb1eb846c0be6d43cbbcc Mon Sep 17 00:00:00 2001
From: KDSKardabox <bollygame94@gmail.com>
Date: Thu, 15 Feb 2018 15:29:26 +0530
Subject: [WIP] Decompile fledd_softboiled.h

---
 include/fldeff_softboiled.h |  7 +++++++
 include/party_menu.h        | 15 +++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 include/fldeff_softboiled.h

(limited to 'include')

diff --git a/include/fldeff_softboiled.h b/include/fldeff_softboiled.h
new file mode 100644
index 000000000..065dcbf02
--- /dev/null
+++ b/include/fldeff_softboiled.h
@@ -0,0 +1,7 @@
+#ifndef GUARD_FLDEFF_SOFTBOILED_H
+#define GUARD_FLDEFF_SOFTBOILED_H
+
+bool8 SetUpFieldMove_SoftBoiled(void);
+void sub_8161560(u8 taskid);
+
+#endif // GUARD_FLDEFF_SOFTBOILED_H
diff --git a/include/party_menu.h b/include/party_menu.h
index 14aacce88..8f361663b 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -11,6 +11,17 @@ enum
     AILMENT_BRN
 };
 
+struct Struct203CEC8
+{
+    u8 filler[0x9];
+    u8 unk9;
+    u8 unkA;
+    u8 unkB;
+    u8 filler2[0x2];
+};
+
+extern struct Struct203CEC8 gUnknown_0203CEC8;
+
 bool8 pokemon_has_move(struct Pokemon *, u16);
 void sub_81B58A8(void);
 void DoWallyTutorialBagMenu(void);
@@ -20,4 +31,8 @@ u8 GetCursorSelectionMonId(void);
 bool8 FieldCallback_Teleport(void);
 void sub_81B7F60(void);
 
+void sub_81B0FCC(u8 partyMonId, u8 a);
+void sub_81B1370(u8 taskId);
+void display_pokemon_menu_message(u8 windowBorderId);
+
 #endif // GUARD_PARTY_MENU_H
-- 
cgit v1.2.3


From 301664db2f7459e6f819a5f6eceeefccc78f0414 Mon Sep 17 00:00:00 2001
From: KDSKardabox <bollygame94@gmail.com>
Date: Thu, 15 Feb 2018 17:12:02 +0530
Subject: Matching the unmatched and another function

---
 include/fldeff_softboiled.h |  1 +
 include/party_menu.h        | 10 ++++++----
 include/strings.h           |  4 ++++
 3 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/fldeff_softboiled.h b/include/fldeff_softboiled.h
index 065dcbf02..0e3b98a46 100644
--- a/include/fldeff_softboiled.h
+++ b/include/fldeff_softboiled.h
@@ -4,4 +4,5 @@
 bool8 SetUpFieldMove_SoftBoiled(void);
 void sub_8161560(u8 taskid);
 
+
 #endif // GUARD_FLDEFF_SOFTBOILED_H
diff --git a/include/party_menu.h b/include/party_menu.h
index 8f361663b..25c389493 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -1,6 +1,6 @@
 #ifndef GUARD_PARTY_MENU_H
 #define GUARD_PARTY_MENU_H
-
+#include "task.h"
 enum
 {
     AILMENT_NONE,
@@ -14,8 +14,8 @@ enum
 struct Struct203CEC8
 {
     u8 filler[0x9];
-    u8 unk9;
-    u8 unkA;
+    s8 unk9;
+    s8 unkA;
     u8 unkB;
     u8 filler2[0x2];
 };
@@ -31,8 +31,10 @@ u8 GetCursorSelectionMonId(void);
 bool8 FieldCallback_Teleport(void);
 void sub_81B7F60(void);
 
-void sub_81B0FCC(u8 partyMonId, u8 a);
+void sub_81B0FCC(u8 partyIdx, u8 a);
 void sub_81B1370(u8 taskId);
 void display_pokemon_menu_message(u8 windowBorderId);
+void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func);
+void sub_81B1B5C(void *a, u8 b);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/strings.h b/include/strings.h
index c9ebc175f..4632938da 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -348,6 +348,10 @@ extern const u8 gText_DepositedVar2Var1s[];
 extern const u8 gText_NoRoomForItems[];
 extern const u8 gText_ThreeDashes[];
 
+//party menu text
+extern const u8 gText_PkmnHPRestoredByVar2[];
+
+//birch dex rating text
 extern const u8 gBirchDexRatingText_LessThan10[];
 extern const u8 gBirchDexRatingText_LessThan20[];
 extern const u8 gBirchDexRatingText_LessThan30[];
-- 
cgit v1.2.3


From a200d9406b15f722b34775050f6fe73894d23629 Mon Sep 17 00:00:00 2001
From: KDSKardabox <bollygame94@gmail.com>
Date: Thu, 15 Feb 2018 22:32:28 +0530
Subject: Finish fldeff_softboiled.c

---
 include/fldeff_softboiled.h | 8 --------
 include/party_menu.h        | 3 ++-
 include/strings.h           | 1 +
 3 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 include/fldeff_softboiled.h

(limited to 'include')

diff --git a/include/fldeff_softboiled.h b/include/fldeff_softboiled.h
deleted file mode 100644
index 0e3b98a46..000000000
--- a/include/fldeff_softboiled.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef GUARD_FLDEFF_SOFTBOILED_H
-#define GUARD_FLDEFF_SOFTBOILED_H
-
-bool8 SetUpFieldMove_SoftBoiled(void);
-void sub_8161560(u8 taskid);
-
-
-#endif // GUARD_FLDEFF_SOFTBOILED_H
diff --git a/include/party_menu.h b/include/party_menu.h
index 25c389493..1ce12d98f 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -33,8 +33,9 @@ void sub_81B7F60(void);
 
 void sub_81B0FCC(u8 partyIdx, u8 a);
 void sub_81B1370(u8 taskId);
-void display_pokemon_menu_message(u8 windowBorderId);
+void display_pokemon_menu_message(u8 windowId);
 void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func);
 void sub_81B1B5C(void *a, u8 b);
+u8 sub_81B1BD4();
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/strings.h b/include/strings.h
index 4632938da..70b2777e1 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -350,6 +350,7 @@ extern const u8 gText_ThreeDashes[];
 
 //party menu text
 extern const u8 gText_PkmnHPRestoredByVar2[];
+extern const u8 gText_CantBeUsedOnPkmn[];
 
 //birch dex rating text
 extern const u8 gBirchDexRatingText_LessThan10[];
-- 
cgit v1.2.3