summaryrefslogtreecommitdiff
path: root/include/constants
diff options
context:
space:
mode:
Diffstat (limited to 'include/constants')
-rw-r--r--include/constants/flags.h4
-rw-r--r--include/constants/global.h2
-rw-r--r--include/constants/layouts.h4
-rw-r--r--include/constants/map_groups.h4
-rw-r--r--include/constants/songs.h755
5 files changed, 318 insertions, 451 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 7f4655d4e..a4b891aca 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -17,7 +17,7 @@
#define FLAG_WORLD_MAP_FUCHSIA_CITY 0x897
#define FLAG_WORLD_MAP_CINNABAR_ISLAND 0x898
#define FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR 0x899
-#define FLAG_WORLD_MAP_SAFFRON_CITY_DUPLICATE 0x89a
+#define FLAG_WORLD_MAP_SAFFRON_CITY 0x89a
#define FLAG_WORLD_MAP_ONE_ISLAND 0x89b
#define FLAG_WORLD_MAP_TWO_ISLAND 0x89c
#define FLAG_WORLD_MAP_THREE_ISLAND 0x89d
@@ -1377,7 +1377,7 @@
#define TRAINERS_FLAG_NO 0x356
#define CODE_FLAGS (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x860
-// TODO: Find what these are
+// TODO: These three are badge flags
#define FLAG_UNK820 0x820
#define FLAG_UNK824 0x824
#define FLAG_UNK826 0x826
diff --git a/include/constants/global.h b/include/constants/global.h
index 3cac8d473..d7508c940 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -45,7 +45,7 @@ enum
enum
{
- OPTIONS_BUTTON_MODE_NORMAL,
+ OPTIONS_BUTTON_MODE_HELP,
OPTIONS_BUTTON_MODE_LR,
OPTIONS_BUTTON_MODE_L_EQUALS_A
};
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index b97ef69cb..f4f2a8a29 100644
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -71,7 +71,7 @@
#define LAYOUT_FUCHSIA_CITY 85
#define LAYOUT_CINNABAR_ISLAND 86
#define LAYOUT_INDIGO_PLATEAU_EXTERIOR 87
-#define LAYOUT_SAFFRON_CITY 88
+#define LAYOUT_SAFFRON_CITY_CLASSIC 88
#define LAYOUT_ROUTE1 89
#define LAYOUT_ROUTE2 90
#define LAYOUT_ROUTE3 91
@@ -189,7 +189,7 @@
#define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE 204
#define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM 205
#define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM 206
-#define LAYOUT_SAFFRON_CITY_DUPLICATE 207
+#define LAYOUT_SAFFRON_CITY 207
#define LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE 208
#define LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE 209
#define LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE 210
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index d769520ca..44fa03eda 100644
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -206,8 +206,8 @@
#define MAP_FUCHSIA_CITY (7 | (3 << 8))
#define MAP_CINNABAR_ISLAND (8 | (3 << 8))
#define MAP_INDIGO_PLATEAU_EXTERIOR (9 | (3 << 8))
-#define MAP_SAFFRON_CITY_DUPLICATE (10 | (3 << 8))
-#define MAP_SAFFRON_CITY (11 | (3 << 8))
+#define MAP_SAFFRON_CITY (10 | (3 << 8))
+#define MAP_SAFFRON_CITY_CLASSIC (11 | (3 << 8))
#define MAP_ONE_ISLAND (12 | (3 << 8))
#define MAP_TWO_ISLAND (13 | (3 << 8))
#define MAP_THREE_ISLAND (14 | (3 << 8))
diff --git a/include/constants/songs.h b/include/constants/songs.h
index 193a57756..f1868ca2a 100644
--- a/include/constants/songs.h
+++ b/include/constants/songs.h
@@ -4,7 +4,7 @@
#define MUS_DUMMY 0
#define SE_STOP 0
#define SE_KAIFUKU 1
-#define SE_PC_LOGON 2
+#define SE_PC_LOGIN 2
#define SE_PC_OFF 3
#define SE_PC_ON 4
#define SE_SELECT 5
@@ -27,234 +27,237 @@
#define SE_BOO 22
#define SE_BOWA 23
#define SE_JYUNI 24
-#define SE_A 25
-#define SE_I 26
-#define SE_U 27
-#define SE_E 28
-#define SE_O 29
-#define SE_N 30
-#define SE_SEIKAI 31
-#define SE_HAZURE 32
-#define SE_EXP 33
-#define SE_JITE_PYOKO 34
-#define SE_MU_PACHI 35
-#define SE_TK_KASYA 36
-#define SE_FU_ZAKU 37
-#define SE_FU_ZAKU2 38
-#define SE_FU_ZUZUZU 39
-#define SE_RU_GASHIN 40
-#define SE_RU_GASYAN 41
-#define SE_RU_BARI 42
-#define SE_RU_HYUU 43
-#define SE_KI_GASYAN 44
-#define SE_TK_WARPIN 45
-#define SE_TK_WARPOUT 46
-#define SE_TU_SAA 47
-#define SE_HI_TURUN 48
-#define SE_TRACK_MOVE 49
-#define SE_TRACK_STOP 50
-#define SE_TRACK_HAIK 51
-#define SE_TRACK_DOOR 52
-#define SE_MOTER 53
-#define SE_CARD 54
-#define SE_SAVE 55
-#define SE_KON 56
-#define SE_KON2 57
-#define SE_KON3 58
-#define SE_KON4 59
-#define SE_SUIKOMU 60
-#define SE_NAGERU 61
-#define SE_TOY_C 62
-#define SE_TOY_D 63
-#define SE_TOY_E 64
-#define SE_TOY_F 65
-#define SE_TOY_G 66
-#define SE_TOY_A 67
-#define SE_TOY_B 68
-#define SE_TOY_C1 69
-#define SE_MIZU 70
-#define SE_HASHI 71
-#define SE_DAUGI 72
-#define SE_PINPON 73
-#define SE_FUUSEN1 74
-#define SE_FUUSEN2 75
-#define SE_FUUSEN3 76
-#define SE_TOY_KABE 77
-#define SE_TOY_DANGO 78
-#define SE_DOKU 79
-#define SE_ESUKA 80
-#define SE_T_AME 81
-#define SE_T_AME_E 82
-#define SE_T_OOAME 83
-#define SE_T_OOAME_E 84
-#define SE_T_KOAME 85
-#define SE_T_KOAME_E 86
-#define SE_T_KAMI 87
-#define SE_T_KAMI2 88
-#define SE_ELEBETA 89
-#define SE_HINSI 90
-#define SE_EXPMAX 91
-#define SE_TAMAKORO 92
-#define SE_TAMAKORO_E 93
-#define SE_BASABASA 94
-#define SE_REGI 95
-#define SE_C_GAJI 96
-#define SE_C_MAKU_U 97
-#define SE_C_MAKU_D 98
-#define SE_C_PASI 99
-#define SE_C_SYU 100
-#define SE_C_PIKON 101
-#define SE_REAPOKE 102
-#define SE_OP_BASYU 103
-#define SE_BT_START 104
-#define SE_DENDOU 105
-#define SE_JIHANKI 106
-#define SE_TAMA 107
-#define SE_Z_SCROLL 108
-#define SE_Z_PAGE 109
-#define SE_PN_ON 110
-#define SE_PN_OFF 111
-#define SE_Z_SEARCH 112
-#define SE_TAMAGO 113
-#define SE_TB_START 114
-#define SE_TB_KON 115
-#define SE_TB_KARA 116
-#define SE_BIDORO 117
-#define SE_W085 118
-#define SE_W085B 119
-#define SE_W231 120
-#define SE_W171 121
-#define SE_W233 122
-#define SE_W233B 123
-#define SE_W145 124
-#define SE_W145B 125
-#define SE_W145C 126
-#define SE_W240 127
-#define SE_W015 128
-#define SE_W081 129
-#define SE_W081B 130
-#define SE_W088 131
-#define SE_W016 132
-#define SE_W016B 133
-#define SE_W003 134
-#define SE_W104 135
-#define SE_W013 136
-#define SE_W196 137
-#define SE_W086 138
-#define SE_W004 139
-#define SE_W025 140
-#define SE_W025B 141
-#define SE_W152 142
-#define SE_W026 143
-#define SE_W172 144
-#define SE_W172B 145
-#define SE_W053 146
-#define SE_W007 147
-#define SE_W092 148
-#define SE_W221 149
-#define SE_W221B 150
-#define SE_W052 151
-#define SE_W036 152
-#define SE_W059 153
-#define SE_W059B 154
-#define SE_W010 155
-#define SE_W011 156
-#define SE_W017 157
-#define SE_W019 158
-#define SE_W028 159
-#define SE_W013B 160
-#define SE_W044 161
-#define SE_W029 162
-#define SE_W057 163
-#define SE_W056 164
-#define SE_W250 165
-#define SE_W030 166
-#define SE_W039 167
-#define SE_W054 168
-#define SE_W077 169
-#define SE_W020 170
-#define SE_W082 171
-#define SE_W047 172
-#define SE_W195 173
-#define SE_W006 174
-#define SE_W091 175
-#define SE_W146 176
-#define SE_W120 177
-#define SE_W153 178
-#define SE_W071B 179
-#define SE_W071 180
-#define SE_W103 181
-#define SE_W062 182
-#define SE_W062B 183
-#define SE_W048 184
-#define SE_W187 185
-#define SE_W118 186
-#define SE_W155 187
-#define SE_W122 188
-#define SE_W060 189
-#define SE_W185 190
-#define SE_W014 191
-#define SE_W043 192
-#define SE_W207 193
-#define SE_W207B 194
-#define SE_W215 195
-#define SE_W109 196
-#define SE_W173 197
-#define SE_W280 198
-#define SE_W202 199
-#define SE_W060B 200
-#define SE_W076 201
-#define SE_W080 202
-#define SE_W100 203
-#define SE_W107 204
-#define SE_W166 205
-#define SE_W129 206
-#define SE_W115 207
-#define SE_W112 208
-#define SE_W197 209
-#define SE_W199 210
-#define SE_W236 211
-#define SE_W204 212
-#define SE_W268 213
-#define SE_W070 214
-#define SE_W063 215
-#define SE_W127 216
-#define SE_W179 217
-#define SE_W151 218
-#define SE_W201 219
-#define SE_W161 220
-#define SE_W161B 221
-#define SE_W227 222
-#define SE_W227B 223
-#define SE_W226 224
-#define SE_W208 225
-#define SE_W213 226
-#define SE_W213B 227
-#define SE_W234 228
-#define SE_W260 229
-#define SE_W328 230
-#define SE_W320 231
-#define SE_W255 232
-#define SE_W291 233
-#define SE_W089 234
-#define SE_W239 235
-#define SE_W230 236
-#define SE_W281 237
-#define SE_W327 238
-#define SE_W287 239
-#define SE_W257 240
-#define SE_W253 241
-#define SE_W258 242
-#define SE_W322 243
-#define SE_W298 244
-#define SE_W287B 245
-#define SE_W114 246
-#define SE_W063B 247
-#define SE_CASHIER 248
-#define SE_SHIP_HORN 249
-#define SE_HELP_OPEN 250
-#define SE_HELP_CLOSE 251
-#define SE_HELP_PAGE 252
+#define SE_SEIKAI 25
+#define SE_HAZURE 26
+#define SE_EXP 27
+#define SE_JITE_PYOKO 28
+#define SE_MU_PACHI 29
+#define SE_TK_KASYA 30
+#define SE_FU_ZAKU 31
+#define SE_FU_ZAKU2 32
+#define SE_FU_ZUZUZU 33
+#define SE_RU_GASHIN 34
+#define SE_RU_GASYAN 35
+#define SE_RU_BARI 36
+#define SE_RU_HYUU 37
+#define SE_KI_GASYAN 38
+#define SE_TK_WARPIN 39
+#define SE_TK_WARPOUT 40
+#define SE_TU_SAA 41
+#define SE_HI_TURUN 42
+#define SE_TRACK_MOVE 43
+#define SE_TRACK_STOP 44
+#define SE_TRACK_HAIKI 45
+#define SE_TRACK_DOOR 46
+#define SE_MOTER 47
+#define SE_SAVE 48
+#define SE_KON 49
+#define SE_KON2 50
+#define SE_KON3 51
+#define SE_KON4 52
+#define SE_SUIKOMU 53
+#define SE_NAGERU 54
+#define SE_TOY_C 55
+#define SE_TOY_D 56
+#define SE_TOY_E 57
+#define SE_TOY_F 58
+#define SE_TOY_G 59
+#define SE_TOY_A 60
+#define SE_TOY_B 61
+#define SE_TOY_C1 62
+#define SE_MIZU 63
+#define SE_HASHI 64
+#define SE_DAUGI 65
+#define SE_PINPON 66
+#define SE_FUUSEN1 67
+#define SE_FUUSEN2 68
+#define SE_FUUSEN3 69
+#define SE_TOY_KABE 70
+#define SE_TOY_DANGO 71
+#define SE_DOKU 72
+#define SE_ESUKA 73
+#define SE_T_AME 74
+#define SE_T_AME_E 75
+#define SE_T_OOAME 76
+#define SE_T_OOAME_E 77
+#define SE_T_KOAME 78
+#define SE_T_KOAME_E 79
+#define SE_T_KAMI 80
+#define SE_T_KAMI2 81
+#define SE_ELEBETA 82
+#define SE_HINSI 83
+#define SE_EXPMAX 84
+#define SE_TAMAKORO 85
+#define SE_TAMAKORO_E 86
+#define SE_BASABASA 87
+#define SE_REGI 88
+#define SE_C_GAJI 89
+#define SE_C_MAKU_U 90
+#define SE_C_MAKU_D 91
+#define SE_C_PASI 92
+#define SE_C_SYU 93
+#define SE_C_PIKON 94
+#define SE_REAPOKE 95
+#define SE_OP_BASYU 96
+#define SE_BT_START 97
+#define SE_DENDOU 98
+#define SE_JIHANKI 99
+#define SE_TAMA 100
+#define SE_Z_SCROLL 101
+#define SE_Z_PAGE 102
+#define SE_PN_ON 103
+#define SE_PN_OFF 104
+#define SE_Z_SEARCH 105
+#define SE_TAMAGO 106
+#define SE_TB_START 107
+#define SE_TB_KON 108
+#define SE_TB_KARA 109
+#define SE_BIDORO 110
+#define SE_W085 111
+#define SE_W085B 112
+#define SE_W231 113
+#define SE_W171 114
+#define SE_W233 115
+#define SE_W233B 116
+#define SE_W145 117
+#define SE_W145B 118
+#define SE_W145C 119
+#define SE_W240 120
+#define SE_W015 121
+#define SE_W081 122
+#define SE_W081B 123
+#define SE_W088 124
+#define SE_W016 125
+#define SE_W016B 126
+#define SE_W003 127
+#define SE_W104 128
+#define SE_W013 129
+#define SE_W196 130
+#define SE_W086 131
+#define SE_W004 132
+#define SE_W025 133
+#define SE_W025B 134
+#define SE_W152 135
+#define SE_W026 136
+#define SE_W172 137
+#define SE_W172B 138
+#define SE_W053 139
+#define SE_W007 140
+#define SE_W092 141
+#define SE_W221 142
+#define SE_W221B 143
+#define SE_W052 144
+#define SE_W036 145
+#define SE_W059 146
+#define SE_W059B 147
+#define SE_W010 148
+#define SE_W011 149
+#define SE_W017 150
+#define SE_W019 151
+#define SE_W028 152
+#define SE_W013B 153
+#define SE_W044 154
+#define SE_W029 155
+#define SE_W057 156
+#define SE_W056 157
+#define SE_W250 158
+#define SE_W030 159
+#define SE_W039 160
+#define SE_W054 161
+#define SE_W077 162
+#define SE_W020 163
+#define SE_W082 164
+#define SE_W047 165
+#define SE_W195 166
+#define SE_W006 167
+#define SE_W091 168
+#define SE_W146 169
+#define SE_W120 170
+#define SE_W153 171
+#define SE_W071B 172
+#define SE_W071 173
+#define SE_W103 174
+#define SE_W062 175
+#define SE_W062B 176
+#define SE_W048 177
+#define SE_W187 178
+#define SE_W118 179
+#define SE_W155 180
+#define SE_W122 181
+#define SE_W060 182
+#define SE_W185 183
+#define SE_W014 184
+#define SE_W043 185
+#define SE_W207 186
+#define SE_W207B 187
+#define SE_W215 188
+#define SE_W109 189
+#define SE_W173 190
+#define SE_W280 191
+#define SE_W202 192
+#define SE_W060B 193
+#define SE_W076 194
+#define SE_W080 195
+#define SE_W100 196
+#define SE_W107 197
+#define SE_W166 198
+#define SE_W129 199
+#define SE_W115 200
+#define SE_W112 201
+#define SE_W197 202
+#define SE_W199 203
+#define SE_W236 204
+#define SE_W204 205
+#define SE_W268 206
+#define SE_W070 207
+#define SE_W063 208
+#define SE_W127 209
+#define SE_W179 210
+#define SE_W151 211
+#define SE_W201 212
+#define SE_W161 213
+#define SE_W161B 214
+#define SE_W227 215
+#define SE_W227B 216
+#define SE_W226 217
+#define SE_W208 218
+#define SE_W213 219
+#define SE_W213B 220
+#define SE_W234 221
+#define SE_W260 222
+#define SE_W328 223
+#define SE_W320 224
+#define SE_W255 225
+#define SE_W291 226
+#define SE_W089 227
+#define SE_W239 228
+#define SE_W230 229
+#define SE_W281 230
+#define SE_W327 231
+#define SE_W287 232
+#define SE_W257 233
+#define SE_W253 234
+#define SE_W258 235
+#define SE_W322 236
+#define SE_W298 237
+#define SE_W287B 238
+#define SE_W114 239
+#define SE_W063B 240
+#define MUS_W_DOOR 241
+#define SE_CARD1 242
+#define SE_CARD2 243
+#define SE_CARD3 244
+#define SE_BAG1 245
+#define SE_BAG2 246
+#define SE_GETTING 247
+#define SE_SHOP 248
+#define SE_KITEKI 249
+#define SE_HELP_OP 250
+#define SE_HELP_CL 251
+#define SE_HELP_NG 252
+#define SE_DEOMOV 253
+#define SE_EXCELLENT 254
+#define SE_NAWAMISS 255
#define MUS_ME_ASA 256
#define MUS_FANFA1 257
@@ -264,224 +267,88 @@
#define MUS_ME_WAZA 261
#define MUS_ME_KINOMI 262
#define MUS_ME_SHINKA 263
-#define BGM_FRLG_SAFARI_ZONE 264
-#define MUS_SHINKA BGM_FRLG_SAFARI_ZONE
-#define BGM_FRLG_CHANSEY_DANCE 267
+#define MUS_SHINKA 264
+#define MUS_BATTLE32 265
+#define MUS_BATTLE20 266
+#define MUS_P_SCHOOL 267
#define MUS_ME_B_BIG 268
#define MUS_ME_B_SMALL 269
#define MUS_ME_WASURE 270
#define MUS_ME_ZANNEN 271
-#define BGM_FRLG_FOLLOW_ME 272
-#define BGM_FRLG_GAMECORNER 273
-#define BGM_FRLG_ROCKET_HIDEOUT 274
-#define BGM_FRLG_GYM 275
-#define BGM_FRLG_JIGGLYPUFF 276
-#define BGM_FRLG_OPENING 277
-#define BGM_FRLG_TITLE 278
-#define BGM_FRLG_CINNABAR_ISLAND 279
-#define BGM_FRLG_LAVENDER_TOWN 280
-#define BGM_FRLG_HEALING_TEST 281
-#define BGM_FRLG_BICYCLE 282
-#define BGM_FRLG_SUSPICIOUS_EYE 283
-#define BGM_FRLG_GIRL_EYE 284
-#define BGM_FRLG_BOY_EYE 285
-#define BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME 286
-#define BGM_FRLG_VIRIDIAN_FOREST 287
-#define BGM_FRLG_MT_MOON 288
-#define BGM_FRLG_POKEMON_MANSION 289
-#define BGM_FRLG_CREDITS 290
-#define BGM_FRLG_ROUTE_1 291
-#define BGM_FRLG_ROUTE_24 292
-#define BGM_FRLG_ROUTE_3 293
-#define BGM_FRLG_ROUTE_11 294
-#define BGM_FRLG_INDIGO_PLATEAU 295
-#define BGM_FRLG_BATTLE_LEADER 296
-#define BGM_FRLG_BATTLE_TRAINER 297
-#define BGM_FRLG_BATTLE_WILD_POKEMON 298
-#define BGM_FRLG_BATTLE_CHAMPION 299
-#define BGM_FRLG_PALLET_TOWN 300
-#define BGM_FRLG_OAK_LAB 301
-#define BGM_FRLG_PROF_OAK 302
-#define BGM_FRLG_POKEMON_CENTER 303
-#define BGM_FRLG_SS_ANNE 304
-#define BGM_FRLG_SURF 305
-#define BGM_FRLG_POKEMON_TOWER 306
-#define BGM_FRLG_SILPH 307
-#define BGM_FRLG_CERULEAN_CITY 308
-#define BGM_FRLG_CELADON_CITY 309
-#define BGM_FRLG_KACHI_TRAINER 310
-#define BGM_FRLG_KACHI_WILD_POKEMON 311
-#define BGM_FRLG_KACHI_LEADER 312
-#define BGM_FRLG_VERMILION_CITY 313
-#define BGM_FRLG_VIRIDIAN_CITY 314
-#define BGM_FRLG_RIVAL 315
-#define BGM_FRLG_RIVAL_POSTBATTLE 316
-#define BGM_FRLG_ME_POKEDEX_EVAL 317
-#define BGM_FRLG_ME_KEYITEM 318
-#define BGM_FRLG_FANFA_POKEMON_CAUGHT 319
-#define BGM_FRLG_FANFA_TRAINERCARD_PHOTO 320
-#define BGM_FRLG_GAMEFREAK_LOGO 321
-#define BGM_FRLG_CAUGHT_POKEMON 322
-#define BGM_FRLG_GAME_EXPLANATION_START 323
-#define BGM_FRLG_GAME_EXPLANATION_MIDDLE 324
-#define BGM_FRLG_GAME_EXPLANATION_END 325
-#define BGM_FRLG_POKEMON_JUMP 326
-#define BGM_FRLG_UNION_ROOM 327
-#define BGM_FRLG_POKEMON_NETWORK_CENTER 328
-#define BGM_FRLG_MYSTERY_GIFT 329
-#define BGM_FRLG_DODRIO_BERRY_PICK 330
-#define BGM_FRLG_MT_EMBER 331
-#define BGM_FRLG_TEACHY_TV_EPISODE 332
-#define BGM_FRLG_SEVII_ISLANDS 333
-#define BGM_FRLG_TANOBY_RUINS 334
-#define BGM_FRLG_ISLAND_ONE 335
-#define BGM_FRLG_ISLAND_FOUR 336
-#define BGM_FRLG_ISLAND_SIX 337
-#define BGM_FRLG_FLUTE 338
-#define BGM_FRLG_BATTLE_DEOXYS 339
-#define BGM_FRLG_BATTLE_MEWTWO 340
-#define BGM_FRLG_BATTLE_LEGENDARY 341
-#define BGM_FRLG_LEADER_EYE 342
-#define BGM_FRLG_DEOXYS_EYE 343
-#define BGM_FRLG_TRAINER_TOWER 344
-#define BGM_FRLG_HALL_OF_FAME_PALLET_TOWN 345
-#define BGM_FRLG_TEACHY_TV 346
-
-#define BGM_STOP 349
-#define BGM_TETSUJI 350
-#define BGM_FIELD13 351
-#define BGM_KACHI22 352
-#define BGM_KACHI2 353
-#define BGM_KACHI3 354
-#define BGM_KACHI5 355
-#define BGM_PCC 356
-#define BGM_NIBI 357
-#define BGM_SUIKUN 358
-#define BGM_DOORO1 359
-#define BGM_DOORO_X1 360
-#define BGM_DOORO_X3 361
-#define BGM_MACHI_S2 362
-#define BGM_MACHI_S4 363
-#define BGM_GIM 364
-#define BGM_NAMINORI 365
-#define BGM_DAN01 366
-#define BGM_FANFA1 367
-#define BGM_ME_ASA 368
-#define BGM_ME_BACHI 369
-#define BGM_FANFA4 370
-#define BGM_FANFA5 371
-#define BGM_ME_WAZA 372
-#define BGM_BIJYUTU 373
-#define BGM_DOORO_X4 374
-#define BGM_FUNE_KAN 375
-#define BGM_ME_SHINKA 376
-#define BGM_SHINKA 377
-#define BGM_ME_WASURE 378
-#define BGM_SYOUJOEYE 379
-#define BGM_BOYEYE 380
-#define BGM_DAN02 381
-#define BGM_MACHI_S3 382
-#define BGM_ODAMAKI 383
-#define BGM_B_TOWER 384
-#define BGM_SWIMEYE 385
-#define BGM_DAN03 386
-#define BGM_ME_KINOMI 387
-#define BGM_ME_TAMA 388
-#define BGM_ME_B_BIG 389
-#define BGM_ME_B_SMALL 390
-#define BGM_ME_ZANNEN 391
-#define BGM_BD_TIME 392
-#define BGM_TEST1 393
-#define BGM_TEST2 394
-#define BGM_TEST3 395
-#define BGM_TEST4 396
-#define BGM_TEST 397
-#define BGM_GOMACHI0 398
-#define BGM_GOTOWN 399
-#define BGM_POKECEN 400
-#define BGM_NEXTROAD 401
-#define BGM_GRANROAD 402
-#define BGM_CYCLING 403
-#define BGM_FRIENDLY 404
-#define BGM_MISHIRO 405
-#define BGM_TOZAN 406
-#define BGM_GIRLEYE 407
-#define BGM_MINAMO 408
-#define BGM_ASHROAD 409
-#define BGM_EVENT0 410
-#define BGM_DEEPDEEP 411
-#define BGM_KACHI1 412
-#define BGM_TITLE3 413
-#define BGM_DEMO1 414
-#define BGM_GIRL_SUP 415
-#define BGM_HAGESHII 416
-#define BGM_KAKKOII 417
-#define BGM_KAZANBAI 418
-#define BGM_AQA_0 419
-#define BGM_TSURETEK 420
-#define BGM_BOY_SUP 421
-#define BGM_RAINBOW 422
-#define BGM_AYASII 423
-#define BGM_KACHI4 424
-#define BGM_ROPEWAY 425
-#define BGM_CASINO 426
-#define BGM_HIGHTOWN 427
-#define BGM_SAFARI 428
-#define BGM_C_ROAD 429
-#define BGM_AJITO 430
-#define BGM_M_BOAT 431
-#define BGM_M_DUNGON 432
-#define BGM_FINECITY 433
-#define BGM_MACHUPI 434
-#define BGM_P_SCHOOL 435
-#define BGM_DENDOU 436
-#define BGM_TONEKUSA 437
-#define BGM_MABOROSI 438
-#define BGM_CON_FAN 439
-#define BGM_CONTEST0 440
-#define BGM_MGM0 441
-#define BGM_T_BATTLE 442
-#define BGM_OOAME 443
-#define BGM_HIDERI 444
-#define BGM_RUNECITY 445
-#define BGM_CON_K 446
-#define BGM_EIKOU_R 447
-#define BGM_KARAKURI 448
-#define BGM_HUTAGO 449
-#define BGM_SITENNOU 450
-#define BGM_YAMA_EYE 451
-#define BGM_CONLOBBY 452
-#define BGM_INTER_V 453
-#define BGM_DAIGO 454
-#define BGM_THANKFOR 455
-#define BGM_END 456
-#define BGM_BATTLE_FRONTIER 457
-#define BGM_BATTLE_ARENA 458
-#define BGM_ME_BATTLE_POINTS 459
-#define BGM_ME_MATCH_CALL 460
-#define BGM_BATTLE_PYRAMID 461
-#define BGM_BATTLE_PYRAMID_SUMMIT 462
-#define BGM_BATTLE_PALACE 463
-#define BGM_FANFA_RAYQUAZA 464
-#define BGM_BATTLE_TOWER 465
-#define BGM_ME_BATTLE_SYMBOL 466
-#define BGM_BATTLE_DOME_TOURNAMENT 467
-#define BGM_BATTLE_PIKE 468
-#define BGM_BATTLE_FACTORY 469
-#define BGM_BATTLE_LEGENDARY 470
-#define BGM_BATTLE_FRONTIER_BRAIN 471
-#define BGM_BATTLE_MEW 472
-#define BGM_BATTLE_DOME 473
-#define BGM_BATTLE27 474
-#define BGM_BATTLE31 475
-#define BGM_BATTLE20 476
-#define BGM_BATTLE32 477
-#define BGM_BATTLE33 478
-#define BGM_BATTLE36 479
-#define BGM_BATTLE34 480
-#define BGM_BATTLE35 481
-#define BGM_BATTLE38 482
-#define BGM_BATTLE30 483
-#define BGM_ROUTE_118 0x7FFF // What is this for?
+#define MUS_ANNAI 272
+#define MUS_SLOT 273
+#define MUS_AJITO 274
+#define MUS_GYM 275
+#define MUS_PURIN 276
+#define MUS_DEMO 277
+#define MUS_TITLE 278
+#define MUS_GUREN 279
+#define MUS_SHION 280
+#define MUS_KAIHUKU 281
+#define MUS_CYCLING 282
+#define MUS_ROCKET 283
+#define MUS_SHOUJO 284
+#define MUS_SHOUNEN 285
+#define MUS_DENDOU 286
+#define MUS_T_MORI 287
+#define MUS_OTSUKIMI 288
+#define MUS_POKEYASHI 289
+#define MUS_ENDING 290
+#define MUS_LOAD01 291
+#define MUS_OPENING 292
+#define MUS_LOAD02 293
+#define MUS_LOAD03 294
+#define MUS_CHAMP_R 295
+#define MUS_VS_GYM 296
+#define MUS_VS_TORE 297
+#define MUS_VS_YASEI 298
+#define MUS_VS_LAST 299
+#define MUS_MASARA 300
+#define MUS_KENKYU 301
+#define MUS_OHKIDO 302
+#define MUS_POKECEN 303
+#define MUS_SANTOAN 304
+#define MUS_NAMINORI 305
+#define MUS_P_TOWER 306
+#define MUS_SHIRUHU 307
+#define MUS_HANADA 308
+#define MUS_TAMAMUSI 309
+#define MUS_WIN_TRE 310
+#define MUS_WIN_YASEI 311
+#define MUS_WIN_GYM 312
+#define MUS_KUCHIBA 313
+#define MUS_NIBI 314
+#define MUS_RIVAL1 315
+#define MUS_RIVAL2 316
+#define MUS_FAN2 317
+#define MUS_FAN5 318
+#define MUS_FAN6 319
+#define MUS_ME_PHOTO 320
+#define MUS_TITLEROG 321
+#define MUS_GET_YASEI 322
+#define MUS_SOUSA 323
+#define MUS_SEKAIKAN 324
+#define MUS_SEIBETU 325
+#define MUS_JUMP 326
+#define MUS_UNION 327
+#define MUS_NETWORK 328
+#define MUS_OKURIMONO 329
+#define MUS_KINOMIKUI 330
+#define MUS_NANADUNGEON 331
+#define MUS_OSHIE_TV 332
+#define MUS_NANASHIMA 333
+#define MUS_NANAISEKI 334
+#define MUS_NANA123 335
+#define MUS_NANA45 336
+#define MUS_NANA67 337
+#define MUS_POKEFUE 338
+#define MUS_VS_DEO 339
+#define MUS_VS_MYU2 340
+#define MUS_VS_DEN 341
+#define MUS_EXEYE 342
+#define MUS_DEOEYE 343
+#define MUS_T_TOWER 344
+#define MUS_SLOWMASARA 345
+#define MUS_TVNOIZE 346
#endif // GUARD_CONSTANTS_SONGS_H