From 487e3c46d164d579f711eb28387ecae3ea2f9577 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sun, 24 Apr 2022 17:27:23 -0300 Subject: [PATCH 1/2] Updated trainer slide-in array --- src/battle_message.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/battle_message.c b/src/battle_message.c index 039aca722..7b2afab54 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -26,6 +26,7 @@ #include "constants/frontier_util.h" #include "constants/items.h" #include "constants/moves.h" +#include "constants/opponents.h" #include "constants/species.h" #include "constants/trainers.h" #include "constants/trainer_hill.h" @@ -3878,7 +3879,9 @@ struct TrainerSlide static const struct TrainerSlide sTrainerSlides[] = { - {0x291, sText_AarghAlmostHadIt, sText_BoxIsFull, sText_123Poof}, + // Put any trainer slide-in messages inside this array. + // Example: + // {TRAINER_WALLY_VR_2, sText_AarghAlmostHadIt, sText_BoxIsFull, sText_123Poof}, }; static u32 GetEnemyMonCount(bool32 onlyAlive) From 66d8409075eb8ce3eaf53c06fa2f2a66c1449af0 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 27 Apr 2022 09:47:32 -0300 Subject: [PATCH 2/2] Update post review --- src/battle_message.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/battle_message.c b/src/battle_message.c index 7b2afab54..ee0cf63e4 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -3879,9 +3879,15 @@ struct TrainerSlide static const struct TrainerSlide sTrainerSlides[] = { - // Put any trainer slide-in messages inside this array. - // Example: - // {TRAINER_WALLY_VR_2, sText_AarghAlmostHadIt, sText_BoxIsFull, sText_123Poof}, + /* Put any trainer slide-in messages inside this array. + Example: + { + .trainerId = TRAINER_WALLY_VR_2, + .msgLastSwitchIn = sText_AarghAlmostHadIt, + .msgLastLowHp = sText_BoxIsFull, + .msgFirstDown = sText_123Poof, + }, + */ }; static u32 GetEnemyMonCount(bool32 onlyAlive)