dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync/update trainer classes

Browse Source
This commit is contained in:
GriffinR
2022-01-09 15:49:02 -05:00
parent d0c79e4e47
commit 08a18d6e32
35 changed files with 4318 additions and 5111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/quest_log_events.c
+8 -8
View File
@@ -14,7 +14,7 @@
#include "region_map.h"
#include "strings.h"
#include "constants/maps.h"
#include "constants/trainer_classes.h"
#include "constants/trainers.h"
#include "constants/items.h"
#include "constants/region_map_sections.h"
@@ -338,10 +338,10 @@ static bool8 ShouldRegisterEvent_HandleBeatStoryTrainer(u16 eventId, const u16 *
if (eventId == QL_EVENT_DEFEATED_TRAINER)
{
u8 trainerClass = gTrainers[*eventData].trainerClass;
if ( trainerClass == CLASS_RIVAL
|| trainerClass == CLASS_RIVAL_2
|| trainerClass == CLASS_CHAMPION_2
|| trainerClass == CLASS_BOSS)
if (trainerClass == TRAINER_CLASS_RIVAL_EARLY
|| trainerClass == TRAINER_CLASS_RIVAL_LATE
|| trainerClass == TRAINER_CLASS_CHAMPION
|| trainerClass == TRAINER_CLASS_BOSS)
return FALSE;
return TRUE;
}
@@ -1680,9 +1680,9 @@ static const u16 *BufferQuestLogText_DefeatedTrainer(const u16 *eventData)
GetMapNameGeneric(gStringVar1, r6[0]);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
if (gTrainers[r5[2]].trainerClass == CLASS_RIVAL
|| gTrainers[r5[2]].trainerClass == CLASS_RIVAL_2
|| gTrainers[r5[2]].trainerClass == CLASS_CHAMPION_2)
if (gTrainers[r5[2]].trainerClass == TRAINER_CLASS_RIVAL_EARLY
|| gTrainers[r5[2]].trainerClass == TRAINER_CLASS_RIVAL_LATE
|| gTrainers[r5[2]].trainerClass == TRAINER_CLASS_CHAMPION)
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, GetExpandedPlaceholder(PLACEHOLDER_ID_RIVAL));
else
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gTrainers[r5[2]].trainerName);