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

---
 src/fldeff_softboiled.c | 191 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 191 insertions(+)
 create mode 100644 src/fldeff_softboiled.c

(limited to 'src')

diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
new file mode 100644
index 000000000..8211cc77d
--- /dev/null
+++ b/src/fldeff_softboiled.c
@@ -0,0 +1,191 @@
+#include "global.h"
+#include "fldeff_softboiled.h"
+#include "menu.h"
+#include "party_menu.h"
+#include "pokemon.h"
+//#include "pokemon_menu.h"
+#include "constants/songs.h"
+#include "sound.h"
+#include "sprite.h"
+#include "strings.h"
+#include "task.h"
+//#include "ewram.h"
+
+/*
+struct Struct2001000 {
+    u8 unk0;
+    u8 unk1;
+    u8 unk2;
+    u8 filler3[9];
+    void *unkC;
+};
+
+struct Struct201C000 {
+    struct Pokemon *unk0;
+    u8 filler4[1];
+    u8 unk5;
+    u16 unk6;
+    u8 filler8[4];
+    s32 unkC;
+    void* unk10;
+    u8 filler14[26];
+    s16 unk2E;
+};
+
+#if ENGLISH
+#define WINDOW_LEFT 3
+#define WINDOW_RIGHT 26
+#elif GERMAN
+#define WINDOW_LEFT 0
+#define WINDOW_RIGHT 29
+#endif
+*/
+/*
+// extern
+extern u8 gUnknown_0202E8F6;
+extern u8 gLastFieldPokeMenuOpened;
+extern u8 gUnknown_0202E8F4;
+
+// Static
+static void sub_8133D50(u8 taskId);
+static void sub_8133E74(u8 taskId);
+static void sub_8133EB8(u8 taskId);
+static void sub_8133EF8(void);
+*/
+
+void sub_816166C(u8 taskId);
+void sub_81617B8(u8 taskId);
+void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func);
+
+bool8 SetUpFieldMove_SoftBoiled(void)
+{
+    u16 maxHp;
+    u16 hp;
+    u16 minHp;
+
+    maxHp = GetMonData(&gPlayerParty[GetCursorSelectionMonId()], MON_DATA_MAX_HP);
+    hp = GetMonData(&gPlayerParty[GetCursorSelectionMonId()], MON_DATA_HP);
+
+    minHp = (maxHp / 5);
+    if (hp > minHp)
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void sub_8161560(u8 taskId)
+{
+    gUnknown_0203CEC8.unkB = 0xA;
+    gUnknown_0203CEC8.unkA =  gUnknown_0203CEC8.unk9;
+    sub_81B0FCC(GetCursorSelectionMonId(), 0x1);
+    display_pokemon_menu_message(0x5);
+    gTasks[taskId].func = sub_81B1370;
+}
+
+void sub_81615A8(u8 taskId)
+{
+    u16 hp;
+
+    u8 unk9 = gUnknown_0203CEC8.unk9;
+    u8 pokemonIndex = gUnknown_0203CEC8.unkA;
+    if(pokemonIndex > 6)
+    {
+        gUnknown_0203CEC8.unkB = 0;
+        display_pokemon_menu_message(0x0);
+        gTasks[taskId].func = sub_81B1370;
+        return;
+    }
+
+    hp = GetMonData(&gPlayerParty[pokemonIndex], MON_DATA_HP);
+    if(hp == 0 || unk9 == pokemonIndex || GetMonData(&gPlayerParty[pokemonIndex], MON_DATA_MAX_HP) == hp)
+    {
+        sub_81617B8(taskId);
+        return;
+    }
+
+    PlaySE(SE_KAIFUKU);
+    sub_81B1F18(taskId, unk9, -1, GetMonData(&gPlayerParty[unk9], MON_DATA_MAX_HP)/5, sub_816166C);
+}
+
+/*
+void sub_8133D28(u8 taskid) {
+    EWRAM_1000.unkC = sub_8133D50;
+    EWRAM_1B000_2.unk272 = 3;
+    DoPokemonMenu_Switch(taskid);
+}
+
+static void sub_8133D50(u8 taskId) {
+    u8 unk1, unk2;
+    u16 hp;
+    struct Pokemon *pokemon;
+    //struct Task *task;
+
+    struct Sprite *sprites = gSprites;
+
+
+    unk1 = sprites[EWRAM_1000.unk1].data[0];
+    unk2 = sprites[EWRAM_1000.unk2].data[0];
+
+    if (unk1 > 5 || unk2 > 5)
+    {
+        sub_806CD44(taskId);
+        return;
+    }
+
+    EWRAM_1C000.unk0 = &gPlayerParty[sprites[EWRAM_1000.unk2].data[0]];
+    hp = GetMonData(EWRAM_1C000.unk0, MON_DATA_HP);
+
+    if (hp == 0 || unk1 == unk2 || GetMonData(EWRAM_1C000.unk0, MON_DATA_MAX_HP) == hp)
+    {
+        sub_8133EB8(taskId);
+        return;
+    }
+
+    PlaySE(SE_KAIFUKU);
+
+    EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data[0];
+
+    pokemon = &gPlayerParty[EWRAM_1C000.unk5];
+    EWRAM_1C000.unk0 = pokemon;
+    EWRAM_1C000.unk6 = 0;
+    EWRAM_1C000.unkC = -0x8000;
+    EWRAM_1C000.unk10 = sub_8133EF8;
+
+
+    gTasks[taskId].data[10] = GetMonData(EWRAM_1C000.unk0, MON_DATA_MAX_HP);
+    gTasks[taskId].data[11] = GetMonData(EWRAM_1C000.unk0, MON_DATA_HP);
+    gTasks[taskId].data[12] = gTasks[taskId].data[10] / 5;
+
+    sub_806D5A4();
+    gTasks[taskId].func = sub_806FA18;
+    EWRAM_1B000_2.unk282 = gTasks[taskId].data[11];
+}
+
+static void sub_8133E74(u8 taskId) {
+    if (gUnknown_0202E8F6)
+    {
+        return;
+    }
+
+    MenuZeroFillWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19);
+    PrintPartyMenuPromptText(3, 0);
+    gTasks[taskId].func = HandlePartyMenuSwitchPokemonInput;
+}
+
+static void sub_8133EB8(u8 taskId) {
+    gUnknown_0202E8F4 = 0;
+    sub_806D5A4();
+    sub_806E834(gOtherText_CantUseOnPoke, 1);
+    gTasks[taskId].func = sub_8133E74;
+}
+
+static void sub_8133EF8(void) {
+    sub_806CCE4();
+    EWRAM_1B000_2.unk261 = 2;
+    DestroySprite(&gSprites[EWRAM_1000.unk1]);
+    MenuZeroFillWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19);
+    PrintPartyMenuPromptText(0, 0);
+    SwitchTaskToFollowupFunc(EWRAM_1000.unk0);
+}
+*/
-- 
cgit v1.2.3


From 44c1ea16b9ec4d4a1c285bdab84b514f376625cc Mon Sep 17 00:00:00 2001
From: KDSKardabox <bollygame94@gmail.com>
Date: Thu, 15 Feb 2018 16:05:27 +0530
Subject: Cleanup and one non-matching function

---
 src/fldeff_softboiled.c | 162 +++++++++++++-----------------------------------
 1 file changed, 44 insertions(+), 118 deletions(-)

(limited to 'src')

diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index 8211cc77d..d4193b917 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -9,52 +9,10 @@
 #include "sprite.h"
 #include "strings.h"
 #include "task.h"
-//#include "ewram.h"
-
-/*
-struct Struct2001000 {
-    u8 unk0;
-    u8 unk1;
-    u8 unk2;
-    u8 filler3[9];
-    void *unkC;
-};
-
-struct Struct201C000 {
-    struct Pokemon *unk0;
-    u8 filler4[1];
-    u8 unk5;
-    u16 unk6;
-    u8 filler8[4];
-    s32 unkC;
-    void* unk10;
-    u8 filler14[26];
-    s16 unk2E;
-};
-
-#if ENGLISH
-#define WINDOW_LEFT 3
-#define WINDOW_RIGHT 26
-#elif GERMAN
-#define WINDOW_LEFT 0
-#define WINDOW_RIGHT 29
-#endif
-*/
-/*
-// extern
-extern u8 gUnknown_0202E8F6;
-extern u8 gLastFieldPokeMenuOpened;
-extern u8 gUnknown_0202E8F4;
-
-// Static
-static void sub_8133D50(u8 taskId);
-static void sub_8133E74(u8 taskId);
-static void sub_8133EB8(u8 taskId);
-static void sub_8133EF8(void);
-*/
 
 void sub_816166C(u8 taskId);
 void sub_81617B8(u8 taskId);
+void sub_81616C0(u8 taskId);
 void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func);
 
 bool8 SetUpFieldMove_SoftBoiled(void)
@@ -108,84 +66,52 @@ void sub_81615A8(u8 taskId)
     sub_81B1F18(taskId, unk9, -1, GetMonData(&gPlayerParty[unk9], MON_DATA_MAX_HP)/5, sub_816166C);
 }
 
-/*
-void sub_8133D28(u8 taskid) {
-    EWRAM_1000.unkC = sub_8133D50;
-    EWRAM_1B000_2.unk272 = 3;
-    DoPokemonMenu_Switch(taskid);
-}
-
-static void sub_8133D50(u8 taskId) {
-    u8 unk1, unk2;
-    u16 hp;
-    struct Pokemon *pokemon;
-    //struct Task *task;
-
-    struct Sprite *sprites = gSprites;
-
-
-    unk1 = sprites[EWRAM_1000.unk1].data[0];
-    unk2 = sprites[EWRAM_1000.unk2].data[0];
-
-    if (unk1 > 5 || unk2 > 5)
-    {
-        sub_806CD44(taskId);
-        return;
-    }
-
-    EWRAM_1C000.unk0 = &gPlayerParty[sprites[EWRAM_1000.unk2].data[0]];
-    hp = GetMonData(EWRAM_1C000.unk0, MON_DATA_HP);
-
-    if (hp == 0 || unk1 == unk2 || GetMonData(EWRAM_1C000.unk0, MON_DATA_MAX_HP) == hp)
-    {
-        sub_8133EB8(taskId);
-        return;
-    }
-
+#ifdef NONMATCHING
+void sub_816166C(u8 taskId)
+{
     PlaySE(SE_KAIFUKU);
-
-    EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data[0];
-
-    pokemon = &gPlayerParty[EWRAM_1C000.unk5];
-    EWRAM_1C000.unk0 = pokemon;
-    EWRAM_1C000.unk6 = 0;
-    EWRAM_1C000.unkC = -0x8000;
-    EWRAM_1C000.unk10 = sub_8133EF8;
-
-
-    gTasks[taskId].data[10] = GetMonData(EWRAM_1C000.unk0, MON_DATA_MAX_HP);
-    gTasks[taskId].data[11] = GetMonData(EWRAM_1C000.unk0, MON_DATA_HP);
-    gTasks[taskId].data[12] = gTasks[taskId].data[10] / 5;
-
-    sub_806D5A4();
-    gTasks[taskId].func = sub_806FA18;
-    EWRAM_1B000_2.unk282 = gTasks[taskId].data[11];
+    sub_81B1F18(taskId, gUnknown_0203CEC8.unkA, 1, GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_MAX_HP)/5, sub_81616C0);
 }
+#else
+__attribute__((naked))
+void sub_816166C(u8 taskId)
+{
+    asm(".syntax unified\n\
+    push {r4,r5,lr}\n\
+    sub sp, 0x4\n\
+    adds r4, r0, 0\n\
+    lsls r4, 24\n\
+    lsrs r4, 24\n\
+    movs r0, 0x1\n\
+    bl PlaySE\n\
+    ldr r5, =gUnknown_0203CEC8\n\
+    movs r1, 0x9\n\
+    ldrsb r1, [r5, r1]\n\
+    movs r0, 0x64\n\
+    muls r0, r1\n\
+    ldr r1, =gPlayerParty\n\
+    adds r0, r1\n\
+    movs r1, 0x3A\n\
+    bl GetMonData\n\
+    movs r1, 0x5\n\
+    bl __udivsi3\n\
+    adds r3, r0, 0\n\
+    lsls r3, 16\n\
+    asrs r3, 16\n\
+    ldrb r1, [r5, 0xA]\n\
+    ldr r0, =sub_81616C0\n\
+    str r0, [sp]\n\
+    adds r0, r4, 0\n\
+    movs r2, 0x1\n\
+    bl sub_81B1F18\n\
+    add sp, 0x4\n\
+    pop {r4,r5}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool\n\
+    .syntax divided\n");
 
-static void sub_8133E74(u8 taskId) {
-    if (gUnknown_0202E8F6)
-    {
-        return;
-    }
-
-    MenuZeroFillWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19);
-    PrintPartyMenuPromptText(3, 0);
-    gTasks[taskId].func = HandlePartyMenuSwitchPokemonInput;
 }
+#endif
 
-static void sub_8133EB8(u8 taskId) {
-    gUnknown_0202E8F4 = 0;
-    sub_806D5A4();
-    sub_806E834(gOtherText_CantUseOnPoke, 1);
-    gTasks[taskId].func = sub_8133E74;
-}
 
-static void sub_8133EF8(void) {
-    sub_806CCE4();
-    EWRAM_1B000_2.unk261 = 2;
-    DestroySprite(&gSprites[EWRAM_1000.unk1]);
-    MenuZeroFillWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19);
-    PrintPartyMenuPromptText(0, 0);
-    SwitchTaskToFollowupFunc(EWRAM_1000.unk0);
-}
-*/
-- 
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

---
 src/fldeff_softboiled.c | 51 +++++++++----------------------------------------
 1 file changed, 9 insertions(+), 42 deletions(-)

(limited to 'src')

diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index d4193b917..3420faed7 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -7,13 +7,14 @@
 #include "constants/songs.h"
 #include "sound.h"
 #include "sprite.h"
+#include "string_util.h"
 #include "strings.h"
 #include "task.h"
 
 void sub_816166C(u8 taskId);
 void sub_81617B8(u8 taskId);
 void sub_81616C0(u8 taskId);
-void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func);
+void sub_8161724(u8 taskId);
 
 bool8 SetUpFieldMove_SoftBoiled(void)
 {
@@ -66,52 +67,18 @@ void sub_81615A8(u8 taskId)
     sub_81B1F18(taskId, unk9, -1, GetMonData(&gPlayerParty[unk9], MON_DATA_MAX_HP)/5, sub_816166C);
 }
 
-#ifdef NONMATCHING
 void sub_816166C(u8 taskId)
 {
     PlaySE(SE_KAIFUKU);
     sub_81B1F18(taskId, gUnknown_0203CEC8.unkA, 1, GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_MAX_HP)/5, sub_81616C0);
 }
-#else
-__attribute__((naked))
-void sub_816166C(u8 taskId)
-{
-    asm(".syntax unified\n\
-    push {r4,r5,lr}\n\
-    sub sp, 0x4\n\
-    adds r4, r0, 0\n\
-    lsls r4, 24\n\
-    lsrs r4, 24\n\
-    movs r0, 0x1\n\
-    bl PlaySE\n\
-    ldr r5, =gUnknown_0203CEC8\n\
-    movs r1, 0x9\n\
-    ldrsb r1, [r5, r1]\n\
-    movs r0, 0x64\n\
-    muls r0, r1\n\
-    ldr r1, =gPlayerParty\n\
-    adds r0, r1\n\
-    movs r1, 0x3A\n\
-    bl GetMonData\n\
-    movs r1, 0x5\n\
-    bl __udivsi3\n\
-    adds r3, r0, 0\n\
-    lsls r3, 16\n\
-    asrs r3, 16\n\
-    ldrb r1, [r5, 0xA]\n\
-    ldr r0, =sub_81616C0\n\
-    str r0, [sp]\n\
-    adds r0, r4, 0\n\
-    movs r2, 0x1\n\
-    bl sub_81B1F18\n\
-    add sp, 0x4\n\
-    pop {r4,r5}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .pool\n\
-    .syntax divided\n");
 
+void sub_81616C0(u8 taskId)
+{
+    GetMonNickname(&gPlayerParty[gUnknown_0203CEC8.unkA], gStringVar1);
+    StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2);
+    sub_81B1B5C(gStringVar4, 0);
+    schedule_bg_copy_tilemap_to_vram(2);
+    gTasks[taskId].func = sub_8161724;
 }
-#endif
-
 
-- 
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

---
 src/fldeff_softboiled.c | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index 3420faed7..b61cf9f32 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -1,9 +1,7 @@
 #include "global.h"
-#include "fldeff_softboiled.h"
 #include "menu.h"
 #include "party_menu.h"
 #include "pokemon.h"
-//#include "pokemon_menu.h"
 #include "constants/songs.h"
 #include "sound.h"
 #include "sprite.h"
@@ -27,9 +25,7 @@ bool8 SetUpFieldMove_SoftBoiled(void)
 
     minHp = (maxHp / 5);
     if (hp > minHp)
-    {
         return TRUE;
-    }
     return FALSE;
 }
 
@@ -82,3 +78,32 @@ void sub_81616C0(u8 taskId)
     gTasks[taskId].func = sub_8161724;
 }
 
+void sub_8161724(u8 taskId)
+{
+    if(sub_81B1BD4() == 1)
+        return;
+    gUnknown_0203CEC8.unkB = 0x0;
+    sub_81B0FCC(gUnknown_0203CEC8.unk9, 0);
+    gUnknown_0203CEC8.unk9 = gUnknown_0203CEC8.unkA;
+    sub_81B0FCC(gUnknown_0203CEC8.unkA, 1);
+    sub_8198070(0x6, FALSE);
+    ClearWindowTilemap(0x6);
+    display_pokemon_menu_message(0);
+    gTasks[taskId].func = sub_81B1370;
+}
+
+void sub_8161784(u8 taskId)
+{
+    if(sub_81B1BD4() == 1)
+        return;
+    display_pokemon_menu_message(0x5);
+    gTasks[taskId].func = sub_81B1370;
+}
+
+void sub_81617B8(u8 taskId)
+{
+    PlaySE(SE_SELECT);
+    sub_81B1B5C(&gText_CantBeUsedOnPkmn, 0);
+    schedule_bg_copy_tilemap_to_vram(2);
+    gTasks[taskId].func = sub_8161784;
+}
-- 
cgit v1.2.3