|
@@ -1,3 +1,5 @@
|
|
1
|
+// songtable repointing
|
|
2
|
+
|
1
|
3
|
.org 0x081DD11C
|
2
|
4
|
.word _songtable
|
3
|
5
|
|
|
@@ -12,3 +14,88 @@
|
12
|
14
|
|
13
|
15
|
.org 0x081DD224
|
14
|
16
|
.word _songtable
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+// titlescreen cry id fix
|
|
21
|
+
|
|
22
|
+.org 0x080791EE
|
|
23
|
+ldr r2, =titlescreen_cry_id_override+1
|
|
24
|
+bx r2
|
|
25
|
+.pool
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+// titlescreen music length extension
|
|
30
|
+.org 0x08078C1C
|
|
31
|
+ .word 0x18D8 // 53 seconds * 2 (loops) * 60 fps
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+// high quality mixer installation stuff
|
|
35
|
+
|
|
36
|
+.org 0x080007B4
|
|
37
|
+ .word 0x0203E000 // new PCM work area
|
|
38
|
+
|
|
39
|
+.org 0x081DD0B4
|
|
40
|
+ .word main_mixer // new mixer ROM location
|
|
41
|
+ .word 0x03005F50 // new mixer RAM location (used for loading)
|
|
42
|
+ .halfword mixer_size
|
|
43
|
+ .halfword 0x400 // CpuSet, copy code by 32 bit units
|
|
44
|
+ .word 0x0203E000 // new PCM work area
|
|
45
|
+
|
|
46
|
+.org 0x081DD0C8
|
|
47
|
+ // set correct sound driver operation mode
|
|
48
|
+ // 12 channels at 31536 Hz samplerate
|
|
49
|
+ .byte 0x00, 0xCC, 0x99, 0x00
|
|
50
|
+
|
|
51
|
+.org 0x081DC094
|
|
52
|
+ .word 0x03005F50+1 // new mixer RAM location (used for branch)
|
|
53
|
+
|
|
54
|
+
|
|
55
|
+
|
|
56
|
+// new cry tables
|
|
57
|
+
|
|
58
|
+.org 0x080720C8
|
|
59
|
+ .include "patches/disable_cry_table_blocks.s"
|
|
60
|
+
|
|
61
|
+.org 0x08043304 // cry-ID = poke-ID
|
|
62
|
+ lsl r0, r0, #0x10
|
|
63
|
+ lsr r0, r0, #0x10
|
|
64
|
+ bx lr
|
|
65
|
+
|
|
66
|
+// trainer music overrides
|
|
67
|
+
|
|
68
|
+.org 0x0808064C // encounter music ([!] Box) song hook
|
|
69
|
+ LDR R1, =mhk_intro_music_id_to_song|1
|
|
70
|
+ BL _call_via_r1
|
|
71
|
+ B 0x080806BA
|
|
72
|
+ .pool
|
|
73
|
+
|
|
74
|
+.org 0x08044090
|
|
75
|
+ LDR R1, =mhk_current_map_music_set_default_for_battle|1
|
|
76
|
+ BX R1
|
|
77
|
+ .pool
|
|
78
|
+
|
|
79
|
+.org 0x080156FE // trainer victory music hook
|
|
80
|
+ LDR R0, =mhk_trainer_battle_play_defeat|1
|
|
81
|
+ BL _call_via_r0
|
|
82
|
+ B 0x0801576E
|
|
83
|
+ .pool
|
|
84
|
+
|
|
85
|
+.org 0x08021D46 // wild poke defeated
|
|
86
|
+ BL _call_via_r0
|
|
87
|
+.org 0x08021D94
|
|
88
|
+ .word mhk_wild_poke_def_music|1
|
|
89
|
+
|
|
90
|
+.org 0x0807F9F8
|
|
91
|
+ LDR R1, =0x0807FA3E
|
|
92
|
+ BL _call_via_r1
|
|
93
|
+ MOV R1, R0
|
|
94
|
+ B 0x0807FA3E
|
|
95
|
+ .pool
|
|
96
|
+
|
|
97
|
+.org 0x080159D0
|
|
98
|
+ LDR R0, =mhk_fadeout|1
|
|
99
|
+ BL _call_via_r0
|
|
100
|
+ B 0x080159DC
|
|
101
|
+ .pool
|