Continue synchronising

5 files changed, 7 insertions, 32 deletions

diff --git a/include/battle_setup.h b/include/battle_setup.h
index fec5a249a..f0608cb21 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -55,9 +55,9 @@ void BattleSetup_StartScriptedWildBattle(void);
 s8 BattleSetup_GetTerrain(void);
 u8 BattleSetup_GetBattleTowerBattleTransition(void);
 u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data);
-void TrainerWantsBattle(u8, u8 *);
+void TrainerWantsBattle(u8, const u8 *);
 
-bool32 GetTrainerFlagFromScriptPointer(u8 *data);
+bool32 GetTrainerFlagFromScriptPointer(const u8 *data);
 //u8 ScrSpecial_GetTrainerBattleMode(void);
 //u8 ScrSpecial_HasTrainerBeenFought(void);
 //void sub_808257C(void);
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 9f100a57c..b3040d6df 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -347,7 +347,6 @@ u8 GetFirstInactiveEventObjectId(void);
 u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8);
 bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
 u8 GetEventObjectIdByXY(s16, s16);
-u8 GetAvailableEventObjectId(u16, u8, u8, u8 *);
 void RemoveEventObjectByLocalIdAndMap(u8, u8, u8);
 u8 SpawnSpecialEventObject(struct EventObjectTemplate *);
 u8 show_sprite(u8, u8, u8);
@@ -359,7 +358,6 @@ void EventObjectSetGraphicsId(struct EventObject *, u8);
 void EventObjectTurn(struct EventObject *, u8);
 void EventObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
 const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8);
-void SetEventObjectDynamicGraphicsId(struct EventObject *);
 void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
 void EventObjectGetLocalIdAndMap(struct EventObject *, void *, void *, void *);
 void sub_805BCC0(s16 x, s16 y);
@@ -369,7 +367,6 @@ void sub_805BD90(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
 void FreeAndReserveObjectSpritePalettes(void);
 void sub_805BDF8(u16);
 void PatchObjectPalette(u16, u8);
-u8 FindEventObjectPaletteIndexByTag(u16);
 void LoadPlayerObjectReflectionPalette(u16, u8);
 void LoadSpecialObjectReflectionPalette(u16, u8);
 void ShiftEventObjectCoords(struct EventObject *pObject, s16 x, s16 y);
@@ -379,8 +376,7 @@ u8 GetEventObjectIdByXYZ(u16, u16, u8);
 void UpdateEventObjectsForCameraUpdate(s16, s16);
 u8 AddCameraObject(u8);
 void CameraObjectReset1(void);
-u8 * GetEventObjectScriptPointerByEventObjectId(u8);
-u16 GetEventObjectFlagIdByEventObjectId(u8);
+const u8 *GetEventObjectScriptPointerByEventObjectId(u8);
 u8 EventObjectGetBerryTreeId(u8);
 struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8, u8, u8);
 void OverrideTemplateCoordsForEventObject(struct EventObject *pObject);
@@ -401,7 +397,6 @@ bool8 IsBerryTreeSparkling(u8, u8, u8);
 void sub_8060288(u8, u8, u8);
 void sub_8060388(s16, s16, s16 *, s16 *);
 void sub_80603CC(s16 x, s16 y, s16 *pInt, s16 *pInt1);
-void GetEventObjectMovingCameraOffset(s16 *, s16 *);
 void EventObjectMoveDestCoords(struct EventObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1);
 bool8 EventObjectIsMovementOverridden(struct EventObject *);
 bool8 EventObjectIsHeldMovementActive(struct EventObject *);
@@ -461,25 +456,8 @@ void DoShadowFieldEffect(struct EventObject *eventObject);
 u8 sub_8064704(struct Sprite *);
 u8 sub_806478C(struct Sprite *);
 void SetAndStartSpriteAnim(struct Sprite *sprite, u8 a2, u8 a3);
-void DoRippleFieldEffect(struct EventObject *eventObj, struct Sprite *sprite);
 bool8 IsZCoordMismatchAt(u8 z, s16 x, s16 y);
 bool8 AreZCoordsCompatible(u8 z1, u8 z2);
-void EventObjectUpdateMetatileBehaviors(struct EventObject *);
-void GetGroundEffectFlags_Reflection(struct EventObject *, u32 *);
-void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject *, u32 *);
-void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject *, u32 *);
-void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject *, u32 *);
-void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject *, u32 *);
-void GetGroundEffectFlags_Tracks(struct EventObject *, u32 *);
-void GetGroundEffectFlags_SandPile(struct EventObject *, u32 *);
-void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *, u32 *);
-void GetGroundEffectFlags_Puddle(struct EventObject *, u32 *);
-void GetGroundEffectFlags_Ripple(struct EventObject *, u32 *);
-void GetGroundEffectFlags_ShortGrass(struct EventObject *, u32 *);
-void GetGroundEffectFlags_HotSprings(struct EventObject *, u32 *);
-void GetGroundEffectFlags_Seaweed(struct EventObject *, u32 *);
-void GetGroundEffectFlags_JumpLanding(struct EventObject *, u32 *);
-u8 EventObjectCheckForReflectiveSurface(struct EventObject *);
 u8 GetLedgeJumpDirection(s16, s16, u8);
 u8 ZCoordToPriority(u8);
 void EventObjectUpdateZCoord(struct EventObject *pObject);
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index 599d1da0c..df6482688 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -26,11 +26,11 @@ struct FieldInput
 void ClearPlayerFieldInput(struct FieldInput *pStruct);
 void GetPlayerFieldInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys);
 int ProcessPlayerFieldInput(struct FieldInput *pStruct);
-u8 *GetInteractedLinkPlayerScript(struct MapPosition *, u8, u8);
+const u8 *GetInteractedLinkPlayerScript(struct MapPosition *, u8, u8);
 void ClearPoisonStepCounter(void);
 void RestartWildEncounterImmunitySteps(void);
 u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *);
-u8 *GetEventObjectScriptPointerPlayerFacing(void);
+const u8 *GetEventObjectScriptPointerPlayerFacing(void);
 u8 TrySetDiveWarp(void);
 bool8 dive_warp(struct MapPosition*, u16);
 
diff --git a/include/overworld.h b/include/overworld.h
index d6e6d1ae5..9d00194be 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -179,13 +179,10 @@ bool32 sub_8055618(struct UnkStruct_8054FF8 *);
 bool32 sub_8055630(struct UnkStruct_8054FF8 *);
 u8 *sub_8055648(struct UnkStruct_8054FF8 *);
 bool32 sub_8055660(struct UnkStruct_8054FF8 *);
-u8 *sub_805568C(struct UnkStruct_8054FF8 *);
-u16 sub_8055758(u8 *);
+const u8 *sub_805568C(struct UnkStruct_8054FF8 *);
 void sub_80557E8(void);
 void sub_80557F4(void);
-void sub_8055808(u8 *);
 void sub_8055824(void);
-void sub_8055840(u8 *);
 void sub_805585C(void);
 bool32 sub_8055870(void);
 u32 sub_80558AC(void);
diff --git a/include/script.h b/include/script.h
index 5a899cf4a..17effd358 100644
--- a/include/script.h
+++ b/include/script.h
@@ -50,6 +50,6 @@ bool8 mapheader_run_first_tag2_script_list_match(void);
 void mapheader_run_first_tag4_script_list_match(void);
 void ClearRamScript(void);
 bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId);
-u8 *GetRamScript(u8 objectId, u8 *script);
+const u8 *GetRamScript(u8 objectId, const u8 *script);
 
 #endif // GUARD_SCRIPT_H