diff options
author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-11-14 16:52:40 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-14 16:52:40 -0600 |
commit | 3fb2a488f99d4d8499a2b0247f73f45837b07156 (patch) | |
tree | 96ade7ed86da5743019c8650613197c654b91759 /src/battle_controller_opponent.c | |
parent | 118bf4f4b115ad6840427b00ba6a5ea0732574c8 (diff) | |
parent | 716590c165791ce33e18bd97c8ee2e26c580e5f8 (diff) |
Merge pull request #111 from DizzyEggg/decompile_battle5
Decompile battle5
Diffstat (limited to 'src/battle_controller_opponent.c')
-rw-r--r-- | src/battle_controller_opponent.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 831f434b0..0aac4cbe4 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1168,7 +1168,7 @@ static void OpponentHandleLoadMonSprite(void) static void OpponentHandleSwitchInAnim(void) { - *(gBattleStruct->field_5C + gActiveBank) = 6; + *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6; gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1]; sub_80613DC(gActiveBank, gBattleBufferA[gActiveBank][2]); gBattleBankFunc[gActiveBank] = sub_805FDF0; @@ -1627,7 +1627,7 @@ static void OpponentHandleChoosePokemon(void) { s32 chosenMonId; - if (*(gBattleStruct->field_294 + gActiveBank) == 6) + if (*(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) == 6) { chosenMonId = GetMostSuitableMonToSwitchInto(); @@ -1670,12 +1670,12 @@ static void OpponentHandleChoosePokemon(void) } else { - chosenMonId = *(gBattleStruct->field_294 + gActiveBank); - *(gBattleStruct->field_294 + gActiveBank) = 6; + chosenMonId = *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank); + *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6; } - *(gBattleStruct->field_5C + gActiveBank) = chosenMonId; + *(gBattleStruct->monToSwitchIntoId + gActiveBank) = chosenMonId; EmitChosenMonReturnValue(1, chosenMonId, NULL); OpponentBufferExecCompleted(); } |