24 files changed, 120 insertions, 77 deletions
diff --git a/include/battle.h b/include/battle.h
index f34364ea6..90bef24ac 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -498,10 +498,12 @@ struct BattleStruct
     struct BattleTv tv;
     u8 notSureWhatFieldLol[0x28];
     u8 AI_monToSwitchIntoId[MAX_BATTLERS_COUNT];
-    u8 field_298[8];
-    u8 field_2A0;
-    u8 field_2A1;
-    u8 field_2A2;
+    s8 arenaMindPoints[2];
+    s8 arenaSkillPoints[2];
+    u16 arenaStartHp[2];
+    u8 arenaLostPlayerMons; // Bits for party member, lost as in referee's decision, not by fainting.
+    u8 arenaLostOpponentMons;
+    u8 alreadyStatusedMoveAttempt; // As bits for battlers; For example when using Thunder Wave on an already paralyzed pokemon.
 };
 
 #define GET_MOVE_TYPE(move, typeArg)                        \
diff --git a/include/battle_arena.h b/include/battle_arena.h
new file mode 100644
index 000000000..bf305ea4e
--- /dev/null
+++ b/include/battle_arena.h
@@ -0,0 +1,14 @@
+#ifndef GUARD_BATTLE_ARENA_H
+#define GUARD_BATTLE_ARENA_H
+
+void CallBattleArenaFunction(void);
+u8 BattleArena_ShowJudgmentWindow(u8 *state);
+void BattleArena_InitPoints(void);
+void BattleArena_AddMindPoints(u8 battler);
+void BattleArena_AddSkillPoints(u8 battler);
+void BattleArena_DeductMindPoints(u8 battler, u16 stringId);
+void sub_81A586C(u8 battler);
+void sub_81A5BF8(void);
+void sub_81A5D44(void);
+
+#endif //GUARD_BATTLE_ARENA_H
diff --git a/include/battle_factory.h b/include/battle_factory.h
index 1b0e44943..2db041b06 100644
--- a/include/battle_factory.h
+++ b/include/battle_factory.h
@@ -1,7 +1,12 @@
 #ifndef GUARD_BATTLE_FACTORY_H
 #define GUARD_BATTLE_FACTORY_H
 
-void DoBattleFactorySelectScreen(void);
-void DoBattleFactorySwapScreen(void);
+void CallBattleFactoryFunction(void);
+bool8 sub_81A6BF4(void);
+u8 GetFactoryMonFixedIV(u8 arg0, u8 arg1);
+void FillFactoryBrainParty(void);
+u8 sub_81A6F70(u8 battleMode, u8 lvlMode);
+u32 GetAiScriptsInBattleFactory(void);
+void SetMonMoveAvoidReturn(struct Pokemon *mon, u16 moveArg, u8 moveSlot);
 
 #endif // GUARD_BATTLE_FACTORY_H
diff --git a/include/battle_factory_screen.h b/include/battle_factory_screen.h
new file mode 100644
index 000000000..86d6177f6
--- /dev/null
+++ b/include/battle_factory_screen.h
@@ -0,0 +1,7 @@
+#ifndef GUARD_BATTLE_FACTORY_SCREEN_H
+#define GUARD_BATTLE_FACTORY_SCREEN_H
+
+void DoBattleFactorySelectScreen(void);
+void DoBattleFactorySwapScreen(void);
+
+#endif // GUARD_BATTLE_FACTORY_SCREEN_H
diff --git a/include/battle_pike.h b/include/battle_pike.h
new file mode 100644
index 000000000..ada5b2441
--- /dev/null
+++ b/include/battle_pike.h
@@ -0,0 +1,9 @@
+#ifndef GUARD_BATTLE_PIKE_H
+#define GUARD_BATTLE_PIKE_H
+
+void CallBattlePikeFunction(void);
+u8 GetBattlePikeWildMonHeaderId(void);
+bool32 TryGenerateBattlePikeWildMon(bool8 checkKeenEyeIntimidate);
+bool8 InBattlePike(void);
+
+#endif // GUARD_BATTLE_PIKE_H
diff --git a/include/battle_scripts.h b/include/battle_scripts.h
index 9c4537363..a23fa6948 100644
--- a/include/battle_scripts.h
+++ b/include/battle_scripts.h
@@ -206,7 +206,7 @@ extern const u8 BattleScript_BerryFocusEnergyEnd2[];
 extern const u8 BattleScript_ActionSelectionItemsCantBeUsed[];
 extern const u8 BattleScript_ArenaTurnBeginning[];
 extern const u8 BattleScript_82DB881[];
-extern const u8 BattleScript_82DB8F3[];
+extern const u8 BattleScript_ArenaDoJudgment[];
 extern const u8 BattleScript_82DAA0B[];
 extern const u8 BattleScript_AskIfWantsToForfeitMatch[];
 extern const u8 BattleScript_PrintPlayerForfeited[];
diff --git a/include/battle_tower.h b/include/battle_tower.h
index 5fe8d1190..90c22c982 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -21,7 +21,7 @@ struct BattleFrontierTrainer
     u16 speechBefore[6];
     u16 speechWin[6];
     u16 speechLose[6];
-    const u16 *bfMonPool;
+    const u16 *monSets;
 };
 
 struct FacilityMon
@@ -52,7 +52,7 @@ u8 GetFrontierOpponentClass(u16 trainerId);
 void GetFrontierTrainerName(u8 *dst, u16 trainerId);
 void FillFrontierTrainerParty(u8 monsCount);
 void FillFrontierTrainersParties(u8 monsCount);
-u16 RandomizeFacilityTrainerMonId(u16 trainerId);
+u16 RandomizeFacilityTrainerMonSet(u16 trainerId);
 void FrontierSpeechToString(const u16 *words);
 void DoSpecialTrainerBattle(void);
 void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *record);
diff --git a/include/berry.h b/include/berry.h
index 1a8b7fa25..bef56ae41 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_BERRY_H
 #define GUARD_BERRY_H
 
+#define BERRY_NONE 0
+
 enum
 {
     BERRY_FIRMNESS_UNKNOWN,
@@ -21,6 +23,17 @@ enum
     FLAVOR_COUNT
 };
 
+enum
+{
+    BERRY_STAGE_NO_BERRY, // there is no tree planted and the soil is completely flat.
+    BERRY_STAGE_PLANTED,
+    BERRY_STAGE_SPROUTED,
+    BERRY_STAGE_TALLER,
+    BERRY_STAGE_FLOWERING,
+    BERRY_STAGE_BERRIES,
+    BERRY_STAGE_SPARKLING = 0xFF,
+};
+
 #define NUM_BERRIES 44
 
 extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[];
@@ -29,7 +42,6 @@ extern const u8 *const gBerryTreePaletteSlotTablePointers[];
 
 void ClearEnigmaBerries(void);
 void SetEnigmaBerry(u8 *src);
-u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);
 bool32 IsEnigmaBerryValid(void);
 const struct Berry *GetBerryInfo(u8 berry);
 struct BerryTree *GetBerryTreeInfo(u8 id);
@@ -37,28 +49,20 @@ bool32 EventObjectInteractionWaterBerryTree(void);
 bool8 IsPlayerFacingPlantedBerryTree(void);
 bool8 TryToWaterBerryTree(void);
 void ClearBerryTrees(void);
-bool32 BerryTreeGrow(struct BerryTree *tree);
 void BerryTreeTimeUpdate(s32 minutes);
 void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle);
 void RemoveBerryTree(u8 id);
 u8 GetBerryTypeByBerryTreeId(u8 id);
 u8 GetStageByBerryTreeId(u8);
 u8 ItemIdToBerryType(u16 item);
-u16 BerryTypeToItemId(u16 berry);
 void GetBerryNameByBerryType(u8 berry, u8 *string);
 void ResetBerryTreeSparkleFlag(u8 id);
-u8 BerryTreeGetNumStagesWatered(struct BerryTree *tree);
-u8 GetNumStagesWateredByBerryTreeId(u8 id);
-u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water);
-u8 CalcBerryYield(struct BerryTree *tree);
-u8 GetBerryCountByBerryTreeId(u8 id);
-u16 GetStageDurationByBerryType(u8);
 void Bag_ChooseBerry(void);
 void EventObjectInteractionGetBerryTreeData(void);
 void EventObjectInteractionPlantBerryTree(void);
 void EventObjectInteractionPickBerryTree(void);
 void EventObjectInteractionRemoveBerryTree(void);
-u8 PlayerHasBerries(void);
+bool8 PlayerHasBerries(void);
 void ResetBerryTreeSparkleFlags(void);
 
 extern const struct Berry gBerries[];
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index dc07fda6e..e8a2980a5 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -68,12 +68,19 @@
 #define VARIOUS_GET_MOVE_TARGET                 3
 #define VARIOUS_RESET_INTIMIDATE_TRACE_BITS     5
 #define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP    6
+#define VARIOUS_ARENA_JUDGMENT_WINDOW           9
+#define VARIOUS_ARENA_OPPONENT_MON_LOST         10
+#define VARIOUS_ARENA_PLAYER_MON_LOST           11
+#define VARIOUS_ARENA_BOTH_MONS_LOST            12
 #define VARIOUS_EMIT_YESNOBOX                   13
+#define VARIOUS_ARENA_JUDGMENT_STRING           16
+#define VARIOUS_ARENA_WAIT_STRING               17
 #define VARIOUS_WAIT_CRY                        18
 #define VARIOUS_RETURN_OPPONENT_MON1            19
 #define VARIOUS_RETURN_OPPONENT_MON2            20
 #define VARIOUS_VOLUME_DOWN                     21
 #define VARIOUS_VOLUME_UP                       22
+#define VARIOUS_SET_ALREADY_STATUS_MOVE_ATTEMPT 23
 #define VARIOUS_SET_TELEPORT_OUTCOME            25
 #define VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC     26
 
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 6d38d072d..6515791c3 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -75,14 +75,14 @@ struct PairedPalettes
 
 struct LockedAnimEventObjects
 {
-    u8 eventObjectIds[NUM_EVENT_OBJECTS];
+    u8 eventObjectIds[EVENT_OBJECTS_COUNT];
     u8 count;
 };
 
 extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[];
 extern const u8 gReflectionEffectPaletteMap[];
 
-void sub_808D438(void);
+void ResetEventObjects(void);
 u8 GetMoveDirectionAnimNum(u8);
 u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8);
 bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
@@ -180,9 +180,7 @@ u8 ZCoordToPriority(u8);
 void EventObjectUpdateZCoord(struct EventObject *pObject);
 void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
 bool8 IsZCoordMismatchAt(u8, s16, s16);
-void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *);
 void UnfreezeEventObject(struct EventObject *);
-void oamt_npc_ministep_reset(struct Sprite *, u8, u8);
 u8 FindLockedEventObjectIndex(struct EventObject *);
 bool8 obj_npc_ministep(struct Sprite *sprite);
 bool8 sub_80976EC(struct Sprite *sprite);
diff --git a/include/field_camera.h b/include/field_camera.h
index fcc19ce9a..fdc4c5450 100644
--- a/include/field_camera.h
+++ b/include/field_camera.h
@@ -7,16 +7,16 @@ struct CameraObject
 {
     void (*callback)(struct CameraObject *);
     u32 spriteId;
-    s32 unk8;
-    s32 unkC;
+    s32 movementSpeedX;
+    s32 movementSpeedY;
     s32 x;
     s32 y;
 };
 
 // Exported RAM declarations
-extern struct CameraObject gUnknown_03005DD0;
-extern u16 gUnknown_03005DEC;
-extern u16 gUnknown_03005DE8;
+extern struct CameraObject gFieldCamera;
+extern u16 gTotalCameraPixelOffsetX;
+extern u16 gTotalCameraPixelOffsetY;
 
 // Exported ROM declarations
 void DrawWholeMapView(void);
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index 536f218a3..24adbe4b3 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -25,7 +25,7 @@ struct FieldInput
 
 void FieldClearPlayerInput(struct FieldInput *pStruct);
 void FieldGetPlayerInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys);
-int sub_809C014(struct FieldInput *pStruct);
+int ProcessPlayerFieldInput(struct FieldInput *pStruct);
 u8 *sub_80682A8(struct MapPosition *, u8, u8);
 void overworld_poison_timer_set(void);
 void RestartWildEncounterImmunitySteps(void);
diff --git a/include/field_effect.h b/include/field_effect.h
index 3fa39aae0..2881a2cd7 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -179,8 +179,8 @@ bool8 sub_80B7B94(struct Task *, struct EventObject *, struct Sprite *);
 bool8 sub_80B7BCC(struct Task *, struct EventObject *, struct Sprite *);
 bool8 sub_80B7BF4(struct Task *, struct EventObject *, struct Sprite *);
 
-void sub_80B7D14(struct Task *);
-void sub_80B7D34(struct Task *);
+static void EscapeRopeFieldEffect_Step0(struct Task *);
+static void EscapeRopeFieldEffect_Step1(struct Task *);
 
 void sub_80B7EC4(struct Task *);
 void sub_80B7EE8(struct Task *);
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 223350042..6022467e4 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -18,7 +18,7 @@ u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s
 void sub_8155F80(struct Sprite*);
 void UpdateShadowFieldEffect(struct Sprite*);
 void UpdateTallGrassFieldEffect(struct Sprite*);
-void sub_81561D0(struct Sprite*);
+void WaitFieldEffectSpriteAnim(struct Sprite*);
 void UpdateAshFieldEffect(struct Sprite*);
 void UpdateSurfBlobFieldEffect(struct Sprite*);
 void sub_8156194(struct Sprite*);
diff --git a/include/field_poison.h b/include/field_poison.h
index 6a1ba17f2..a23a93ca5 100644
--- a/include/field_poison.h
+++ b/include/field_poison.h
@@ -13,7 +13,7 @@ enum {
     FLDPSN_FNT
 };
 
-void sub_80F972C(void);
-int DoPoisonFieldEffect(void);
+void ExecuteWhiteOut(void);
+s32 DoPoisonFieldEffect(void);
 
 #endif //GUARD_FIELD_POISON_H
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 8287229ed..a50c79b43 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -35,6 +35,7 @@ bool8 sub_8088BF0(u16*, u16, u8);
 struct MapConnection *sub_8088950(u8 direction, int x, int y);
 bool8 sub_80889A8(u8 direction, int x, int y, struct MapConnection *connection);
 bool8 sub_8088A0C(int x, int src_width, int dest_width, int offset);
+void save_serialize_map(void);
 
 void SpriteCB_PokeballGlow(struct Sprite *);
 void SpriteCB_PokecenterMonitor(struct Sprite *);
diff --git a/include/fldeff_80F9BCC.h b/include/fldeff_80F9BCC.h
index 87a20d290..027bb4273 100644
--- a/include/fldeff_80F9BCC.h
+++ b/include/fldeff_80F9BCC.h
@@ -11,7 +11,7 @@ void sub_80FA5E4(s16 id, s16 x, s16 y);
 void sub_80FA794(s16 x, s16 y);
 void CreateRecordMixingSprite(void);
 void DestroyRecordMixingSprite(void);
-void overworld_poison_effect(void);
+void FldeffPoison_Start(void);
 void sub_80FA970(s16);
 void sub_80FA9D0(void);
 bool8 sub_80FADE4(u16, u8);
diff --git a/include/fldeff_teleport.h b/include/fldeff_teleport.h
deleted file mode 100644
index 71fb64ad2..000000000
--- a/include/fldeff_teleport.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef GUARD_FLDEFF_TELEPORT_H
-#define GUARD_FLDEFF_TELEPORT_H
-
-void hm_teleport_run_dp02scr(void);
-void sub_817C94C(void);
-
-#endif // GUARD_FLDEFF_TELEPORT_H
diff --git a/include/frontier_util.h b/include/frontier_util.h
index cfc3a8af4..6b6a2ea39 100644
--- a/include/frontier_util.h
+++ b/include/frontier_util.h
@@ -15,6 +15,7 @@ u8 GetPlayerSymbolCountForFacility(u8 facility);
 void ShowRankingHallRecordsWindow(void);
 void ScrollRankingHallRecordsWindow(void);
 void ClearRankingHallRecords(void);
+void sub_81A4C30(void);
 u8 GetFrontierBrainTrainerPicIndex(void);
 u8 GetFrontierBrainTrainerClass(void);
 void CopyFrontierBrainTrainerName(u8 *dst);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index bb120c62c..f6273e80d 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -1,8 +1,6 @@
 #ifndef GUARD_GLOBAL_FIELDMAP_H
 #define GUARD_GLOBAL_FIELDMAP_H
 
-#define NUM_EVENT_OBJECTS 16
-
 enum
 {
     CONNECTION_SOUTH = 1,
@@ -228,14 +226,14 @@ struct EventObjectGraphicsInfo
     /*0x20*/ const union AffineAnimCmd *const *affineAnims;
 };
 
-#define PLAYER_AVATAR_FLAG_ON_FOOT   (1 << 0)
-#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << 1)
-#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2)
-#define PLAYER_AVATAR_FLAG_SURFING   (1 << 3)
+#define PLAYER_AVATAR_FLAG_ON_FOOT    (1 << 0)
+#define PLAYER_AVATAR_FLAG_MACH_BIKE  (1 << 1)
+#define PLAYER_AVATAR_FLAG_ACRO_BIKE  (1 << 2)
+#define PLAYER_AVATAR_FLAG_SURFING    (1 << 3)
 #define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4)
-#define PLAYER_AVATAR_FLAG_5         (1 << 5)
-#define PLAYER_AVATAR_FLAG_6         (1 << 6)
-#define PLAYER_AVATAR_FLAG_DASH      (1 << 7)
+#define PLAYER_AVATAR_FLAG_5          (1 << 5)
+#define PLAYER_AVATAR_FLAG_6          (1 << 6)
+#define PLAYER_AVATAR_FLAG_DASH       (1 << 7)
 
 enum
 {
@@ -311,7 +309,7 @@ struct Camera
     s32 y;
 };
 
-extern struct EventObject gEventObjects[NUM_EVENT_OBJECTS];
+extern struct EventObject gEventObjects[EVENT_OBJECTS_COUNT];
 extern u8 gSelectedEventObject;
 extern struct MapHeader gMapHeader;
 extern struct PlayerAvatar gPlayerAvatar;
diff --git a/include/global.h b/include/global.h
index c2b139e7a..5a86d5daa 100644
--- a/include/global.h
+++ b/include/global.h
@@ -119,22 +119,22 @@ enum LanguageId
 #define GAME_LANGUAGE (LANGUAGE_ENGLISH)
 
 // capacities of various saveblock objects
-#define DAYCARE_MON_COUNT   2
-#define POKEBLOCKS_COUNT    40
-#define EVENT_OBJECTS_COUNT   16
+#define DAYCARE_MON_COUNT     2
+#define POKEBLOCKS_COUNT     40
+#define EVENT_OBJECTS_COUNT  16
 #define BERRY_TREES_COUNT   128
 #define FLAGS_COUNT         300
 #define VARS_COUNT          256
-#define MAIL_COUNT          16
-#define SECRET_BASES_COUNT  20
-#define TV_SHOWS_COUNT      25
-#define POKE_NEWS_COUNT     16
-#define PC_ITEMS_COUNT      50
-#define BAG_ITEMS_COUNT     30
-#define BAG_KEYITEMS_COUNT  30
-#define BAG_POKEBALLS_COUNT 16
-#define BAG_TMHM_COUNT      64
-#define BAG_BERRIES_COUNT   46
+#define MAIL_COUNT           16
+#define SECRET_BASES_COUNT   20
+#define TV_SHOWS_COUNT       25
+#define POKE_NEWS_COUNT      16
+#define PC_ITEMS_COUNT       50
+#define BAG_ITEMS_COUNT      30
+#define BAG_KEYITEMS_COUNT   30
+#define BAG_POKEBALLS_COUNT  16
+#define BAG_TMHM_COUNT       64
+#define BAG_BERRIES_COUNT    46
 
 #define PYRAMID_BAG_ITEMS_COUNT 10
 #define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode.
@@ -424,7 +424,8 @@ struct BattleFrontier
     /*0xD1C*/ u16 domeTotalChampionships[2][2];
     /*0xD24*/ struct BattleDomeTrainer domeTrainers[DOME_TOURNAMENT_TRAINERS_COUNT];
     /*0xD64*/ u16 domeMonIds[DOME_TOURNAMENT_TRAINERS_COUNT][3];
-    /*0xD64*/ u16 field_DC4[2];
+    /*0xDC4*/ u16 field_DC4;
+    /*0xDC6*/ u16 field_DC6;
     /*0xDC8*/ u16 palaceWinStreaks[2][2];
     /*0xDD0*/ u16 palaceRecordWinStreaks[2][2];
     /*0xDD8*/ u16 field_DD8;
@@ -438,7 +439,10 @@ struct BattleFrontier
     /*0xE04*/ u16 pikeWinStreaks[2];
     /*0xE08*/ u16 pikeRecordStreaks[2];
     /*0xE0C*/ u16 pikeTotalStreaks[2];
-    /*0xE10*/ u16 field_E10[5];
+    /*0xE10*/ u8 field_E10_1:3;
+    /*0xE10*/ u8 field_E10_2:4;
+    /*0xE10*/ u8 field_E10_3:1;
+    /*0xE12*/ u16 field_E12[4];
     /*0xE1A*/ u16 pyramidWinStreaks[2];
     /*0xE1E*/ u16 pyramidRecordStreaks[2];
     /*0xE1E*/ u16 field_E1F[5];
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index 8301a22f2..e18639faf 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -77,7 +77,7 @@ bool8 MetatileBehavior_IsBerryTreeSoil(u8);
 bool8 MetatileBehavior_IsAshGrass(u8);
 bool8 MetatileBehavior_IsFootprints(u8);
 bool8 MetatileBehavior_IsBridge(u8);
-u8 MetatileBehavior_GetBridgeSth(u8);
+u8 MetatileBehavior_GetBridgeType(u8);
 u8 MetatileBehavior_8089510(u8);
 bool8 MetatileBehavior_IsLandWildEncounter(u8);
 bool8 MetatileBehavior_IsWaterWildEncounter(u8);
diff --git a/include/overworld.h b/include/overworld.h
index 3dce20ab2..6b38a8782 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -47,13 +47,13 @@ void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType);
 const struct MapLayout *GetMapLayout(void);
 void ApplyCurrentWarp(void);
 void set_warp2_warp3_to_neg_1(void);
-void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
-bool32 IsDummyWarp(struct WarpData *warp);
+static void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
+static bool32 IsDummyWarp(struct WarpData *warp);
 struct MapHeader const *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum);
 struct MapHeader const *const GetDestinationWarpMapHeader(void);
-void LoadCurrentMapData(void);
-void LoadSaveblockMapHeader(void);
-void SetPlayerCoordsFromWarp(void);
+static void LoadCurrentMapData(void);
+static void LoadSaveblockMapHeader(void);
+static void SetPlayerCoordsFromWarp(void);
 void WarpIntoMap(void);
 void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpId);
@@ -67,7 +67,7 @@ void sub_8084D5C(s16 a1, s16 a2);
 void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void sub_8084E14(void);
 void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
-void SetFixedDiveWarpAsDestination(void);
+static void SetFixedDiveWarpAsDestination(void);
 void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void SetFixedHoleWarpAsDestination(s16 x, s16 y);
 void warp1_set_to_sav1w(void);
@@ -75,7 +75,7 @@ void sub_8084F2C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void sub_8084F6C(u8 a1);
 void sub_8084FAC(void);
 const struct MapConnection *GetMapConnection(u8 dir);
-bool8 SetDiveWarp(u8 dir, u16 x, u16 y);
+static bool8 SetDiveWarp(u8 dir, u16 x, u16 y);
 bool8 SetDiveWarpEmerge(u16 x, u16 y);
 bool8 SetDiveWarpDive(u16 x, u16 y);
 void mliX_load_map(u8 mapGroup, u8 mapNum);
@@ -105,7 +105,7 @@ void UpdateAmbientCry(s16 *state, u16 *delayCounter);
 u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum);
 u8 GetMapTypeByWarpData(struct WarpData *warp);
 u8 Overworld_GetMapTypeOfSaveblockLocation(void);
-u8 get_map_light_from_warp0(void);
+u8 GetLastUsedWarpMapType(void);
 bool8 is_map_type_1_2_3_5_or_6(u8 mapType);
 bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType);
 bool8 Overworld_MapTypeIsIndoors(u8 mapType);
diff --git a/include/pokemon.h b/include/pokemon.h
index 0155f7430..7cf043ba3 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -486,7 +486,7 @@ void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedI
 void sub_806819C(struct Pokemon *mon, struct UnknownPokemonStruct *src);
 void sub_8068338(struct Pokemon *mon, struct UnknownPokemonStruct *src, bool8 lvl50);
 void CreateApprenticeMon(struct Pokemon *mon, const struct Apprentice *src, u8 monId);
-void CreateMonWithEVSpreadPersonalityOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId);
+void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId);
 void sub_80686FC(struct Pokemon *mon, struct UnknownPokemonStruct *dest);
 void CreateObedientMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId);
 bool8 sub_80688F8(u8 caseId, u8 battlerId);