Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Difficulty Fallback for Trainer Slides #6088

Merged
merged 4 commits into from
Jan 29, 2025
Merged

Added Difficulty Fallback for Trainer Slides #6088

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6eed348
Updated sFrontierTrainerSlides to use the right constant for the numb…
pkmnsnfrn Jan 23, 2025
f318c79
Removed patch file
pkmnsnfrn Jan 23, 2025
032cc7f
Simplified GetTrainerSlideArray per https://github.com/rh-hideout/pok…
pkmnsnfrn Jan 24, 2025
4f1ecc0
Fixed logic errors where wrong array was being called
pkmnsnfrn Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions src/trainer_slide.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ static const u8* const sTrainerSlides[DIFFICULTY_COUNT][TRAINERS_COUNT][TRAINER_
},
};

static const u8* const sFrontierTrainerSlides[DIFFICULTY_COUNT][TRAINERS_COUNT][TRAINER_SLIDE_COUNT] =
static const u8* const sFrontierTrainerSlides[DIFFICULTY_COUNT][FRONTIER_TRAINERS_COUNT][TRAINER_SLIDE_COUNT] =
{
[DIFFICULTY_NORMAL] =
{
},
};

static const u8* const sTestTrainerSlides[DIFFICULTY_COUNT][FRONTIER_TRAINERS_COUNT][TRAINER_SLIDE_COUNT] =
static const u8* const sTestTrainerSlides[DIFFICULTY_COUNT][TRAINERS_COUNT][TRAINER_SLIDE_COUNT] =
{
#include "../test/battle/trainer_slides.h"
};
Expand Down Expand Up @@ -107,24 +107,34 @@ static u32 GetEnemyMonCount(u32 firstId, u32 lastId, bool32 onlyAlive)
return count;
}

static bool32 DoesTrainerHaveSlideMessage(enum DifficultyLevel difficulty, u32 trainerId, u32 slideId)
static const u8* const (*GetTrainerSlideArray(enum DifficultyLevel difficulty, u32 trainerId, u32 slideId))[TRAINER_SLIDE_COUNT]
AlexOn1ine marked this conversation as resolved.
Show resolved Hide resolved
{
if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
return (sFrontierTrainerSlides[difficulty][trainerId][slideId] != NULL);
return &sFrontierTrainerSlides[difficulty][trainerId];
else if (TESTING)
return (sTestTrainerSlides[difficulty][trainerId][slideId] != NULL);
return &sTestTrainerSlides[difficulty][trainerId];
else
return (sTrainerSlides[difficulty][trainerId][slideId] != NULL);
return &sTrainerSlides[difficulty][trainerId];
}

static bool32 DoesTrainerHaveSlideMessage(enum DifficultyLevel difficulty, u32 trainerId, u32 slideId)
{
const u8* const (*trainerSlides)[TRAINER_SLIDE_COUNT] = GetTrainerSlideArray(difficulty, trainerId, slideId);

if ((*trainerSlides)[slideId] == NULL)
return ((*trainerSlides)[DIFFICULTY_NORMAL] != NULL);
else
return TRUE;
}

void SetTrainerSlideMessage(enum DifficultyLevel difficulty, u32 trainerId, u32 slideId)
{
if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
gBattleStruct->trainerSlideMsg = sFrontierTrainerSlides[difficulty][trainerId][slideId];
else if (TESTING)
gBattleStruct->trainerSlideMsg = sTestTrainerSlides[difficulty][trainerId][slideId];
const u8* const (*trainerSlides)[TRAINER_SLIDE_COUNT] = GetTrainerSlideArray(difficulty, trainerId, slideId);

if ((*trainerSlides)[slideId] != NULL)
gBattleStruct->trainerSlideMsg = (*trainerSlides)[slideId];
else
gBattleStruct->trainerSlideMsg = sTrainerSlides[difficulty][trainerId][slideId];
gBattleStruct->trainerSlideMsg = (*trainerSlides)[DIFFICULTY_NORMAL];
}

static bool32 ShouldRunTrainerSlidePlayerLandsFirstCriticalHit(enum TrainerSlideType slideId)
Expand Down
Loading