diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-08-21 12:44:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 12:44:07 -0400 |
| commit | cd895e497d68bf9adbaa067dc411cc99a3bd1a4b (patch) | |
| tree | ad8bed728bb939cf08fbb8b9fd7d4c009a06459e /src/battle_tower.c | |
| parent | 6c34effda93c67a37895e79b684b31b3cb9a2a88 (diff) | |
| parent | 0e7f634b00f904ac29088f3b7fdac0c51999be2d (diff) | |
Merge pull request #1141 from GriffinRichards/add-nonmatch
Wrap asm statements in NONMATCHING
Diffstat (limited to 'src/battle_tower.c')
| -rw-r--r-- | src/battle_tower.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/battle_tower.c b/src/battle_tower.c index 09c9f0416..0333c4397 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -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 } } |