Merge branch 'master' into decompile_pokeblock_feed

9 files changed, 114 insertions, 73 deletions

diff --git a/include/battle.h b/include/battle.h
index 4b2542017..08ed5cf58 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -19,6 +19,15 @@
 #define BATTLE_TYPE_LEGENDARY       0x2000
 #define BATTLE_TYPE_REGI            0x4000
 
+#define BATTLE_WON                  0x1
+#define BATTLE_LOST                 0x2
+#define BATTLE_DREW                 0x3
+#define BATTLE_RAN                  0x4
+#define BATTLE_PLAYER_TELEPORTED    0x5
+#define BATTLE_POKE_FLED            0x6
+#define BATTLE_CAUGHT               0x7
+#define BATTLE_OPPONENT_TELEPORTED  0xA
+
 #define AI_ACTION_DONE          0x0001
 #define AI_ACTION_FLEE          0x0002
 #define AI_ACTION_WATCH         0x0004
@@ -327,7 +336,7 @@ struct BattleStruct /* 0x2000000 */
     /*0x1609D*/ u8 unk1609D;
     /*0x1609E*/ u8 unk1609E;
     /*0x1609F*/ u8 unk1609F;
-    /*0x160A0*/ u8 unk160a0;
+    /*0x160A0*/ u8 stringMoveType;
     /*0x160A1*/ u8 animTargetsHit;
     /*0x160A2*/ u8 expGetterBank;
     /*0x160A3*/ u8 unk160A3;
@@ -511,12 +520,12 @@ struct BattleResults
 
 struct Struct2017800
 {
-    u8 unk0_0:1;
+    u8 invisible:1;
     u8 unk0_1:1;
-    u8 unk0_2:1;
+    u8 substituteSprite:1;
     u8 unk0_3:1;
     u8 unk0_4:1;
-    u16 unk2;
+    u16 transformedSpecies;
 };
 
 struct Struct2017810
diff --git a/include/battle_message.h b/include/battle_message.h
index da57333a5..d115e5357 100644
--- a/include/battle_message.h
+++ b/include/battle_message.h
@@ -1,7 +1,8 @@
 #ifndef GUARD_BATTLE_MESSAGE_H
 #define GUARD_BATTLE_MESSAGE_H
 
-void StrCpyDecodeToDisplayedStringBattle(const u8 *);
-void StrCpyDecodeBattle(const u8 *, u8 *);
+void BufferStringBattle(u16 stringID);
+u32 StrCpyDecodeToDisplayedStringBattle(const u8* src);
+u32 StrCpyDecodeBattle(const u8* src, u8* dst);
 
 #endif // GUARD_BATTLE_MESSAGE_H
diff --git a/include/battle_transition.h b/include/battle_transition.h
index b01378505..ca6869c93 100644
--- a/include/battle_transition.h
+++ b/include/battle_transition.h
@@ -1,8 +1,42 @@
 #ifndef GUARD_BATTLE_TRANSITION_H
 #define GUARD_BATTLE_TRANSITION_H
 
-void sub_811AABC(u8);
-void sub_811AAD8(u8);
-u8 sub_811AAE8(void);
+void sub_811AABC(u8 transitionID);
+void sub_811AAD8(u8 transitionID);
+bool8 IsBattleTransitionDone(void);
+
+#define TRANSITIONS_NO         17
+
+enum // TRANSITION_MUGSHOT
+{
+    MUGSHOT_SYDNEY,
+    MUGSHOT_PHOEBE,
+    MUGSHOT_GLACIA,
+    MUGSHOT_DRAKE,
+    MUGSHOT_STEVEN,
+};
+
+#define MUGSHOTS_NO             5
+
+// credits for the names go to Dyskinesia and Tetrable
+// names are naturally subject to change
+
+#define B_TRANSITION_BLUR                   0
+#define B_TRANSITION_SWIRL                  1
+#define B_TRANSITION_SHUFFLE                2
+#define B_TRANSITION_BIG_POKEBALL           3
+#define B_TRANSITION_POKEBALLS_TRAIL        4
+#define B_TRANSITION_CLOCKWISE_BLACKFADE    5
+#define B_TRANSITION_RIPPLE                 6
+#define B_TRANSITION_WAVE                   7
+#define B_TRANSITION_SLICE                  8
+#define B_TRANSITION_WHITEFADE              9
+#define B_TRANSITION_GRID_SQUARES           10
+#define B_TRANSITION_SHARDS                 11
+#define B_TRANSITION_SYDNEY                 12
+#define B_TRANSITION_PHOEBE                 13
+#define B_TRANSITION_GLACIA                 14
+#define B_TRANSITION_DRAKE                  15
+#define B_TRANSITION_STEVEN                 16
 
 #endif // GUARD_BATTLE_TRANSITION_H
diff --git a/include/berry_blender.h b/include/berry_blender.h
deleted file mode 100644
index 924b24b00..000000000
--- a/include/berry_blender.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GUARD_BERRY_BLENDER_H
-#define GUARD_BERRY_BLENDER_H
-
-void sub_80516C4(u8, u16);
-
-#endif // GUARD_BERRY_BLENDER_H
diff --git a/include/data2.h b/include/data2.h
index 9dd26fd5f..2837a4451 100644
--- a/include/data2.h
+++ b/include/data2.h
@@ -45,6 +45,8 @@ extern const u8 gTrainerClassNames[][13];
 extern const struct Trainer gTrainers[];
 extern u8 gSpeciesNames[][11];
 extern u8 gMoveNames[][13];
+extern const u8 gAbilityNames[][13];
+extern const u8 gTypeNames[][7];
 extern const struct UnknownStructD2 gUnknown_081F9674;
 extern const u8 gUnknown_081F96C8[];
 extern struct CompressedSpriteSheet gUnknown_081FAEA4;
diff --git a/include/field_effect.h b/include/field_effect.h
index ea02c4131..f43b15afb 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -244,7 +244,7 @@ void sub_808948C(struct Task *);
 void sub_80894C4(struct Task *);
 void fishE(struct Task *);
 
-u8 CreateTrainerSprite_BirchSpeech(u8 gender, s16 x, s16 y, u8 subpriority, u8 *buffer);
+u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer);
 void LoadTrainerGfx_TrainerCard(u8 gender, u16 palOffset, u8 *dest);
 u8 CreateBirchSprite(s16 x, s16 y, u8 subpriority);
 u8 CreateMonSprite_PicBox(u16, s16, s16, u8);
diff --git a/include/pokemon.h b/include/pokemon.h
index 21173d503..d0ceaf15e 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -583,6 +583,7 @@ void AdjustFriendship(struct Pokemon *, u8);
 u8 CheckPartyHasHadPokerus(struct Pokemon *, u8);
 void UpdatePartyPokerusTime(u16);
 u32 CanMonLearnTMHM(struct Pokemon *, u8);
+u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves);
 u8 sub_8040574(struct Pokemon *party);
 void ClearBattleMonForms(void);
 void sub_80408BC();
diff --git a/include/rom4.h b/include/rom4.h
index 8d5b1bfa2..daccad7e9 100644
--- a/include/rom4.h
+++ b/include/rom4.h
@@ -120,7 +120,7 @@ bool32 is_c1_link_related_active(void);
 // c1_overworld_normal
 // c1_overworld
 // c2_overworld_basic
-// sub_8054398
+void sub_8054398(void);
 void c2_overworld(void);
 // set_callback1
 // sub_80543DC
diff --git a/include/songs.h b/include/songs.h
index 8cf7ee5e9..25707ddd3 100644
--- a/include/songs.h
+++ b/include/songs.h
@@ -36,29 +36,29 @@ enum
     /*0x1E*/ SE_N,
     /*0x1F*/ SE_SEIKAI,
     /*0x20*/ SE_HAZURE,
-    SE_EXP,
-    SE_JITE_PYOKO,
-    SE_MU_PACHI,
-    SE_TK_KASYA,
-    SE_FU_ZAKU,
-    SE_FU_ZAKU2,
-    SE_FU_ZUZUZU,
-    SE_RU_GASHIN,
-    SE_RU_GASYAN,
-    SE_RU_BARI,
-    SE_RU_HYUU,
-    SE_KI_GASYAN,
-    SE_TK_WARPIN,
-    SE_TK_WARPOUT,
-    SE_TU_SAA,
-    SE_HI_TURUN,
-    SE_TRACK_MOVE,
-    SE_TRACK_STOP,
-    SE_TRACK_HAIK,
-    SE_TRACK_DOOR,
-    SE_MOTER,
-    SE_CARD,
-    SE_SAVE,
+    /*0x21*/ SE_EXP,
+    /*0x22*/ SE_JITE_PYOKO,
+    /*0x23*/ SE_MU_PACHI,
+    /*0x24*/ SE_TK_KASYA,
+    /*0x25*/ SE_FU_ZAKU,
+    /*0x26*/ SE_FU_ZAKU2,
+    /*0x27*/ SE_FU_ZUZUZU,
+    /*0x28*/ SE_RU_GASHIN,
+    /*0x29*/ SE_RU_GASYAN,
+    /*0x2A*/ SE_RU_BARI,
+    /*0x2B*/ SE_RU_HYUU,
+    /*0x2C*/ SE_KI_GASYAN,
+    /*0x2D*/ SE_TK_WARPIN,
+    /*0x2E*/ SE_TK_WARPOUT,
+    /*0x2F*/ SE_TU_SAA,
+    /*0x30*/ SE_HI_TURUN,
+    /*0x31*/ SE_TRACK_MOVE,
+    /*0x32*/ SE_TRACK_STOP,
+    /*0x33*/ SE_TRACK_HAIK,
+    /*0x34*/ SE_TRACK_DOOR,
+    /*0x35*/ SE_MOTER,
+    /*0x36*/ SE_CARD,
+    /*0x37*/ SE_SAVE,
     /*0x38*/ SE_KON,
     /*0x39*/ SE_KON2,
     /*0x3A*/ SE_KON3,
@@ -107,7 +107,7 @@ enum
     SE_C_PIKON,
     SE_REAPOKE,
     SE_OP_BASYU,
-    SE_BT_START,
+    /*0x68*/ SE_BT_START,
     SE_DENDOU,
     SE_JIHANKI,
     SE_TAMA,
@@ -274,38 +274,38 @@ enum
     /*0x171*/ BGM_ME_BACHI,
     /*0x172*/ BGM_FANFA4,
     /*0x173*/ BGM_FANFA5,
-    BGM_ME_WAZA,
-    BGM_BIJYUTU,
-    BGM_DOORO_X4,
-    BGM_FUNE_KAN,
-    BGM_ME_SHINKA,
-    BGM_SHINKA,
-    BGM_ME_WASURE,
-    BGM_SYOUJOEYE,
-    BGM_BOYEYE,
-    BGM_DAN02,
-    BGM_MACHI_S3,
-    BGM_ODAMAKI,
-    BGM_B_TOWER,
-    BGM_SWIMEYE,
-    BGM_DAN03,
-    BGM_ME_KINOMI,
-    BGM_ME_TAMA,
-    BGM_ME_B_BIG,
-    BGM_ME_B_SMALL,
-    BGM_ME_ZANNEN,
-    BGM_BD_TIME,
-    BGM_TEST1,
-    BGM_TEST2,
-    BGM_TEST3,
-    BGM_TEST4,
-    BGM_TEST,
-    BGM_GOMACHI0,
-    BGM_GOTOWN,
-    BGM_POKECEN,
-    BGM_NEXTROAD,
-    BGM_GRANROAD,
-    BGM_CYCLING,
+    /*0x174*/ BGM_ME_WAZA,
+    /*0x175*/ BGM_BIJYUTU,
+    /*0x176*/ BGM_DOORO_X4,
+    /*0x177*/ BGM_FUNE_KAN,
+    /*0x178*/ BGM_ME_SHINKA,
+    /*0x179*/ BGM_SHINKA,
+    /*0x17A*/ BGM_ME_WASURE,
+    /*0x17B*/ BGM_SYOUJOEYE,
+    /*0x17C*/ BGM_BOYEYE,
+    /*0x17D*/ BGM_DAN02,
+    /*0x17E*/ BGM_MACHI_S3,
+    /*0x17F*/ BGM_ODAMAKI,
+    /*0x180*/ BGM_B_TOWER,
+    /*0x181*/ BGM_SWIMEYE,
+    /*0x182*/ BGM_DAN03,
+    /*0x183*/ BGM_ME_KINOMI,
+    /*0x184*/ BGM_ME_TAMA,
+    /*0x185*/ BGM_ME_B_BIG,
+    /*0x186*/ BGM_ME_B_SMALL,
+    /*0x187*/ BGM_ME_ZANNEN,
+    /*0x188*/ BGM_BD_TIME,
+    /*0x189*/ BGM_TEST1,
+    /*0x18A*/ BGM_TEST2,
+    /*0x18B*/ BGM_TEST3,
+    /*0x18C*/ BGM_TEST4,
+    /*0x18D*/ BGM_TEST,
+    /*0x18E*/ BGM_GOMACHI0,
+    /*0x18F*/ BGM_GOTOWN,
+    /*0x190*/ BGM_POKECEN,
+    /*0x191*/ BGM_NEXTROAD,
+    /*0x192*/ BGM_GRANROAD,
+    /*0x193*/ BGM_CYCLING,
     BGM_FRIENDLY,
     BGM_MISHIRO,
     BGM_TOZAN,