script progress

data/overworld/overworld_data.s

@@ -4989,12 +4989,13 @@ ow_data_objekt_0023:
 .align 2
 ow_data_objekt_0024:
 .hword 0xFFFF, 0xC318, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
-.word 0x83A3720, 0x83A38D0, 0x83A3314, ow_frames_objekt_0024 , 0x8231CFC
+.word 0x83A3720, 0x83A38D0, 0x83A3314, ow_frames_objekt_0024, 0x8231CFC
 
 .align 2
 ow_data_objekt_0025:
-.hword 0xFFFF, 0xC319, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0025, 0x8231CFC
+.hword 0xFFFF, 0xC319, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
+.word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_objekt_0025, 0x8231CFC
+
 
 .align 2
 ow_data_objekt_0026:

data/overworld/overworld_frames.s

@@ -16523,8 +16523,32 @@ ow_frames_objekt_0024:
 
 .align 2
 ow_frames_objekt_0025:
-.word ow_00000Tiles+(0*0x80)
-.hword 0x80
+.word ow_objekt_0025Tiles+(0*0x200)
+.hword 0x200
+.hword 0x0
+.word ow_objekt_0025Tiles+(0*0x200)
+.hword 0x200 
+.hword 0x0
+.word ow_objekt_0025Tiles+(0*0x200)
+.hword 0x200 
+.hword 0x0
+.word ow_objekt_0025Tiles+(1*0x200)
+.hword 0x200 
+.hword 0x0
+.word ow_objekt_0025Tiles+(2*0x200)
+.hword 0x200 
+.hword 0x0
+.word ow_objekt_0025Tiles+(1*0x200)
+.hword 0x200 
+.hword 0x0
+.word ow_objekt_0025Tiles+(2*0x200)
+.hword 0x200 
+.hword 0x0
+.word ow_objekt_0025Tiles+(1*0x200)
+.hword 0x200 
+.hword 0x0
+.word ow_objekt_0025Tiles+(2*0x200)
+.hword 0x200 
 .hword 0x0
 
 .align 2

sots-private

@@ -1 +1 @@
-Subproject commit db6e5c928859a358a7c16f0e85b4b4aa9fc48a66
+Subproject commit 9781b1572914460b4f1afbccbf28155a87d5c8c5

src/include/constants/pymap/npc_sprite_table4.h

@@ -23,3 +23,4 @@
 #define NPC_ZERSCHNEIDERBAUM 0x16
 #define NPC_GROSSER_ZERSCHNEIDERBAUM 0x17
 #define NPC_ZERSCHNEIDER_ANIMATION 0x18
+#define NPC_HEILUNGSSTATUE 0x19

src/include/constants/pymap/npc_sprite_table4.s

@@ -23,3 +23,4 @@
 .equ NPC_ZERSCHNEIDERBAUM, 0x16
 .equ NPC_GROSSER_ZERSCHNEIDERBAUM, 0x17
 .equ NPC_ZERSCHNEIDER_ANIMATION, 0x18
+.equ NPC_HEILUNGSSTATUE, 0x19

src/include/constants/pymap/story_flags.h

@@ -2,21 +2,22 @@
 #define FLAG_SCHOOL_MOVESPRITE 0x501
 #define FLAG_HIDE_RIVAL_SCHOOL 0x502
 #define FLAG_HIDE_RIVAL_SCHOOL_OUT 0x503
-#define FLAG_LABOR_MOVESPRITE1 0x504
-#define FLAG_HIDE_IDAN_LABOR 0x505
-#define FLAG_HIDE_ACHIM_LABOR 0x506
-#define FLAG_HIDE_RIVALE_LABOR 0x507
-#define FLAG_LABOR_MOVESPRITE2 0x508
-#define FLAG_HIDE_IDAN_HES_OD 0x509
-#define FLAG_HIDE_ACHIM_HES_OD 0x50a
-#define FLAG_HIDE_TUNDRA_RUEPEL_HES 0x50b
-#define FLAG_HIDE_POKE_HESPERIAPFAD 0x50c
-#define FLAG_HIDE_RIVALE_BERGSPITZE_RDW 0x50d
-#define FLAG_HIDE_IDAN_BERGSPITZE_RDW 0x50e
-#define FLAG_HIDE_ACHIM_BERGSPITZE_RDW 0x50f
-#define FLAG_FARBRAETSEL_FALSCH 0x510
-#define FLAG_FARBRAETSEL_RICHTIG 0x511
-#define FLAG_FARBRAETSEL_WETTER 0x512
-#define FLAG_FARBRAETSEL_GELBTAFEL 0x513
-#define FLAG_FARBRAETSEL_PINKTAFEL 0x514
-#define FLAG_FARBRAETSEL_BLAUTAFEL 0x515
+#define FLAG_BRUECKE_DEFEKT_CARUNPFAD 0x504
+#define FLAG_LABOR_MOVESPRITE1 0x505
+#define FLAG_HIDE_IDAN_LABOR 0x506
+#define FLAG_HIDE_ACHIM_LABOR 0x507
+#define FLAG_HIDE_RIVALE_LABOR 0x508
+#define FLAG_LABOR_MOVESPRITE2 0x509
+#define FLAG_HIDE_IDAN_HES_OD 0x50a
+#define FLAG_HIDE_ACHIM_HES_OD 0x50b
+#define FLAG_HIDE_TUNDRA_RUEPEL_HES 0x50c
+#define FLAG_HIDE_POKE_HESPERIAPFAD 0x50d
+#define FLAG_HIDE_RIVALE_BERGSPITZE_RDW 0x50e
+#define FLAG_HIDE_IDAN_BERGSPITZE_RDW 0x50f
+#define FLAG_HIDE_ACHIM_BERGSPITZE_RDW 0x510
+#define FLAG_FARBRAETSEL_FALSCH 0x511
+#define FLAG_FARBRAETSEL_RICHTIG 0x512
+#define FLAG_FARBRAETSEL_WETTER 0x513
+#define FLAG_FARBRAETSEL_GELBTAFEL 0x514
+#define FLAG_FARBRAETSEL_PINKTAFEL 0x515
+#define FLAG_FARBRAETSEL_BLAUTAFEL 0x516

src/include/constants/pymap/story_flags.s

@@ -2,21 +2,22 @@
 .equ FLAG_SCHOOL_MOVESPRITE, 0x501
 .equ FLAG_HIDE_RIVAL_SCHOOL, 0x502
 .equ FLAG_HIDE_RIVAL_SCHOOL_OUT, 0x503
-.equ FLAG_LABOR_MOVESPRITE1, 0x504
-.equ FLAG_HIDE_IDAN_LABOR, 0x505
-.equ FLAG_HIDE_ACHIM_LABOR, 0x506
-.equ FLAG_HIDE_RIVALE_LABOR, 0x507
-.equ FLAG_LABOR_MOVESPRITE2, 0x508
-.equ FLAG_HIDE_IDAN_HES_OD, 0x509
-.equ FLAG_HIDE_ACHIM_HES_OD, 0x50a
-.equ FLAG_HIDE_TUNDRA_RUEPEL_HES, 0x50b
-.equ FLAG_HIDE_POKE_HESPERIAPFAD, 0x50c
-.equ FLAG_HIDE_RIVALE_BERGSPITZE_RDW, 0x50d
-.equ FLAG_HIDE_IDAN_BERGSPITZE_RDW, 0x50e
-.equ FLAG_HIDE_ACHIM_BERGSPITZE_RDW, 0x50f
-.equ FLAG_FARBRAETSEL_FALSCH, 0x510
-.equ FLAG_FARBRAETSEL_RICHTIG, 0x511
-.equ FLAG_FARBRAETSEL_WETTER, 0x512
-.equ FLAG_FARBRAETSEL_GELBTAFEL, 0x513
-.equ FLAG_FARBRAETSEL_PINKTAFEL, 0x514
-.equ FLAG_FARBRAETSEL_BLAUTAFEL, 0x515
+.equ FLAG_BRUECKE_DEFEKT_CARUNPFAD, 0x504
+.equ FLAG_LABOR_MOVESPRITE1, 0x505
+.equ FLAG_HIDE_IDAN_LABOR, 0x506
+.equ FLAG_HIDE_ACHIM_LABOR, 0x507
+.equ FLAG_HIDE_RIVALE_LABOR, 0x508
+.equ FLAG_LABOR_MOVESPRITE2, 0x509
+.equ FLAG_HIDE_IDAN_HES_OD, 0x50a
+.equ FLAG_HIDE_ACHIM_HES_OD, 0x50b
+.equ FLAG_HIDE_TUNDRA_RUEPEL_HES, 0x50c
+.equ FLAG_HIDE_POKE_HESPERIAPFAD, 0x50d
+.equ FLAG_HIDE_RIVALE_BERGSPITZE_RDW, 0x50e
+.equ FLAG_HIDE_IDAN_BERGSPITZE_RDW, 0x50f
+.equ FLAG_HIDE_ACHIM_BERGSPITZE_RDW, 0x510
+.equ FLAG_FARBRAETSEL_FALSCH, 0x511
+.equ FLAG_FARBRAETSEL_RICHTIG, 0x512
+.equ FLAG_FARBRAETSEL_WETTER, 0x513
+.equ FLAG_FARBRAETSEL_GELBTAFEL, 0x514
+.equ FLAG_FARBRAETSEL_PINKTAFEL, 0x515
+.equ FLAG_FARBRAETSEL_BLAUTAFEL, 0x516