Browse Source

Simplify Titlescreen Cry Override

Michael Panzlaff 6 years ago
parent
commit
aec1662535
2 changed files with 3 additions and 29 deletions
  1. 3
    5
      patches/music.asm
  2. 0
    24
      src/music/titlescreen.s

+ 3
- 5
patches/music.asm View File

@@ -20,11 +20,9 @@
20 20
 // titlescreen cry id fix
21 21
 
22 22
 .org 0x080791EE
23
-ldr r2, =titlescreen_cry_id_override+1
24
-bx  r2
25
-.pool
26
-
27
-
23
+    mov r0, #80
24
+    bl  m4aSongNumStart
25
+    nop
28 26
 
29 27
 // titlescreen music length extension
30 28
 .org 0x08078C1C

+ 0
- 24
src/music/titlescreen.s View File

@@ -1,24 +0,0 @@
1
-#include <constants/pkmns.h>
2
-
3
-.text
4
-.thumb
5
-
6
-.global titlescreen_cry_id_override
7
-
8
-.align 2
9
-
10
-titlescreen_cry_id_override:
11
-    //ldr     r0, =PKMN_DEOXYS
12
-    //mov     r1, #0
13
-    //ldr     r2, =0x08071DF0+1       // cry_related
14
-    //bl      _call_via_r2
15
-    mov     r0, #80
16
-    ldr     r1, =m4aSongNumStart
17
-    bl      _call_via_r1
18
-    ldrb    r0, [r4, #0xC]
19
-    ldr     r1, =0x080791F8+1       // hook return address
20
-    bx      r1
21
-
22
-.align 2
23
-_call_via_r1:
24
-    bx      r1