fix conflicts

6 files changed, 128 insertions, 43 deletions

diff --git a/include/battle.h b/include/battle.h
index b0554a914..ae8a1c98a 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -563,6 +563,14 @@ struct BattleStruct
 #define IS_MOVE_PHYSICAL(moveType)(moveType < TYPE_MYSTERY)
 #define IS_MOVE_SPECIAL(moveType)(moveType > TYPE_MYSTERY)
 
+#define TARGET_TURN_DAMAGED ((gSpecialStatuses[gBattlerTarget].physicalDmg != 0 || gSpecialStatuses[gBattlerTarget].specialDmg != 0))
+
+#define IS_BATTLER_OF_TYPE(battlerId, type)((gBattleMons[battlerId].type1 == type || gBattleMons[battlerId].type2 == type))
+#define SET_BATTLER_TYPE(battlerId, type)   \
+{                                           \
+    gBattleMons[battlerId].type1 = type;    \
+    gBattleMons[battlerId].type2 = type;    \
+}
 
 #define GET_STAT_BUFF_ID(n)((n & 0xF))              // first four bits 0x1, 0x2, 0x4, 0x8
 #define GET_STAT_BUFF_VALUE(n)(((n >> 4) & 7))      // 0x10, 0x20, 0x40
diff --git a/include/battle_message.h b/include/battle_message.h
index a68ad1551..bf9b590af 100644
--- a/include/battle_message.h
+++ b/include/battle_message.h
@@ -229,13 +229,62 @@ extern const u8* const gPokeblockWasTooXStringTable[];
 extern const u8* const gRefereeStringsTable[];
 extern const u8* const gStatNamesTable2[];
 
+extern const u8 gText_PkmnIsEvolving[];
+extern const u8 gText_CongratsPkmnEvolved[];
+extern const u8 gText_PkmnStoppedEvolving[];
+extern const u8 gText_EllipsisQuestionMark[];
+extern const u8 gText_WhatWillPkmnDo[];
+extern const u8 gText_WhatWillPkmnDo2[];
+extern const u8 gText_WhatWillWallyDo[];
+extern const u8 gText_LinkStandby[];
+extern const u8 gText_BattleMenu[];
+extern const u8 gText_SafariZoneMenu[];
+extern const u8 gText_MoveInterfacePP[];
+extern const u8 gText_MoveInterfaceType[];
+extern const u8 gText_MoveInterfacePpType[];
+extern const u8 gText_MoveInterfaceDynamicColors[];
+extern const u8 gText_WhichMoveToForget4[];
+extern const u8 gText_BattleYesNoChoice[];
+extern const u8 gText_BattleSwitchWhich[];
+extern const u8 gText_BattleSwitchWhich2[];
+extern const u8 gText_BattleSwitchWhich3[];
+extern const u8 gText_BattleSwitchWhich4[];
+extern const u8 gText_BattleSwitchWhich5[];
+extern const u8 gText_SafariBalls[];
+extern const u8 gText_SafariBallLeft[];
+extern const u8 gText_SpaceAndSpace[];
+extern const u8 gText_CommaSpace[];
+extern const u8 gText_Space2[];
+extern const u8 gText_ScrollTextUp[];
+extern const u8 gText_NewLine[];
+extern const u8 gText_Are[];
+extern const u8 gText_Are2[];
 extern const u8 gText_BadEgg[];
+extern const u8 gText_BattleWallyName[];
+extern const u8 gText_Win[];
+extern const u8 gText_Loss[];
+extern const u8 gText_Draw[];
 extern const u8 gText_StatRose[];
 extern const u8 gText_PkmnsStatChanged2[];
 extern const u8 gText_PkmnGettingPumped[];
 extern const u8 gText_PkmnShroudedInMist[];
-extern const u8 gText_BattleWallyName[];
 extern const u8 gText_PkmnsXPreventsSwitching[];
+extern const u8 gText_TheGreatNewHope[];
+extern const u8 gText_WillChampinshipDreamComeTrue[];
+extern const u8 gText_AFormerChampion[];
+extern const u8 gText_ThePreviousChampion[];
+extern const u8 gText_TheUnbeatenChampion[];
+extern const u8 gText_PlayerMon1Name[];
+extern const u8 gText_Vs[];
+extern const u8 gText_OpponentMon1Name[];
+extern const u8 gText_Mind[];
+extern const u8 gText_Skill[];
+extern const u8 gText_Body[];
+extern const u8 gText_Judgement[];
+extern const u8 gText_EmptyString3[];
+extern const u8 gText_RecordBattleToPass[];
+extern const u8 gText_BattleRecordedOnPass[];
+extern const u8 gText_BattleTourney[];
 
 extern const u16 gMissStringIds[];
 extern const u16 gTrappingMoves[];
diff --git a/include/battle_util.h b/include/battle_util.h
index d992faa47..e5c1aaf18 100644
--- a/include/battle_util.h
+++ b/include/battle_util.h
@@ -49,36 +49,36 @@ void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move);
 void PressurePPLoseOnUsingPerishSong(u8 bankAtk);
 void PressurePPLoseOnUsingImprision(u8 bankAtk);
 void MarkAllBattlersForControllerExec(void); // unused
-void MarkBattlerForControllerExec(u8 bank);
+void MarkBattlerForControllerExec(u8 battlerId);
 void sub_803F850(u8 arg0);
-void CancelMultiTurnMoves(u8 bank);
-bool8 WasUnableToUseMove(u8 bank);
-void PrepareStringBattle(u16 stringId, u8 bank);
+void CancelMultiTurnMoves(u8 battlerId);
+bool8 WasUnableToUseMove(u8 battlerId);
+void PrepareStringBattle(u16 stringId, u8 battlerId);
 void ResetSentPokesToOpponentValue(void);
-void sub_803F9EC(u8 bank);
-void sub_803FA70(u8 bank);
+void sub_803F9EC(u8 battlerId);
+void sub_803FA70(u8 battlerId);
 void BattleScriptPush(const u8* bsPtr);
 void BattleScriptPushCursor(void);
 void BattleScriptPop(void);
 u8 TrySetCantSelectMoveBattleScript(void);
-u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check);
+u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check);
 bool8 AreAllMovesUnusable(void);
-u8 GetImprisonedMovesCount(u8 bank, u16 move);
+u8 GetImprisonedMovesCount(u8 battlerId, u16 move);
 u8 UpdateTurnCounters(void);
 u8 TurnBasedEffects(void);
 bool8 HandleWishPerishSongOnTurnEnd(void);
 bool8 HandleFaintedMonActions(void);
 void TryClearRageStatuses(void);
 u8 AtkCanceller_UnableToUseMove(void);
-bool8 sub_80423F4(u8 bank, u8 r1, u8 r2);
-u8 CastformDataTypeChange(u8 bank);
-u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg);
+bool8 sub_80423F4(u8 battlerId, u8 r1, u8 r2);
+u8 CastformDataTypeChange(u8 battlerId);
+u8 AbilityBattleEffects(u8 caseID, u8 battlerId, u8 ability, u8 special, u16 moveArg);
 void BattleScriptExecute(const u8* BS_ptr);
 void BattleScriptPushCursorAndCallback(const u8* BS_ptr);
-u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn);
-void ClearFuryCutterDestinyBondGrudge(u8 bank);
+u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn);
+void ClearFuryCutterDestinyBondGrudge(u8 battlerId);
 void HandleAction_RunBattleScript(void);
-u8 GetMoveTarget(u16 move, u8 useMoveTarget);
+u8 GetMoveTarget(u16 move, u8 setTarget);
 u8 IsMonDisobedient(void);
 
 #endif // GUARD_BATTLE_UTIL_H
diff --git a/include/list_menu.h b/include/list_menu.h
index 77d00bf97..0aa66a524 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -4,9 +4,11 @@
 #define LIST_NOTHING_CHOSEN -1
 #define LIST_B_PRESSED -2
 
-// Exported type declarations
+#define LIST_NO_MULTIPLE_SCROLL     0
+#define LIST_MULTIPLE_SCROLL_DPAD   1
+#define LIST_MULTIPLE_SCROLL_L_R    2
 
-// Exported RAM declarations
+struct ListMenu;
 
 struct ListMenuItem
 {
@@ -14,33 +16,31 @@ struct ListMenuItem
     s32 id;
 };
 
-struct ListMenu;
-
 struct ListMenuTemplate
 {
     const struct ListMenuItem *items;
-    void (* moveCursorFunc)(u32, bool8, struct ListMenu *);
-    void (* unk_08)(u8, s32, u8);
+    void (* moveCursorFunc)(s32, bool8, struct ListMenu *);
+    void (* unk_08)(u8 windowId, s32 itemId, u8 y);
     u16 totalItems;
     u16 maxShowed;
-    u8 unk_10;
+    u8 windowId;
     u8 unk_11;
     u8 unk_12;
-    u8 cursor_Y;
-    u32 upText_Y:4; // x1, x2, x4, x8 = xF
-    u32 cursorColor:4; // x10, x20, x40, x80 = xF0
-    u32 fillColor:4; // x100, x200, x400, x800 = xF00
-    u32 cursorShadowColor:4; // x1000, x2000, x4000, x8000 = xF000
-    u32 unk_16_0:1; // x10000
-    u32 spaceBetweenItems:6; // x20000, x40000, x80000, x100000, x200000, x400000 = x7E0000
-    u32 unk_16_7:1; // x800000
-    u32 unk_17_0:6; // x1000000, x2000000, x4000000, x8000000, x10000000, x20000000 = x3F000000
-    u32 cursorKind:2; // x40000000, x80000000
+    u8 cursor_X;
+    u8 upText_Y:4; // x1, x2, x4, x8 = xF
+    u8 cursorPal:4; // x10, x20, x40, x80 = xF0
+    u8 fillValue:4; // x1, x2, x4, x8 = xF
+    u8 cursorShadowPal:4; // x10, x20, x40, x80 = xF0
+    u8 lettersSpacing:3;
+    u8 unk_16_3:3;
+    u8 scrollMultiple:2; // x40, x80 = xC0
+    u8 fontId:6; // x1, x2, x4, x8, x10, x20 = x3F
+    u8 cursorKind:2; // x40, x80
 };
 
 struct ListMenu
 {
-    struct ListMenuTemplate _template;
+    struct ListMenuTemplate template;
     u16 scrollOffset;
     u16 selectedRow;
     u8 unk_1C;
@@ -49,14 +49,30 @@ struct ListMenu
     u8 unk_1F;
 };
 
-extern struct ListMenuTemplate gMultiuseListMenuTemplate;
+struct UnknownListMenuWindowStruct
+{
+    u8 x;
+    u8 y;
+    u8 width;
+    u8 height;
+    u8 palNum;
+};
 
-// Exported ROM declarations
+extern struct ListMenuTemplate gMultiuseListMenuTemplate;
 
-u8 ListMenuInit(struct ListMenuTemplate *template, u16 cursorPage, u16 cursorPosition);
+s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum);
+u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow);
+u8 ListMenuInitWithWindows(struct ListMenuTemplate *listMenuTemplate, struct UnknownListMenuWindowStruct *arg1, u16 scrollOffset, u16 selectedRow);
 s32 ListMenuHandleInputGetItemId(u8 listTaskId);
-void sub_81AE860(u8 listTaskId, u16 *a1, u16 *a2);
-void sub_81AE6C8(u8 listTaskId, u16 *a1, u16 *a2);
-u8 ListMenuGetYCoordForPrintingArrowCursor(u8);
+void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow);
+void sub_81AE70C(u8 listTaskId);
+void ChangeListMenuPals(u8 listTaskId, u8 cursorPal, u8 fillValue, u8 cursorShadowPal);
+void ChangeListMenuCoords(u8 listTaskId, u8 x, u8 y);
+s32 ListMenuTestInput(struct ListMenuTemplate *template, u32 scrollOffset, u32 selectedRow, u16 keys, u16 *newScrollOffset, u16 *newSelectedRow);
+void ListMenuGetCurrentItemArrayId(u8 listTaskId, u16 *arrayId);
+void ListMenuGetScrollAndRow(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow);
+u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId);
+void sub_81AF028(u8 cursorPal, u8 fillValue, u8 cursorShadowPal);
+void sub_81AF078(s32 arg0, u8 arg1, struct ListMenu *list);
 
 #endif //GUARD_LIST_MENU_H
diff --git a/include/menu_indicators.h b/include/menu_indicators.h
index b82e48725..a099cffab 100644
--- a/include/menu_indicators.h
+++ b/include/menu_indicators.h
@@ -7,16 +7,31 @@
 
 // Exported ROM declarations
 
-struct ArrowStruct {
+struct ArrowStruct
+{
     u8 unk0[6];
     u16 unk6[4];
     u8 unkE;
 };
 
+struct CursorStruct
+{
+    u8 unk0;
+    u8 unk1;
+    u16 unk2;
+    u16 unk4;
+    u16 unk6;
+    u16 unk8;
+    u8 unkA;
+};
+
 void Task_ScrollIndicatorArrowPairOnMainMenu(u8);
 u8 AddScrollIndicatorArrowPairParametrized(u8, u8, u8, u8, s32, u16, u16, u16 *);
 void RemoveScrollIndicatorArrowPair(u8);
 u8 AddScrollIndicatorArrowPair(const struct ArrowStruct*, void*);
 void sub_81AF15C(u8, u8, u8);
+void ListMenuRemoveCursorObject(u8 taskId, u32 cursorKind);
+void ListMenuUpdateCursorObject(u8 taskId, u16 x, u16 y, u32 cursorKind);
+u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorKind);
 
 #endif //GUARD_MENU_INDICATORS_H
diff --git a/include/strings.h b/include/strings.h
index 70b2777e1..ceb994900 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -112,9 +112,6 @@ extern const u8 gText_Cancel4[];
 extern const u8 gText_IsThisTheCorrectTime[];
 extern const u8 gText_PkmnFainted3[];
 extern const u8 gText_Coins[];
-extern const u8 gText_Draw[];
-extern const u8 gText_Loss[];
-extern const u8 gText_Win[];
 
 extern const u8 gText_Var1AteTheVar2[];
 extern const u8 gText_Var1HappilyAteVar2[];