diff --git a/config/GMPE01_00/rels/mstory4Dll/symbols.txt b/config/GMPE01_00/rels/mstory4Dll/symbols.txt
index 032687ab..01a56bcd 100644
--- a/config/GMPE01_00/rels/mstory4Dll/symbols.txt
+++ b/config/GMPE01_00/rels/mstory4Dll/symbols.txt
@@ -48,7 +48,7 @@ lbl_1_data_624 = .data:0x00000624; // type:object size:0x6 scope:local data:stri
 lbl_1_data_62A = .data:0x0000062A; // type:object size:0x7 scope:local data:string
 lbl_1_data_631 = .data:0x00000631; // type:object size:0x6 scope:local data:string
 lbl_1_data_637 = .data:0x00000637; // type:object size:0x9 scope:local
-lbl_1_data_640 = .data:0x00000640; // type:object size:0x20
+charNameTbl = .data:0x00000640; // type:object size:0x20
 lbl_1_data_660 = .data:0x00000660; // type:object size:0x16 scope:local data:string
 lbl_1_data_676 = .data:0x00000676; // type:object size:0x11 scope:local data:string
 lbl_1_data_687 = .data:0x00000687; // type:object size:0x10 scope:local data:string
diff --git a/include/game/data.h b/include/game/data.h
index f41a3816..288e5577 100644
--- a/include/game/data.h
+++ b/include/game/data.h
@@ -12,7 +12,7 @@
 #define DATA_DECODE_FSLIDE 4
 #define DATA_DECODE_RLE 5
 
-#define DATA_NUM_LISTEND -1
+#define DATA_NUM_LISTEND -1U
 
 #include "dolphin/types.h"
 
diff --git a/src/REL/m444dll/datalist.c b/src/REL/m444dll/datalist.c
index 9f085a98..3b4fbbaf 100644
--- a/src/REL/m444dll/datalist.c
+++ b/src/REL/m444dll/datalist.c
@@ -111,7 +111,7 @@ void fn_1_D588(DataListModel *model_list)
 	for(clear_i=0; clear_i<90; clear_i++) {
 		lbl_1_bss_199C2[clear_i] = lbl_1_bss_1990E[clear_i] = -1;
 	}
-	for(i=0; list->datanum != 0xFFFFFFFF; list++, i++) {
+	for(i=0; list->datanum != DATA_NUM_LISTEND; list++, i++) {
 		if(list->type == 0) {
 			data = HuDataSelHeapReadNum(list->datanum, MEMORY_DEFAULT_NUM, HEAP_DATA);
 			model = Hu3DModelCreate(data);
@@ -132,7 +132,7 @@ void fn_1_D588(DataListModel *model_list)
 		(void)i;
 	}
 	list = model_list;
-	for(i=0; list->datanum != 0xFFFFFFFF; list++, i++) {
+	for(i=0; list->datanum != DATA_NUM_LISTEND; list++, i++) {
 		if(list->type == 2) {
 			model = Hu3DModelLink(lbl_1_bss_199C2[list->link]);
 			lbl_1_bss_199C2[i] = model;
diff --git a/src/REL/modeseldll/datalist.c b/src/REL/modeseldll/datalist.c
index 40471638..07019d3f 100644
--- a/src/REL/modeseldll/datalist.c
+++ b/src/REL/modeseldll/datalist.c
@@ -60,7 +60,7 @@ void fn_1_BED8(DataListModel *model_list)
 	for(clear_i=0; clear_i<24; clear_i++) {
 		lbl_1_bss_19A[clear_i] = lbl_1_bss_16A[clear_i] = -1;
 	}
-	for(i=0; list->datanum != 0xFFFFFFFF; list++, i++) {
+	for(i=0; list->datanum != DATA_NUM_LISTEND; list++, i++) {
 		if(list->type == 0) {
 			data = HuDataSelHeapReadNum(list->datanum, MEMORY_DEFAULT_NUM, HEAP_DATA);
 			model = Hu3DModelCreate(data);
@@ -81,7 +81,7 @@ void fn_1_BED8(DataListModel *model_list)
 		(void)i;
 	}
 	list = model_list;
-	for(i=0; list->datanum != 0xFFFFFFFF; list++, i++) {
+	for(i=0; list->datanum != DATA_NUM_LISTEND; list++, i++) {
 		if(list->type == 2) {
 			model = Hu3DModelLink(lbl_1_bss_19A[list->link]);
 			lbl_1_bss_19A[i] = model;
diff --git a/src/REL/mstory4Dll/main.c b/src/REL/mstory4Dll/main.c
index a6d09788..1fa909da 100644
--- a/src/REL/mstory4Dll/main.c
+++ b/src/REL/mstory4Dll/main.c
@@ -483,7 +483,7 @@ void fn_1_12E8(void)
 	}
 }
 
-char *lbl_1_data_640[] = {
+char *charNameTbl[] = {
 	"Mario",
 	"Luigi",
 	"Peach",
@@ -524,7 +524,7 @@ void fn_1_13A0(void)
 		}
 		print8(x, y+(row_h*5), scale, "Chara Name :");
 		fontcolor = 13;
-		print8(x, y+(row_h*5), scale, "             %s", lbl_1_data_640[itemno/6]);
+		print8(x, y+(row_h*5), scale, "             %s", charNameTbl[itemno/6]);
 		fontcolor = 15;
 		print8(x, y+(row_h*6), scale, "Item  Name :");
 		if(lbl_1_data_0[itemno].unk10 == 1) {
@@ -578,7 +578,7 @@ void fn_1_13A0(void)
 		s32 character;
 		for(i=1; i<4; i++) {
 			GWPlayerCfg[i].character = GWPlayerCfg[i-1].character+1;
-			if(GWPlayerCfg[i].character > 8) {
+			if(GWPlayerCfg[i].character > GW_CHARACTER_MAX) {
 				GWPlayerCfg[i].character = 0;
 			}				
 		}
diff --git a/src/REL/resultDll/datalist.c b/src/REL/resultDll/datalist.c
index af956902..6b5705a2 100644
--- a/src/REL/resultDll/datalist.c
+++ b/src/REL/resultDll/datalist.c
@@ -17,7 +17,7 @@ void fn_1_8FF8(DataListModel *model_list)
 	for(clear_i=0; clear_i<32; clear_i++) {
 		lbl_1_bss_1A9C[clear_i] = lbl_1_bss_1A5C[clear_i] = -1;
 	}
-	for(i=0; list->datanum != 0xFFFFFFFF; list++, i++) {
+	for(i=0; list->datanum != DATA_NUM_LISTEND; list++, i++) {
 		if(list->type == 0) {
 			data = HuDataSelHeapReadNum(list->datanum, MEMORY_DEFAULT_NUM, HEAP_DATA);
 			model = Hu3DModelCreate(data);
@@ -38,7 +38,7 @@ void fn_1_8FF8(DataListModel *model_list)
 		(void)i;
 	}
 	list = model_list;
-	for(i=0; list->datanum != 0xFFFFFFFF; list++, i++) {
+	for(i=0; list->datanum != DATA_NUM_LISTEND; list++, i++) {
 		if(list->type == 2) {
 			model = Hu3DModelLink(lbl_1_bss_1A9C[list->link]);
 			lbl_1_bss_1A9C[i] = model;
diff --git a/src/REL/w02Dll/main.c b/src/REL/w02Dll/main.c
index af50d141..db0b592e 100644
--- a/src/REL/w02Dll/main.c
+++ b/src/REL/w02Dll/main.c
@@ -266,7 +266,7 @@ void fn_1_990(void) {
 
 
     currPlayer = GWSystem.player_curr;
-    BoardWinCreateChoice(2, 0x130011U, 4, 0);
+    BoardWinCreateChoice(2, MAKE_MESSID(19, 17), 4, 0);
     if (GWPlayer[currPlayer].com) {
         if (frandBool() != 0) {
             BoardComKeySetLeft();
@@ -278,7 +278,7 @@ void fn_1_990(void) {
     BoardWinKill();
     textChoice = BoardWinChoiceGet();
     if ((textChoice == 1) || (textChoice == -1)) {
-        BoardWinCreate(2, 0x130012U, 4);
+        BoardWinCreate(2, MAKE_MESSID(19, 18), 4);
         BoardWinWait();
         BoardWinKill();
         BoardMGExit();
@@ -288,7 +288,7 @@ void fn_1_990(void) {
         BoardMGDoneFlagSet(0);
         return;
     }
-    BoardAudSeqPause(0, 1, 0x3E8);
+    BoardAudSeqPause(0, 1, 1000);
     HuPrcChildCreate(fn_1_954, 0x2003U, 0x1000U, 0, boardMainProc);
     rotation.x = 0.0f;
     rotation.y = rotation.z = 0.0f;
@@ -328,7 +328,7 @@ void fn_1_C50(void) {
 
     currPlayer = GWSystem.player_curr;
     if (BoardPlayerItemCount((s32) currPlayer) == 3) {
-        BoardWinCreate(2, 0x13001A, 4);
+        BoardWinCreate(2, MAKE_MESSID(19, 26), 4);
         BoardWinWait();
         BoardWinKill();
         HuPrcEnd();
@@ -357,7 +357,7 @@ void fn_1_C50(void) {
     fn_1_79BC(lbl_1_bss_8);
 
     HuAudFXPlay(0x43);
-    BoardWinCreateChoice(2, 0x130016, 4, 0);
+    BoardWinCreateChoice(2, MAKE_MESSID(19, 22), 4, 0);
     if (GWPlayer[currPlayer].com) {
         if (BoardComPreferItemCheck(currPlayer, lbl_1_bss_8[0], lbl_1_bss_8[1], lbl_1_bss_8[2]) != -1) {
             BoardComKeySetLeft();
@@ -370,7 +370,7 @@ void fn_1_C50(void) {
     textChoice = BoardWinChoiceGet();
     if ((textChoice == 1) || (textChoice == -1)) {
         HuAudFXPlay(0x44);
-        BoardWinCreate(2, 0x130017, 4);
+        BoardWinCreate(2, MAKE_MESSID(19, 23), 4);
         BoardWinWait();
         BoardWinKill();
         BoardMGExit();
diff --git a/src/REL/w02Dll/mg_coin.c b/src/REL/w02Dll/mg_coin.c
index d1cf3755..a1ce769c 100644
--- a/src/REL/w02Dll/mg_coin.c
+++ b/src/REL/w02Dll/mg_coin.c
@@ -348,7 +348,7 @@ void fn_1_46E8(void)
 		BoardModelAttrReset(lbl_1_bss_30[9], 0x40000002);
 	}
 	sprintf(sp8, "%d", lbl_1_bss_84);
-	BoardWinCreate(2, 0x130013, 4);
+	BoardWinCreate(2, MAKE_MESSID(19, 19), 4);
 	BoardWinInsertMesSet((u32)sp8, 0);
 	BoardWinWait();
 	BoardWinKill();
diff --git a/src/REL/w02Dll/mg_item.c b/src/REL/w02Dll/mg_item.c
index 895e3a69..a03f2ed7 100644
--- a/src/REL/w02Dll/mg_item.c
+++ b/src/REL/w02Dll/mg_item.c
@@ -424,7 +424,7 @@ void fn_1_6EA8(void)
 	s32 temp_r28;
 	
 	temp_r31 = lbl_1_bss_108->work[0];
-	BoardWinCreate(2, 0x130018, 4);
+	BoardWinCreate(2, MAKE_MESSID(19, 24), 4);
 	BoardWinInsertMesSet(lbl_1_bss_190[temp_r31]+0x80000, 1);
 	BoardWinWait();
 	BoardWinKill();
diff --git a/src/REL/w02Dll/roulette.c b/src/REL/w02Dll/roulette.c
index dda61fc4..2a2808bc 100644
--- a/src/REL/w02Dll/roulette.c
+++ b/src/REL/w02Dll/roulette.c
@@ -107,7 +107,7 @@ s32 fn_1_BE88(void) {
     fn_1_121C(0x130002);
 
     do {
-        BoardWinCreateChoice(2, 0x13001DU, 4, 0);
+        BoardWinCreateChoice(2, MAKE_MESSID(19, 29), 4, 0);
         /* COM has 50% to bribe goomba */
         if (GWPlayer[lbl_1_bss_388].com) {
             if (frandBool()) {
@@ -121,7 +121,7 @@ s32 fn_1_BE88(void) {
         rouletteChoice = BoardWinChoiceGet();
         // If chose to play roulette
         if (rouletteChoice == 0) {
-            BoardWinCreateChoice(1, 0x130003U, 4, 0);
+            BoardWinCreateChoice(1, MAKE_MESSID(19, 3), 4, 0);
             playerCoinRegion = 3;
             if (coinAmount < 0x14) {
                 BoardWinChoiceDisable(0);
diff --git a/src/REL/w03Dll/condor.c b/src/REL/w03Dll/condor.c
index a8d7a2a8..cfc9a13a 100644
--- a/src/REL/w03Dll/condor.c
+++ b/src/REL/w03Dll/condor.c
@@ -230,12 +230,12 @@ s32 fn_1_3478(s32 arg0) {
     
     BoardModelMotionShiftSet(lbl_1_data_310, 1, 0.0f, 5.0f, 0x40000001);
     temp_r26 = BoardPlayerGetCharMess(arg0);
-    BoardWinCreate(2, 0x160010, 8);
+    BoardWinCreate(2, MAKE_MESSID(22, 16), 8);
     BoardWinInsertMesSet(temp_r26, 3);
     BoardWinWait();
 
     if (BoardPlayerCoinsGet(arg0) < 5) {
-        BoardWinCreate(2, 0x160013, 8);
+        BoardWinCreate(2, MAKE_MESSID(22, 19), 8);
         BoardWinWait();
         BoardWinKill();
         return 0;
@@ -243,7 +243,7 @@ s32 fn_1_3478(s32 arg0) {
 
     var_r29 = 0;
     while (var_r29 == 0) {
-        BoardWinCreateChoice(2, 0x160011, 8, 0);
+        BoardWinCreateChoice(2, MAKE_MESSID(22, 17), 8, 0);
         BoardWinAttrSet(0x10);
         
         if (GWPlayer[arg0].com != 0) {
@@ -261,7 +261,7 @@ s32 fn_1_3478(s32 arg0) {
             break;
         default:
         case 1:
-            BoardWinCreate(2, 0x160014, 8);
+            BoardWinCreate(2, MAKE_MESSID(22, 20), 8);
             BoardWinWait();
             BoardWinKill();
             return 0;
@@ -501,7 +501,7 @@ void fn_1_3F5C(s32 arg0) {
         HuPrcVSleep();
     }
 
-    BoardWinCreate(2, 0x16000F, 8);
+    BoardWinCreate(2, MAKE_MESSID(22, 15), 8);
     BoardWinWait();
     BoardWinKill();
 }
diff --git a/src/REL/w03Dll/mg_coin.c b/src/REL/w03Dll/mg_coin.c
index 6a06ff1e..fa2cb7dc 100644
--- a/src/REL/w03Dll/mg_coin.c
+++ b/src/REL/w03Dll/mg_coin.c
@@ -137,7 +137,7 @@ s32 fn_1_7D18(s32 arg0) {
     s16 temp_r28;
     f32 arctan;
     
-    BoardWinCreateChoice(2, 0x160015, 2, 0);
+    BoardWinCreateChoice(2, MAKE_MESSID(22, 21), 2, 0);
 
     if (GWPlayer[arg0].com != 0) {
         BoardComKeySetLeft();
@@ -147,7 +147,7 @@ s32 fn_1_7D18(s32 arg0) {
     BoardWinKill();
 
     if (BoardWinChoiceGet() != 0) {
-        BoardWinCreate(2, 0x160018, 2);
+        BoardWinCreate(2, MAKE_MESSID(22, 24), 2);
         BoardWinWait();
         BoardWinKill();
         return 0;
@@ -635,7 +635,7 @@ void fn_1_9384(void) {
 
 void fn_1_9474(s32 arg0) {
     sprintf(lbl_1_bss_150, "%d", lbl_1_bss_14C);
-    BoardWinCreate(2, 0x160017U, 2);
+    BoardWinCreate(2, MAKE_MESSID(22, 23), 2);
     BoardWinInsertMesSet((u32)lbl_1_bss_150, 4);
     BoardWinWait();
     BoardWinKill();
@@ -658,7 +658,7 @@ void fn_1_9474(s32 arg0) {
         HuPrcVSleep();
     }
 
-    BoardWinCreate(2, 0x160018U, 2);
+    BoardWinCreate(2, MAKE_MESSID(22, 24), 2);
     BoardWinWait();
     BoardWinKill();
     BoardModelMotionStart(lbl_1_bss_C[7], 0, 0x40000002);
diff --git a/src/REL/w03Dll/mg_item.c b/src/REL/w03Dll/mg_item.c
index e672440f..2644f97b 100644
--- a/src/REL/w03Dll/mg_item.c
+++ b/src/REL/w03Dll/mg_item.c
@@ -211,13 +211,13 @@ s32 fn_1_9CF4(s32 arg0) {
     s16 temp_r29;
 
     if (BoardPlayerItemCount(arg0) == 3) {
-        BoardWinCreate(2, 0x16001E, 2);
+        BoardWinCreate(2, MAKE_MESSID(22, 30), 2);
         BoardWinWait();
         BoardWinKill();
         return 0;
     }
 
-    BoardWinCreateChoice(2, 0x16001A, 2, 0);
+    BoardWinCreateChoice(2, MAKE_MESSID(22, 26), 2, 0);
 
     if (GWPlayer[arg0].com != 0) {
         BoardComKeySetLeft();
@@ -226,7 +226,7 @@ s32 fn_1_9CF4(s32 arg0) {
     BoardWinWait();
 
     if (BoardWinChoiceGet() != 0) {
-        BoardWinCreate(2, 0x16001B, 2);
+        BoardWinCreate(2, MAKE_MESSID(22, 27), 2);
         BoardWinWait();
         BoardWinKill();
         return 0;
@@ -361,7 +361,7 @@ void fn_1_A44C(s32 arg0) {
     }
 
     temp_r29 = fn_1_BBC4() + 0x80000;
-    BoardWinCreate(2, 0x16001C, 2);
+    BoardWinCreate(2, MAKE_MESSID(22, 28), 2);
     BoardWinInsertMesSet(temp_r29, 0);
     BoardWinWait();
     fn_1_B8E8(4);
@@ -386,7 +386,7 @@ void fn_1_A44C(s32 arg0) {
     }
 
     HuPrcSleep(0x1E);
-    BoardWinCreate(2, 0x16001D, 2);
+    BoardWinCreate(2, MAKE_MESSID(22, 29), 2);
     BoardWinWait();
     BoardWinKill();
 }
diff --git a/src/REL/w03Dll/river.c b/src/REL/w03Dll/river.c
index a1359f2e..99d0aeda 100644
--- a/src/REL/w03Dll/river.c
+++ b/src/REL/w03Dll/river.c
@@ -176,12 +176,12 @@ s32 fn_1_6898(s32 arg0) {
     }
 
     BoardCameraTargetModelSet(-1);
-    BoardWinCreate(2, 0x160009, 2);
+    BoardWinCreate(2, MAKE_MESSID(22, 9), 2);
     BoardWinWait();
     temp_r3 = BoardPlayerCoinsGet(arg0);
 
     if (temp_r3 < 5) {
-        BoardWinCreate(2, 0x16000A, 2);
+        BoardWinCreate(2, MAKE_MESSID(22, 10), 2);
         BoardWinWait();
         BoardWinKill();
         return 0;
@@ -202,7 +202,7 @@ s32 fn_1_6898(s32 arg0) {
 
     j = 0;
     while (j == 0) {
-        BoardWinCreateChoice(2, 0x16000B, 2, 0);
+        BoardWinCreateChoice(2, MAKE_MESSID(22, 11), 2, 0);
         BoardWinInsertMesSet(lbl_1_bss_130, 2);
         BoardWinAttrSet(0x10);
 
@@ -219,7 +219,7 @@ s32 fn_1_6898(s32 arg0) {
             break;
         case 1:
         case -1:
-            BoardWinCreate(2, 0x16000E, 2);
+            BoardWinCreate(2, MAKE_MESSID(22, 14), 2);
             BoardWinWait();
             BoardWinKill();
             return 0;
@@ -235,7 +235,7 @@ s32 fn_1_6898(s32 arg0) {
     }
 
     HuAudFXPlay(0xF);
-    BoardWinCreate(2, 0x0016000C, 2);
+    BoardWinCreate(2, MAKE_MESSID(22, 12), 2);
     BoardWinWait();
     BoardWinKill();
     return 1;
@@ -434,7 +434,7 @@ void fn_1_735C(s32 arg0) {
     GWPlayer[arg0].space_curr = temp_r29;
     GWPlayer[arg0].space_prev = -1;
     BoardPlayerPostTurnHookSet(arg0, fn_1_6698);
-    BoardWinCreate(2, 0x16000D, 2);
+    BoardWinCreate(2, MAKE_MESSID(22, 13), 2);
     BoardWinWait();
     BoardWinKill();
 }
diff --git a/src/REL/w03Dll/statue.c b/src/REL/w03Dll/statue.c
index c5855b55..ac985685 100644
--- a/src/REL/w03Dll/statue.c
+++ b/src/REL/w03Dll/statue.c
@@ -88,7 +88,7 @@ void fn_1_1358(void) {
         }
         if (lbl_1_bss_2C) {
             sprintf(lbl_1_bss_44, "%d", lbl_1_bss_2C);
-            BoardWinCreate(0, 0x160006, -1);
+            BoardWinCreate(0, MAKE_MESSID(22, 6), -1);
             BoardWinInsertMesSet((s32)lbl_1_bss_44, 0);
             BoardWinWait();
             BoardWinKill();
@@ -145,7 +145,7 @@ s32 fn_1_1650(s32 arg0) {
     BoardPlayerIdleSet(arg0);
     
     if (lbl_1_bss_0->unk2) {
-        BoardWinCreate(0, 0x160000, -1);
+        BoardWinCreate(0, MAKE_MESSID(22, 0), -1);
         BoardWinWait();
         BoardWinKill();
         return 0;
@@ -178,9 +178,9 @@ s32 fn_1_1650(s32 arg0) {
     }
     
     BoardPlayerIdleSet(arg0);
-    BoardWinCreate(2, 0x160001, 2);
+    BoardWinCreate(2, MAKE_MESSID(22, 1), 2);
     BoardWinWait();
-    BoardWinCreateChoice(0, 0x160002, -1, 0);
+    BoardWinCreateChoice(0, MAKE_MESSID(22, 2), -1, 0);
     BoardWinAttrSet(0x10);
 
     if (GWPlayer[arg0].com) {
@@ -338,7 +338,7 @@ s32 fn_1_1D1C(void) {
     while (BoardMusStatusGet(1) != 0) {
         HuPrcVSleep();
     }
-    BoardWinCreate(2, 0x160003, 2);
+    BoardWinCreate(2, MAKE_MESSID(22, 3), 2);
     BoardWinWait();
     BoardWinKill();
 
@@ -404,7 +404,7 @@ void fn_1_1ED4(s32 arg0) {
     }
 
     BoardAudSeqPause(0, 0, 1000);
-    BoardWinCreate(2, 0x160004, 2);
+    BoardWinCreate(2, MAKE_MESSID(22, 4), 2);
     BoardWinWait();
     BoardWinKill();
     BoardConfettiStop();
@@ -482,7 +482,7 @@ void fn_1_20E0(s32 arg0) {
     }
     
     BoardAudSeqPause(0, 0, 1000);
-    BoardWinCreate(2, 0x160005, 2);
+    BoardWinCreate(2, MAKE_MESSID(22, 5), 2);
     BoardWinWait();
     BoardCameraQuakeSet(0x8CA0, 100.0f);
     omVibrate(arg0, 0xE10, 4, 2);
@@ -588,7 +588,7 @@ s32 fn_1_2930(s32 arg0) {
         lbl_1_bss_0->unk2 = 0;
         lbl_1_bss_0->unk0 = 0;
         fn_1_B5C(0);
-        BoardWinCreate(0, 0x160008, -1);
+        BoardWinCreate(0, MAKE_MESSID(22, 8), -1);
         BoardWinWait();
         BoardWinKill();
         fn_1_CF4();
@@ -596,7 +596,7 @@ s32 fn_1_2930(s32 arg0) {
     }
 
     sprintf(lbl_1_bss_38, "%d", lbl_1_bss_0->unk0);
-    BoardWinCreate(0, 0x160007, -1);
+    BoardWinCreate(0, MAKE_MESSID(22, 7), -1);
     BoardWinInsertMesSet((s32)lbl_1_bss_38, 1);
     BoardWinWait();
     BoardWinKill();
diff --git a/src/REL/w05Dll/dolphin.c b/src/REL/w05Dll/dolphin.c
index 9319cee0..2ea78c06 100644
--- a/src/REL/w05Dll/dolphin.c
+++ b/src/REL/w05Dll/dolphin.c
@@ -149,7 +149,7 @@ void fn_1_4034(s32 arg0) {
     BoardCameraViewSet(2);
     BoardCameraMotionWait();
     HuAudFXPlay(0x480);
-    BoardWinCreate(2, 0x270007, 0xA);
+    BoardWinCreate(2, MAKE_MESSID(39, 7), 0xA);
     BoardWinWait();
     BoardWinKill();
     if (arg0 >= 4) {
diff --git a/src/REL/w05Dll/hotel.c b/src/REL/w05Dll/hotel.c
index 285330e9..73256443 100644
--- a/src/REL/w05Dll/hotel.c
+++ b/src/REL/w05Dll/hotel.c
@@ -121,7 +121,7 @@ void fn_1_155C(void) {
         BoardWinCreate(2, var_r27, 7);
         BoardWinInsertMesSet(MAKE_MESSID_PTR(sp8), 1);
     } else {
-        BoardWinCreate(2, 0x270003, 7);
+        BoardWinCreate(2, MAKE_MESSID(39, 3), 7);
         BoardWinInsertMesSet(MAKE_MESSID_PTR(sp18), 0);
     }
     BoardWinWait();
@@ -135,7 +135,7 @@ void fn_1_155C(void) {
         HuAudFXPlay(0xF);
         lbl_1_bss_0->unk_00 += var_r30;
         sprintf(sp18, "%d", lbl_1_bss_0->unk_00);
-        BoardWinCreate(2, 0x270016, 7);
+        BoardWinCreate(2, MAKE_MESSID(39, 22), 7);
         BoardWinInsertMesSet(MAKE_MESSID_PTR(sp18), 0);
         BoardWinWait();
         BoardWinKill();
@@ -275,7 +275,7 @@ void fn_1_1E44(void) {
         HuPrcVSleep();
     }
     if (lbl_1_bss_0->unk_00 == 0) {
-        BoardWinCreate(2, 0x270005, 7);
+        BoardWinCreate(2, MAKE_MESSID(39, 5), 7);
         BoardWinWait();
         BoardWinKill();
     } else {
@@ -299,9 +299,9 @@ void fn_1_1E44(void) {
         sprintf(&sp84, "%d", lbl_1_bss_0->unk_00);
         sprintf(&sp74, "%d", var_r28);
         if (var_r28 == lbl_1_bss_0->unk_00) {
-            BoardWinCreate(2, 0x270004, 7);
+            BoardWinCreate(2, MAKE_MESSID(39, 4), 7);
         } else {
-            BoardWinCreate(2, 0x270017, 7);
+            BoardWinCreate(2, MAKE_MESSID(39, 23), 7);
         }
         BoardWinInsertMesSet(MAKE_MESSID_PTR(sp84), 0);
         BoardWinInsertMesSet(MAKE_MESSID_PTR(sp74), 1);
@@ -369,7 +369,7 @@ void fn_1_1E44(void) {
         }
         BoardModelKill(temp_r3);
         HuPadRumbleStop(GWPlayer[lbl_1_bss_28].port);
-        BoardWinCreate(0, 0x270006, -1);
+        BoardWinCreate(0, MAKE_MESSID(39, 6), -1);
         BoardWinWait();
         BoardWinKill();
         HuPrcSleep(0x1E);
diff --git a/src/REL/w05Dll/main.c b/src/REL/w05Dll/main.c
index f2c14f97..6c45d892 100644
--- a/src/REL/w05Dll/main.c
+++ b/src/REL/w05Dll/main.c
@@ -233,7 +233,7 @@ void fn_1_954(void) {
 
     temp_r30 = GWSystem.player_curr;
     if (BoardPlayerItemCount(temp_r30) == 3) {
-        BoardWinCreate(2, 0x270009, 7);
+        BoardWinCreate(2, MAKE_MESSID(39, 9), 7);
         BoardWinWait();
         BoardWinKill();
         HuPrcEnd();
@@ -256,7 +256,7 @@ void fn_1_954(void) {
         var_r31++;
     }
     fn_1_74D0(lbl_1_bss_8);
-    BoardWinCreateChoice(2, 0x27000A, 7, 0);
+    BoardWinCreateChoice(2, MAKE_MESSID(39, 10), 7, 0);
     if (GWPlayer[temp_r30].com != 0) {
         if (BoardComPreferItemCheck(temp_r30, lbl_1_bss_8[0], lbl_1_bss_8[1], lbl_1_bss_8[2]) != -1) {
             BoardComKeySetLeft();
@@ -271,7 +271,7 @@ void fn_1_954(void) {
         while (((u32)fn_1_8884() & 0x10) == 0) {
             HuPrcVSleep();
         }
-        BoardWinCreate(2, 0x27000B, 7);
+        BoardWinCreate(2, MAKE_MESSID(39, 11), 7);
         BoardWinWait();
         BoardWinKill();
         BoardMGExit();
@@ -346,7 +346,7 @@ void fn_1_E40(void) {
 
     temp_r31 = GWSystem.player_curr;
     fn_1_96B4();
-    BoardWinCreateChoice(2, 0x27000F, 7, 0);
+    BoardWinCreateChoice(2, MAKE_MESSID(39, 15), 7, 0);
     if (GWPlayer[temp_r31].com != 0) {
         if (frandBool() != 0) {
             BoardComKeySetLeft();
@@ -359,7 +359,7 @@ void fn_1_E40(void) {
     temp_r30 = BoardWinChoiceGet();
     if ((temp_r30 == 1) || (temp_r30 == -1)) {
         fn_1_9760();
-        BoardWinCreate(2, 0x270010, 7);
+        BoardWinCreate(2, MAKE_MESSID(39, 16), 7);
         BoardWinWait();
         BoardWinKill();
         BoardMGExit();
diff --git a/src/REL/w05Dll/mg_coin.c b/src/REL/w05Dll/mg_coin.c
index 45e93786..875a2947 100644
--- a/src/REL/w05Dll/mg_coin.c
+++ b/src/REL/w05Dll/mg_coin.c
@@ -137,8 +137,7 @@ void fn_1_9C98(dataCopy2* arg0) {
 void fn_1_9D0C(omObjData* arg0) {
     Vec sp1C;
     Vec sp10;
-    f32 spC;
-    f32 sp8;
+    f32 sp8[2];
     s32 var_r30;
     dataCopy2* temp_r31;
 
@@ -147,8 +146,8 @@ void fn_1_9D0C(omObjData* arg0) {
     temp_r31->unk_02 = 5;
     temp_r31->unk_04 = 0x3C;
     temp_r31->unk_00 = MGSeqCreate(1, temp_r31->unk_02, 0x120, 0x40);
-    HuWinMesMaxSizeGet(1, &sp8, 0x27000E);
-    temp_r31->unk_06 = HuWinCreate(-10000.0f, 368.0f, sp8, spC, 0);
+    HuWinMesMaxSizeGet(1, sp8, 0x27000E);
+    temp_r31->unk_06 = HuWinCreate(-10000.0f, 368.0f, sp8[0], sp8[1], 0);
     HuWinMesSet(temp_r31->unk_06, 0x27000E);
     HuWinBGTPLvlSet(temp_r31->unk_06, 0.0f);
     HuWinMesSpeedSet(temp_r31->unk_06, 0);
@@ -374,9 +373,9 @@ void fn_1_AB24(void) {
     }
     HuPrcSleep(0x1E);
     lbl_1_bss_C6 = lbl_1_data_4B2[lbl_1_bss_C2];
-    BoardAudSeqPause(0, 0, 0x3E8);
+    BoardAudSeqPause(0, 0, 1000);
     sprintf(&sp8, "%d", lbl_1_bss_C6);
-    BoardWinCreate(2, 0x270011, 7);
+    BoardWinCreate(2, MAKE_MESSID(39, 17), 7);
     BoardWinInsertMesSet((u32)&sp8, 0);
     BoardWinInsertMesSet(lbl_1_data_4B8[lbl_1_bss_C2], 1);
     BoardWinWait();
@@ -437,7 +436,7 @@ loop_10:
     while (BoardPlayerMotionEndCheck(lbl_1_bss_C0) == 0) {
         HuPrcVSleep();
     }
-    BoardWinCreate(2, 0x270012, 7);
+    BoardWinCreate(2, MAKE_MESSID(39, 18), 7);
     BoardWinWait();
     BoardWinKill();
     temp_r30->func = fn_1_B214;
diff --git a/src/REL/w05Dll/mg_item.c b/src/REL/w05Dll/mg_item.c
index c6613000..92c0f959 100644
--- a/src/REL/w05Dll/mg_item.c
+++ b/src/REL/w05Dll/mg_item.c
@@ -306,7 +306,7 @@ void fn_1_799C(void) {
     while (fn_1_1208(lbl_1_bss_14[6], 90.0f, 6.0f) == 0) {
         HuPrcVSleep();
     }
-    BoardWinCreate(2, 0x27000C, 7);
+    BoardWinCreate(2, MAKE_MESSID(39, 12), 7);
     BoardWinInsertMesSet(lbl_1_bss_B0[temp_r31] + 0x80000, 0);
     BoardWinWait();
     BoardWinKill();
@@ -349,7 +349,7 @@ void fn_1_799C(void) {
         HuPrcVSleep();
     }
     BoardAudSeqPause(0, 0, 0x3E8);
-    BoardWinCreate(2, 0x27000D, 7);
+    BoardWinCreate(2, MAKE_MESSID(39, 13), 7);
     BoardWinWait();
     BoardWinKill();
     temp_r30->func = &fn_1_7E4C;
@@ -372,8 +372,7 @@ void fn_1_7E94(dataCopy* arg0) {
 }
 
 void fn_1_7F04(omObjData* arg0) {
-    f32 spC;
-    f32 sp8;
+    f32 sp8[2];
     s32 var_r30;
     s32 var_r28;
     dataCopy* temp_r31;
@@ -382,8 +381,8 @@ void fn_1_7F04(omObjData* arg0) {
     temp_r31->unk_00 = 5;
     temp_r31->unk_02 = 0x3C;
     temp_r31->unk_04 = MGSeqCreate(1, temp_r31->unk_00, 0x120, 0x40);
-    HuWinMesMaxSizeGet(1, &sp8, 0x27000E);
-    temp_r31->unk_06 = HuWinCreate(-10000.0f, 344.0f, sp8, spC, 0);
+    HuWinMesMaxSizeGet(1, sp8, 0x27000E);
+    temp_r31->unk_06 = HuWinCreate(-10000.0f, 344.0f, sp8[0], sp8[1], 0);
     HuWinMesSet(temp_r31->unk_06, 0x27000E);
     HuWinBGTPLvlSet(temp_r31->unk_06, 0.0f);
     HuWinMesSpeedSet(temp_r31->unk_06, 0);
@@ -616,31 +615,33 @@ void fn_1_896C(void) {
     sp8 = 0.0f;
     var_f31 = 12.0f;
     
-loop_20:
-    for (var_r28 = 0, var_r31 = 0; var_r31 < 3; var_r31++) {
-        var_r29 = (1 << var_r31);
-        if ((temp_r30 & var_r29) != 0) {
-            var_r28++;
-            sp8 += 0.1f;
-            if (sp8 > 1.0f) {
-                sp8 = 1.0f;
-            }
+    while (1) {
+        for (var_r28 = 0, var_r31 = 0; var_r31 < 3; var_r31++) {
+            var_r29 = (1 << var_r31);
+            if ((temp_r30 & var_r29) != 0) {
+                var_r28++;
+                sp8 += 0.1f;
+                if (sp8 > 1.0f) {
+                    sp8 = 1.0f;
+                }
 
-            spC.x = spC.y = spC.z = sp8;
-            BoardModelScaleSetV(lbl_1_bss_A4[var_r31], (Vec* ) &sp8); //!
-            BoardModelPosGet(lbl_1_bss_A4[var_r31], &sp18);
-            sp18.y += var_f31;
-            if (sp18.y >= temp_f29) {
-                sp18.y = temp_f29;
-                var_r28 -= 1;
+                spC.x = spC.y = spC.z = sp8;
+                BoardModelScaleSetV(lbl_1_bss_A4[var_r31], (Vec* ) &sp8); //!
+                BoardModelPosGet(lbl_1_bss_A4[var_r31], &sp18);
+                sp18.y += var_f31;
+                if (sp18.y >= temp_f29) {
+                    sp18.y = temp_f29;
+                    var_r28 -= 1;
+                }
+                BoardModelPosSetV(lbl_1_bss_A4[var_r31], &sp18);
             }
-            BoardModelPosSetV(lbl_1_bss_A4[var_r31], &sp18);
         }
-    }
-    var_f31 *= 0.95f;
-    if (var_r28 > 0) {
-        HuPrcVSleep();
-        goto loop_20;
+        var_f31 *= 0.95f;
+        if (var_r28 > 0) {
+            HuPrcVSleep();
+        } else {
+            break;
+        }
     }
     spC.x = spC.y = spC.z = 1.0f;
     for (var_r31 = 0; var_r31 < 3; var_r31++) {
@@ -653,56 +654,59 @@ loop_20:
     HuPrcCurrentGet()->user_data = (void*)temp_r30;
     var_f30 = 0.0f;
 
-loop_37:
-    temp_r30 = (u32) HuPrcCurrentGet()->user_data;
-    if ((temp_r30 & 8) == 0) {
-        for (var_r31 = 0; var_r31 < 3; var_r31++) {
-            var_r29 = (1 << var_r31);
-            if ((temp_r30 & var_r29) != 0) {
-                BoardModelPosGet(lbl_1_bss_A4[var_r31], &sp18);
-                sp18.y = (sp18.y + (0.25 * sin((M_PI * var_f30) / 180.0)));
-                BoardModelPosSetV(lbl_1_bss_A4[var_r31], &sp18);
+    while (1) {
+        temp_r30 = (u32) HuPrcCurrentGet()->user_data;
+        if ((temp_r30 & 8) == 0) {
+            for (var_r31 = 0; var_r31 < 3; var_r31++) {
+                var_r29 = (1 << var_r31);
+                if ((temp_r30 & var_r29) != 0) {
+                    BoardModelPosGet(lbl_1_bss_A4[var_r31], &sp18);
+                    sp18.y = (sp18.y + (0.25 * sin((M_PI * var_f30) / 180.0)));
+                    BoardModelPosSetV(lbl_1_bss_A4[var_r31], &sp18);
+                }
             }
+            var_f30 += 5.0f;
+            if (var_f30 >= 360.0f) {
+                var_f30 -= 360.0f;
+            }
+            HuPrcVSleep();
+        } else {
+            break;
         }
-        var_f30 += 5.0f;
-        if (var_f30 >= 360.0f) {
-            var_f30 -= 360.0f;
-        }
-        HuPrcVSleep();
-        goto loop_37;
     }
-    
     for (var_r31 = 0; var_r31 < 3; var_r31++) {
         BoardModelMotionStartEndSet(lbl_1_bss_AA[var_r31], 0x28, 0x46);
     }
-    HuPrcSleep(0xD);
+    HuPrcSleep(13);
     var_f31 = -8.0f;
-loop_50:
-    for (var_r28 = 0, var_r31 = 0; var_r31 < 3; var_r31++) {
-        var_r29 = (1 << var_r31);
-        if ((temp_r30 & var_r29) != 0) {
-            var_r28++;
-            sp8 -= 0.02f;
-            if (sp8 < 0.0f) {
-                sp8 = 0.0f;
+    while (1) {
+        for (var_r28 = 0, var_r31 = 0; var_r31 < 3; var_r31++) {
+            var_r29 = (1 << var_r31);
+            if ((temp_r30 & var_r29) != 0) {
+                var_r28++;
+                sp8 -= 0.02f;
+                if (sp8 < 0.0f) {
+                    sp8 = 0.0f;
+                }
+                spC.x = spC.y = spC.z = sp8;
+                BoardModelScaleSetV(lbl_1_bss_A4[var_r31], (Vec* ) &sp8); //!
+                BoardModelPosGet(lbl_1_bss_A4[var_r31], &sp18);
+                sp18.y += var_f31;
+                if (sp18.y <= (temp_f29 - 150.0f)) {
+                    sp18.y = temp_f29 - 150.0f;
+                }
+                if (BoardModelMotionTimeGet(lbl_1_bss_AA[var_r31]) >= 70.0f) {
+                    var_r28--;
+                }
+                BoardModelPosSetV(lbl_1_bss_A4[var_r31], &sp18);
             }
-            spC.x = spC.y = spC.z = sp8;
-            BoardModelScaleSetV(lbl_1_bss_A4[var_r31], (Vec* ) &sp8); //!
-            BoardModelPosGet(lbl_1_bss_A4[var_r31], &sp18);
-            sp18.y += var_f31;
-            if (sp18.y <= (temp_f29 - 150.0f)) {
-                sp18.y = temp_f29 - 150.0f;
-            }
-            if (BoardModelMotionTimeGet(lbl_1_bss_AA[var_r31]) >= 70.0f) {
-                var_r28--;
-            }
-            BoardModelPosSetV(lbl_1_bss_A4[var_r31], &sp18);
         }
-    }
-    var_f31 *= 0.98f;
-    if (var_r28 > 0) {
-        HuPrcVSleep();
-        goto loop_50;
+        var_f31 *= 0.98f;
+        if (var_r28 > 0) {
+            HuPrcVSleep();
+        } else {
+            break;
+        }
     }
     
     for (var_r31 = 0; var_r31 < 3; var_r31++) {
diff --git a/src/REL/w05Dll/monkey.c b/src/REL/w05Dll/monkey.c
index e68f49af..fb7e8efc 100644
--- a/src/REL/w05Dll/monkey.c
+++ b/src/REL/w05Dll/monkey.c
@@ -70,7 +70,7 @@ void fn_1_2C7C(s32 arg0) {
     BoardCameraRotSet(-33.0f, 0.0f);
     BoardCameraMotionWait();
     HuAudFXPlay(0x48A);
-    BoardWinCreate(0, 0x270018, -1);
+    BoardWinCreate(0, MAKE_MESSID(39, 24), -1);
     BoardWinWait();
     BoardWinKill();
     fn_1_3044();
@@ -167,8 +167,8 @@ void fn_1_3430(void) {
 }
 
 void fn_1_3514(void) {
-    Vec sp2C;                                   /* compiler-managed */
-    Vec sp20;                                   /* compiler-managed */
+    Vec sp2C;
+    Vec sp20;
     Vec sp14;
     Vec sp8;
     f32 var_f29;
@@ -308,7 +308,7 @@ void fn_1_3D88(void) {
     HuAudFXPlay(0x48B);
     HuPrcChildCreate(fn_1_3E8C, 0x2001U, 0x1000U, 0, boardMainProc);
     BoardPlayerIdleSet(lbl_1_bss_4C);
-    BoardWinCreate(0, 0x270019, -1);
+    BoardWinCreate(0, MAKE_MESSID(39, 25), -1);
     BoardWinWait();
     BoardWinKill();
 }
diff --git a/src/game/board/block.c b/src/game/board/block.c
index c947d465..a3e73511 100644
--- a/src/game/board/block.c
+++ b/src/game/board/block.c
@@ -156,7 +156,7 @@ static void BlockProc(void) {
         SetBlockStop();
     }
     
-    BoardWinCreate(0, work->contains_star != 0 ? 0x10001 : 0x10002, -1);
+    BoardWinCreate(0, work->contains_star != 0 ? MAKE_MESSID(1, 1) : MAKE_MESSID(1, 2), -1);
     BoardWinWait();
     BoardWinKill();
     KillCoinMdl();
diff --git a/src/game/board/boo_house.c b/src/game/board/boo_house.c
index 65877a3a..b3197298 100644
--- a/src/game/board/boo_house.c
+++ b/src/game/board/boo_house.c
@@ -149,13 +149,13 @@ static void ExecBooHouse(void) {
     var_r30 = GWPlayer[currPlayer].space_curr;
     BoardPlayerIdleSet(currPlayer);
     if (BoardPlayerCoinsGet(currPlayer) < 5) {
-        BoardWinCreate(0, 0x70001, -1);
+        BoardWinCreate(0, MAKE_MESSID(7, 1), -1);
         BoardWinWait();
         BoardWinKill();
         BoardDataAsyncWait(var_r28);
         HuPrcEnd();
     }
-    BoardWinCreateChoice(0, 0x70000, -1, 0);
+    BoardWinCreateChoice(0, MAKE_MESSID(7, 0), -1, 0);
     if (GWPlayer[currPlayer].com != 0) {
         if (BoardBooComUseCheck(currPlayer) != 0) {
             BoardComKeySetLeft();
@@ -645,7 +645,7 @@ void ApplyStarSteal(void) {
     s32 temp_r31;
 
     HuAudFXPlay(0x4C);
-    BoardWinCreate(2, 0x7000A, 3);
+    BoardWinCreate(2, MAKE_MESSID(7, 10), 3);
     BoardWinWait();
     BoardWinKill();
     BoardStatusShowSetForce(currPlayer);
@@ -670,7 +670,7 @@ void ApplyStarSteal(void) {
 }
 
 void ApplyBooLight(void) {
-    BoardWinCreate(2, 0x7000B, 3);
+    BoardWinCreate(2, MAKE_MESSID(7, 11), 3);
     BoardWinWait();
     BoardWinKill();
     BoardPlayerMotionShiftSet(currPlayer, 8, 0.0f, 8.0f, 0);
diff --git a/src/game/board/bowser.c b/src/game/board/bowser.c
index 8157d5c5..adecec98 100644
--- a/src/game/board/bowser.c
+++ b/src/game/board/bowser.c
@@ -150,6 +150,9 @@ typedef struct bowser_event_work {
 
 static void ExecBowser(void)
 {
+	#define BOWSER_EVENT 0
+	#define MINI_BOWSER_EVENT 1
+
 	s32 i;
 	s32 status;
 	if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
@@ -159,10 +162,11 @@ static void ExecBowser(void)
 			boardBowserHook(1);
 		}
 		BoardAudSeqPause(0, 1, 1000);
+		//20% of bowser, 80% chance of koopa kid
 		if(BoardRandMod(100) < 20) {
-			eventType = 0;
+			eventType = BOWSER_EVENT;
 		} else {
-			eventType = 1;
+			eventType = MINI_BOWSER_EVENT;
 		}
 	} else {
 		BoardMusStart(1, 6, 127, 0);
@@ -240,7 +244,7 @@ static void ExecBowserMain(void)
 	BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, 0);
 	HuPrcSleep(8);
 	HuAudFXPlay(58);
-	BoardWinCreate(2, 0x3000B, 5);
+	BoardWinCreate(2, MAKE_MESSID(3, 11), 5);
 	BoardWinWait();
 	BoardWinKill();
 	BoardAudSeqFadeOut(1, 1000);
@@ -287,7 +291,7 @@ static void ExecMGReturn(void)
 	BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, 0);
 	HuPrcSleep(8);
 	HuAudFXPlay(58);
-	BoardWinCreate(2, 0x3000B, 5);
+	BoardWinCreate(2, MAKE_MESSID(3, 11), 5);
 	BoardWinWait();
 	BoardWinKill();
 	while(!BoardStatusStopCheck(0)) {
@@ -349,7 +353,7 @@ static void ExecBowserSpecial(void)
 	HuAudFXPlay(58);
 	BoardMusStart(1, 6, 127, 0);
 	HuPrcSleep(120);
-	BoardWinCreate(2, 0x30007, 5);
+	BoardWinCreate(2, MAKE_MESSID(3, 7), 5);
 	BoardWinWait();
 	BoardWinKill();
 	HuAudFXPlay(857);
@@ -412,7 +416,7 @@ static void ExecBowserGame(void)
 	for(i=0; i<4; i++) {
 		BoardPlayerPosGet(i, &playerPosTemp[i]);
 	}
-	BoardWinCreate(2, 0x30008, 5);
+	BoardWinCreate(2, MAKE_MESSID(3, 8), 5);
 	BoardWinWait();
 	mess = messLoss[GWSystem.bowser_loss];
 	BoardWinCreate(2, mess, 5);
@@ -524,7 +528,7 @@ static void ExecBowserShuffle(void)
 	s32 player;
 	s32 player_new;
 	s32 reset_cam;
-	BoardWinCreate(2, 0x30010, 5);
+	BoardWinCreate(2, MAKE_MESSID(3, 16), 5);
 	BoardWinWait();
 	BoardWinKill();
 	for(i=0; i<4; i++) {
@@ -585,7 +589,7 @@ static void ExecBowserRevo(void)
 {
 	s32 i;
 	s32 coin;
-	BoardWinCreate(2, 0x30011, 5);
+	BoardWinCreate(2, MAKE_MESSID(3, 17), 5);
 	BoardWinWait();
 	BoardWinKill();
 	for(coin=i=0; i<4; i++) {
@@ -619,7 +623,7 @@ static void ExecBowserRevo(void)
 static void ExecBowserSuit(void)
 {
 	BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, 0);
-	BoardWinCreate(2, 0x30012, 5);
+	BoardWinCreate(2, MAKE_MESSID(3, 18), 5);
 	BoardWinWait();
 	HuAudFXPlay(857);
 	BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, 0);
@@ -1441,19 +1445,20 @@ static s32 ExecMiniBowserEvent(void)
 	BoardAudSeqFadeOutFast(1);
 	BoardMusStart(1, 11, 127, 0);
 	HuAudFXPlay(62);
-	BoardWinCreate(2, 0x30000, 6);
+	BoardWinCreate(2, MAKE_MESSID(3, 0), 6);
 	BoardWinWait();
 	if(BoardRandMod(100) < 70) {
 		MiniBowserTake();
 	} else {
 		MiniBowserTakeAll();
 	}
+	//5% chance bowser will appear after baby bowser
 	if(BoardRandMod(100) < 5) {
 		doneF = 1;
 	}
 	if(doneF) {
 		HuPrcSleep(60);
-		BoardWinCreate(2, 0x30006, 6);
+		BoardWinCreate(2, MAKE_MESSID(3, 6), 6);
 		BoardWinWait();
 		BoardWinKill();
 		HuAudFXPlay(62);
@@ -1461,7 +1466,7 @@ static s32 ExecMiniBowserEvent(void)
 		HuPrcSleep(60);
 	} else {
 		HuAudFXPlay(62);
-		BoardWinCreate(2, 0x30002, 6);
+		BoardWinCreate(2, MAKE_MESSID(3, 2), 6);
 		BoardWinWait();
 		BoardWinKill();
 		BoardAudSeqFadeOut(1, 1000);
diff --git a/src/game/board/com.c b/src/game/board/com.c
index 177a869c..00a66a66 100755
--- a/src/game/board/com.c
+++ b/src/game/board/com.c
@@ -30,134 +30,135 @@ static BOOL CheckLampUse(s32 player, s32 item);
 
 static s8 itemUse = -1;
 
-#define MINI_MUSHROOM 0
-#define MEGA_MUSHROOM 1
-#define SUPER_MINI_MUSHROOM 2
-#define SUPER_MEGA_MUSHROOM 3
-#define MINI_MEGA_HAMMER 4
-#define WARP_PIPE 5
-#define SWAP_CARD 6
-#define SPARKY_STICKER 7
-#define GADDLIGHT 8
-#define CHOMP_CALL 9
-#define BOWSER_SUIT 10
-#define BOOS_CRYSTAL_BALL 11
-#define MAGIC_LAMP 12
-#define SHOP_ITEMS_END MAGIC_LAMP
-#define ITEM_BAG 13
+#define BOARD_ITEM_MINI_MUSHROOM 0
+#define BOARD_ITEM_MEGA_MUSHROOM 1
+#define BOARD_ITEM_SUPER_MINI_MUSHROOM 2
+#define BOARD_ITEM_SUPER_MEGA_MUSHROOM 3
+#define BOARD_ITEM_MINI_MEGA_HAMMER 4
+#define BOARD_ITEM_WARP_PIPE 5
+#define BOARD_ITEM_SWAP_CARD 6
+#define BOARD_ITEM_SPARKY_STICKER 7
+#define BOARD_ITEM_GADDLIGHT 8
+#define BOARD_ITEM_CHOMP_CALL 9
+#define BOARD_ITEM_BOWSER_SUIT 10
+#define BOARD_ITEM_BOOS_CRYSTAL_BALL 11
+#define BOARD_ITEM_MAGIC_LAMP 12
+#define SHOP_ITEMS_END BOARD_ITEM_MAGIC_LAMP
+#define BOARD_ITEM_ITEM_BAG 13
+#define BOARD_ITEMS_END BOARD_ITEM_ITEM_BAG
 
 static s8 comItemPreferTbl[GW_CHARACTER_MAX][SHOP_ITEMS_END] = {
-    { //Mario
-        MAGIC_LAMP,
-        BOOS_CRYSTAL_BALL,
-        WARP_PIPE,
-        SUPER_MEGA_MUSHROOM,
-        MEGA_MUSHROOM,
-        SUPER_MINI_MUSHROOM,
-        SWAP_CARD,
-        MINI_MEGA_HAMMER,
-        MINI_MUSHROOM,
-        SPARKY_STICKER,
-        CHOMP_CALL,
-        BOWSER_SUIT
+    {   //Mario
+        BOARD_ITEM_MAGIC_LAMP,
+        BOARD_ITEM_BOOS_CRYSTAL_BALL,
+        BOARD_ITEM_WARP_PIPE,
+        BOARD_ITEM_SUPER_MEGA_MUSHROOM,
+        BOARD_ITEM_MEGA_MUSHROOM,
+        BOARD_ITEM_SUPER_MINI_MUSHROOM,
+        BOARD_ITEM_SWAP_CARD,
+        BOARD_ITEM_MINI_MEGA_HAMMER,
+        BOARD_ITEM_MINI_MUSHROOM,
+        BOARD_ITEM_SPARKY_STICKER,
+        BOARD_ITEM_CHOMP_CALL,
+        BOARD_ITEM_BOWSER_SUIT
     },
     {   //Luigi
-        MAGIC_LAMP,
-        BOOS_CRYSTAL_BALL,
-        WARP_PIPE,
-        BOWSER_SUIT,
-        SUPER_MEGA_MUSHROOM,
-        MEGA_MUSHROOM,
-        SUPER_MINI_MUSHROOM,
-        MINI_MUSHROOM,
-        SWAP_CARD,
-        MINI_MEGA_HAMMER,
-        SPARKY_STICKER,
-        CHOMP_CALL
+        BOARD_ITEM_MAGIC_LAMP,
+        BOARD_ITEM_BOOS_CRYSTAL_BALL,
+        BOARD_ITEM_WARP_PIPE,
+        BOARD_ITEM_BOWSER_SUIT,
+        BOARD_ITEM_SUPER_MEGA_MUSHROOM,
+        BOARD_ITEM_MEGA_MUSHROOM,
+        BOARD_ITEM_SUPER_MINI_MUSHROOM,
+        BOARD_ITEM_MINI_MUSHROOM,
+        BOARD_ITEM_SWAP_CARD,
+        BOARD_ITEM_MINI_MEGA_HAMMER,
+        BOARD_ITEM_SPARKY_STICKER,
+        BOARD_ITEM_CHOMP_CALL
     },   
     {   //Peach
-        MAGIC_LAMP,
-        BOOS_CRYSTAL_BALL,
-        WARP_PIPE,
-        SWAP_CARD,
-        SUPER_MEGA_MUSHROOM,
-        MEGA_MUSHROOM,
-        SUPER_MINI_MUSHROOM,
-        BOWSER_SUIT,
-        SPARKY_STICKER,
-        CHOMP_CALL,
-        MINI_MUSHROOM,
-        MINI_MEGA_HAMMER
+        BOARD_ITEM_MAGIC_LAMP,
+        BOARD_ITEM_BOOS_CRYSTAL_BALL,
+        BOARD_ITEM_WARP_PIPE,
+        BOARD_ITEM_SWAP_CARD,
+        BOARD_ITEM_SUPER_MEGA_MUSHROOM,
+        BOARD_ITEM_MEGA_MUSHROOM,
+        BOARD_ITEM_SUPER_MINI_MUSHROOM,
+        BOARD_ITEM_BOWSER_SUIT,
+        BOARD_ITEM_SPARKY_STICKER,
+        BOARD_ITEM_CHOMP_CALL,
+        BOARD_ITEM_MINI_MUSHROOM,
+        BOARD_ITEM_MINI_MEGA_HAMMER
     },   
     {   //Yoshi
-        MAGIC_LAMP,
-        WARP_PIPE,
-        BOOS_CRYSTAL_BALL,
-        CHOMP_CALL,
-        SUPER_MEGA_MUSHROOM,
-        MEGA_MUSHROOM,
-        SUPER_MINI_MUSHROOM,
-        SWAP_CARD,
-        MINI_MUSHROOM,
-        MINI_MEGA_HAMMER,
-        BOWSER_SUIT,
-        SPARKY_STICKER
+        BOARD_ITEM_MAGIC_LAMP,
+        BOARD_ITEM_WARP_PIPE,
+        BOARD_ITEM_BOOS_CRYSTAL_BALL,
+        BOARD_ITEM_CHOMP_CALL,
+        BOARD_ITEM_SUPER_MEGA_MUSHROOM,
+        BOARD_ITEM_MEGA_MUSHROOM,
+        BOARD_ITEM_SUPER_MINI_MUSHROOM,
+        BOARD_ITEM_SWAP_CARD,
+        BOARD_ITEM_MINI_MUSHROOM,
+        BOARD_ITEM_MINI_MEGA_HAMMER,
+        BOARD_ITEM_BOWSER_SUIT,
+        BOARD_ITEM_SPARKY_STICKER
     },    
     {   //Wario
-        MAGIC_LAMP,
-        BOOS_CRYSTAL_BALL,
-        MINI_MEGA_HAMMER,
-        CHOMP_CALL,
-        BOWSER_SUIT,
-        SUPER_MEGA_MUSHROOM,
-        MEGA_MUSHROOM,
-        WARP_PIPE,
-        SUPER_MINI_MUSHROOM,
-        SWAP_CARD,
-        MINI_MUSHROOM,
-        SPARKY_STICKER
+        BOARD_ITEM_MAGIC_LAMP,
+        BOARD_ITEM_BOOS_CRYSTAL_BALL,
+        BOARD_ITEM_MINI_MEGA_HAMMER,
+        BOARD_ITEM_CHOMP_CALL,
+        BOARD_ITEM_BOWSER_SUIT,
+        BOARD_ITEM_SUPER_MEGA_MUSHROOM,
+        BOARD_ITEM_MEGA_MUSHROOM,
+        BOARD_ITEM_WARP_PIPE,
+        BOARD_ITEM_SUPER_MINI_MUSHROOM,
+        BOARD_ITEM_SWAP_CARD,
+        BOARD_ITEM_MINI_MUSHROOM,
+        BOARD_ITEM_SPARKY_STICKER
     },   
     {   //DK
-        MAGIC_LAMP,
-        BOOS_CRYSTAL_BALL,
-        WARP_PIPE,
-        SUPER_MEGA_MUSHROOM,
-        MEGA_MUSHROOM,
-        BOWSER_SUIT,
-        SWAP_CARD,
-        SUPER_MINI_MUSHROOM,
-        MINI_MUSHROOM,
-        MINI_MEGA_HAMMER,
-        CHOMP_CALL,
-        SPARKY_STICKER
+        BOARD_ITEM_MAGIC_LAMP,
+        BOARD_ITEM_BOOS_CRYSTAL_BALL,
+        BOARD_ITEM_WARP_PIPE,
+        BOARD_ITEM_SUPER_MEGA_MUSHROOM,
+        BOARD_ITEM_MEGA_MUSHROOM,
+        BOARD_ITEM_BOWSER_SUIT,
+        BOARD_ITEM_SWAP_CARD,
+        BOARD_ITEM_SUPER_MINI_MUSHROOM,
+        BOARD_ITEM_MINI_MUSHROOM,
+        BOARD_ITEM_MINI_MEGA_HAMMER,
+        BOARD_ITEM_CHOMP_CALL,
+        BOARD_ITEM_SPARKY_STICKER
     },   
     {   //Daisy
-        MAGIC_LAMP,
-        WARP_PIPE,
-        BOOS_CRYSTAL_BALL,
-        MINI_MEGA_HAMMER,
-        SPARKY_STICKER,
-        CHOMP_CALL,
-        SUPER_MEGA_MUSHROOM,
-        MEGA_MUSHROOM,
-        BOWSER_SUIT,
-        SWAP_CARD,
-        SUPER_MINI_MUSHROOM,
-        MINI_MUSHROOM
+        BOARD_ITEM_MAGIC_LAMP,
+        BOARD_ITEM_WARP_PIPE,
+        BOARD_ITEM_BOOS_CRYSTAL_BALL,
+        BOARD_ITEM_MINI_MEGA_HAMMER,
+        BOARD_ITEM_SPARKY_STICKER,
+        BOARD_ITEM_CHOMP_CALL,
+        BOARD_ITEM_SUPER_MEGA_MUSHROOM,
+        BOARD_ITEM_MEGA_MUSHROOM,
+        BOARD_ITEM_BOWSER_SUIT,
+        BOARD_ITEM_SWAP_CARD,
+        BOARD_ITEM_SUPER_MINI_MUSHROOM,
+        BOARD_ITEM_MINI_MUSHROOM
     },   
     {   //Waluigi
-        MAGIC_LAMP,
-        WARP_PIPE,
-        SPARKY_STICKER,
-        BOOS_CRYSTAL_BALL,
-        BOWSER_SUIT,
-        CHOMP_CALL,
-        MINI_MEGA_HAMMER,
-        SWAP_CARD,
-        SUPER_MEGA_MUSHROOM,
-        MEGA_MUSHROOM,
-        SUPER_MINI_MUSHROOM,
-        MINI_MUSHROOM
+        BOARD_ITEM_MAGIC_LAMP,
+        BOARD_ITEM_WARP_PIPE,
+        BOARD_ITEM_SPARKY_STICKER,
+        BOARD_ITEM_BOOS_CRYSTAL_BALL,
+        BOARD_ITEM_BOWSER_SUIT,
+        BOARD_ITEM_CHOMP_CALL,
+        BOARD_ITEM_MINI_MEGA_HAMMER,
+        BOARD_ITEM_SWAP_CARD,
+        BOARD_ITEM_SUPER_MEGA_MUSHROOM,
+        BOARD_ITEM_MEGA_MUSHROOM,
+        BOARD_ITEM_SUPER_MINI_MUSHROOM,
+        BOARD_ITEM_MINI_MUSHROOM
     }
 };
 
@@ -252,9 +253,9 @@ s8 BoardComPreferItemGet(s32 player, s8 *items, s8 num_items) {
     weight = 100;
     for (i = 0; i < num_items; i++) {
         item = items[i];
-        for (j = 0; j < 12; j++) {
+        for (j = 0; j < SHOP_ITEMS_END; j++) {
             if (item == comItemPreferTbl[character][j]) {
-                if (j < weight && (BoardPlayerItemFind(player, item) == -1 || item == 0xC || item == 0xB)) {
+                if (j < weight && (BoardPlayerItemFind(player, item) == -1 || item == BOARD_ITEM_MAGIC_LAMP || item == BOARD_ITEM_BOOS_CRYSTAL_BALL)) {
                     weight = j;
                     prefer = i;
                 }
@@ -283,7 +284,7 @@ s32 BoardComItemWeightGet(s32 player, s32 item) {
     s32 weight;
     s32 i;
 
-    for (i = 0; i < 12; i++) {
+    for (i = 0; i < SHOP_ITEMS_END; i++) {
         if (item == comItemPreferTbl[GWPlayer[player].character][i]) {
             break;
         }
@@ -351,7 +352,7 @@ static s32 ChooseUseItem(s32 player) {
 
     useItem = -1;
     character = GWPlayer[player].character;
-    weight = 0x64;
+    weight = 100;
     for (i = 0; i < 3; i++) {
         item = GWPlayer[player].items[i];
         if (item == -1) {
@@ -363,7 +364,7 @@ static s32 ChooseUseItem(s32 player) {
         }
         result = func(player, item);
         if (result) {
-            for (j = 0; j < 0xC; j++) {
+            for (j = 0; j < SHOP_ITEMS_END; j++) {
                 if (item == comItemPreferTbl[character][j]) {
                     if (j < weight) {
                         weight = j;
@@ -373,7 +374,7 @@ static s32 ChooseUseItem(s32 player) {
             }
         }
     }
-    if (weight == 0x64) {
+    if (weight == 100) {
         return -1;
     }
     useItem = comItemPreferTbl[character][weight];
diff --git a/src/game/board/mushroom.c b/src/game/board/mushroom.c
index bca27bde..3f182af2 100644
--- a/src/game/board/mushroom.c
+++ b/src/game/board/mushroom.c
@@ -98,11 +98,11 @@ static void MushroomMain(void) {
     }
     
     if ((GWSystem.max_turn - GWSystem.turn) == 0) {
-        BoardWinCreate(0, 0x50003U, -1);
+        BoardWinCreate(0, MAKE_MESSID(5, 3), -1);
         BoardWinWait();
         BoardWinKill();
     } else if (BoardPlayerItemCount(curPlayer) == 3) {
-        BoardWinCreate(0, 0x50000U, -1);
+        BoardWinCreate(0, MAKE_MESSID(5, 0), -1);
         BoardWinWait();
         BoardWinKill();
     } else {
diff --git a/src/game/board/player.c b/src/game/board/player.c
index 80adfb7d..87d106bc 100644
--- a/src/game/board/player.c
+++ b/src/game/board/player.c
@@ -2420,7 +2420,7 @@ static s32 DoSparkSpace(s32 player, s32 pause_cam)
 static void RemoveSparkSpace(s32 player)
 {
 	if(GWPlayer[player].spark) {
-		BoardWinCreate(0, 0x12001C, -1);
+		BoardWinCreate(0, MAKE_MESSID(18, 28), -1);
 		BoardWinWait();
 		BoardWinKill();
 		GWPlayer[player].spark = 0;
diff --git a/src/game/board/roll.c b/src/game/board/roll.c
index 5cf848a1..28866389 100755
--- a/src/game/board/roll.c
+++ b/src/game/board/roll.c
@@ -871,7 +871,7 @@ static void SameRollExec(void) {
         HuPrcVSleep();
     }
     BoardAudSeqPause(0, 0, 0x3E8);
-    BoardWinCreate(0, 0x90000, -1);
+    BoardWinCreate(0, MAKE_MESSID(9, 0), -1);
     BoardWinInsertMesSet(sameRollCoinStr, 0);
     BoardWinWait();
     BoardWinKill();
diff --git a/src/game/board/shop.c b/src/game/board/shop.c
index 74219244..52a018e5 100755
--- a/src/game/board/shop.c
+++ b/src/game/board/shop.c
@@ -248,7 +248,7 @@ static void ExecShop(void) {
         BoardWinKill();
         HuPrcEnd();
     }
-    BoardWinCreateChoice(0, 0xF0000, -1, 0);
+    BoardWinCreateChoice(0, MAKE_MESSID(15, 0), -1, 0);
     DecideComEnter(shopPlayer);
     BoardWinWait();
     if (BoardWinChoiceGet() != 0) {