Browse Source

script progress

dragonflysots 6 years ago
parent
commit
1cdb48cb7b

+ 4
- 3
data/overworld/overworld_data.s View File

@@ -4989,12 +4989,13 @@ ow_data_objekt_0023:
4989 4989
 .align 2
4990 4990
 ow_data_objekt_0024:
4991 4991
 .hword 0xFFFF, 0xC318, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
4992
-.word 0x83A3720, 0x83A38D0, 0x83A3314, ow_frames_objekt_0024 , 0x8231CFC
4992
+.word 0x83A3720, 0x83A38D0, 0x83A3314, ow_frames_objekt_0024, 0x8231CFC
4993 4993
 
4994 4994
 .align 2
4995 4995
 ow_data_objekt_0025:
4996
-.hword 0xFFFF, 0xC319, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
4997
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0025, 0x8231CFC
4996
+.hword 0xFFFF, 0xC319, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
4997
+.word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_objekt_0025, 0x8231CFC
4998
+
4998 4999
 
4999 5000
 .align 2
5000 5001
 ow_data_objekt_0026:

+ 26
- 2
data/overworld/overworld_frames.s View File

@@ -16523,8 +16523,32 @@ ow_frames_objekt_0024:
16523 16523
 
16524 16524
 .align 2
16525 16525
 ow_frames_objekt_0025:
16526
-.word ow_00000Tiles+(0*0x80)
16527
-.hword 0x80
16526
+.word ow_objekt_0025Tiles+(0*0x200)
16527
+.hword 0x200
16528
+.hword 0x0
16529
+.word ow_objekt_0025Tiles+(0*0x200)
16530
+.hword 0x200 
16531
+.hword 0x0
16532
+.word ow_objekt_0025Tiles+(0*0x200)
16533
+.hword 0x200 
16534
+.hword 0x0
16535
+.word ow_objekt_0025Tiles+(1*0x200)
16536
+.hword 0x200 
16537
+.hword 0x0
16538
+.word ow_objekt_0025Tiles+(2*0x200)
16539
+.hword 0x200 
16540
+.hword 0x0
16541
+.word ow_objekt_0025Tiles+(1*0x200)
16542
+.hword 0x200 
16543
+.hword 0x0
16544
+.word ow_objekt_0025Tiles+(2*0x200)
16545
+.hword 0x200 
16546
+.hword 0x0
16547
+.word ow_objekt_0025Tiles+(1*0x200)
16548
+.hword 0x200 
16549
+.hword 0x0
16550
+.word ow_objekt_0025Tiles+(2*0x200)
16551
+.hword 0x200 
16528 16552
 .hword 0x0
16529 16553
 
16530 16554
 .align 2

+ 1
- 1
sots-private

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

+ 1
- 0
src/include/constants/pymap/npc_sprite_table4.h View File

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

+ 1
- 0
src/include/constants/pymap/npc_sprite_table4.s View File

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

+ 19
- 18
src/include/constants/pymap/story_flags.h View File

@@ -2,21 +2,22 @@
2 2
 #define FLAG_SCHOOL_MOVESPRITE 0x501
3 3
 #define FLAG_HIDE_RIVAL_SCHOOL 0x502
4 4
 #define FLAG_HIDE_RIVAL_SCHOOL_OUT 0x503
5
-#define FLAG_LABOR_MOVESPRITE1 0x504
6
-#define FLAG_HIDE_IDAN_LABOR 0x505
7
-#define FLAG_HIDE_ACHIM_LABOR 0x506
8
-#define FLAG_HIDE_RIVALE_LABOR 0x507
9
-#define FLAG_LABOR_MOVESPRITE2 0x508
10
-#define FLAG_HIDE_IDAN_HES_OD 0x509
11
-#define FLAG_HIDE_ACHIM_HES_OD 0x50a
12
-#define FLAG_HIDE_TUNDRA_RUEPEL_HES 0x50b
13
-#define FLAG_HIDE_POKE_HESPERIAPFAD 0x50c
14
-#define FLAG_HIDE_RIVALE_BERGSPITZE_RDW 0x50d
15
-#define FLAG_HIDE_IDAN_BERGSPITZE_RDW 0x50e
16
-#define FLAG_HIDE_ACHIM_BERGSPITZE_RDW 0x50f
17
-#define FLAG_FARBRAETSEL_FALSCH 0x510
18
-#define FLAG_FARBRAETSEL_RICHTIG 0x511
19
-#define FLAG_FARBRAETSEL_WETTER 0x512
20
-#define FLAG_FARBRAETSEL_GELBTAFEL 0x513
21
-#define FLAG_FARBRAETSEL_PINKTAFEL 0x514
22
-#define FLAG_FARBRAETSEL_BLAUTAFEL 0x515
5
+#define FLAG_BRUECKE_DEFEKT_CARUNPFAD 0x504
6
+#define FLAG_LABOR_MOVESPRITE1 0x505
7
+#define FLAG_HIDE_IDAN_LABOR 0x506
8
+#define FLAG_HIDE_ACHIM_LABOR 0x507
9
+#define FLAG_HIDE_RIVALE_LABOR 0x508
10
+#define FLAG_LABOR_MOVESPRITE2 0x509
11
+#define FLAG_HIDE_IDAN_HES_OD 0x50a
12
+#define FLAG_HIDE_ACHIM_HES_OD 0x50b
13
+#define FLAG_HIDE_TUNDRA_RUEPEL_HES 0x50c
14
+#define FLAG_HIDE_POKE_HESPERIAPFAD 0x50d
15
+#define FLAG_HIDE_RIVALE_BERGSPITZE_RDW 0x50e
16
+#define FLAG_HIDE_IDAN_BERGSPITZE_RDW 0x50f
17
+#define FLAG_HIDE_ACHIM_BERGSPITZE_RDW 0x510
18
+#define FLAG_FARBRAETSEL_FALSCH 0x511
19
+#define FLAG_FARBRAETSEL_RICHTIG 0x512
20
+#define FLAG_FARBRAETSEL_WETTER 0x513
21
+#define FLAG_FARBRAETSEL_GELBTAFEL 0x514
22
+#define FLAG_FARBRAETSEL_PINKTAFEL 0x515
23
+#define FLAG_FARBRAETSEL_BLAUTAFEL 0x516

+ 19
- 18
src/include/constants/pymap/story_flags.s View File

@@ -2,21 +2,22 @@
2 2
 .equ FLAG_SCHOOL_MOVESPRITE, 0x501
3 3
 .equ FLAG_HIDE_RIVAL_SCHOOL, 0x502
4 4
 .equ FLAG_HIDE_RIVAL_SCHOOL_OUT, 0x503
5
-.equ FLAG_LABOR_MOVESPRITE1, 0x504
6
-.equ FLAG_HIDE_IDAN_LABOR, 0x505
7
-.equ FLAG_HIDE_ACHIM_LABOR, 0x506
8
-.equ FLAG_HIDE_RIVALE_LABOR, 0x507
9
-.equ FLAG_LABOR_MOVESPRITE2, 0x508
10
-.equ FLAG_HIDE_IDAN_HES_OD, 0x509
11
-.equ FLAG_HIDE_ACHIM_HES_OD, 0x50a
12
-.equ FLAG_HIDE_TUNDRA_RUEPEL_HES, 0x50b
13
-.equ FLAG_HIDE_POKE_HESPERIAPFAD, 0x50c
14
-.equ FLAG_HIDE_RIVALE_BERGSPITZE_RDW, 0x50d
15
-.equ FLAG_HIDE_IDAN_BERGSPITZE_RDW, 0x50e
16
-.equ FLAG_HIDE_ACHIM_BERGSPITZE_RDW, 0x50f
17
-.equ FLAG_FARBRAETSEL_FALSCH, 0x510
18
-.equ FLAG_FARBRAETSEL_RICHTIG, 0x511
19
-.equ FLAG_FARBRAETSEL_WETTER, 0x512
20
-.equ FLAG_FARBRAETSEL_GELBTAFEL, 0x513
21
-.equ FLAG_FARBRAETSEL_PINKTAFEL, 0x514
22
-.equ FLAG_FARBRAETSEL_BLAUTAFEL, 0x515
5
+.equ FLAG_BRUECKE_DEFEKT_CARUNPFAD, 0x504
6
+.equ FLAG_LABOR_MOVESPRITE1, 0x505
7
+.equ FLAG_HIDE_IDAN_LABOR, 0x506
8
+.equ FLAG_HIDE_ACHIM_LABOR, 0x507
9
+.equ FLAG_HIDE_RIVALE_LABOR, 0x508
10
+.equ FLAG_LABOR_MOVESPRITE2, 0x509
11
+.equ FLAG_HIDE_IDAN_HES_OD, 0x50a
12
+.equ FLAG_HIDE_ACHIM_HES_OD, 0x50b
13
+.equ FLAG_HIDE_TUNDRA_RUEPEL_HES, 0x50c
14
+.equ FLAG_HIDE_POKE_HESPERIAPFAD, 0x50d
15
+.equ FLAG_HIDE_RIVALE_BERGSPITZE_RDW, 0x50e
16
+.equ FLAG_HIDE_IDAN_BERGSPITZE_RDW, 0x50f
17
+.equ FLAG_HIDE_ACHIM_BERGSPITZE_RDW, 0x510
18
+.equ FLAG_FARBRAETSEL_FALSCH, 0x511
19
+.equ FLAG_FARBRAETSEL_RICHTIG, 0x512
20
+.equ FLAG_FARBRAETSEL_WETTER, 0x513
21
+.equ FLAG_FARBRAETSEL_GELBTAFEL, 0x514
22
+.equ FLAG_FARBRAETSEL_PINKTAFEL, 0x515
23
+.equ FLAG_FARBRAETSEL_BLAUTAFEL, 0x516