Script: Ruine der Wächter (progress)

data/overworld/overworld_data.s

@@ -2013,23 +2013,23 @@ ow_data_npcs_0196:
 
 .align 2
 ow_data_npcs_0197:
-.hword 0xFFFF, 0xC0B0, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_npcs_0197, 0x8231CFC
+.hword 0xFFFF, 0xC0B0, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
+.word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0197 , 0x8231CFC
 
 .align 2
 ow_data_npcs_0198:
-.hword 0xFFFF, 0xC0B1, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_npcs_0198, 0x8231CFC
+.hword 0xFFFF, 0xC0B1, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
+.word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0198 , 0x8231CFC
 
 .align 2
 ow_data_npcs_0199:
-.hword 0xFFFF, 0xC0B2, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_npcs_0199, 0x8231CFC
+.hword 0xFFFF, 0xC0B2, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
+.word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0199 , 0x8231CFC
 
 .align 2
 ow_data_npcs_0200:
-.hword 0xFFFF, 0xC0B3, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_npcs_0200, 0x8231CFC
+.hword 0xFFFF, 0xC0B3, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
+.word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0200 , 0x8231CFC
 
 .align 2
 ow_data_npcs_0201:
@@ -4999,7 +4999,7 @@ ow_data_objekt_0025:
 .align 2
 ow_data_objekt_0026:
 .hword 0xFFFF, 0xC31A, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0026, 0x8231CFC
+.word 0x83A36F0, 0x83A3748, 0x83A3368, ow_frames_objekt_0026, 0x8231CFC
 
 .align 2
 ow_data_objekt_0027:

data/overworld/overworld_frames.s

@@ -7007,26 +7007,122 @@ ow_frames_npcs_0196:
 
 .align 2
 ow_frames_npcs_0197:
-.word ow_00000Tiles+(0*0x80)
-.hword 0x80
+.word ow_npcs_0197Tiles+(0*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0197Tiles+(1*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0197Tiles+(2*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0197Tiles+(1*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0197Tiles+(1*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0197Tiles+(2*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0197Tiles+(2*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0197Tiles+(3*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0197Tiles+(3*0x200)
+.hword 0x200
 .hword 0x0
 
 .align 2
 ow_frames_npcs_0198:
-.word ow_00000Tiles+(0*0x80)
-.hword 0x80
+.word ow_npcs_0198Tiles+(0*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0198Tiles+(1*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0198Tiles+(2*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0198Tiles+(1*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0198Tiles+(1*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0198Tiles+(2*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0198Tiles+(2*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0198Tiles+(3*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0198Tiles+(3*0x200)
+.hword 0x200
 .hword 0x0
 
 .align 2
 ow_frames_npcs_0199:
-.word ow_00000Tiles+(0*0x80)
-.hword 0x80
+.word ow_npcs_0199Tiles+(0*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0199Tiles+(1*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0199Tiles+(2*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0199Tiles+(1*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0199Tiles+(1*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0199Tiles+(2*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0199Tiles+(2*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0199Tiles+(3*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0199Tiles+(3*0x200)
+.hword 0x200
 .hword 0x0
 
 .align 2
 ow_frames_npcs_0200:
-.word ow_00000Tiles+(0*0x80)
-.hword 0x80
+.word ow_npcs_0200Tiles+(0*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0200Tiles+(1*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0200Tiles+(2*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0200Tiles+(1*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0200Tiles+(1*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0200Tiles+(2*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0200Tiles+(2*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0200Tiles+(3*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_npcs_0200Tiles+(3*0x200)
+.hword 0x200
 .hword 0x0
 
 .align 2
@@ -16553,7 +16649,31 @@ ow_frames_objekt_0025:
 
 .align 2
 ow_frames_objekt_0026:
-.word ow_00000Tiles+(0*0x80)
+.word ow_objekt_0026Tiles+(0*0x80)
+.hword 0x80
+.hword 0x0
+.word ow_objekt_0026Tiles+(0*0x80)
+.hword 0x80
+.hword 0x0
+.word ow_objekt_0026Tiles+(0*0x80)
+.hword 0x80
+.hword 0x0
+.word ow_objekt_0026Tiles+(1*0x80)
+.hword 0x80
+.hword 0x0
+.word ow_objekt_0026Tiles+(2*0x80)
+.hword 0x80
+.hword 0x0
+.word ow_objekt_0026Tiles+(1*0x80)
+.hword 0x80
+.hword 0x0
+.word ow_objekt_0026Tiles+(2*0x80)
+.hword 0x80
+.hword 0x0
+.word ow_objekt_0026Tiles+(1*0x80)
+.hword 0x80
+.hword 0x0
+.word ow_objekt_0026Tiles+(2*0x80)
 .hword 0x80
 .hword 0x0
 

data/overworld/overworld_pal_table.s

@@ -201,10 +201,10 @@ ow_pal_table:
 .word ow_npcs_0194Pal, 0xC0AD
 .word ow_npcs_0195Pal, 0xC0AE
 .word ow_npcs_0196Pal, 0xC0AF
-.word ow_00000Pal, 0xC0B0
-.word ow_00000Pal, 0xC0B1
-.word ow_00000Pal, 0xC0B2
-.word ow_00000Pal, 0xC0B3
+.word ow_npcs_0197Pal, 0xC0B0
+.word ow_npcs_0198Pal, 0xC0B1
+.word ow_npcs_0199Pal, 0xC0B2
+.word ow_npcs_0200Pal, 0xC0B3
 .word ow_00000Pal, 0xC0B4
 .word ow_00000Pal, 0xC0B5
 .word ow_00000Pal, 0xC0B6
@@ -798,7 +798,7 @@ ow_pal_table:
 .word ow_objekt_0023Pal, 0xC317
 .word ow_objekt_0024Pal, 0xC318
 .word ow_objekt_0025Pal, 0xC319
-.word ow_00000Pal, 0xC31A
+.word ow_objekt_0026Pal, 0xC31A
 .word ow_00000Pal, 0xC31B
 .word ow_00000Pal, 0xC31C
 .word ow_00000Pal, 0xC31D

sots-private

@@ -1 +1 @@
-Subproject commit 3bce959367f662ec0f3fbfd9e3a5fc0672d6d036
+Subproject commit c7b6ee222bc766949b06f12d87c05baa0fab2d10

src/include/constants/pymap/main_story_variables.h

@@ -23,3 +23,7 @@
 #define VALUE_FARBRAETSEL_EINGANG_RDW_FERTIG 0x15
 #define VALUE_MAPSCRIPT_RDW_INNEN_EINGANG 0x16
 #define VALUE_TIEFESINNERE_RDW_MAPSCRIPT 0x17
+#define VALUE_RDW_INNERES_STEINTAFELN 0x18
+#define VALUE_RDW_INNERES_STEINTAFELN2 0x19
+#define VALUE_HEILIGTUM_RDW_MAPSCRIPT 0x1a
+#define VALUE_HEILIGTUM_RDW_BESIEGT 0x1b

src/include/constants/pymap/main_story_variables.s

@@ -23,3 +23,7 @@
 .equ VALUE_FARBRAETSEL_EINGANG_RDW_FERTIG, 0x15
 .equ VALUE_MAPSCRIPT_RDW_INNEN_EINGANG, 0x16
 .equ VALUE_TIEFESINNERE_RDW_MAPSCRIPT, 0x17
+.equ VALUE_RDW_INNERES_STEINTAFELN, 0x18
+.equ VALUE_RDW_INNERES_STEINTAFELN2, 0x19
+.equ VALUE_HEILIGTUM_RDW_MAPSCRIPT, 0x1a
+.equ VALUE_HEILIGTUM_RDW_BESIEGT, 0x1b

src/include/constants/pymap/npc_sprite_table1.h

@@ -195,4 +195,10 @@
 #define NPC_PROFESSOR2_M 0xc2
 #define NPC_TUNDRA_SPION 0xc3
 #define NPC_PROFESSOR1_W 0xc4
+#define NPC_NOAH_OHNMAECHTIG 0xc5
+#define NPC_EMMA_OHNMAECHTIG 0xc6
+#define NPC_ACHIM_OHNMAECHTIG 0xc7
+#define NPC_IDAN_OHNMAECHTIG 0xc8
 #define NPC_RIVALE 0xee
+#define NPC_PLAYER_OHNMAECHTIG 0xef
+#define NPC_RIVALE_OHNMAECHTIG 0xf0

src/include/constants/pymap/npc_sprite_table1.s

@@ -195,4 +195,10 @@
 .equ NPC_PROFESSOR2_M, 0xc2
 .equ NPC_TUNDRA_SPION, 0xc3
 .equ NPC_PROFESSOR1_W, 0xc4
+.equ NPC_NOAH_OHNMAECHTIG, 0xc5
+.equ NPC_EMMA_OHNMAECHTIG, 0xc6
+.equ NPC_ACHIM_OHNMAECHTIG, 0xc7
+.equ NPC_IDAN_OHNMAECHTIG, 0xc8
 .equ NPC_RIVALE, 0xee
+.equ NPC_PLAYER_OHNMAECHTIG, 0xef
+.equ NPC_RIVALE_OHNMAECHTIG, 0xf0

src/include/constants/pymap/npc_sprite_table4.h

@@ -24,3 +24,4 @@
 #define NPC_GROSSER_ZERSCHNEIDERBAUM 0x17
 #define NPC_ZERSCHNEIDER_ANIMATION 0x18
 #define NPC_HEILUNGSSTATUE 0x19
+#define NPC_SEELENGEFAESSE 0x1a

src/include/constants/pymap/npc_sprite_table4.s

@@ -24,3 +24,4 @@
 .equ NPC_GROSSER_ZERSCHNEIDERBAUM, 0x17
 .equ NPC_ZERSCHNEIDER_ANIMATION, 0x18
 .equ NPC_HEILUNGSSTATUE, 0x19
+.equ NPC_SEELENGEFAESSE, 0x1a