Merge pull request #429 from DizzyEggg/sync_sky

Sync some function names with pmd-sky

include/code_806CD90.h

@@ -17,7 +17,7 @@ u8 sub_806CEBC(Entity *entity);
 void sub_806CEFC(Entity *entity, u32 newDir);
 void sub_806CF18(Entity *entity);
 u8 sub_806CF54(Entity *entity);
-void sub_806CF60(void);
-u32 sub_806CF98(Entity *entity);
+void DetermineAllMonsterShadow(void);
+u32 DetermineMonsterShadow(Entity *entity);
 
 #endif // GUARD_CODE_806CD90_H

include/dungeon_action.h

@@ -3,7 +3,7 @@
 
 #include "structs/dungeon_entity.h"
 
-void sub_8044C50(u16 action);
+void SetLeaderActionFields(u16 action);
 void ClearMonsterActionFields(ActionContainer *actionPointer);
 void SetMonsterActionFields(ActionContainer *actionPointer, u16 action);
 void SetActionPassTurnOrWalk(ActionContainer *actionPointer, s16 species);

include/dungeon_engine.h

@@ -6,5 +6,6 @@
 extern const s16 gSpeedTurns[NUM_SPEED_COUNTERS][25];
 
 void RunFractionalTurn(bool8 param_1);
+bool8 IsFloorOver(void);
 
 #endif

include/dungeon_info.h

@@ -10,7 +10,9 @@ s32 GetDungeonFloorCount(u8 dungeon);
 s32 GetDungeonStartingFloor(u8 dungeon);
 const u8 *GetDungeonName1(u8 dungeon);
 bool8 IsStairDirectionUp(u8 dungeon);
+bool8 IsLevelResetDungeon(u8 dungeon);
 u32 GetMaxItemsAllowed(u8 dungeon);
+bool8 IsMoneyAllowed(u8 dungeon);
 s8 GetRescuesAllowed(u8 dungeon);
 bool8 HasCheckpoint(u8 dungeon);
 s16 GetRandomMovementChance(u8 dungeon);

include/dungeon_items.h

@@ -13,12 +13,12 @@ void sub_8045C18(u8 *buffer, Item *item);
 #define FORCE_STICKY_NEVER 2
 void CreateItemWithStickyChance(Item *item, u8 itemID, u32 forceSticky);
 void CreateFloorItems(void);
-void PickUpItemFromPos(struct DungeonPos *pos, bool8 printMsg);
-bool8 AddItemToDungeonAt(DungeonPos *pos, Item *item, bool8 a2);
-bool8 RemoveItemFromDungeonAt(DungeonPos *pos, bool8 a2);
+void TryLeaderItemPickUp(struct DungeonPos *pos, bool8 printMsg);
+bool8 SpawnItem(DungeonPos *pos, Item *item, bool8 a2);
+bool8 RemoveGroundItem(DungeonPos *pos, bool8 a2);
 bool8 sub_80462AC(Entity * entity, u8 hallucinating, u8 a2, u8 a3, u8 a4);
 const u8 *sub_80464AC(Item *item);
-void sub_80464C8(Entity *entity, DungeonPos *pos, Item *item);
+void SpawnDroppedItemWrapper(Entity *entity, DungeonPos *pos, Item *item);
 void SpawnDroppedItem(Entity *entity1, Entity *entity2, Item *item, bool8 a3, DungeonPos *pos);
 void sub_8046860(Entity *entity, DungeonPos *pos, Item *item, s32 a4);
 void sub_804687C(Entity *entity, DungeonPos *pos1, DungeonPos *pos2, Item *item, s32 count);

include/dungeon_main.h

@@ -12,7 +12,7 @@ struct UnkMenuBitsStruct {
 
 void DungeonHandlePlayerInput(void);
 void sub_805E804(void);
-void sub_805EE30(void);
+void CheckLeaderTile(void);
 void sub_805EFB4(Entity *a0, bool8 a1);
 void sub_805F02C(void);
 ActionContainer *GetLeaderActionContainer(void);

include/dungeon_map.h

@@ -12,11 +12,11 @@ void OpenDungeonMapFile(void);
 void InitDungeonMap(bool8 a0);
 void CloseDungeonMapFile(void);
 void LoadDungeonMapPalette(void);
-void ShowDungeonMapAtPos(s32 x, s32 y);
+void DrawMinimapTile(s32 x, s32 y);
 void CopyDungeonMapToVram(void);
-void ShowPlayerDotOnMap(void);
+void FlashLeaderIcon(void);
 void ResetMapPlayerDotFrames(void);
-void ShowWholeRevealedDungeonMap(void);
+void UpdateMinimap(void);
 void UpdateBgTilemapForDungeonMap(bool8 a0);
 void TryResetDungeonMapTilesScheduledForCopy(void);
 

include/dungeon_map_access.h

@@ -6,8 +6,8 @@
 const Tile *GetTile(s32 x, s32 y);
 Tile *GetTileMut(s32 x, s32 y);
 
-void sub_8049ED4(void);
-void sub_804AC20(DungeonPos *pos);
+void UpdateTrapsVisibility(void);
+void DiscoverMinimap(DungeonPos *pos);
 
 void sub_80495E4(void);
 void LoadDungeonTilesetAssets(void);

include/dungeon_message.h

@@ -35,7 +35,7 @@ void LogMessageByIdWithPopupCheckUser(Entity *pokemon, const u8 *str);
 void TryDisplayDungeonLoggableMessage2(Entity *pokemon, const u8 *str);
 void TryDisplayDungeonLoggableMessage3(Entity *attacker, Entity *target, const u8 *str);
 void TryDisplayDungeonLoggableMessage4(Entity *attacker, Entity *target, const u8 *str);
-void TryDisplayDungeonLoggableMessage5(Entity *pokemon, DungeonPos *pos, const u8 *str);
+void LogMessageByIdWithPopupCheckUserUnknown(Entity *pokemon, DungeonPos *pos, const u8 *str);
 
 // As opposed to the above - these always display the string and save it in the message log. False/True stand for an unknown argument. Not sure what the practical difference is between these.
 void DisplayDungeonLoggableMessage(Entity *pokemon, const u8 *str);
@@ -51,7 +51,7 @@ bool32 DisplayDungeonYesNoMessage(struct MonDialogueSpriteInfo *monSpriteInfo, c
 s32 DisplayDungeonMenuMessage(struct MonDialogueSpriteInfo *monSpriteInfo, const u8 *str, const MenuItem *menuItems, u16 unkArg);
 void sub_8052D44(s16 *ids, Entity *leader, Entity *partner);
 void TryDisplayGeneralTutorialMessage(void);
-void TryDisplayItemPickupTutorialMessage(u8 itemId);
+void DisplayItemTip(u8 itemId);
 void DisplayYouReachedDestFloorStr(void);
 void sub_8052FB8(const u8 *str);
 const u8 *GetCurrentDungeonName(void);

include/dungeon_misc.h

@@ -35,7 +35,7 @@ void sub_8068A84(Pokemon *pokemon);
 void sub_8068BDC(bool8 a0);
 void sub_8068F28(void);
 void sub_8068F80(void);
-void sub_8068FE0(Entity *entity, s32 param_2, Entity *param_3);
+void HandleFaint(Entity *entity, s32 param_2, Entity *param_3);
 void sub_80694C0(Entity *target,s32 x,s32 y,u8 param_4);
 void sub_80695EC(Entity *param_1,int x,int y);
 Entity * sub_8069660(Entity *target);
@@ -47,14 +47,14 @@ bool8 sub_8069D18(DungeonPos *pos,Entity *entity);
 void sub_8069D4C(struct unkStruct_8069D4C *r0, Entity *target);
 void TargetTileInFront(Entity *pokemon);
 void sub_8069E0C(Entity *pokemon);
-void TriggerWeatherAbilities(void);
+void TryActivateArtificialWeatherAbilities(void);
 s32 GetMonsterApparentID(Entity *pokemon, s32 _id);
 void sub_8069F9C(Entity *pokemon, Entity *target, Move *move);
 void sub_806A120(Entity * pokemon, Entity * target, Move* move);
 void sub_806A1B0(Entity *pokemon);
 void sub_806A1E8(Entity *pokemon);
 void sub_806A240(Entity *pokemon, Entity *target);
-void sub_806A2BC(Entity *pokemon, u8 param_2);
+void TryPointCameraToMonster(Entity *pokemon, u8 param_2);
 void sub_806A338(void);
 void sub_806A390(Entity *pokemon);
 void sub_806A3D4(u8 *dst, s32 _a1, s32 id, bool32 _a3);

include/dungeon_util.h

@@ -16,16 +16,17 @@ bool8 EntityIsValid(Entity *pokemon);
 u32 GetEntityType(Entity *entity);
 u8 GetEntityRoom(Entity *entity);
 Tile *GetTileAtEntitySafe(Entity *entity);
-void sub_804535C(Entity *entity, PixelPos *pos);
+void UpdateEntityPixelPos(Entity *entity, PixelPos *pos);
 void SetEntityPixelPos(Entity *entity, s32 x, s32 y);
 void IncreaseEntityPixelPos(Entity *entity, s32 x, s32 y);
-Item *GetItemData(Entity *entity);
+Item *GetItemInfo(Entity *entity);
 Item *GetItemData_1(Entity *entity);
-Trap *GetTrapData(Entity *entity);
+Trap *GetTrapInfo(Entity *entity);
 Trap* GetTrapData_1(Entity *entity);
 Entity *SpawnTrap(u8 trapID, DungeonPos *pos, u8 c);
-Entity *sub_8045708(DungeonPos *pos);
+Entity *SpawnItemEntity(DungeonPos *pos);
 void sub_80457DC(Entity* ent);
+bool8 ShouldDisplayEntity(Entity *ent);
 bool8 CanSeeTarget(Entity *entity, Entity *targetEntity);
 bool8 CanTargetEntity(Entity *entity, Entity *targetEntity);
 bool8 sub_8045A70(Entity *entity, Entity *targetEntity);

include/items.h

@@ -45,22 +45,22 @@ void LoadItemParameters(void);
 TeamInventory *GetMoneyItemsInfo(void);
 void InitializeMoneyItems(void);
 s32 GetNumberOfFilledInventorySlots(void);
-bool8 IsThrowableItem(u8 id);
+bool8 IsThrownItem(u8 id);
 void ItemIdToItem(Item *item, u8 id, bool8 makeSticky);
-void ItemIdToBulkItem(BulkItem *dst, u8 id);
+void InitBulkItem(BulkItem *dst, u8 id);
 void BulkItemToItem(Item *dst, BulkItem *src);
 void ItemToBulkItem(BulkItem *dst, Item *src);
 u8 GetItemCategory(u8 index);
 s32 GetStackBuyValue(Item *param_1);
 s32 GetStackSellValue(Item *param_1);
-s32 GetStackBuyPrice(Item *param_1);
-s32 GetStackSellPrice(Item *param_1);
+s32 GetActualBuyPrice(Item *param_1);
+s32 GetActualSellPrice(Item *param_1);
 s32 GetItemBuyPrice(u8 id);
 s32 GetItemSellPrice(u8 id);
 s32 GetItemOrder(u8 id);
 s32 GetItemPalette(u8 id);
 u32 GetItemActionType(u8 id);
-u32 GetSpawnAmountRange(u8 id, u32 r1);
+u32 GetThrownItemQuantityLimit(u8 id, u32 r1);
 u8 *GetItemDescription(u8 id);
 bool8 TestItemAIFlag(u8 id, u32 aiFlag);
 void BufferItemName(u8 *, u8 id, unkStruct_8090F58 *);
@@ -70,7 +70,7 @@ void ConvertMoneyItemToMoney();
 void AddToTeamMoney(s32 amount);
 u32 GetMoneyValue(Item* slot);
 u16 GetItemMoveID(u8 index);
-bool8 CanSellItem(u32 id);
+bool8 IsShoppableItem(u32 id);
 bool8 IsGummiItem(u8);
 void ShiftItemsDownFrom(s32 start);
 void ClearItemSlotAt(u32 index);

include/pokemon.h

@@ -109,7 +109,7 @@ s32 GetUnitSum_808D544(s32 *);
 s32 sub_808D580(s32 *);
 bool8 ComparePokemonNames(s16, s16);
 void PrintPokeNameToBuffer(u8 *buffer, Pokemon *pokemon);
-void GetPokemonLevelData(LevelData* a1, s32 _id, s32 level);
+void GetLvlUpEntry(LevelData* a1, s32 _id, s32 level);
 const u8* DecompressMoveID(const u8* a1, u16* moveID);
 bool8 sub_808DA44(s32, u32);
 void ConvertStoryMonToPokemon(Pokemon *dst, const struct StoryMonData *src);

include/run_dungeon.h

@@ -22,7 +22,7 @@ bool8 sub_8043CE4(s32 dungeonId);
 u8 GetFloorType(void);
 void sub_8043D50(s32 *a0, s32 *a1);
 void sub_8043D60(void);
-bool8 sub_8043ED0(bool8 a0);
+bool8 TryForcedLoss(bool8 a0);
 void EnforceMaxItemsAndMoney(void);
 bool8 IsBossFight(void);
 bool8 IsCurrentFixedRoomBossFight(void);

include/trap.h

@@ -12,7 +12,7 @@ bool8 sub_807FD84(Entity *entity);
 bool8 sub_807FE04(DungeonPos *pos, char param_2);
 bool8 sub_807FE44(DungeonPos *pos, char param_2);
 void GetTrapName(u8 *buffer, u8 trapIndex);
-void HandleTrap(Entity *pokemon, DungeonPos *pos, int param_3, char param_4);
+void TryTriggerTrap(Entity *pokemon, DungeonPos *pos, int param_3, char param_4);
 void HandleMudTrap(Entity *pokemon, Entity *target);
 void HandleStickyTrap(Entity *pokemon, Entity *target);
 void HandleGrimyTrap(Entity *pokemon, Entity *target);