pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

rename 'StartMusic' to 'PlayMusic'

Browse Source
This commit is contained in:
yenatch 2013-10-08 13:21:15 -04:00
parent 963fe4808b
commit 789469c465
4 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/trainer_encounters.asm
View File

@ -8,7 +8,7 @@ PlayTrainerEncounterMusic: ; e900a
; play nothing for one frame ; play nothing for one frame
push de push de
ld de, $0000 ; id: Music_Nothing ld de, $0000 ; id: Music_Nothing
call StartMusic call PlayMusic
call DelayFrame call DelayFrame
; play new song ; play new song
call MaxVolume call MaxVolume
@ -17,7 +17,7 @@ PlayTrainerEncounterMusic: ; e900a
ld hl, TrainerEncounterMusic ld hl, TrainerEncounterMusic
add hl, de add hl, de
ld e, [hl] ld e, [hl]
call StartMusic call PlayMusic
ret ret
; e9027 ; e9027

4
engine/credits.asm
View File

@ -223,10 +223,10 @@ ParseCredits: ; 1099aa
ld de, MUSIC_CREDITS ld de, MUSIC_CREDITS
push de push de
ld de, MUSIC_NONE ld de, MUSIC_NONE
call StartMusic call PlayMusic
call DelayFrame call DelayFrame
pop de pop de
call StartMusic call PlayMusic
jp .loop jp .loop
.wait2 .wait2

4
engine/scripting.asm
View File

@ -917,7 +917,7 @@ Script_playmusic: ; 0x97189
; music_pointer (MultiByteParam) ; music_pointer (MultiByteParam)
ld de, $0000 ld de, $0000
call StartMusic call PlayMusic
xor a xor a
ld [$c2a7], a ld [$c2a7], a
call MaxVolume call MaxVolume
@ -925,7 +925,7 @@ Script_playmusic: ; 0x97189
ld e, a ld e, a
call GetScriptByte call GetScriptByte
ld d, a ld d, a
call StartMusic call PlayMusic
ret ret
; 0x971a2 ; 0x971a2

84
main.asm
View File

@ -3055,7 +3055,7 @@ LoadMusicByte: ; 3b86
; 3b97 ; 3b97
StartMusic: ; 3b97 PlayMusic: ; 3b97
; Play music de. ; Play music de.
push hl push hl
@ -3091,7 +3091,7 @@ StartMusic: ; 3b97
; 3bbc ; 3bbc
StartMusic2: ; 3bbc PlayMusic2: ; 3bbc
; Stop playing music, then play music de. ; Stop playing music, then play music de.
push hl push hl
@ -3357,12 +3357,12 @@ Function3cdf: ; 3cdf
jr z, .asm_3cfe jr z, .asm_3cfe
push de push de
ld de, MUSIC_NONE ld de, MUSIC_NONE
call StartMusic call PlayMusic
call DelayFrame call DelayFrame
pop de pop de
ld a, e ld a, e
ld [CurMusic], a ld [CurMusic], a
call StartMusic call PlayMusic
.asm_3cfe .asm_3cfe
pop af pop af
@ -3387,12 +3387,12 @@ Function3d03: ; 3d03
.asm_3d18 .asm_3d18
push de push de
ld de, MUSIC_NONE ld de, MUSIC_NONE
call StartMusic call PlayMusic
call DelayFrame call DelayFrame
pop de pop de
ld a, e ld a, e
ld [CurMusic], a ld [CurMusic], a
call StartMusic call PlayMusic
pop af pop af
pop bc pop bc
pop de pop de
@ -3407,7 +3407,7 @@ Function3d2f: ; 3d2f
xor a xor a
ld [CurMusic], a ld [CurMusic], a
ld de, MUSIC_NONE ld de, MUSIC_NONE
call StartMusic call PlayMusic
call DelayFrame call DelayFrame
xor a xor a
ld [$c2c1], a ld [$c2c1], a
@ -3420,12 +3420,12 @@ Function3d47: ; 3d47
push bc push bc
push af push af
ld de, MUSIC_NONE ld de, MUSIC_NONE
call StartMusic call PlayMusic
call DelayFrame call DelayFrame
ld a, [CurMusic] ld a, [CurMusic]
ld e, a ld e, a
ld d, 0 ld d, 0
call StartMusic call PlayMusic
pop af pop af
pop bc pop bc
pop de pop de
@ -7794,12 +7794,12 @@ Function5ac2: ; 5ac2
Function5ae8: ; 5ae8 Function5ae8: ; 5ae8
ld de, MUSIC_NONE ld de, MUSIC_NONE
call StartMusic call PlayMusic
call DelayFrame call DelayFrame
ld de, MUSIC_MAIN_MENU ld de, MUSIC_MAIN_MENU
ld a, e ld a, e
ld [CurMusic], a ld [CurMusic], a
call StartMusic call PlayMusic
ld a, $12 ld a, $12
ld hl, $5cdc ld hl, $5cdc
rst FarCall rst FarCall
@ -8503,7 +8503,7 @@ OakSpeech: ; 0x5f99
call ClearTileMap call ClearTileMap
ld de, MUSIC_ROUTE_30 ld de, MUSIC_ROUTE_30
call StartMusic call PlayMusic
call Function4a3 call Function4a3
call Function4b6 call Function4b6
@ -9012,7 +9012,7 @@ TitleScreenEntrance: ; 62bc
; Play the title screen music. ; Play the title screen music.
ld de, MUSIC_TITLE ld de, MUSIC_TITLE
call StartMusic call PlayMusic
ld a, $88 ld a, $88
ld [hWY], a ld [hWY], a
@ -14294,13 +14294,13 @@ Functiond0bc: ; d0bc
xor a xor a
ld [MusicFade], a ld [MusicFade], a
ld de, $0000 ld de, $0000
call StartMusic call PlayMusic
call DelayFrame call DelayFrame
call MaxVolume call MaxVolume
ld de, $0013 ld de, $0013
ld a, e ld a, e
ld [CurMusic], a ld [CurMusic], a
call StartMusic call PlayMusic
ld a, $1 ld a, $1
ret ret
@ -19271,7 +19271,7 @@ Function123a7: ; 123a7
Function123bf: ; 123bf Function123bf: ; 123bf
ld de, $000d ld de, $000d
call StartMusic call PlayMusic
jp Function12459 jp Function12459
; 123c8 ; 123c8
@ -30258,7 +30258,7 @@ Function26601: ; 0x26601
call Rate call Rate
push de push de
ld de, MUSIC_NONE ld de, MUSIC_NONE
call StartMusic call PlayMusic
pop de pop de
call PlaySFX call PlaySFX
call Functiona36 call Functiona36
@ -31130,7 +31130,7 @@ Function2805d: ; 2805d
.asm_28091 .asm_28091
ld de, $0000 ld de, $0000
call StartMusic call PlayMusic
ld c, $3 ld c, $3
call DelayFrames call DelayFrames
xor a xor a
@ -31234,13 +31234,13 @@ Function2805d: ; 2805d
ld a, $d3 ld a, $d3
ld [$d103], a ld [$d103], a
ld de, $0000 ld de, $0000
call StartMusic call PlayMusic
ld a, [$ffcb] ld a, [$ffcb]
cp $2 cp $2
ld c, $42 ld c, $42
call z, DelayFrames call z, DelayFrames
ld de, $002b ld de, $002b
call StartMusic call PlayMusic
jp Function287e3 jp Function287e3
; 28177 ; 28177
@ -31273,7 +31273,7 @@ Function28177: ; 28177
.asm_281ae .asm_281ae
ld de, $0000 ld de, $0000
call StartMusic call PlayMusic
ld c, $3 ld c, $3
call DelayFrames call DelayFrames
xor a xor a
@ -31310,7 +31310,7 @@ Function28177: ; 28177
ld a, $1d ld a, $1d
ld [rIE], a ld [rIE], a
ld de, $0000 ld de, $0000
call StartMusic call PlayMusic
call Function287ab call Function287ab
ld hl, $d26b ld hl, $d26b
call Function287ca call Function287ca
@ -31476,7 +31476,7 @@ Function28177: ; 28177
ld a, $d3 ld a, $d3
ld [$d103], a ld [$d103], a
ld de, $0000 ld de, $0000
call StartMusic call PlayMusic
ld a, [$ffcb] ld a, [$ffcb]
cp $2 cp $2
ld c, $42 ld c, $42
@ -31533,7 +31533,7 @@ Function28177: ; 28177
.asm_283a9 .asm_283a9
ld de, $002b ld de, $002b
call StartMusic call PlayMusic
jp Function287e3 jp Function287e3
; 283b2 ; 283b2
@ -33141,7 +33141,7 @@ Function28fa1: ; 28fa1
and a and a
jr nz, .asm_28fca jr nz, .asm_28fca
ld de, MUSIC_EVOLUTION ld de, MUSIC_EVOLUTION
call StartMusic2 call PlayMusic2
.asm_28fca .asm_28fca
call Function29082 call Function29082
jr nc, .asm_28fca jr nc, .asm_28fca
@ -35773,7 +35773,7 @@ PlayBattleMusic: ; 2ee6c
xor a xor a
ld [MusicFade], a ld [MusicFade], a
ld de, MUSIC_NONE ld de, MUSIC_NONE
call StartMusic call PlayMusic
call DelayFrame call DelayFrame
call MaxVolume call MaxVolume
@ -35866,7 +35866,7 @@ PlayBattleMusic: ; 2ee6c
ld de, MUSIC_KANTO_TRAINER_BATTLE ld de, MUSIC_KANTO_TRAINER_BATTLE
.done .done
call StartMusic call PlayMusic
pop bc pop bc
pop de pop de
@ -39376,7 +39376,7 @@ Function3d0be: ; 3d0be
Function3d0ea: ; 3d0ea Function3d0ea: ; 3d0ea
push de push de
ld de, MUSIC_NONE ld de, MUSIC_NONE
call StartMusic call PlayMusic
call DelayFrame call DelayFrame
ld de, MUSIC_WILD_VICTORY ld de, MUSIC_WILD_VICTORY
ld a, [IsInBattle] ld a, [IsInBattle]
@ -39402,7 +39402,7 @@ Function3d0ea: ; 3d0ea
ld de, MUSIC_TRAINER_VICTORY ld de, MUSIC_TRAINER_VICTORY
.asm_3d11e .asm_3d11e
call StartMusic call PlayMusic
.asm_3d121 .asm_3d121
pop de pop de
@ -47187,7 +47187,7 @@ Function421e6: ; 421e6
ld hl, $6094 ld hl, $6094
rst FarCall rst FarCall
ld de, MUSIC_NONE ld de, MUSIC_NONE
call StartMusic call PlayMusic
ld de, SFX_CAUGHT_MON ld de, SFX_CAUGHT_MON
call PlaySFX call PlaySFX
call WaitSFX call WaitSFX
@ -51198,7 +51198,7 @@ Function4d3b1: ; 4d3b1
call Functione51 call Functione51
call Functione5f call Functione5f
ld de, $0054 ld de, $0054
call StartMusic call PlayMusic
ld hl, $5408 ld hl, $5408
call PrintText call PrintText
ld hl, $540d ld hl, $540d
@ -51442,7 +51442,7 @@ Function4d54c: ; 4d54c
call Functione51 call Functione51
call Functione5f call Functione5f
ld de, $0054 ld de, $0054
call StartMusic call PlayMusic
ld hl, $5580 ld hl, $5580
call PrintText call PrintText
ld hl, $5585 ld hl, $5585
@ -52409,7 +52409,7 @@ Function4e607: ; 4e607
ld a, $e4 ld a, $e4
ld [rOBP0], a ld [rOBP0], a
ld de, $0000 ld de, $0000
call StartMusic call PlayMusic
callba Function8cf53 callba Function8cf53
ld de, $6831 ld de, $6831
ld hl, VTiles0 ld hl, VTiles0
@ -52451,7 +52451,7 @@ Function4e607: ; 4e607
.asm_4e67c .asm_4e67c
ld de, $0022 ld de, $0022
call StartMusic call PlayMusic
ld c, $50 ld c, $50
call DelayFrames call DelayFrames
ld c, $1 ld c, $1
@ -53044,7 +53044,7 @@ Function4ea82: ; 4ea82
and a and a
ret nz ret nz
ld de, $0000 ld de, $0000
call StartMusic call PlayMusic
call ClearTileMap call ClearTileMap
ld hl, $6b76 ld hl, $6b76
ld de, $d000 ld de, $d000
@ -57787,7 +57787,7 @@ Function84742: ; 84742
Function8474c: ; 8474c Function8474c: ; 8474c
ld de, MUSIC_PRINTER ld de, MUSIC_PRINTER
call StartMusic2 call PlayMusic2
ret ret
; 84753 ; 84753
@ -58115,10 +58115,10 @@ Function8648e: ; 8648e
Function864b4: ; 864b4 Function864b4: ; 864b4
push de push de
ld de, $0000 ld de, $0000
call StartMusic call PlayMusic
call DelayFrame call DelayFrame
pop de pop de
call StartMusic call PlayMusic
ret ret
; 864c3 ; 864c3
@ -62576,7 +62576,7 @@ Function8ccc9: ; 8ccc9
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
ld de, MUSIC_MAGNET_TRAIN ld de, MUSIC_MAGNET_TRAIN
call StartMusic2 call PlayMusic2
ret ret
; 8cd27 ; 8cd27
@ -71501,7 +71501,7 @@ Functione455c: ; e455c
Functione4579: ; e4579 Functione4579: ; e4579
ld de, MUSIC_NONE ld de, MUSIC_NONE
call StartMusic call PlayMusic
call WhiteBGMap call WhiteBGMap
call ClearTileMap call ClearTileMap
ld a, $98 ld a, $98
@ -71743,7 +71743,7 @@ Functione48bc: ; e48bc
.asm_e48db .asm_e48db
ld de, $0000 ld de, $0000
call StartMusic call PlayMusic
.asm_e48e1 .asm_e48e1
call WhiteBGMap call WhiteBGMap
@ -83289,7 +83289,7 @@ Function17d2ce: ; 17d2ce
ld [MusicFadeIDLo], a ld [MusicFadeIDLo], a
ld a, d ld a, d
ld [MusicFadeIDHi], a ld [MusicFadeIDHi], a
call StartMusic call PlayMusic
call Function222a call Function222a
call Function2b3c call Function2b3c
ret ret