dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2020-01-12 22:42:43 -05:00
committed by GitHub
parent 635267ce32 fa5816915d
commit 655910a16f
127 changed files with 15606 additions and 21934 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_pyramid.c
+2 -2
View File
@@ -1493,7 +1493,7 @@ static u16 GetUniqueTrainerId(u8 objectEventId)
{
do
{
trainerId = sub_8162548(challengeNum + 1, battleNum);
trainerId = GetRandomScaledFrontierTrainerId(challengeNum + 1, battleNum);
for (i = 0; i < objectEventId; i++)
{
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
@@ -1505,7 +1505,7 @@ static u16 GetUniqueTrainerId(u8 objectEventId)
{
do
{
trainerId = sub_8162548(challengeNum, battleNum);
trainerId = GetRandomScaledFrontierTrainerId(challengeNum, battleNum);
for (i = 0; i < objectEventId; i++)
{
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)