summaryrefslogtreecommitdiff
path: root/src/battle_controller_wally.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-06-28 15:54:22 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-06-28 15:54:22 -0400
commit27c5faf8e0e8a0f685ed61847a30eaf51b90c497 (patch)
tree8d0c2c64dd5eed7f9f30db1a190236ca9b2f8fa5 /src/battle_controller_wally.c
parent01e4381ab71c4ebf49fd66d88bfc2833ba1bffc5 (diff)
Match sub_806CF04
Diffstat (limited to 'src/battle_controller_wally.c')
-rw-r--r--src/battle_controller_wally.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 417706adf..be72d673e 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -1102,7 +1102,7 @@ void WallyHandleTrainerThrow(void)
80, 80 + 4 * (8 - gTrainerBackPicCoords[2].coords),
30);
gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
- gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240;
+ gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = 240;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80313A0;
gBattlerControllerFuncs[gActiveBattler] = sub_813741C;
@@ -1117,7 +1117,7 @@ void WallyHandleTrainerSlide(void)
80, 80 + 4 * (8 - gTrainerBackPicCoords[2].coords),
30);
gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
- gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -96;
+ gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -96;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 2;
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80313A0;
gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy2;
@@ -1477,7 +1477,7 @@ void WallyHandleTrainerBallThrow(void)
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
- gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+ gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
StoreSpriteCallbackInData(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_8030E38);