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

move some pokemon data to c

Browse Source
This commit is contained in:
DizzyEggg
2018-02-05 17:39:26 +01:00
parent eb6aed50e5
commit ae8e89a10d
65 changed files with 32297 additions and 20897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/battle_controller_link_opponent.c
View File

@@ -58,7 +58,7 @@ extern u16 gTrainerBattleOpponent_B;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct BattleMove gBattleMoves[];
extern const u8 gUnknown_0831F578[];
extern const u8 gFacilityClassToPicIndex[];
extern void sub_8172EF0(u8 bank, struct Pokemon *mon);
extern void sub_806A068(u16, u8);
@@ -1280,17 +1280,17 @@ static void LinkOpponentHandleDrawTrainerPic(void)
|| (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_LEAF_GREEN)
{
if (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].gender != 0)
trainerPicId = gUnknown_0831F578[0x4F];
trainerPicId = gFacilityClassToPicIndex[0x4F];
else
trainerPicId = gUnknown_0831F578[0x4E];
trainerPicId = gFacilityClassToPicIndex[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 = gFacilityClassToPicIndex[0x51];
else
trainerPicId = gUnknown_0831F578[0x50];
trainerPicId = gFacilityClassToPicIndex[0x50];
}
else
{
@@ -1309,17 +1309,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 = gFacilityClassToPicIndex[0x4F];
else
trainerPicId = gUnknown_0831F578[0x4E];
trainerPicId = gFacilityClassToPicIndex[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 = gFacilityClassToPicIndex[0x51];
else
trainerPicId = gUnknown_0831F578[0x50];
trainerPicId = gFacilityClassToPicIndex[0x50];
}
else
{