buttonsound

This commit is contained in:
PikalaxALT 2015-11-29 22:29:45 -05:00
parent b8dcccd0da
commit 0eb0c40ba7
132 changed files with 2154 additions and 2154 deletions

View File

@ -875,7 +875,7 @@ Special_DayCareMon1: ; 17421
ld a, [wDaycareLady]
bit 0, a
jr z, Function1745f
call KeepTextOpen
call ButtonSound
ld hl, wBreedMon2Nick
call Function1746c
jp PrintText
@ -888,7 +888,7 @@ Special_DayCareMon2: ; 17440
ld a, [wDaycareMan]
bit 0, a
jr z, Function1745f
call KeepTextOpen
call ButtonSound
ld hl, wBreedMon1Nick
call Function1746c
jp PrintText

View File

@ -18,17 +18,17 @@ BuenaPhoneScript_CheckTimeOfDay1:
checkday
iftrue .day
writetext UnknownText_0xa0d42
keeptextopen
buttonsound
end
.morn:
writetext UnknownText_0xa0c28
keeptextopen
buttonsound
end
.day:
writetext UnknownText_0xa0c72
keeptextopen
buttonsound
end
BuenaPhoneScript_AfterMidnight1:
@ -43,22 +43,22 @@ BuenaPhoneScript_CheckTimeOfDay2:
checkday
iftrue .day
writetext UnknownText_0xa0e29
keeptextopen
buttonsound
end
.morn:
writetext UnknownText_0xa0d96
keeptextopen
buttonsound
end
.day:
writetext UnknownText_0xa0dcf
keeptextopen
buttonsound
end
BuenaPhoneScript_AfterMidnight2:
writetext UnknownText_0xa0e01
keeptextopen
buttonsound
end
BuenaPhoneScript_Rocket:

View File

@ -4,7 +4,7 @@ FruitTreeScript:: ; 44000
copybytetovar CurFruit
itemtotext $0, $0
writetext FruitBearingTreeText
keeptextopen
buttonsound
callasm TryResetFruitTrees
callasm CheckFruitTree
iffalse .fruit
@ -17,7 +17,7 @@ FruitTreeScript:: ; 44000
copybytetovar CurFruit
giveitem ITEM_FROM_MEM
iffalse .packisfull
keeptextopen
buttonsound
writetext ObtainedFruitText
callasm PickedFruitTree
specialsound
@ -25,7 +25,7 @@ FruitTreeScript:: ; 44000
jump .end
.packisfull
keeptextopen
buttonsound
writetext FruitPackIsFullText
waitbutton

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -157,7 +157,7 @@ IF _CRYSTAL
ENDC
dw Script_jumptext
dw Script_waitbutton
dw Script_keeptextopen
dw Script_buttonsound
dw Script_pokepic
dw Script_closepokepic
dw Script_interpretmenu
@ -438,7 +438,7 @@ Script_waitbutton: ; 96ed9
jp WaitButton
; 96edc
Script_keeptextopen: ; 96edc
Script_buttonsound: ; 96edc
; script command 0x55
ld a, [hOAMUpdate]
@ -446,7 +446,7 @@ Script_keeptextopen: ; 96edc
ld a, $1
ld [hOAMUpdate], a
call WaitBGMap
call KeepTextOpen
call ButtonSound
pop af
ld [hOAMUpdate], a
ret
@ -583,7 +583,7 @@ GiveItemScript: ; 96f77
end
.Full
keeptextopen
buttonsound
pocketisfull
end
; 96f89

View File

@ -68,33 +68,33 @@ PokeCenterNurseScript:
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .morn_comcenter
farwritetext UnknownText_0x1b0000
keeptextopen
buttonsound
jump .ok
.morn_comcenter
farwritetext UnknownText_0x1b008a
keeptextopen
buttonsound
jump .ok
.day
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .day_comcenter
farwritetext UnknownText_0x1b002b
keeptextopen
buttonsound
jump .ok
.day_comcenter
farwritetext UnknownText_0x1b00d6
keeptextopen
buttonsound
jump .ok
.nite
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .nite_comcenter
farwritetext UnknownText_0x1b004f
keeptextopen
buttonsound
jump .ok
.nite_comcenter
farwritetext UnknownText_0x1b011b
keeptextopen
buttonsound
jump .ok
.ok
@ -326,20 +326,20 @@ BugContestResultsScript:
if_equal 2, BugContestResults_SecondPlace
if_equal 3, BugContestResults_ThirdPlace
farwritetext ContestResults_ConsolationPrizeText
keeptextopen
buttonsound
waitsfx
verbosegiveitem BERRY
iffalse BugContestResults_NoRoomForBerry
BugContestResults_DidNotWin
farwritetext ContestResults_DidNotWinText
keeptextopen
buttonsound
jump BugContestResults_FinishUp
; 0xbc2b1
BugContestResults_ReturnAfterWinnersPrize ; 0xbc2b1
farwritetext ContestResults_JoinUsNextTimeText
keeptextopen
buttonsound
BugContestResults_FinishUp
checkevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
@ -412,28 +412,28 @@ BugContestResults_ThirdPlace ; 0xbc343
BugContestResults_NoRoomForSunStone ; 0xbc354
farwritetext UnknownText_0x1b08cc
keeptextopen
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc35f
BugContestResults_NoRoomForEverstone ; 0xbc35f
farwritetext UnknownText_0x1b08cc
keeptextopen
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc36a
BugContestResults_NoRoomForGoldBerry ; 0xbc36a
farwritetext UnknownText_0x1b08cc
keeptextopen
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc375
BugContestResults_NoRoomForBerry ; 0xbc375
farwritetext UnknownText_0x1b08cc
keeptextopen
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_BERRY
jump BugContestResults_DidNotWin
; 0xbc380
@ -794,7 +794,7 @@ RegisteredNumberMScript:
farwritetext RegisteredNumber1Text
playsound SFX_REGISTER_PHONE_NUMBER
waitsfx
keeptextopen
buttonsound
end
NumberAcceptedMScript:
@ -1287,31 +1287,31 @@ GiftMScript:
.Jose
farwritetext JoseGiftText
keeptextopen
buttonsound
end
.Wade
farwritetext WadeGiftText
keeptextopen
buttonsound
end
.Alan
farwritetext AlanGiftText
keeptextopen
buttonsound
end
.Derek
farwritetext DerekGiftText
keeptextopen
buttonsound
end
.Tully
farwritetext TullyGiftText
keeptextopen
buttonsound
end
.Wilton
farwritetext WiltonGiftText
keeptextopen
buttonsound
end
.Kenji
farwritetext KenjiGiftText
keeptextopen
buttonsound
end
PackFullMScript:
@ -1394,19 +1394,19 @@ RematchGiftMScript:
.Huey
farwritetext HueyRematchGiftText
keeptextopen
buttonsound
end
.Joey
farwritetext JoeyRematchGiftText
keeptextopen
buttonsound
end
.Vance
farwritetext VanceRematchGiftText
keeptextopen
buttonsound
end
.Parry
farwritetext ParryRematchGiftText
keeptextopen
buttonsound
end
AskNumber1FScript:
@ -1485,7 +1485,7 @@ RegisteredNumberFScript:
farwritetext RegisteredNumber2Text
playsound SFX_REGISTER_PHONE_NUMBER
waitsfx
keeptextopen
buttonsound
end
NumberAcceptedFScript: ; 0xbcbd3
@ -1699,19 +1699,19 @@ GiftFScript:
.Beverly
farwritetext BeverlyGiftText
keeptextopen
buttonsound
end
.Gina
farwritetext GinaGiftText
keeptextopen
buttonsound
end
.Dana
farwritetext DanaGiftText
keeptextopen
buttonsound
end
.Tiffany
farwritetext TiffanyGiftText
keeptextopen
buttonsound
end
PackFullFScript:
@ -1755,7 +1755,7 @@ RematchGiftFScript:
.Erin
loadfont
farwritetext ErinRematchGiftText
keeptextopen
buttonsound
end
GymStatue1Script:
@ -1770,7 +1770,7 @@ GymStatue2Script:
mapnametotext $0
loadfont
farwritetext GymStatue_CityGymText
keeptextopen
buttonsound
farwritetext GymStatue_WinningTrainersText
waitbutton
closetext
@ -1796,7 +1796,7 @@ GameCornerCoinVendorScript: ; 0xbcdcd
faceplayer
loadfont
farwritetext CoinVendor_WelcomeText
keeptextopen
buttonsound
checkitem COIN_CASE
iftrue CoinVendor_IntroScript
farwritetext CoinVendor_NoCoinCaseText

View File

@ -392,7 +392,7 @@ SimpleWaitPressAorB:: ; aa5
ret
; aaf
KeepTextOpen:: ; aaf
ButtonSound:: ; aaf
ld a, [wLinkMode]
and a
jr nz, .link

View File

@ -538,7 +538,7 @@ Paragraph:: ; 12f2
.linkbattle
call Function13b6
call KeepTextOpen
call ButtonSound
hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY
lb bc, TEXTBOX_INNERH - 1, TEXTBOX_INNERW
call ClearBox
@ -561,7 +561,7 @@ Char4B:: ; 131f
call Function13b6
push de
call KeepTextOpen
call ButtonSound
pop de
ld a, [wLinkMode]
@ -611,7 +611,7 @@ PromptText:: ; 135a
.ok
call Function13b6
call KeepTextOpen
call ButtonSound
ld a, [wLinkMode]
cp LINK_COLOSSEUM
jr z, DoneText
@ -934,7 +934,7 @@ Text_WAIT_BUTTON:: ; 149f
push hl
call LoadBlinkingCursor
push bc
call KeepTextOpen
call ButtonSound
pop bc
call UnloadBlinkingCursor
pop hl
@ -1101,7 +1101,7 @@ Text_0D:: ; 1562
; display arrow
push hl
push bc
call KeepTextOpen
call ButtonSound
pop bc
pop hl
ret

View File

@ -564,9 +564,9 @@ waitbutton: macro
db waitbutton_command
endm
enum keeptextopen_command
keeptextopen: macro
db keeptextopen_command
enum buttonsound_command
buttonsound: macro
db buttonsound_command
endm
enum pokepic_command

View File

@ -8658,7 +8658,7 @@ SignpostItemScript:: ; 0x13625
; 0x1363e
.bag_full: ; 0x1363e
keeptextopen
buttonsound
writetext .no_room_text
waitbutton
@ -22604,7 +22604,7 @@ Function10424e: ; 10424e (41:424e)
ret
Function10425f: ; 10425f (41:425f)
ld c, $7f
ld c, " "
jr Function104265
Function104263: ; 104263 (41:4263)

View File

@ -42,7 +42,7 @@ BugsyScript:
setevent EVENT_BEAT_BUG_CATCHER_AL
setevent EVENT_BEAT_BUG_CATCHER_JOSH
writetext BugsyText_HiveBadgeSpeech
keeptextopen
buttonsound
verbosegiveitem TM_FURY_CUTTER
iffalse .NoRoomForFuryCutter
setevent EVENT_GOT_TM49_FURY_CUTTER

View File

@ -163,10 +163,10 @@ UnknownScript_0x1980e5:
applymovement PLAYER, MovementData_0x198148
loadfont
writetext UnknownText_0x1985df
keeptextopen
buttonsound
spriteface AZALEATOWN_KURT_OUTSIDE, RIGHT
writetext UnknownText_0x19860b
keeptextopen
buttonsound
writetext UnknownText_0x198628
waitbutton
verbosegiveitem GS_BALL

View File

@ -61,7 +61,7 @@ ReceptionistScript_0x9e3e2:
if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
loadfont
writetext Text_BattleTowerWelcomesYou
keeptextopen
buttonsound
writebyte BATTLETOWERACTION_00 ; if new save file: bit 1, [sbe4f]
special BattleTowerAction
if_not_equal $0, Script_Menu_ChallengeExplanationCancel

View File

@ -32,7 +32,7 @@ Script_BattleRoomLoop: ; 0x9f425
applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksIn
loadfont
battletowertext 1
keeptextopen
buttonsound
closetext
special BattleTowerBattle ; calls predef startbattle
special FadeOutPalettes

View File

@ -18,7 +18,7 @@ GrampsScript_0x189538:
checkevent EVENT_MET_BILLS_GRANDPA
iftrue UnknownScript_0x189553
writetext UnknownText_0x1896ce
keeptextopen
buttonsound
setevent EVENT_MET_BILLS_GRANDPA
UnknownScript_0x189553:
checkevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
@ -32,7 +32,7 @@ UnknownScript_0x189553:
checkevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
iftrue UnknownScript_0x18963b
writetext UnknownText_0x1898c0
keeptextopen
buttonsound
writetext UnknownText_0x189732
yesorno
iffalse UnknownScript_0x1896aa
@ -46,7 +46,7 @@ UnknownScript_0x189553:
UnknownScript_0x189592:
writetext UnknownText_0x1898ff
keeptextopen
buttonsound
writetext UnknownText_0x189732
yesorno
iffalse UnknownScript_0x1896aa
@ -60,7 +60,7 @@ UnknownScript_0x189592:
UnknownScript_0x1895b3:
writetext UnknownText_0x189953
keeptextopen
buttonsound
writetext UnknownText_0x189732
yesorno
iffalse UnknownScript_0x1896aa
@ -76,7 +76,7 @@ UnknownScript_0x1895d4:
checkver
iftrue UnknownScript_0x1895f9
writetext UnknownText_0x1899fe
keeptextopen
buttonsound
writetext UnknownText_0x189732
yesorno
iffalse UnknownScript_0x1896aa
@ -90,7 +90,7 @@ UnknownScript_0x1895d4:
UnknownScript_0x1895f9:
writetext UnknownText_0x189a57
keeptextopen
buttonsound
writetext UnknownText_0x189732
yesorno
iffalse UnknownScript_0x1896aa
@ -104,7 +104,7 @@ UnknownScript_0x1895f9:
UnknownScript_0x18961a:
writetext UnknownText_0x189ab1
keeptextopen
buttonsound
writetext UnknownText_0x189732
yesorno
iffalse UnknownScript_0x1896aa
@ -170,7 +170,7 @@ UnknownScript_0x189697:
UnknownScript_0x1896a5:
writetext UnknownText_0x189760
keeptextopen
buttonsound
end
UnknownScript_0x1896aa:
@ -181,12 +181,12 @@ UnknownScript_0x1896aa:
UnknownScript_0x1896b0:
writetext UnknownText_0x1897a6
keeptextopen
buttonsound
end
UnknownScript_0x1896b5:
writetext UnknownText_0x1897e1
keeptextopen
buttonsound
end
UnknownScript_0x1896ba:

View File

@ -99,11 +99,11 @@ SantosScript:
checkevent EVENT_MET_SANTOS_OF_SATURDAY
iftrue .MetSantos
writetext MeetSantosText
keeptextopen
buttonsound
setevent EVENT_MET_SANTOS_OF_SATURDAY
.MetSantos
writetext SantosGivesGiftText
keeptextopen
buttonsound
verbosegiveitem SPELL_TAG
iffalse SantosDoneScript
setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS

View File

@ -68,7 +68,7 @@ UnknownScript_0x194e69:
checkevent EVENT_GOT_TM24_DRAGONBREATH
iftrue UnknownScript_0x194e94
writetext UnknownText_0x195196
keeptextopen
buttonsound
giveitem TM_DRAGONBREATH
iffalse UnknownScript_0x194e8e
itemtotext TM_DRAGONBREATH, $0
@ -78,7 +78,7 @@ UnknownScript_0x194e69:
itemnotify
setevent EVENT_GOT_TM24_DRAGONBREATH
writetext UnknownText_0x1951d1
keeptextopen
buttonsound
jump UnknownScript_0x194e94
UnknownScript_0x194e8e:

View File

@ -41,7 +41,7 @@ UnknownScript_0x19b0de:
loadfont
writetext UnknownText_0x19b296
special PlayCurMonCry
keeptextopen
buttonsound
writetext UnknownText_0x19b2aa
waitbutton
closetext

View File

@ -109,7 +109,7 @@ CeladonCafeTrashcan:
loadfont
itemtotext LEFTOVERS, $0
writetext FoundLeftoversText
keeptextopen
buttonsound
writetext NoRoomForLeftoversText
waitbutton
closetext

Some files were not shown because too many files have changed in this diff Show More