remove .s files

data/shop.s

@@ -1,92 +0,0 @@
-#include "constants/maps.h"
-#include "constants/species.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2
-
-gUnknown_83DF09C:: @ 83DF09C
-	.4byte gUnknown_8416738, sub_809AC5C
-	.4byte gUnknown_841673C, sub_809AC98
-	.4byte gUnknown_8416741, sub_809ACF8
-
-gUnknown_83DF0B4:: @ 83DF0B4
-	.4byte sub_809BEA4
-	.4byte sub_809BF98
-
-gUnknown_83DF0BC:: @ 83DF0BC
-	.byte 0, 2, 1, 12, 6, 15
-	.2byte 0x0008
-	@ {
-	@   .bg = 0,
-	@   .tilemapLeft = 2,
-	@   .tilemapTop = 1,
-	@   .width = 12,
-	@   .height = 6,
-	@   .paletteNum = 15,
-	@   .baseBlock = 0x0008
-	@ }
-
-gUnknown_83DF0C4:: @ 83DF0C4
-	.4byte 0x000001f8
-	@ {
-	@   .bg = 0,
-	@   .charBaseIndex = 2,
-	@   .mapBaseIndex = 31,
-	@   .screenSize = 0,
-	@   .paletteMode = 0,
-	@   .priority = 0,
-	@   .baseTile = 0x0000
-	@ }
-	.4byte 0x000011e1
-	@ {
-	@   .bg = 1,
-	@   .charBaseIndex = 0,
-	@   .mapBaseIndex = 30,
-	@   .screenSize = 0,
-	@   .paletteMode = 0,
-	@   .priority = 1,
-	@   .baseTile = 0x0000
-	@ }
-	.4byte 0x000021d2
-	@ {
-	@   .bg = 2,
-	@   .charBaseIndex = 0,
-	@   .mapBaseIndex = 29,
-	@   .screenSize = 0,
-	@   .paletteMode = 0,
-	@   .priority = 2,
-	@   .baseTile = 0x0000
-	@ }
-	.4byte 0x000031c3
-	@ {
-	@   .bg = 3,
-	@   .charBaseIndex = 0,
-	@   .mapBaseIndex = 28,
-	@   .screenSize = 0,
-	@   .paletteMode = 0,
-	@   .priority = 3,
-	@   .baseTile = 0x0000
-	@ }
-
-gUnknown_83DF0D4:: @ 83DF0D4
-	.2byte 0x0308, 0x030a, 0x02d0
-
-gUnknown_83DF0DA:: @ 83DF0DA
-	.2byte 0x0309, 0x030b, 0x02d1
-
-gUnknown_83DF0E0:: @ 83DF0E0
-	.2byte 0x0310, 0x0312, 0x02d8
-
-gUnknown_83DF0E6:: @ 83DF0E6
-	.2byte 0x0311, 0x0313, 0x02d9
-
-gUnknown_83DF0EC:: @ 83DF0EC
-	.2byte 0x02e3, 0x0316, 0x0314
-
-gUnknown_83DF0F2:: @ 83DF0F2
-	.2byte 0x02e4, 0x0317, 0x0315
-
-gUnknown_83DF0F8:: @ 83DF0F8
-	.2byte 0x02eb, 0x031e, 0x031c

data/strings.s

@@ -475,7 +475,7 @@ gUnknown_8416210:: @ 8416210
 gText_ThreeHyphens:: @ 8416213
 	.string "---$"
 
-gUnknown_8416217:: @ 8416217
+gText_SevenHyphens:: @ 8416217
 	.string "-------$"
 
 gUnknown_841621F:: @ 841621F
@@ -720,26 +720,26 @@ gText_TheBerryPouchWillBePutAway:: @ 8416716
 	.string "The BERRY POUCH will be\n"
 	.string "put away.$"
 
-gUnknown_8416738:: @ 0x8416738
+gText_ShopBuy:: @ 0x8416738
 	.string "BUY$"
 
-gUnknown_841673C:: @ 0x841673C
+gText_ShopSell:: @ 0x841673C
 	.string "SELL$"
 
-gUnknown_8416741:: @ 0x8416741
+gText_ShopQuit:: @ 0x8416741
 	.string "SEE YA!$"
 
-gUnknown_8416749:: @ 8416749
+gText_InBagVar1:: @ 8416749
 	.string "IN BAG:{SMALL} {STR_VAR_1}$"
 
-gUnknown_8416757:: @ 8416757
+gText_QuitShopping:: @ 8416757
 	.string "Quit shopping.$"
 
-gUnknown_8416766:: @ 8416766
+gText_Var1CertainlyHowMany:: @ 8416766
 	.string "{STR_VAR_1}? Certainly.\n"
 	.string "How many would you like?$"
 
-gUnknown_841678E:: @ 841678E
+gText_Var1AndYouWantedVar2:: @ 841678E
 	.string "{STR_VAR_1}, and you want {STR_VAR_2}.\n"
 	.string "That will be ¥{STR_VAR_3}. Okay?$"
 
@@ -751,7 +751,7 @@ gUnknown_84167D0:: @ 0x84167D0
 	.string "{STR_VAR_1} ですね!\n"
 	.string "{STR_VAR_2}¥ だけど かいますか?$"
 
-gUnknown_84167E7:: @ 84167E7
+gText_HereYouGoThankYou:: @ 84167E7
 	.string "Here you are!\n"
 	.string "Thank you!$"
 
@@ -763,10 +763,10 @@ gUnknown_8416822:: @ 0x8416822
 	.string "どうも ありがとう!\n"
 	.string "じたくの パソコンに おくって おくね!$"
 
-gUnknown_8416842:: @ 8416842
+gText_YouDontHaveMoney:: @ 8416842
 	.string "You don't have enough money.{PAUSE_UNTIL_PRESS}$"
 
-gUnknown_8416861:: @ 8416861
+gText_NoMoreRoomForThis:: @ 8416861
 	.string "You have no more room for this\n"
 	.string "item.{PAUSE_UNTIL_PRESS}$"
 
@@ -774,7 +774,7 @@ gUnknown_8416888:: @ 0x8416888
 	.string "{STR_VAR_1}を\n"
 	.string "いれる ばしょが いっぱいです{PAUSE_UNTIL_PRESS}$"
 
-gUnknown_841689E:: @ 841689E
+gText_CanIHelpWithAnythingElse:: @ 841689E
 	.string "Is there anything else I can do?$"
 
 gUnknown_84168BF:: @ 0x84168BF

include/list_menu.h

@@ -30,25 +30,25 @@ struct ListMenu;
 
 struct ListMenuTemplate
 {
-    const struct ListMenuItem *items;
+	/*0x00*/ const struct ListMenuItem *items;
-    void (* moveCursorFunc)(s32 itemIndex, bool8 onInit, struct ListMenu *list);
+	/*0x04*/ void (* moveCursorFunc)(s32 itemIndex, bool8 onInit, struct ListMenu *list);
-    void (* itemPrintFunc)(u8 windowId, s32 itemId, u8 y);
+	/*0x08*/ void (* itemPrintFunc)(u8 windowId, s32 itemId, u8 y);
-    u16 totalItems;
+	/*0x0C*/ u16 totalItems;
-    u16 maxShowed;
+	/*0x0E*/ u16 maxShowed;
-    u8 windowId;
+	/*0x10*/ u8 windowId;
-    u8 header_X;
+	/*0x11*/ u8 header_X;
-    u8 item_X;
+	/*0x12*/ u8 item_X;
-    u8 cursor_X;
+	/*0x13*/ u8 cursor_X;
-    u8 upText_Y:4; // x1, x2, x4, x8 = xF
+	/*0x14*/ u8 upText_Y:4; // x1, x2, x4, x8 = xF
-    u8 cursorPal:4; // x10, x20, x40, x80 = xF0
+			 u8 cursorPal:4; // x10, x20, x40, x80 = xF0
-    u8 fillValue:4; // x1, x2, x4, x8 = xF
+	/*0x15*/ u8 fillValue:4; // x1, x2, x4, x8 = xF
-    u8 cursorShadowPal:4; // x10, x20, x40, x80 = xF0
+			 u8 cursorShadowPal:4; // x10, x20, x40, x80 = xF0
-    u8 lettersSpacing:3;
+	/*0x16*/ u8 lettersSpacing:3;
-    u8 itemVerticalPadding:3;
+			 u8 itemVerticalPadding:3;
-    u8 scrollMultiple:2; // x40, x80 = xC0
+			 u8 scrollMultiple:2; // x40, x80 = xC0
-    u8 fontId:6; // x1, x2, x4, x8, x10, x20 = x3F
+	/*0x17*/ u8 fontId:6; // x1, x2, x4, x8, x10, x20 = x3F
-    u8 cursorKind:2; // x40, x80
+			 u8 cursorKind:2; // x40, x80
-};
+}; /* size = 0x18 */
 
 struct ListMenu
 {

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);

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

ld_script.txt

@@ -141,7 +141,6 @@ SECTIONS {
         src/battle_anim_mon_movement.o(.text);
         src/item.o(.text);
 		src/shop.o(.text);
-        asm/shop.o(.text);
         src/berry.o(.text);
         src/script_menu.o(.text);
         asm/naming_screen.o(.text);
@@ -443,7 +442,6 @@ SECTIONS {
         src/battle_anim_mon_movement.o(.rodata);
         src/item.o(.rodata);
 		src/shop.o(.rodata);
-        data/shop.o(.rodata);
         src/berry.o(.rodata);
         src/script_menu.o(.rodata);
         data/naming_screen.o(.rodata);

src/buy_menu_helpers.c

@@ -177,7 +177,7 @@ void BuyMenuDrawMoneyBox(void)
     PrintMoneyAmountInMoneyBoxWithBorder(0, 0xA, 0xF, GetMoney(&gSaveBlock1Ptr->money));
 }
 
-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)
 {
     AddTextPrinterParameterized4(windowId, font, x, y, letterSpacing, lineSpacing, sShopBuyMenuTextColors[color], speed, text);
 }

sym_ewram.txt

@@ -315,7 +315,7 @@ gUnknown_20398B8: @ 20398B8
 gUnknown_20398BA: @ 20398BA
 	.space 0x7A
 
-gUnknown_2039934: @ 2039934
+gShopData: @ 2039934
 	.space 0xE
 
 gUnknown_2039942: @ 2039942