diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle/battle_4.c | 4 | ||||
| -rw-r--r-- | src/battle/battle_ai.c | 2 | ||||
| -rw-r--r-- | src/battle/battle_controller_opponent.c | 4 | ||||
| -rw-r--r-- | src/battle/battle_message.c | 6 | ||||
| -rw-r--r-- | src/debug/watanabe_debug_menu.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index c2e7d47a0..a84e16116 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -9913,7 +9913,7 @@ static void atk5D_getmoneyreward(void) int i = 0; u8 r5 = 0; u32 money_to_give; - if (gTrainerBattleOpponent == 0x400) + if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT) { money_to_give = 2 * gBattleStruct->moneyMultiplier * MONEY_UNKNOWN; } @@ -14521,7 +14521,7 @@ static void atkD1_trysethelpinghand(void) #ifdef NONMATCHING static void atkD2_tryswapitems(void) { - if ((GetBattlerSide(gBankAttacker) != 1 || gBattleTypeFlags & (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER) || gTrainerBattleOpponent == 0x400)) + if ((GetBattlerSide(gBankAttacker) != 1 || gBattleTypeFlags & (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER) || gTrainerBattleOpponent == SECRET_BASE_OPPONENT)) { u8 side = GetBattlerSide(gBankAttacker); if (gBattleTypeFlags) diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c index 447909091..e192251d0 100644 --- a/src/battle/battle_ai.c +++ b/src/battle/battle_ai.c @@ -338,7 +338,7 @@ void BattleAI_SetupAIData(void) else if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) AI_THINKING_STRUCT->aiFlags = 0x80000000; #ifdef GERMAN - else if (gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER) || gTrainerBattleOpponent == 0x400) + else if (gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER) || gTrainerBattleOpponent == SECRET_BASE_OPPONENT) AI_THINKING_STRUCT->aiFlags = 7; #endif else // otherwise, just set aiFlags to whatever flags the trainer has set in their data. diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index cf1fd6274..15e077e92 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -1220,7 +1220,7 @@ void OpponentHandleTrainerThrow(void) else #endif { - if (gTrainerBattleOpponent == 0x400) + if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT) trainerPicIndex = GetSecretBaseTrainerPicIndex(); else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) trainerPicIndex = get_trainer_class_pic_index(); @@ -1251,7 +1251,7 @@ void OpponentHandleTrainerSlide(void) { u32 trainerPicIndex; - if (gTrainerBattleOpponent == 0x400) + if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT) trainerPicIndex = GetSecretBaseTrainerPicIndex(); else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) trainerPicIndex = get_trainer_class_pic_index(); 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); diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index ed6a1d18d..2e3b684d9 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -1358,7 +1358,7 @@ void debug_80C4AC4(u8 taskId) else if (gMain.newKeys & START_BUTTON) { PlaySE(SE_SELECT); - gTrainerBattleOpponent = 0x400; + gTrainerBattleOpponent = SECRET_BASE_OPPONENT; eWatanabe17000.unk1_4 = 0; eWatanabe17000.unk2 = 0xAC; eWatanabe17000.unk3 = 0xFF; |