DragonflySotS il y a 7 ans
Parent
révision
36467ef56d

+ 3
- 3
.gitmodules Voir le fichier

@@ -1,9 +1,9 @@
1 1
 [submodule "sots-private"]
2 2
 	path = sots-private
3 3
 	url = ssh://sotshost:/home/sots-michy/sots-private.git
4
-[submodule "battle_engine"]
5
-	path = battle_engine
6
-	url = https://github.com/SBird1337/battle_engine
7 4
 [submodule "g3headers"]
8 5
 	path = g3headers
9 6
 	url = https://github.com/SBird1337/g3headers
7
+[submodule "battle_engine"]
8
+	path = battle_engine
9
+	url = https://github.com/SBird1337/battle_engine

+ 1
- 1
battle_engine

@@ -1 +1 @@
1
-Subproject commit a201b518834f0208efdb82ac95b08675f5279950
1
+Subproject commit 991e2793854c10885382ad325c55ad42a0585f61

+ 1
- 1
g3headers

@@ -1 +1 @@
1
-Subproject commit c83937b923518ff7faaf6f6a6b357eee618b4368
1
+Subproject commit 1c9d6f8cdaaf7482b2f03b8e90d911303c251375

+ 3
- 3
src/music/battle_music_lookup.c Voir le fichier

@@ -83,10 +83,10 @@ u16 mhk_intro_music_id_to_song(u8 introid) {
83 83
             res = 481;
84 84
             break;
85 85
         case 22:
86
-            res = 471;
86
+            res = 498;
87 87
             break;
88 88
         case 23:
89
-            res = 471;
89
+            res = 498;
90 90
             break;
91 91
         case 24:
92 92
             res = 473;
@@ -137,7 +137,7 @@ u16 mhk_intro_music_id_to_song(u8 introid) {
137 137
             res = 490;
138 138
             break;
139 139
         case 40:
140
-            res = 472;
140
+            res = 499;
141 141
             break;
142 142
         case 41:
143 143
             res = 491;

+ 4
- 4
src/overworld/tileset_animation/main_animator.c Voir le fichier

@@ -38,13 +38,13 @@ void main_second_animator(u16 current_frame) {
38 38
 }
39 39
 
40 40
 void main_animator_init(void) {
41
-    blockset_one_current_tile = 0;
42
-    blockset_one_max_tile = 0x280;
41
+    blockset_one_current_frame = 0;
42
+    blockset_one_max_frame = 0x280;
43 43
     blockset_one_animator = main_animator;
44 44
 }
45 45
 
46 46
 void main_second_animator_init(void) {
47
-    blockset_two_current_tile = 0;
48
-    blockset_two_max_tile = 0x100;
47
+    blockset_two_current_frame = 0;
48
+    blockset_two_max_frame = 0x100;
49 49
     blockset_two_animator = main_second_animator;
50 50
 }

+ 2
- 2
src/overworld/tileset_animation/text_animator.c Voir le fichier

@@ -101,8 +101,8 @@ void text_animator(u16 current_frame) {
101 101
 }
102 102
 
103 103
 void anim_init_text(void) {
104
-    blockset_one_current_tile = 0;
105
-    blockset_one_max_tile = 0x280;
104
+    blockset_one_current_frame = 0;
105
+    blockset_one_max_frame = 0x280;
106 106
     blockset_one_animator = NULL;
107 107
     u16 text = var_load(TEXT_ANIMATION_VAR);
108 108
     if (text != 0) {

+ 40
- 37
src/savefile/save_block_jpan.s Voir le fichier

@@ -15,57 +15,60 @@ saved c324 to cec4 at 14th block (0xd)*/
15 15
 /*in pre-patched Fire Red, d9ef0*/
16 16
 .global load_hijack
17 17
 load_hijack:	ldr r1, [r4]
18
-		mov r3, #0xff 
19
-		lsl r3, r3, #0x4
20
-		add r3, r3, r1
21
-		ldrh r0, [r3, #0x4]
22
-		cmp r0, #0x0
23
-		beq first_cc_load
24
-		cmp r0, #0x4
25
-		beq middle_load
26
-		cmp r0, #0xd
27
-		beq last_load
18
+	mov r3, #0xff 
19
+	lsl r3, r3, #0x4
20
+	add r3, r3, r1
21
+	ldrh r0, [r3, #0x4]
22
+	cmp r0, #0x0
23
+	beq first_cc_load
24
+	cmp r0, #0x4
25
+	beq middle_load
26
+	cmp r0, #0xd
27
+	beq last_load
28 28
 
29 29
 
30 30
 load_ender:	cmp r5, #0xd
31
-		ble next_loop_iter
32
-		
33
-		mov r0, #0x1
34
-		pop {r3}
35
-		mov r8, r3
36
-		pop {r4-r7}	
37
-		pop {r1}
38
-		bx r1	
31
+	ble next_loop_iter
32
+	mov r0, #0x1
33
+	pop {r3}
34
+	mov r8, r3
35
+	pop {r4-r7}	
36
+	pop {r1}
37
+	bx r1	
39 38
 
40 39
 first_cc_load:	mov r1, #0xcc
41
-		ldr r2, c0c8_addr
42
-		b load_loop	
40
+	ldr r2, c0c8_addr
41
+	b load_loop	
43 42
 	
44 43
 middle_load:	mov r1, #0x96
45
-		lsl r1, r1, #0x2
46
-		ldr r2, c320_addr
47
-		b load_loop
44
+	lsl r1, r1, #0x2
45
+	ldr r2, c320_addr
46
+	b load_loop
48 47
 
49
-last_load:	mov r1, #0xba
50
-		lsl r1, r1, #0x4
51
-		ldr r2, cec0_addr
52
-				
48
+last_load:	
49
+	mov r1, #0xba
50
+	lsl r1, r1, #0x4
51
+	ldr r2, cec0_addr
53 52
 
54 53
 load_loop:	sub r3, #0x4
55
-		ldr r0, [r3]
56
-		str r0, [r2]
57
-		sub r2, #0x4	
58
-		sub r1, #0x4
59
-		cmp r1, #0x0
60
-		bne load_loop
61
-		b load_ender
62
-.hword 0x0000
54
+	ldr r0, [r3]
55
+	str r0, [r2]
56
+	sub r2, #0x4	
57
+	sub r1, #0x4
58
+	cmp r1, #0x0
59
+	bne load_loop
60
+	b load_ender
61
+
62
+.align 2
63
+
63 64
 c0c8_addr:	.word 0x0203c0c8
64 65
 c320_addr:	.word 0x0203c320
65 66
 cec0_addr:	.word 0x0203cec0
66 67
 
67
-next_loop_iter:	ldr r0, game_load_ret_addr
68
-		bx r0
68
+next_loop_iter:	
69
+	ldr r0, game_load_ret_addr
70
+	bx r0
71
+
69 72
 game_load_ret_addr:	.word 0x080D9E71
70 73
 /*d9e85 for pre-patched*/
71 74