Add playeritem enum and use ids and kinds in all Findentity calls

This commit is contained in:
Tal Hayon
2022-02-18 18:18:40 +02:00
parent 10f8096abd
commit 0e224cf232
20 changed files with 81 additions and 43 deletions
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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);
}
+1 -1
View File
@@ -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);
}