From 386299d1f401cb939e6fe3ea16d0ca57731b2648 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 9 Jul 2021 17:35:12 -0700 Subject: Makefile and Install.md Revamp (#41) * Makefile: move over to gcc for preproc and ditch cpp * INSTALL: rewrite INSTALL * README: add CI badge * Makefile: make tools build before anything else --- include/trade_items_menu.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/trade_items_menu.h b/include/trade_items_menu.h index 31eac25..52cb733 100644 --- a/include/trade_items_menu.h +++ b/include/trade_items_menu.h @@ -2,6 +2,7 @@ #define GUARD_TRADE_ITEMS_MENU_H #include "text.h" +#include "item.h" struct TradeSubStruct { @@ -41,12 +42,11 @@ struct TradeItemsMenu struct TradeSubStruct unk24C; - struct TradeSubStruct unk254; + /* 0x254 */ struct TradeSubStruct sentItem; - u8 unk25C; - u8 chosenNum; - u8 chosenItem; - u8 fill25F[0x3A0 - 0x25F]; + /* 0x25C */ struct ItemStruct_203B460 itemToSend; + + u8 fill25F[0x3A0 - 0x260]; }; -- cgit v1.2.3