Browse Source

New Scripts and Script Fix

DragonflySotS 7 years ago
parent
commit
85ec6de78b
3 changed files with 4 additions and 4 deletions
  1. 1
    1
      battle_engine
  2. 1
    1
      sots-private
  3. 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 a939744eddbf3a54ee47240630aaaf01320016bc
1
+Subproject commit b58cbfa3dff8ab40a328c1bb9e5dccca99ff1fe1

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

201
 .endm
201
 .endm
202
 
202
 
203
 .macro battlescreen battlescreen_grass:req battlescreen_sea:req
203
 .macro battlescreen battlescreen_grass:req battlescreen_sea:req
204
-setvar NORMAL_VAR \battlescreen_grass
205
-setvar SEA_VAR \battlescreen_sea
204
+setvar BATTLE_NORMAL_VAR \battlescreen_grass
205
+setvar BATTLE_SEA_VAR \battlescreen_sea
206
 .endm
206
 .endm
207
 
207
 
208
 .macro cameramove cameramove_xpos:req cameramove_ypos:req
208
 .macro cameramove cameramove_xpos:req cameramove_ypos:req