merge

15 files changed, 241 insertions, 171 deletions

diff --git a/include/battle.h b/include/battle.h
index 9d8092197..08ed5cf58 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -520,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_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/evolution_graphics.h b/include/evolution_graphics.h
new file mode 100644
index 000000000..c217f22af
--- /dev/null
+++ b/include/evolution_graphics.h
@@ -0,0 +1,13 @@
+#ifndef GUARD_EVOLUTION_GRAPHICS_H
+#define GUARD_EVOLUTION_GRAPHICS_H
+
+void LoadEvoSparkleSpriteAndPal(void);
+
+u8 LaunchTask_PreEvoSparklesSet1(u16 arg0);
+u8 LaunchTask_PreEvoSparklesSet2(void);
+u8 LaunchTask_PostEvoSparklesSet1(void);
+u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 arg0);
+u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 arg0);
+u8 sub_8149E7C(u8 preEvoSpriteID, u8 postEvoSpriteID);
+
+#endif // GUARD_EVOLUTION_GRAPHICS_H
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/gba/types.h b/include/gba/types.h
index 96e057ab7..480619d21 100644
--- a/include/gba/types.h
+++ b/include/gba/types.h
@@ -39,11 +39,11 @@ struct PlttData
 struct OamData
 {
     /*0x00*/ u32 y:8;
-    /*0x01*/ u32 affineMode:2;
-             u32 objMode:2;
-             u32 mosaic:1;
-             u32 bpp:1;
-             u32 shape:2;
+    /*0x01*/ u32 affineMode:2;  // 0x1, 0x2 = 0x3
+             u32 objMode:2;     // 0x4, 0x8 = 0xC
+             u32 mosaic:1;      // 0x10
+             u32 bpp:1;         // 0x20
+             u32 shape:2;       // 0x40, 0x80
 
     /*0x02*/ u32 x:9;
              u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode
diff --git a/include/money.h b/include/money.h
index 49015ee19..06ac00e92 100644
--- a/include/money.h
+++ b/include/money.h
@@ -7,7 +7,7 @@ void sub_80B79E0(u32 *, u32);
 void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2);
 void sub_80B7A94(u32 arg0, u8 arg1, u8 x, u8 y);
 void sub_80B7AEC(u32, u8 left, u8 top);
-void sub_80B7B34(void);
+void sub_80B7B34(u8, u8, int);
 void sub_80B7BEC(u32, u8, u8);
 void sub_80B7C14(u32, u8, u8);
 void RemoveMoneyLabelObject(u8, u8);
diff --git a/include/pokeblock.h b/include/pokeblock.h
index f78ed40c3..6720653a0 100644
--- a/include/pokeblock.h
+++ b/include/pokeblock.h
@@ -1,7 +1,8 @@
 #ifndef GUARD_POKEBLOCK_H
 #define GUARD_POKEBLOCK_H
 
-enum {
+enum
+{
     PBLOCK_CLR_BLACK,
     PBLOCK_CLR_RED,
     PBLOCK_CLR_BLUE,
@@ -10,15 +11,32 @@ enum {
     PBLOCK_CLR_YELLOW
 };
 
+enum
+{
+    PBLOCK_COLOR,
+    PBLOCK_SPICY,
+    PBLOCK_DRY,
+    PBLOCK_SWEET,
+    PBLOCK_BITTER,
+    PBLOCK_SOUR,
+    PBLOCK_FEEL,
+};
+
 void sub_810B96C(void);
 u8 sub_810BA50(s16, s16, u8);
 u8 sub_810C9B0(struct Pokeblock *);
-s16 sub_810CA9C(const struct Pokeblock *, u8);
+s16 GetPokeblockData(const struct Pokeblock *, u8);
 u8 sub_810C9E8(struct Pokeblock *);
 void sub_810BA7C(u8);
 void ClearPokeblocks(void);
-bool8 sub_810CA6C(u8);
-s16 sub_810CAE4(u8, const struct Pokeblock *);
+bool8 PokeblockClearIfExists(u8);
+s16 PokeblockGetGain(u8, const struct Pokeblock *);
 u8 sub_810CB68(u8, u8*);
+void PokeblockCopyName(struct Pokeblock *pokeblock, u8 *dest);
+void CB2_PreparePokeblockFeedScene(void);
+
+#include "main.h"
+
+void sub_8136130(struct Pokeblock *, MainCallback);
 
 #endif // GUARD_POKEBLOCK_H
diff --git a/include/pokeblock_feed.h b/include/pokeblock_feed.h
deleted file mode 100644
index 65d0d1dc9..000000000
--- a/include/pokeblock_feed.h
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// Created by Scott Norton on 6/28/17.
-//
-
-#ifndef POKERUBY_POKEBLOCK_FEED_H
-#define POKERUBY_POKEBLOCK_FEED_H
-
-void sub_8147ADC(void);
-
-#endif //POKERUBY_POKEBLOCK_FEED_H
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/shop.h b/include/shop.h
index cca6091c9..b785ca764 100644
--- a/include/shop.h
+++ b/include/shop.h
@@ -1,6 +1,34 @@
 #ifndef GUARD_SHOP_H
 #define GUARD_SHOP_H
 
+enum
+{
+    MART_TYPE_0, // normal mart
+    MART_TYPE_1,
+    MART_TYPE_2,
+};
+
+// shop view window NPC info enum
+enum
+{
+    MAP_OBJ_ID,
+    X_COORD,
+    Y_COORD,
+    ANIM_NUM
+};
+
+struct MartInfo
+{
+    /* 0x0 */ void (* callback) (void);
+    /* 0x4 */ u16 *itemList;
+    /* 0x8 */ u8 itemCount; // how many unique items are there for sale?
+    /* 0x9 */ u8 cursor; // this shows the on-screen true index of the cursor and not the current item selected.
+    /* 0xA */ u8 numChoices; // how many options does the mart have? can be either 2 or 1 (BUY/SELL vs BUY)
+    /* 0xB */ u8 choicesAbove; // when your cursor is far down, there are choices that have scrolled up past the top. this is the count of that.
+    /* 0xC */ u8 martType; // 0-2. 0 is normal mart while 1-2 seem to be decor shops or non-stackable purchases in general.
+    /* 0xD */ u8 curItemCount; // if you are selling an item, this is the count of the current item stack you have.
+};
+
 void sub_80B2E38(u8);
 void HandleShopMenuQuit(u8);
 void sub_80B2FA0(u8);
@@ -11,8 +39,10 @@ void BuyMenuDrawMapGraphics(void);
 void sub_80B3764(int, int);
 void sub_80B37EC(void);
 void sub_80B40E8(u8);
-void CreatePokemartMenu(void *);
-void CreateDecorationShop1Menu(void *);
-void CreateDecorationShop2Menu(void *);
+void CreatePokemartMenu(u16 *);
+void CreateDecorationShop1Menu(u16 *);
+void CreateDecorationShop2Menu(u16 *);
+void sub_80B356C(void);
+void sub_80B368C(void);
 
 #endif // GUARD_SHOP_H
diff --git a/include/songs.h b/include/songs.h
index 8cf7ee5e9..afd26d683 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,
@@ -105,9 +105,9 @@ enum
     SE_C_PASI,
     SE_C_SYU,
     SE_C_PIKON,
-    SE_REAPOKE,
-    SE_OP_BASYU,
-    SE_BT_START,
+    /*0x66*/ SE_REAPOKE,
+    /*0x67*/ SE_OP_BASYU,
+    /*0x68*/ SE_BT_START,
     SE_DENDOU,
     SE_JIHANKI,
     SE_TAMA,
@@ -131,20 +131,20 @@ enum
     /*0x7D*/ SE_W145B,
     /*0x7E*/ SE_W145C,
     /*0x7F*/ SE_W240,
-    SE_W015,
-    SE_W081,
-    SE_W081B,
-    SE_W088,
-    SE_W016,
-    SE_W016B,
-    SE_W003,
-    SE_W104,
-    SE_W013,
-    SE_W196,
-    SE_W086,
-    SE_W004,
-    SE_W025,
-    SE_W025B,
+    /*0x80*/ SE_W015,
+    /*0x81*/ SE_W081,
+    /*0x82*/ SE_W081B,
+    /*0x83*/ SE_W088,
+    /*0x84*/ SE_W016,
+    /*0x85*/ SE_W016B,
+    /*0x86*/ SE_W003,
+    /*0x87*/ SE_W104,
+    /*0x88*/ SE_W013,
+    /*0x89*/ SE_W196,
+    /*0x8A*/ SE_W086,
+    /*0x8B*/ SE_W004,
+    /*0x8C*/ SE_W025,
+    /*0x8D*/ SE_W025B,
     SE_W152,
     SE_W026,
     SE_W172,
@@ -185,29 +185,29 @@ enum
     SE_W071B,
     SE_W071,
     SE_W103,
-    SE_W062,
-    SE_W062B,
-    SE_W048,
-    SE_W187,
-    SE_W118,
-    SE_W155,
-    SE_W122,
-    SE_W060,
-    SE_W185,
-    SE_W014,
-    SE_W043,
-    SE_W207,
-    SE_W207B,
-    SE_W215,
-    SE_W109,
-    SE_W173,
-    SE_W280,
-    SE_W202,
-    SE_W060B,
-    SE_W076,
-    SE_W080,
-    SE_W100,
-    SE_W107,
+    /*0xB6*/ SE_W062,
+    /*0xB7*/ SE_W062B,
+    /*0xB8*/ SE_W048,
+    /*0xB9*/ SE_W187,
+    /*0xBA*/ SE_W118,
+    /*0xBB*/ SE_W155,
+    /*0xBC*/ SE_W122,
+    /*0xBD*/ SE_W060,
+    /*0xBE*/ SE_W185,
+    /*0xBF*/ SE_W014,
+    /*0xC0*/ SE_W043,
+    /*0xC1*/ SE_W207,
+    /*0xC2*/ SE_W207B,
+    /*0xC3*/ SE_W215,
+    /*0xC4*/ SE_W109,
+    /*0xC5*/ SE_W173,
+    /*0xC6*/ SE_W280,
+    /*0xC7*/ SE_W202,
+    /*0xC8*/ SE_W060B,
+    /*0xC9*/ SE_W076,
+    /*0xCA*/ SE_W080,
+    /*0xCB*/ SE_W100,
+    /*0xCC*/ SE_W107,
     SE_W166,
     SE_W129,
     SE_W115,
@@ -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,
diff --git a/include/text.h b/include/text.h
index 99987d2c3..9a70dec11 100644
--- a/include/text.h
+++ b/include/text.h
@@ -97,35 +97,35 @@ struct WindowConfig
 
 struct Window
 {
-    u8 textMode;
-    u8 fontNum;
-    u8 language;
-    u8 foregroundColor;
-    u8 backgroundColor;
-    u8 shadowColor;
-    u8 paletteNum;
-    u8 tilemapLeft;
-    u8 tilemapTop;
-    u8 width;
-    u8 height;
-    u8 win_field_B;
-    u8 win_field_C;
-    u8 delayCounter;
-    u8 spacing;
-    u8 win_field_F;
-    u8 cursorX;
-    u8 cursorY;
-    u8 left;
-    u16 top;
-    u16 state;
-    u16 downArrowCounter;
-    u16 tileDataStartOffset;
-    u16 tileDataOffset;
-    u16 textIndex;
-    const u8 *text;
-    u8 *tileData;
-    u16 *tilemap;
-    struct WindowConfig *config;
+ /*0x00*/ u8 textMode;
+ /*0x01*/ u8 fontNum;
+ /*0x02*/ u8 language;
+ /*0x03*/ u8 foregroundColor;
+ /*0x04*/ u8 backgroundColor;
+ /*0x05*/ u8 shadowColor;
+ /*0x06*/ u8 paletteNum;
+ /*0x07*/ u8 tilemapLeft;
+ /*0x08*/ u8 tilemapTop;
+ /*0x09*/ u8 width;
+ /*0x0A*/ u8 height;
+ /*0x0B*/ u8 win_field_B;
+ /*0x0C*/ u8 win_field_C;
+ /*0x0D*/ u8 delayCounter;
+ /*0x0E*/ u8 spacing;
+ /*0x0F*/ u8 win_field_F;
+ /*0x10*/ u8 cursorX;
+ /*0x11*/ u8 cursorY;
+ /*0x12*/ u8 left;
+ /*0x14*/ u16 top; // padded to 0x14
+ /*0x16*/ u16 state;
+ /*0x18*/ u16 downArrowCounter;
+ /*0x1A*/ u16 tileDataStartOffset;
+ /*0x1C*/ u16 tileDataOffset;
+ /*0x1E*/ u16 textIndex;
+ /*0x20*/ const u8 *text;
+ /*0x24*/ u8 *tileData;
+ /*0x28*/ u16 *tilemap;
+ /*0x2C*/ struct WindowConfig *config;
 };
 
 extern vu16 *const gBGControlRegs[];
diff --git a/include/use_pokeblock.h b/include/use_pokeblock.h
deleted file mode 100644
index f34857cf1..000000000
--- a/include/use_pokeblock.h
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// Created by Scott Norton on 5/31/17.
-//
-
-#ifndef POKERUBY_USE_POKEBLOCK_H
-#define POKERUBY_USE_POKEBLOCK_H
-
-void sub_8136130(struct Pokeblock *, MainCallback);
-
-#endif //POKERUBY_USE_POKEBLOCK_H