Merge pull request #573 from AsparagusEduardo/pret/pr/sinjoh/monData

Sync `MON_DATA` names with pokeheartgold and pokeplatinum

Author: red031000

arm9/src/daycare.c

@@ -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) {

arm9/src/hall_of_fame.c

@@ -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;

arm9/src/message_format.c

@@ -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);
 }
 

arm9/src/pokedex.c

@@ -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);