diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:55:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 16:55:19 -0700 |
| commit | 5fb9b9052276243d54ecfc27d0514e9c35825e8c (patch) | |
| tree | 7546411871d12a05f370b529341ebfd656334af1 /src/battle_controller_wally.c | |
| parent | f74d4742f597a423b7a8685d72c06597c8c78db7 (diff) | |
| parent | 37b891cbd49780d63fe2295add70bf003c59de48 (diff) | |
Merge pull request #437 from huderlem/name_labels
Name labels
Diffstat (limited to 'src/battle_controller_wally.c')
| -rw-r--r-- | src/battle_controller_wally.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index f2cf5bbb4..bf6ef0892 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -89,7 +89,7 @@ extern void sub_80E43C0(); extern void oamt_add_pos2_onto_pos1(); extern void sub_8078B34(struct Sprite *); extern void sub_8030E38(struct Sprite *); -extern void oamt_set_x3A_32(); +extern void StoreSpriteCallbackInData6(); extern u8 sub_8046400(); extern u8 sub_8077ABC(); extern u8 sub_8077F68(); @@ -1490,7 +1490,7 @@ void WallyHandleTrainerBallThrow(void) gSprites[gObjectBankIDs[gActiveBank]].data4 = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34; gSprites[gObjectBankIDs[gActiveBank]].data5 = gActiveBank; - oamt_set_x3A_32(&gSprites[gObjectBankIDs[gActiveBank]], sub_8030E38); + StoreSpriteCallbackInData6(&gSprites[gObjectBankIDs[gActiveBank]], sub_8030E38); StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 1); paletteNum = AllocSpritePalette(0xD6F8); LoadCompressedPalette(gTrainerBackPicPaletteTable[2].data, 0x100 + paletteNum * 16, 32); |