소스 검색

fix redefined values

Michael Panzlaff 5 년 전
부모
커밋
5e71f2d09e
3개의 변경된 파일3개의 추가작업 그리고 7개의 파일을 삭제
  1. 1
    1
      sots-private
  2. 1
    3
      src/include/constants/pymap/songs.h
  3. 1
    3
      src/include/constants/pymap/songs.s

+ 1
- 1
sots-private

1
-Subproject commit cc4061c000589ba7767d352304378ed3767f16a7
1
+Subproject commit 027e5415d6bdcadc391827edb98ec089301201fb

+ 1
- 3
src/include/constants/pymap/songs.h 파일 보기

1
 #define SEQ_BGM_TOWN_HESPERIA 0x15e
1
 #define SEQ_BGM_TOWN_HESPERIA 0x15e
2
 #define SEQ_BGM_CITY_CARUN 0x15f
2
 #define SEQ_BGM_CITY_CARUN 0x15f
3
-#define SEQ_BGM_P_FOY 0x160
3
+#define SEQ_BGM_CITY_URBANIA 0x160
4
 #define SEQ_BGM_TOWN_04 0x161
4
 #define SEQ_BGM_TOWN_04 0x161
5
 #define SEQ_BGM_TOWN_02 0x162
5
 #define SEQ_BGM_TOWN_02 0x162
6
 #define SEQ_BGM_TOWN_06 0x163
6
 #define SEQ_BGM_TOWN_06 0x163
23
 #define SEQ_BGM_R_08 0x179
23
 #define SEQ_BGM_R_08 0x179
24
 #define SEQ_BGM_CAVE_GUARDIAN 0x186
24
 #define SEQ_BGM_CAVE_GUARDIAN 0x186
25
 #define SEQ_BGM_CAVE_02 0x187
25
 #define SEQ_BGM_CAVE_02 0x187
26
-#define SEQ_BGM_PC 0x15b
27
-#define SEQ_BGM_LAB 0x17e
28
 #define SEQ_BGM_GYM 0x19b
26
 #define SEQ_BGM_GYM 0x19b
29
 #define SEQ_BGM_LAB 0x19c
27
 #define SEQ_BGM_LAB 0x19c
30
 #define SEQ_BGM_SCHOOL 0x19d
28
 #define SEQ_BGM_SCHOOL 0x19d

+ 1
- 3
src/include/constants/pymap/songs.s 파일 보기

1
 .equ SEQ_BGM_TOWN_HESPERIA, 0x15e
1
 .equ SEQ_BGM_TOWN_HESPERIA, 0x15e
2
 .equ SEQ_BGM_CITY_CARUN, 0x15f
2
 .equ SEQ_BGM_CITY_CARUN, 0x15f
3
-.equ SEQ_BGM_P_FOY, 0x160
3
+.equ SEQ_BGM_CITY_URBANIA, 0x160
4
 .equ SEQ_BGM_TOWN_04, 0x161
4
 .equ SEQ_BGM_TOWN_04, 0x161
5
 .equ SEQ_BGM_TOWN_02, 0x162
5
 .equ SEQ_BGM_TOWN_02, 0x162
6
 .equ SEQ_BGM_TOWN_06, 0x163
6
 .equ SEQ_BGM_TOWN_06, 0x163
23
 .equ SEQ_BGM_R_08, 0x179
23
 .equ SEQ_BGM_R_08, 0x179
24
 .equ SEQ_BGM_CAVE_GUARDIAN, 0x186
24
 .equ SEQ_BGM_CAVE_GUARDIAN, 0x186
25
 .equ SEQ_BGM_CAVE_02, 0x187
25
 .equ SEQ_BGM_CAVE_02, 0x187
26
-.equ SEQ_BGM_PC, 0x15b
27
-.equ SEQ_BGM_LAB, 0x17e
28
 .equ SEQ_BGM_GYM, 0x19b
26
 .equ SEQ_BGM_GYM, 0x19b
29
 .equ SEQ_BGM_LAB, 0x19c
27
 .equ SEQ_BGM_LAB, 0x19c
30
 .equ SEQ_BGM_SCHOOL, 0x19d
28
 .equ SEQ_BGM_SCHOOL, 0x19d