Browse Source

New Scripts & Fix

DragonflySotS 7 years ago
parent
commit
b5508a5b10
3 changed files with 81 additions and 13 deletions
  1. 1
    1
      sots-private
  2. 2
    0
      src/include/hiddenflags.h
  3. 78
    12
      src/include/script_language.h

+ 1
- 1
sots-private

1
-Subproject commit 462815a460dd15a118cefe93ad11ebb4c9ebf19b
1
+Subproject commit f9e6ee59b56752bf25f71986a0fcd69690992ff2

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

2
 
2
 
3
 .macro sethiddenflags
3
 .macro sethiddenflags
4
 setflag 0x501
4
 setflag 0x501
5
+setflag 0x507
6
+setflag 0x509
5
 .endm
7
 .endm

+ 78
- 12
src/include/script_language.h View File

6
 #include <hiddenflags.h>
6
 #include <hiddenflags.h>
7
 #include <mugssprites.h>
7
 #include <mugssprites.h>
8
 
8
 
9
+@@ Costum Specials
10
+.equ SP_BATCHMAPTILE, 0x7
11
+
9
 @@ Compare operands
12
 @@ Compare operands
10
 .equ B_LT, 0x0
13
 .equ B_LT, 0x0
11
 .equ B_EQ, 0x1
14
 .equ B_EQ, 0x1
14
 .equ B_GE, 0x4
17
 .equ B_GE, 0x4
15
 .equ B_NE, 0x5
18
 .equ B_NE, 0x5
16
 
19
 
20
+@@ Important flags
21
+.equ FLAG_PKMN_MENU, 0x828
22
+.equ FLAG_POKDEX, 0x829
23
+.equ FLAG_RUNNING_SHOES, 0x82F
24
+.equ FLAG_ORDEN_1, 0x820
25
+.equ FLAG_ORDEN_2, 0x821
26
+.equ FLAG_ORDEN_3, 0x822
27
+.equ FLAG_ORDEN_4, 0x823
28
+.equ FLAG_ORDEN_5, 0x824
29
+.equ FLAG_ORDEN_6, 0x825
30
+.equ FLAG_ORDEN_7, 0x826
31
+.equ FLAG_ORDEN_8, 0x827
32
+
17
 @@ Flag operands
33
 @@ Flag operands
18
 .equ B_T, 0x0
34
 .equ B_T, 0x0
19
 .equ B_F, 0x1
35
 .equ B_F, 0x1
28
 .equ MSG_STD, 0x6
44
 .equ MSG_STD, 0x6
29
 
45
 
30
 @@ Definition
46
 @@ Definition
31
-.equ MUG_LEFT, 0x0
32
-.equ MUG_RIGHT, 0x1
47
+.equ MUGFACE_LEFT, 0x0
48
+.equ MUGFACE_RIGHT, 0x1
49
+
50
+@@ Effect
51
+.equ EFFECT_NORMAL, 0x0
52
+.equ EFFECT_GREY, 0x1
53
+.equ EFFECT_SERPIA, 0x2
33
 
54
 
34
 @@@@@@@@@@@@@@@@@ Macro
55
 @@@@@@@@@@@@@@@@@ Macro
35
 
56
 
36
 @@ Custom commands
57
 @@ Custom commands
37
 
58
 
59
+.macro batchmaptile batchmaptile_tiles_from:req batchmaptile_tiles_to:req batchmaptile_kollision_from:req batchmaptile_kollision_to:req
60
+setvar 0x8000 \batchmaptile_tiles_from
61
+setvar 0x8001 \batchmaptile_tiles_to
62
+setvar 0x8002 \batchmaptile_kollision_from
63
+setvar 0x8003 \batchmaptile_kollision_to
64
+setvar 0x5006 SP_BATCHMAPTILE
65
+special 0x68
66
+.endm
67
+
68
+.macro seteffect seteffect_effect_id:req
69
+writebytetooffset \seteffect_effect_id 0x02036E28
70
+.endm
71
+
72
+.macro setecutscene
73
+writebytetooffset 0x80 0x4000044
74
+writebytetooffset 0x20 0x4000045
75
+.endm
76
+
77
+.macro clearcutscene
78
+writebytetooffset 0xFF 0x4000044
79
+writebytetooffset 0x00 0x4000045
80
+.endm
81
+
82
+.macro pokemsg pokemsg_string:req pokemsg_callstd:req pokemsg_ID:req
83
+checksound
84
+cry \pokemsg_ID 0x0
85
+showpokepic \pokemsg_ID 0x0 0x5
86
+loadpointer 0x0 \pokemsg_string
87
+callstd \pokemsg_callstd
88
+hidepokepic
89
+waitcry
90
+.endm
91
+
92
+.macro earthquake earthquake_horri:req earthquake_tiles:req earthquake_sec:req earthquake_vert:req
93
+setvar 0x8004 \earthquake_horri
94
+setvar 0x8005 \earthquake_tiles
95
+setvar 0x8006 \earthquake_sec
96
+setvar 0x8007 \earthquake_vert
97
+special 0x136
98
+.endm
99
+
38
 .macro lookbattle lookbattle_id:req lookbattle_before:req lookbattle_after:req
100
 .macro lookbattle lookbattle_id:req lookbattle_before:req lookbattle_after:req
39
 trainerbattle 0x0 \lookbattle_id 0x0 \lookbattle_before \lookbattle_after
101
 trainerbattle 0x0 \lookbattle_id 0x0 \lookbattle_before \lookbattle_after
40
 .endm
102
 .endm
92
 waitstate
154
 waitstate
93
 .endm
155
 .endm
94
 
156
 
157
+.macro wildbattlemusic wildbattlemusic_spezies:req wildbattlemusic_level:req wildbattlemusic_item:req wildbattlemusic_music:req
158
+setwildbattle \wildbattlemusic_spezies \wildbattlemusic_level \wildbattlemusic_item
159
+special 0x138
160
+playsong \wildbattlemusic_music 0x0
161
+.endm
162
+
163
+.macro costumtrainerbattlemusic costumtrainerbattlemusic_id:req
164
+special 0x3B
165
+playsong \costumtrainerbattlemusic_id 0x0
166
+.endm
167
+
95
 .macro mugmsgr mugmsgr_textpointer:req mugmsgr_callstd:req mugmsgr_sprite:req
168
 .macro mugmsgr mugmsgr_textpointer:req mugmsgr_callstd:req mugmsgr_sprite:req
96
 setvar MUGHSOT_1_TABLE \mugmsgr_sprite
169
 setvar MUGHSOT_1_TABLE \mugmsgr_sprite
97
 setvar MUGSHOT_1_X 0xD0
170
 setvar MUGSHOT_1_X 0xD0
108
 setvar MUGHSOT_1_TABLE 0x0
181
 setvar MUGHSOT_1_TABLE 0x0
109
 .endm
182
 .endm
110
 
183
 
111
-.macro mugrival mugrivalr_textpointer:req mugrivalr_callstd:req mugrivalr_facing:req
112
-setvar 0x8000 \mugrivalr_facing
113
-call scr_mugrival
114
-msgbox \mugrivalr_textpointer \mugrivalr_callstd
115
-setvar MUGHSOT_1_TABLE 0x0
116
-.endm
117
-
118
-.macro mugrivall mugrivall_textpointer:req mugrivall_callstd:req mugrivall_facing:req
119
-setvar 0x8000 \mugrivall_facing
184
+.macro mugrival mugrival_textpointer:req mugrival_callstd:req mugrival_facing:req
185
+setvar 0x8000 \mugrival_facing
120
 call scr_mugrival
186
 call scr_mugrival
121
-msgbox \mugrivall_textpointer \mugrivall_callstd
187
+msgbox \mugrival_textpointer \mugrival_callstd
122
 setvar MUGHSOT_1_TABLE 0x0
188
 setvar MUGHSOT_1_TABLE 0x0
123
 .endm
189
 .endm
124
 
190