diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 |
| commit | 93f767e26de82d1d4133e719a758578ede98b306 (patch) | |
| tree | 0932ef3730d627bb9d9fc6c919cdcd5a6a358d7f /include/songs.h | |
| parent | dd7e19107879f74d8f962a6a47d619470eaefbcd (diff) | |
| parent | e50b9e28bc0d98c69b22f6d13298e705eb4eb865 (diff) | |
resolve conflict
Diffstat (limited to 'include/songs.h')
| -rw-r--r-- | include/songs.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/songs.h b/include/songs.h index a813cc785..8cf7ee5e9 100644 --- a/include/songs.h +++ b/include/songs.h @@ -94,11 +94,11 @@ enum SE_T_KAMI2, SE_ELEBETA, /*0x5A*/ SE_HINSI, - SE_EXPMAX, - SE_TAMAKORO, - SE_TAMAKORO_E, - SE_BASABASA, - SE_REGI, + /*0x5B*/ SE_EXPMAX, + /*0x5C*/ SE_TAMAKORO, + /*0x5D*/ SE_TAMAKORO_E, + /*0x5E*/ SE_BASABASA, + /*0x5F*/ SE_REGI, SE_C_GAJI, SE_C_MAKU_U, SE_C_MAKU_D, |