Script Progress: Ruine der Wächter

data/overworld/overworld_frames.s

@@ -7016,22 +7016,22 @@ ow_frames_npcs_0197:
 .word ow_npcs_0197Tiles+(2*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0197Tiles+(1*0x200)
+.word ow_npcs_0197Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0197Tiles+(1*0x200)
+.word ow_npcs_0197Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0197Tiles+(2*0x200)
+.word ow_npcs_0197Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0197Tiles+(2*0x200)
+.word ow_npcs_0197Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0197Tiles+(3*0x200)
+.word ow_npcs_0197Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0197Tiles+(3*0x200)
+.word ow_npcs_0197Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
 
@@ -7046,22 +7046,22 @@ ow_frames_npcs_0198:
 .word ow_npcs_0198Tiles+(2*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0198Tiles+(1*0x200)
+.word ow_npcs_0198Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0198Tiles+(1*0x200)
+.word ow_npcs_0198Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0198Tiles+(2*0x200)
+.word ow_npcs_0198Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0198Tiles+(2*0x200)
+.word ow_npcs_0198Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0198Tiles+(3*0x200)
+.word ow_npcs_0198Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0198Tiles+(3*0x200)
+.word ow_npcs_0198Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
 
@@ -7076,22 +7076,22 @@ ow_frames_npcs_0199:
 .word ow_npcs_0199Tiles+(2*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0199Tiles+(1*0x200)
+.word ow_npcs_0199Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0199Tiles+(1*0x200)
+.word ow_npcs_0199Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0199Tiles+(2*0x200)
+.word ow_npcs_0199Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0199Tiles+(2*0x200)
+.word ow_npcs_0199Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0199Tiles+(3*0x200)
+.word ow_npcs_0199Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0199Tiles+(3*0x200)
+.word ow_npcs_0199Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
 
@@ -7106,22 +7106,22 @@ ow_frames_npcs_0200:
 .word ow_npcs_0200Tiles+(2*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0200Tiles+(1*0x200)
+.word ow_npcs_0200Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0200Tiles+(1*0x200)
+.word ow_npcs_0200Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0200Tiles+(2*0x200)
+.word ow_npcs_0200Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0200Tiles+(2*0x200)
+.word ow_npcs_0200Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0200Tiles+(3*0x200)
+.word ow_npcs_0200Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_npcs_0200Tiles+(3*0x200)
+.word ow_npcs_0200Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
 

sots-private

@@ -1 +1 @@
-Subproject commit 2cf0b1fcd8f3e6a8c9e14c116dfd3a8e2836dda0
+Subproject commit 8057be3ad7779b535b009cd8b1588068a7a23270

src/include/constants/pymap/main_story_variables.h

@@ -27,3 +27,8 @@
 #define VALUE_RDW_INNERES_STEINTAFELN2 0x19
 #define VALUE_HEILIGTUM_RDW_MAPSCRIPT 0x1a
 #define VALUE_HEILIGTUM_RDW_BESIEGT 0x1b
+#define VALUE_PERSON_ANGESPROCHEN1 0x1c
+#define VALUE_PERSON_ANGESPROCHEN2 0x1d
+#define VALUE_PERSON_ANGESPROCHEN3 0x1e
+#define VALUE_ZEHEILIGTUM_INNERES_MAPSCRIPT2 0x1f
+#define VALUE_RDW_HEILIGE_STEINE_MAPSCRIPT 0x20

src/include/constants/pymap/main_story_variables.s

@@ -27,3 +27,8 @@
 .equ VALUE_RDW_INNERES_STEINTAFELN2, 0x19
 .equ VALUE_HEILIGTUM_RDW_MAPSCRIPT, 0x1a
 .equ VALUE_HEILIGTUM_RDW_BESIEGT, 0x1b
+.equ VALUE_PERSON_ANGESPROCHEN1, 0x1c
+.equ VALUE_PERSON_ANGESPROCHEN2, 0x1d
+.equ VALUE_PERSON_ANGESPROCHEN3, 0x1e
+.equ VALUE_ZEHEILIGTUM_INNERES_MAPSCRIPT2, 0x1f
+.equ VALUE_RDW_HEILIGE_STEINE_MAPSCRIPT, 0x20

src/include/constants/pymap/rival_pokemon_variables.h

@@ -1 +0,0 @@
-#define VAR_STARTER_RIVALE_POKEMON 0x5053

src/include/constants/pymap/rival_pokemon_variables.s

@@ -1 +0,0 @@
-.equ VAR_STARTER_RIVALE_POKEMON, 0x5053

src/include/constants/pymap/story_flags.h

@@ -31,3 +31,10 @@
 #define FLAG_REBOST_LATIAS_RAETSEL_KERZE2 0x51e
 #define FLAG_REBOST_LATIAS_RAETSEL_KERZE3 0x51f
 #define FLAG_REBOST_LATIAS_RAETSEL_KERZE4 0x520
+#define FLAG_RDW_INNERES_GEFAESSE 0x521
+#define FLAG_RDW_HIDE_OHNMAECHTIG_NOAH 0x522
+#define FLAG_RDW_HIDE_OHNMAECHTIG_EMMA 0x523
+#define FLAG_RDW_HIDE_OHNMAECHTIG_ACHIM 0x524
+#define FLAG_RDW_HIDE_OHNMAECHTIG_IDAN 0x525
+#define FLAG_RDW_HIDE_ACHIM_IDAN_RIVAL 0x526
+#define FLAG_RDW_HIDE_FIRNONTOR_FROSDEDJE 0x527

src/include/constants/pymap/story_flags.s

@@ -31,3 +31,10 @@
 .equ FLAG_REBOST_LATIAS_RAETSEL_KERZE2, 0x51e
 .equ FLAG_REBOST_LATIAS_RAETSEL_KERZE3, 0x51f
 .equ FLAG_REBOST_LATIAS_RAETSEL_KERZE4, 0x520
+.equ FLAG_RDW_INNERES_GEFAESSE, 0x521
+.equ FLAG_RDW_HIDE_OHNMAECHTIG_NOAH, 0x522
+.equ FLAG_RDW_HIDE_OHNMAECHTIG_EMMA, 0x523
+.equ FLAG_RDW_HIDE_OHNMAECHTIG_ACHIM, 0x524
+.equ FLAG_RDW_HIDE_OHNMAECHTIG_IDAN, 0x525
+.equ FLAG_RDW_HIDE_ACHIM_IDAN_RIVAL, 0x526
+.equ FLAG_RDW_HIDE_FIRNONTOR_FROSDEDJE, 0x527

src/include/pymap_constants.h

@@ -30,7 +30,6 @@
 #include <constants/pymap/npc_sprite_table4.h>
 #include <constants/pymap/person_behaviours.h>
 #include <constants/pymap/riddle_variables.h>
-#include <constants/pymap/rival_pokemon_variables.h>
 #include <constants/pymap/save_variables.h>
 #include <constants/pymap/sidequest_flags.h>
 #include <constants/pymap/signpost_types.h>

src/include/script/language.h

@@ -403,9 +403,7 @@ addvar OW_REPLACE_VAR 0x1
 setvar OW_REPLACE_TO_VAR \changeowto_to
 .endm
 
-
 @@ Index commands
-
 .macro nop
 .byte 0x0
 .endm