Browse Source

Include angepasst, neue Scripts, Bugs (werden behoben)

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

+ 1
- 1
sots-private

1
-Subproject commit 8f1f50bbe7d5ba157cbb2a4791f2181152234cb6
1
+Subproject commit d208915b0707c7710bc28ec3b0bea5cfccb86917

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

4
 setflag 0x501
4
 setflag 0x501
5
 setflag 0x507
5
 setflag 0x507
6
 setflag 0x509
6
 setflag 0x509
7
+setflag 0x50E
8
+setflag 0x511
9
+setflag 0x512
10
+setflag 0x513
7
 .endm
11
 .endm

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

131
 .endm
131
 .endm
132
 
132
 
133
 .macro giveitem giveitem_item:req giveitem_quantity:req giveitem_messagetyp:req
133
 .macro giveitem giveitem_item:req giveitem_quantity:req giveitem_messagetyp:req
134
-setvarifnotzero 0x8000 \giveitem_item
135
-setvarifnotzero 0x8001 \giveitem_quantity
134
+copyvarifnotzero 0x8000 \giveitem_item
135
+copyvarifnotzero 0x8001 \giveitem_quantity
136
 callstd \giveitem_messagetyp
136
 callstd \giveitem_messagetyp
137
 .endm
137
 .endm
138
 
138
 
139
 .macro giveitem2 giveitem2_item:req giveitem2_quantity:req giveitem2_song:req
139
 .macro giveitem2 giveitem2_item:req giveitem2_quantity:req giveitem2_song:req
140
-setvarifnotzero 0x8000 \giveitem2_item
141
-setvarifnotzero 0x8001 \giveitem2_quantity
142
-setvarifnotzero 0x8002 \giveitem2_song
140
+copyvarifnotzero 0x8000 \giveitem2_item
141
+copyvarifnotzero 0x8001 \giveitem2_quantity
142
+copyvarifnotzero 0x8002 \giveitem2_song
143
 callstd 0x9
143
 callstd 0x9
144
 .endm
144
 .endm
145
 
145
 
745
 .word \braile_data
745
 .word \braile_data
746
 .endm
746
 .endm
747
 
747
 
748
-.macro givepokemon givepokemon_spezies:req givepokemon_level:req givepokemon_item:req givepokemon_one givepokemon_two givepokemon_three
748
+.macro givepokemon givepokemon_spezies:req givepokemon_level:req givepokemon_item:req
749
 .byte 0x79
749
 .byte 0x79
750
 .hword \givepokemon_spezies
750
 .hword \givepokemon_spezies
751
 .byte \givepokemon_level
751
 .byte \givepokemon_level