Matched game/board/shop

config/GMPE01_00/symbols.txt

@@ -5207,11 +5207,11 @@ spaceImgIdx = .data:0x80139CC8; // type:object size:0xC scope:local
 spaceHiliteImgIdx = .data:0x80139CD4; // type:object size:0xC scope:local
 jumptable_80139CE0 = .data:0x80139CE0; // type:object size:0x28 scope:local
 hostMessTbl = .data:0x80139D08; // type:object size:0x24 scope:local
-itemPriceTbl = .data:0x80139D2C; // type:object size:0x10 scope:local
+itemPriceTbl = .data:0x80139D2C; // type:object size:0x10 scope:local data:byte
 shopMotTbl = .data:0x80139D3C; // type:object size:0x6C scope:local
 lbl_80139DA8 = .data:0x80139DA8; // type:object size:0xA data:string
-itemPrioTbl = .data:0x80139DB2; // type:object size:0x8C scope:local
-rankItemGroupTbl = .data:0x80139E3E; // type:object size:0x18 scope:local
+itemPrioTbl = .data:0x80139DB2; // type:object size:0x8C scope:local data:byte
+rankItemGroupTbl = .data:0x80139E3E; // type:object size:0x18 scope:local data:byte
 cursorPosTbl = .data:0x80139E58; // type:object size:0x30 scope:local data:float
 comInputDraw1 = .data:0x80139E88; // type:object size:0xEE scope:local data:2byte
 comInputDraw2 = .data:0x80139F76; // type:object size:0xBA scope:local data:2byte
@@ -5897,7 +5897,7 @@ shopMdlParam = .sdata:0x801D370C; // type:object size:0x8 scope:local
 hostMdl = .sdata:0x801D3714; // type:object size:0x2 scope:local data:2byte
 shopMot = .sdata:0x801D3716; // type:object size:0x6 scope:local data:2byte
 itemCurChoice = .sdata:0x801D371C; // type:object size:0x1 scope:local data:byte
-defaultItemTbl = .sdata:0x801D371D; // type:object size:0x5 scope:local
+defaultItemTbl = .sdata:0x801D371D; // type:object size:0x5 scope:local data:byte
 hostMdl = .sdata:0x801D3728; // type:object size:0x2 scope:local data:2byte
 lotteryMot = .sdata:0x801D372A; // type:object size:0x8 scope:local data:2byte
 lotterySpr = .sdata:0x801D3732; // type:object size:0x2 scope:local data:2byte

configure.py

@@ -375,7 +375,7 @@ config.libs = [
             Object(Matching, "game/board/com.c"),
             Object(Matching, "game/board/view.c"),
             Object(Matching, "game/board/space.c"),
-            Object(NonMatching, "game/board/shop.c"),
+            Object(Matching, "game/board/shop.c"),
             Object(Matching, "game/board/lottery.c"),
             Object(Matching, "game/board/basic_space.c"),
             Object(Matching, "game/board/warp.c"),

include/board_unsplit.h

@@ -7,12 +7,10 @@
 typedef void (*BoardLightHook)(void);
 #endif
 
-void BoardShopTutorialExec(s32);
 void BoardMGSetupTutorialExec(void);
 void BoardBooHouseTutorialExec(void);
 void BoardLightHookSet(BoardLightHook set, BoardLightHook reset);
 s32 fn_8006DDE8(s16, f32);
-void BoardShopHostSet(s16);
 void BoardBooHouseHostSet(s16);
 s32 BoardCameraRotGet(Vec*);
 s32 BoardIsKill(void);

include/game/board/model.h

@@ -12,7 +12,7 @@ typedef struct board_model_param {
 		u8 link : 1;
 		u8 start_mot : 1;
 		u8 pause : 1;
-	};
+	} unk4;
 	s16 unk6;
 } BoardModelParam;
 

include/game/board/shop.h

@@ -0,0 +1,13 @@
+#ifndef _BOARD_SHOP_H
+#define _BOARD_SHOP_H
+
+#include "dolphin/types.h"
+
+void BoardShopHostSet(s16 arg0);
+s16 BoardShopHostGet(void);
+void BoardShopInit(void);
+void BoardShopKill(void);
+void BoardShopExec(s32 player, s32 space);
+void BoardShopTutorialExec(s32 arg0);
+
+#endif

src/REL/w03Dll/main.c

@@ -7,7 +7,9 @@
 #include "game/wipe.h"
 #include "REL/w03Dll.h"
 #include "game/board/lottery.h"
+#include "game/board/main.h"
 #include "game/board/model.h"
+#include "game/board/shop.h"
 #include "game/board/space.h"
 #include "game/board/star.h"
 #include "game/object.h"
@@ -30,7 +32,6 @@ void fn_1_10B0(void);
 s32 fn_1_12C8(void);
 s32 fn_8006DDE8(s16, f32);
 void fn_1_10E4(omObjData* arg0);
-extern Process *boardObjMan;
 typedef void (*VoidFunc)(void);
 extern const VoidFunc _ctors[];
 extern const VoidFunc _dtors[];

src/REL/w10Dll/main.c

@@ -3,6 +3,7 @@
 #include "game/hsfman.h"
 #include "game/board/lottery.h"
 #include "game/board/model.h"
+#include "game/board/shop.h"
 #include "game/board/space.h"
 #include "game/board/star.h"
 #include "game/board/tutorial.h"

src/REL/w10Dll/scene.c

@@ -3,6 +3,7 @@
 #include "game/board/lottery.h"
 #include "game/board/main.h"
 #include "game/board/model.h"
+#include "game/board/shop.h"
 #include "game/board/space.h"
 #include "game/board/star.h"
 #include "game/board/tutorial.h"

src/game/board/lottery.c

@@ -51,8 +51,6 @@ typedef struct {
     s16 unk08;
 } LotteryTicketPickWork;
 
-extern s32 BoardShopHostGet(void);
-
 static void CreateModel(void);
 static void KillModel(void);
 static void DestroyLottery(void);

src/game/board/main.c

@@ -14,6 +14,7 @@
 #include "game/board/model.h"
 #include "game/board/pause.h"
 #include "game/board/player.h"
+#include "game/board/shop.h"
 #include "game/board/space.h"
 #include "game/board/tutorial.h"
 #include "game/board/ui.h"

src/game/board/model.c

@@ -249,16 +249,16 @@ s16 BoardModelCreateCharacter(s32 character, s32 data_num, s32 *mot_list, s32 li
 s16 BoardModelCreateParam(BoardModelParam *param, Vec *pos, Vec *rot)
 {
 	float unk_param;
-	s16 model = BoardModelCreate(param->data_num, NULL, param->link);
+	s16 model = BoardModelCreate(param->data_num, NULL, param->unk4.link);
 	if(model == -1) {
 		return -1;
 	}
-	BoardModelMotionStart(model, 0, (param->pause) ? 0x40000001 : 0);
-	if(!param->start_mot) {
+	BoardModelMotionStart(model, 0, (param->unk4.pause) ? 0x40000001 : 0);
+	if(!param->unk4.start_mot) {
 		BoardModelMotionSpeedSet(model, 0.0f);
 	}
-	BoardModelExistDupe(model, param->field04_bit0);
-	BoardModelVisibilitySet(model, param->visible);
+	BoardModelExistDupe(model, param->unk4.field04_bit0);
+	BoardModelVisibilitySet(model, param->unk4.visible);
 	if(pos) {
 		BoardModelPosSetV(model, pos);
 	}

src/game/board/space.c

@@ -5,6 +5,7 @@
 #include "game/board/main.h"
 #include "game/board/model.h"
 #include "game/board/player.h"
+#include "game/board/shop.h"
 #include "game/board/space.h"
 #include "game/board/star.h"
 #include "game/board/tutorial.h"