Merge pull request #698 from Slawter666/synchronise

Synchronise with pokeemerald

9 files changed, 19 insertions, 58 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/constants/event_objects.h b/include/constants/event_objects.h
index 7c236671d..32c7b7625 100644
--- a/include/constants/event_objects.h
+++ b/include/constants/event_objects.h
@@ -240,6 +240,9 @@
 #define EVENT_OBJ_GFX_VAR_E 254
 #define EVENT_OBJ_GFX_VAR_F 255
 
+#define NUM_OBJECT_GRAPHICS_INFO 217
+#define SPRITE_VAR 239
+
 #define SHADOW_SIZE_S 0
 #define SHADOW_SIZE_M 1
 #define SHADOW_SIZE_L 2
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index ece46fce0..b3040d6df 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -347,23 +347,17 @@ u8 GetFirstInactiveEventObjectId(void);
 u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8);
 bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
 u8 GetEventObjectIdByXY(s16, s16);
-u8 GetEventObjectIdByLocalIdAndMapInternal(u8, u8, u8);
-u8 GetEventObjectIdByLocalId(u8);
-u8 GetAvailableEventObjectId(u16, u8, u8, u8 *);
 void RemoveEventObjectByLocalIdAndMap(u8, u8, u8);
-void RemoveEventObjectInternal(struct EventObject *);
 u8 SpawnSpecialEventObject(struct EventObjectTemplate *);
 u8 show_sprite(u8, u8, u8);
-void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjTemplate, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables);
 u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority);
 u8 sub_805B410(u8, u8, s16, s16, u8, u8);
 void TrySpawnEventObjects(s16, s16);
 void sub_805B710(u16 i, u16 i1);
-void sub_805B980(struct EventObject *, u8);
+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);
@@ -372,9 +366,7 @@ void sub_805BD48(u8, u8, u8);
 void sub_805BD90(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
 void FreeAndReserveObjectSpritePalettes(void);
 void sub_805BDF8(u16);
-u8 sub_805BE58(const struct SpritePalette *);
-void PatchObjectPalette(u16, u16);
-u8 FindEventObjectPaletteIndexByTag(u16);
+void PatchObjectPalette(u16, u8);
 void LoadPlayerObjectReflectionPalette(u16, u8);
 void LoadSpecialObjectReflectionPalette(u16, u8);
 void ShiftEventObjectCoords(struct EventObject *pObject, s16 x, s16 y);
@@ -384,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);
@@ -406,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 *);
@@ -466,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/global.fieldmap.h b/include/global.fieldmap.h
index aa13a9ac0..81f805ee2 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -304,7 +304,7 @@ struct PlayerAvatar /* 0x202E858 */
 
 struct Camera
 {
-    bool8 field_0:1;
+    bool8 active:1;
     s32 x;
     s32 y;
 };
diff --git a/include/item_menu.h b/include/item_menu.h
index 22ef3892c..1a34b8f53 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -37,7 +37,7 @@ void CleanUpOverworldMessage(u8);
 void ExecuteItemUseFromBlackPalette(void);
 void sub_80A5D04(void);
 void ItemMenu_LoadSellMenu(void);
-void sub_80A68CC();
+void CB2_ChooseBerry();
 void sub_80A6A30(void);
 bool32 UseRegisteredKeyItem(void);
 void sub_80A6DCC(void);
diff --git a/include/overworld.h b/include/overworld.h
index f7571ee0f..9d00194be 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -31,7 +31,6 @@ extern u8 gUnknown_03004860;
 void Overworld_ResetStateAfterFly(void);
 void Overworld_ResetStateAfterTeleport(void);
 void Overworld_ResetStateAfterDigEscRope(void);
-void Overworld_ResetStateAfterWhiteOut(void);
 void ResetGameStats(void);
 void IncrementGameStat(u8 index);
 u32 GetGameStat(u8 index);
@@ -98,7 +97,6 @@ bool8 BGMusicStopped(void);
 void Overworld_FadeOutMapMusic(void);
 // PlayAmbientCry
 void UpdateAmbientCry(s16 *, u16 *);
-void ChooseAmbientCrySpecies(void);
 u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum);
 // GetMapTypeByWarpData
 u8 Overworld_GetMapTypeOfSaveblockLocation(void);
@@ -115,8 +113,7 @@ bool32 is_c1_link_related_active(void);
 // c1_overworld
 // OverworldBasic
 void CB2_OverworldBasic(void);
-void c2_overworld(void);
-// set_callback1
+// SetMainCallback1
 // sub_80543DC
 void CB2_NewGame(void);
 void CB2_WhiteOut(void);
@@ -124,9 +121,9 @@ void CB2_LoadMap(void);
 void CB2_LoadMap2(void);
 void sub_8054534(void);
 void sub_8054588(void);
-void c2_exit_to_overworld_2_switch(void);
-void c2_exit_to_overworld_2_local(void);
-void c2_exit_to_overworld_2_link(void);
+void CB2_ReturnToField(void);
+void CB2_ReturnToFieldLocal(void);
+void CB2_ReturnToFieldLink(void);
 // sub_805465C
 void c2_exit_to_overworld_1_sub_8080DEC(void);
 // sub_80546B8
@@ -135,8 +132,6 @@ void sub_80546F0(void);
 // sub_805470C
 void CB2_ContinueSavedGame(void);
 void FieldClearVBlankHBlankCallbacks(void);
-void SetFieldVBlankCallback(void);
-void VBlankCB_Field(void);
 bool32 sub_805493C(u8 *, u32);
 bool32 sub_8054A4C(u8 *);
 bool32 sub_8054A9C(u8 *a1);
@@ -184,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);
@@ -199,8 +191,6 @@ u32 sub_8055940(void);
 // ClearLinkPlayerEventObject
 void ClearLinkPlayerEventObjects(void);
 // ZeroEventObject
-void SpawnLinkPlayerEventObject(u8, s16, s16, u8);
-void InitLinkPlayerEventObjectPos(struct EventObject *, s16, s16);
 // unref_sub_8055A6C
 // unref_sub_8055A9C
 u8 sub_8055AE8(u8);
@@ -208,7 +198,6 @@ void sub_8055B08(u8, u16 *, u16 *);
 u8 sub_8055B30(u8);
 u8 sub_8055B50(u8);
 // unref_sub_8055B74
-u8 GetLinkPlayerIdAt(s16, s16);
 void sub_8055BFC(u8, u8);
 // sub_8055C68
 // sub_8055C88
@@ -218,10 +207,6 @@ void sub_8055BFC(u8, u8);
 // sub_8055D18
 // sub_8055D30
 // sub_8055D38
-u8 npc_something3(u8, u8);
-u8 LinkPlayerDetectCollision(u8, u8, s16, s16);
-void CreateLinkPlayerSprite(u8);
-void SpriteCB_LinkPlayer(struct Sprite *);
 void sub_805465C(void);
 
 void CB2_InitTestMenu(void);
diff --git a/include/rom6.h b/include/rom6.h
index 105eac19a..508817163 100644
--- a/include/rom6.h
+++ b/include/rom6.h
@@ -3,7 +3,7 @@
 
 extern struct MapPosition gPlayerFacingPosition;
 
-bool8 SetLastTalkedObjectInFrontOfPlayer(u8);
+bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
 u8 oei_task_add(void);
 void debug_sub_8120968(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