summaryrefslogtreecommitdiff
path: root/src/pokemon_3.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-06-21 20:56:11 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-06-21 20:56:11 +0200
commit2f0e6350b186e3f6d1db00459d6f5499b025cf10 (patch)
tree577455e0db3d3160e0389f5547d2a5ec86892162 /src/pokemon_3.c
parentc84bb67156d6ab822b6ff1b508e9fae73f054675 (diff)
battle_h update, labelling battle2.c
Diffstat (limited to 'src/pokemon_3.c')
-rw-r--r--src/pokemon_3.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index cb8eb2a46..d3ecf04dd 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -1296,15 +1296,15 @@ void BoxMonRestorePP(struct BoxPokemon *boxMon)
void sub_8040B8C(void)
{
- gLastUsedAbility = BATTLE_STRUCT->filler1_2[0x37];
+ gLastUsedAbility = BATTLE_STRUCT->unk160C0;;
gBattleTextBuff1[0] = 0xFD;
gBattleTextBuff1[1] = 4;
- gBattleTextBuff1[2] = BATTLE_STRUCT->filler1[0x34];
+ gBattleTextBuff1[2] = BATTLE_STRUCT->unk16054;
gBattleTextBuff1[4] = EOS;
- if (!GetBankSide(BATTLE_STRUCT->filler1[0x34]))
- gBattleTextBuff1[3] = pokemon_order_func(gBattlePartyID[BATTLE_STRUCT->filler1[0x34]]);
+ if (!GetBankSide(BATTLE_STRUCT->unk16054))
+ gBattleTextBuff1[3] = pokemon_order_func(gBattlePartyID[BATTLE_STRUCT->unk16054]);
else
- gBattleTextBuff1[3] = gBattlePartyID[BATTLE_STRUCT->filler1[0x34]];
+ gBattleTextBuff1[3] = gBattlePartyID[BATTLE_STRUCT->unk16054];
gBattleTextBuff2[0] = 0xFD;
gBattleTextBuff2[1] = 4;
gBattleTextBuff2[2] = gBankInMenu;