dragonflysots před 6 roky
rodič
revize
33a8d50fd4

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit c392684e7b6ea814fd5a9e5f28f60f2ec24e6865
1
+Subproject commit 15198d2baf0555f5c4a01257b659b663f15d5f55

+ 7
- 0
src/include/constants/pymap/main_story_variables.h Zobrazit soubor

@@ -13,3 +13,10 @@
13 13
 #define VALUE_HESPERIAGRABEN_SPRITEFACEUP 0xb
14 14
 #define VALUE_VOR_DEM_REBERATUNNEL 0xc
15 15
 #define VALUE_MAPSCRIPT_EINGANG_RDW1 0xd
16
+#define VALUE_MAPSCRIPT_EINGANG_AKTIV 0xe
17
+#define VALUE_MAPSCRIPT_EINGANG_INAKTIV 0xf
18
+#define VALUE_MAPSCRIPT_EINGANG_FKR 0x10
19
+#define VALUE_MAPSCRIPT_EINGANG_FR 0x11
20
+#define VALUE_MAPSCRIPT_EINGANG_RKF 0x12
21
+#define VALUE_MAPSCRIPT_EINGANG_RK 0x13
22
+#define VALUE_MAPSCRIPT_EINGANG_GELOEST 0x14

+ 7
- 0
src/include/constants/pymap/main_story_variables.s Zobrazit soubor

@@ -13,3 +13,10 @@
13 13
 .equ VALUE_HESPERIAGRABEN_SPRITEFACEUP, 0xb
14 14
 .equ VALUE_VOR_DEM_REBERATUNNEL, 0xc
15 15
 .equ VALUE_MAPSCRIPT_EINGANG_RDW1, 0xd
16
+.equ VALUE_MAPSCRIPT_EINGANG_AKTIV, 0xe
17
+.equ VALUE_MAPSCRIPT_EINGANG_INAKTIV, 0xf
18
+.equ VALUE_MAPSCRIPT_EINGANG_FKR, 0x10
19
+.equ VALUE_MAPSCRIPT_EINGANG_FR, 0x11
20
+.equ VALUE_MAPSCRIPT_EINGANG_RKF, 0x12
21
+.equ VALUE_MAPSCRIPT_EINGANG_RK, 0x13
22
+.equ VALUE_MAPSCRIPT_EINGANG_GELOEST, 0x14

+ 3
- 0
src/include/constants/pymap/story_flags.h Zobrazit soubor

@@ -11,3 +11,6 @@
11 11
 #define FLAG_HIDE_ACHIM_HES_OD 0x50a
12 12
 #define FLAG_HIDE_TUNDRA_RUEPEL_HES 0x50b
13 13
 #define FLAG_HIDE_POKE_HESPERIAPFAD 0x50c
14
+#define FLAG_HIDE_RIVALE_BERGSPITZE_RDW 0x50d
15
+#define FLAG_HIDE_IDAN_BERGSPITZE_RDW 0x50e
16
+#define FLAG_HIDE_ACHIM_BERGSPITZE_RDW 0x50f

+ 3
- 0
src/include/constants/pymap/story_flags.s Zobrazit soubor

@@ -11,3 +11,6 @@
11 11
 .equ FLAG_HIDE_ACHIM_HES_OD, 0x50a
12 12
 .equ FLAG_HIDE_TUNDRA_RUEPEL_HES, 0x50b
13 13
 .equ FLAG_HIDE_POKE_HESPERIAPFAD, 0x50c
14
+.equ FLAG_HIDE_RIVALE_BERGSPITZE_RDW, 0x50d
15
+.equ FLAG_HIDE_IDAN_BERGSPITZE_RDW, 0x50e
16
+.equ FLAG_HIDE_ACHIM_BERGSPITZE_RDW, 0x50f

+ 0
- 1
src/include/script/language.h Zobrazit soubor

@@ -301,7 +301,6 @@ setvar 0x8000 0x0
301 301
         setvar MUGSHOT_1_Y 0x60
302 302
     .endif
303 303
 .endif
304
-
305 304
 addvar MUGHSOT_1_TABLE \mugmsg_emot
306 305
 .if \mugmsg_callstd==5
307 306
     msgbox \mugmsg_textpointer \mugmsg_callstd