From 3de1f79307eda8de1232dfb612097cef261d0431 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 31 Dec 2021 16:08:12 -0600 Subject: add more to moves header --- src/items.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/items.c') diff --git a/src/items.c b/src/items.c index 4b5a710..526dff7 100644 --- a/src/items.c +++ b/src/items.c @@ -5,7 +5,9 @@ #include "team_inventory.h" #include "random.h" #include "pokemon.h" +#include "random.h" #include "subStruct_203B240.h" +#include "team_inventory.h" #include @@ -702,13 +704,13 @@ u32 sub_80913E0(struct ItemSlot* slot, u32 a2, struct subStruct_203B240 ** a3) u8* typestring; u32 result; - InitPokemonMove(buffer8, move); + InitPokemonMove((struct PokemonMove *)buffer8, move); sub_80078A4(a2, 4, 82, 200, 7); xxx_format_and_draw(4, 84, gPtrTypeText, a2, 0); - moves_data = GetMoveType(buffer8); + moves_data = GetMoveType((struct PokemonMove *)buffer8); typestring = GetUnformattedTypeString(moves_data); xxx_format_and_draw(64, 84, typestring, a2, 0); - result = GetMoveMaxPP(buffer8); + result = GetMoveMaxPP((struct PokemonMove *)buffer8); gUnknown_202DE30 = result; xxx_format_and_draw(128, 84, gPtrPPD0Text, a2, 0); } -- cgit v1.2.3 From 19decc36d0465f26de20b389e6c8bf0775862cdb Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 7 Jan 2022 15:03:08 -0600 Subject: Move all the menus to respective directory in src/data/menus --- src/items.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/items.c') diff --git a/src/items.c b/src/items.c index 526dff7..6f0e587 100644 --- a/src/items.c +++ b/src/items.c @@ -27,7 +27,7 @@ extern u8* gPtrPPD0Text; // ptr to "PP $d0 \0" extern u32 gUnknown_810A3F0[100]; extern u32 gUnknown_81097E8[4]; // some sort of lookup table (16, 18, 20, 22) extern u32 gUnknown_81097F8[4]; // some sort of lookup table (17, 19, 21, 23) -extern u32 gUnknown_810AF50[]; +extern const char *gUnknown_810AF50[]; extern u8 gUnknown_8108F64[0x3f][32]; // some sort of bit lookup table extern s16 gTypeGummiIQBoost[0x12][NUMBER_OF_GUMMIS]; extern u8 gInvalidItemIDs[0x10]; @@ -1234,7 +1234,7 @@ void SaveItemSlot(struct unkStruct_8094924 *a1, struct ItemSlot *slot) SaveIntegerBits(a1, &slot->itemIndex, 8); } -u32 sub_8091E50(u8 index) +const char *sub_8091E50(u8 index) { return gUnknown_810AF50[index]; } -- cgit v1.2.3 From f8d0556b20eaa5546596087084bdba0ff4d6dc44 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 5 Feb 2022 06:36:49 -0600 Subject: remove redudant casts --- src/items.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/items.c') diff --git a/src/items.c b/src/items.c index 6f0e587..d1cd07b 100644 --- a/src/items.c +++ b/src/items.c @@ -704,13 +704,13 @@ u32 sub_80913E0(struct ItemSlot* slot, u32 a2, struct subStruct_203B240 ** a3) u8* typestring; u32 result; - InitPokemonMove((struct PokemonMove *)buffer8, move); + InitPokemonMove(buffer8, move); sub_80078A4(a2, 4, 82, 200, 7); xxx_format_and_draw(4, 84, gPtrTypeText, a2, 0); - moves_data = GetMoveType((struct PokemonMove *)buffer8); + moves_data = GetMoveType(buffer8); typestring = GetUnformattedTypeString(moves_data); xxx_format_and_draw(64, 84, typestring, a2, 0); - result = GetMoveMaxPP((struct PokemonMove *)buffer8); + result = GetMoveMaxPP(buffer8); gUnknown_202DE30 = result; xxx_format_and_draw(128, 84, gPtrPPD0Text, a2, 0); } -- cgit v1.2.3