diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-23 09:39:16 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-04-23 19:57:44 -0500 |
| commit | 5c7c095bab47ef4792da3cbc1f5c4c754282e644 (patch) | |
| tree | 19ad51b320fd219fd83eb78b83041f682842b203 /src/battle/battle_message.c | |
| parent | b1a71de32316cb9a48cbbe4435f7995fd627974d (diff) | |
gTrainerBattleOpponent = SECRET_BASE_OPPONENT
Diffstat (limited to 'src/battle/battle_message.c')
| -rw-r--r-- | src/battle/battle_message.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c index f87e1f152..dcca5f006 100644 --- a/src/battle/battle_message.c +++ b/src/battle/battle_message.c @@ -700,7 +700,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) break; case 25: // trainer class name #ifdef ENGLISH - if (gTrainerBattleOpponent == 0x400) + if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT) toCpy = gTrainerClassNames[GetSecretBaseTrainerNameIndex()]; else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) toCpy = gTrainerClassNames[get_trainer_class_name_index()]; @@ -710,7 +710,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) toCpy = gTrainerClassNames[gTrainers[gTrainerBattleOpponent].trainerClass]; break; #else - if (gTrainerBattleOpponent == 0x400) + if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT) toCpy = de_sub_8041024(gTrainerBattleOpponent, 0); else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) toCpy = de_sub_8041024(BATTLE_TYPE_BATTLE_TOWER, 0); @@ -721,7 +721,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) break; #endif case 26: // trainer name - if (gTrainerBattleOpponent == 0x400) + if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT) { memset(text, 0xFF, 8); memcpy(text, ewram17002, 7); |