From cd9a8c5a384124999e15626d9623b48f2687deba Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Mon, 13 Dec 2021 23:22:03 -0500 Subject: Decomped CanTarget() --- include/dungeon_entity.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'include/dungeon_entity.h') diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index b894a2f..29e3112 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -287,10 +287,11 @@ enum MovementFlag enum ShopkeeperMode { - SHOPKEEPER_FRIENDLY = 1, + SHOPKEEPER_NONE, + SHOPKEEPER_FRIENDLY, // These two modes trigger if an explosion damages the shopkeeper. The shopkeeper attacks the side that damaged it. - SHOPKEEPER_AGGRESSIVE_TO_WILD = 2, - SHOPKEEPER_AGGRESSIVE_TO_PLAYER = 3 + SHOPKEEPER_AGGRESSIVE_TO_WILD, + SHOPKEEPER_AGGRESSIVE_TO_PLAYER }; enum MovementAction @@ -308,7 +309,7 @@ enum ClientType { CLIENT_TYPE_NONE = 0, CLIENT_TYPE_CLIENT = 1, // Used for mission clients that need rescuing. - CLIENT_TYPE_DONT_MOVE = 3 // Used for Diglett in the Skarmory boss fight. + CLIENT_TYPE_DONT_MOVE = 4 // Used for Diglett in the Skarmory boss fight. }; enum VisualFlag -- 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() --- include/dungeon_entity.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/dungeon_entity.h') diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index 29e3112..bf263ae 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -272,10 +272,10 @@ struct DungeonEntity enum EntityType { - ENTITY_NONE = 0, - ENTITY_POKEMON = 1, - ENTITY_TRAP = 2, - ENTITY_ITEM = 3 + ENTITY_NONE, + ENTITY_POKEMON, + ENTITY_TRAP, + ENTITY_ITEM }; enum MovementFlag -- cgit v1.2.3 From b1fc911965c584f5af6522849162527f41461b7c Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Tue, 14 Dec 2021 23:36:22 -0500 Subject: Decomped InSameRoom_2() --- include/dungeon_entity.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/dungeon_entity.h') diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index bf263ae..f4e836c 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -3,7 +3,7 @@ #include "constants/move.h" #include "item.h" -#include "map.h" +#include "position.h" struct DungeonActionContainer { -- cgit v1.2.3