Browse Source

Script fix, bis Carun City

DragonflySotS 7 years ago
parent
commit
6bef13e953
4 changed files with 5 additions and 4 deletions
  1. 1
    1
      battle_engine
  2. 1
    1
      sots-private
  3. 1
    0
      src/include/hiddenflags.h
  4. 2
    2
      src/include/script_language.h

+ 1
- 1
battle_engine

1
-Subproject commit 4a4fb7ac2ac3def1d4270796bdd2c04e8231d382
1
+Subproject commit a201b518834f0208efdb82ac95b08675f5279950

+ 1
- 1
sots-private

1
-Subproject commit efb99555c48d483f727ee8a15ced4c4e95e341dc
1
+Subproject commit 1e41bcd48f05000de9ac0459ea370209c601c1a4

+ 1
- 0
src/include/hiddenflags.h View File

11
 setflag 0x516
11
 setflag 0x516
12
 setflag 0x51B
12
 setflag 0x51B
13
 setflag 0x51C
13
 setflag 0x51C
14
+setflag 0x51F
14
 .endm
15
 .endm

+ 2
- 2
src/include/script_language.h View File

225
 .endm
225
 .endm
226
 
226
 
227
 .macro writemusikon
227
 .macro writemusikon
228
-setflag FLAG_ENABLE_MUSIC_OVERRIDES
228
+setflag FLAG_SKIP_BATTLE_MUSIC
229
 .endm
229
 .endm
230
 
230
 
231
 .macro writemusikoff
231
 .macro writemusikoff
232
-clearflag FLAG_ENABLE_MUSIC_OVERRIDES
232
+clearflag FLAG_SKIP_BATTLE_MUSIC
233
 .endm
233
 .endm
234
 
234
 
235
 @@ Index commands
235
 @@ Index commands