diff options
| -rw-r--r-- | asm/evolution_scene.s | 2 | ||||
| -rw-r--r-- | include/dynamic_placeholder_text_util.h | 6 | ||||
| -rw-r--r-- | include/evolution_graphics.h | 2 | ||||
| -rw-r--r-- | src/evolution_graphics.c | 20 |
4 files changed, 15 insertions, 15 deletions
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index a1aff00ea..efa6ccff7 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -3045,7 +3045,7 @@ _080CF820: lsls r4, 3 adds r4, r5 ldrh r0, [r4, 0xC] - bl LaunchTask_PostEvoSparklesSet2Alt + bl LaunchTask_PostEvoSparklesSet2AndFlash_Trade mov r1, r8 strb r0, [r1, 0x2] b _080CFA90 diff --git a/include/dynamic_placeholder_text_util.h b/include/dynamic_placeholder_text_util.h index 31cfe8d30..bae92eb01 100644 --- a/include/dynamic_placeholder_text_util.h +++ b/include/dynamic_placeholder_text_util.h @@ -1,5 +1,5 @@ -#ifndef GUARD_UNK_TEXT_UTIL_H -#define GUARD_UNK_TEXT_UTIL_H +#ifndef GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H +#define GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H #include "global.h" @@ -9,4 +9,4 @@ u8 *DynamicPlaceholderTextUtil_ExpandPlaceholders(u8 *dest, const u8 *src); const u8 *DynamicPlaceholderTextUtil_GetPlaceholderPtr(u8 idx); u8 GetColorFromTextColorTable(u16 graphicId); -#endif //GUARD_UNK_TEXT_UTIL_H +#endif //GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H diff --git a/include/evolution_graphics.h b/include/evolution_graphics.h index 21f133872..e4fbf0fc0 100644 --- a/include/evolution_graphics.h +++ b/include/evolution_graphics.h @@ -10,7 +10,7 @@ u8 LaunchTask_PreEvoSparklesSet2(void); u8 LaunchTask_PostEvoSparklesSet1(void); u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 species); u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 species); -u8 sub_817C3A0(u8 preEvoSpriteID, u8 postEvoSpriteID); +u8 LaunchTask_PrePostEvoMonSprites(u8 preEvoSpriteId, u8 postEvoSpriteId); #define EvoGraphicsTaskEvoStop data[8] diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index da6ada735..7088679ba 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -22,8 +22,8 @@ static void EvoTask_PostEvoSparklesSet1Teardown(u8 taskId); static void EvoTask_PostEvoSparklesSet2Init(u8 taskId); static void EvoTask_CreatePostEvoSparklesSet2(u8 taskId); static void EvoTask_PostEvoSparklesSet2Teardown(u8 taskId); -static void EvoTask_PostEvoSparklesSet2AltInit(u8 taskId); -static void EvoTask_CreatePostEvoSparklesSet2Alt(u8 taskId); +static void EvoTask_PostEvoSparklesSet2TradeInit(u8 taskId); +static void EvoTask_CreatePostEvoSparklesSet2Trade(u8 taskId); static void EvoTask_PrePostEvoMonSpritesInit(u8 taskId); static void EvoTask_ChooseNextEvoSpriteAnim(u8 taskId); static void EvoTask_ShrinkOrExpandEvoSprites(u8 taskId); @@ -386,10 +386,10 @@ static void EvoTask_PostEvoSparklesSet1Teardown(u8 taskId) DestroyTask(taskId); } -u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 a0) +u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 species) { u8 taskId = CreateTask(EvoTask_PostEvoSparklesSet2Init, 0); - gTasks[taskId].data[2] = a0; + gTasks[taskId].data[2] = species; return taskId; } @@ -437,25 +437,25 @@ static void EvoTask_PostEvoSparklesSet2Teardown(u8 taskId) DestroyTask(taskId); } -u8 LaunchTask_PostEvoSparklesSet2Alt(u16 a0) +u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 species) { - u8 taskId = CreateTask(EvoTask_PostEvoSparklesSet2AltInit, 0); - gTasks[taskId].data[2] = a0; + u8 taskId = CreateTask(EvoTask_PostEvoSparklesSet2TradeInit, 0); + gTasks[taskId].data[2] = species; return taskId; } -static void EvoTask_PostEvoSparklesSet2AltInit(u8 taskId) +static void EvoTask_PostEvoSparklesSet2TradeInit(u8 taskId) { SetEvoSparklesMatrices(); gTasks[taskId].data[15] = 0; sub_80D0474(); CpuCopy16(&gPlttBufferFaded[32], &gPlttBufferUnfaded[32], 96); BeginNormalPaletteFade(0xFFF90F00, 0, 0, 16, RGB_WHITE); - gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet2Alt; + gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet2Trade; PlaySE(SE_W080); } -static void EvoTask_CreatePostEvoSparklesSet2Alt(u8 taskId) +static void EvoTask_CreatePostEvoSparklesSet2Trade(u8 taskId) { u8 i; if (gTasks[taskId].data[15] < 128) |