Merge branch 'master' into decompile_battle_5

1 files changed, 54 insertions, 54 deletions

diff --git a/include/songs.h b/include/songs.h
index c4f693726..e801ac7d7 100644
--- a/include/songs.h
+++ b/include/songs.h
@@ -37,28 +37,28 @@ enum
     /*0x1F*/ SE_SEIKAI,
     /*0x20*/ SE_HAZURE,
     /*0x21*/ SE_EXP,
-    SE_JITE_PYOKO,
-    SE_MU_PACHI,
-    SE_TK_KASYA,
-    SE_FU_ZAKU,
-    SE_FU_ZAKU2,
-    SE_FU_ZUZUZU,
-    SE_RU_GASHIN,
-    SE_RU_GASYAN,
-    SE_RU_BARI,
-    SE_RU_HYUU,
-    SE_KI_GASYAN,
-    SE_TK_WARPIN,
-    SE_TK_WARPOUT,
-    SE_TU_SAA,
-    SE_HI_TURUN,
-    SE_TRACK_MOVE,
-    SE_TRACK_STOP,
-    SE_TRACK_HAIK,
-    SE_TRACK_DOOR,
-    SE_MOTER,
-    SE_CARD,
-    SE_SAVE,
+    /*0x22*/ SE_JITE_PYOKO,
+    /*0x23*/ SE_MU_PACHI,
+    /*0x24*/ SE_TK_KASYA,
+    /*0x25*/ SE_FU_ZAKU,
+    /*0x26*/ SE_FU_ZAKU2,
+    /*0x27*/ SE_FU_ZUZUZU,
+    /*0x28*/ SE_RU_GASHIN,
+    /*0x29*/ SE_RU_GASYAN,
+    /*0x2A*/ SE_RU_BARI,
+    /*0x2B*/ SE_RU_HYUU,
+    /*0x2C*/ SE_KI_GASYAN,
+    /*0x2D*/ SE_TK_WARPIN,
+    /*0x2E*/ SE_TK_WARPOUT,
+    /*0x2F*/ SE_TU_SAA,
+    /*0x30*/ SE_HI_TURUN,
+    /*0x31*/ SE_TRACK_MOVE,
+    /*0x32*/ SE_TRACK_STOP,
+    /*0x33*/ SE_TRACK_HAIK,
+    /*0x34*/ SE_TRACK_DOOR,
+    /*0x35*/ SE_MOTER,
+    /*0x36*/ SE_CARD,
+    /*0x37*/ SE_SAVE,
     /*0x38*/ SE_KON,
     /*0x39*/ SE_KON2,
     /*0x3A*/ SE_KON3,
@@ -274,38 +274,38 @@ enum
     /*0x171*/ BGM_ME_BACHI,
     /*0x172*/ BGM_FANFA4,
     /*0x173*/ BGM_FANFA5,
-    BGM_ME_WAZA,
-    BGM_BIJYUTU,
-    BGM_DOORO_X4,
-    BGM_FUNE_KAN,
-    BGM_ME_SHINKA,
-    BGM_SHINKA,
-    BGM_ME_WASURE,
-    BGM_SYOUJOEYE,
-    BGM_BOYEYE,
-    BGM_DAN02,
-    BGM_MACHI_S3,
-    BGM_ODAMAKI,
-    BGM_B_TOWER,
-    BGM_SWIMEYE,
-    BGM_DAN03,
-    BGM_ME_KINOMI,
-    BGM_ME_TAMA,
-    BGM_ME_B_BIG,
-    BGM_ME_B_SMALL,
-    BGM_ME_ZANNEN,
-    BGM_BD_TIME,
-    BGM_TEST1,
-    BGM_TEST2,
-    BGM_TEST3,
-    BGM_TEST4,
-    BGM_TEST,
-    BGM_GOMACHI0,
-    BGM_GOTOWN,
-    BGM_POKECEN,
-    BGM_NEXTROAD,
-    BGM_GRANROAD,
-    BGM_CYCLING,
+    /*0x174*/ BGM_ME_WAZA,
+    /*0x175*/ BGM_BIJYUTU,
+    /*0x176*/ BGM_DOORO_X4,
+    /*0x177*/ BGM_FUNE_KAN,
+    /*0x178*/ BGM_ME_SHINKA,
+    /*0x179*/ BGM_SHINKA,
+    /*0x17A*/ BGM_ME_WASURE,
+    /*0x17B*/ BGM_SYOUJOEYE,
+    /*0x17C*/ BGM_BOYEYE,
+    /*0x17D*/ BGM_DAN02,
+    /*0x17E*/ BGM_MACHI_S3,
+    /*0x17F*/ BGM_ODAMAKI,
+    /*0x180*/ BGM_B_TOWER,
+    /*0x181*/ BGM_SWIMEYE,
+    /*0x182*/ BGM_DAN03,
+    /*0x183*/ BGM_ME_KINOMI,
+    /*0x184*/ BGM_ME_TAMA,
+    /*0x185*/ BGM_ME_B_BIG,
+    /*0x186*/ BGM_ME_B_SMALL,
+    /*0x187*/ BGM_ME_ZANNEN,
+    /*0x188*/ BGM_BD_TIME,
+    /*0x189*/ BGM_TEST1,
+    /*0x18A*/ BGM_TEST2,
+    /*0x18B*/ BGM_TEST3,
+    /*0x18C*/ BGM_TEST4,
+    /*0x18D*/ BGM_TEST,
+    /*0x18E*/ BGM_GOMACHI0,
+    /*0x18F*/ BGM_GOTOWN,
+    /*0x190*/ BGM_POKECEN,
+    /*0x191*/ BGM_NEXTROAD,
+    /*0x192*/ BGM_GRANROAD,
+    /*0x193*/ BGM_CYCLING,
     BGM_FRIENDLY,
     BGM_MISHIRO,
     BGM_TOZAN,