fix conflicts

12 files changed, 32 insertions, 19 deletions

diff --git a/include/battle_bg.h b/include/battle_bg.h
index 29571b410..61c106b64 100644
--- a/include/battle_bg.h
+++ b/include/battle_bg.h
@@ -5,7 +5,7 @@
 
 extern const struct BgTemplate gBattleBgTemplates[];
 
-void sub_800F34C(void);
+void InitBattleBgsVideo(void);
 void DrawBattleEntryBackground(void);
 void sub_800F6FC(u8 taskId);
 void LoadBattleMenuWindowGfx(void);
diff --git a/include/battle_main.h b/include/battle_main.h
index 613171da9..fe585f0e6 100644
--- a/include/battle_main.h
+++ b/include/battle_main.h
@@ -69,7 +69,7 @@ void VBlankCB_Battle(void);
 void nullsub_9(struct Sprite *sprite);
 void sub_801182C(struct Sprite *sprite);
 void sub_8011A1C(void);
-u32 sub_8011C44(u8 arrayId, u8 caseId);
+u32 GetBattleBgAttribute(u8 arrayId, u8 caseId);
 void SpriteCB_WildMon(struct Sprite *sprite);
 void SpriteCallbackDummy2(struct Sprite *sprite);
 void SpriteCB_FaintOpponentMon(struct Sprite *sprite);
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 6942fee83..a2ad90776 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -83,4 +83,8 @@
 // Shiny odds
 #define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536
 
+// Learning moves
+#define MON_ALREADY_KNOWS_MOVE 0xFFFE
+#define MON_HAS_MAX_MOVES      0xFFFF
+
 #endif // GUARD_CONSTANTS_POKEMON_H
diff --git a/include/dynamic_placeholder_text_util.h b/include/dynamic_placeholder_text_util.h
index 31cfe8d30..bae92eb01 100644
--- a/include/dynamic_placeholder_text_util.h
+++ b/include/dynamic_placeholder_text_util.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_UNK_TEXT_UTIL_H
-#define GUARD_UNK_TEXT_UTIL_H
+#ifndef GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H
+#define GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H
 
 #include "global.h"
 
@@ -9,4 +9,4 @@ u8 *DynamicPlaceholderTextUtil_ExpandPlaceholders(u8 *dest, const u8 *src);
 const u8 *DynamicPlaceholderTextUtil_GetPlaceholderPtr(u8 idx);
 u8 GetColorFromTextColorTable(u16 graphicId);
 
-#endif //GUARD_UNK_TEXT_UTIL_H
+#endif //GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H
diff --git a/include/evolution_graphics.h b/include/evolution_graphics.h
index 21f133872..e4fbf0fc0 100644
--- a/include/evolution_graphics.h
+++ b/include/evolution_graphics.h
@@ -10,7 +10,7 @@ u8 LaunchTask_PreEvoSparklesSet2(void);
 u8 LaunchTask_PostEvoSparklesSet1(void);
 u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 species);
 u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 species);
-u8 sub_817C3A0(u8 preEvoSpriteID, u8 postEvoSpriteID);
+u8 LaunchTask_PrePostEvoMonSprites(u8 preEvoSpriteId, u8 postEvoSpriteId);
 
 #define EvoGraphicsTaskEvoStop  data[8]
 
diff --git a/include/evolution_scene.h b/include/evolution_scene.h
index 6ceed99c1..3f504a1f1 100644
--- a/include/evolution_scene.h
+++ b/include/evolution_scene.h
@@ -3,10 +3,11 @@
 
 #include "global.h"
 
-void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8, u8 partyID);
-void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8, u8 partyID);
-void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID);
-
 extern void (*gCB2_AfterEvolution)(void);
 
+void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8, u8 partyId);
+void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8, u8 partyId);
+void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteId, u8 partyId);
+void IsMovingBackgroundTaskRunning(void);
+
 #endif // GUARD_EVOLUTION_SCENE_H
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 6ea771500..8d042825c 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -12,7 +12,7 @@ struct YesNoFuncTable
 };
 
 bool16 RunTextPrinters_CheckActive(u8 textPrinterId);
-bool8 sub_80BF72C(void);
+bool32 sub_80BF72C(void);
 bool8 sub_80BF748(void);
 bool8 MenuHelpers_LinkSomething(void);
 void SetVBlankHBlankCallbacksToNull(void);
diff --git a/include/pokemon.h b/include/pokemon.h
index 3d0faca36..c5ad89f41 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -14,7 +14,7 @@
 #define MON_DATA_OT_NAME            7
 #define MON_DATA_MARKINGS           8
 #define MON_DATA_CHECKSUM           9
-#define MON_DATA_10                10
+#define MON_DATA_ENCRYPT_SEPARATOR 10
 #define MON_DATA_SPECIES           11
 #define MON_DATA_HELD_ITEM         12
 #define MON_DATA_MOVE1             13
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index b800e3d30..2655405e5 100644
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -10,7 +10,7 @@ extern const u8 *const gNatureNamePointers[];
 
 void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
 void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
-u8 sub_8138B2C(void);
+u8 GetMoveSlotToReplace(void);
 void SummaryScreen_SetUnknownTaskId(u8 a0);
 void SummaryScreen_DestroyUnknownTask(void);
 
diff --git a/include/sprite.h b/include/sprite.h
index 85722311f..7432306a4 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -253,6 +253,7 @@ extern s16 gSpriteCoordOffsetY;
 extern const struct SpriteTemplate gDummySpriteTemplate;
 extern struct Sprite gSprites[];
 extern struct OamMatrix gOamMatrices[];
+extern bool8 gAffineAnimsDisabled;
 
 void ResetSpriteData(void);
 void AnimateSprites(void);
diff --git a/include/strings.h b/include/strings.h
index 89149a8eb..7750b271c 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -688,7 +688,7 @@ extern const u8 gText_XWillBeSentToY[];
 extern const u8 gText_ByeByeVar1[];
 extern const u8 gText_XSentOverY[];
 extern const u8 gText_TakeGoodCareOfX[];
-extern const u8 gUnknown_841E325[];
+extern const u8 gText_CommunicationStandby5[];
 extern const u8 gTradeText_Cancel[];
 extern const u8 gTradeText_ChooseAPokemon[];
 extern const u8 gTradeText_Summary[];
@@ -780,11 +780,18 @@ extern const u8 gText_BattleStyleShift[];
 extern const u8 gText_BattleStyleSet[];
 extern const u8 gText_SoundMono[];
 extern const u8 gText_SoundStereo[];
-extern const u8 gText_ButtonTypeNormal[];
+extern const u8 gText_ButtonTypeHelp[];
 extern const u8 gText_ButtonTypeLR[];
 extern const u8 gText_ButtonTypeLEqualsA[];
-extern const u8 gText_MenuOptionOption[];
+extern const u8 gText_MenuOption[];
 extern const u8 gText_FrameType[];
+extern const u8 gTextJP_Type[];
 extern const u8 gText_PickSwitchCancel[];
 
+// evolution_scene
+extern const u8 gText_PkmnIsEvolving[];
+extern const u8 gText_CongratsPkmnEvolved[];
+extern const u8 gText_EllipsisQuestionMark[];
+extern const u8 gText_PkmnStoppedEvolving[];
+
 #endif //GUARD_STRINGS_H
diff --git a/include/trade_scene.h b/include/trade_scene.h
index 13cb1a56c..52e80e418 100644
--- a/include/trade_scene.h
+++ b/include/trade_scene.h
@@ -7,11 +7,11 @@ void DoInGameTradeScene(void);
 void DrawTextOnTradeWindow(u8 windowId, const u8 *str, s8 speed);
 u16 GetInGameTradeSpeciesInfo(void);
 u16 GetTradeSpecies(void);
-void sub_805049C(void);
-void sub_80504B0(void);
+void InitTradeSequenceBgGpuRegs(void);
+void LinkTradeDrawWindow(void);
 void LoadTradeAnimGfx(void);
 
 extern const u16 gUnknown_826601C[];
-extern const struct WindowTemplate gUnknown_826D1CC;
+extern const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate;
 
 #endif //GUARD_TRADE_SCENE_H