Merge remote-tracking branch 'upstream/master' into move-tutor

# Conflicts:
#	include/pokenav.h
#	src/battle_script_commands.c

include/agb_flash.h

@@ -8,5 +8,7 @@
 // Exported ROM declarations
 
 u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void));
+u16 IdentifyFlash(void);
+u32 ProgramFlashSectorAndVerify(u16 sectorNum, u8 *src);
 
 #endif //GUARD_AGB_FLASH_H

include/battle_anim.h

@@ -204,6 +204,9 @@ void sub_80A718C(struct Sprite *sprite);
 #define STAT_ANIM_MULTIPLE_MINUS2 58
 void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId);
 
+// battle_anim_8170478.c
+void sub_8172EF0(u8 battler, struct Pokemon *mon);
+
 // ground.c
 void sub_81152DC(u8 taskId);
 
@@ -216,6 +219,19 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes,
 void sub_8116EB4(u8);
 void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *arg8, const u32 *arg9, const u32 *palette);
 
+// battle_anim_effects_1.c
+void sub_810310C(u8 battler, struct Sprite* sprite);
+void AnimMoveTwisterParticle(struct Sprite* sprite);
+
+// water.c
+void sub_8108C94(struct Sprite *sprite);
+
+// flying.c
+void sub_810E2C8(struct Sprite *sprite);
+
+// smokescreen.c
+u8 sub_807521C(s16 x, s16 y, u8 a3);
+
 u32 UnpackSelectedBattleAnimPalettes(s16);
 
 u8 GetBattlerSpriteFinal_Y(u8, u16, u8);

include/battle_tent.h

@@ -1,6 +1,6 @@
 #ifndef GUARD_BATTLE_TENT_H
 #define GUARD_BATTLE_TENT_H
 
-bool8 sub_81B9E94(void);
+bool8 InSlateportBattleTent(void);
 
 #endif //GUARD_BATTLE_TENT_H

include/constants/flags.h

@@ -1548,7 +1548,7 @@
 
 // Special Flags (Unknown)
 #define SPECIAL_FLAGS_START                                        0x4000
-#define FLAG_SPECIAL_FLAG_0x4000                                   0x4000
+#define FLAG_HIDE_MAP_NAME_POPUP                                   0x4000
 #define FLAG_SPECIAL_FLAG_0x4001                                   0x4001
 #define FLAG_SPECIAL_FLAG_0x4002                                   0x4002
 #define FLAG_SPECIAL_FLAG_0x4003                                   0x4003

include/constants/songs.h

@@ -538,4 +538,6 @@
 
 #define MUS_ROUTE_118 0x7FFF  // map is split into 2 music sections. controlled by GetCurrLocationDefaultMusic().
 
+#define MUS_NONE 0xFFFF
+
 #endif  // GUARD_CONSTANTS_SONGS_H

include/contest.h

@@ -478,5 +478,6 @@ bool32 sub_80FC4F4(void *, u16);
 bool8 sub_80FC55C(void);
 bool8 sub_80FC530(u8);
 u8 sub_80F86E0(u8 *);
+void sub_80FC9F8(u8 taskId);
 
 #endif //GUARD_CONTEST_H

include/dewford_trend.h

@@ -5,5 +5,7 @@ void InitDewfordTrend(void);
 void UpdateDewfordTrendPerDay(u16);
 void UpdateDewfordTrendPerDay(u16 days);
 bool8 sub_81226D8(u16 *a);
+void ReceiveEasyChatPairsData(struct EasyChatPair *a, size_t b, u8 unused);
+
 
 #endif // GUARD_DEWFORDTREND_H

include/easy_chat.h

@@ -134,5 +134,6 @@ u16 EasyChat_GetNumWordsInGroup(u8);
 u16 sub_811EE90(u16);
 void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback, u8 displayedPersonType);
 void sub_811F8BC(void);
+void sub_811EFC0(u8 additionalPhraseId);
 
 #endif // GUARD_EASYCHAT_H

include/event_obj_lock.h

@@ -7,5 +7,6 @@ bool8 sub_809847C(void);
 void LockSelectedEventObject(void);
 void sub_8098630(void);
 bool8 sub_8098734(void);
+void ScriptUnfreezeEventObjects(void);
 
 #endif // GUARD_EVENT_OBJ_LOCK_H

include/event_object_movement.h

@@ -193,6 +193,9 @@ void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible);
 s16 sub_809773C(s16 a1);
 s16 sub_8097728(s16 a1);
 void CameraObjectReset2(void);
+u8 EventObjectGetBerryTreeId(u8 eventObjectId);
+void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup);
+bool8 IsBerryTreeSparkling(u8, u8, u8);
 
 void MovementType_None(struct Sprite *);
 void MovementType_LookAround(struct Sprite *);

include/field_control_avatar.h

@@ -39,5 +39,6 @@ int SetCableClubWarp(void);
 u8 TrySetDiveWarp(void);
 const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction);
 u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *position);
+void ClearPoisonStepCounter(void);
 
 #endif // GUARD_FIELDCONTROLAVATAR_H

include/field_effect.h

@@ -36,6 +36,10 @@ bool8 FieldEffectCmd_end(u8 **script, u32 *val);
 bool8 FieldEffectCmd_loadgfx_callnative(u8 **script, u32 *val);
 bool8 FieldEffectCmd_loadtiles_callnative(u8 **script, u32 *val);
 bool8 FieldEffectCmd_loadfadedpal_callnative(u8 **script, u32 *val);
+void sub_80B6B68(void);
+void sub_80B6E4C(u8 a0, u8 priority);
+void sub_80B75D8(u8 priority);
+void sub_80B7A74(u8 priority);
 
 void sub_80B9C28(s16*, u8);
 void sub_80B9C54(s16*, u8);
@@ -47,5 +51,6 @@ void sub_80B7A58(struct Sprite*);
 void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
 void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId);
 u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority);
+void StartEscapeRopeFieldEffect(void);
 
 #endif //GUARD_FIELD_EFFECTS_H

include/field_effect_helpers.h

@@ -34,5 +34,6 @@ void UpdateSparkleFieldEffect(struct Sprite*);
 void SetSpriteInvisible(u8 spriteId);
 void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y);
 void sub_8155604(u8 spriteId, u8 value, s16 data1);
+void sub_81555D8(u8 spriteId, u8 value);
 
 #endif //GUARD_FIELD_EFFECT_HELPERS_H

include/field_player_avatar.h

@@ -63,5 +63,15 @@ u8 sub_808BCD0(void);
 void sub_808B578(void);
 u8 GetFRLGAvatarGraphicsIdByGender(u8);
 u8 GetRSAvatarGraphicsIdByGender(u8);
+void sub_808B980(u8 direction);
+void sub_808B9BC(u8 direction);
+void sub_808B9A4(u8 direction);
+void sub_808C1B4(u8 direction);
+void sub_808B9D4(u8 direction);
+void sub_808D194(void);
+void sub_808D1C8(void);
+bool32 sub_808D1B4(void);
+bool32 sub_808D1E8(void);
+void sub_808C0A8(u8 a);
 
 #endif // GUARD_FIELD_PLAYER_AVATAR_H

include/field_screen_effect.h

@@ -41,5 +41,6 @@ void sub_80B0534(void);
 void sub_80B058C(void);
 void sub_80B05B4(void);
 void WriteFlashScanlineEffectBuffer(u8 flashLevel);
+bool8 walkrun_is_standing_still(void);
 
 #endif // GUARD_FIELD_SCREEN_EFFECT_H

include/field_special_scene.h

@@ -10,5 +10,6 @@ void Task_HandleTruckSequence(u8 taskId);
 void ExecuteTruckSequence(void);
 void EndTruckSequence(u8);
 void sub_80C791C(void);
+void sub_80FB768(void);
 
 #endif // GUARD_FIELD_SPECIAL_SCENE_H

include/field_specials.h

@@ -26,6 +26,7 @@ void UpdateFrontierGambler(u16 a0);
 void ResetCyclingRoadChallengeData(void);
 bool8 warp0_in_pokecenter(void);
 void ResetFanClub(void);
-
+bool8 sub_813B21C(void);
+void set_unknown_box_id(u8 id);
 
 #endif // GUARD_FIELD_SPECIALS_H

include/fieldmap.h

@@ -9,6 +9,8 @@
 #define NUM_PALS_TOTAL 13
 #define MAX_MAP_DATA_SIZE 0x2800
 
+#include "main.h"
+
 extern struct BackupMapLayout gBackupMapLayout;
 
 u32 MapGridGetMetatileIdAt(int, int);
@@ -37,11 +39,16 @@ void copy_map_tileset1_tileset2_to_vram(struct MapLayout const *mapLayout);
 void apply_map_tileset1_tileset2_palette(struct MapLayout const *mapLayout);
 void apply_map_tileset2_palette(struct MapLayout const *mapLayout);
 void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout);
-extern void copy_map_tileset1_to_vram(const struct MapLayout *);
-extern void copy_map_tileset2_to_vram(const struct MapLayout *);
+void copy_map_tileset1_to_vram(const struct MapLayout *);
+void copy_map_tileset2_to_vram(const struct MapLayout *);
+struct MapHeader const *const mapconnection_get_mapheader(struct MapConnection *connection);
+struct MapConnection *sub_8088A8C(s16 x, s16 y);
 
 void SpriteCB_PokeballGlow(struct Sprite *);
 void SpriteCB_PokecenterMonitor(struct Sprite *);
 void SpriteCB_HallOfFameMonitor(struct Sprite *);
 
+// field_region_map.c
+void FieldInitRegionMap(MainCallback callback);
+
 #endif //GUARD_FIELDMAP_H

include/gba/types.h

@@ -87,6 +87,29 @@ struct OamData
 #define ST_OAM_H_RECTANGLE 1
 #define ST_OAM_V_RECTANGLE 2
 
+#define ST_OAM_SIZE_0   0
+#define ST_OAM_SIZE_1   1
+#define ST_OAM_SIZE_2   2
+#define ST_OAM_SIZE_3   3
+
+#define SPRITE_SIZE_8x8     ((ST_OAM_SIZE_0 << 2) | (ST_OAM_SQUARE))
+#define SPRITE_SIZE_16x16   ((ST_OAM_SIZE_1 << 2) | (ST_OAM_SQUARE))
+#define SPRITE_SIZE_32x32   ((ST_OAM_SIZE_2 << 2) | (ST_OAM_SQUARE))
+#define SPRITE_SIZE_64x64   ((ST_OAM_SIZE_3 << 2) | (ST_OAM_SQUARE))
+
+#define SPRITE_SIZE_16x8    ((ST_OAM_SIZE_0 << 2) | (ST_OAM_H_RECTANGLE))
+#define SPRITE_SIZE_32x8    ((ST_OAM_SIZE_1 << 2) | (ST_OAM_H_RECTANGLE))
+#define SPRITE_SIZE_32x16   ((ST_OAM_SIZE_2 << 2) | (ST_OAM_H_RECTANGLE))
+#define SPRITE_SIZE_64x32   ((ST_OAM_SIZE_3 << 2) | (ST_OAM_H_RECTANGLE))
+
+#define SPRITE_SIZE_8x16    ((ST_OAM_SIZE_0 << 2) | (ST_OAM_V_RECTANGLE))
+#define SPRITE_SIZE_8x32    ((ST_OAM_SIZE_1 << 2) | (ST_OAM_V_RECTANGLE))
+#define SPRITE_SIZE_16x32   ((ST_OAM_SIZE_2 << 2) | (ST_OAM_V_RECTANGLE))
+#define SPRITE_SIZE_32x64   ((ST_OAM_SIZE_3 << 2) | (ST_OAM_V_RECTANGLE))
+
+#define SPRITE_SIZE(dim) (SPRITE_SIZE_##dim >> 2)
+#define SPRITE_SHAPE(dim) (SPRITE_SIZE_##dim & 0xFF)
+
 struct BgAffineSrcData
 {
     s32 texX;

include/hall_of_fame.h

@@ -6,4 +6,7 @@ void CB2_DoHallOfFameScreenDontSaveData(void);
 void CB2_DoHallOfFamePC(void);
 void sub_8175280(void);
 
+// hof_pc.c
+void ReturnFromHallOfFamePC(void);
+
 #endif // GUARD_HALL_OF_FAME_H

include/item_menu.h

@@ -2,6 +2,7 @@
 #define GUARD_item_menu_H
 
 #include "item.h"
+#include "menu_helpers.h"
 
 #define RETURN_LOCATION_FIELD 0
 #define RETURN_LOCATION_BATTLE 1
@@ -71,6 +72,7 @@ void sub_81AAC14(void);
 void sub_81AAC50(void);
 void sub_81AAC70(void);
 void sub_81AAC28(void);
+void sub_81AABB0(void);
 void SetInitialScrollAndCursorPositions(u8 pocketId);
 void bag_menu_mail_related(void);
 void CB2_BagMenuFromStartMenu(void);
@@ -80,6 +82,11 @@ void CB2_GoToSellMenu(void);
 void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)());
 void DoWallyTutorialBagMenu(void);
 void ResetBagScrollPositions(void);
+void sub_81AABF0(void (*callback)(void));
+void CB2_ChooseBerry(void);
+void unknown_ItemMenu_Confirm(u8 taskId);
+void bag_menu_yes_no(u8, u8, const struct YesNoFuncTable*);
+void sub_81AB9A8(u8 pocketId);
 
 
 #endif //GUARD_item_menu_H

include/link.h

@@ -261,6 +261,8 @@ void sub_800B3A4(u32 who);
 bool32 sub_800A07C(void);
 void sub_800AB98(void);
 void sub_800AA04(u8 a0);
+void sub_800B4C0(void);
+bool32 sub_800B504(void);
 
 extern u16 gLinkPartnersHeldKeys[6];
 extern u32 gLinkDebugSeed;

include/main.h

@@ -68,7 +68,7 @@ void ClearPokemonCrySongs(void);
 void RestoreSerialTimer3IntrHandlers(void);
 void StartTimer1(void);
 void SeedRngAndSetTrainerId(void);
-extern u16 GetGeneratedTrainerIdLower(void);
+u16 GetGeneratedTrainerIdLower(void);
 
 
 #endif // GUARD_MAIN_H

include/match_call.h

@@ -12,5 +12,9 @@ enum {
 
 s32 GetRematchIdxByTrainerIdx(s32 trainerIdx);
 void InitMatchCallCounters(void);
+bool32 TryStartMatchCall(void);
+bool32 IsMatchCallTaskActive(void);
+void StartMatchCallFromScript(u8* script);
+void sub_8197080(u8 *destStr);
 
 #endif //GUARD_MATCH_CALL_H

include/menu_specialized.h

@@ -3,6 +3,7 @@
 
 #include "player_pc.h"
 #include "list_menu.h"
+#include "pokemon.h"
 
 struct UnknownSubStruct_81D1ED4
 {
@@ -47,5 +48,6 @@ bool16 MoveRelearnerRunTextPrinters(void);
 void MoveRelearnerCreateYesNoMenu(void);
 u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices);
 void InitMoveRelearnerWindows(bool8 useContextWindow);
+void GetMonLevelUpWindowStats(struct Pokemon* mon, void* statStoreLocation);
 
 #endif // GUARD_MENU_SPECIALIZED_H

include/party_menu.h

@@ -62,7 +62,7 @@ u8 sub_81B1B5C(const u8* str, u8 b);
 bool8 sub_81B1BD4(void);
 void sub_81B1F18(u8 taskId, u8 slot, s8 c, s16 HPDifference, TaskFunc func);
 u8 pokemon_ailments_get_primary(u32 status);
-u8 sub_81B205C(struct Pokemon *mon);
+u8 GetMonAilment(struct Pokemon *mon);
 void display_pokemon_menu_message(u32 stringID);
 void sub_81B47E0(u8 taskId);
 bool8 FieldCallback_PrepareFadeInFromMenu(void);

include/pokedex.h

@@ -43,5 +43,7 @@ s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId);
 u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16);
 bool16 HasAllHoennMons(void);
 void ResetPokedexScrollPositions(void);
+u16 sub_80C0944(void);
+void CB2_Pokedex(void);
 
 #endif // GUARD_POKEDEX_H

include/pokemon_icon.h

@@ -23,5 +23,6 @@ void LoadMonIconPalette(u16 species);
 void sub_80D328C(struct Sprite *sprite);
 void sub_80D3014(struct Sprite *sprite);
 void sub_80D32C8(struct Sprite *sprite, u8 animNum);
+u8 sub_80D30A0(u16 species);
 
 #endif // GUARD_POKEMON_ICON_H

include/pokenav.h

@@ -7,5 +7,6 @@ bool8 sub_81D4A58(struct EventObject*);
 bool8 EventObjectIsFarawayIslandMew(struct EventObject *);
 u32 sub_81D427C(void);
 void sub_81D4998(void);
+void CB2_InitPokeNav(void);
 
 #endif //GUARD_POKENAV_H

include/rom_8011DC0.h

@@ -17,5 +17,7 @@ u16 mevent_081445C0(u8);
 void sub_801B990(u32, u32);
 u8 sub_8013F78(void);
 bool32 sub_802C908(u16);
+void nullsub_89(u8 taskId);
+void var_800D_set_xB(void);
 
 #endif //GUARD_rom_8011DC0_H

include/save.h

@@ -92,4 +92,7 @@ u32 TryCopySpecialSaveSection(u8 sector, u8* dst);
 u32 sub_8153634(u8 sector, u8* src);
 void sub_8153688(u8 taskId);
 
+// save_failed_screen.c
+void DoSaveFailedScreen(u8 saveType);
+
 #endif // GUARD_SAVE_H

include/script.h

@@ -61,4 +61,7 @@ bool32 sub_80991F8(void);
 u8 *sub_8099244(void);
 void sub_80992A0(u8 *script, u16 scriptSize);
 
+// srccmd.h
+void sub_809BE48(u16 npcId);
+
 #endif // GUARD_SCRIPT_H

include/script_menu.h

@@ -14,5 +14,7 @@ u8 CreateWindowFromRect(u8, u8, u8, u8);
 void sub_80E2A78(u8);
 int display_text_and_get_width(const u8*, int);
 int sub_80E2D5C(int arg0, int tileWidth);
+bool16 ScrSpecial_CreatePCMenu(void);
+void ScriptMenu_DisplayPCStartupPrompt(void);
 
 #endif //GUARD_SCRIPT_MENU_H

include/secret_base.h

@@ -33,6 +33,8 @@ void sub_80E8B6C(void);
 void sub_80E8BC8(void);
 void sub_80E8D4C(void);
 void EnableBothScriptContexts(void);
+void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx);
+
 
 
 #endif //GUARD_SECRET_BASE_H

include/text.h

@@ -284,4 +284,8 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese);
 u32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese);
 void DecompressGlyphFont9(u16 glyphId);
 
+// unk_text_util_2.c
+u16 Font6Func(struct TextPrinter *textPrinter);
+u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese);
+
 #endif // GUARD_TEXT_H

include/title_screen.h

@@ -1,7 +1,7 @@
 #ifndef GUARD_TITLE_SCREEN_H
 #define GUARD_TITLE_SCREEN_H
 
-extern const u16 gIntroWaterDropData[];
+extern const u16 gIntroWaterDropAlphaBlend[];
 
 void CB2_InitTitleScreen(void);