Neue Scripts

data/string/misc/multichoice.s

@@ -5,27 +5,44 @@
 .global str_yes
 str_yes:
 .string LAN_DE "Ja"
+.string LAN_EN "Yes"
 
 .global str_no
 str_no:
 .string LAN_DE "Nein"
+.string LAN_EN "No"
 
 .global str_beginner
 str_beginner:
 .string LAN_DE "Anfänger"
+.string LAN_EN "Newbie"
 
 .global str_intermediate
 str_intermediate:
 .string LAN_DE "Fortgeschritten"
+.string LAN_EN "Advanced"
 
 .global str_expert
 str_expert:
 .string LAN_DE "Experte"
+.string LAN_EN "Expert"
 
 .global str_left
 str_left:
 .string LAN_DE "Links"
+.string LAN_EN "Left"
 
 .global str_right
 str_right:
 .string LAN_DE "Rechts"
+.string LAN_EN "Right"
+
+.global str_redstone
+str_redstone:
+.string LAN_DE "Roter Stein"
+.string LAN_EN "Red Stone"
+
+.global str_blaustone
+str_blaustone:
+.string LAN_DE "Blauer Stein"
+.string LAN_EN "Blue Stone"

data/text_lookup/text_multichoice.s

@@ -14,6 +14,9 @@ multichoice_array:
     .word smc_left_right
     .word 2
 
+    .word smc_red_blue
+    .word 2
+
 
 smc_yes_no:
     .word str_yes
@@ -34,3 +37,9 @@ smc_left_right:
     .word 0
     .word str_right
     .word 0
+
+smc_red_blue:
+    .word str_redstone
+    .word 0
+    .word str_blaustone
+    .word 0

sots-private

@@ -1 +1 @@
-Subproject commit 5e84e787cbd82745317aa3d8b5cc9117e0051903
+Subproject commit d3dd4eab8bc4bce04af974a6a768eec98ccdbe32

src/include/constants/items.h

@@ -717,5 +717,8 @@
 #define ITEM_STATUSWERTEBON 0x2C9
 #define ITEM_FANGBON 0x2CA
 #define ITEM_ENZYKLOPAEDIE 0x0
+#define ITEM_ROTER_STEIN 0x0
+#define ITEM_BLAUER_STEIN 0x0
+#define ITEM_VMTM_SIMMULATOR 0x0
 
 #endif /* ITEM_IDS */

src/include/constants/pymap/latias_latios_var.h

@@ -0,0 +1,3 @@
+#define VAR_AEON 0x5062
+#define VALUE_AEON_LATIAS 0x0
+#define VALUE_AEON_LATIOS 0x1

src/include/constants/pymap/latias_latios_var.s

@@ -0,0 +1,3 @@
+.equ VAR_AEON, 0x5062
+.equ VALUE_AEON_LATIAS, 0x0
+.equ VALUE_AEON_LATIOS, 0x1

src/include/constants/pymap/main_story_variables.h

@@ -37,3 +37,10 @@
 #define VALUE_MAPSCRIPT_RDW_EINGANG2 0x23
 #define VALUE_MAPSCRIPT_CENTER_CAR_MS1 0x24
 #define VALUE_LABOR_NACH_RUINE1 0x25
+#define VALUE_VOR_DEM_HAUS_DES_SPIELERS 0x26
+#define VALUE_MS_SPIELERHAUS_021 0x27
+#define VALUE_MS_SPIELERHAUS_022 0x28
+#define VALUE_SCRIPTFELD_DETEKTOR 0x29
+#define VALUE_MS_HES_OD_1 0x2a
+#define VALUE_ABENTEUER_BEGINNT 0x2b
+#define VALUE_INTRO_FERTIG_ABENTEUER_GO 0x2c

src/include/constants/pymap/main_story_variables.s

@@ -37,3 +37,10 @@
 .equ VALUE_MAPSCRIPT_RDW_EINGANG2, 0x23
 .equ VALUE_MAPSCRIPT_CENTER_CAR_MS1, 0x24
 .equ VALUE_LABOR_NACH_RUINE1, 0x25
+.equ VALUE_VOR_DEM_HAUS_DES_SPIELERS, 0x26
+.equ VALUE_MS_SPIELERHAUS_021, 0x27
+.equ VALUE_MS_SPIELERHAUS_022, 0x28
+.equ VALUE_SCRIPTFELD_DETEKTOR, 0x29
+.equ VALUE_MS_HES_OD_1, 0x2a
+.equ VALUE_ABENTEUER_BEGINNT, 0x2b
+.equ VALUE_INTRO_FERTIG_ABENTEUER_GO, 0x2c

src/include/constants/pymap/story_flags.h

@@ -42,3 +42,6 @@
 #define FLAG_HIDE_ROTER_STEIN_RDW_INNEN 0x529
 #define FLAG_HIDE_BLAUER_STEIN_RDW_INNEN 0x52a
 #define FLAG_ZERTRUEMMERERWAND_RDW 0x52b
+#define FLAG_HIDE_IDAN_SPIELERHAUS 0x52c
+#define FLAG_HIDE_LINDA_SPIELERHAUS 0x52d
+#define FLAG_HIDE_RIVALE_SPIELERHAUS 0x52e

src/include/constants/pymap/story_flags.s

@@ -42,3 +42,6 @@
 .equ FLAG_HIDE_ROTER_STEIN_RDW_INNEN, 0x529
 .equ FLAG_HIDE_BLAUER_STEIN_RDW_INNEN, 0x52a
 .equ FLAG_ZERTRUEMMERERWAND_RDW, 0x52b
+.equ FLAG_HIDE_IDAN_SPIELERHAUS, 0x52c
+.equ FLAG_HIDE_LINDA_SPIELERHAUS, 0x52d
+.equ FLAG_HIDE_RIVALE_SPIELERHAUS, 0x52e

src/include/pymap_constants.h

@@ -6,6 +6,7 @@
 #include <constants/pymap/engine_variables.h>
 #include <constants/pymap/farbkugel_raetsel.h>
 #include <constants/pymap/items.h>
+#include <constants/pymap/latias_latios_var.h>
 #include <constants/pymap/level_types.h>
 #include <constants/pymap/main_story_variables.h>
 #include <constants/pymap/map_adjacency_types.h>