Script Progress

sots-private

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

src/include/constants/pymap/main_story_variables.h

@@ -31,4 +31,9 @@
 #define VALUE_PERSON_ANGESPROCHEN2 0x1d
 #define VALUE_PERSON_ANGESPROCHEN3 0x1e
 #define VALUE_ZEHEILIGTUM_INNERES_MAPSCRIPT2 0x1f
-#define VALUE_RDW_HEILIGE_STEINE_MAPSCRIPT 0x20
+#define VALUE_RDW_INNEN_STEIN_COUNTER1 0x20
+#define VALUE_RDW_INNEN_STEIN_COUNTER2 0x21
+#define VALUE_RDW_TIEFESINNERES_MAPSCRIPT 0x22
+#define VALUE_MAPSCRIPT_RDW_EINGANG2 0x23
+#define VALUE_MAPSCRIPT_CENTER_CAR_MS1 0x24
+#define VALUE_LABOR_NACH_RUINE1 0x25

src/include/constants/pymap/main_story_variables.s

@@ -31,4 +31,9 @@
 .equ VALUE_PERSON_ANGESPROCHEN2, 0x1d
 .equ VALUE_PERSON_ANGESPROCHEN3, 0x1e
 .equ VALUE_ZEHEILIGTUM_INNERES_MAPSCRIPT2, 0x1f
-.equ VALUE_RDW_HEILIGE_STEINE_MAPSCRIPT, 0x20
+.equ VALUE_RDW_INNEN_STEIN_COUNTER1, 0x20
+.equ VALUE_RDW_INNEN_STEIN_COUNTER2, 0x21
+.equ VALUE_RDW_TIEFESINNERES_MAPSCRIPT, 0x22
+.equ VALUE_MAPSCRIPT_RDW_EINGANG2, 0x23
+.equ VALUE_MAPSCRIPT_CENTER_CAR_MS1, 0x24
+.equ VALUE_LABOR_NACH_RUINE1, 0x25

src/include/constants/pymap/songs.h

@@ -1,6 +1,6 @@
 #define SEQ_BGM_TOWN_HESPERIA 0x15e
 #define SEQ_BGM_CITY_CARUN 0x15f
-#define SEQ_BGM_P_FOY 0x160
+#define SEQ_BGM_CITY_URBANIA 0x160
 #define SEQ_BGM_TOWN_04 0x161
 #define SEQ_BGM_TOWN_02 0x162
 #define SEQ_BGM_TOWN_06 0x163
@@ -23,8 +23,6 @@
 #define SEQ_BGM_R_08 0x179
 #define SEQ_BGM_CAVE_GUARDIAN 0x186
 #define SEQ_BGM_CAVE_02 0x187
-#define SEQ_BGM_PC 0x15b
-#define SEQ_BGM_LAB 0x17e
 #define SEQ_BGM_GYM 0x19b
 #define SEQ_BGM_LAB 0x19c
 #define SEQ_BGM_SCHOOL 0x19d

src/include/constants/pymap/songs.s

@@ -1,6 +1,6 @@
 .equ SEQ_BGM_TOWN_HESPERIA, 0x15e
 .equ SEQ_BGM_CITY_CARUN, 0x15f
-.equ SEQ_BGM_P_FOY, 0x160
+.equ SEQ_BGM_CITY_URBANIA, 0x160
 .equ SEQ_BGM_TOWN_04, 0x161
 .equ SEQ_BGM_TOWN_02, 0x162
 .equ SEQ_BGM_TOWN_06, 0x163
@@ -23,8 +23,6 @@
 .equ SEQ_BGM_R_08, 0x179
 .equ SEQ_BGM_CAVE_GUARDIAN, 0x186
 .equ SEQ_BGM_CAVE_02, 0x187
-.equ SEQ_BGM_PC, 0x15b
-.equ SEQ_BGM_LAB, 0x17e
 .equ SEQ_BGM_GYM, 0x19b
 .equ SEQ_BGM_LAB, 0x19c
 .equ SEQ_BGM_SCHOOL, 0x19d

src/include/constants/pymap/story_flags.h

@@ -39,3 +39,6 @@
 #define FLAG_RDW_HIDE_ACHIM_IDAN_RIVAL 0x526
 #define FLAG_RDW_HIDE_FIRNONTOR_FROSDEDJE 0x527
 #define FLAG_HIDE_SEELENOWS_RDW_INNEN 0x528
+#define FLAG_HIDE_ROTER_STEIN_RDW_INNEN 0x529
+#define FLAG_HIDE_BLAUER_STEIN_RDW_INNEN 0x52a
+#define FLAG_ZERTRUEMMERERWAND_RDW 0x52b

src/include/constants/pymap/story_flags.s

@@ -39,3 +39,6 @@
 .equ FLAG_RDW_HIDE_ACHIM_IDAN_RIVAL, 0x526
 .equ FLAG_RDW_HIDE_FIRNONTOR_FROSDEDJE, 0x527
 .equ FLAG_HIDE_SEELENOWS_RDW_INNEN, 0x528
+.equ FLAG_HIDE_ROTER_STEIN_RDW_INNEN, 0x529
+.equ FLAG_HIDE_BLAUER_STEIN_RDW_INNEN, 0x52a
+.equ FLAG_ZERTRUEMMERERWAND_RDW, 0x52b

src/include/script/movement.h

@@ -70,6 +70,7 @@
 .equ APPLYMOVE_JUMP_ON_POINT_DOWN_UP, 0x57
 .equ APPLYMOVE_JUMP_ON_POINT_RIGHT_LEFT, 0x58
 .equ APPLYMOVE_JUMP_ON_POINT_LEFT_RIGHT, 0x59
+.equ APPLYMOVE_JOY_MOVE, 0x5B
 .equ APPLYMOVE_HIDESPRITE, 0x60
 .equ APPLYMOVE_SHOWSPRITE, 0x61
 .equ APPLYMOVE_EXCL, 0x62