Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Difficulty Fallback for Trainer Slides (#6088)

Browse Source
This commit is contained in:
psf 2025-01-29 10:09:00 -08:00 committed by GitHub
parent bc5adcac18
commit b130a3846e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/trainer_slide.c
View File

@ -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"
};
@ -107,24 +107,36 @@ 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)
{
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 = GetTrainerSlideArray(difficulty, trainerId, slideId);
const u8* const *trainerSlidesNormal = GetTrainerSlideArray(DIFFICULTY_NORMAL, trainerId, slideId);
if (trainerSlides[slideId] == NULL)
return (trainerSlidesNormal[slideId] != 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 = GetTrainerSlideArray(difficulty, trainerId, slideId);
const u8* const *trainerSlidesNormal = GetTrainerSlideArray(DIFFICULTY_NORMAL, trainerId, slideId);
if (trainerSlides[slideId] != NULL)
gBattleStruct->trainerSlideMsg = trainerSlides[slideId];
else
gBattleStruct->trainerSlideMsg = sTrainerSlides[difficulty][trainerId][slideId];
gBattleStruct->trainerSlideMsg = trainerSlidesNormal[slideId];
}
static bool32 ShouldRunTrainerSlidePlayerLandsFirstCriticalHit(enum TrainerSlideType slideId)
@ -232,7 +244,7 @@ enum TrainerSlideTargets ShouldDoTrainerSlide(u32 battler, enum TrainerSlideType
return TRAINER_SLIDE_TARGET_NONE;
SetTrainerSlideParamters(battler, &firstId, &lastId, &trainerId, &retValue);
enum DifficultyLevel difficulty = GetTrainerDifficultyLevel(trainerId);
enum DifficultyLevel difficulty = GetCurrentDifficultyLevel();
gBattleScripting.battler = battler;