You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
new and updated music macros
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -975,11 +975,7 @@ Function106453: ; 106453
|
||||
ret
|
||||
; 106462
|
||||
|
||||
Function106462: ; 106462
|
||||
ret
|
||||
; 106463
|
||||
|
||||
Function106463: ; 106463
|
||||
MobileFunc_106462: mobile
|
||||
ret
|
||||
; 106464
|
||||
|
||||
|
||||
@@ -328,7 +328,7 @@ Function10824b: ; 10824b
|
||||
ld [hWY], a
|
||||
call LoadStandardFont
|
||||
call LoadFontsBattleExtra
|
||||
callba Function106462
|
||||
callba MobileFunc_106462
|
||||
callba Function106464
|
||||
scf
|
||||
ret
|
||||
|
||||
@@ -5755,9 +5755,9 @@ Function1161d5: ; 1161d5
|
||||
ld [MusicFade], a
|
||||
ld de, MUSIC_MOBILE_ADAPTER
|
||||
ld a, e
|
||||
ld [wc2a9], a
|
||||
ld [MusicFadeIDLo], a
|
||||
ld a, d
|
||||
ld [wc2aa], a
|
||||
ld [MusicFadeIDHi], a
|
||||
ld a, [wc314 + 5]
|
||||
inc a
|
||||
ld [wc314 + 5], a
|
||||
@@ -5934,10 +5934,10 @@ Function11636e: ; 11636e
|
||||
callba ReloadMapPart
|
||||
ld a, $8
|
||||
ld [MusicFade], a
|
||||
ld a, [wc2c0]
|
||||
ld [wc2a9], a
|
||||
ld a, [wMapMusic]
|
||||
ld [MusicFadeIDLo], a
|
||||
xor a
|
||||
ld [wc2aa], a
|
||||
ld [MusicFadeIDHi], a
|
||||
xor a
|
||||
ld [wc314 + 5], a
|
||||
ld [wc30d], a
|
||||
@@ -5981,19 +5981,19 @@ Function1163c0: ; 1163c0
|
||||
jr z, .asm_11642a
|
||||
ld a, $8
|
||||
ld [MusicFade], a
|
||||
ld a, [wc2c0]
|
||||
ld [wc2a9], a
|
||||
ld a, [wMapMusic]
|
||||
ld [MusicFadeIDLo], a
|
||||
xor a
|
||||
ld [wc2aa], a
|
||||
ld [MusicFadeIDHi], a
|
||||
jr .asm_116439
|
||||
|
||||
.asm_11642a
|
||||
ld a, $8
|
||||
ld [MusicFade], a
|
||||
ld a, $0
|
||||
ld [wc2a9], a
|
||||
ld [MusicFadeIDLo], a
|
||||
ld a, $0
|
||||
ld [wc2aa], a
|
||||
ld [MusicFadeIDHi], a
|
||||
|
||||
.asm_116439
|
||||
xor a
|
||||
@@ -6009,10 +6009,10 @@ Function116441: ; 116441
|
||||
callba ReloadMapPart
|
||||
ld a, $8
|
||||
ld [MusicFade], a
|
||||
ld a, [wc2c0]
|
||||
ld [wc2a9], a
|
||||
ld a, [wMapMusic]
|
||||
ld [MusicFadeIDLo], a
|
||||
xor a
|
||||
ld [wc2aa], a
|
||||
ld [MusicFadeIDHi], a
|
||||
xor a
|
||||
ld [wc314 + 5], a
|
||||
ld [wc30d], a
|
||||
|
||||
@@ -489,7 +489,7 @@ Function1183cb: ; 1183cb
|
||||
ld [hFFC9], a
|
||||
ld [hMobile], a
|
||||
ei
|
||||
callba Function106462
|
||||
callba MobileFunc_106462
|
||||
callba Function106464
|
||||
callba Function115d99
|
||||
callba Function11615a
|
||||
@@ -4565,7 +4565,7 @@ Function11a00e: ; 11a00e
|
||||
call BackUpTiles
|
||||
callba Function11765d
|
||||
callba Function117ab4
|
||||
callba Function106462
|
||||
callba MobileFunc_106462
|
||||
callba Function106464
|
||||
call ExitMenu
|
||||
callba ReloadMapPart
|
||||
@@ -4588,7 +4588,7 @@ Function11a0ca: ; 11a0ca
|
||||
call BackUpTiles
|
||||
callba Function11765d
|
||||
callba Function17d3f6
|
||||
callba Function106462
|
||||
callba MobileFunc_106462
|
||||
callba Function106464
|
||||
call ExitMenu
|
||||
callba ReloadMapPart
|
||||
@@ -5691,7 +5691,7 @@ Function11a9ce: ; 11a9ce
|
||||
call ClearBGPalettes
|
||||
call Function2bae
|
||||
call Call_ExitMenu
|
||||
callba Function106462
|
||||
callba MobileFunc_106462
|
||||
callba Function106464
|
||||
call Functiond90
|
||||
callba Function2b5c
|
||||
|
||||
@@ -715,7 +715,7 @@ Function171c41: ; 171c41 (5c:5c41)
|
||||
dec [hl]
|
||||
ret nz
|
||||
call ClearBGPalettes
|
||||
callba Function106462
|
||||
callba MobileFunc_106462
|
||||
callba Function106464
|
||||
ld a, $2
|
||||
ld [wc303], a
|
||||
|
||||
@@ -802,7 +802,7 @@ Function17d48d: ; 17d48d
|
||||
jr z, .asm_17d4e0
|
||||
ld a, e
|
||||
ld [wcd6c], a
|
||||
ld [wc2c0], a
|
||||
ld [wMapMusic], a
|
||||
ld d, $0
|
||||
call PlayMusic2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user