From cd9a8c5a384124999e15626d9623b48f2687deba Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Mon, 13 Dec 2021 23:22:03 -0500 Subject: Decomped CanTarget() --- src/dungeon_movement.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/dungeon_movement.c') diff --git a/src/dungeon_movement.c b/src/dungeon_movement.c index 9ea894e..80bf2e5 100644 --- a/src/dungeon_movement.c +++ b/src/dungeon_movement.c @@ -5,6 +5,7 @@ #include "constants/direction.h" #include "constants/iq_skill.h" #include "constants/status.h" +#include "constants/targeting.h" #include "dungeon_ai_items.h" #include "dungeon_capabilities_1.h" #include "dungeon_global_data.h" -- cgit v1.2.3 From da8fcb2ac85554bb099dff69f1d0ec1226156afd Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Tue, 14 Dec 2021 23:26:56 -0500 Subject: Decomped CanSee() --- src/dungeon_movement.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dungeon_movement.c') diff --git a/src/dungeon_movement.c b/src/dungeon_movement.c index 80bf2e5..86a2b01 100644 --- a/src/dungeon_movement.c +++ b/src/dungeon_movement.c @@ -13,6 +13,7 @@ #include "dungeon_random.h" #include "dungeon_util.h" #include "dungeon_util_1.h" +#include "dungeon_visibility.h" #include "map.h" #include "pokemon.h" @@ -25,7 +26,6 @@ extern void SendImmobilizeEndMessage(struct DungeonEntity*, struct DungeonEntity extern void SetMessageArgument(char[], struct DungeonEntity*, u32); extern void SendMessage(struct DungeonEntity*, char*); extern bool8 HasStatusAffectingActions(struct DungeonEntity*); -extern bool8 CanSee(struct DungeonEntity*, struct DungeonEntity*); extern void ResetAction(u16*); extern void SetWalkAction(u16*, s16); extern void DecideAttack(struct DungeonEntity*); -- cgit v1.2.3 From c033aea36e73365c28da1de93af29ec11b3945b2 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Fri, 17 Dec 2021 23:39:50 -0500 Subject: Moved gDungeonGlobalData definition to dungeon_global_data.h --- src/dungeon_movement.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/dungeon_movement.c') diff --git a/src/dungeon_movement.c b/src/dungeon_movement.c index 86a2b01..275de05 100644 --- a/src/dungeon_movement.c +++ b/src/dungeon_movement.c @@ -20,7 +20,6 @@ extern char gAvailablePokemonNames[]; extern char *gPtrCouldntBeUsedMessage; extern char *gPtrItsaMonsterHouseMessage; -extern struct DungeonGlobalData *gDungeonGlobalData; extern void SendImmobilizeEndMessage(struct DungeonEntity*, struct DungeonEntity*); extern void SetMessageArgument(char[], struct DungeonEntity*, u32); -- cgit v1.2.3 From 0369264407563b64d60c885f8bf79322b6f663c8 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sat, 18 Dec 2021 00:22:03 -0500 Subject: Decomped GetMapTileAtPosition() --- src/dungeon_movement.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/dungeon_movement.c') diff --git a/src/dungeon_movement.c b/src/dungeon_movement.c index 275de05..1601cff 100644 --- a/src/dungeon_movement.c +++ b/src/dungeon_movement.c @@ -49,7 +49,7 @@ u32 sub_8075818(struct DungeonEntity *entity) entityData = entity->entityData; if(EntityExists(entity)) { - tile = sub_8045128(entity); + tile = GetMapEntityForDungeonEntity(entity); if(HasIQSkill(entity, IQ_SKILL_SUPER_MOBILE)) if(!(tile->tileType & (TILE_TYPE_FLOOR | TILE_TYPE_UNK_1))) return 1; @@ -136,7 +136,7 @@ void sub_8075900(struct DungeonEntity *pokemon, u8 r1) { if(!gDungeonGlobalData->monsterHouseActive) { - if((sub_8045128(pokemon)->tileType & TILE_TYPE_MONSTER_HOUSE)) + if((GetMapEntityForDungeonEntity(pokemon)->tileType & TILE_TYPE_MONSTER_HOUSE)) { // It's a monster house! SendMessage(GetLeaderEntity(), gPtrItsaMonsterHouseMessage); -- cgit v1.2.3