summaryrefslogtreecommitdiff
path: root/src/manager
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2022-02-18 18:18:40 +0200
committerTal Hayon <talhayon1@gmail.com>2022-02-18 18:18:40 +0200
commit0e224cf2323a76539730ee35f4e8a0856cf7a1fd (patch)
tree4153b4359e569ce555626b85c63a0533d26eb348 /src/manager
parent10f8096abd9533e14a5ad03eedcbee4fcbb9019a (diff)
Add playeritem enum and use ids and kinds in all Findentity calls
Diffstat (limited to 'src/manager')
-rw-r--r--src/manager/manager22.c2
-rw-r--r--src/manager/manager36.c2
-rw-r--r--src/manager/managerF.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/manager/manager22.c b/src/manager/manager22.c
index 4d6130cc..a8bb0794 100644
--- a/src/manager/manager22.c
+++ b/src/manager/manager22.c
@@ -159,7 +159,7 @@ void sub_0805BB74(s32 lightLevel) {
}
gArea.lightLevel = lightLevel;
gRoomVars.lightLevel = gArea.lightLevel;
- manager = (Manager22*)DeepFindEntityByID(9, 0x22);
+ manager = (Manager22*)DeepFindEntityByID(MANAGER, 0x22);
if (manager) {
Manager22_Main(manager);
gScreen.lcd.displayControl |= DISPCNT_BG3_ON;
diff --git a/src/manager/manager36.c b/src/manager/manager36.c
index ca9c5c24..7dcf71c4 100644
--- a/src/manager/manager36.c
+++ b/src/manager/manager36.c
@@ -36,7 +36,7 @@ void CreateManager36(Entity* entity, ScriptExecutionContext* context) {
}
void DeleteManager36(Entity* entity, ScriptExecutionContext* context) {
- Entity* manager = FindEntity(9, 0x36, 6, context->intVariable, 0);
+ Entity* manager = FindEntity(MANAGER, 0x36, 6, context->intVariable, 0);
if (manager != NULL) {
DeleteEntityAny(manager);
}
diff --git a/src/manager/managerF.c b/src/manager/managerF.c
index f1cc1aca..1c3bd127 100644
--- a/src/manager/managerF.c
+++ b/src/manager/managerF.c
@@ -286,7 +286,7 @@ void sub_08059220(ManagerF* this) {
void sub_08059278(void) {
ManagerF* tmp;
- tmp = (ManagerF*)FindEntityByID(0x9, 0xF, 0x6);
+ tmp = (ManagerF*)FindEntityByID(MANAGER, 0xF, 0x6);
if (tmp) {
sub_08058ECC(tmp);
}