|
@@ -165,19 +165,18 @@ special 0x3B
|
165
|
165
|
playsong \costumtrainerbattlemusic_id 0x0
|
166
|
166
|
.endm
|
167
|
167
|
|
168
|
|
-.macro mugmsgr mugmsgr_textpointer:req mugmsgr_callstd:req mugmsgr_sprite:req
|
169
|
|
-setvar MUGHSOT_1_TABLE \mugmsgr_sprite
|
170
|
|
-setvar MUGSHOT_1_X 0xD0
|
171
|
|
-setvar MUGSHOT_1_Y 0x60
|
172
|
|
-msgbox \mugmsgr_textpointer \mugmsgr_callstd
|
173
|
|
-setvar MUGHSOT_1_TABLE 0x0
|
174
|
|
-.endm
|
175
|
|
-
|
176
|
|
-.macro mugmsgl mugmsgl_textpointer:req mugmsgl_callstd:req mugmsgl_sprite:req
|
177
|
|
-setvar MUGHSOT_1_TABLE \mugmsgl_sprite | 0x8000
|
178
|
|
-setvar MUGSHOT_1_X 0x16
|
179
|
|
-setvar MUGSHOT_1_Y 0x60
|
180
|
|
-msgbox \mugmsgl_textpointer \mugmsgl_callstd
|
|
168
|
+.macro mugmsg mugmsg_textpointer:req mugmsg_callstd:req mugmsg_sprite:req mugmsg_facing:req
|
|
169
|
+.if \mugmsg_facing==MUGFACE_LEFT
|
|
170
|
+ setvar MUGHSOT_1_TABLE \mugmsg_sprite | 0x8000
|
|
171
|
+ setvar MUGSHOT_1_X 0x16
|
|
172
|
+ setvar MUGSHOT_1_Y 0x60
|
|
173
|
+.endif
|
|
174
|
+.if \mugmsg_facing==MUGFACE_RIGHT
|
|
175
|
+ setvar MUGHSOT_1_TABLE \mugmsg_sprite
|
|
176
|
+ setvar MUGSHOT_1_X 0xD0
|
|
177
|
+ setvar MUGSHOT_1_Y 0x60
|
|
178
|
+.endif
|
|
179
|
+msgbox \mugmsg_textpointer \mugmsg_callstd
|
181
|
180
|
setvar MUGHSOT_1_TABLE 0x0
|
182
|
181
|
.endm
|
183
|
182
|
|
|
@@ -188,7 +187,6 @@ setvar MUGHSOT_1_TABLE 0x0
|
188
|
187
|
.if \mugrival_facing==MUGFACE_RIGHT
|
189
|
188
|
call scr_mugrival_right
|
190
|
189
|
.endif
|
191
|
|
-
|
192
|
190
|
msgbox \mugrival_textpointer \mugrival_callstd
|
193
|
191
|
setvar MUGHSOT_1_TABLE 0x0
|
194
|
192
|
.endm
|