Merge pull request #210 from jiangzhengwenjz/party_menu

script_pokemon_util_80BF8FC

2 files changed, 111 insertions, 1 deletions

diff --git a/src/party_menu_specials.c b/src/party_menu_specials.c
new file mode 100644
index 000000000..751684bd5
--- /dev/null
+++ b/src/party_menu_specials.c
@@ -0,0 +1,111 @@
+#include "global.h"
+#include "data.h"
+#include "script.h"
+#include "overworld.h"
+#include "battle.h"
+#include "palette.h"
+#include "pokemon.h"
+#include "party_menu.h"
+#include "field_fadetransition.h"
+#include "pokemon_summary_screen.h"
+#include "event_data.h"
+#include "string_util.h"
+#include "constants/moves.h"
+
+static void sub_80BF97C(u8 taskId);
+
+void Special_ChooseMonFromParty(void)
+{
+    u8 taskId;
+
+    ScriptContext2_Enable();
+    taskId = CreateTask(sub_80BF97C, 10);
+    gTasks[taskId].data[0] = PARTY_MENU_TYPE_CHOOSE_MON;
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
+}
+
+void Special_SelectMoveTutorMon(void)
+{
+    u8 taskId;
+
+    ScriptContext2_Enable();
+    taskId = CreateTask(sub_80BF97C, 10);
+    gTasks[taskId].data[0] = PARTY_MENU_TYPE_MOVE_RELEARNER;
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
+}
+
+static void sub_80BF97C(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        gPaletteFade.bufferTransferDisabled = TRUE;
+        ChoosePartyMonByMenuType((u8)gTasks[taskId].data[0]);
+        DestroyTask(taskId);
+    }
+}
+
+void Special_SelectMove(void)
+{
+    ShowSelectMovePokemonSummaryScreen(gPlayerParty, gSpecialVar_0x8004, gPlayerPartyCount - 1, CB2_ReturnToField, 0);
+    sub_8138B38(3);
+    gFieldCallback = FieldCallback_ReturnToEventScript2;
+}
+
+void Special_GetNumMovesSelectedMonHas(void)
+{
+    u8 i;
+
+    gSpecialVar_Result = 0;
+    for (i = 0; i < MAX_MON_MOVES; ++i)
+        if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_MOVE1 + i) != MOVE_NONE)
+            ++gSpecialVar_Result;
+}
+
+void Special_BufferMoveDeleterNicknameAndMove(void)
+{
+    struct Pokemon *mon = &gPlayerParty[gSpecialVar_0x8004];
+    u16 move = GetMonData(mon, MON_DATA_MOVE1 + gSpecialVar_0x8005);
+
+    GetMonNickname(mon, gStringVar1);
+    StringCopy(gStringVar2, gMoveNames[move]);
+}
+
+static void ShiftMoveSlot(struct Pokemon *mon, u8 slotTo, u8 slotFrom)
+{
+    u16 move1 = GetMonData(mon, MON_DATA_MOVE1 + slotTo);
+    u16 move0 = GetMonData(mon, MON_DATA_MOVE1 + slotFrom);
+    u8 pp1 = GetMonData(mon, MON_DATA_PP1 + slotTo);
+    u8 pp0 = GetMonData(mon, MON_DATA_PP1 + slotFrom);
+    u8 ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES);
+    u8 ppBonusMask1 = gPPUpGetMask[slotTo];
+    u8 ppBonusMove1 = (ppBonuses & ppBonusMask1) >> (slotTo * 2);
+    u8 ppBonusMask2 = gPPUpGetMask[slotFrom];
+    u8 ppBonusMove2 = (ppBonuses & ppBonusMask2) >> (slotFrom * 2);
+
+    ppBonuses &= ~ppBonusMask1;
+    ppBonuses &= ~ppBonusMask2;
+    ppBonuses |= (ppBonusMove1 << (slotFrom * 2)) + (ppBonusMove2 << (slotTo * 2));
+    SetMonData(mon, MON_DATA_MOVE1 + slotTo, &move0);
+    SetMonData(mon, MON_DATA_MOVE1 + slotFrom, &move1);
+    SetMonData(mon, MON_DATA_PP1 + slotTo, &pp0);
+    SetMonData(mon, MON_DATA_PP1 + slotFrom, &pp1);
+    SetMonData(mon, MON_DATA_PP_BONUSES, &ppBonuses);
+}
+
+void Special_MoveDeleterForgetMove(void)
+{
+    u16 i;
+
+    SetMonMoveSlot(&gPlayerParty[gSpecialVar_0x8004], MOVE_NONE, gSpecialVar_0x8005);
+    RemoveMonPPBonus(&gPlayerParty[gSpecialVar_0x8004], gSpecialVar_0x8005);
+    for (i = gSpecialVar_0x8005; i < MAX_MON_MOVES - 1; ++i)
+        ShiftMoveSlot(&gPlayerParty[gSpecialVar_0x8004], i, i + 1);
+}
+
+void Special_IsSelectedMonEgg(void)
+{
+    if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_IS_EGG))
+        gSpecialVar_Result = TRUE;
+    else
+        gSpecialVar_Result = FALSE;
+}
diff --git a/src/scrcmd.c b/src/scrcmd.c
index fad30a6a8..6d2b1f430 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -34,7 +34,6 @@
 #include "coins.h"
 #include "battle_setup.h"
 #include "shop.h"
-#include "script_pokemon_80F8.h"
 #include "slot_machine.h"
 #include "field_effect.h"
 #include "fieldmap.h"