Skip to content

Sync MON_DATA names with pokeheartgold and pokeplatinum #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
red031000 merged 3 commits into from
Nov 16, 2025
Merged

Sync MON_DATA names with pokeheartgold and pokeplatinum #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74089e1
Sync `MON_DATA` names with pokeheartgold and pokeplatinum
AsparagusEduardo Nov 14, 2025
4ad298c
Merge branch 'master' into pret/pr/sinjoh/monData
AsparagusEduardo Nov 14, 2025
5721640
Merge branch 'master' into pret/pr/sinjoh/monData
AsparagusEduardo Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arm9/src/daycare.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions arm9/src/hall_of_fame.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions arm9/src/message_format.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion arm9/src/pokedex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading