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

Converted Get(Box)MonData2 to proper functions (#3416)

Browse source
This commit is contained in:
Eduardo Quezada D'Ottone 2023-10-14 13:23:17 -03:00 committed by GitHub
parent 0f979ac796
commit 6016c606d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/pokemon.c
View file

@ -4719,7 +4719,10 @@ u32 GetMonData3(struct Pokemon *mon, s32 field, u8 *data)
return ret;
}
u32 GetMonData2(struct Pokemon *mon, s32 field) __attribute__((alias("GetMonData3")));
u32 GetMonData2(struct Pokemon *mon, s32 field)
{
return GetMonData3(mon, field, NULL);
}
/* GameFreak called GetBoxMonData with either 2 or 3 arguments, for type
* safety we have a GetBoxMonData macro (in include/pokemon.h) which
@ -5089,7 +5092,10 @@ u32 GetBoxMonData3(struct BoxPokemon *boxMon, s32 field, u8 *data)
return retVal;
}
u32 GetBoxMonData2(struct BoxPokemon *boxMon, s32 field) __attribute__((alias("GetBoxMonData3")));
u32 GetBoxMonData2(struct BoxPokemon *boxMon, s32 field)
{
return GetBoxMonData3(boxMon, field, NULL);
}
#define SET8(lhs) (lhs) = *data
#define SET16(lhs) (lhs) = data[0] + (data[1] << 8)