Merge branch 'master' of https://github.com/SBird1337/source_of_the_sovereign

.gitmodules

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

battle_engine

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

g3headers

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

src/music/battle_music_lookup.c

@@ -83,10 +83,10 @@ u16 mhk_intro_music_id_to_song(u8 introid) {
             res = 481;
             break;
         case 22:
-            res = 471;
+            res = 498;
             break;
         case 23:
-            res = 471;
+            res = 498;
             break;
         case 24:
             res = 473;
@@ -137,7 +137,7 @@ u16 mhk_intro_music_id_to_song(u8 introid) {
             res = 490;
             break;
         case 40:
-            res = 472;
+            res = 499;
             break;
         case 41:
             res = 491;

src/overworld/tileset_animation/main_animator.c

@@ -38,13 +38,13 @@ void main_second_animator(u16 current_frame) {
 }
 
 void main_animator_init(void) {
-    blockset_one_current_tile = 0;
-    blockset_one_max_tile = 0x280;
+    blockset_one_current_frame = 0;
+    blockset_one_max_frame = 0x280;
     blockset_one_animator = main_animator;
 }
 
 void main_second_animator_init(void) {
-    blockset_two_current_tile = 0;
-    blockset_two_max_tile = 0x100;
+    blockset_two_current_frame = 0;
+    blockset_two_max_frame = 0x100;
     blockset_two_animator = main_second_animator;
 }

src/overworld/tileset_animation/text_animator.c

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

src/savefile/save_block_jpan.s

@@ -15,57 +15,60 @@ saved c324 to cec4 at 14th block (0xd)*/
 /*in pre-patched Fire Red, d9ef0*/
 .global load_hijack
 load_hijack:	ldr r1, [r4]
-		mov r3, #0xff 
-		lsl r3, r3, #0x4
-		add r3, r3, r1
-		ldrh r0, [r3, #0x4]
-		cmp r0, #0x0
-		beq first_cc_load
-		cmp r0, #0x4
-		beq middle_load
-		cmp r0, #0xd
-		beq last_load
+	mov r3, #0xff 
+	lsl r3, r3, #0x4
+	add r3, r3, r1
+	ldrh r0, [r3, #0x4]
+	cmp r0, #0x0
+	beq first_cc_load
+	cmp r0, #0x4
+	beq middle_load
+	cmp r0, #0xd
+	beq last_load
 
 
 load_ender:	cmp r5, #0xd
-		ble next_loop_iter
-		
-		mov r0, #0x1
-		pop {r3}
-		mov r8, r3
-		pop {r4-r7}	
-		pop {r1}
-		bx r1	
+	ble next_loop_iter
+	mov r0, #0x1
+	pop {r3}
+	mov r8, r3
+	pop {r4-r7}	
+	pop {r1}
+	bx r1	
 
 first_cc_load:	mov r1, #0xcc
-		ldr r2, c0c8_addr
-		b load_loop	
+	ldr r2, c0c8_addr
+	b load_loop	
 	
 middle_load:	mov r1, #0x96
-		lsl r1, r1, #0x2
-		ldr r2, c320_addr
-		b load_loop
+	lsl r1, r1, #0x2
+	ldr r2, c320_addr
+	b load_loop
 
-last_load:	mov r1, #0xba
-		lsl r1, r1, #0x4
-		ldr r2, cec0_addr
-				
+last_load:	
+	mov r1, #0xba
+	lsl r1, r1, #0x4
+	ldr r2, cec0_addr
 
 load_loop:	sub r3, #0x4
-		ldr r0, [r3]
-		str r0, [r2]
-		sub r2, #0x4	
-		sub r1, #0x4
-		cmp r1, #0x0
-		bne load_loop
-		b load_ender
-.hword 0x0000
+	ldr r0, [r3]
+	str r0, [r2]
+	sub r2, #0x4	
+	sub r1, #0x4
+	cmp r1, #0x0
+	bne load_loop
+	b load_ender
+
+.align 2
+
 c0c8_addr:	.word 0x0203c0c8
 c320_addr:	.word 0x0203c320
 cec0_addr:	.word 0x0203cec0
 
-next_loop_iter:	ldr r0, game_load_ret_addr
-		bx r0
+next_loop_iter:	
+	ldr r0, game_load_ret_addr
+	bx r0
+
 game_load_ret_addr:	.word 0x080D9E71
 /*d9e85 for pre-patched*/