Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-03-21 17:54:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #573 from AsparagusEduardo/pret/pr/sinjoh/monData
Some checks failed
build / build (push) Has been cancelled
Details

Browse Source 
Sync `MON_DATA` names with pokeheartgold and pokeplatinum
This commit is contained in:
red031000 2025-11-16 18:43:05 +00:00 committed by GitHub
commit cf51c2828f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 508 additions and 507 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arm9/src/daycare.c
View File

@ -67,7 +67,7 @@ BOOL Save_Daycare_MasudaCheck(Daycare *daycare) {
// Uses language as a proxy for country, even though it
// only accounts for European languages and Japanese.
// If true, shiny odds are increased.
return GetBoxMonData(&daycare->mons[0].mon, MON_DATA_GAME_LANGUAGE, NULL) != GetBoxMonData(&daycare->mons[1].mon, MON_DATA_GAME_LANGUAGE, NULL);
return GetBoxMonData(&daycare->mons[0].mon, MON_DATA_LANGUAGE, NULL) != GetBoxMonData(&daycare->mons[1].mon, MON_DATA_LANGUAGE, NULL);
}
void DaycareMon_Copy(DaycareMon *dest, const DaycareMon *src) {

6
arm9/src/hall_of_fame.c
View File

@ -35,15 +35,15 @@ void Save_HOF_RecordParty(struct HallOfFame *hof, struct Party *party, RTCDate *
hof_party->party[j].level = (u8)GetMonData(mon, MON_DATA_LEVEL, NULL);
hof_party->party[j].form = (u8)GetMonData(mon, MON_DATA_FORM, NULL);
hof_party->party[j].personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL);
hof_party->party[j].otid = GetMonData(mon, MON_DATA_OTID, NULL);
hof_party->party[j].otid = GetMonData(mon, MON_DATA_OT_ID, NULL);
hof_party->party[j].moves[0] = (u16)GetMonData(mon, MON_DATA_MOVE1, NULL);
hof_party->party[j].moves[1] = (u16)GetMonData(mon, MON_DATA_MOVE2, NULL);
hof_party->party[j].moves[2] = (u16)GetMonData(mon, MON_DATA_MOVE3, NULL);
hof_party->party[j].moves[3] = (u16)GetMonData(mon, MON_DATA_MOVE4, NULL);
if (str != NULL) {
GetMonData(mon, MON_DATA_NICKNAME_3, str);
GetMonData(mon, MON_DATA_NICKNAME_STRING, str);
CopyStringToU16Array(str, hof_party->party[j].nickname, POKEMON_NAME_LENGTH + 1);
GetMonData(mon, MON_DATA_OT_NAME_2, str);
GetMonData(mon, MON_DATA_OT_NAME_STRING, str);
CopyStringToU16Array(str, hof_party->party[j].otname, PLAYER_NAME_LENGTH + 1);
} else {
hof_party->party[j].nickname[0] = EOS;

4
arm9/src/message_format.c
View File

@ -155,12 +155,12 @@ void BufferSpeciesNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 spe
}
void BufferBoxMonNickname(MessageFormat *messageFormat, u32 idx, struct BoxPokemon *mon) {
GetBoxMonData(mon, MON_DATA_NICKNAME_3, messageFormat->buffer);
GetBoxMonData(mon, MON_DATA_NICKNAME_STRING, messageFormat->buffer);
SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL);
}
void BufferBoxMonOTName(MessageFormat *messageFormat, u32 idx, struct BoxPokemon *mon) {
GetBoxMonData(mon, MON_DATA_OT_NAME_2, messageFormat->buffer);
GetBoxMonData(mon, MON_DATA_OT_NAME_STRING, messageFormat->buffer);
SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL);
}

2
arm9/src/pokedex.c
View File

@ -601,7 +601,7 @@ void Pokedex_SetMonCaughtFlag(struct Pokedex *pokedex, struct Pokemon *pokemon)
u16 species; // r6
species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL);
language = GetMonData(pokemon, MON_DATA_GAME_LANGUAGE, NULL);
language = GetMonData(pokemon, MON_DATA_LANGUAGE, NULL);
personality = GetMonData(pokemon, MON_DATA_PERSONALITY, NULL);
gender = GetMonGender(pokemon);
GF_ASSERT(pokedex->magic == 0xBEEFCAFE);

680
arm9/src/pokemon.c
View File

File diff suppressed because it is too large Load Diff

4
arm9/src/scrcmd_party.c
View File

@ -63,7 +63,7 @@ BOOL ScrCmd_CheckPartyMonOTID(struct ScriptContext *ctx) // 0199 - todo: CheckPa
struct Party *party = SaveArray_Party_Get(fieldSystem->saveData);
struct Pokemon *party_mon = Party_GetMonByIndex(party, *mon_slot);
u16 party_mon_otid = (u16)GetMonData(party_mon, MON_DATA_OTID, NULL);
u16 party_mon_otid = (u16)GetMonData(party_mon, MON_DATA_OT_ID, NULL);
u16 player_otid = (u16)PlayerProfile_GetTrainerID(player);
if (party_mon_otid == player_otid) {
*ret_ptr = 0;
@ -298,7 +298,7 @@ BOOL ScrCmd_AddPartyMonFriendship(struct ScriptContext *ctx) // 01BA
friendship_to_add++;
}
u32 party_mon_egg_met_location = GetMonData(party_mon, MON_DATA_EGG_MET_LOCATION, NULL);
u32 party_mon_egg_met_location = GetMonData(party_mon, MON_DATA_EGG_LOCATION, NULL);
if (map_sec == party_mon_egg_met_location) {
friendship_to_add++;
}

2
arm9/src/unk_0206B688.c
View File

@ -53,7 +53,7 @@ u32 sub_0206B6D4(u32 species, u32 is_egg, u32 form) {
}
u16 BoxMon_GetAlternateForm(struct BoxPokemon *boxmon) {
u32 species = GetBoxMonData(boxmon, MON_DATA_SPECIES2, NULL);
u32 species = GetBoxMonData(boxmon, MON_DATA_SPECIES_OR_EGG, NULL);
switch (species) {
case SPECIES_UNOWN:
return GetBoxMonUnownLetter(boxmon);

104
arm9/src/unk_0207FC5C.c
View File

@ -13,59 +13,59 @@ struct UnkStruct_020FB788 {
};
const struct UnkStruct_020FB788 UNK_020FB788[] = {
{ MON_DATA_HOENN_CHAMPION_RIBBON, 72, 0, RIBBON_HOENN_CHAMPION, 80 },
{ MON_DATA_HOENN_COOL_RIBBON, 73, 0, RIBBON_HOENN_COOL, 81 },
{ MON_DATA_HOENN_COOL_RIBBON_SUPER, 74, 0, RIBBON_HOENN_COOL_SUPER, 82 },
{ MON_DATA_HOENN_COOL_RIBBON_HYPER, 75, 0, RIBBON_HOENN_COOL_HYPER, 83 },
{ MON_DATA_HOENN_COOL_RIBBON_MASTER, 76, 0, RIBBON_HOENN_COOL_MASTER, 84 },
{ MON_DATA_HOENN_BEAUTY_RIBBON, 73, 1, RIBBON_HOENN_BEAUTY, 85 },
{ MON_DATA_HOENN_BEAUTY_RIBBON_SUPER, 74, 1, RIBBON_HOENN_BEAUTY_SUPER, 86 },
{ MON_DATA_HOENN_BEAUTY_RIBBON_HYPER, 75, 1, RIBBON_HOENN_BEAUTY_HYPER, 87 },
{ MON_DATA_HOENN_BEAUTY_RIBBON_MASTER, 76, 1, RIBBON_HOENN_BEAUTY_MASTER, 88 },
{ MON_DATA_HOENN_CUTE_RIBBON, 73, 2, RIBBON_HOENN_CUTE, 89 },
{ MON_DATA_HOENN_CUTE_RIBBON_SUPER, 74, 2, RIBBON_HOENN_CUTE_SUPER, 90 },
{ MON_DATA_HOENN_CUTE_RIBBON_HYPER, 75, 2, RIBBON_HOENN_CUTE_HYPER, 91 },
{ MON_DATA_HOENN_CUTE_RIBBON_MASTER, 76, 2, RIBBON_HOENN_CUTE_MASTER, 92 },
{ MON_DATA_HOENN_SMART_RIBBON, 73, 3, RIBBON_HOENN_SMART, 93 },
{ MON_DATA_HOENN_SMART_RIBBON_SUPER, 74, 3, RIBBON_HOENN_SMART_SUPER, 94 },
{ MON_DATA_HOENN_SMART_RIBBON_HYPER, 75, 3, RIBBON_HOENN_SMART_HYPER, 95 },
{ MON_DATA_HOENN_SMART_RIBBON_MASTER, 76, 3, RIBBON_HOENN_SMART_MASTER, 96 },
{ MON_DATA_HOENN_TOUGH_RIBBON, 73, 4, RIBBON_HOENN_TOUGH, 97 },
{ MON_DATA_HOENN_TOUGH_RIBBON_SUPER, 74, 4, RIBBON_HOENN_TOUGH_SUPER, 98 },
{ MON_DATA_HOENN_TOUGH_RIBBON_HYPER, 75, 4, RIBBON_HOENN_TOUGH_HYPER, 99 },
{ MON_DATA_HOENN_TOUGH_RIBBON_MASTER, 76, 4, RIBBON_HOENN_TOUGH_MASTER, 100 },
{ MON_DATA_HOENN_WINNING_RIBBON, 78, 0, RIBBON_HOENN_WINNING, 101 },
{ MON_DATA_HOENN_VICTORY_RIBBON, 77, 0, RIBBON_HOENN_VICTORY, 102 },
{ MON_DATA_HOENN_ARTIST_RIBBON, 79, 1, RIBBON_HOENN_ARTIST, 103 },
{ MON_DATA_HOENN_EFFORT_RIBBON, 80, 2, RIBBON_HOENN_EFFORT, 104 },
{ MON_DATA_HOENN_MARINE_RIBBON, 81, 1, RIBBON_HOENN_MARINE, 0 | 0x8000 },
{ MON_DATA_HOENN_LAND_RIBBON, 81, 3, RIBBON_HOENN_LAND, 1 | 0x8000 },
{ MON_DATA_HOENN_SKY_RIBBON, 81, 4, RIBBON_HOENN_SKY, 2 | 0x8000 },
{ MON_DATA_HOENN_COUNTRY_RIBBON, 82, 3, RIBBON_HOENN_COUNTRY, 178 },
{ MON_DATA_HOENN_NATIONAL_RIBBON, 82, 4, RIBBON_HOENN_NATIONAL, 190 },
{ MON_DATA_HOENN_EARTH_RIBBON, 83, 0, RIBBON_HOENN_EARTH, 191 },
{ MON_DATA_HOENN_WORLD_RIBBON, 83, 1, RIBBON_HOENN_WORLD, 178 },
{ MON_DATA_CHAMPION_RIBBON, 72, 0, RIBBON_HOENN_CHAMPION, 80 },
{ MON_DATA_COOL_RIBBON, 73, 0, RIBBON_HOENN_COOL, 81 },
{ MON_DATA_COOL_RIBBON_SUPER, 74, 0, RIBBON_HOENN_COOL_SUPER, 82 },
{ MON_DATA_COOL_RIBBON_HYPER, 75, 0, RIBBON_HOENN_COOL_HYPER, 83 },
{ MON_DATA_COOL_RIBBON_MASTER, 76, 0, RIBBON_HOENN_COOL_MASTER, 84 },
{ MON_DATA_BEAUTY_RIBBON, 73, 1, RIBBON_HOENN_BEAUTY, 85 },
{ MON_DATA_BEAUTY_RIBBON_SUPER, 74, 1, RIBBON_HOENN_BEAUTY_SUPER, 86 },
{ MON_DATA_BEAUTY_RIBBON_HYPER, 75, 1, RIBBON_HOENN_BEAUTY_HYPER, 87 },
{ MON_DATA_BEAUTY_RIBBON_MASTER, 76, 1, RIBBON_HOENN_BEAUTY_MASTER, 88 },
{ MON_DATA_CUTE_RIBBON, 73, 2, RIBBON_HOENN_CUTE, 89 },
{ MON_DATA_CUTE_RIBBON_SUPER, 74, 2, RIBBON_HOENN_CUTE_SUPER, 90 },
{ MON_DATA_CUTE_RIBBON_HYPER, 75, 2, RIBBON_HOENN_CUTE_HYPER, 91 },
{ MON_DATA_CUTE_RIBBON_MASTER, 76, 2, RIBBON_HOENN_CUTE_MASTER, 92 },
{ MON_DATA_SMART_RIBBON, 73, 3, RIBBON_HOENN_SMART, 93 },
{ MON_DATA_SMART_RIBBON_SUPER, 74, 3, RIBBON_HOENN_SMART_SUPER, 94 },
{ MON_DATA_SMART_RIBBON_HYPER, 75, 3, RIBBON_HOENN_SMART_HYPER, 95 },
{ MON_DATA_SMART_RIBBON_MASTER, 76, 3, RIBBON_HOENN_SMART_MASTER, 96 },
{ MON_DATA_TOUGH_RIBBON, 73, 4, RIBBON_HOENN_TOUGH, 97 },
{ MON_DATA_TOUGH_RIBBON_SUPER, 74, 4, RIBBON_HOENN_TOUGH_SUPER, 98 },
{ MON_DATA_TOUGH_RIBBON_HYPER, 75, 4, RIBBON_HOENN_TOUGH_HYPER, 99 },
{ MON_DATA_TOUGH_RIBBON_MASTER, 76, 4, RIBBON_HOENN_TOUGH_MASTER, 100 },
{ MON_DATA_WINNING_RIBBON, 78, 0, RIBBON_HOENN_WINNING, 101 },
{ MON_DATA_VICTORY_RIBBON, 77, 0, RIBBON_HOENN_VICTORY, 102 },
{ MON_DATA_ARTIST_RIBBON, 79, 1, RIBBON_HOENN_ARTIST, 103 },
{ MON_DATA_EFFORT_RIBBON, 80, 2, RIBBON_HOENN_EFFORT, 104 },
{ MON_DATA_MARINE_RIBBON, 81, 1, RIBBON_HOENN_MARINE, 0 | 0x8000 },
{ MON_DATA_LAND_RIBBON, 81, 3, RIBBON_HOENN_LAND, 1 | 0x8000 },
{ MON_DATA_SKY_RIBBON, 81, 4, RIBBON_HOENN_SKY, 2 | 0x8000 },
{ MON_DATA_COUNTRY_RIBBON, 82, 3, RIBBON_HOENN_COUNTRY, 178 },
{ MON_DATA_NATIONAL_RIBBON, 82, 4, RIBBON_HOENN_NATIONAL, 190 },
{ MON_DATA_EARTH_RIBBON, 83, 0, RIBBON_HOENN_EARTH, 191 },
{ MON_DATA_WORLD_RIBBON, 83, 1, RIBBON_HOENN_WORLD, 178 },
{ MON_DATA_SINNOH_CHAMP_RIBBON, 88, 0, RIBBON_SINNOH_CHAMP, 105 },
{ MON_DATA_COOL_RIBBON, 89, 0, RIBBON_COOL, 106 },
{ MON_DATA_COOL_RIBBON_GREAT, 90, 0, RIBBON_COOL_GREAT, 107 },
{ MON_DATA_COOL_RIBBON_ULTRA, 91, 0, RIBBON_COOL_ULTRA, 108 },
{ MON_DATA_COOL_RIBBON_MASTER, 92, 0, RIBBON_COOL_MASTER, 109 },
{ MON_DATA_BEAUTY_RIBBON, 89, 1, RIBBON_BEAUTY, 110 },
{ MON_DATA_BEAUTY_RIBBON_GREAT, 90, 1, RIBBON_BEAUTY_GREAT, 111 },
{ MON_DATA_BEAUTY_RIBBON_ULTRA, 91, 1, RIBBON_BEAUTY_ULTRA, 112 },
{ MON_DATA_BEAUTY_RIBBON_MASTER, 92, 1, RIBBON_BEAUTY_MASTER, 113 },
{ MON_DATA_CUTE_RIBBON, 89, 2, RIBBON_CUTE, 114 },
{ MON_DATA_CUTE_RIBBON_GREAT, 90, 2, RIBBON_CUTE_GREAT, 115 },
{ MON_DATA_CUTE_RIBBON_ULTRA, 91, 2, RIBBON_CUTE_ULTRA, 116 },
{ MON_DATA_CUTE_RIBBON_MASTER, 92, 2, RIBBON_CUTE_MASTER, 117 },
{ MON_DATA_SMART_RIBBON, 89, 3, RIBBON_SMART, 118 },
{ MON_DATA_SMART_RIBBON_GREAT, 90, 3, RIBBON_SMART_GREAT, 119 },
{ MON_DATA_SMART_RIBBON_ULTRA, 91, 3, RIBBON_SMART_ULTRA, 120 },
{ MON_DATA_SMART_RIBBON_MASTER, 92, 3, RIBBON_SMART_MASTER, 121 },
{ MON_DATA_TOUGH_RIBBON, 89, 4, RIBBON_TOUGH, 122 },
{ MON_DATA_TOUGH_RIBBON_GREAT, 90, 4, RIBBON_TOUGH_GREAT, 123 },
{ MON_DATA_TOUGH_RIBBON_ULTRA, 91, 4, RIBBON_TOUGH_ULTRA, 124 },
{ MON_DATA_TOUGH_RIBBON_MASTER, 92, 4, RIBBON_TOUGH_MASTER, 125 },
{ MON_DATA_SUPER_COOL_RIBBON, 89, 0, RIBBON_COOL, 106 },
{ MON_DATA_SUPER_COOL_RIBBON_GREAT, 90, 0, RIBBON_COOL_GREAT, 107 },
{ MON_DATA_SUPER_COOL_RIBBON_ULTRA, 91, 0, RIBBON_COOL_ULTRA, 108 },
{ MON_DATA_SUPER_COOL_RIBBON_MASTER, 92, 0, RIBBON_COOL_MASTER, 109 },
{ MON_DATA_SUPER_BEAUTY_RIBBON, 89, 1, RIBBON_BEAUTY, 110 },
{ MON_DATA_SUPER_BEAUTY_RIBBON_GREAT, 90, 1, RIBBON_BEAUTY_GREAT, 111 },
{ MON_DATA_SUPER_BEAUTY_RIBBON_ULTRA, 91, 1, RIBBON_BEAUTY_ULTRA, 112 },
{ MON_DATA_SUPER_BEAUTY_RIBBON_MASTER, 92, 1, RIBBON_BEAUTY_MASTER, 113 },
{ MON_DATA_SUPER_CUTE_RIBBON, 89, 2, RIBBON_CUTE, 114 },
{ MON_DATA_SUPER_CUTE_RIBBON_GREAT, 90, 2, RIBBON_CUTE_GREAT, 115 },
{ MON_DATA_SUPER_CUTE_RIBBON_ULTRA, 91, 2, RIBBON_CUTE_ULTRA, 116 },
{ MON_DATA_SUPER_CUTE_RIBBON_MASTER, 92, 2, RIBBON_CUTE_MASTER, 117 },
{ MON_DATA_SUPER_SMART_RIBBON, 89, 3, RIBBON_SMART, 118 },
{ MON_DATA_SUPER_SMART_RIBBON_GREAT, 90, 3, RIBBON_SMART_GREAT, 119 },
{ MON_DATA_SUPER_SMART_RIBBON_ULTRA, 91, 3, RIBBON_SMART_ULTRA, 120 },
{ MON_DATA_SUPER_SMART_RIBBON_MASTER, 92, 3, RIBBON_SMART_MASTER, 121 },
{ MON_DATA_SUPER_TOUGH_RIBBON, 89, 4, RIBBON_TOUGH, 122 },
{ MON_DATA_SUPER_TOUGH_RIBBON_GREAT, 90, 4, RIBBON_TOUGH_GREAT, 123 },
{ MON_DATA_SUPER_TOUGH_RIBBON_ULTRA, 91, 4, RIBBON_TOUGH_ULTRA, 124 },
{ MON_DATA_SUPER_TOUGH_RIBBON_MASTER, 92, 4, RIBBON_TOUGH_MASTER, 125 },
{ MON_DATA_ABILITY_RIBBON, 93, 0, RIBBON_ABILITY, 126 },
{ MON_DATA_GREAT_ABILITY_RIBBON, 94, 0, RIBBON_GREAT_ABILITY, 127 },
{ MON_DATA_DOUBLE_ABILITY_RIBBON, 95, 0, RIBBON_DOUBLE_ABILITY, 128 },

24
arm9/src/use_item_on_mon.c
View File

@ -59,7 +59,7 @@ BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, HeapID
FreeToHeap(itemData);
return TRUE;
}
} else if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_RESTORE) && hp != 0 && hp < GetMonData(pokemon, MON_DATA_MAXHP, NULL)) {
} else if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_RESTORE) && hp != 0 && hp < GetMonData(pokemon, MON_DATA_MAX_HP, NULL)) {
FreeToHeap(itemData);
return TRUE;
}
@ -72,7 +72,7 @@ BOOL CanUseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveId, HeapID
return TRUE;
}
if (GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_UP) || GetItemAttr_PreloadedItemData(itemData, ITEMATTR_PP_MAX)) {
if (GetMonData(pokemon, MON_DATA_MOVE1PPUP + moveId, NULL) < 3 && WazaGetMaxPp((u16)GetMonData(pokemon, MON_DATA_MOVE1 + moveId, NULL), 0) >= 5) {
if (GetMonData(pokemon, MON_DATA_MOVE1_PP_UPS + moveId, NULL) < 3 && WazaGetMaxPp((u16)GetMonData(pokemon, MON_DATA_MOVE1 + moveId, NULL), 0) >= 5) {
FreeToHeap(itemData);
return TRUE;
}
@ -256,7 +256,7 @@ BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 loca
}
{
sp50 = (int)GetMonData(pokemon, MON_DATA_HP, NULL);
sp54 = (int)GetMonData(pokemon, MON_DATA_MAXHP, NULL);
sp54 = (int)GetMonData(pokemon, MON_DATA_MAX_HP, NULL);
if ((GetItemAttr_PreloadedItemData(itemData, ITEMATTR_REVIVE) || GetItemAttr_PreloadedItemData(itemData, ITEMATTR_REVIVE_ALL)) && GetItemAttr_PreloadedItemData(itemData, ITEMATTR_LEVEL_UP)) {
if (sp50 == 0) {
RestoreMonHPBy(pokemon, (u32)sp50, (u32)sp54, GetItemAttr_PreloadedItemData(itemData, ITEMATTR_HP_RESTORE_PARAM));
@ -276,7 +276,7 @@ BOOL UseItemOnPokemon(struct Pokemon *pokemon, u16 itemId, s32 moveIdx, u16 loca
AddMonData(pokemon, MON_DATA_EXPERIENCE, (int)CalcMonExpToNextLevel(pokemon));
CalcMonLevelAndStats(pokemon);
if (sp50 == 0) {
sp5C = (s32)GetMonData(pokemon, MON_DATA_MAXHP, NULL);
sp5C = (s32)GetMonData(pokemon, MON_DATA_MAX_HP, NULL);
RestoreMonHPBy(pokemon, (u32)sp50, (u32)sp5C, (u32)(sp5C - sp54));
}
hadEffect = TRUE;
@ -446,8 +446,8 @@ u8 MonMoveCanRestorePP(struct Pokemon *pokemon, s32 moveIdx) {
if (move_id == MOVE_NONE) {
return FALSE;
}
u8 pp = (u8)GetMonData(pokemon, MON_DATA_MOVE1PP + moveIdx, NULL);
u8 ppUp = (u8)GetMonData(pokemon, MON_DATA_MOVE1PPUP + moveIdx, NULL);
u8 pp = (u8)GetMonData(pokemon, MON_DATA_MOVE1_PP + moveIdx, NULL);
u8 ppUp = (u8)GetMonData(pokemon, MON_DATA_MOVE1_PP_UPS + moveIdx, NULL);
return (u8)(pp < WazaGetMaxPp(move_id, ppUp));
}
@ -462,9 +462,9 @@ BOOL MonMoveRestorePP(struct Pokemon *pokemon, s32 moveIdx, s32 ppRestore) {
if (move_id == MOVE_NONE) {
return FALSE;
}
ppAttr = MON_DATA_MOVE1PP + moveIdx;
ppAttr = MON_DATA_MOVE1_PP + moveIdx;
pp = (u8)GetMonData(pokemon, ppAttr, NULL);
ppUpAttr = MON_DATA_MOVE1PPUP + moveIdx;
ppUpAttr = MON_DATA_MOVE1_PP_UPS + moveIdx;
maxPp = WazaGetMaxPp(move_id, (u8)GetMonData(pokemon, ppUpAttr, NULL));
if (pp < maxPp) {
if (ppRestore == PP_RESTORE_ALL) {
@ -487,7 +487,7 @@ BOOL BoostMonMovePpUpBy(struct Pokemon *pokemon, s32 moveIdx, u32 nPpUp) {
s32 ppUpAttr;
s32 ppAttr;
ppUpAttr = MON_DATA_MOVE1PPUP + moveIdx;
ppUpAttr = MON_DATA_MOVE1_PP_UPS + moveIdx;
ppUp = (u8)GetMonData(pokemon, ppUpAttr, NULL);
if (ppUp == 3) {
return FALSE;
@ -496,7 +496,7 @@ BOOL BoostMonMovePpUpBy(struct Pokemon *pokemon, s32 moveIdx, u32 nPpUp) {
if (WazaGetMaxPp(move, 0) < 5) {
return FALSE;
}
ppAttr = MON_DATA_MOVE1PP + moveIdx;
ppAttr = MON_DATA_MOVE1_PP + moveIdx;
pp = (u8)GetMonData(pokemon, ppAttr, NULL);
maxPp = WazaGetMaxPp(move, ppUp);
if (ppUp + nPpUp > 3) {
@ -582,7 +582,7 @@ BOOL DoItemFriendshipMod(struct Pokemon *pokemon, s32 friendship, s32 mod, u16 l
if (GetMonData(pokemon, MON_DATA_POKEBALL, NULL) == ITEM_LUXURY_BALL) {
mod++;
}
if (location == GetMonData(pokemon, MON_DATA_EGG_MET_LOCATION, NULL)) {
if (location == GetMonData(pokemon, MON_DATA_EGG_LOCATION, NULL)) {
mod++;
}
}
@ -607,7 +607,7 @@ void HealParty(struct Party *party) {
for (i = 0; i < nmons; i++) {
struct Pokemon *pokemon = Party_GetMonByIndex(party, i);
if (GetMonData(pokemon, MON_DATA_SPECIES_EXISTS, NULL)) {
sp8 = GetMonData(pokemon, MON_DATA_MAXHP, NULL);
sp8 = GetMonData(pokemon, MON_DATA_MAX_HP, NULL);
SetMonData(pokemon, MON_DATA_HP, &sp8);
sp8 = 0;

187
include/constants/pokemon.h
View File

@ -114,18 +114,18 @@
#define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536
#define MON_DATA_PERSONALITY 0
#define MON_DATA_PARTY_LOCK 1
#define MON_DATA_BOX_LOCK 2
#define MON_DATA_IS_PARTY_DECRYPTED 1
#define MON_DATA_IS_BOX_DECRYPTED 2
#define MON_DATA_CHECKSUM_FAILED 3
#define MON_DATA_CHECKSUM 4
#define MON_DATA_SPECIES 5
#define MON_DATA_HELD_ITEM 6
#define MON_DATA_OTID 7
#define MON_DATA_OT_ID 7
#define MON_DATA_EXPERIENCE 8
#define MON_DATA_FRIENDSHIP 9
#define MON_DATA_ABILITY 10
#define MON_DATA_MARKINGS 11
#define MON_DATA_GAME_LANGUAGE 12
#define MON_DATA_LANGUAGE 12
#define MON_DATA_HP_EV 13
#define MON_DATA_ATK_EV 14
#define MON_DATA_DEF_EV 15
@ -166,23 +166,23 @@
#define MON_DATA_CARNIVAL_RIBBON 50
#define MON_DATA_CLASSIC_RIBBON 51
#define MON_DATA_PREMIER_RIBBON 52
#define MON_DATA_SINNOH_RIBBON_53 53
#define MON_DATA_UNUSED_RIBBON_53 53
#define MON_DATA_MOVE1 54
#define MON_DATA_MOVE2 55
#define MON_DATA_MOVE3 56
#define MON_DATA_MOVE4 57
#define MON_DATA_MOVE1PP 58
#define MON_DATA_MOVE2PP 59
#define MON_DATA_MOVE3PP 60
#define MON_DATA_MOVE4PP 61
#define MON_DATA_MOVE1PPUP 62
#define MON_DATA_MOVE2PPUP 63
#define MON_DATA_MOVE3PPUP 64
#define MON_DATA_MOVE4PPUP 65
#define MON_DATA_MOVE1MAXPP 66
#define MON_DATA_MOVE2MAXPP 67
#define MON_DATA_MOVE3MAXPP 68
#define MON_DATA_MOVE4MAXPP 69
#define MON_DATA_MOVE1_PP 58
#define MON_DATA_MOVE2_PP 59
#define MON_DATA_MOVE3_PP 60
#define MON_DATA_MOVE4_PP 61
#define MON_DATA_MOVE1_PP_UPS 62
#define MON_DATA_MOVE2_PP_UPS 63
#define MON_DATA_MOVE3_PP_UPS 64
#define MON_DATA_MOVE4_PP_UPS 65
#define MON_DATA_MOVE1_MAX_PP 66
#define MON_DATA_MOVE2_MAX_PP 67
#define MON_DATA_MOVE3_MAX_PP 68
#define MON_DATA_MOVE4_MAX_PP 69
#define MON_DATA_HP_IV 70
#define MON_DATA_ATK_IV 71
#define MON_DATA_DEF_IV 72
@ -191,104 +191,105 @@
#define MON_DATA_SPDEF_IV 75
#define MON_DATA_IS_EGG 76
#define MON_DATA_HAS_NICKNAME 77
#define MON_DATA_HOENN_COOL_RIBBON 78
#define MON_DATA_HOENN_COOL_RIBBON_SUPER 79
#define MON_DATA_HOENN_COOL_RIBBON_HYPER 80
#define MON_DATA_HOENN_COOL_RIBBON_MASTER 81
#define MON_DATA_HOENN_BEAUTY_RIBBON 82
#define MON_DATA_HOENN_BEAUTY_RIBBON_SUPER 83
#define MON_DATA_HOENN_BEAUTY_RIBBON_HYPER 84
#define MON_DATA_HOENN_BEAUTY_RIBBON_MASTER 85
#define MON_DATA_HOENN_CUTE_RIBBON 86
#define MON_DATA_HOENN_CUTE_RIBBON_SUPER 87
#define MON_DATA_HOENN_CUTE_RIBBON_HYPER 88
#define MON_DATA_HOENN_CUTE_RIBBON_MASTER 89
#define MON_DATA_HOENN_SMART_RIBBON 90
#define MON_DATA_HOENN_SMART_RIBBON_SUPER 91
#define MON_DATA_HOENN_SMART_RIBBON_HYPER 92
#define MON_DATA_HOENN_SMART_RIBBON_MASTER 93
#define MON_DATA_HOENN_TOUGH_RIBBON 94
#define MON_DATA_HOENN_TOUGH_RIBBON_SUPER 95
#define MON_DATA_HOENN_TOUGH_RIBBON_HYPER 96
#define MON_DATA_HOENN_TOUGH_RIBBON_MASTER 97
#define MON_DATA_HOENN_CHAMPION_RIBBON 98
#define MON_DATA_HOENN_WINNING_RIBBON 99
#define MON_DATA_HOENN_VICTORY_RIBBON 100
#define MON_DATA_HOENN_ARTIST_RIBBON 101
#define MON_DATA_HOENN_EFFORT_RIBBON 102
#define MON_DATA_HOENN_MARINE_RIBBON 103
#define MON_DATA_HOENN_LAND_RIBBON 104
#define MON_DATA_HOENN_SKY_RIBBON 105
#define MON_DATA_HOENN_COUNTRY_RIBBON 106
#define MON_DATA_HOENN_NATIONAL_RIBBON 107
#define MON_DATA_HOENN_EARTH_RIBBON 108
#define MON_DATA_HOENN_WORLD_RIBBON 109
#define MON_DATA_COOL_RIBBON 78
#define MON_DATA_COOL_RIBBON_SUPER 79
#define MON_DATA_COOL_RIBBON_HYPER 80
#define MON_DATA_COOL_RIBBON_MASTER 81
#define MON_DATA_BEAUTY_RIBBON 82
#define MON_DATA_BEAUTY_RIBBON_SUPER 83
#define MON_DATA_BEAUTY_RIBBON_HYPER 84
#define MON_DATA_BEAUTY_RIBBON_MASTER 85
#define MON_DATA_CUTE_RIBBON 86
#define MON_DATA_CUTE_RIBBON_SUPER 87
#define MON_DATA_CUTE_RIBBON_HYPER 88
#define MON_DATA_CUTE_RIBBON_MASTER 89
#define MON_DATA_SMART_RIBBON 90
#define MON_DATA_SMART_RIBBON_SUPER 91
#define MON_DATA_SMART_RIBBON_HYPER 92
#define MON_DATA_SMART_RIBBON_MASTER 93
#define MON_DATA_TOUGH_RIBBON 94
#define MON_DATA_TOUGH_RIBBON_SUPER 95
#define MON_DATA_TOUGH_RIBBON_HYPER 96
#define MON_DATA_TOUGH_RIBBON_MASTER 97
#define MON_DATA_CHAMPION_RIBBON 98
#define MON_DATA_WINNING_RIBBON 99
#define MON_DATA_VICTORY_RIBBON 100
#define MON_DATA_ARTIST_RIBBON 101
#define MON_DATA_EFFORT_RIBBON 102
#define MON_DATA_MARINE_RIBBON 103
#define MON_DATA_LAND_RIBBON 104
#define MON_DATA_SKY_RIBBON 105
#define MON_DATA_COUNTRY_RIBBON 106
#define MON_DATA_NATIONAL_RIBBON 107
#define MON_DATA_EARTH_RIBBON 108
#define MON_DATA_WORLD_RIBBON 109
#define MON_DATA_FATEFUL_ENCOUNTER 110
#define MON_DATA_GENDER 111
#define MON_DATA_FORM 112
#define MON_DATA_RESERVED_113 113 // HGSS
#define MON_DATA_RESERVED_114 114 // Plat
#define MON_DATA_UNUSED_113 113
#define MON_DATA_UNUSED_114 114
#define MON_DATA_UNUSED_115 115
#define MON_DATA_NICKNAME 116
#define MON_DATA_NICKNAME_2 117
#define MON_DATA_NICKNAME_3 118 // ???
#define MON_DATA_NICKNAME_4 119 // ???
#define MON_DATA_UNK_120 120
#define MON_DATA_GAME_VERSION 121
#define MON_DATA_COOL_RIBBON 122
#define MON_DATA_COOL_RIBBON_GREAT 123
#define MON_DATA_COOL_RIBBON_ULTRA 124
#define MON_DATA_COOL_RIBBON_MASTER 125
#define MON_DATA_BEAUTY_RIBBON 126
#define MON_DATA_BEAUTY_RIBBON_GREAT 127
#define MON_DATA_BEAUTY_RIBBON_ULTRA 128
#define MON_DATA_BEAUTY_RIBBON_MASTER 129
#define MON_DATA_CUTE_RIBBON 130
#define MON_DATA_CUTE_RIBBON_GREAT 131
#define MON_DATA_CUTE_RIBBON_ULTRA 132
#define MON_DATA_CUTE_RIBBON_MASTER 133
#define MON_DATA_SMART_RIBBON 134
#define MON_DATA_SMART_RIBBON_GREAT 135
#define MON_DATA_SMART_RIBBON_ULTRA 136
#define MON_DATA_SMART_RIBBON_MASTER 137
#define MON_DATA_TOUGH_RIBBON 138
#define MON_DATA_TOUGH_RIBBON_GREAT 139
#define MON_DATA_TOUGH_RIBBON_ULTRA 140
#define MON_DATA_TOUGH_RIBBON_MASTER 141
#define MON_DATA_SINNOH_RIBBON_142 142
#define MON_DATA_NICKNAME_FLAT_COMPARE 117
#define MON_DATA_NICKNAME_STRING 118
#define MON_DATA_NICKNAME_STRING_AND_FLAG 119
#define MON_DATA_UNUSED_120 120
#define MON_DATA_MET_GAME 121
#define MON_DATA_SUPER_COOL_RIBBON 122
#define MON_DATA_SUPER_COOL_RIBBON_GREAT 123
#define MON_DATA_SUPER_COOL_RIBBON_ULTRA 124
#define MON_DATA_SUPER_COOL_RIBBON_MASTER 125
#define MON_DATA_SUPER_BEAUTY_RIBBON 126
#define MON_DATA_SUPER_BEAUTY_RIBBON_GREAT 127
#define MON_DATA_SUPER_BEAUTY_RIBBON_ULTRA 128
#define MON_DATA_SUPER_BEAUTY_RIBBON_MASTER 129
#define MON_DATA_SUPER_CUTE_RIBBON 130
#define MON_DATA_SUPER_CUTE_RIBBON_GREAT 131
#define MON_DATA_SUPER_CUTE_RIBBON_ULTRA 132
#define MON_DATA_SUPER_CUTE_RIBBON_MASTER 133
#define MON_DATA_SUPER_SMART_RIBBON 134
#define MON_DATA_SUPER_SMART_RIBBON_GREAT 135
#define MON_DATA_SUPER_SMART_RIBBON_ULTRA 136
#define MON_DATA_SUPER_SMART_RIBBON_MASTER 137
#define MON_DATA_SUPER_TOUGH_RIBBON 138
#define MON_DATA_SUPER_TOUGH_RIBBON_GREAT 139
#define MON_DATA_SUPER_TOUGH_RIBBON_ULTRA 140
#define MON_DATA_SUPER_TOUGH_RIBBON_MASTER 141
#define MON_DATA_UNUSED_RIBBON_142 142
#define MON_DATA_OT_NAME 143
#define MON_DATA_OT_NAME_2 144 // ???
#define MON_DATA_EGG_MET_YEAR 145
#define MON_DATA_EGG_MET_MONTH 146
#define MON_DATA_EGG_MET_DAY 147
#define MON_DATA_OT_NAME_STRING 144
#define MON_DATA_EGG_YEAR 145
#define MON_DATA_EGG_MONTH 146
#define MON_DATA_EGG_DAY 147
#define MON_DATA_MET_YEAR 148
#define MON_DATA_MET_MONTH 149
#define MON_DATA_MET_DAY 150
#define MON_DATA_EGG_MET_LOCATION 151
#define MON_DATA_EGG_LOCATION 151
#define MON_DATA_MET_LOCATION 152
#define MON_DATA_POKERUS 153
#define MON_DATA_POKEBALL 154
#define MON_DATA_MET_LEVEL 155
#define MON_DATA_OT_GENDER 156
#define MON_DATA_ENCOUNTER_TYPE 157
#define MON_DATA_RESERVED_158 158 // HGSS
#define MON_DATA_MET_TERRAIN 157
#define MON_DATA_RESERVED_158 158
#define MON_DATA_STATUS 159
#define MON_DATA_LEVEL 160
#define MON_DATA_CAPSULE 161
#define MON_DATA_BALL_CAPSULE_ID 161
#define MON_DATA_HP 162
#define MON_DATA_MAXHP 163
#define MON_DATA_MAX_HP 163
#define MON_DATA_ATK 164
#define MON_DATA_DEF 165
#define MON_DATA_SPEED 166
#define MON_DATA_SPATK 167
#define MON_DATA_SPDEF 168
#define MON_DATA_MAIL_STRUCT 169
#define MON_DATA_SEAL_COORDS 170
#define MON_DATA_SP_ATK 167
#define MON_DATA_SP_DEF 168
#define MON_DATA_MAIL 169
#define MON_DATA_BALL_CAPSULE 170
#define MON_DATA_SPECIES_EXISTS 171
#define MON_DATA_SANITY_IS_EGG 172
#define MON_DATA_SPECIES2 173
#define MON_DATA_IVS_WORD 174
#define MON_DATA_UNK_175 175
#define MON_DATA_SPECIES_OR_EGG 173 // If the Pokémon is in an Egg, return SPECIES_EGG.
#define MON_DATA_COMBINED_IVS 174
#define MON_DATA_NO_PRINT_GENDER 175
#define MON_DATA_TYPE_1 176
#define MON_DATA_TYPE_2 177
#define MON_DATA_SPECIES_NAME 178