Merge branch 'master' into slot_machine

include/battle_transition.h

@@ -3,8 +3,39 @@
 
 #include "global.h"
 
-void sub_8149DFC(u8 a0);
-bool8 sub_80D08F8(void);
-void sub_80D08B8(u8 a0);
+enum
+{
+    MUGSHOT_LORELEI,
+    MUGSHOT_BRUNO,
+    MUGSHOT_AGATHA,
+    MUGSHOT_LANCE,
+    MUGSHOT_BLUE,
+    MUGSHOTS_COUNT
+};
+
+#define B_TRANSITION_BLUR 0
+#define B_TRANSITION_DISTORTED_WAVE 1
+#define B_TRANSITION_HORIZONTAL_CORRUGATE 2
+#define B_TRANSITION_BIG_POKEBALL 3
+#define B_TRANSITION_SLIDING_POKEBALLS 4
+#define B_TRANSITION_CLOCKWISE_BLACKFADE 5
+#define B_TRANSITION_FULLSCREEN_WAVE 6
+#define B_TRANSITION_BLACK_WAVE_TO_RIGHT 7
+#define B_TRANSITION_SLICED_SCREEN 8
+#define B_TRANSITION_WHITEFADE_IN_STRIPES 9
+#define B_TRANSITION_GRID_SQUARES 10
+#define B_TRANSITION_BLACK_DOODLES 11
+#define B_TRANSITION_LORELEI 12
+#define B_TRANSITION_BRUNO 13
+#define B_TRANSITION_AGATHA 14
+#define B_TRANSITION_LANCE 15
+#define B_TRANSITION_BLUE 16
+#define B_TRANSITION_ANTI_CLOCKWISE_SPIRAL 17
+
+extern const struct SpritePalette sSpritePalette_SlidingPokeball;
+
+bool8 BT_IsDone(void);
+void BT_StartOnField(u8 transitionId);
+bool8 FldEff_Pokeball(void);
 
 #endif // GUARD_BATTLE_TRANSITION_H

include/field_camera.h

@@ -26,5 +26,6 @@ extern u16 gUnknown_03005DE8;
 
 void DrawWholeMapView(void);
 void CurrentMapDrawMetatileAt(int x, int y);
+void sub_805A658(s16 *x, s16 *y);
 
 #endif //GUARD_FIELD_CAMERA_H

include/field_effect.h

@@ -83,5 +83,7 @@ void sub_80B69DC(void);
 void CreateTeleportFieldEffectTask(void);
 void FieldEffectActiveListRemove(u8 id);
 void sub_8085620(void);
+void FieldEffectStop(struct Sprite *sprite, u8 id);
+u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer);
 
 #endif //GUARD_FIELD_EFFECTS_H

include/overworld.h

@@ -106,6 +106,7 @@ extern bool8 (* gFieldCallback2)(void);
 void SetLastHealLocationWarp(u8 healLocaionId);
 void sub_8055864(u8 mapGroup, u8 mapNum);
 void CB2_Overworld(void);
+void CB2_OverworldBasic(void);
 void CB2_NewGame(void);
 bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType);
 void Overworld_ResetStateAfterTeleport(void);

include/trainer_pokemon_sprites.h

@@ -1,5 +1,5 @@
-#ifndef GUARD_BATTLE_DOME_CARDS_H
-#define GUARD_BATTLE_DOME_CARDS_H
+#ifndef GUARD_TRAINER_POKEMON_SPRITES_H
+#define GUARD_TRAINER_POKEMON_SPRITES_H
 
 #include "global.h"
 
@@ -13,5 +13,6 @@ u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteS
 u8 sub_818D97C(u8 a0, u8 a1);
 u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
 u16 FreeAndDestroyTrainerPicSprite(u16);
+u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass);
 
-#endif //GUARD_BATTLE_DOME_CARDS_H
+#endif // GUARD_TRAINER_POKEMON_SPRITES_H