Przeglądaj źródła

update private, update script_language.h

SBird1337 7 lat temu
rodzic
commit
915bebbed3
2 zmienionych plików z 5 dodań i 5 usunięć
  1. 1
    1
      sots-private
  2. 4
    4
      src/include/script_language.h

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 378ab536a037e2f33ee5c56f6617c50139612b81
1
+Subproject commit 978a2232190e649a93d63a3d00cc9233f4b0b6c3

+ 4
- 4
src/include/script_language.h Wyświetl plik

@@ -129,11 +129,11 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
129 129
 
130 130
 @@ Index commands
131 131
 
132
-.macro nope
132
+.macro nop
133 133
 .byte 0x0
134 134
 .endm
135 135
 
136
-.macro nop
136
+.macro nop1
137 137
 .byte 0x1
138 138
 .endm
139 139
 
@@ -155,13 +155,13 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
155 155
 .word \goto_address
156 156
 .endm
157 157
 
158
-.macro if1 if1_value if1_pointer
158
+.macro callif if1_value if1_pointer
159 159
 .byte 0x6
160 160
 .byte \if1_value
161 161
 .word \if1_address
162 162
 .endm
163 163
 
164
-.macro if2 if2_value if2_pointer
164
+.macro gotoif if2_value if2_pointer
165 165
 .byte 0x7
166 166
 .byte \if2_value
167 167
 .word \if2_address