Merge branch 'master' into doc-link

include/battle_transition.h

@@ -7,7 +7,7 @@ void BattleTransition_Start(u8 transitionId);
 bool8 IsBattleTransitionDone(void);
 bool8 FldEff_Pokeball(void);
 void TransitionPhase1_Task_RunFuncs(u8 taskId);
-void sub_8149F58(u16 **a0, u16 **a1);
+void GetBg0TilesDst(u16 **tilemap, u16 **tileset);
 
 extern const struct SpritePalette gFieldEffectObjectPaletteInfo10;
 

include/field_message_box.h

@@ -10,8 +10,8 @@ enum
 };
 
 bool8 ShowFieldMessage(const u8 *message);
-bool8 sub_8098238(const u8 *message);
-bool8 sub_80982B8(void);
+bool8 ShowPokenavFieldMessage(const u8 *message);
+bool8 ShowFieldMessageFromBuffer(void);
 bool8 ShowFieldAutoScrollMessage(const u8 *message);
 void HideFieldMessageBox(void);
 bool8 IsFieldMessageBoxHidden(void);

include/match_call.h

@@ -14,7 +14,7 @@ s32 GetRematchIdxByTrainerIdx(s32 trainerIdx);
 void InitMatchCallCounters(void);
 bool32 TryStartMatchCall(void);
 bool32 IsMatchCallTaskActive(void);
-void StartMatchCallFromScript(u8 *message);
+void StartMatchCallFromScript(const u8 *message);
 void BufferPokedexRatingForMatchCall(u8 *destStr);
 bool32 SelectMatchCallMessage(int, u8 *);
 void sub_8197184(u32 windowId, u32 destOffset, u32 paletteId);

include/shop.h

@@ -41,7 +41,7 @@ struct ShopData
     /*0x200B*/ u8 scrollIndicatorsTaskId;
     /*0x200C*/ u8 iconSlot;
     /*0x200D*/ u8 itemSpriteIds[2];
-    /*0x2010*/ s16 viewportObjects[16][5];
+    /*0x2010*/ s16 viewportObjects[OBJECT_EVENTS_COUNT][5];
 };
 
 void CreatePokemartMenu(const u16 *);