From 888109935e9c35d6794c340759e4fd8c8c96760d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 6 Apr 2018 10:55:04 -0700 Subject: Start decompiling battle_9 --- src/pokemon_3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/pokemon_3.c') diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 9346031a6..81a588e8e 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -28,7 +28,7 @@ extern u8 gPlayerPartyCount; extern u8 gEnemyPartyCount; extern struct BattlePokemon gBattleMons[4]; -extern u8 gActiveBank; +extern u8 gActiveBattler; extern struct BattleEnigmaBerry gEnigmaBerries[]; extern u16 gSpeciesToHoennPokedexNum[]; extern u16 gSpeciesToNationalPokedexNum[]; @@ -95,7 +95,7 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit) if (itemId == ITEM_ENIGMA_BERRY) { - temp = gEnigmaBerries[gActiveBank].itemEffect; + temp = gEnigmaBerries[gActiveBattler].itemEffect; } itemEffect = temp; -- cgit v1.2.3 From cbf2c5c2a9539f74d57f141f233b47923566e838 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 6 Apr 2018 14:54:47 -0700 Subject: Decompile a bunch of battle_9 --- src/pokemon_3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/pokemon_3.c') diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 81a588e8e..d35551613 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -51,7 +51,7 @@ extern const u8 BattleText_Wally[]; extern s8 gPokeblockFlavorCompatibilityTable[]; extern u8 gLastUsedAbility; extern const u8 BattleText_PreventedSwitch[]; -extern u16 gBattlePartyID[]; +extern u16 gBattlerPartyIndexes[]; extern u8 BattleText_Rose[]; extern u8 BattleText_UnknownString3[]; @@ -1299,13 +1299,13 @@ void sub_8040B8C(void) gBattleTextBuff1[2] = gBattleStruct->unk16054; gBattleTextBuff1[4] = EOS; if (!GetBankSide(gBattleStruct->unk16054)) - gBattleTextBuff1[3] = pokemon_order_func(gBattlePartyID[gBattleStruct->unk16054]); + gBattleTextBuff1[3] = pokemon_order_func(gBattlerPartyIndexes[gBattleStruct->unk16054]); else - gBattleTextBuff1[3] = gBattlePartyID[gBattleStruct->unk16054]; + gBattleTextBuff1[3] = gBattlerPartyIndexes[gBattleStruct->unk16054]; gBattleTextBuff2[0] = 0xFD; gBattleTextBuff2[1] = 4; gBattleTextBuff2[2] = gBankInMenu; - gBattleTextBuff2[3] = pokemon_order_func(gBattlePartyID[gBankInMenu]); + gBattleTextBuff2[3] = pokemon_order_func(gBattlerPartyIndexes[gBankInMenu]); gBattleTextBuff2[4] = EOS; StrCpyDecodeBattle(BattleText_PreventedSwitch, gStringVar4); } -- cgit v1.2.3 From 818801cf5ab0c696f2460922753f921726aac6bb Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 6 Apr 2018 16:02:31 -0700 Subject: Finish decompiling battle_9 --- src/pokemon_3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pokemon_3.c') diff --git a/src/pokemon_3.c b/src/pokemon_3.c index d35551613..791dd5d2f 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -1298,7 +1298,7 @@ void sub_8040B8C(void) gBattleTextBuff1[1] = 4; gBattleTextBuff1[2] = gBattleStruct->unk16054; gBattleTextBuff1[4] = EOS; - if (!GetBankSide(gBattleStruct->unk16054)) + if (!GetBattlerSide(gBattleStruct->unk16054)) gBattleTextBuff1[3] = pokemon_order_func(gBattlerPartyIndexes[gBattleStruct->unk16054]); else gBattleTextBuff1[3] = gBattlerPartyIndexes[gBattleStruct->unk16054]; -- cgit v1.2.3