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

data/desktop.ini

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

desktop.ini

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

sots-private

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

src/include/desktop.ini

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

src/include/pymap_constants.h

@@ -134,6 +134,7 @@
 .equ VALUE_OHNE_POKE_LABOR, 0x5
 .equ VALUE_MIT_POKE_LABOR, 0x6
 .equ VALUE_RIVALKAMPF_HESPERIAPFAD, 0x7
+.equ VALUE_HESPERIA_BRUECKE, 0x8
 
 
 
@@ -872,6 +873,8 @@
 .equ SEQ_BGM_EVENT_DEOXYS, 0x1f8
 .equ SEQ_BGM_EVENT_TT_DANCE, 0x1f9
 .equ SEQ_BGM_SURF, 0x1fa
+.equ SEQ_BGM_EYE_RIVF, 0x1de
+.equ SEQ_BGM_EYE_RIVM, 0x1df
 
 
 

src/include/script/language.h

@@ -6,7 +6,9 @@
 #include <script/mugshot.h>
 #include <script/battlescreen.h>
 #include <constants/items.h>
+#include <constants/pkmns.h>
 #include <pymap_constants.h>
+#include <script/trainerid.h>
 
 @@Some Constants
 .equ PLAYER, 0xFF
@@ -67,17 +69,17 @@
 .equ EFFECT_SERPIA, 0x2
 
 @@ Emotion
-.equ EMOT_NORMAL, 0x1
-.equ EMOT_UEBERLEGT, 0x2
-.equ EMOT_ERSTAUNT, 0x3
-.equ EMOT_TRAURIG, 0x4
-.equ EMOT_SAUER, 0x5
-.equ EMOT_GRINST, 0x6
-.equ EMOT_ZWINKERT, 0x7
-.equ EMOT_SCHOCKIERT, 0x8
-.equ EMOT_BOESESLACHEN, 0x9
-.equ EMOT_GENERVT, 0xa
-.equ EMOT_ERFREUT, 0xb
+.equ EMOT_NORMAL, 0x0
+.equ EMOT_UEBERLEGT, 0x1
+.equ EMOT_ERSTAUNT, 0x2
+.equ EMOT_TRAURIG, 0x3
+.equ EMOT_SAUER, 0x4
+.equ EMOT_LAECHELN, 0x5
+.equ EMOT_ZWINKERT, 0x6
+.equ EMOT_SCHOCKIERT, 0x7
+.equ EMOT_BOESESLACHEN, 0x8
+.equ EMOT_GENERVT, 0x9
+.equ EMOT_ERFREUT, 0xa
 
 @@@@@@@@@@@@@@@@@ Macro
 
@@ -268,7 +270,13 @@ setvar 0x8000 0x0
     .endif
 .endif
 addvar MUGHSOT_1_TABLE \mugmsg_emot
-msgbox \mugmsg_textpointer \mugmsg_callstd
+.if \mugmsg_callstd==5
+    msgbox \mugmsg_textpointer \mugmsg_callstd
+    closeonkeypress
+.endif
+.if \mugmsg_callstd!=5
+    msgbox \mugmsg_textpointer \mugmsg_callstd
+.endif
 setvar MUGHSOT_1_TABLE 0x0
 pause 0x20
 .endm

src/include/script/trainerid.h

@@ -0,0 +1,7 @@
+#ifndef TRAINERID_IDS_H_
+#define TRAINERID_IDS_H_
+
+#define TRAINER_RIVALE_M_KAMPF_1  0x1
+#define TRAINER_RIVALE_F_KAMPF_1  0x4
+
+#endif /* TRAINERID_IDS_H */