diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-23 12:51:58 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-23 12:51:58 -0400 |
commit | 18a567fb29aab58250170ecb3a0ac4f5d19094a9 (patch) | |
tree | 85b1d63b147a6b148bfd2f738c07ce59a34042a3 | |
parent | ed0546faaeee4e41ac9b0906bfcbac3e50aa7b22 (diff) |
Document remaining contest.c functions
-rw-r--r-- | data-de/text/contest_strings.inc | 10 | ||||
-rw-r--r-- | data/text/contest_strings.inc | 10 | ||||
-rw-r--r-- | include/contest_internal.h | 112 | ||||
-rw-r--r-- | include/contest_link.h | 12 | ||||
-rw-r--r-- | include/ewram.h | 2 | ||||
-rw-r--r-- | include/graphics.h | 6 | ||||
-rw-r--r-- | include/text.h | 4 | ||||
-rw-r--r-- | src/battle_controller_link_opponent.c | 3 | ||||
-rw-r--r-- | src/battle_controller_link_partner.c | 3 | ||||
-rw-r--r-- | src/battle_controller_opponent.c | 3 | ||||
-rw-r--r-- | src/battle_controller_player.c | 6 | ||||
-rw-r--r-- | src/battle_controller_safari.c | 3 | ||||
-rw-r--r-- | src/battle_controller_wally.c | 3 | ||||
-rw-r--r-- | src/contest.c | 465 | ||||
-rw-r--r-- | src/contest_2.c | 50 | ||||
-rw-r--r-- | src/contest_link.c | 4 | ||||
-rw-r--r-- | src/contest_link_util.c | 2 | ||||
-rw-r--r-- | src/data/graphics.c | 6 | ||||
-rw-r--r-- | src/egg_hatch.c | 3 | ||||
-rw-r--r-- | src/evolution_scene.c | 141 | ||||
-rw-r--r-- | src/field_message_box.c | 4 | ||||
-rw-r--r-- | src/hall_of_fame.c | 2 | ||||
-rw-r--r-- | src/mauville_man.c | 2 | ||||
-rw-r--r-- | src/menu.c | 4 | ||||
-rw-r--r-- | src/pokedex.c | 4 | ||||
-rw-r--r-- | src/text.c | 4 | ||||
-rw-r--r-- | src/text_window.c | 2 |
27 files changed, 484 insertions, 386 deletions
diff --git a/data-de/text/contest_strings.inc b/data-de/text/contest_strings.inc index 0067f78e3..028213152 100644 --- a/data-de/text/contest_strings.inc +++ b/data-de/text/contest_strings.inc @@ -268,18 +268,18 @@ gText_Contest_ButItCantParticipate:: @ 83CAFAE .string "Ausdruck {NAME_END}! Aber es\n" .string "kann nicht teilnehmen!$" -gUnknown_083CAFD7:: @ 83CAFD7 +gText_MonAppealedWithMove:: @ 83CAFD7 .string "{STR_VAR_1} führt\n" .string "{STR_VAR_2} vor!$" .string "Die anderen POKéMON\n" .string "zeigten ihre Attacken!$" -gUnknown_083CB00D:: @ 83CB00D +gText_MonWasWatchingOthers:: @ 83CB00D .string "{STR_VAR_1} beobachtet\n" .string "die anderen.{PAUSE 60}$" -gUnknown_083CB02C:: @ 83CB02C +gText_AllOutOfAppealTime:: @ 83CB02C .string "Soweit zur\n" .string "Ausdruckskraft!{PAUSE 60}$" @@ -645,7 +645,7 @@ ContestString_TrippedOver: .string "{STR_VAR_1} ist so irri-\n" .string "tiert, dass es stolpert.{PAUSE 60}$" -gUnknown_083CBF60:: @ 83CBF60 +gText_MonWasTooNervousToMove:: @ 83CBF60 ContestString_TooNervous: .string "{STR_VAR_1} ist zu nervös,\n" .string "um etwas vorzuführen.{PAUSE 60}$" @@ -828,7 +828,7 @@ ContestString_UnknownMoveType: .string "???$" .align 2 -gUnknown_083CC330:: @ 83CC330 +sInvalidContestMoveNames:: @ 83CC330 .4byte ContestString_CoolMove .4byte ContestString_BeautyMove .4byte ContestString_CuteMove diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc index f435f5d15..2c1d7958e 100644 --- a/data/text/contest_strings.inc +++ b/data/text/contest_strings.inc @@ -214,14 +214,14 @@ gText_Contest_WhichMoveWillBePlayed:: @ 83CAF84 gText_Contest_ButItCantParticipate:: @ 83CAFAE .string "Appeal no. {NAME_END}!\nBut it can't participate!$" -gUnknown_083CAFD7:: @ 83CAFD7 +gText_MonAppealedWithMove:: @ 83CAFD7 .string "{STR_VAR_1} appealed with\n{STR_VAR_2}!$" .string "The other POKéMON\nmade moves.{PAUSE 60}$" -gUnknown_083CB00D:: @ 83CB00D +gText_MonWasWatchingOthers:: @ 83CB00D .string "{STR_VAR_1} was watching\nthe others.{PAUSE 60}$" -gUnknown_083CB02C:: @ 83CB02C +gText_AllOutOfAppealTime:: @ 83CB02C .string "We're all out of\nAppeal Time!{PAUSE 60}$" .string "{STR_VAR_1}'s {STR_VAR_3}\nmove {STR_VAR_2}!{PAUSE 60}$" .string "TRICK$" @@ -485,7 +485,7 @@ ContestString_LeaptUp: ContestString_TrippedOver: .string "{STR_VAR_1} tripped over\nout of distraction.{PAUSE 60}$" -gUnknown_083CBF60:: @ 83CBF60 +gText_MonWasTooNervousToMove:: @ 83CBF60 ContestString_TooNervous: .string "{STR_VAR_1} was too\nnervous to move.{PAUSE 60}$" ContestString_MessedUp2: @@ -654,7 +654,7 @@ ContestString_UnknownMoveType: .string "???$" .align 2 -gUnknown_083CC330:: @ 83CC330 +sInvalidContestMoveNames:: @ 83CC330 .4byte ContestString_CoolMove .4byte ContestString_BeautyMove .4byte ContestString_CuteMove diff --git a/include/contest_internal.h b/include/contest_internal.h index dd81a624c..ad984d599 100644 --- a/include/contest_internal.h +++ b/include/contest_internal.h @@ -1,55 +1,55 @@ #ifndef GUARD_CONTEST_INTERNAL_H #define GUARD_CONTEST_INTERNAL_H -void sub_80AB350(void); -void sub_80AB5D4(u8); -void sub_80AB604(u8); -void sub_80AB678(u8); -void sub_80AB694(u8); -void sub_80AB6B4(u8); -u8 sub_80AB70C(u8 *); -void sub_80AB960(u8); -void sub_80AB9A0(u8); +void InitContestResources(void); +void Task_StartContestWaitFade(u8 taskId); +void Task_TryStartLinkContest(u8 taskId); +void Task_CommunicateMonIdxs(u8 taskId); +void Task_EndCommunicateMonIdxs(u8 taskId); +void Task_ReadyStartLinkContest(u8 taskId); +u8 SetupContestGraphics(u8 *a); +void Task_WaitToRaiseCurtainAtStart(u8 taskId); +void Task_RaiseCurtainAtStart(u8 taskId); void ContestMainCallback2(void); void ContestVBlankCallback(void); -void sub_80ABB70(u8); +void Task_DisplayAppealNumberText(u8 taskId); void sub_80ABC3C(u8); -void sub_80ABC70(u8); -void sub_80ABCDC(u8); -void sub_80ABEA0(u8); -void sub_80AC0AC(s8); -void nullsub_17(s8); -void sub_80AC0C8(u8); -void sub_80AC15C(u8); -void sub_80AC188(u8); -void sub_80AC204(u8); -void sub_80AC250(u8); -void sub_80AC284(u8); -void sub_80AC2CC(u8); +void Task_TryShowMoveSelectScreen(u8 taskId); +void Task_ShowMoveSelectScreen(u8 taskId); +void Task_HandleMoveSelectInput(u8 taskId); +void DrawMoveSelectArrow(s8 a); +void EraseMoveSelectArrow(s8 a); // nullsub +void Task_SelectedMove(u8 taskId); +void Task_EndCommunicateMoveSelections(u8 taskId); +void Task_HideMoveSelectScreen(u8 taskId); +void Task_HideApplauseMeterForAppealStart(u8 taskId); +void Task_WaitHideApplauseMeterForAppealStart(u8 taskId); +void Task_AppealSetup(u8 taskId); +void Task_DoAppeals(u8 taskId); void Task_EndWaitForLink(u8 taskId); -void sub_80AD8FC(struct Sprite *); -void sub_80AD92C(struct Sprite *); -void sub_80AD960(u8); -void sub_80ADA1C(u8); -void sub_80ADA4C(u8); -void sub_80ADAD8(u8); -void sub_80ADB04(u8); -void sub_80ADB48(u8); -void sub_80ADB88(u8); -void sub_80ADC10(u8); -void sub_80ADC4C(u8); -void sub_80ADC84(u8); -void sub_80ADCB4(u8); -void sub_80ADD04(u8); -void sub_80ADD74(u8); -void sub_80ADDA4(u8); -void sub_80ADE54(u8); -void sub_80ADEAC(u8); -void sub_80ADEEC(u8); -void sub_80ADF4C(u8); -void sub_80ADF98(u8); -void sub_80ADFD8(u8); -void sub_80AE010(void); +void SpriteCB_MonSlideIn(struct Sprite *sprite); +void SpriteCB_MonSlideOut(struct Sprite *sprite); +void Task_FinishRoundOfAppeals(u8 taskId); +void Task_ReadyUpdateHeartSliders(u8 taskId); +void Task_UpdateHeartSliders(u8 taskId); +void Task_WaitForHeartSliders(u8 taskId); +void sub_80ADB04(u8 taskId); +void Task_WaitBeforePrintRoundResult(u8 taskId); +void Task_PrintRoundResultText(u8 taskId); +void Task_WaitPrintRoundResultText(u8 taskId); +void Task_ReUpdateHeartSliders(u8 taskId); +void Task_WaitForHeartSlidersAgain(u8 taskId); +void Task_DropCurtainAtRoundEnd(u8 taskId); +void Task_TryStartNextRoundOfAppeals(u8 taskId); +void Task_StartNewRoundOfAppeals(u8 taskId); +void Task_EndAppeals(u8 taskId); +void Task_WaitForOutOfTimeMsg(u8 taskId); +void Task_DropCurtainAtAppealsEnd(u8 taskId); +void Task_TryCommunicateFinalStandings(u8 taskId); +void Task_CommunicateFinalStandings(u8 taskId); +void Task_EndCommunicateFinalStandings(u8 taskId); +void Task_ContestReturnToField(u8 taskId); +void FieldCB_ContestReturnToField(void); void InsertStringDigit(u8 *, s32); bool8 IsPlayerLinkLeader(void); void __copy_tilemap(void *); @@ -62,7 +62,7 @@ u8 CreateJudgeSpeechBubbleSprite(void); u8 CreateContestantSprite(u16, u32, u32); void SwapMoveDescAndContestTilemaps(void); void PrintContestMoveDescription(u16); -void sub_80AED58(void); +void Contest_ClearMoveDescriptionBox(void); bool8 UpdateConditionStars(u8, u8); bool8 DrawStatusSymbol(u8); void DrawStatusSymbols(void); @@ -83,27 +83,27 @@ s8 GetNumHeartsFromAppealPoints(s16 a); u8 UpdateAppealHearts(s16 startAppeal, s16 appealDelta, u8 contestant); void Task_UpdateAppealHearts(u8 taskId); void CreateSliderHeartSprites(void); -void sub_80AFF10(void); -bool8 sub_80AFF28(void); +void UpdateHeartSliders(void); +bool8 SlidersDoneUpdating(void); void sub_80AFF60(struct Sprite *); -void sub_80AFFE0(bool8); -void sub_80B0034(void); +void SetBottomSliderHeartsInvisibility(bool8); +void CreateNextTurnSprites(void); void CreateApplauseMeterSprite(void); void nullsub_18(s8); void sub_80B0238(struct Sprite *); void sub_80B0280(struct Sprite *); void sub_80B02A8(struct Sprite *); void sub_80B02F4(struct Sprite *); -void sub_80B0324(void); +void CreateJudgeAttentionEyeTask(void); void sub_80B03A8(u8); void sub_80B03D8(u8); void sub_80B0458(u8); -void sub_80B0518(void); -void sub_80B0548(u8); -void sub_80B05A4(u8); +void CreateUnusedBlendTask(void); +void InitUnusedBlendTaskData(u8 contestant); +void UpdateBlendTaskContestantData(u8 contestant); void nullsub_19(int); -void sub_80B05FC(u8); -void Task_UnusedBlend(u8); +void Task_UnusedBlend(u8 taskId); +void Task_UnusedBrokenBlend(u8 taskId); void StartStopFlashJudgeAttentionEye(u8); u8 CreateContestantBoxBlinkSprites(u8); void BlinkContestantBox(u8, bool8); diff --git a/include/contest_link.h b/include/contest_link.h index c86eb0988..3bd5fa2bb 100644 --- a/include/contest_link.h +++ b/include/contest_link.h @@ -1,12 +1,12 @@ #ifndef GUARD_CONTEST_LINK_H #define GUARD_CONTEST_LINK_H -void sub_80C8734(u8); -void Task_LinkContest_CommunicateRng(u8); -void sub_80C89DC(u8); -void Task_LinkContest_CommunicateLeaderIds(u8); -void Task_LinkContest_CommunicateRound1Points(u8); -void Task_LinkContest_CommunicateTurnOrder(u8); +void sub_80C8734(u8 taskId); +void Task_LinkContest_CommunicateRng(u8 taskId); +void Task_LinkContest_CommunicateMonIdxs(u8 taskId); +void Task_LinkContest_CommunicateLeaderIds(u8 taskId); +void Task_LinkContest_CommunicateRound1Points(u8 taskId); +void Task_LinkContest_CommunicateTurnOrder(u8 taskId); u8 GetStringLanguage(const u8 *string); void Task_LinkContest_Init(u8 taskId); void Task_LinkContest_CommunicateCategory(u8 taskId); diff --git a/include/ewram.h b/include/ewram.h index cf3f53417..6c9039713 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -86,11 +86,11 @@ extern u8 gSharedMem[]; #define EWRAM_15000 ((u8 *)(gSharedMem + 0x15000)) #define ewram15000 (&gSharedMem[0x15000]) #define ewram15000arr(i, data) (gSharedMem[0x15000 + data + i]) -#define ewram15800 (&gSharedMem[0x15800]) #define ewram16000_2 (&gSharedMem[0x16000]) // Contest +#define eUnzippedContestAudience_Gfx (&gSharedMem[0x15800]) // overlaps other contest vars #define eCurContestWinnerSaveIdx (gSharedMem[0x15DDE]) #define eCurContestWinnerIsForArtist (gSharedMem[0x15DDF]) #define eCurContestWinner ((*(struct ContestWinner*)(gSharedMem + 0x15DE0))) diff --git a/include/graphics.h b/include/graphics.h index 66ef9a028..dfd3affe2 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -35,9 +35,9 @@ extern const u8 gInterfaceGfx_PremierBall[]; extern const u8 gInterfacePal_PremierBall[]; extern const u8 gUnknown_08D030D0[]; -extern const u8 gUnknown_08D17144[]; -extern const u8 gUnknown_08D1725C[]; -extern const u8 gUnknown_08D17424[]; +extern const u8 gContestPalette[]; +extern const u8 gContestGfx[]; +extern const u8 gContestBgmap[]; extern const u8 gUnknown_08D17C3C[]; extern const u8 gContestMiscGfx[]; extern const u8 gContestAudienceGfx[]; diff --git a/include/text.h b/include/text.h index 1d79eeb46..dba242fe3 100644 --- a/include/text.h +++ b/include/text.h @@ -255,7 +255,7 @@ void Text_InitWindowWithTemplate(struct Window *win, const struct WindowTemplate void Text_InitWindow(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); void Text_InitWindow8002E4C(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6); void Text_SetWindowText(struct Window *win, const u8 *text); -void Text_InitWindow8002EB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); +void Contest_StartTextPrinter(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); u8 Text_PrintWindow8002F44(struct Window *win); u8 Text_PrintWindowSimple(struct Window *win); u8 Text_InitWindowAndPrintText(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); @@ -267,7 +267,7 @@ u8 *sub_8003558(u8 *dest, const u8 *src, u8 alignAmount, u8 alignType); u8 Text_UpdateWindow(struct Window *win); u8 Text_UpdateWindowInBattle(struct Window *win); u8 Text_UpdateWindowAutoscroll(struct Window *win); -u8 Text_UpdateWindowInContest(struct Window *win); +u8 Contest_RunTextPrinter(struct Window *win); u32 Text_UpdateWindowOverrideLineLength(struct Window *win, u8 lineLength); void Text_ClearWindow(struct Window *win); u16 Text_GetWindowTilemapEntry(struct Window *win, u8 x, u8 y); diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index adbad297d..8e0418a40 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -1405,7 +1405,8 @@ void LinkOpponentHandlePrintString(void) gBattle_BG0_X = 0; gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBattler][2]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); gBattlerControllerFuncs[gActiveBattler] = sub_8037C2C; } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 39e1a4a0f..60e10d8c2 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -1341,7 +1341,8 @@ void LinkPartnerHandlePrintString(void) gBattle_BG0_X = 0; gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBattler][2]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); gBattlerControllerFuncs[gActiveBattler] = sub_811DFA0; } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index d148962cf..04e850f2f 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1409,7 +1409,8 @@ void OpponentHandlePrintString(void) gBattle_BG0_X = 0; gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBattler][2]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); gBattlerControllerFuncs[gActiveBattler] = sub_80331D0; } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 7a1c7682e..caf8c3a1a 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1728,7 +1728,8 @@ void b_link_standby_message(void) { gBattle_BG0_X = 0; gBattle_BG0_Y = 0; - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, BattleText_LinkStandby, 0x90, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, BattleText_LinkStandby, 0x90, 2, 15); } } @@ -2594,7 +2595,8 @@ void PlayerHandlePrintString(void) gBattle_BG0_X = 0; gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBattler][2]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 0x90, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 0x90, 2, 15); gBattlerControllerFuncs[gActiveBattler] = sub_802DF18; } diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 56defc527..32657bf3d 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -461,7 +461,8 @@ void SafariHandlePrintString(void) gBattle_BG0_X = 0; gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBattler][2]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); gBattlerControllerFuncs[gActiveBattler] = sub_812B694; } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 26fc28a9e..03b87ff84 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -1239,7 +1239,8 @@ void WallyHandlePrintString(void) if (*ptr == 2) DestroyMenuCursor(); BufferStringBattle(*ptr); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 0x90, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 0x90, 2, 15); gBattlerControllerFuncs[gActiveBattler] = sub_8137454; } diff --git a/src/contest.c b/src/contest.c index a138991c0..e5fcebbc0 100644 --- a/src/contest.c +++ b/src/contest.c @@ -39,7 +39,7 @@ extern u8 gUnknown_020297ED; extern void sub_80C8A38(u8); -extern void sub_80C8AD0(u8); +extern void Task_LinkContest_CommunicateFinalStandings(u8); extern void Task_LinkContest_CommunicateAppealsState(u8); extern u8 gBattleMonForms[]; @@ -55,14 +55,14 @@ u32 gContestRngValue; extern const u8 gUnknown_083CA340[][4]; extern const u8 gText_Contest_WhichMoveWillBePlayed[]; extern const u8 gText_Contest_ButItCantParticipate[]; -extern const u8 gUnknown_083CAFD7[]; -extern const u8 gUnknown_083CB00D[]; +extern const u8 gText_MonAppealedWithMove[]; +extern const u8 gText_MonWasWatchingOthers[]; extern const u8 ContestString_JudgeExpectantly2[]; extern const u8 ContestString_WentOverWell[]; extern const u8 ContestString_WentOverVeryWell[]; extern const u8 ContestString_AppealComboExcellently[]; -extern const u8 gUnknown_083CBF60[]; -extern const u8 gUnknown_083CB02C[]; +extern const u8 gText_MonWasTooNervousToMove[]; +extern const u8 gText_AllOutOfAppealTime[]; extern const u8 *const gContestStandOutStrings[]; extern const u8 ContestString_DissapointedRepeat[]; extern const u8 ContestString_WentOverGreat[]; @@ -72,7 +72,7 @@ extern const u8 ContestString_CantAppealNextTurn[]; extern const u8 ContestString_CrowdWatches[]; extern const u8 ContestString_Ignored2[]; extern const u8 *const gContestCategoryStrings[]; -extern const u8 *const gUnknown_083CC330[]; +extern const u8 *const sInvalidContestMoveNames[]; extern const u8 gUnknownText_UnknownFormatting2[]; extern const u8 gUnknownText_UnknownFormatting3[]; @@ -91,7 +91,7 @@ EWRAM_DATA u8 gContestLinkLeaderIndex = 0; EWRAM_DATA u16 gSpecialVar_ContestCategory = 0; EWRAM_DATA u16 gSpecialVar_ContestRank = 0; -void nullsub_89(u8 taskId) +void TaskDummy1(u8 taskId) { } @@ -134,15 +134,16 @@ void ResetContestGpuRegs(void) gBattle_WIN1H = 0; gBattle_WIN1V = 0; } + void LoadContestBgAfterMoveAnim(void) { s32 i; LZDecompressVram(gContestMiscGfx, (void *)VRAM); LZDecompressVram(gContestAudienceGfx, (void *)(VRAM + 0x2000)); - LZDecompressVram(gUnknown_08D1725C, (void *)(VRAM + 0xD000)); - LoadCompressedPalette(gUnknown_08D17144, 0, 0x200); - sub_80AB350(); + LZDecompressVram(gContestGfx, (void *)(VRAM + 0xD000)); + LoadCompressedPalette(gContestPalette, 0, 0x200); + InitContestResources(); for (i = 0; i < 4; i++) { u32 var = 5 + i; @@ -158,7 +159,7 @@ void SetUpContestWindow(void) Text_InitWindowWithTemplate(&gMenuWindow, &gWindowTemplate_81E6FF4); } -void sub_80AB350(void) +void InitContestResources(void) { u8 i; @@ -223,11 +224,11 @@ void CB2_StartContest(void) gMain.state++; break; case 1: - sub_80AB350(); + InitContestResources(); gMain.state++; break; case 2: - if (sub_80AB70C(&sContest.contestSetupState) == 0) + if (SetupContestGraphics(&sContest.contestSetupState) == 0) break; sContest.contestSetupState = 0; gMain.state++; @@ -239,19 +240,19 @@ void CB2_StartContest(void) BeginFastPaletteFade(2); gPaletteFade.bufferTransferDisabled = FALSE; SetVBlankCallback(ContestVBlankCallback); - sContest.mainTaskId = CreateTask(sub_80AB5D4, 10); + sContest.mainTaskId = CreateTask(Task_StartContestWaitFade, 10); SetMainCallback2(ContestMainCallback2); break; } } -void sub_80AB5D4(u8 taskId) +void Task_StartContestWaitFade(u8 taskId) { if (!gPaletteFade.active) - gTasks[taskId].func = sub_80AB604; + gTasks[taskId].func = Task_TryStartLinkContest; } -void sub_80AB604(u8 taskId) +void Task_TryStartLinkContest(u8 taskId) { if (gIsLinkContest & 1) { @@ -259,40 +260,40 @@ void sub_80AB604(u8 taskId) { gPaletteFade.bufferTransferDisabled = FALSE; ContestPrintLinkStandby(); - CreateTask(sub_80AB678, 0); - gTasks[taskId].func = nullsub_89; + CreateTask(Task_CommunicateMonIdxs, 0); + gTasks[taskId].func = TaskDummy1; } } else { - gTasks[taskId].func = sub_80AB960; + gTasks[taskId].func = Task_WaitToRaiseCurtainAtStart; } } -void sub_80AB678(u8 taskId) +void Task_CommunicateMonIdxs(u8 taskId) { - SetTaskFuncWithFollowupFunc(taskId, sub_80C89DC, sub_80AB694); + SetTaskFuncWithFollowupFunc(taskId, Task_LinkContest_CommunicateMonIdxs, Task_EndCommunicateMonIdxs); } -void sub_80AB694(u8 taskId) +void Task_EndCommunicateMonIdxs(u8 taskId) { u16 one = 1; gTasks[taskId].data[0] = one; - gTasks[taskId].func = sub_80AB6B4; + gTasks[taskId].func = Task_ReadyStartLinkContest; } -void sub_80AB6B4(u8 taskId) +void Task_ReadyStartLinkContest(u8 taskId) { if (--gTasks[taskId].data[0] > 0) return; GetMultiplayerId(); // unused return value DestroyTask(taskId); - gTasks[sContest.mainTaskId].func = sub_80AB960; + gTasks[sContest.mainTaskId].func = Task_WaitToRaiseCurtainAtStart; gRngValue = gContestRngValue; } -u8 sub_80AB70C(u8 *a) +u8 SetupContestGraphics(u8 *a) { u16 sp0[16]; u16 sp20[16]; @@ -308,23 +309,23 @@ u8 sub_80AB70C(u8 *a) break; case 2: LZDecompressVram(gContestAudienceGfx, (void *)(VRAM + 0x2000)); - DmaCopyLarge32(3, (void *)(VRAM + 0x2000), ewram15800, 0x2000, 0x1000); + DmaCopyLarge32(3, (void *)(VRAM + 0x2000), eUnzippedContestAudience_Gfx, 0x2000, 0x1000); break; case 3: - LZDecompressVram(gUnknown_08D1725C, (void *)(VRAM + 0xD000)); + LZDecompressVram(gContestGfx, (void *)(VRAM + 0xD000)); break; case 4: - LZDecompressVram(gUnknown_08D17424, (void *)(VRAM + 0xE000)); + LZDecompressVram(gContestBgmap, (void *)(VRAM + 0xE000)); DmaCopy32Defvars(3, (void *)(VRAM + 0xE000), eContestTempSave.savedJunk, 0x800); break; case 5: - LoadCompressedPalette(gUnknown_08D17144, 0, 0x200); + LoadCompressedPalette(gContestPalette, 0, 0x200); CpuCopy32(gPlttBufferUnfaded + 128, sp0, 16 * sizeof(u16)); CpuCopy32(gPlttBufferUnfaded + (5 + gContestPlayerMonIndex) * 16, sp20, 16 * sizeof(u16)); CpuCopy32(sp20, gPlttBufferUnfaded + 128, 16 * sizeof(u16)); CpuCopy32(sp0, gPlttBufferUnfaded + (5 + gContestPlayerMonIndex) * 16, 16 * sizeof(u16)); DmaCopy32Defvars(3, gPlttBufferUnfaded, eContestTempSave.cachedWindowPalettes, 0x200); - sub_80AB350(); + InitContestResources(); break; case 6: DrawContestantWindows(); @@ -332,10 +333,10 @@ u8 sub_80AB70C(u8 *a) SwapMoveDescAndContestTilemaps(); sContest.judgeSpeechBubbleSpriteId = CreateJudgeSpeechBubbleSprite(); CreateSliderHeartSprites(); - sub_80B0034(); + CreateNextTurnSprites(); CreateApplauseMeterSprite(); - sub_80B0324(); - sub_80B0518(); + CreateJudgeAttentionEyeTask(); + CreateUnusedBlendTask(); gBattlerPositions[0] = 0; gBattlerPositions[1] = 1; gBattlerPositions[2] = 3; @@ -355,18 +356,18 @@ u8 sub_80AB70C(u8 *a) return 0; } -void sub_80AB960(u8 taskId) +void Task_WaitToRaiseCurtainAtStart(u8 taskId) { gPaletteFade.bufferTransferDisabled = FALSE; if (!gPaletteFade.active) { gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0; - gTasks[taskId].func = sub_80AB9A0; + gTasks[taskId].func = Task_RaiseCurtainAtStart; } } -void sub_80AB9A0(u8 taskId) +void Task_RaiseCurtainAtStart(u8 taskId) { switch (gTasks[taskId].data[0]) { @@ -398,7 +399,7 @@ void sub_80AB9A0(u8 taskId) break; gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0; - gTasks[taskId].func = sub_80ABB70; + gTasks[taskId].func = Task_DisplayAppealNumberText; break; } } @@ -406,7 +407,7 @@ void sub_80AB9A0(u8 taskId) void ContestMainCallback2(void) { #if DEBUG - if (gUnknown_020297ED == 1 && gMain.newKeys == 4) + if (gUnknown_020297ED == 1 && gMain.newKeys == SELECT_BUTTON) ContestDebugTogglePointTotal(); #endif AnimateSprites(); @@ -435,7 +436,7 @@ void ContestVBlankCallback(void) ScanlineEffect_InitHBlankDmaTransfer(); } -void sub_80ABB70(u8 taskId) +void Task_DisplayAppealNumberText(u8 taskId) { gBattle_BG0_Y = 0; gBattle_BG2_Y = 0; @@ -448,35 +449,35 @@ void sub_80ABB70(u8 taskId) InsertStringDigit(gDisplayedStringBattle, sContest.appealNumber + 1); ContestClearGeneralTextWindow(); StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle); - Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Contest_StartTextPrinter(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].func = sub_80ABC3C; } void sub_80ABC3C(u8 taskId) { - if (Text_UpdateWindowInContest(&gMenuWindow) == 1) - gTasks[taskId].func = sub_80ABC70; + if (Contest_RunTextPrinter(&gMenuWindow) == 1) + gTasks[taskId].func = Task_TryShowMoveSelectScreen; } -void sub_80ABC70(u8 taskId) +void Task_TryShowMoveSelectScreen(u8 taskId) { if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys == B_BUTTON)) { PlaySE(SE_SELECT); if (!Contest_IsMonsTurnDisabled(gContestPlayerMonIndex)) { - sub_80AFFE0(TRUE); - gTasks[taskId].func = sub_80ABCDC; + SetBottomSliderHeartsInvisibility(TRUE); + gTasks[taskId].func = Task_ShowMoveSelectScreen; } else { - gTasks[taskId].func = sub_80AC0C8; + gTasks[taskId].func = Task_SelectedMove; } } } // Print the move list -void sub_80ABCDC(u8 taskId) +void Task_ShowMoveSelectScreen(u8 taskId) { u8 i; u8 sp8[32]; @@ -524,15 +525,15 @@ void sub_80ABCDC(u8 taskId) } MenuCursor_Create814A5C0(0, 0xFFFF, 12, 0x2D9F, 72); - sub_80AC0AC(sContest.playerMoveChoice); + DrawMoveSelectArrow(sContest.playerMoveChoice); PrintContestMoveDescription(gContestMons[gContestPlayerMonIndex].moves[sContest.playerMoveChoice]); - gTasks[taskId].func = sub_80ABEA0; + gTasks[taskId].func = Task_HandleMoveSelectInput; } void debug_sub_80B9EBC(u8); // Handle move selection input -void sub_80ABEA0(u8 taskId) +void Task_HandleMoveSelectInput(u8 taskId) { u8 numMoves = 0; s32 i; @@ -547,7 +548,7 @@ void sub_80ABEA0(u8 taskId) { DestroyMenuCursor(); PlaySE(SE_SELECT); - gTasks[taskId].func = sub_80AC0C8; + gTasks[taskId].func = Task_SelectedMove; } else { @@ -556,7 +557,7 @@ void sub_80ABEA0(u8 taskId) case B_BUTTON: sub_814A904(); PlaySE(SE_SELECT); - sub_80AFFE0(FALSE); + SetBottomSliderHeartsInvisibility(FALSE); Text_FillWindowRectDefPalette( &gWindowTemplate_Contest_MoveDescription, 0, @@ -574,31 +575,31 @@ void sub_80ABEA0(u8 taskId) Text_InitWindowAndPrintText(&gMenuWindow, gStringVar4, 776, 1, 15); gBattle_BG0_Y = 0; gBattle_BG2_Y = 0; - gTasks[taskId].func = sub_80ABC70; + gTasks[taskId].func = Task_TryShowMoveSelectScreen; break; case DPAD_LEFT: case DPAD_RIGHT: break; case DPAD_UP: - nullsub_17(sContest.playerMoveChoice); + EraseMoveSelectArrow(sContest.playerMoveChoice); if (sContest.playerMoveChoice == 0) sContest.playerMoveChoice = numMoves - 1; else sContest.playerMoveChoice--; - sub_80AC0AC(sContest.playerMoveChoice); - sub_80AED58(); + DrawMoveSelectArrow(sContest.playerMoveChoice); + Contest_ClearMoveDescriptionBox(); PrintContestMoveDescription(gContestMons[gContestPlayerMonIndex].moves[sContest.playerMoveChoice]); if (numMoves > 1) PlaySE(SE_SELECT); break; case DPAD_DOWN: - nullsub_17(sContest.playerMoveChoice); + EraseMoveSelectArrow(sContest.playerMoveChoice); if (sContest.playerMoveChoice == numMoves - 1) sContest.playerMoveChoice = 0; else sContest.playerMoveChoice++; - sub_80AC0AC(sContest.playerMoveChoice); - sub_80AED58(); + DrawMoveSelectArrow(sContest.playerMoveChoice); + Contest_ClearMoveDescriptionBox(); PrintContestMoveDescription(gContestMons[gContestPlayerMonIndex].moves[sContest.playerMoveChoice]); if (numMoves > 1) PlaySE(SE_SELECT); @@ -790,16 +791,16 @@ void debug_sub_80BA054(u8 taskId) #endif -void sub_80AC0AC(s8 a) +void DrawMoveSelectArrow(s8 a) { MenuCursor_SetPos814A880(4, 88 + a * 16); } -void nullsub_17(s8 a) +void EraseMoveSelectArrow(s8 a) { } -void sub_80AC0C8(u8 taskId) +void Task_SelectedMove(u8 taskId) { if (gIsLinkContest & 1) { @@ -808,38 +809,38 @@ void sub_80AC0C8(u8 taskId) sContestantStatus[gContestPlayerMonIndex].currMove = var; taskId2 = CreateTask(sub_80C8A38, 0); - SetTaskFuncWithFollowupFunc(taskId2, sub_80C8A38, sub_80AC15C); - gTasks[taskId].func = nullsub_89; + SetTaskFuncWithFollowupFunc(taskId2, sub_80C8A38, Task_EndCommunicateMoveSelections); + gTasks[taskId].func = TaskDummy1; ContestPrintLinkStandby(); - sub_80AFFE0(FALSE); + SetBottomSliderHeartsInvisibility(FALSE); } else { GetAllChosenMoves(); - gTasks[taskId].func = sub_80AC188; + gTasks[taskId].func = Task_HideMoveSelectScreen; } } -void sub_80AC15C(u8 taskId) +void Task_EndCommunicateMoveSelections(u8 taskId) { DestroyTask(taskId); - gTasks[sContest.mainTaskId].func = sub_80AC188; + gTasks[sContest.mainTaskId].func = Task_HideMoveSelectScreen; } -void sub_80AC188(u8 taskId) +void Task_HideMoveSelectScreen(u8 taskId) { ContestClearGeneralTextWindow(); gBattle_BG0_Y = 0; gBattle_BG2_Y = 0; - sub_80AFFE0(FALSE); + SetBottomSliderHeartsInvisibility(FALSE); DmaCopy32Defvars(3, gPlttBufferFaded, eContestTempSave.cachedPlttBufferFaded, 0x400); LoadPalette(eContestTempSave.cachedPlttBufferUnfaded, 0, 0x400); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0; - gTasks[taskId].func = sub_80AC204; + gTasks[taskId].func = Task_HideApplauseMeterForAppealStart; } -void sub_80AC204(u8 taskId) +void Task_HideApplauseMeterForAppealStart(u8 taskId) { if (++gTasks[taskId].data[0] > 2) { @@ -848,33 +849,33 @@ void sub_80AC204(u8 taskId) { SlideApplauseMeterOut(); AnimateSliderHearts(1); - gTasks[taskId].func = sub_80AC250; + gTasks[taskId].func = Task_WaitHideApplauseMeterForAppealStart; } } } -void sub_80AC250(u8 taskId) +void Task_WaitHideApplauseMeterForAppealStart(u8 taskId) { if (!sContest.applauseMeterIsMoving && !sContest.sliderHeartsAnimating) - gTasks[taskId].func = sub_80AC284; + gTasks[taskId].func = Task_AppealSetup; } -void sub_80AC284(u8 taskId) +void Task_AppealSetup(u8 taskId) { if (++gTasks[taskId].data[0] > 19) { sContest.turnNumber = 0; sContest.unusedRng = gRngValue; gTasks[taskId].data[0] = 0; - gTasks[taskId].func = sub_80AC2CC; + gTasks[taskId].func = Task_DoAppeals; } } -void sub_80AC2CC(u8 taskId) +void Task_DoAppeals(u8 taskId) { u8 spriteId; s32 i; - u8 r7 = sContest.currentContestant; + u8 contestant = sContest.currentContestant; s8 r4; switch (gTasks[taskId].data[0]) @@ -884,7 +885,7 @@ void sub_80AC2CC(u8 taskId) for (i = 0; sContest.turnNumber != eContestAppealResults.turnOrder[i]; i++) ; sContest.currentContestant = i; - r7 = sContest.currentContestant; + contestant = sContest.currentContestant; if (gIsLinkContest & 1) { u8 taskId2; @@ -909,15 +910,15 @@ void sub_80AC2CC(u8 taskId) gTasks[taskId].data[0] = 2; return; case 2: - if (sContestantStatus[r7].numTurnsSkipped != 0 - || sContestantStatus[r7].noMoreTurns) + if (sContestantStatus[contestant].numTurnsSkipped != 0 + || sContestantStatus[contestant].noMoreTurns) { gTasks[taskId].data[0] = 31; } else { ContestClearGeneralTextWindow(); - Unused_EndBlinkingState(r7, 0); + Unused_EndBlinkingState(contestant, 0); gTasks[taskId].data[10] = 0; gTasks[taskId].data[0] = 3; } @@ -932,7 +933,7 @@ void sub_80AC2CC(u8 taskId) gContestMons[sContest.currentContestant].otId, gContestMons[sContest.currentContestant].personality); gSprites[spriteId].pos2.x = 120; - gSprites[spriteId].callback = sub_80AD8FC; + gSprites[spriteId].callback = SpriteCB_MonSlideIn; gTasks[taskId].data[2] = spriteId; gBattlerSpriteIds[gBattlerAttacker] = spriteId; BlinkContestantBox(CreateContestantBoxBlinkSprites(sContest.currentContestant), FALSE); @@ -942,30 +943,31 @@ void sub_80AC2CC(u8 taskId) spriteId = gTasks[taskId].data[2]; if (gSprites[spriteId].callback == SpriteCallbackDummy) { - if (!eContestGfxState[r7].boxBlinking) + if (!eContestGfxState[contestant].boxBlinking) gTasks[taskId].data[0] = 5; } return; case 5: - if (sContestantStatus[r7].nervous) + if (sContestantStatus[contestant].nervous) { gTasks[taskId].data[0] = 33; } else { ContestClearGeneralTextWindow(); - StringCopy(gStringVar1, gContestMons[r7].nickname); - if (sContestantStatus[r7].currMove < NUM_MOVES) - StringCopy(gStringVar2, gMoveNames[sContestantStatus[r7].currMove]); + StringCopy(gStringVar1, gContestMons[contestant].nickname); + if (sContestantStatus[contestant].currMove < NUM_MOVES) + StringCopy(gStringVar2, gMoveNames[sContestantStatus[contestant].currMove]); else - StringCopy(gStringVar2, gUnknown_083CC330[sContestantStatus[r7].moveCategory]); - StringExpandPlaceholders(gStringVar4, gUnknown_083CAFD7); - Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + StringCopy(gStringVar2, + sInvalidContestMoveNames[sContestantStatus[contestant].moveCategory]); + StringExpandPlaceholders(gStringVar4, gText_MonAppealedWithMove); + Contest_StartTextPrinter(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[0] = 6; } return; case 6: - if (Text_UpdateWindowInContest(&gMenuWindow) != 0) + if (Contest_RunTextPrinter(&gMenuWindow) != 0) { sContest.moveAnimTurnCount = 0; gTasks[taskId].data[0] = 7; @@ -986,7 +988,7 @@ void sub_80AC2CC(u8 taskId) gAnimScriptCallback(); if (!gAnimScriptActive) { - ClearMoveAnimData(r7); + ClearMoveAnimData(contestant); if (sContest.moveAnimTurnCount != 0) { gTasks[taskId].data[10] = 0; @@ -994,8 +996,8 @@ void sub_80AC2CC(u8 taskId) } else { - if (!sContestantStatus[r7].hasJudgesAttention) - sub_80B03A8(r7); + if (!sContestantStatus[contestant].hasJudgesAttention) + sub_80B03A8(contestant); DrawUnnervedSymbols(); gTasks[taskId].data[0] = 23; } @@ -1010,25 +1012,26 @@ void sub_80AC2CC(u8 taskId) return; case 23: gTasks[taskId].data[1] = 0; - if (sContestantStatus[r7].effectStringId != CONTEST_STRING_NONE) + if (sContestantStatus[contestant].effectStringId != CONTEST_STRING_NONE) { - PrintAppealMoveResultText(r7, sContestantStatus[r7].effectStringId); - sContestantStatus[r7].effectStringId = CONTEST_STRING_NONE; + PrintAppealMoveResultText(contestant, sContestantStatus[contestant].effectStringId); + sContestantStatus[contestant].effectStringId = CONTEST_STRING_NONE; gTasks[taskId].data[0] = 24; } else { - if (sContestantStatus[r7].effectStringId2 != CONTEST_STRING_NONE) + if (sContestantStatus[contestant].effectStringId2 != CONTEST_STRING_NONE) { for (i = 0; i < 4; i++) { - if (i != r7 && sContestantStatus[i].effectStringId != CONTEST_STRING_NONE) + if (i != contestant && sContestantStatus[i].effectStringId != CONTEST_STRING_NONE) break; } if (i == 4) { - PrintAppealMoveResultText(r7, sContestantStatus[r7].effectStringId2); - sContestantStatus[r7].effectStringId2 = CONTEST_STRING_NONE; + PrintAppealMoveResultText( + contestant, sContestantStatus[contestant].effectStringId2); + sContestantStatus[contestant].effectStringId2 = CONTEST_STRING_NONE; gTasks[taskId].data[0] = 24; } else @@ -1043,19 +1046,19 @@ void sub_80AC2CC(u8 taskId) } return; case 24: - if (Text_UpdateWindowInContest(&gMenuWindow) != 0) + if (Contest_RunTextPrinter(&gMenuWindow) != 0) gTasks[taskId].data[0] = 23; return; case 48: - if (sContestantStatus[r7].turnOrderModAction == 1) + if (sContestantStatus[contestant].turnOrderModAction == 1) { DoJudgeSpeechBubble(5); } - else if (sContestantStatus[r7].turnOrderModAction == 2) + else if (sContestantStatus[contestant].turnOrderModAction == 2) { DoJudgeSpeechBubble(6); } - else if (sContestantStatus[r7].turnOrderModAction == 3) + else if (sContestantStatus[contestant].turnOrderModAction == 3) { DoJudgeSpeechBubble(7); } @@ -1075,7 +1078,7 @@ void sub_80AC2CC(u8 taskId) gTasks[taskId].data[0] = 12; return; case 12: - UpdateAppealHearts(0, sContestantStatus[r7].appeal, r7); + UpdateAppealHearts(0, sContestantStatus[contestant].appeal, contestant); gTasks[taskId].data[0] = 13; return; case 13: @@ -1083,7 +1086,7 @@ void sub_80AC2CC(u8 taskId) gTasks[taskId].data[0] = 35; return; case 35: - if (sContestantStatus[r7].conditionMod == 1) + if (sContestantStatus[contestant].conditionMod == 1) DoJudgeSpeechBubble(8); gTasks[taskId].data[0] = 36; return; @@ -1092,7 +1095,7 @@ void sub_80AC2CC(u8 taskId) gTasks[taskId].data[0] = 37; return; case 37: - if (UpdateConditionStars(r7, 1)) + if (UpdateConditionStars(contestant, 1)) { gTasks[taskId].data[10] = 0; gTasks[taskId].data[0] = 38; @@ -1110,7 +1113,7 @@ void sub_80AC2CC(u8 taskId) } return; case 50: - if (DrawStatusSymbol(r7)) + if (DrawStatusSymbol(contestant)) PlaySE(SE_CONTEST_ICON_CHANGE); gTasks[taskId].data[0] = 25; return; @@ -1128,7 +1131,7 @@ void sub_80AC2CC(u8 taskId) r4 = 0; for (r2 = 0; r2 < 4; r2++) { - if (r2 != r7 && gContestantTurnOrder[r2] == i + if (r2 != contestant && gContestantTurnOrder[r2] == i && sContestantStatus[r2].effectStringId != CONTEST_STRING_NONE) { r4 = 1; @@ -1155,7 +1158,7 @@ void sub_80AC2CC(u8 taskId) } return; case 27: - if (Text_UpdateWindowInContest(&gMenuWindow) != 0) + if (Contest_RunTextPrinter(&gMenuWindow) != 0) gTasks[taskId].data[0] = 28; return; case 28: @@ -1213,37 +1216,38 @@ void sub_80AC2CC(u8 taskId) if (gTasks[taskId].data[10]++ > 9) { gTasks[taskId].data[10] = 0; - if (sContestantStatus[r7].numTurnsSkipped != 0 - || sContestantStatus[r7].turnSkipped) + if (sContestantStatus[contestant].numTurnsSkipped != 0 + || sContestantStatus[contestant].turnSkipped) { ContestClearGeneralTextWindow(); - StringCopy(gStringVar1, gContestMons[r7].nickname); + StringCopy(gStringVar1, gContestMons[contestant].nickname); StringExpandPlaceholders(gStringVar4, ContestString_CantAppealNextTurn); - Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Contest_StartTextPrinter(&gMenuWindow, gStringVar4, 776, 1, 15); } gTasks[taskId].data[0] = 52; } return; case 52: - if (Text_UpdateWindowInContest(&gMenuWindow) != 0) + if (Contest_RunTextPrinter(&gMenuWindow) != 0) { - if (!sContestantStatus[r7].usedComboMove) + if (!sContestantStatus[contestant].usedComboMove) gTasks[taskId].data[0] = 17; else gTasks[taskId].data[0] = 14; } return; case 14: - r4 = sContestantStatus[r7].completedCombo; - if (sContestantStatus[r7].completedCombo != 0) + r4 = sContestantStatus[contestant].completedCombo; + if (sContestantStatus[contestant].completedCombo != 0) { ContestClearGeneralTextWindow(); if (r4 == 1) - Text_InitWindow8002EB0(&gMenuWindow, ContestString_WentOverWell, 776, 1, 15); + Contest_StartTextPrinter(&gMenuWindow, ContestString_WentOverWell, 776, 1, 15); else if (r4 == 2) - Text_InitWindow8002EB0(&gMenuWindow, ContestString_WentOverVeryWell, 776, 1, 15); + Contest_StartTextPrinter(&gMenuWindow, ContestString_WentOverVeryWell, 776, 1, 15); else - Text_InitWindow8002EB0(&gMenuWindow, ContestString_AppealComboExcellently, 776, 1, 15); + Contest_StartTextPrinter( + &gMenuWindow, ContestString_AppealComboExcellently, 776, 1, 15); DoJudgeSpeechBubble(3); gTasks[taskId].data[10] = 0; gTasks[taskId].data[0] = 45; @@ -1251,9 +1255,9 @@ void sub_80AC2CC(u8 taskId) else { ContestClearGeneralTextWindow(); - StringCopy(gStringVar1, gContestMons[r7].nickname); + StringCopy(gStringVar1, gContestMons[contestant].nickname); StringExpandPlaceholders(gStringVar4, ContestString_JudgeExpectantly2); - Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Contest_StartTextPrinter(&gMenuWindow, gStringVar4, 776, 1, 15); DoJudgeSpeechBubble(2); gTasks[taskId].data[10] = 0; gTasks[taskId].data[0] = 45; @@ -1267,34 +1271,35 @@ void sub_80AC2CC(u8 taskId) } return; case 15: - if (Text_UpdateWindowInContest(&gMenuWindow) != 0) + if (Contest_RunTextPrinter(&gMenuWindow) != 0) { if (++gTasks[taskId].data[10] > 50) { - if (!sContestantStatus[r7].hasJudgesAttention) + if (!sContestantStatus[contestant].hasJudgesAttention) { UpdateAppealHearts( - sContestantStatus[r7].appeal, sContestantStatus[r7].comboAppealBonus, r7); - sContestantStatus[r7].appeal += sContestantStatus[r7].comboAppealBonus; + sContestantStatus[contestant].appeal, sContestantStatus[contestant].comboAppealBonus, + contestant); + sContestantStatus[contestant].appeal += sContestantStatus[contestant].comboAppealBonus; } gTasks[taskId].data[0] = 16; } } return; case 16: - if (!eContestGfxState[r7].updatingAppealHearts) + if (!eContestGfxState[contestant].updatingAppealHearts) { gTasks[taskId].data[10] = 0; gTasks[taskId].data[0] = 17; } return; case 17: - if (sContestantStatus[r7].repeatedMove) + if (sContestantStatus[contestant].repeatedMove) { ContestClearGeneralTextWindow(); - StringCopy(gStringVar1, gContestMons[r7].nickname); + StringCopy(gStringVar1, gContestMons[contestant].nickname); StringExpandPlaceholders(gStringVar4, ContestString_DissapointedRepeat); - Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Contest_StartTextPrinter(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[10] = 0; DoJudgeSpeechBubble(0); gTasks[taskId].data[0] = 46; @@ -1309,16 +1314,17 @@ void sub_80AC2CC(u8 taskId) gTasks[taskId].data[0] = 19; return; case 19: - if (Text_UpdateWindowInContest(&gMenuWindow) != 0) + if (Contest_RunTextPrinter(&gMenuWindow) != 0) { - UpdateAppealHearts(sContestantStatus[r7].appeal, -sContestantStatus[r7].repeatJam, r7); - sContestantStatus[r7].appeal -= sContestantStatus[r7].repeatJam; + UpdateAppealHearts(sContestantStatus[contestant].appeal, -sContestantStatus[contestant].repeatJam, + contestant); + sContestantStatus[contestant].appeal -= sContestantStatus[contestant].repeatJam; gTasks[taskId].data[0] = 18; } return; case 18: ContestDebugDoPrint(); - if (!eContestGfxState[r7].updatingAppealHearts) + if (!eContestGfxState[contestant].updatingAppealHearts) { gTasks[taskId].data[10] = 0; ContestClearGeneralTextWindow(); @@ -1326,29 +1332,30 @@ void sub_80AC2CC(u8 taskId) } return; case 41: - if (eContestExcitement.excitementFrozen && r7 != eContestExcitement.excitementFreezer) + if (eContestExcitement.excitementFrozen && + contestant != eContestExcitement.excitementFreezer) { gTasks[taskId].data[0] = 57; } else { r4 = eContestExcitement.moveExcitement; - if (sContestantStatus[r7].overrideCategoryExcitementMod) + if (sContestantStatus[contestant].overrideCategoryExcitementMod) { r4 = 1; - StringCopy(gStringVar3, gMoveNames[sContestantStatus[r7].currMove]); + StringCopy(gStringVar3, gMoveNames[sContestantStatus[contestant].currMove]); } else { - StringCopy(gStringVar3, gContestCategoryStrings[gContestMoves[sContestantStatus[r7].currMove].contestCategory]); + StringCopy(gStringVar3, gContestCategoryStrings[gContestMoves[sContestantStatus[contestant].currMove].contestCategory]); } if (r4 > 0) { - if (sContestantStatus[r7].repeatedMove) + if (sContestantStatus[contestant].repeatedMove) r4 = 0; } ContestClearGeneralTextWindow(); - StringCopy(gStringVar1, gContestMons[r7].nickname); + StringCopy(gStringVar1, gContestMons[contestant].nickname); sContest.applauseLevel += r4; if (sContest.applauseLevel < 0) sContest.applauseLevel = 0; @@ -1364,7 +1371,7 @@ void sub_80AC2CC(u8 taskId) StringExpandPlaceholders(gStringVar4, ContestString_WentOverGreat); else StringExpandPlaceholders(gStringVar4, ContestString_GotCrowdGoing); - Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Contest_StartTextPrinter(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[10] = 0; gTasks[taskId].data[11] = 0; if (r4 < 0) @@ -1383,7 +1390,7 @@ void sub_80AC2CC(u8 taskId) gTasks[taskId].data[10]++; break; case 1: - if (!sContest.waitForAudienceBlend && Text_UpdateWindowInContest(&gMenuWindow) != 0) + if (!sContest.waitForAudienceBlend && Contest_RunTextPrinter(&gMenuWindow) != 0) { ShowAndUpdateApplauseMeter(-1); gTasks[taskId].data[10]++; @@ -1414,7 +1421,7 @@ void sub_80AC2CC(u8 taskId) switch (gTasks[taskId].data[10]) { case 0: - if (Text_UpdateWindowInContest(&gMenuWindow) != 0) + if (Contest_RunTextPrinter(&gMenuWindow) != 0) { BlendAudienceBackground(1, 1); gTasks[taskId].data[10]++; @@ -1436,14 +1443,15 @@ void sub_80AC2CC(u8 taskId) { gTasks[taskId].data[11] = 0; UpdateAppealHearts( - sContestantStatus[r7].appeal, eContestExcitement.excitementAppealBonus, r7); - sContestantStatus[r7].appeal += eContestExcitement.excitementAppealBonus; + sContestantStatus[contestant].appeal, eContestExcitement.excitementAppealBonus, + contestant); + sContestantStatus[contestant].appeal += eContestExcitement.excitementAppealBonus; gTasks[taskId].data[10]++; } } break; case 3: - if (!eContestGfxState[r7].updatingAppealHearts) + if (!eContestGfxState[contestant].updatingAppealHearts) { if (!sContest.animatingAudience) { @@ -1463,7 +1471,7 @@ void sub_80AC2CC(u8 taskId) } return; case 43: - if (!eContestGfxState[r7].updatingAppealHearts) + if (!eContestGfxState[contestant].updatingAppealHearts) { ContestClearGeneralTextWindow(); gTasks[taskId].data[0] = 55; @@ -1472,40 +1480,40 @@ void sub_80AC2CC(u8 taskId) case 57: ContestClearGeneralTextWindow(); StringCopy(gStringVar3, gContestMons[eContestExcitement.excitementFreezer].nickname); - StringCopy(gStringVar1, gContestMons[r7].nickname); - StringCopy(gStringVar2, gMoveNames[sContestantStatus[r7].currMove]); + StringCopy(gStringVar1, gContestMons[contestant].nickname); + StringCopy(gStringVar2, gMoveNames[sContestantStatus[contestant].currMove]); StringExpandPlaceholders(gStringVar4, ContestString_CrowdWatches); - Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Contest_StartTextPrinter(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[0] = 58; return; case 58: - if (Text_UpdateWindowInContest(&gMenuWindow) != 0) + if (Contest_RunTextPrinter(&gMenuWindow) != 0) { ContestClearGeneralTextWindow(); StringExpandPlaceholders(gStringVar4, ContestString_Ignored2); - Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Contest_StartTextPrinter(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[0] = 59; } return; case 59: - if (Text_UpdateWindowInContest(&gMenuWindow) != 0) + if (Contest_RunTextPrinter(&gMenuWindow) != 0) { ContestClearGeneralTextWindow(); gTasks[taskId].data[0] = 55; } return; case 33: - if (sContestantStatus[r7].hasJudgesAttention) - sContestantStatus[r7].hasJudgesAttention = 0; - StartStopFlashJudgeAttentionEye(r7); - StringCopy(gStringVar1, gContestMons[r7].nickname); - StringCopy(gStringVar2, gMoveNames[sContestantStatus[r7].currMove]); - StringExpandPlaceholders(gStringVar4, gUnknown_083CBF60); - Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + if (sContestantStatus[contestant].hasJudgesAttention) + sContestantStatus[contestant].hasJudgesAttention = 0; + StartStopFlashJudgeAttentionEye(contestant); + StringCopy(gStringVar1, gContestMons[contestant].nickname); + StringCopy(gStringVar2, gMoveNames[sContestantStatus[contestant].currMove]); + StringExpandPlaceholders(gStringVar4, gText_MonWasTooNervousToMove); + Contest_StartTextPrinter(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[0] = 34; return; case 34: - if (Text_UpdateWindowInContest(&gMenuWindow) != 0) + if (Contest_RunTextPrinter(&gMenuWindow) != 0) gTasks[taskId].data[0] = 55; return; case 55: @@ -1525,7 +1533,7 @@ void sub_80AC2CC(u8 taskId) return; case 10: spriteId = gTasks[taskId].data[2]; - gSprites[spriteId].callback = sub_80AD92C; + gSprites[spriteId].callback = SpriteCB_MonSlideOut; gTasks[taskId].data[0] = 11; return; case 11: @@ -1545,13 +1553,13 @@ void sub_80AC2CC(u8 taskId) return; case 31: ContestClearGeneralTextWindow(); - StringCopy(gStringVar1, gContestMons[r7].nickname); - StringExpandPlaceholders(gStringVar4, gUnknown_083CB00D); - Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + StringCopy(gStringVar1, gContestMons[contestant].nickname); + StringExpandPlaceholders(gStringVar4, gText_MonWasWatchingOthers); + Contest_StartTextPrinter(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[0] = 32; return; case 32: - if (Text_UpdateWindowInContest(&gMenuWindow) != 0) + if (Contest_RunTextPrinter(&gMenuWindow) != 0) gTasks[taskId].data[0] = 21; return; case 21: @@ -1567,7 +1575,7 @@ void sub_80AC2CC(u8 taskId) gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0; gTasks[taskId].data[2] = 0; - gTasks[taskId].func = sub_80AD960; + gTasks[taskId].func = Task_FinishRoundOfAppeals; } else { @@ -1584,7 +1592,7 @@ void Task_EndWaitForLink(u8 taskId) DestroyTask(taskId); } -void sub_80AD8FC(struct Sprite *sprite) +void SpriteCB_MonSlideIn(struct Sprite *sprite) { if (sprite->pos2.x != 0) { @@ -1600,7 +1608,7 @@ void sub_80AD8FC(struct Sprite *sprite) } } -void sub_80AD92C(struct Sprite *sprite) +void SpriteCB_MonSlideOut(struct Sprite *sprite) { sprite->pos2.x -= 6; if (sprite->pos1.x + sprite->pos2.x < -32) @@ -1610,7 +1618,7 @@ void sub_80AD92C(struct Sprite *sprite) } } -void sub_80AD960(u8 taskId) +void Task_FinishRoundOfAppeals(u8 taskId) { switch (gTasks[taskId].data[0]) { @@ -1644,20 +1652,20 @@ void sub_80AD960(u8 taskId) break; case 2: gTasks[taskId].data[0] = 0; - gTasks[taskId].func = sub_80ADA1C; + gTasks[taskId].func = Task_ReadyUpdateHeartSliders; break; } } -void sub_80ADA1C(u8 taskId) +void Task_ReadyUpdateHeartSliders(u8 taskId) { ShowHideNextTurnGfx(FALSE); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0; - gTasks[taskId].func = sub_80ADA4C; + gTasks[taskId].func = Task_UpdateHeartSliders; } -void sub_80ADA4C(u8 taskId) +void Task_UpdateHeartSliders(u8 taskId) { switch (gTasks[taskId].data[0]) { @@ -1680,17 +1688,17 @@ void sub_80ADA4C(u8 taskId) } break; case 2: - sub_80AFF10(); + UpdateHeartSliders(); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0; - gTasks[taskId].func = sub_80ADAD8; + gTasks[taskId].func = Task_WaitForHeartSliders; break; } } -void sub_80ADAD8(u8 taskId) +void Task_WaitForHeartSliders(u8 taskId) { - if (sub_80AFF28()) + if (SlidersDoneUpdating()) gTasks[taskId].func = sub_80ADB04; } @@ -1699,60 +1707,60 @@ void sub_80ADB04(u8 taskId) DmaCopy32Defvars(3, eContestTempSave.cachedPlttBufferUnfaded, gPlttBufferUnfaded, 0x400); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 2; - gTasks[taskId].func = sub_80ADB48; + gTasks[taskId].func = Task_WaitBeforePrintRoundResult; } -void sub_80ADB48(u8 taskId) +void Task_WaitBeforePrintRoundResult(u8 taskId) { if (++gTasks[taskId].data[0] > 2) { gTasks[taskId].data[0] = 0; if (--gTasks[taskId].data[1] == 0) - gTasks[taskId].func = sub_80ADB88; + gTasks[taskId].func = Task_PrintRoundResultText; } } -void sub_80ADB88(u8 taskId) +void Task_PrintRoundResultText(u8 taskId) { u8 r4 = sContestantStatus[gContestPlayerMonIndex].attentionLevel; ContestClearGeneralTextWindow(); StringCopy(gStringVar1, gContestMons[gContestPlayerMonIndex].nickname); StringExpandPlaceholders(gStringVar4, gContestStandOutStrings[r4]); - Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); - gTasks[taskId].func = sub_80ADC10; + Contest_StartTextPrinter(&gMenuWindow, gStringVar4, 776, 1, 15); + gTasks[taskId].func = Task_WaitPrintRoundResultText; } -void sub_80ADC10(u8 taskId) +void Task_WaitPrintRoundResultText(u8 taskId) { - if (Text_UpdateWindowInContest(&gMenuWindow) == 1) + if (Contest_RunTextPrinter(&gMenuWindow) == 1) { gTasks[taskId].data[0] = 0; - gTasks[taskId].func = sub_80ADC4C; + gTasks[taskId].func = Task_ReUpdateHeartSliders; ContestDebugDoPrint(); } } -void sub_80ADC4C(u8 taskId) +void Task_ReUpdateHeartSliders(u8 taskId) { if (gTasks[taskId].data[0]++ > 29) { gTasks[taskId].data[0] = 0; - sub_80AFF10(); - gTasks[taskId].func = sub_80ADC84; + UpdateHeartSliders(); + gTasks[taskId].func = Task_WaitForHeartSlidersAgain; } } -void sub_80ADC84(u8 taskId) +void Task_WaitForHeartSlidersAgain(u8 taskId) { - if (sub_80AFF28()) + if (SlidersDoneUpdating()) { gTasks[taskId].data[0] = 0; - gTasks[taskId].func = sub_80ADCB4; + gTasks[taskId].func = Task_DropCurtainAtRoundEnd; } } -void sub_80ADCB4(u8 taskId) +void Task_DropCurtainAtRoundEnd(u8 taskId) { SetBgForCurtainDrop(); gTasks[taskId].func = Task_StartDropCurtainAtRoundEnd; @@ -1761,31 +1769,31 @@ void sub_80ADCB4(u8 taskId) void Task_UpdateContestantBoxOrder(u8 taskId) { UpdateContestantBoxOrder(); - gTasks[taskId].func = sub_80ADD04; + gTasks[taskId].func = Task_TryStartNextRoundOfAppeals; } -void sub_80ADD04(u8 taskId) +void Task_TryStartNextRoundOfAppeals(u8 taskId) { REG_BG0CNT_BITFIELD.priority = 0; REG_BG2CNT_BITFIELD.priority = 0; if (++sContest.appealNumber == 5) { - gTasks[taskId].func = sub_80ADDA4; + gTasks[taskId].func = Task_EndAppeals; } else { SlideApplauseMeterIn(); - gTasks[taskId].func = sub_80ADD74; + gTasks[taskId].func = Task_StartNewRoundOfAppeals; } } -void sub_80ADD74(u8 taskId) +void Task_StartNewRoundOfAppeals(u8 taskId) { if (!sContest.applauseMeterIsMoving) - gTasks[taskId].func = sub_80ABB70; + gTasks[taskId].func = Task_DisplayAppealNumberText; } -void sub_80ADDA4(u8 taskId) +void Task_EndAppeals(u8 taskId) { s32 i; @@ -1797,81 +1805,82 @@ void sub_80ADDA4(u8 taskId) ContestClearGeneralTextWindow(); sub_80BE23C(sContestantStatus[gContestPlayerMonIndex].prevMove); gContestRngValue = gRngValue; - StringExpandPlaceholders(gStringVar4, gUnknown_083CB02C); - Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + StringExpandPlaceholders(gStringVar4, gText_AllOutOfAppealTime); + Contest_StartTextPrinter(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[2] = 0; - gTasks[taskId].func = sub_80ADE54; + gTasks[taskId].func = Task_WaitForOutOfTimeMsg; } -void sub_80ADE54(u8 taskId) +void Task_WaitForOutOfTimeMsg(u8 taskId) { - if (Text_UpdateWindowInContest(&gMenuWindow) == 1) + if (Contest_RunTextPrinter(&gMenuWindow) == 1) { SetBgForCurtainDrop(); gBattle_BG1_X = 0; gBattle_BG1_Y = 160; PlaySE12WithPanning(SE_CONTEST_CURTAIN_FALL, 0); gTasks[taskId].data[0] = 0; - gTasks[taskId].func = sub_80ADEAC; + gTasks[taskId].func = Task_DropCurtainAtAppealsEnd; } } -void sub_80ADEAC(u8 taskId) +void Task_DropCurtainAtAppealsEnd(u8 taskId) { if ((s16)(gBattle_BG1_Y -= 7) < 0) gBattle_BG1_Y = 0; if (gBattle_BG1_Y == 0) // Why cast? { - gTasks[taskId].func = sub_80ADEEC; + gTasks[taskId].func = Task_TryCommunicateFinalStandings; gTasks[taskId].data[0] = 0; } } -void sub_80ADEEC(u8 taskId) +void Task_TryCommunicateFinalStandings(u8 taskId) { if (gTasks[taskId].data[0]++ >= 50) { gTasks[taskId].data[0] = 0; if (gIsLinkContest & 1) { - gTasks[taskId].func = sub_80ADF4C; + gTasks[taskId].func = Task_CommunicateFinalStandings; } else { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); - gTasks[taskId].func = sub_80ADFD8; + gTasks[taskId].func = Task_ContestReturnToField; } } } -void sub_80ADF4C(u8 taskId) +void Task_CommunicateFinalStandings(u8 taskId) { - u8 taskId2 = CreateTask(sub_80C8AD0, 0); + u8 taskId2 = CreateTask(Task_LinkContest_CommunicateFinalStandings, 0); - SetTaskFuncWithFollowupFunc(taskId2, sub_80C8AD0, sub_80ADF98); - gTasks[taskId].func = nullsub_89; + SetTaskFuncWithFollowupFunc( + taskId2, Task_LinkContest_CommunicateFinalStandings, Task_EndCommunicateFinalStandings); + gTasks[taskId].func = TaskDummy1; ContestPrintLinkStandby(); - sub_80AFFE0(FALSE); + SetBottomSliderHeartsInvisibility(FALSE); } -void sub_80ADF98(u8 taskId) +void Task_EndCommunicateFinalStandings(u8 taskId) { DestroyTask(taskId); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); - gTasks[sContest.mainTaskId].func = sub_80ADFD8; + gTasks[sContest.mainTaskId].func = Task_ContestReturnToField; } -void sub_80ADFD8(u8 taskId) +void Task_ContestReturnToField(u8 taskId) { if (!gPaletteFade.active) { DestroyTask(taskId); - gFieldCallback = sub_80AE010; + gFieldCallback = FieldCB_ContestReturnToField; SetMainCallback2(CB2_ReturnToField); } } -void sub_80AE010(void) +void FieldCB_ContestReturnToField(void) { // Why disable and re-enable again? ScriptContext2_Disable(); diff --git a/src/contest_2.c b/src/contest_2.c index 8c352a642..3e617773b 100644 --- a/src/contest_2.c +++ b/src/contest_2.c @@ -604,7 +604,7 @@ void PrintContestMoveDescription(u16 a) Text_InitWindowAndPrintText(&gWindowTemplate_Contest_MoveDescription, gText_Slash, 866, 16, 31); } -void sub_80AED58(void) +void Contest_ClearMoveDescriptionBox(void) { Text_FillWindowRectDefPalette(&gWindowTemplate_Contest_MoveDescription, 0, 11, 35, 28, 40); } @@ -1423,7 +1423,7 @@ void sub_80AFE78(u8 a) gSprites[spriteId].callback = sub_80AFF60; } -void sub_80AFF10(void) +void UpdateHeartSliders(void) { s32 i; @@ -1431,7 +1431,7 @@ void sub_80AFF10(void) sub_80AFE78(i); } -bool8 sub_80AFF28(void) +bool8 SlidersDoneUpdating(void) { s32 i; @@ -1467,7 +1467,7 @@ void UpdateSliderHeartSpriteYPositions(void) gSprites[eContestGfxState[i].sliderHeartSpriteId].pos1.y = sSliderHeartYPositions[gContestantTurnOrder[i]]; } -void sub_80AFFE0(bool8 a) +void SetBottomSliderHeartsInvisibility(bool8 a) { s32 i; @@ -1483,7 +1483,7 @@ void sub_80AFFE0(bool8 a) } } -void sub_80B0034(void) +void CreateNextTurnSprites(void) { s32 i; @@ -1601,7 +1601,7 @@ void sub_80B02F4(struct Sprite *sprite) } } -void sub_80B0324(void) +void CreateJudgeAttentionEyeTask(void) { u8 i; u8 taskId = CreateTask(sub_80B0458, 30); @@ -1666,19 +1666,19 @@ void sub_80B0458(u8 taskId) } } -void sub_80B0518(void) +void CreateUnusedBlendTask(void) { u8 i; - sContest.blendTaskId = CreateTask(sub_80B05FC, 30); + sContest.blendTaskId = CreateTask(Task_UnusedBlend, 30); for (i = 0; i < 4; i++) - sub_80B0548(i); + InitUnusedBlendTaskData(i); } -void sub_80B0548(u8 a) +void InitUnusedBlendTaskData(u8 contestant) { - gTasks[sContest.blendTaskId].data[a * 4 + 0] = 0xFF; - gTasks[sContest.blendTaskId].data[a * 4 + 1] = 0; + gTasks[sContest.blendTaskId].data[contestant * 4 + 0] = 0xFF; + gTasks[sContest.blendTaskId].data[contestant * 4 + 1] = 0; } void UpdateBlendTaskContestantsData(void) @@ -1686,25 +1686,25 @@ void UpdateBlendTaskContestantsData(void) u8 i; for (i = 0; i < 4; i++) - sub_80B05A4(i); + UpdateBlendTaskContestantData(i); } -void sub_80B05A4(u8 a) +void UpdateBlendTaskContestantData(u8 contestant) { - sub_80B0548(a); + InitUnusedBlendTaskData(contestant); // 2-byte DMA copy? Why? DmaCopy16Defvars( 3, - &gPlttBufferUnfaded[16 * (5 + a) + 10], - &gPlttBufferFaded[16 * (5 + a) + 10], + &gPlttBufferUnfaded[16 * (5 + contestant) + 10], + &gPlttBufferFaded[16 * (5 + contestant) + 10], 2); DmaCopy16Defvars( 3, - &gPlttBufferUnfaded[16 * (5 + a) + 12 + a], - &gPlttBufferFaded[16 * (5 + a) + 12 + a], + &gPlttBufferUnfaded[16 * (5 + contestant) + 12 + contestant], + &gPlttBufferFaded[16 * (5 + contestant) + 12 + contestant], 2); } @@ -1712,7 +1712,7 @@ void nullsub_19(int unused) { } -void sub_80B05FC(u8 taskId) +void Task_UnusedBlend(u8 taskId) { u8 i; @@ -1743,10 +1743,10 @@ void sub_80B05FC(u8 taskId) } // This task is never used -u8 CreateUnusedBlendTask(u8 *a) +u8 CreateUnusedBrokenBlendTask(u8 *a) { u8 i; - u8 taskId = CreateTask(Task_UnusedBlend, 10); + u8 taskId = CreateTask(Task_UnusedBrokenBlend, 10); for (i = 0; i < 4; i++) { @@ -1883,7 +1883,7 @@ void Task_UnusedBlend(u8 taskId) } #else NAKED -void Task_UnusedBlend(u8 taskId) +void Task_UnusedBrokenBlend(u8 taskId) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -2683,7 +2683,7 @@ void PrintAppealMoveResultText(u8 contestant, u8 stringId) StringCopy(gStringVar3, gText_Contest_Fear); StringExpandPlaceholders(gStringVar4, gUnknown_083CC188[stringId]); ContestClearGeneralTextWindow(); - Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Contest_StartTextPrinter(&gMenuWindow, gStringVar4, 776, 1, 15); } void MakeContestantNervous(u8 p) @@ -3005,7 +3005,7 @@ void Task_AnimateAudience(u8 taskId) } else { - DmaCopy32Defvars(3, ewram15800, (void *)(VRAM + 0x2000), 0x1000); + DmaCopy32Defvars(3, eUnzippedContestAudience_Gfx, (void *)(VRAM + 0x2000), 0x1000); gTasks[taskId].data[12]++; } diff --git a/src/contest_link.c b/src/contest_link.c index 7a169cf08..2ba7a3e39 100644 --- a/src/contest_link.c +++ b/src/contest_link.c @@ -395,7 +395,7 @@ void Task_LinkContest_CommunicateCategory(u8 taskId) } } -void sub_80C89DC(u8 taskId) +void Task_LinkContest_CommunicateMonIdxs(u8 taskId) { switch (gTasks[taskId].data[0]) { @@ -449,7 +449,7 @@ void sub_80C8A38(u8 taskId) } } -void sub_80C8AD0(u8 taskId) +void Task_LinkContest_CommunicateFinalStandings(u8 taskId) { switch (gTasks[taskId].data[0]) { diff --git a/src/contest_link_util.c b/src/contest_link_util.c index 442668b9c..0d3d77ae2 100644 --- a/src/contest_link_util.c +++ b/src/contest_link_util.c @@ -388,7 +388,7 @@ static void sub_80C255C(u8 taskId) static void sub_80C25A4(u8 taskId) { - SetTaskFuncWithFollowupFunc(taskId, sub_80C89DC, sub_80C25C0); + SetTaskFuncWithFollowupFunc(taskId, Task_LinkContest_CommunicateMonIdxs, sub_80C25C0); } static void sub_80C25C0(u8 taskId) diff --git a/src/data/graphics.c b/src/data/graphics.c index 0e98195cd..55d0e453f 100644 --- a/src/data/graphics.c +++ b/src/data/graphics.c @@ -355,11 +355,11 @@ const u8 gContestNumbers_UnusedGfx[] = INCBIN_U8("graphics/unused/numbers.4bpp.l const u8 gContestNumbers_UnusedPal[] = INCBIN_U8("graphics/unused/numbers.gbapal.lz"); const u8 unused_old_contest_2_4bpp[] = INCBIN_U8("graphics/unused/old_contest_2.4bpp.lz"); // the tilemap and palette for unused contest assets are used. however, these two files aren't old -const u8 gUnknown_08D17144[] = INCBIN_U8("graphics/unused/old_contest_2.gbapal.lz"); +const u8 gContestPalette[] = INCBIN_U8("graphics/unused/old_contest_2.gbapal.lz"); -const u8 gUnknown_08D1725C[] = INCBIN_U8("graphics/unused/old_contest_2.bin.lz"); +const u8 gContestGfx[] = INCBIN_U8("graphics/unused/old_contest_2.bin.lz"); -const u8 gUnknown_08D17424[] = INCBIN_U8("graphics/unknown/unknown_D17424.bin.lz"); +const u8 gContestBgmap[] = INCBIN_U8("graphics/unknown/unknown_D17424.bin.lz"); const u8 unused_unknown_D176CC[] = INCBIN_U8("graphics/unknown/unknown_D176CC.bin.lz"); const u8 unused_unknown_D177D8[] = INCBIN_U8("graphics/unknown/unknown_D177D8.bin.lz"); diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 974fa77e2..9ad8a9a8b 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -764,7 +764,8 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8 static void EggHatchPrintMessage1(u8* src) { - Text_InitWindow8002EB0(&gEggHatchData->window, src, gEggHatchData->tileDataStartOffset, 3, 15); + Contest_StartTextPrinter( + &gEggHatchData->window, src, gEggHatchData->tileDataStartOffset, 3, 15); } static void EggHatchPrintMessage2(u8* src) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index a88fbca57..c559e6287 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -549,7 +549,8 @@ static void Task_EvolutionScene(u8 taskID) if (!gPaletteFade.active) { StringExpandPlaceholders(gStringVar4, BattleText_StartEvo); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gStringVar4, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gStringVar4, 144, 2, 15); gTasks[taskID].tState++; } break; @@ -637,7 +638,8 @@ static void Task_EvolutionScene(u8 taskID) if (IsCryFinished() && !gPaletteFade.active) { StringExpandPlaceholders(gStringVar4, BattleText_FinishEvo); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gStringVar4, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gStringVar4, 144, 2, 15); PlayBGM(MUS_EVOLVED); gTasks[taskID].tState++; SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies)); @@ -706,7 +708,8 @@ static void Task_EvolutionScene(u8 taskID) if (IsCryFinished()) { StringExpandPlaceholders(gStringVar4, BattleText_StopEvo); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gStringVar4, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gStringVar4, 144, 2, 15); gTasks[taskID].tEvoWasStopped = TRUE; gTasks[taskID].tState = 14; } @@ -717,7 +720,8 @@ static void Task_EvolutionScene(u8 taskID) sub_8024CEC(); PlayFanfare(MUS_LEVEL_UP); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[3]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter gTasks[taskID].tState++; } @@ -734,7 +738,8 @@ static void Task_EvolutionScene(u8 taskID) { sub_8024CEC(); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[4]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tLearnMoveState++; } break; @@ -742,7 +747,8 @@ static void Task_EvolutionScene(u8 taskID) if (gWindowTemplate_Contest_MoveDescription.state == 0 && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[5]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tLearnMoveState++; } break; @@ -752,7 +758,8 @@ static void Task_EvolutionScene(u8 taskID) if (!IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[6]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tData9 = 5; gTasks[taskID].tdata10 = 9; gTasks[taskID].tLearnMoveState++; @@ -785,7 +792,8 @@ static void Task_EvolutionScene(u8 taskID) { sub_8023AD8(); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[292]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); PlaySE(SE_SELECT); if (sEvoCursorPos != 0) gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; @@ -800,7 +808,8 @@ static void Task_EvolutionScene(u8 taskID) { sub_8023AD8(); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[292]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); PlaySE(SE_SELECT); gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; } @@ -826,7 +835,11 @@ static void Task_EvolutionScene(u8 taskID) if (IsHMMove2(move)) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[307]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter(&gWindowTemplate_Contest_MoveDescription, + gDisplayedStringBattle, + 144, + 2, + 15); gTasks[taskID].tLearnMoveState = 11; } else @@ -839,7 +852,11 @@ static void Task_EvolutionScene(u8 taskID) RemoveMonPPBonus(mon, var); SetMonMoveSlot(mon, gMoveToLearn, var); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[207]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter(&gWindowTemplate_Contest_MoveDescription, + gDisplayedStringBattle, + 144, + 2, + 15); gTasks[taskID].tLearnMoveState++; } } @@ -849,7 +866,8 @@ static void Task_EvolutionScene(u8 taskID) if (gWindowTemplate_Contest_MoveDescription.state == 0 && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[7]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tLearnMoveState++; } break; @@ -857,20 +875,23 @@ static void Task_EvolutionScene(u8 taskID) if (gWindowTemplate_Contest_MoveDescription.state == 0 && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[208]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tState = 19; } break; case 9: BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[8]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tData9 = 10; gTasks[taskID].tdata10 = 0; gTasks[taskID].tLearnMoveState = 3; break; case 10: BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[9]); - Text_InitWindow8002EB0(&gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); + Contest_StartTextPrinter( + &gWindowTemplate_Contest_MoveDescription, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tState = 14; break; case 11: @@ -891,7 +912,11 @@ static void Task_TradeEvolutionScene(u8 taskID) { case 0: StringExpandPlaceholders(gStringVar4, BattleText_StartEvo); - Text_InitWindow8002EB0(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Contest_StartTextPrinter(&gUnknown_03004828->window, + gStringVar4, + gUnknown_03004828->textWindowBaseTileNum, + 2, + 15); gTasks[taskID].tState++; break; case 1: @@ -979,7 +1004,11 @@ static void Task_TradeEvolutionScene(u8 taskID) if (IsCryFinished() && !gPaletteFade.active) { StringExpandPlaceholders(gStringVar4, BattleText_FinishEvo); - Text_InitWindow8002EB0(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Contest_StartTextPrinter(&gUnknown_03004828->window, + gStringVar4, + gUnknown_03004828->textWindowBaseTileNum, + 2, + 15); PlayFanfare(MUS_EVOLVED); gTasks[taskID].tState++; SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies)); @@ -1013,7 +1042,11 @@ static void Task_TradeEvolutionScene(u8 taskID) else { PlayBGM(MUS_EVOLUTION); - Text_InitWindow8002EB0(&gUnknown_03004828->window, gOtherText_LinkStandby2, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Contest_StartTextPrinter(&gUnknown_03004828->window, + gOtherText_LinkStandby2, + gUnknown_03004828->textWindowBaseTileNum, + 2, + 15); gTasks[taskID].tState++; } } @@ -1031,7 +1064,11 @@ static void Task_TradeEvolutionScene(u8 taskID) sub_8024CEC(); PlayFanfare(MUS_LEVEL_UP); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[3]); - Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Contest_StartTextPrinter(&gUnknown_03004828->window, + gDisplayedStringBattle, + gUnknown_03004828->textWindowBaseTileNum, + 2, + 15); gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter gTasks[taskID].tState++; } @@ -1048,7 +1085,11 @@ static void Task_TradeEvolutionScene(u8 taskID) { sub_8024CEC(); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[4]); - Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Contest_StartTextPrinter(&gUnknown_03004828->window, + gDisplayedStringBattle, + gUnknown_03004828->textWindowBaseTileNum, + 2, + 15); gTasks[taskID].tLearnMoveState++; } break; @@ -1056,7 +1097,11 @@ static void Task_TradeEvolutionScene(u8 taskID) if (gUnknown_03004828->window.state == 0 && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[5]); - Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Contest_StartTextPrinter(&gUnknown_03004828->window, + gDisplayedStringBattle, + gUnknown_03004828->textWindowBaseTileNum, + 2, + 15); gTasks[taskID].tLearnMoveState++; } break; @@ -1066,7 +1111,11 @@ static void Task_TradeEvolutionScene(u8 taskID) if (!IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[6]); - Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Contest_StartTextPrinter(&gUnknown_03004828->window, + gDisplayedStringBattle, + gUnknown_03004828->textWindowBaseTileNum, + 2, + 15); gTasks[taskID].tData9 = 5; gTasks[taskID].tdata10 = 9; gTasks[taskID].tLearnMoveState++; @@ -1104,7 +1153,11 @@ static void Task_TradeEvolutionScene(u8 taskID) Text_EraseWindowRect(&gUnknown_03004828->window, 0x18, 8, 0x1D, 0xD); DestroyMenuCursor(); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[292]); - Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Contest_StartTextPrinter(&gUnknown_03004828->window, + gDisplayedStringBattle, + gUnknown_03004828->textWindowBaseTileNum, + 2, + 15); PlaySE(SE_SELECT); if (sEvoCursorPos != 0) gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; @@ -1120,7 +1173,11 @@ static void Task_TradeEvolutionScene(u8 taskID) Text_EraseWindowRect(&gUnknown_03004828->window, 0x18, 8, 0x1D, 0xD); DestroyMenuCursor(); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[292]); - Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Contest_StartTextPrinter(&gUnknown_03004828->window, + gDisplayedStringBattle, + gUnknown_03004828->textWindowBaseTileNum, + 2, + 15); PlaySE(SE_SELECT); gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; } @@ -1146,7 +1203,11 @@ static void Task_TradeEvolutionScene(u8 taskID) if (IsHMMove2(move)) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[307]); - Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Contest_StartTextPrinter(&gUnknown_03004828->window, + gDisplayedStringBattle, + gUnknown_03004828->textWindowBaseTileNum, + 2, + 15); gTasks[taskID].tLearnMoveState = 11; } else @@ -1159,7 +1220,11 @@ static void Task_TradeEvolutionScene(u8 taskID) RemoveMonPPBonus(mon, var); SetMonMoveSlot(mon, gMoveToLearn, var); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[207]); - Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Contest_StartTextPrinter(&gUnknown_03004828->window, + gDisplayedStringBattle, + gUnknown_03004828->textWindowBaseTileNum, + 2, + 15); gTasks[taskID].tLearnMoveState++; } } @@ -1169,7 +1234,11 @@ static void Task_TradeEvolutionScene(u8 taskID) if (gUnknown_03004828->window.state == 0 && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[7]); - Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Contest_StartTextPrinter(&gUnknown_03004828->window, + gDisplayedStringBattle, + gUnknown_03004828->textWindowBaseTileNum, + 2, + 15); gTasks[taskID].tLearnMoveState++; } break; @@ -1177,20 +1246,32 @@ static void Task_TradeEvolutionScene(u8 taskID) if (gUnknown_03004828->window.state == 0 && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[208]); - Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Contest_StartTextPrinter(&gUnknown_03004828->window, + gDisplayedStringBattle, + gUnknown_03004828->textWindowBaseTileNum, + 2, + 15); gTasks[taskID].tState = 15; } break; case 9: BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[8]); - Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Contest_StartTextPrinter(&gUnknown_03004828->window, + gDisplayedStringBattle, + gUnknown_03004828->textWindowBaseTileNum, + 2, + 15); gTasks[taskID].tData9 = 10; gTasks[taskID].tdata10 = 0; gTasks[taskID].tLearnMoveState = 3; break; case 10: BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[9]); - Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Contest_StartTextPrinter(&gUnknown_03004828->window, + gDisplayedStringBattle, + gUnknown_03004828->textWindowBaseTileNum, + 2, + 15); gTasks[taskID].tState = 13; break; case 11: diff --git a/src/field_message_box.c b/src/field_message_box.c index 44fd4ac49..7df3373ce 100644 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -117,13 +117,13 @@ bool8 unref_sub_8064BD0(const u8 *message) static void PrintFieldMessage(const u8 *message) { StringExpandPlaceholders(gStringVar4, message); - Text_InitWindow8002EB0(&gFieldMessageBoxWindow, gStringVar4, gMenuTextTileOffset, 2, 15); + Contest_StartTextPrinter(&gFieldMessageBoxWindow, gStringVar4, gMenuTextTileOffset, 2, 15); CreateFieldMessageBoxTask(); } static void PrintFieldMessageFromStringVar4(void) { - Text_InitWindow8002EB0(&gFieldMessageBoxWindow, gStringVar4, gMenuTextTileOffset, 2, 15); + Contest_StartTextPrinter(&gFieldMessageBoxWindow, gStringVar4, gMenuTextTileOffset, 2, 15); CreateFieldMessageBoxTask(); } diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 2dd3266a3..39ff84583 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -204,7 +204,7 @@ static const struct SpriteFrameImage sSpriteImageTable_840B65C[] = {ewram14000, 0x800}, {ewram14800, 0x800}, {ewram15000, 0x800}, - {ewram15800, 0x800} + { eUnzippedContestAudience_Gfx, 0x800} }; static const struct SpriteFrameImage sSpriteImageTable_840B67C[] = diff --git a/src/mauville_man.c b/src/mauville_man.c index a71ce5fe8..acd6af5bc 100644 --- a/src/mauville_man.c +++ b/src/mauville_man.c @@ -690,7 +690,7 @@ static void Task_BardSong(u8 taskId) case 0: // Initialize song PrepareSongText(); Text_InitWindowWithTemplate(gMenuWindowPtr, &gMenuTextWindowTemplate); - Text_InitWindow8002EB0(gMenuWindowPtr, gStringVar4, 2, 4, 15); + Contest_StartTextPrinter(gMenuWindowPtr, gStringVar4, 2, 4, 15); task->data[1] = 0; task->data[2] = 0; task->tCharIndex = 0; diff --git a/src/menu.c b/src/menu.c index 5bb5f96d1..d1ef5e882 100644 --- a/src/menu.c +++ b/src/menu.c @@ -204,12 +204,12 @@ void Menu_DisplayDialogueFrame(void) void MenuPrintMessage(const u8 *str, u8 left, u8 top) { - Text_InitWindow8002EB0(gMenuWindowPtr, str, gMenuTextTileOffset, left, top); + Contest_StartTextPrinter(gMenuWindowPtr, str, gMenuTextTileOffset, left, top); } void MenuPrintMessageDefaultCoords(const u8 *str) { - Text_InitWindow8002EB0(gMenuWindowPtr, str, gMenuTextTileOffset, 2, 15); + Contest_StartTextPrinter(gMenuWindowPtr, str, gMenuTextTileOffset, 2, 15); } void Menu_SetText(const u8 *str) diff --git a/src/pokedex.c b/src/pokedex.c index f0be616d0..e084f37e6 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -991,7 +991,7 @@ static const struct SpriteFrameImage gSpriteImageTable_83B5694[] = {ewram14000, 0x800}, {ewram14800, 0x800}, {ewram15000, 0x800}, - {ewram15800, 0x800}, + { eUnzippedContestAudience_Gfx, 0x800}, {ewram16000_2, 0x800}, {ewram16800, 0x800}, {ewram17000, 0x800}, @@ -1002,7 +1002,7 @@ static const struct SpriteFrameImage gSpriteImageTable_83B5714[] = {ewram14000, 0x800}, {ewram14800, 0x800}, {ewram15000, 0x800}, - {ewram15800, 0x800}, + { eUnzippedContestAudience_Gfx, 0x800}, {ewram16000_2, 0x800}, {ewram16800, 0x800}, {ewram17000, 0x800}, diff --git a/src/text.c b/src/text.c index 20adca6bd..a5a78b430 100644 --- a/src/text.c +++ b/src/text.c @@ -2019,7 +2019,7 @@ void Text_SetWindowText(struct Window *win, const u8 *text) win->delayCounter = 0; } -void Text_InitWindow8002EB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top) +void Contest_StartTextPrinter(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top) { gMain.watchedKeysMask = A_BUTTON | B_BUTTON; gMain.watchedKeysPressed = 0; @@ -2546,7 +2546,7 @@ u8 Text_UpdateWindowAutoscroll(struct Window *win) return retVal; } -u8 Text_UpdateWindowInContest(struct Window *win) +u8 Contest_RunTextPrinter(struct Window *win) { u8 retVal; diff --git a/src/text_window.c b/src/text_window.c index ade349f4e..6d2900845 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -205,7 +205,7 @@ u16 TextWindow_SetDlgFrameBaseTileNum(u16 baseTileNum) void unref_sub_80651DC(struct Window *win, u8 *text) { - Text_InitWindow8002EB0(win, text, sDialogueFrameBaseTileNum + 14, 2, 15); + Contest_StartTextPrinter(win, text, sDialogueFrameBaseTileNum + 14, 2, 15); } // Loads and draws a dialogue window frame |