|
@@ -6,7 +6,9 @@
|
6
|
6
|
#include <script/mugshot.h>
|
7
|
7
|
#include <script/battlescreen.h>
|
8
|
8
|
#include <constants/items.h>
|
|
9
|
+#include <constants/pkmns.h>
|
9
|
10
|
#include <pymap_constants.h>
|
|
11
|
+#include <script/trainerid.h>
|
10
|
12
|
|
11
|
13
|
@@Some Constants
|
12
|
14
|
.equ PLAYER, 0xFF
|
|
@@ -67,17 +69,17 @@
|
67
|
69
|
.equ EFFECT_SERPIA, 0x2
|
68
|
70
|
|
69
|
71
|
@@ Emotion
|
70
|
|
-.equ EMOT_NORMAL, 0x1
|
71
|
|
-.equ EMOT_UEBERLEGT, 0x2
|
72
|
|
-.equ EMOT_ERSTAUNT, 0x3
|
73
|
|
-.equ EMOT_TRAURIG, 0x4
|
74
|
|
-.equ EMOT_SAUER, 0x5
|
75
|
|
-.equ EMOT_GRINST, 0x6
|
76
|
|
-.equ EMOT_ZWINKERT, 0x7
|
77
|
|
-.equ EMOT_SCHOCKIERT, 0x8
|
78
|
|
-.equ EMOT_BOESESLACHEN, 0x9
|
79
|
|
-.equ EMOT_GENERVT, 0xa
|
80
|
|
-.equ EMOT_ERFREUT, 0xb
|
|
72
|
+.equ EMOT_NORMAL, 0x0
|
|
73
|
+.equ EMOT_UEBERLEGT, 0x1
|
|
74
|
+.equ EMOT_ERSTAUNT, 0x2
|
|
75
|
+.equ EMOT_TRAURIG, 0x3
|
|
76
|
+.equ EMOT_SAUER, 0x4
|
|
77
|
+.equ EMOT_LAECHELN, 0x5
|
|
78
|
+.equ EMOT_ZWINKERT, 0x6
|
|
79
|
+.equ EMOT_SCHOCKIERT, 0x7
|
|
80
|
+.equ EMOT_BOESESLACHEN, 0x8
|
|
81
|
+.equ EMOT_GENERVT, 0x9
|
|
82
|
+.equ EMOT_ERFREUT, 0xa
|
81
|
83
|
|
82
|
84
|
@@@@@@@@@@@@@@@@@ Macro
|
83
|
85
|
|
|
@@ -268,7 +270,13 @@ setvar 0x8000 0x0
|
268
|
270
|
.endif
|
269
|
271
|
.endif
|
270
|
272
|
addvar MUGHSOT_1_TABLE \mugmsg_emot
|
271
|
|
-msgbox \mugmsg_textpointer \mugmsg_callstd
|
|
273
|
+.if \mugmsg_callstd==5
|
|
274
|
+ msgbox \mugmsg_textpointer \mugmsg_callstd
|
|
275
|
+ closeonkeypress
|
|
276
|
+.endif
|
|
277
|
+.if \mugmsg_callstd!=5
|
|
278
|
+ msgbox \mugmsg_textpointer \mugmsg_callstd
|
|
279
|
+.endif
|
272
|
280
|
setvar MUGHSOT_1_TABLE 0x0
|
273
|
281
|
pause 0x20
|
274
|
282
|
.endm
|