pret/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-10-05 17:02:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

gTrainerBattleOpponent = SECRET_BASE_OPPONENT

Browse Source
This commit is contained in:
PikalaxALT
2019-04-23 09:39:16 -04:00
committed by huderlem
parent b1a71de323
commit 5c7c095bab
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle/battle_4.c
+2 -2
View File
@@ -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)
src/battle/battle_ai.c
+1 -1
View File
@@ -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.
src/battle/battle_controller_opponent.c
+2 -2
View File
@@ -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();
src/battle/battle_message.c
+3 -3
View File
@@ -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);
src/debug/watanabe_debug_menu.c
+1 -1
View File
@@ -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;