actor types extraction

pmret · Sep 29, 2023 · 8c89932 · 8c89932
1 parent bd0aaa6
commit 8c89932
Show file tree

Hide file tree

Showing 14 changed files with 2,509 additions and 2,568 deletions.
diff --git a/include/common.h b/include/common.h
@@ -13,7 +13,7 @@
 #include "messages.h"
 #include "battle/formation_names.h"
 #include "battle/stage_names.h"
-#include "battle/actor_levels.h"
+#include "battle/actor_types.h"
 
 #ifdef PERMUTER
 extern int TEXEL0, TEXEL1, PRIMITIVE, PRIMITIVE_ALPHA;

diff --git a/src/16F740.c b/src/16F740.c
@@ -13,7 +13,7 @@ extern s16 D_802809F6;
 extern s16 DemoBattleBeginDelay;
 extern s32 BattleScreenFadeAmt;
 extern EvtScript EVS_OnBattleInit;
-extern s32 D_80281454[];
+extern s32 bActorsIgnoreDuringCount[];
 extern EvtScript EVS_Mario_OnActorCreate;
 extern EvtScript EVS_Peach_OnActorCreate;
 
@@ -343,7 +343,7 @@ void btl_state_update_normal_start(void) {
 
             for (i = 0; i < BattleEnemiesCreated; i++) {
                 create_actor(&(*battle->formation)[i]);
-                types = D_80281454;
+                types = bActorsIgnoreDuringCount;
                 actor = battleStatus->enemyActors[i];
 
                 while (TRUE) {

diff --git a/src/17D6A0.c b/src/17D6A0.c
diff --git a/src/actor_api.c b/src/actor_api.c
@@ -2,7 +2,7 @@
 #include "effects.h"
 #include "battle/battle.h"
 
-extern s32 isGroupHeal;
+extern s32 IsGroupHeal;
 extern s8 ApplyingBuff;
 
 s32 count_targets(Actor* actor, s32 targetHomeIndex, s32 targetSelectionFlags) {
@@ -3678,7 +3678,7 @@ ApiStatus HealActor(Evt* script, s32 isInitialCall) {
             actorID = script->owner1.enemyID;
         }
         hpBoost = evt_get_variable(script, *args++);
-        isGroupHeal = evt_get_variable(script, *args++);
+        IsGroupHeal = evt_get_variable(script, *args++);
         actor = get_actor(actorID);
         script->functionTempPtr[1] = actor;
         script->functionTemp[2] = hpBoost;
@@ -3751,7 +3751,7 @@ ApiStatus HealActor(Evt* script, s32 isInitialCall) {
         case 3:
             if (script->functionTemp[3] == 0) {
                 message = BTL_MSG_HEAL_ALL;
-                if (!isGroupHeal) {
+                if (!IsGroupHeal) {
                     message = BTL_MSG_HEAL_ONE;
                 }
                 btl_show_variable_battle_message(message, 60, hpBoost);

diff --git a/src/battle/action_cmd.c b/src/battle/action_cmd.c
@@ -82,7 +82,7 @@ void* actionCommandDmaTable[] = {
 BSS s32 sMashMeterSmoothDivisor;
 BSS s32 D_8029FBC4_pad[3];
 // TODO move to actor_api
-BSS s32 isGroupHeal;
+BSS s32 IsGroupHeal;
 BSS s8 ApplyingBuff;
 BSS s32 D_8029FBD8_pad[2];
 

diff --git a/src/battle/actor_levels.h b/src/battle/actor_levels.h