Browse Source

Merge branch 'master' of github.com:SBird1337/source_of_the_sovereign

SBird1337 6 years ago
parent
commit
2c18b82f49

+ 6
- 0
data/desktop.ini View File

@@ -0,0 +1,6 @@
1
+[.ShellClassInfo]
2
+IconResource=C:\WINDOWS\System32\SHELL32.dll,8
3
+[ViewState]
4
+Mode=
5
+Vid=
6
+FolderType=Generic

+ 46
- 2798
data/trainer/trainer_pkmn_data.s
File diff suppressed because it is too large
View File


+ 6
- 0
desktop.ini View File

@@ -0,0 +1,6 @@
1
+[.ShellClassInfo]
2
+IconResource=C:\WINDOWS\System32\SHELL32.dll,278
3
+[ViewState]
4
+Mode=
5
+Vid=
6
+FolderType=Generic

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 2067957a1be681a1d077315522ba037415569a87
1
+Subproject commit 38779228bdfb681bd4b274a1dd367be12099dd73

+ 6
- 0
src/include/desktop.ini View File

@@ -0,0 +1,6 @@
1
+[.ShellClassInfo]
2
+IconResource=C:\WINDOWS\System32\SHELL32.dll,209
3
+[ViewState]
4
+Mode=
5
+Vid=
6
+FolderType=Generic

+ 3
- 0
src/include/pymap_constants.h View File

@@ -134,6 +134,7 @@
134 134
 .equ VALUE_OHNE_POKE_LABOR, 0x5
135 135
 .equ VALUE_MIT_POKE_LABOR, 0x6
136 136
 .equ VALUE_RIVALKAMPF_HESPERIAPFAD, 0x7
137
+.equ VALUE_HESPERIA_BRUECKE, 0x8
137 138
 
138 139
 
139 140
 
@@ -872,6 +873,8 @@
872 873
 .equ SEQ_BGM_EVENT_DEOXYS, 0x1f8
873 874
 .equ SEQ_BGM_EVENT_TT_DANCE, 0x1f9
874 875
 .equ SEQ_BGM_SURF, 0x1fa
876
+.equ SEQ_BGM_EYE_RIVF, 0x1de
877
+.equ SEQ_BGM_EYE_RIVM, 0x1df
875 878
 
876 879
 
877 880
 

+ 20
- 12
src/include/script/language.h View File

@@ -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

+ 7
- 0
src/include/script/trainerid.h View File

@@ -0,0 +1,7 @@
1
+#ifndef TRAINERID_IDS_H_
2
+#define TRAINERID_IDS_H_
3
+
4
+#define TRAINER_RIVALE_M_KAMPF_1  0x1
5
+#define TRAINER_RIVALE_F_KAMPF_1  0x4
6
+
7
+#endif /* TRAINERID_IDS_H */