summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_controller_link_opponent.c2
-rw-r--r--src/battle_controller_link_partner.c2
-rw-r--r--src/battle_controller_opponent.c2
-rw-r--r--src/battle_controller_player.c2
-rw-r--r--src/battle_controller_wally.c2
-rw-r--r--src/battle_interface.c27
6 files changed, 18 insertions, 19 deletions
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 4c86dbb92..fdee6128f 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -1692,7 +1692,7 @@ void LinkOpponentHandlecmd48(void)
}
gUnknown_02024E68[gActiveBattler] = sub_8044804(
gActiveBattler,
- (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBattler][4],
+ (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4],
gBattleBufferA[gActiveBattler][1],
gBattleBufferA[gActiveBattler][2]);
ewram17810[gActiveBattler].unk5 = 0;
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 21aead586..62ed0101f 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -1623,7 +1623,7 @@ void LinkPartnerHandlecmd48(void)
ewram17810[gActiveBattler].unk0_0 = 1;
gUnknown_02024E68[gActiveBattler] = sub_8044804(
gActiveBattler,
- (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBattler][4],
+ (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4],
gBattleBufferA[gActiveBattler][1],
gBattleBufferA[gActiveBattler][2]);
ewram17810[gActiveBattler].unk5 = 0;
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index d82f2e197..fd7282f49 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -1841,7 +1841,7 @@ void OpponentHandlecmd48(void)
}
gUnknown_02024E68[gActiveBattler] = sub_8044804(
gActiveBattler,
- (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBattler][4],
+ (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4],
gBattleBufferA[gActiveBattler][1],
gBattleBufferA[gActiveBattler][2]);
ewram17810[gActiveBattler].unk5 = 0;
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 6f61f29b1..ddeefcc32 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -2969,7 +2969,7 @@ void PlayerHandlecmd48(void)
else
{
ewram17810[gActiveBattler].unk0_0 = 1;
- gUnknown_02024E68[gActiveBattler] = sub_8044804(gActiveBattler, (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+ gUnknown_02024E68[gActiveBattler] = sub_8044804(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
index 9dbb8bade..95e648ea7 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -1545,7 +1545,7 @@ void WallyHandlecmd48(void)
else
{
ewram17810[gActiveBattler].unk0_0 = 1;
- gUnknown_02024E68[gActiveBattler] = sub_8044804(gActiveBattler, (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+ gUnknown_02024E68[gActiveBattler] = sub_8044804(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
WallyBufferExecCompleted();
}
}
diff --git a/src/battle_interface.c b/src/battle_interface.c
index bf7429a67..5c087b8af 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -1075,9 +1075,8 @@ void sub_804454C(void)
}
}
-// This function almost matches except for just two instructions around 0x08044B52 that are swapped.
#ifdef NONMATCHING
-u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
+u8 sub_8044804(u8 a, const struct HpAndStatus *b, u8 c, u8 d)
{
u8 r7;
s16 x;
@@ -1131,7 +1130,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
sp14 = 0;
for (i = 0; i < 6; i++) //_080448A0
{
- if (b[i].unk0 != 0xFFFF)
+ if (b[i].hp != 0xFFFF)
sp14++;
}
@@ -1192,19 +1191,19 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
{
if (gBattleTypeFlags & BATTLE_TYPE_MULTI) // && b[i] != 0xFFFF && b[i]
{
- if (b[i].unk0 == 0xFFFF)
+ if (b[i].hp == 0xFFFF)
{
//_08044AE6
gSprites[sp[i]].oam.tileNum += 1;
gSprites[sp[i]].data[7] = 1;
// to _08044B52
}
- else if (b[i].unk0 == 0)
+ else if (b[i].hp == 0)
{
gSprites[sp[i]].oam.tileNum += 3;
// to _08044B46
}
- else if (b[i].unk4 != 0)
+ else if (b[i].status != 0)
{
gSprites[sp[i]].oam.tileNum += 2;
}
@@ -1219,13 +1218,13 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
gSprites[sp[i]].data[7] = 1;
// to _08044B52
}
- else if (b[i].unk0 == 0)
+ else if (b[i].hp == 0)
{
//_08044B14
gSprites[sp[i]].oam.tileNum += 3;
// to _08044B46
}
- else if (b[i].unk4 != 0)
+ else if (b[i].status != 0)
{
gSprites[sp[i]].oam.tileNum += 2;
}
@@ -1240,16 +1239,16 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
{
if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
{
- if (b[i].unk0 == 0xFFFF)
+ if (b[i].hp == 0xFFFF)
{
gSprites[sp[5 - i]].oam.tileNum += 1;
gSprites[sp[5 - i]].data[7] = 1;
}
- else if (b[i].unk0 == 0)
+ else if (b[i].hp == 0)
{
gSprites[sp[5 - i]].oam.tileNum += 3;
}
- else if (b[i].unk4 != 0)
+ else if (b[i].status != 0)
{
gSprites[sp[5 - i]].oam.tileNum += 2;
}
@@ -1261,11 +1260,11 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
gSprites[sp[5 - i]].oam.tileNum += 1;
gSprites[sp[5 - i]].data[7] = 1;
}
- else if (b[i].unk0 == 0)
+ else if (b[i].hp == 0)
{
gSprites[sp[5 - i]].oam.tileNum += 3;
}
- else if (b[i].unk4 != 0)
+ else if (b[i].status != 0)
{
gSprites[sp[5 - i]].oam.tileNum += 2;
}
@@ -1286,7 +1285,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
}
#else
NAKED
-u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
+u8 sub_8044804(u8 a, const struct HpAndStatus *b, u8 c, u8 d)
{
asm(".syntax unified\n\
push {r4-r7,lr}\n\
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 14:16:36 +0000