Leahnaya/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2026-06-02 21:54:45 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DAYCAREMAIL -> DaycareMail

Browse Source
This commit is contained in:
Eduardo Quezada 2023-07-01 23:59:59 -04:00
parent 55809d7c49
commit fcbc05a113
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/daycare.h
View File

@ -4,16 +4,16 @@
#include "mail.h"
#include "pokemon.h"
typedef struct DAYCAREMAIL {
typedef struct DaycareMail {
MAIL mail;
u16 ot_name[PLAYER_NAME_LENGTH + 1];
u16 nickname[POKEMON_NAME_LENGTH + 1];
u8 padding_5E[2];
} DAYCAREMAIL;
} DaycareMail;
typedef struct DaycareMon {
BoxPokemon mon;
DAYCAREMAIL mail;
DaycareMail mail;
u32 steps;
} DaycareMon;
@ -28,9 +28,9 @@ u32 Save_Daycare_sizeof(void);
void Save_Daycare_Init(DAYCARE* daycare);
DaycareMon* Save_DayCare_GetMonX(DAYCARE* daycare, int i);
BoxPokemon *DayCareMon_GetBoxMon(DaycareMon* dcmon);
DAYCAREMAIL* DayCareMon_GetExtras(DaycareMon* dcmon);
DaycareMail* DayCareMon_GetExtras(DaycareMon* dcmon);
int DayCareMon_GetSteps(DaycareMon* dcmon);
MAIL* DayCareMail_GetMailPtr(DAYCAREMAIL* dcmail);
MAIL* DayCareMail_GetMailPtr(DaycareMail* dcmail);
u32 Save_DayCare_GetEggPID(DAYCARE* daycare);
u8 Save_DayCare_GetEggCycleCounter(DAYCARE* daycare);
void DayCareMon_SetSteps(DaycareMon* dcmon, u32 steps);
@ -39,7 +39,7 @@ void Save_DayCare_SetEggPID(DAYCARE* daycare, u32 pid);
void Save_DayCare_SetEggCycleCounter(DAYCARE* daycare, int count);
BOOL Save_DayCare_MasudaCheck(DAYCARE* daycare);
void DayCareMon_Copy(DaycareMon* dest, const DaycareMon* src);
void DayCareMon_Extras_Init(DAYCAREMAIL* mail);
void DayCareMon_Extras_Init(DaycareMail* mail);
void DayCareMon_Init(DaycareMon* mon);
DAYCARE* Save_DayCare_Get(SaveData* savedata);
BOOL Save_DayCare_HasEgg(DAYCARE* daycare);

6
src/daycare.c
View File

@ -20,7 +20,7 @@ BoxPokemon *DayCareMon_GetBoxMon(DaycareMon* dcmon) {
return &dcmon->mon;
}
DAYCAREMAIL* DayCareMon_GetExtras(DaycareMon* dcmon) {
DaycareMail* DayCareMon_GetExtras(DaycareMon* dcmon) {
return &dcmon->mail;
}
@ -28,7 +28,7 @@ int DayCareMon_GetSteps(DaycareMon* dcmon) {
return dcmon->steps;
}
MAIL* DayCareMail_GetMailPtr(DAYCAREMAIL* dcmail) {
MAIL* DayCareMail_GetMailPtr(DaycareMail* dcmail) {
return &dcmail->mail;
}
@ -73,7 +73,7 @@ void DayCareMon_Copy(DaycareMon* dest, const DaycareMon* src) {
*dest = *src;
}
void DayCareMon_Extras_Init(DAYCAREMAIL* mail) {
void DayCareMon_Extras_Init(DaycareMail* mail) {
int i;
for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++) {

4
src/get_egg.c
View File

@ -82,7 +82,7 @@ static int Save_DayCare_GetAvailableSlot(DAYCARE *daycare) {
static void DayCareMon_CopyFromPartySlot(PARTY *party, int partyIdx, DaycareMon *daycareMon, SaveData *saveData) {
u16 nickname[POKEMON_NAME_LENGTH + 1];
u8 mood;
DAYCAREMAIL *daycareMail;
DaycareMail *daycareMail;
BoxPokemon *boxMon;
Pokemon *partyMon;
const u16 *playerNamePtr;
@ -156,7 +156,7 @@ static int Save_DayCare_MoveMonToParty(PARTY *party, DaycareMon *daycareMon, Mes
u32 exp;
Pokemon *mon;
BoxPokemon *boxMon;
DAYCAREMAIL *daycareMail;
DaycareMail *daycareMail;
u16 species;
mon = AllocMonZeroed(HEAP_ID_4);