diff options
| author | yenatch <yenatch@gmail.com> | 2013-10-08 13:10:36 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-10-08 13:10:36 -0400 |
| commit | 546c17ad37b1e0cfd91ea630e0bbc044c28b3e6a (patch) | |
| tree | bf0d8bdf9e0f1b29e4693068922bcda5d98d0b18 | |
| parent | 4ac678313f9c7b9d28774a1a936b8de64350b478 (diff) | |
rename 'StartSFX' to 'PlaySFX'
| -rw-r--r-- | engine/scripting.asm | 6 | ||||
| -rw-r--r-- | engine/title.asm | 2 | ||||
| -rw-r--r-- | home/joypad.asm | 2 | ||||
| -rw-r--r-- | home/menu.asm | 2 | ||||
| -rw-r--r-- | home/text.asm | 2 | ||||
| -rw-r--r-- | main.asm | 138 |
6 files changed, 76 insertions, 76 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index 39a56950e..06364a27c 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -588,7 +588,7 @@ Script_specialsound: ; 0x96fe4 jr z, .play ld de, SFX_ITEM .play - call StartSFX + call PlaySFX call WaitSFX ret ; 0x96ffe @@ -954,7 +954,7 @@ Script_playsound: ; 0x971b7 ld e, a call GetScriptByte ld d, a - call StartSFX + call PlaySFX ret ; 0x971c3 @@ -971,7 +971,7 @@ Script_warpsound: ; 0x971c7 ld a, $5 ld hl, $4a07 rst $8 - call StartSFX + call PlaySFX ret ; 0x971d1 diff --git a/engine/title.asm b/engine/title.asm index 3772b052f..97428430c 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -225,7 +225,7 @@ _TitleScreen: ; 10ed67 ; Play starting sound effect call SFXChannelsOff ld de, SFX_TITLE_SCREEN_ENTRANCE - call StartSFX + call PlaySFX ret ; 10eea7 diff --git a/home/joypad.asm b/home/joypad.asm index 198e1c47b..efe70e809 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -394,7 +394,7 @@ Functionaaf: ; aaf call Functionac6 push de ld de, SFX_READ_TEXT_2 - call StartSFX + call PlaySFX pop de ret diff --git a/home/menu.asm b/home/menu.asm index c761a927c..b3a3de377 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -532,7 +532,7 @@ Function1ff8: ; 1ff8 PlayClickSFX: ; 2009 push de ld de, SFX_READ_TEXT_2 - call StartSFX + call PlaySFX pop de ret ; 0x2012 diff --git a/home/text.asm b/home/text.asm index e010de6d4..d5123b849 100644 --- a/home/text.asm +++ b/home/text.asm @@ -1091,7 +1091,7 @@ Text_PlaySound:: ; 1500 ld e, [hl] inc hl ld d, [hl] - call StartSFX + call PlaySFX call WaitSFX pop de @@ -3183,7 +3183,7 @@ PlayCryHeader: ; 3be3 ; 3c23 -StartSFX: ; 3c23 +PlaySFX: ; 3c23 ; Play sound effect de. ; Sound effects are ordered by priority (lowest to highest) @@ -3225,7 +3225,7 @@ StartSFX: ; 3c23 WaitPlaySFX: ; 3c4e call WaitSFX - call StartSFX + call PlaySFX ret ; 3c55 @@ -5238,7 +5238,7 @@ Function48b3: ; 48b3 call Function6ec1 jr c, .asm_48eb ld de, SFX_STRENGTH - call StartSFX + call PlaySFX call Function5538 call Function463f ld hl, $0009 @@ -8695,7 +8695,7 @@ Function610f: ; 610f ld [MusicFadeIDHi], a ld de, SFX_ESCAPE_ROPE - call StartSFX + call PlaySFX pop af rst Bankswitch @@ -9554,7 +9554,7 @@ UnknownText_0x6684: ; 6684 ; 6689 push de ld de, SFX_SWITCH_POKEMON - call StartSFX + call PlaySFX pop de ld hl, UnknownText_0x6695 ret @@ -13213,7 +13213,7 @@ UnknownText_0xc8f3: ; 0xc8f3 Functionc8f8: ; c8f8 call WaitSFX ld de, SFX_FLASH - call StartSFX + call PlaySFX call WaitSFX ld hl, UnknownText_0xc908 ret @@ -16213,7 +16213,7 @@ Functiondd21: ; dd21 ld a, [BreedMon1Species] ld [CurPartySpecies], a ld de, $0022 - call StartSFX + call PlaySFX call WaitSFX call Functione698 ld a, b @@ -16229,7 +16229,7 @@ Functiondd42: ; dd42 ld a, [BreedMon2Species] ld [CurPartySpecies], a ld de, $0022 - call StartSFX + call PlaySFX call WaitSFX call Functione6b3 ld a, b @@ -18064,7 +18064,7 @@ Function1076f: ; 1076f ld [$cf63], a push de ld de, SFX_UNKNOWN_62 - call StartSFX + call PlaySFX pop de scf ret @@ -18076,7 +18076,7 @@ Function1076f: ; 1076f ld [$cf63], a push de ld de, SFX_UNKNOWN_62 - call StartSFX + call PlaySFX pop de scf ret @@ -19260,7 +19260,7 @@ Function123a7: ; 123a7 call Function124a3 push de ld de, $0012 - call StartSFX + call PlaySFX pop de ld c, $1e call DelayFrames @@ -19277,11 +19277,11 @@ Function123bf: ; 123bf Function123c8: ; 123c8 ld de, $00aa - call StartSFX + call PlaySFX call Function12459 call WaitSFX ld de, $000d - call StartSFX + call PlaySFX ret ; 123db @@ -19507,7 +19507,7 @@ StartMenu: ; 125cd call Function1fbf ld de, SFX_MENU - call StartSFX + call PlaySFX callba Function6454 @@ -21105,10 +21105,10 @@ Function130c6: ; 130c6 .asm_13113 ld de, $0020 - call StartSFX + call PlaySFX call WaitSFX ld de, $0020 - call StartSFX + call PlaySFX call WaitSFX ld hl, $c4c9 ld bc, $0812 @@ -25026,7 +25026,7 @@ Function15650: ; 15650 and a ret nz ld de, $000f - call StartSFX + call PlaySFX ld hl, $5663 call Function15a20 scf @@ -25058,7 +25058,7 @@ Function156d0: ; 156d0 push de call WaitSFX pop de - call StartSFX + call PlaySFX ret ; 156d9 @@ -26260,7 +26260,7 @@ UnknownText_0x15fbe: ; 0x15fbe Function15fc3: ; 15fc3 call WaitSFX ld de, SFX_TRANSACTION - call StartSFX + call PlaySFX ret ; 15fcd @@ -26804,7 +26804,7 @@ Function16936: ; 16936 ld hl, $6998 call PrintText ld de, $0096 - call StartSFX + call PlaySFX ld c, $78 call DelayFrames ld hl, $699d @@ -29630,7 +29630,7 @@ Function24d59: ; 24d59 set 6, [hl] call Function1bc9 ld de, SFX_READ_TEXT_2 - call StartSFX + call PlaySFX ld a, [hJoyPressed] bit 0, a ; A jr nz, .asm_24d84 @@ -29853,7 +29853,7 @@ Function24e99: ; 24e99 set 6, [hl] call Function1bc9 ld de, SFX_READ_TEXT_2 - call StartSFX + call PlaySFX ld a, [hJoyPressed] bit 1, a jr z, .asm_24ed2 @@ -30248,7 +30248,7 @@ ProfOaksPCBoot ; 0x265ee ld hl, OakPCText2 call PrintText call Rate - call StartSFX ; sfx loaded by previous Rate function call + call PlaySFX ; sfx loaded by previous Rate function call call Functiona36 call WaitSFX ret @@ -30260,7 +30260,7 @@ Function26601: ; 0x26601 ld de, MUSIC_NONE call StartMusic pop de - call StartSFX + call PlaySFX call Functiona36 call WaitSFX ret @@ -35398,7 +35398,7 @@ Function2c547: ; 2c547 call Function2c5f9 call WaitSFX ld de, $0097 - call StartSFX + call PlaySFX call WaitSFX ld hl, $45db call PrintText @@ -35526,7 +35526,7 @@ Function2c7fb: ; 2c7fb push bc push af ld de, SFX_WRONG - call StartSFX + call PlaySFX call WaitSFX pop af pop bc @@ -36252,7 +36252,7 @@ Function38387: ; 38387 Function3839a: ; 3839a push de ld de, SFX_FULL_HEAL - call StartSFX + call PlaySFX pop de ret ; 383a3 @@ -36918,7 +36918,7 @@ Function3c0e5: ; 3c0e5 jr c, .asm_3c126 ld de, SFX_RUN - call StartSFX + call PlaySFX .asm_3c126 call SetPlayerTurn @@ -39076,10 +39076,10 @@ Function3cef1: ; 3cef1 Function3cf14: ; 3cf14 call WaitSFX ld de, SFX_KINESIS - call StartSFX + call PlaySFX call Function3d432 ld de, SFX_UNKNOWN_2A - call StartSFX + call PlaySFX hlcoord 1, 0 ld bc, $040a call ClearBox @@ -39753,7 +39753,7 @@ Function3d362: ; 3d362 call Function3d2e0 ret c ld de, SFX_WRONG - call StartSFX + call PlaySFX call WaitSFX jr .asm_3d362 ; 3d375 @@ -41105,10 +41105,10 @@ Function3dc5b: ; 3dc5b or [hl] jr nz, .asm_3dce4 ld de, SFX_KINESIS - call StartSFX + call PlaySFX call WaitSFX ld de, SFX_UNKNOWN_2A - call StartSFX + call PlaySFX call WaitSFX call Function3d432 ld hl, BattleText_0x809a8 @@ -44368,7 +44368,7 @@ Function3ee3b: ; 3ee3b cp b jr z, .asm_3f057 ld de, SFX_HIT_END_OF_EXP_BAR - call StartSFX + call PlaySFX call WaitSFX ld hl, BattleText_0x80c9c call StdBattleTextBox @@ -44618,7 +44618,7 @@ Function3f136: ; 3f136 call CopyBytes call Function3dfe ld de, SFX_HIT_END_OF_EXP_BAR - call StartSFX + call PlaySFX ld a, $23 ld hl, $679d rst FarCall @@ -44655,7 +44655,7 @@ Function3f21b: ; 3f21b push bc call WaitSFX ld de, SFX_EXP_BAR - call StartSFX + call PlaySFX ld c, 10 call DelayFrames pop bc @@ -46237,7 +46237,7 @@ BattleStartMessage: ; 3fc8b jr z, .asm_3fcaa ld de, SFX_SHINE - call StartSFX + call PlaySFX call WaitSFX ld c, 20 @@ -46372,7 +46372,7 @@ Function40000: ; 40000 .asm_4003b ld de, SFX_READ_TEXT_2 - call StartSFX + call PlaySFX call WaitSFX call ClearSprites ld a, [$c7d4] @@ -47189,7 +47189,7 @@ Function421e6: ; 421e6 ld de, MUSIC_NONE call StartMusic ld de, SFX_CAUGHT_MON - call StartSFX + call PlaySFX call WaitSFX ld c, $28 call DelayFrames @@ -48654,7 +48654,7 @@ Function492b9: ; 492b9 jr nz, .asm_492e5 push de ld de, SFX_WRONG - call StartSFX + call PlaySFX pop de ld a, $b ld hl, $48ce @@ -49990,7 +49990,7 @@ Function4a94e: ; 4a94e .asm_4a9b0 ld de, $0019 - call StartSFX + call PlaySFX ld hl, $69be call PrintText jr .asm_4a974 @@ -50253,7 +50253,7 @@ Function4ab1a: ; 4ab1a ld a, [hl] ld [CurPartySpecies], a ld de, $0008 - call StartSFX + call PlaySFX call WaitSFX ld a, $1 and a @@ -50264,7 +50264,7 @@ Function4ab1a: ; 4ab1a ld [$d0d8], a .asm_4ab73 ld de, $0008 - call StartSFX + call PlaySFX call WaitSFX scf ret @@ -50276,7 +50276,7 @@ Function4ab1a: ; 4ab1a cp $2 jr z, .asm_4ab73 ld de, $0008 - call StartSFX + call PlaySFX call WaitSFX xor a ld [$d018], a @@ -50478,7 +50478,7 @@ Function4acaa: ; 4acaa set 6, [hl] call Function1bc9 ld de, $0008 - call StartSFX + call PlaySFX ld a, [hJoyPressed] bit 0, a jr nz, .asm_4acf4 @@ -52315,7 +52315,7 @@ EggStatsScreen: ; 4e33a cp 6 ret nc ld de, SFX_2_BOOPS - call StartSFX + call PlaySFX ret ; 0x4e3c0 @@ -52634,7 +52634,7 @@ Function4e7a6: ; 4e7a6 and a ret nz ld de, SFX_EVOLVED - call StartSFX + call PlaySFX ld hl, $cf63 ld a, [hl] push af @@ -54149,14 +54149,14 @@ PartyMenuSelect: ; 0x50457 ld [CurPartySpecies], a ld de, SFX_READ_TEXT_2 - call StartSFX + call PlaySFX call WaitSFX and a ret .exitmenu ld de, SFX_READ_TEXT_2 - call StartSFX + call PlaySFX call WaitSFX scf ret @@ -54348,7 +54348,7 @@ Function5062e: ; 5062e Function50658: ; 50658 ld de, SFX_POISON - call StartSFX + call PlaySFX ld b, $2 ld a, $2e call Predef @@ -56844,7 +56844,7 @@ TryJumpLedge: ; 801f3 jr z, .DontJump ld de, SFX_JUMP_OVER_LEDGE - call StartSFX + call PlaySFX ld a, STEP_LEDGE call DoStep ld a, 7 @@ -57247,7 +57247,7 @@ PlayBump: ; 803ee call CheckSFX ret c ld de, SFX_BUMP - call StartSFX + call PlaySFX ret ; 803f9 @@ -60379,7 +60379,7 @@ Function89a57: ; 89a57 Function89a8a: ; 89a8a push af ld de, $0062 - call StartSFX + call PlaySFX pop af ret ; 89a93 @@ -61078,7 +61078,7 @@ Function8afd4: ; 8afd4 .asm_8b051 ld de, $0022 - call StartSFX + call PlaySFX ld hl, $707c .asm_8b05a @@ -62358,7 +62358,7 @@ INCBIN "baserom.gbc", $8c6f7, $8c7d4 - $8c6f7 Function8c7d4: ; 8c7d4 call WaitSFX ld de, $0053 - call StartSFX + call PlaySFX call WaitSFX ret ; 8c7e1 @@ -62372,7 +62372,7 @@ Function8c940: ; 8c940 call Function8c96d call WaitSFX ld de, $001e - call StartSFX + call PlaySFX .asm_8c952 ld a, [$cf63] bit 7, a @@ -63687,7 +63687,7 @@ Function9031d: ; 9031d ld hl, UnknownText_0x9032a call PrintText ld de, SFX_HANG_UP - call StartSFX + call PlaySFX ret ; 9032a @@ -63717,7 +63717,7 @@ Function9033b: ; 9033b Function9033f: ; 9033f call WaitSFX ld de, SFX_CALL - call StartSFX + call PlaySFX call Function90375 call Function1ad2 ld a, $13 @@ -65931,7 +65931,7 @@ CheckAPressOW: ; 96999 PlayTalkObject: ; 969ac push de ld de, SFX_READ_TEXT_2 - call StartSFX + call PlaySFX pop de ret ; 969b5 @@ -68675,7 +68675,7 @@ Functioncc881: ; cc881 ld de, $00ab .asm_cc8a0 - call StartSFX + call PlaySFX ret ; cc8a4 @@ -70971,7 +70971,7 @@ _OptionsMenu: ; e41d0 .asm_e4234 ld de, SFX_TRANSACTION - call StartSFX + call PlaySFX call WaitSFX pop af ld [$ffaa], a @@ -71664,7 +71664,7 @@ Functione468d: ; e468d call CopyBytes call Functione4687 ld de, SFX_GAME_FREAK_PRESENTS - call StartSFX + call PlaySFX ret ; e46af @@ -75593,7 +75593,7 @@ Function100902: ; 100902 ld de, StringBuffer2 call PrintNum ld de, SFX_TWO_PC_BEEPS - call StartSFX + call PlaySFX callba Function104061 ld c, $3c call DelayFrames @@ -75604,7 +75604,7 @@ Function100902: ; 100902 ld hl, $c580 call PlaceString ld de, SFX_4_NOTE_DITTY - call StartSFX + call PlaySFX callba Function104061 ld c, $78 call DelayFrames @@ -76131,14 +76131,14 @@ Function100cb5: ; 100cb5 ld a, [hl] ld [CurPartySpecies], a ld de, SFX_READ_TEXT_2 - call StartSFX + call PlaySFX call WaitSFX and a ret .asm_100d17 ld de, SFX_READ_TEXT_2 - call StartSFX + call PlaySFX call WaitSFX scf ret @@ -76172,7 +76172,7 @@ Function100d22: ; 100d22 .asm_100d56 push af ld de, SFX_READ_TEXT_2 - call StartSFX + call PlaySFX pop af bit 1, a jr z, .asm_100d65 @@ -76343,7 +76343,7 @@ Function100e63: ; 100e63 call Function100db0 ret nc ld de, SFX_ELEVATOR_END - call StartSFX + call PlaySFX ret ; 100e72 @@ -76664,7 +76664,7 @@ Function102142: ; 102142 ld hl, $61d1 call Function1d4f ld de, $0090 - call StartSFX + call PlaySFX call Functiona36 call Function1c07 call Function10219f |