Merge pull request #858 from AreaZeroArven/work8

Unassembler and rename sub_8044804
pret · Sep 30, 2024 · e898671 · e898671
2 parents 5d2b9c7 + eb2d041
commit e898671
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 618 deletions.
diff --git a/include/battle_interface.h b/include/battle_interface.h
@@ -21,7 +21,7 @@ void nullsub_11();
 void UpdateOamPriorityInAllHealthboxes(u8);
 void sub_8043F44(u8);
 void sub_804454C(void);
-u8 sub_8044804(u8, const struct HpAndStatus *, u8, u8);
+u8 CreatePartyStatusSummarySprites(u8, const struct HpAndStatus *, u8, u8);
 void sub_8044CA0(u8);
 void sub_8045A5C(u8, struct Pokemon *, u8);
 s32 sub_8045C78(u8, u8, u8, u8);

diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
@@ -1689,7 +1689,7 @@ void LinkOpponentHandlecmd48(void)
             ewram17810[gActiveBattler].unk1_1 = 0;
         }
     }
-    gUnknown_02024E68[gActiveBattler] = sub_8044804(
+    gUnknown_02024E68[gActiveBattler] = CreatePartyStatusSummarySprites(
       gActiveBattler,
       (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4],
       gBattleBufferA[gActiveBattler][1],

diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
@@ -1620,7 +1620,7 @@ void LinkPartnerHandlecmd48(void)
     }
 
     ewram17810[gActiveBattler].unk0_0 = 1;
-    gUnknown_02024E68[gActiveBattler] = sub_8044804(
+    gUnknown_02024E68[gActiveBattler] = CreatePartyStatusSummarySprites(
       gActiveBattler,
       (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4],
       gBattleBufferA[gActiveBattler][1],

diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
@@ -1838,7 +1838,7 @@ void OpponentHandlecmd48(void)
             ewram17810[gActiveBattler].unk1_1 = 0;
         }
     }
-    gUnknown_02024E68[gActiveBattler] = sub_8044804(
+    gUnknown_02024E68[gActiveBattler] = CreatePartyStatusSummarySprites(
       gActiveBattler,
       (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4],
       gBattleBufferA[gActiveBattler][1],

diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
@@ -2967,7 +2967,7 @@ void PlayerHandlecmd48(void)
     else
     {
         ewram17810[gActiveBattler].unk0_0 = 1;
-        gUnknown_02024E68[gActiveBattler] = sub_8044804(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gUnknown_02024E68[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
         ewram17810[gActiveBattler].unk5 = 0;
         if (gBattleBufferA[gActiveBattler][2] != 0)
             ewram17810[gActiveBattler].unk5 = 0x5D;

diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
@@ -1539,7 +1539,7 @@ void WallyHandlecmd48(void)
     else
     {
         ewram17810[gActiveBattler].unk0_0 = 1;
-        gUnknown_02024E68[gActiveBattler] = sub_8044804(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gUnknown_02024E68[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
         WallyBufferExecCompleted();
     }
 }