remove .s files

3 files changed, 62 insertions, 22 deletions

diff --git a/include/list_menu.h b/include/list_menu.h
index df53bb529..54e598d2a 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -30,25 +30,25 @@ struct ListMenu;
 
 struct ListMenuTemplate
 {
-    const struct ListMenuItem *items;
-    void (* moveCursorFunc)(s32 itemIndex, bool8 onInit, struct ListMenu *list);
-    void (* itemPrintFunc)(u8 windowId, s32 itemId, u8 y);
-    u16 totalItems;
-    u16 maxShowed;
-    u8 windowId;
-    u8 header_X;
-    u8 item_X;
-    u8 cursor_X;
-    u8 upText_Y:4; // x1, x2, x4, x8 = xF
-    u8 cursorPal:4; // x10, x20, x40, x80 = xF0
-    u8 fillValue:4; // x1, x2, x4, x8 = xF
-    u8 cursorShadowPal:4; // x10, x20, x40, x80 = xF0
-    u8 lettersSpacing:3;
-    u8 itemVerticalPadding:3;
-    u8 scrollMultiple:2; // x40, x80 = xC0
-    u8 fontId:6; // x1, x2, x4, x8, x10, x20 = x3F
-    u8 cursorKind:2; // x40, x80
-};
+	/*0x00*/ const struct ListMenuItem *items;
+	/*0x04*/ void (* moveCursorFunc)(s32 itemIndex, bool8 onInit, struct ListMenu *list);
+	/*0x08*/ void (* itemPrintFunc)(u8 windowId, s32 itemId, u8 y);
+	/*0x0C*/ u16 totalItems;
+	/*0x0E*/ u16 maxShowed;
+	/*0x10*/ u8 windowId;
+	/*0x11*/ u8 header_X;
+	/*0x12*/ u8 item_X;
+	/*0x13*/ u8 cursor_X;
+	/*0x14*/ u8 upText_Y:4; // x1, x2, x4, x8 = xF
+			 u8 cursorPal:4; // x10, x20, x40, x80 = xF0
+	/*0x15*/ u8 fillValue:4; // x1, x2, x4, x8 = xF
+			 u8 cursorShadowPal:4; // x10, x20, x40, x80 = xF0
+	/*0x16*/ u8 lettersSpacing:3;
+			 u8 itemVerticalPadding:3;
+			 u8 scrollMultiple:2; // x40, x80 = xC0
+	/*0x17*/ u8 fontId:6; // x1, x2, x4, x8, x10, x20 = x3F
+			 u8 cursorKind:2; // x40, x80
+}; /* size = 0x18 */
 
 struct ListMenu
 {
diff --git a/include/shop.h b/include/shop.h
index 481fd6c76..129839e33 100644
--- a/include/shop.h
+++ b/include/shop.h
@@ -4,18 +4,43 @@
 #include "global.h"
 #include "menu_helpers.h"
 
+#define MENU_NOTHING_CHOSEN -2
+#define MENU_B_PRESSED -1
+
+#define INDEX_CANCEL -2
+
+#define NUM_CHARS_PRICE 4
+
+// shop view window NPC info enum
+enum
+{
+    EVENT_OBJ_ID,
+    X_COORD,
+    Y_COORD,
+    ANIM_NUM
+};
+
 extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3];
 
-void CreatePokemartMenu(const u16 *);
+void CreatePokemartMenu(const u16 *itemsForSale);
 void CreateDecorationShop1Menu(const u16 *);
 void CreateDecorationShop2Menu(const u16 *);
-void sub_809C09C(u16, u16, u8);
 u8 sub_809B56C(void);
+void sub_809C09C(u16 a0, u16 a1, u8 a2);
+
+// wrong file
+void sub_809C1D8(u8 taskId, const u16* a1, u16 a2);
+void sub_809C448(u8 a0);
+void sub_809C460(void);
+bool8 sub_809C474(void);
+void sub_809C4A8(void);
+void sub_809C5FC(void);
+
 
 // buy_menu_helper
 void BuyMenuInitWindows(bool32 isSellingTM);
 void BuyMenuDrawMoneyBox(void);
-void BuyMenuPrint(u8 windowId, u8 font, const u8 *text, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, s8 speed, u8 color);
+void BuyMenuPrint(u8 windowId, u8 font, const u8 *text, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 color);
 void BuyMenuDisplayMessage(u8 taskId, const u8 *text, TaskFunc callback);
 void BuyMenuQuantityBoxNormalBorder(u8 windowId, bool8 copyToVram);
 void BuyMenuQuantityBoxThinBorder(u8 windowId, bool8 copyToVram);
diff --git a/include/strings.h b/include/strings.h
index 7750b271c..29caabae4 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -97,6 +97,7 @@ extern const u8 gOtherText_Toss[];
 extern const u8 gOtherText_Give[];
 extern const u8 gOtherText_Exit[];
 extern const u8 gText_ThreeHyphens[];
+extern const u8 gText_SevenHyphens[];
 extern const u8 gOtherText_UnkF9_08_Clear_01[];
 extern const u8 gText_TimesStrVar1[];
 extern const u8 gText_IsSelected[];
@@ -794,4 +795,18 @@ extern const u8 gText_CongratsPkmnEvolved[];
 extern const u8 gText_EllipsisQuestionMark[];
 extern const u8 gText_PkmnStoppedEvolving[];
 
+// shop
+extern const u8 gText_ShopBuy[];
+extern const u8 gText_ShopSell[];
+extern const u8 gText_ShopQuit[];
+extern const u8 gText_CanIHelpWithAnythingElse[];
+extern const u8 gText_QuitShopping[];
+extern const u8 gText_PokedollarVar1[];
+extern const u8 gText_YouDontHaveMoney[];
+extern const u8 gText_Var1CertainlyHowMany[];
+extern const u8 gText_InBagVar1[];
+extern const u8 gText_Var1AndYouWantedVar2[];
+extern const u8 gText_HereYouGoThankYou[];
+extern const u8 gText_NoMoreRoomForThis[];
+
 #endif //GUARD_STRINGS_H