summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/black2_musicfix.asm211
-rw-r--r--asm/white2_musicfix.asm211
2 files changed, 422 insertions, 0 deletions
diff --git a/asm/black2_musicfix.asm b/asm/black2_musicfix.asm
new file mode 100644
index 0000000..9072fac
--- /dev/null
+++ b/asm/black2_musicfix.asm
@@ -0,0 +1,211 @@
+ .nds
+ .thumb
+ .open "pkmnblack2_ovl36", "pkmnblack2_ovl36_musicfix", 0x0217F600
+
+ NEW_INDEX_TO_MUSIC_SUBR_HOOK equ 0x021C5F16
+ OLD_INDEX_TO_MUSIC_SUBR_CONTINUED equ 0x021C60AC
+
+ ITCM_SRC_START equ 0x0209D740
+ ITCM_DEST_START equ 0x01FF8000
+ ITCM_OLD_SIZE equ 0x13A0
+
+ NEW_INDEX_TO_MUSIC_SUBR equ ITCM_SRC_START + ITCM_OLD_SIZE
+ NEW_INDEX_TO_MUSIC_SUBR_ITCM equ ITCM_DEST_START + ITCM_OLD_SIZE
+
+ ; Hook that jumps to our new subroutine
+ .org NEW_INDEX_TO_MUSIC_SUBR_HOOK
+ mov r0,r4
+ bl org() + 6
+ b @@continue_old_subr
+ ldr r2,=#(NEW_INDEX_TO_MUSIC_SUBR_ITCM + 1)
+ bx r2
+ .pool
+@@continue_old_subr:
+ cmp r0,#0x0
+ beq @@subr_end
+ add sp,#0x10
+ pop {r3-r7,r15}
+@@subr_end:
+ b OLD_INDEX_TO_MUSIC_SUBR_CONTINUED
+
+ .close
+
+ .open "pkmnblack2.bin", "pkmnblack2_musicfix.bin", 0x02004000
+ ; New subroutine. Checks each relevant index one-by-one and picks the correct music+intro
+ .org NEW_INDEX_TO_MUSIC_SUBR
+ .area 448
+
+ push r14
+ ldr r2,=#0x179 ; Regirock
+ cmp r0,r2
+ beq @@music_regi
+ ldr r2,=#0x17A ; Regice
+ cmp r0,r2
+ beq @@music_regi
+ ldr r2,=#0x17B ; Registeel
+ cmp r0,r2
+ beq @@music_regi
+ ldr r2,=#0x17C ; Latias
+ cmp r0,r2
+ beq @@music_special
+ ldr r2,=#0x17D ; Latios
+ cmp r0,r2
+ beq @@music_special
+ ldr r2,=#0x1E0 ; Uxie
+ cmp r0,r2
+ beq @@music_lake_guardian
+ ldr r2,=#0x1E1 ; Mesprit
+ cmp r0,r2
+ beq @@music_lake_guardian
+ ldr r2,=#0x1E2 ; Azelf
+ cmp r0,r2
+ beq @@music_lake_guardian
+ ldr r2,=#0x1E5 ; Heatran
+ cmp r0,r2
+ beq @@music_heatran
+ ldr r2,=#0x1E6 ; Regigigas
+ cmp r0,r2
+ beq @@music_regi
+ ldr r2,=#0x1E8 ; Cresselia
+ cmp r0,r2
+ beq @@music_special
+ ldr r2,=#0x1EE ; Victini
+ cmp r0,r2
+ beq @@music_victini
+ ldr r2,=#0x23B ; Zoroark
+ cmp r0,r2
+ beq @@music_zoroark
+ ldr r2,=#0x264 ; Haxorus
+ cmp r0,r2
+ beq @@music_special
+ ldr r2,=#0x27D ; Volcarona
+ cmp r0,r2
+ beq @@music_volcarona
+ ldr r2,=#0x27E ; Cobalion
+ cmp r0,r2
+ beq @@music_musketeer
+ ldr r2,=#0x27F ; Terrakion
+ cmp r0,r2
+ beq @@music_musketeer
+ ldr r2,=#0x280 ; Virizion
+ cmp r0,r2
+ beq @@music_musketeer
+ ldr r2,=#0x281 ; Tornadus
+ cmp r0,r2
+ beq @@music_genies
+ ldr r2,=#0x282 ; Thundurus
+ cmp r0,r2
+ beq @@music_genies
+ ldr r2,=#0x283 ; Reshiram
+ cmp r0,r2
+ beq @@music_reshiram
+ ldr r2,=#0x284 ; Zekrom
+ cmp r0,r2
+ beq @@music_zekrom
+ ldr r2,=#0x285 ; Landorus
+ cmp r0,r2
+ beq @@music_genies
+ ldr r2,=#0x29D ; Kyurem-B
+ sub r2,#0x17 ; Set to "absolute index" and subtract to get regular Kyurem index
+ cmp r0,r2
+ bne @@continue
+ cmp r7,#0x2 ; 1 = W, 2 = B
+ beq @@music_kyurem_b
+@@continue:
+ ldr r2,=#0x286 ; Kyurem
+ cmp r0,r2
+ beq @@music_kyurem
+ ldr r2,=#0x287 ; Keldeo
+ cmp r0,r2
+ beq @@music_musketeer
+@@music_regular:
+ mov r0,#0x0
+ b @@subr_end
+@@music_regi:
+ ldr r0,=#0x473
+ strh r0,[r5]
+ mov r0,#0x20
+ str r0,[r6]
+ b @@return_1
+@@music_special:
+ ldr r0,=#0x469
+ strh r0,[r5]
+ mov r0,#0x20
+ str r0,[r6]
+ b @@return_1
+@@music_lake_guardian:
+ ldr r0,=#0x472
+ strh r0,[r5]
+ mov r0,#0x20
+ str r0,[r6]
+ b @@return_1
+@@music_heatran:
+ ldr r0,=#0x46E
+ strh r0,[r5]
+ mov r0,#0x20
+ str r0,[r6]
+ b @@return_1
+@@music_victini:
+ ldr r0,=#0x478
+ strh r0,[r5]
+ mov r0,#0x20
+ str r0,[r6]
+ b @@return_1
+@@music_zoroark:
+ ldr r0,=#0x469
+ strh r0,[r5]
+ mov r0,#0x24
+ str r0,[r6]
+ b @@return_1
+@@music_volcarona:
+ ldr r0,=#0x469
+ strh r0,[r5]
+ mov r0,#0x20
+ str r0,[r6]
+ b @@return_1
+@@music_musketeer:
+ ldr r0,=#0x478
+ strh r0,[r5]
+ mov r0,#0x23
+ str r0,[r6]
+ b @@return_1
+@@music_genies:
+ ldr r0,=#0x477
+ strh r0,[r5]
+ mov r0,#0x22
+ str r0,[r6]
+ b @@return_1
+@@music_reshiram:
+ ldr r0,=#0x474
+ strh r0,[r5]
+ mov r0,#0x21
+ str r0,[r6]
+ b @@return_1
+@@music_zekrom:
+ ldr r0,=#0x475
+ strh r0,[r5]
+ mov r0,#0x21
+ str r0,[r6]
+ b @@return_1
+@@music_kyurem_b:
+ ldr r0,=#0x4E8 ; 4E7 = W, 4E8 = B
+ strh r0,[r5]
+ mov r0,#0x21
+ str r0,[r6]
+ b @@return_1
+@@music_kyurem:
+ ldr r0,=#0x476
+ strh r0,[r5]
+ mov r0,#0x21
+ str r0,[r6]
+ b @@return_1
+@@return_1:
+ mov r0,#0x1
+@@subr_end:
+ pop r1
+ bx r1
+
+ .pool
+ .endarea
+
+ .close \ No newline at end of file
diff --git a/asm/white2_musicfix.asm b/asm/white2_musicfix.asm
new file mode 100644
index 0000000..c5fe43f
--- /dev/null
+++ b/asm/white2_musicfix.asm
@@ -0,0 +1,211 @@
+ .nds
+ .thumb
+ .open "pkmnwhite2_ovl36", "pkmnwhite2_ovl36_musicfix", 0x0217F640
+
+ NEW_INDEX_TO_MUSIC_SUBR_HOOK equ 0x021C5F4E
+ OLD_INDEX_TO_MUSIC_SUBR_CONTINUED equ 0x021C60E4
+
+ ITCM_SRC_START equ 0x0209D780
+ ITCM_DEST_START equ 0x01FF8000
+ ITCM_OLD_SIZE equ 0x13A0
+
+ NEW_INDEX_TO_MUSIC_SUBR equ ITCM_SRC_START + ITCM_OLD_SIZE
+ NEW_INDEX_TO_MUSIC_SUBR_ITCM equ ITCM_DEST_START + ITCM_OLD_SIZE
+
+ ; Hook that jumps to our new subroutine
+ .org NEW_INDEX_TO_MUSIC_SUBR_HOOK
+ mov r0,r4
+ bl org() + 6
+ b @@continue_old_subr
+ ldr r2,=#(NEW_INDEX_TO_MUSIC_SUBR_ITCM + 1)
+ bx r2
+ .pool
+@@continue_old_subr:
+ cmp r0,#0x0
+ beq @@subr_end
+ add sp,#0x10
+ pop {r3-r7,r15}
+@@subr_end:
+ b OLD_INDEX_TO_MUSIC_SUBR_CONTINUED
+
+ .close
+
+ .open "pkmnwhite2.bin", "pkmnwhite2_musicfix.bin", 0x02004000
+ ; New subroutine. Checks each relevant index one-by-one and picks the correct music+intro
+ .org NEW_INDEX_TO_MUSIC_SUBR
+ .area 448
+
+ push r14
+ ldr r2,=#0x179 ; Regirock
+ cmp r0,r2
+ beq @@music_regi
+ ldr r2,=#0x17A ; Regice
+ cmp r0,r2
+ beq @@music_regi
+ ldr r2,=#0x17B ; Registeel
+ cmp r0,r2
+ beq @@music_regi
+ ldr r2,=#0x17C ; Latias
+ cmp r0,r2
+ beq @@music_special
+ ldr r2,=#0x17D ; Latios
+ cmp r0,r2
+ beq @@music_special
+ ldr r2,=#0x1E0 ; Uxie
+ cmp r0,r2
+ beq @@music_lake_guardian
+ ldr r2,=#0x1E1 ; Mesprit
+ cmp r0,r2
+ beq @@music_lake_guardian
+ ldr r2,=#0x1E2 ; Azelf
+ cmp r0,r2
+ beq @@music_lake_guardian
+ ldr r2,=#0x1E5 ; Heatran
+ cmp r0,r2
+ beq @@music_heatran
+ ldr r2,=#0x1E6 ; Regigigas
+ cmp r0,r2
+ beq @@music_regi
+ ldr r2,=#0x1E8 ; Cresselia
+ cmp r0,r2
+ beq @@music_special
+ ldr r2,=#0x1EE ; Victini
+ cmp r0,r2
+ beq @@music_victini
+ ldr r2,=#0x23B ; Zoroark
+ cmp r0,r2
+ beq @@music_zoroark
+ ldr r2,=#0x264 ; Haxorus
+ cmp r0,r2
+ beq @@music_special
+ ldr r2,=#0x27D ; Volcarona
+ cmp r0,r2
+ beq @@music_volcarona
+ ldr r2,=#0x27E ; Cobalion
+ cmp r0,r2
+ beq @@music_musketeer
+ ldr r2,=#0x27F ; Terrakion
+ cmp r0,r2
+ beq @@music_musketeer
+ ldr r2,=#0x280 ; Virizion
+ cmp r0,r2
+ beq @@music_musketeer
+ ldr r2,=#0x281 ; Tornadus
+ cmp r0,r2
+ beq @@music_genies
+ ldr r2,=#0x282 ; Thundurus
+ cmp r0,r2
+ beq @@music_genies
+ ldr r2,=#0x283 ; Reshiram
+ cmp r0,r2
+ beq @@music_reshiram
+ ldr r2,=#0x284 ; Zekrom
+ cmp r0,r2
+ beq @@music_zekrom
+ ldr r2,=#0x285 ; Landorus
+ cmp r0,r2
+ beq @@music_genies
+ ldr r2,=#0x29C ; Kyurem-W
+ sub r2,#0x16 ; Set to "absolute index" and subtract to get regular Kyurem index
+ cmp r0,r2
+ bne @@continue
+ cmp r7,#0x1 ; 1 = W, 2 = B
+ beq @@music_kyurem_w
+@@continue:
+ ldr r2,=#0x286 ; Kyurem
+ cmp r0,r2
+ beq @@music_kyurem
+ ldr r2,=#0x287 ; Keldeo
+ cmp r0,r2
+ beq @@music_musketeer
+@@music_regular:
+ mov r0,#0x0
+ b @@subr_end
+@@music_regi:
+ ldr r0,=#0x473
+ strh r0,[r5]
+ mov r0,#0x20
+ str r0,[r6]
+ b @@return_1
+@@music_special:
+ ldr r0,=#0x469
+ strh r0,[r5]
+ mov r0,#0x20
+ str r0,[r6]
+ b @@return_1
+@@music_lake_guardian:
+ ldr r0,=#0x472
+ strh r0,[r5]
+ mov r0,#0x20
+ str r0,[r6]
+ b @@return_1
+@@music_heatran:
+ ldr r0,=#0x46E
+ strh r0,[r5]
+ mov r0,#0x20
+ str r0,[r6]
+ b @@return_1
+@@music_victini:
+ ldr r0,=#0x478
+ strh r0,[r5]
+ mov r0,#0x20
+ str r0,[r6]
+ b @@return_1
+@@music_zoroark:
+ ldr r0,=#0x469
+ strh r0,[r5]
+ mov r0,#0x24
+ str r0,[r6]
+ b @@return_1
+@@music_volcarona:
+ ldr r0,=#0x469
+ strh r0,[r5]
+ mov r0,#0x20
+ str r0,[r6]
+ b @@return_1
+@@music_musketeer:
+ ldr r0,=#0x478
+ strh r0,[r5]
+ mov r0,#0x23
+ str r0,[r6]
+ b @@return_1
+@@music_genies:
+ ldr r0,=#0x477
+ strh r0,[r5]
+ mov r0,#0x22
+ str r0,[r6]
+ b @@return_1
+@@music_reshiram:
+ ldr r0,=#0x474
+ strh r0,[r5]
+ mov r0,#0x21
+ str r0,[r6]
+ b @@return_1
+@@music_zekrom:
+ ldr r0,=#0x475
+ strh r0,[r5]
+ mov r0,#0x21
+ str r0,[r6]
+ b @@return_1
+@@music_kyurem_w:
+ ldr r0,=#0x4E7 ; 4E7 = W, 4E8 = B
+ strh r0,[r5]
+ mov r0,#0x21
+ str r0,[r6]
+ b @@return_1
+@@music_kyurem:
+ ldr r0,=#0x476
+ strh r0,[r5]
+ mov r0,#0x21
+ str r0,[r6]
+ b @@return_1
+@@return_1:
+ mov r0,#0x1
+@@subr_end:
+ pop r1
+ bx r1
+
+ .pool
+ .endarea
+
+ .close \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 16:40:30 +0000