From 6016c606d608a2f875fec5df8034eee2642d3bb3 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Sat, 14 Oct 2023 13:23:17 -0300 Subject: [PATCH] Converted Get(Box)MonData2 to proper functions (#3416) --- src/pokemon.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pokemon.c b/src/pokemon.c index 8430933630..7bbf2702e4 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -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)