diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-01 15:28:57 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-01 15:28:57 +0200 |
| commit | c556358e47f7af50ba9b04fc1d7b359512c25b03 (patch) | |
| tree | 4d36126957f9ce8d2d278a3adb91a26a2ed64b66 /src/battle_controller_safari.c | |
| parent | f35c0abe80ce9ec91618b2237d68463100fa4afa (diff) | |
label multiuse sprite template functions
Diffstat (limited to 'src/battle_controller_safari.c')
| -rw-r--r-- | src/battle_controller_safari.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index bc69e2624..f7be76c9b 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -239,7 +239,7 @@ static void HandleInputChooseAction(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) SafariBufferExecCompleted(); @@ -358,9 +358,9 @@ static void SafariHandleReturnMonToBall(void) static void SafariHandleDrawTrainerPic(void) { DecompressTrainerBackPic(gSaveBlock2Ptr->playerGender, gActiveBattler); - sub_806A12C(gSaveBlock2Ptr->playerGender, GetBattlerPosition(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerBack(gSaveBlock2Ptr->playerGender, GetBattlerPosition(gActiveBattler)); gBattlerSpriteIds[gActiveBattler] = CreateSprite( - &gUnknown_0202499C, + &gMultiuseSpriteTemplate, 80, (8 - gTrainerBackPicCoords[gSaveBlock2Ptr->playerGender].coords) * 4 + 80, 30); @@ -368,7 +368,7 @@ static void SafariHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void SafariHandleTrainerSlide(void) |