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

Merge pull request #1141 from GriffinRichards/add-nonmatch

Browse Source 
Wrap asm statements in NONMATCHING
This commit is contained in:
PikalaxALT
2020-08-21 12:44:07 -04:00
committed by GitHub
parent 6c34effda9 0e7f634b00
commit cd895e497d
13 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_tower.c
View File

@@ -1466,7 +1466,9 @@ u8 GetFrontierOpponentClass(u16 trainerId)
else
{
trainerClass = gFacilityClassToTrainerClass[gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].facilityClass];
asm("");
#ifndef NONMATCHING
asm("");
#endif
}
}
else
@@ -1478,7 +1480,9 @@ u8 GetFrontierOpponentClass(u16 trainerId)
else
{
trainerClass = gFacilityClassToTrainerClass[gApprentices[gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].id].facilityClass];
asm("");
#ifndef NONMATCHING
asm("");
#endif
}
}