diff --git a/data/text/birch_speech.inc b/data/text/birch_speech.inc index 7a9ea6a611..7ea814144c 100644 --- a/data/text/birch_speech.inc +++ b/data/text/birch_speech.inc @@ -35,6 +35,9 @@ gText_Birch_BoyOrGirl:: .string "Are you a boy?\n" .string "Or are you a girl?$" +gText_Birch_WrongGender:: + .string "WRONG!$" + gText_Birch_WhatsYourName:: .string "All right.\n" .string "What's your name?$" diff --git a/graphics/trainers/front_pics/brendan.png b/graphics/trainers/front_pics/brendan.png index b0c65b4be4..7fcffc8db8 100644 Binary files a/graphics/trainers/front_pics/brendan.png and b/graphics/trainers/front_pics/brendan.png differ diff --git a/graphics/trainers/palettes/brendan.pal b/graphics/trainers/palettes/brendan.pal index 7274e303e0..7af1907255 100644 --- a/graphics/trainers/palettes/brendan.pal +++ b/graphics/trainers/palettes/brendan.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 115 197 164 -255 222 205 -222 164 148 -205 131 115 -123 90 82 -98 123 156 -74 90 131 -49 65 106 -24 41 82 -222 230 238 -139 222 115 -98 156 90 -255 98 90 -197 65 65 +255 204 178 +131 74 65 +239 82 81 +189 57 74 +139 49 88 +119 201 232 +86 152 175 +61 90 112 +49 41 65 +255 205 106 +155 160 184 +246 148 230 +211 97 194 255 255 255 0 0 0 diff --git a/include/strings.h b/include/strings.h index 3215f70c88..7899d58f40 100644 --- a/include/strings.h +++ b/include/strings.h @@ -346,6 +346,7 @@ extern const u8 gText_Birch_WhatsYourName[]; extern const u8 gText_Birch_SoItsPlayer[]; extern const u8 gText_Birch_YourePlayer[]; extern const u8 gText_Birch_AreYouReady[]; +extern const u8 gText_Birch_WrongGender[]; extern const u8 gText_ContinueMenuPlayer[]; extern const u8 gText_ContinueMenuTime[]; extern const u8 gText_ContinueMenuPokedex[]; diff --git a/src/data/trainers.h b/src/data/trainers.h index b4c1b05752..0825da29fb 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -6244,9 +6244,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BRENDAN_ROUTE_103_MUDKIP] = { .trainerClass = TRAINER_CLASS_RIVAL, - .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_BRENDAN, - .trainerName = _("BRENDAN"), + .trainerName = _("MADELINE & AETHER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, @@ -6256,9 +6256,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BRENDAN_ROUTE_110_MUDKIP] = { .trainerClass = TRAINER_CLASS_RIVAL, - .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_BRENDAN, - .trainerName = _("BRENDAN"), + .trainerName = _("MADELINE & AETHER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, @@ -6268,9 +6268,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BRENDAN_ROUTE_119_MUDKIP] = { .trainerClass = TRAINER_CLASS_RIVAL, - .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_BRENDAN, - .trainerName = _("BRENDAN"), + .trainerName = _("MADELINE & AETHER"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, @@ -6280,9 +6280,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BRENDAN_ROUTE_103_TREECKO] = { .trainerClass = TRAINER_CLASS_RIVAL, - .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, .trainerPic = TRAINER_PIC_BRENDAN, - .trainerName = _("BRENDAN"), + .trainerName = _("MADDIE"), .items = {}, .doubleBattle = FALSE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN, diff --git a/src/main_menu.c b/src/main_menu.c index 9565df886d..d0938a308f 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -220,6 +220,8 @@ static void NewGameBirchSpeech_ClearGenderWindow(u8, u8); static void Task_NewGameBirchSpeech_WhatsYourName(u8); static void Task_NewGameBirchSpeech_SlideOutOldGenderSprite(u8); static void Task_NewGameBirchSpeech_SlideInNewGenderSprite(u8); +static void Task_NewGameBirchSpeech_WrongGender(u8); +static void Task_NewGameBirchSpeech_WaitForWrongGenderToPrint(u8); static void Task_NewGameBirchSpeech_WaitForWhatsYourNameToPrint(u8); static void Task_NewGameBirchSpeech_WaitPressBeforeNameChoice(u8); static void Task_NewGameBirchSpeech_StartNamingScreen(u8); @@ -1442,6 +1444,8 @@ static void Task_NewGameBirchSpeech_SlidePlatformAway(u8 taskId) { gTasks[taskId].tBG1HOFS = -60; gTasks[taskId].func = Task_NewGameBirchSpeech_StartPlayerFadeIn; + + } } @@ -1507,13 +1511,13 @@ static void Task_NewGameBirchSpeech_ChooseGender(u8 taskId) { case MALE: PlaySE(SE_SELECT); - gSaveBlock2Ptr->playerGender = gender; + gSaveBlock2Ptr->playerGender = FEMALE; NewGameBirchSpeech_ClearGenderWindow(1, 1); - gTasks[taskId].func = Task_NewGameBirchSpeech_WhatsYourName; + gTasks[taskId].func = Task_NewGameBirchSpeech_WrongGender; break; case FEMALE: PlaySE(SE_SELECT); - gSaveBlock2Ptr->playerGender = gender; + gSaveBlock2Ptr->playerGender = FEMALE; NewGameBirchSpeech_ClearGenderWindow(1, 1); gTasks[taskId].func = Task_NewGameBirchSpeech_WhatsYourName; break; @@ -1571,6 +1575,20 @@ static void Task_NewGameBirchSpeech_SlideInNewGenderSprite(u8 taskId) } } +static void Task_NewGameBirchSpeech_WrongGender(u8 taskId) +{ + NewGameBirchSpeech_ClearWindow(0); + StringExpandPlaceholders(gStringVar4, gText_Birch_WrongGender); + AddTextPrinterForMessage(TRUE); + gTasks[taskId].func = Task_NewGameBirchSpeech_WaitForWrongGenderToPrint; +} + +static void Task_NewGameBirchSpeech_WaitForWrongGenderToPrint(u8 taskId) +{ + if (!RunTextPrintersAndIsPrinter0Active()) + gTasks[taskId].func = Task_NewGameBirchSpeech_WhatsYourName; +} + static void Task_NewGameBirchSpeech_WhatsYourName(u8 taskId) { NewGameBirchSpeech_ClearWindow(0); @@ -1896,7 +1914,7 @@ static void AddBirchSpeechObjects(u8 taskId) gSprites[lotadSpriteId].oam.priority = 0; gSprites[lotadSpriteId].invisible = TRUE; gTasks[taskId].tLotadSpriteId = lotadSpriteId; - brendanSpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_BRENDAN), 120, 60, 0, &gDecompressionBuffer[0]); + brendanSpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_MAY), 120, 60, 0, &gDecompressionBuffer[0]); gSprites[brendanSpriteId].callback = SpriteCB_Null; gSprites[brendanSpriteId].invisible = TRUE; gSprites[brendanSpriteId].oam.priority = 0;