atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename UnknownPokemonStruct to BattleTowerPokemon.

Browse source
This commit is contained in:
Meowsy 2018-12-10 15:49:33 -05:00
parent 58ca87accc
commit 68017b531a
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/battle_tower.h
View file

@ -9,7 +9,7 @@ struct RSBattleTowerRecord
/*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1];
/*0x0C*/ u8 trainerId[4]; /*0x0C*/ u8 trainerId[4];
/*0x10*/ u16 greeting[6]; /*0x10*/ u16 greeting[6];
/*0x1C*/ struct UnknownPokemonStruct party[3]; /*0x1C*/ struct BattleTowerPokemon party[3];
/*0xA0*/ u32 checksum; /*0xA0*/ u32 checksum;
}; };

6
include/global.h
View file

@ -301,7 +301,7 @@ struct Apprentice
u32 checksum; u32 checksum;
}; };
struct UnknownPokemonStruct struct BattleTowerPokemon
{ {
u16 species; u16 species;
u16 heldItem; u16 heldItem;
@ -338,7 +338,7 @@ struct EmeraldBattleTowerRecord
/*0x10*/ u16 greeting[6]; /*0x10*/ u16 greeting[6];
/*0x1C*/ u16 speechWon[6]; /*0x1C*/ u16 speechWon[6];
/*0x28*/ u16 speechLost[6]; /*0x28*/ u16 speechLost[6];
/*0x34*/ struct UnknownPokemonStruct party[4]; /*0x34*/ struct BattleTowerPokemon party[4];
/*0xE4*/ u8 language; /*0xE4*/ u8 language;
/*0xE8*/ u32 checksum; /*0xE8*/ u32 checksum;
}; };
@ -353,7 +353,7 @@ struct BattleTowerEReaderTrainer
/*0x10*/ u16 greeting[6]; /*0x10*/ u16 greeting[6];
/*0x1C*/ u16 farewellPlayerLost[6]; /*0x1C*/ u16 farewellPlayerLost[6];
/*0x28*/ u16 farewellPlayerWon[6]; /*0x28*/ u16 farewellPlayerWon[6];
/*0x34*/ struct UnknownPokemonStruct party[3]; /*0x34*/ struct BattleTowerPokemon party[3];
/*0xB8*/ u32 checksum; /*0xB8*/ u32 checksum;
}; };

6
include/pokemon.h
View file

@ -460,11 +460,11 @@ void CreateMaleMon(struct Pokemon *mon, u16 species, u8 level);
void CreateMonWithIVsPersonality(struct Pokemon *mon, u16 species, u8 level, u32 ivs, u32 personality); void CreateMonWithIVsPersonality(struct Pokemon *mon, u16 species, u8 level, u32 ivs, u32 personality);
void CreateMonWithIVsOTID(struct Pokemon *mon, u16 species, u8 level, u8 *ivs, u32 otId); void CreateMonWithIVsOTID(struct Pokemon *mon, u16 species, u8 level, u8 *ivs, u32 otId);
void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 evSpread); void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 evSpread);
void sub_806819C(struct Pokemon *mon, struct UnknownPokemonStruct *src); void sub_806819C(struct Pokemon *mon, struct BattleTowerPokemon *src);
void sub_8068338(struct Pokemon *mon, struct UnknownPokemonStruct *src, bool8 lvl50); void sub_8068338(struct Pokemon *mon, struct BattleTowerPokemon *src, bool8 lvl50);
void CreateApprenticeMon(struct Pokemon *mon, const struct Apprentice *src, u8 monId); void CreateApprenticeMon(struct Pokemon *mon, const struct Apprentice *src, u8 monId);
void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId); void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId);
void sub_80686FC(struct Pokemon *mon, struct UnknownPokemonStruct *dest); void sub_80686FC(struct Pokemon *mon, struct BattleTowerPokemon *dest);
void CreateObedientMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId); void CreateObedientMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId);
bool8 sub_80688F8(u8 caseId, u8 battlerId); bool8 sub_80688F8(u8 caseId, u8 battlerId);
void SetDeoxysStats(void); void SetDeoxysStats(void);

2
src/battle_tower.c
View file

@ -3245,7 +3245,7 @@ static void FillPartnerParty(u16 trainerId)
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
struct EmeraldBattleTowerRecord *record = &gSaveBlock2Ptr->frontier.towerRecords[trainerId]; struct EmeraldBattleTowerRecord *record = &gSaveBlock2Ptr->frontier.towerRecords[trainerId];
struct UnknownPokemonStruct monData = record->party[gSaveBlock2Ptr->frontier.field_CB4[18 + i]]; struct BattleTowerPokemon monData = record->party[gSaveBlock2Ptr->frontier.field_CB4[18 + i]];
StringCopy(trainerName, record->name); StringCopy(trainerName, record->name);
if (record->language == LANGUAGE_JAPANESE) if (record->language == LANGUAGE_JAPANESE)
{ {

6
src/pokemon.c
View file

@ -2755,7 +2755,7 @@ void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedI
CalculateMonStats(mon); CalculateMonStats(mon);
} }
void sub_806819C(struct Pokemon *mon, struct UnknownPokemonStruct *src) void sub_806819C(struct Pokemon *mon, struct BattleTowerPokemon *src)
{ {
s32 i; s32 i;
u8 nickname[30]; u8 nickname[30];
@ -2809,7 +2809,7 @@ void sub_806819C(struct Pokemon *mon, struct UnknownPokemonStruct *src)
CalculateMonStats(mon); CalculateMonStats(mon);
} }
void sub_8068338(struct Pokemon *mon, struct UnknownPokemonStruct *src, bool8 lvl50) void sub_8068338(struct Pokemon *mon, struct BattleTowerPokemon *src, bool8 lvl50)
{ {
s32 i; s32 i;
u8 nickname[30]; u8 nickname[30];
@ -2937,7 +2937,7 @@ void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level,
CalculateMonStats(mon); CalculateMonStats(mon);
} }
void sub_80686FC(struct Pokemon *mon, struct UnknownPokemonStruct *dest) void sub_80686FC(struct Pokemon *mon, struct BattleTowerPokemon *dest)
{ {
s32 i; s32 i;
u16 heldItem; u16 heldItem;

4
src/record_mixing.c
View file

@ -647,7 +647,7 @@ static void ReceiveOldManData(OldMan *oldMan, size_t recordSize, u8 which)
static void ReceiveBattleTowerData(void *battleTowerRecord, size_t recordSize, u8 which) static void ReceiveBattleTowerData(void *battleTowerRecord, size_t recordSize, u8 which)
{ {
struct EmeraldBattleTowerRecord *dest; struct EmeraldBattleTowerRecord *dest;
struct UnknownPokemonStruct *btPokemon; struct BattleTowerPokemon *btPokemon;
u32 mixIndices[4]; u32 mixIndices[4];
s32 i; s32 i;
@ -1866,7 +1866,7 @@ static void SanitizeEmeraldBattleTowerRecord(struct EmeraldBattleTowerRecord *ds
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
struct UnknownPokemonStruct *towerMon = &dst->party[i]; struct BattleTowerPokemon *towerMon = &dst->party[i];
if (towerMon->species != 0) if (towerMon->species != 0)
StripExtCtrlCodes(towerMon->nickname); StripExtCtrlCodes(towerMon->nickname);
} }