Merge pull request #636 from huderlem/assets

Map organization

charmap.txt

@@ -523,124 +523,124 @@ SE_TB_START    = 72 00
 SE_TB_KON      = 73 00
 SE_TB_KARA     = 74 00
 SE_BIDORO      = 75 00
-BGM_STOP       = 5D 01
-BGM_TETSUJI    = 5E 01
-BGM_FIELD13    = 5F 01
-BGM_KACHI22    = 60 01
-BGM_KACHI2     = 61 01
-BGM_KACHI3     = 62 01
-BGM_KACHI5     = 63 01
-BGM_PCC        = 64 01
-BGM_NIBI       = 65 01
-BGM_SUIKUN     = 66 01
-BGM_DOORO1     = 67 01
-BGM_DOORO_X1   = 68 01
-BGM_DOORO_X3   = 69 01
-BGM_MACHI_S2   = 6A 01
-BGM_MACHI_S4   = 6B 01
-BGM_GIM        = 6C 01
-BGM_NAMINORI   = 6D 01
-BGM_DAN01      = 6E 01
-BGM_FANFA1     = 6F 01
-BGM_ME_ASA     = 70 01
-BGM_ME_BACHI   = 71 01
-BGM_FANFA4     = 72 01
-BGM_FANFA5     = 73 01
-BGM_ME_WAZA    = 74 01
-BGM_BIJYUTU    = 75 01
-BGM_DOORO_X4   = 76 01
-BGM_FUNE_KAN   = 77 01
-BGM_ME_SHINKA  = 78 01
-BGM_SHINKA     = 79 01
-BGM_ME_WASURE  = 7A 01
-BGM_SYOUJOEYE  = 7B 01
-BGM_BOYEYE     = 7C 01
-BGM_DAN02      = 7D 01
-BGM_MACHI_S3   = 7E 01
-BGM_ODAMAKI    = 7F 01
-BGM_B_TOWER    = 80 01
-BGM_SWIMEYE    = 81 01
-BGM_DAN03      = 82 01
-BGM_ME_KINOMI  = 83 01
-BGM_ME_TAMA    = 84 01
-BGM_ME_B_BIG   = 85 01
-BGM_ME_B_SMALL = 86 01
-BGM_ME_ZANNEN  = 87 01
-BGM_BD_TIME    = 88 01
-BGM_TEST1      = 89 01
-BGM_TEST2      = 8A 01
-BGM_TEST3      = 8B 01
-BGM_TEST4      = 8C 01
-BGM_TEST       = 8D 01
-BGM_GOMACHI0   = 8E 01
-BGM_GOTOWN     = 8F 01
-BGM_POKECEN    = 90 01
-BGM_NEXTROAD   = 91 01
-BGM_GRANROAD   = 92 01
-BGM_CYCLING    = 93 01
-BGM_FRIENDLY   = 94 01
-BGM_MISHIRO    = 95 01
-BGM_TOZAN      = 96 01
-BGM_GIRLEYE    = 97 01
-BGM_MINAMO     = 98 01
-BGM_ASHROAD    = 99 01
-BGM_EVENT0     = 9A 01
-BGM_DEEPDEEP   = 9B 01
-BGM_KACHI1     = 9C 01
-BGM_TITLE3     = 9D 01
-BGM_DEMO1      = 9E 01
-BGM_GIRL_SUP   = 9F 01
-BGM_HAGESHII   = A0 01
-BGM_KAKKOII    = A1 01
-BGM_KAZANBAI   = A2 01
-BGM_AQA_0      = A3 01
-BGM_TSURETEK   = A4 01
-BGM_BOY_SUP    = A5 01
-BGM_RAINBOW    = A6 01
-BGM_AYASII     = A7 01
-BGM_KACHI4     = A8 01
-BGM_ROPEWAY    = A9 01
-BGM_CASINO     = AA 01
-BGM_HIGHTOWN   = AB 01
-BGM_SAFARI     = AC 01
-BGM_C_ROAD     = AD 01
-BGM_AJITO      = AE 01
-BGM_M_BOAT     = AF 01
-BGM_M_DUNGON   = B0 01
-BGM_FINECITY   = B1 01
-BGM_MACHUPI    = B2 01
-BGM_P_SCHOOL   = B3 01
-BGM_DENDOU     = B4 01
-BGM_TONEKUSA   = B5 01
-BGM_MABOROSI   = B6 01
-BGM_CON_FAN    = B7 01
-BGM_CONTEST0   = B8 01
-BGM_MGM0       = B9 01
-BGM_T_BATTLE   = BA 01
-BGM_OOAME      = BB 01
-BGM_HIDERI     = BC 01
-BGM_RUNECITY   = BD 01
-BGM_CON_K      = BE 01
-BGM_EIKOU_R    = BF 01
-BGM_KARAKURI   = C0 01
-BGM_HUTAGO     = C1 01
-BGM_SITENNOU   = C2 01
-BGM_YAMA_EYE   = C3 01
-BGM_CONLOBBY   = C4 01
-BGM_INTER_V    = C5 01
-BGM_DAIGO      = C6 01
-BGM_THANKFOR   = C7 01
-BGM_END        = C8 01
-BGM_BATTLE27   = C9 01
-BGM_BATTLE31   = CA 01
-BGM_BATTLE20   = CB 01
-BGM_BATTLE32   = CC 01
-BGM_BATTLE33   = CD 01
-BGM_BATTLE36   = CE 01
-BGM_BATTLE34   = CF 01
-BGM_BATTLE35   = D0 01
-BGM_BATTLE38   = D1 01
-BGM_BATTLE30   = D2 01
+MUS_STOP       = 5D 01
+MUS_TETSUJI    = 5E 01
+MUS_FIELD13    = 5F 01
+MUS_KACHI22    = 60 01
+MUS_KACHI2     = 61 01
+MUS_KACHI3     = 62 01
+MUS_KACHI5     = 63 01
+MUS_PCC        = 64 01
+MUS_NIBI       = 65 01
+MUS_SUIKUN     = 66 01
+MUS_DOORO1     = 67 01
+MUS_DOORO_X1   = 68 01
+MUS_DOORO_X3   = 69 01
+MUS_MACHI_S2   = 6A 01
+MUS_MACHI_S4   = 6B 01
+MUS_GIM        = 6C 01
+MUS_NAMINORI   = 6D 01
+MUS_DAN01      = 6E 01
+MUS_FANFA1     = 6F 01
+MUS_ME_ASA     = 70 01
+MUS_ME_BACHI   = 71 01
+MUS_FANFA4     = 72 01
+MUS_FANFA5     = 73 01
+MUS_ME_WAZA    = 74 01
+MUS_BIJYUTU    = 75 01
+MUS_DOORO_X4   = 76 01
+MUS_FUNE_KAN   = 77 01
+MUS_ME_SHINKA  = 78 01
+MUS_SHINKA     = 79 01
+MUS_ME_WASURE  = 7A 01
+MUS_SYOUJOEYE  = 7B 01
+MUS_BOYEYE     = 7C 01
+MUS_DAN02      = 7D 01
+MUS_MACHI_S3   = 7E 01
+MUS_ODAMAKI    = 7F 01
+MUS_B_TOWER    = 80 01
+MUS_SWIMEYE    = 81 01
+MUS_DAN03      = 82 01
+MUS_ME_KINOMI  = 83 01
+MUS_ME_TAMA    = 84 01
+MUS_ME_B_BIG   = 85 01
+MUS_ME_B_SMALL = 86 01
+MUS_ME_ZANNEN  = 87 01
+MUS_BD_TIME    = 88 01
+MUS_TEST1      = 89 01
+MUS_TEST2      = 8A 01
+MUS_TEST3      = 8B 01
+MUS_TEST4      = 8C 01
+MUS_TEST       = 8D 01
+MUS_GOMACHI0   = 8E 01
+MUS_GOTOWN     = 8F 01
+MUS_POKECEN    = 90 01
+MUS_NEXTROAD   = 91 01
+MUS_GRANROAD   = 92 01
+MUS_CYCLING    = 93 01
+MUS_FRIENDLY   = 94 01
+MUS_MISHIRO    = 95 01
+MUS_TOZAN      = 96 01
+MUS_GIRLEYE    = 97 01
+MUS_MINAMO     = 98 01
+MUS_ASHROAD    = 99 01
+MUS_EVENT0     = 9A 01
+MUS_DEEPDEEP   = 9B 01
+MUS_KACHI1     = 9C 01
+MUS_TITLE3     = 9D 01
+MUS_DEMO1      = 9E 01
+MUS_GIRL_SUP   = 9F 01
+MUS_HAGESHII   = A0 01
+MUS_KAKKOII    = A1 01
+MUS_KAZANBAI   = A2 01
+MUS_AQA_0      = A3 01
+MUS_TSURETEK   = A4 01
+MUS_BOY_SUP    = A5 01
+MUS_RAINBOW    = A6 01
+MUS_AYASII     = A7 01
+MUS_KACHI4     = A8 01
+MUS_ROPEWAY    = A9 01
+MUS_CASINO     = AA 01
+MUS_HIGHTOWN   = AB 01
+MUS_SAFARI     = AC 01
+MUS_C_ROAD     = AD 01
+MUS_AJITO      = AE 01
+MUS_M_BOAT     = AF 01
+MUS_M_DUNGON   = B0 01
+MUS_FINECITY   = B1 01
+MUS_MACHUPI    = B2 01
+MUS_P_SCHOOL   = B3 01
+MUS_DENDOU     = B4 01
+MUS_TONEKUSA   = B5 01
+MUS_MABOROSI   = B6 01
+MUS_CON_FAN    = B7 01
+MUS_CONTEST0   = B8 01
+MUS_MGM0       = B9 01
+MUS_T_BATTLE   = BA 01
+MUS_OOAME      = BB 01
+MUS_HIDERI     = BC 01
+MUS_RUNECITY   = BD 01
+MUS_CON_K      = BE 01
+MUS_EIKOU_R    = BF 01
+MUS_KARAKURI   = C0 01
+MUS_HUTAGO     = C1 01
+MUS_SITENNOU   = C2 01
+MUS_YAMA_EYE   = C3 01
+MUS_CONLOBBY   = C4 01
+MUS_INTER_V    = C5 01
+MUS_DAIGO      = C6 01
+MUS_THANKFOR   = C7 01
+MUS_END        = C8 01
+MUS_BATTLE27   = C9 01
+MUS_BATTLE31   = CA 01
+MUS_BATTLE20   = CB 01
+MUS_BATTLE32   = CC 01
+MUS_BATTLE33   = CD 01
+MUS_BATTLE36   = CE 01
+MUS_BATTLE34   = CF 01
+MUS_BATTLE35   = D0 01
+MUS_BATTLE38   = D1 01
+MUS_BATTLE30   = D2 01
 
 '\l' = FA @ scroll up window text
 '\p' = FB @ new paragraph

constants/version.inc

@@ -5,11 +5,11 @@
 	.endif
 
 	.ifdef SAPPHIRE
-	.set BGM_EVIL_TEAM, BGM_AQA_0
-	.set BGM_GOOD_TEAM, BGM_MGM0
+	.set MUS_EVIL_TEAM, MUS_AQA_0
+	.set MUS_GOOD_TEAM, MUS_MGM0
 	.else
-	.set BGM_EVIL_TEAM, BGM_MGM0
-	.set BGM_GOOD_TEAM, BGM_AQA_0
+	.set MUS_EVIL_TEAM, MUS_MGM0
+	.set MUS_GOOD_TEAM, MUS_AQA_0
 	.endc
 
 	.ifdef SAPPHIRE