Browse Source

script progress bergspitze

dragonflysots 6 years ago
parent
commit
7c2be486f7

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 80f7d9c01dbc2589ae0a01a8ac1ea46f56b11e47
1
+Subproject commit e0ddcf8e35501ad84d81d27824bd8b83555723c7

+ 8
- 0
src/include/constants/pymap/farbkugel_raetsel.h View File

@@ -0,0 +1,8 @@
1
+#define VAR_FARBKUGEL_RAETSEL 0x5060
2
+#define VALUE_FARBEN_ERLOSCHEN 0x0
3
+#define VALUE_FARBEN_BLAU_PINK_GELB 0x1
4
+#define VALUE_FARBEN_BLAU_GELB_PINK 0x2
5
+#define VALUE_FARBEN_PINK_BLAU_GELB 0x3
6
+#define VALUE_FARBEN_PINK_GELB_BLAU 0x4
7
+#define VALUE_FARBEN_GELB_BLAU_PINK 0x5
8
+#define VALUE_FARBEN_GELB_PINK_BLAU 0x6

+ 8
- 0
src/include/constants/pymap/farbkugel_raetsel.s View File

@@ -0,0 +1,8 @@
1
+.equ VAR_FARBKUGEL_RAETSEL, 0x5060
2
+.equ VALUE_FARBEN_ERLOSCHEN, 0x0
3
+.equ VALUE_FARBEN_BLAU_PINK_GELB, 0x1
4
+.equ VALUE_FARBEN_BLAU_GELB_PINK, 0x2
5
+.equ VALUE_FARBEN_PINK_BLAU_GELB, 0x3
6
+.equ VALUE_FARBEN_PINK_GELB_BLAU, 0x4
7
+.equ VALUE_FARBEN_GELB_BLAU_PINK, 0x5
8
+.equ VALUE_FARBEN_GELB_PINK_BLAU, 0x6

+ 3
- 0
src/include/constants/pymap/story_flags.h View File

@@ -14,3 +14,6 @@
14 14
 #define FLAG_HIDE_RIVALE_BERGSPITZE_RDW 0x50d
15 15
 #define FLAG_HIDE_IDAN_BERGSPITZE_RDW 0x50e
16 16
 #define FLAG_HIDE_ACHIM_BERGSPITZE_RDW 0x50f
17
+#define FLAG_STEINTAFEL_GELB 0x510
18
+#define FLAG_STEINTAFEL_BLAU 0x511
19
+#define FLAG_STEINTAFEL_PINK 0x512

+ 3
- 0
src/include/constants/pymap/story_flags.s View File

@@ -14,3 +14,6 @@
14 14
 .equ FLAG_HIDE_RIVALE_BERGSPITZE_RDW, 0x50d
15 15
 .equ FLAG_HIDE_IDAN_BERGSPITZE_RDW, 0x50e
16 16
 .equ FLAG_HIDE_ACHIM_BERGSPITZE_RDW, 0x50f
17
+.equ FLAG_STEINTAFEL_GELB, 0x510
18
+.equ FLAG_STEINTAFEL_BLAU, 0x511
19
+.equ FLAG_STEINTAFEL_PINK, 0x512

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

@@ -4,6 +4,7 @@
4 4
 #include <constants/pymap/difficulty_variables.h>
5 5
 #include <constants/pymap/engine_flags.h>
6 6
 #include <constants/pymap/engine_variables.h>
7
+#include <constants/pymap/farbkugel_raetsel.h>
7 8
 #include <constants/pymap/items.h>
8 9
 #include <constants/pymap/level_types.h>
9 10
 #include <constants/pymap/main_story_variables.h>

+ 8
- 0
src/include/script/language.h View File

@@ -859,6 +859,14 @@ setvar OW_REPLACE_TO_VAR \changeowto_to
859 859
 .byte \multichoice3_determines
860 860
 .endm
861 861
 
862
+.macro hidebox hidebox_leftpos:req hidebox_toppos:req hidebox_width:req hidebox_length:req
863
+.byte 0x73
864
+.byte \hidebox_leftpos
865
+.byte \hidebox_toppos
866
+.byte \hidebox_width
867
+.byte \hidebox_length
868
+.endm
869
+
862 870
 .macro showpokepic showpokepic_spezies:req showpokepic_x:req showpokepic_y:req
863 871
 .byte 0x75
864 872
 .hword \showpokepic_spezies