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

start opponent controller, thx bird

Browse Source
This commit is contained in:
DizzyEggg
2017-10-25 21:57:28 +02:00
parent a9bc67dbb0
commit fa36e23683
10 changed files with 1514 additions and 5432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_controller_link_opponent.c
+9 -10
View File
@@ -55,9 +55,8 @@ extern u16 gTrainerBattleOpponent_A;
extern u16 gTrainerBattleOpponent_B;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
extern const struct BattleMove gBattleMoves[];
extern const u8 gUnknown_0831F578[];
extern const u8 gTrainerClassToFrontPicId[];
extern void sub_8172EF0(u8 bank, struct Pokemon *mon);
extern void sub_806A068(u16, u8);
@@ -1291,17 +1290,17 @@ static void LinkOpponentHandleDrawTrainerPic(void)
|| (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_LEAF_GREEN)
{
if (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].gender != 0)
trainerPicId = gUnknown_0831F578[0x4F];
trainerPicId = gTrainerClassToFrontPicId[0x4F];
else
trainerPicId = gUnknown_0831F578[0x4E];
trainerPicId = gTrainerClassToFrontPicId[0x4E];
}
else if ((gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_RUBY
|| (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_SAPPHIRE)
{
if (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].gender != 0)
trainerPicId = gUnknown_0831F578[0x51];
trainerPicId = gTrainerClassToFrontPicId[0x51];
else
trainerPicId = gUnknown_0831F578[0x50];
trainerPicId = gTrainerClassToFrontPicId[0x50];
}
else
{
@@ -1320,17 +1319,17 @@ static void LinkOpponentHandleDrawTrainerPic(void)
|| (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_LEAF_GREEN)
{
if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0)
trainerPicId = gUnknown_0831F578[0x4F];
trainerPicId = gTrainerClassToFrontPicId[0x4F];
else
trainerPicId = gUnknown_0831F578[0x4E];
trainerPicId = gTrainerClassToFrontPicId[0x4E];
}
else if ((gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_RUBY
|| (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_SAPPHIRE)
{
if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0)
trainerPicId = gUnknown_0831F578[0x51];
trainerPicId = gTrainerClassToFrontPicId[0x51];
else
trainerPicId = gUnknown_0831F578[0x50];
trainerPicId = gTrainerClassToFrontPicId[0x50];
}
else
{
src/battle_controller_opponent.c
+1484 -7
View File
File diff suppressed because it is too large Load Diff
src/battle_dome_cards.c
+3 -3
View File
@@ -19,7 +19,7 @@ extern const union AffineAnimCmd *const gUnknown_082FF694[];
extern const union AnimCmd *const gUnknown_082FF70C[];
extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[NUM_SPECIES];
extern const union AnimCmd *const *const gUnknown_0830536C[];
extern const u8 gUnknown_0831F578[];
extern const u8 gTrainerClassToFrontPicId[];
// Static type declarations
@@ -421,9 +421,9 @@ u8 sub_818D97C(u8 a0, u8 a1)
switch (a0)
{
default:
return gUnknown_0831F578[0x3F];
return gTrainerClassToFrontPicId[0x3F];
case 0:
return gUnknown_0831F578[0x3C];
return gTrainerClassToFrontPicId[0x3C];
}
}
return a0;
src/pokemon_2.c
+2 -2
View File
@@ -1222,14 +1222,14 @@ void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord)
}
}
extern const u8 gUnknown_0831F578[];
extern const u8 gTrainerClassToFrontPicId[];
extern const u8 gTrainerClassToNameIndex[];
extern const u8 gSecretBaseTrainerClasses[][5];
u8 GetSecretBaseTrainerPicIndex(void)
{
u8 trainerClass = gSecretBaseTrainerClasses[gBattleResources->secretBase->gender][gBattleResources->secretBase->trainerId[0] % 5];
return gUnknown_0831F578[trainerClass];
return gTrainerClassToFrontPicId[trainerClass];
}
u8 GetSecretBaseTrainerNameIndex(void)
src/pokemon_3.c
+2 -2
View File
@@ -1652,11 +1652,11 @@ u8 sub_806EF84(u8 arg0, u8 arg1)
return i;
}
extern const u8 gUnknown_0831F578[];
extern const u8 gTrainerClassToFrontPicId[];
u16 sub_806EFF0(u16 arg0)
{
return gUnknown_0831F578[arg0];
return gTrainerClassToFrontPicId[arg0];
}
u16 PlayerGenderToFrontTrainerPicId(u8 playerGender)