diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-29 22:29:45 -0500 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-29 22:29:45 -0500 |
commit | 0eb0c40ba7be54862364e6cd3a77cc605a4ada16 (patch) | |
tree | c449bf08b91a3e5ccc1bf728dd9a0b7940ddef8e /engine | |
parent | b8dcccd0da7d7eda8f4e480aeb4f87d08d7461b4 (diff) |
buttonsound
Diffstat (limited to 'engine')
-rwxr-xr-x | engine/breeding/egg.asm | 4 | ||||
-rw-r--r-- | engine/buena_phone_scripts.asm | 14 | ||||
-rw-r--r-- | engine/fruit_trees.asm | 6 | ||||
-rw-r--r-- | engine/more_phone_scripts.asm | 412 | ||||
-rw-r--r-- | engine/phone_scripts.asm | 418 | ||||
-rw-r--r-- | engine/scripting.asm | 8 | ||||
-rw-r--r-- | engine/std_scripts.asm | 66 |
7 files changed, 464 insertions, 464 deletions
diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm index 6d6141c4f..138faa99e 100755 --- a/engine/breeding/egg.asm +++ b/engine/breeding/egg.asm @@ -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 diff --git a/engine/buena_phone_scripts.asm b/engine/buena_phone_scripts.asm index 98a7b72a3..0aad5e0ba 100644 --- a/engine/buena_phone_scripts.asm +++ b/engine/buena_phone_scripts.asm @@ -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: diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm index e6f7de9d1..7a76c5a89 100644 --- a/engine/fruit_trees.asm +++ b/engine/fruit_trees.asm @@ -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 diff --git a/engine/more_phone_scripts.asm b/engine/more_phone_scripts.asm index f0c835e92..6d9233402 100644 --- a/engine/more_phone_scripts.asm +++ b/engine/more_phone_scripts.asm @@ -76,87 +76,87 @@ UnknownScript_0xa007c: .Jack: farwritetext UnknownText_0x1740c0 - keeptextopen + buttonsound end .Gaven: farwritetext UnknownText_0x174a24 - keeptextopen + buttonsound end .Jose: farwritetext UnknownText_0x174f2f - keeptextopen + buttonsound end .Joey: farwritetext UnknownText_0x175530 - keeptextopen + buttonsound end .Wade: farwritetext UnknownText_0x1757d4 - keeptextopen + buttonsound end .Ralph: farwritetext UnknownText_0x175bc4 - keeptextopen + buttonsound end .Anthony: farwritetext UnknownText_0x176a2f - keeptextopen + buttonsound end .Todd: farwritetext UnknownText_0x176e5d - keeptextopen + buttonsound end .Arnie: farwritetext UnknownText_0x649dc - keeptextopen + buttonsound end .Alan: farwritetext UnknownText_0x64cbd - keeptextopen + buttonsound end .Chad: farwritetext UnknownText_0x65271 - keeptextopen + buttonsound end .Derek: farwritetext UnknownText_0x65ab2 - keeptextopen + buttonsound end .Tully: farwritetext UnknownText_0x65de4 - keeptextopen + buttonsound end .Brent: farwritetext UnknownText_0x660be - keeptextopen + buttonsound end .Vance: farwritetext UnknownText_0x66980 - keeptextopen + buttonsound end .Wilton: farwritetext UnknownText_0x66afc - keeptextopen + buttonsound end .Parry: farwritetext UnknownText_0x66f9f - keeptextopen + buttonsound end UnknownScript_0xa0128: @@ -172,42 +172,42 @@ UnknownScript_0xa0128: .Beverly: farwritetext UnknownText_0x174688 - keeptextopen + buttonsound end .Beth: farwritetext UnknownText_0x174c7f - keeptextopen + buttonsound end .Reena: farwritetext UnknownText_0x1752f5 - keeptextopen + buttonsound end .Liz: farwritetext UnknownText_0x175fda - keeptextopen + buttonsound end .Gina: farwritetext UnknownText_0x1771fd - keeptextopen + buttonsound end .Dana: farwritetext UnknownText_0x64f74 - keeptextopen + buttonsound end .Tiffany: farwritetext UnknownText_0x665ad - keeptextopen + buttonsound end .Erin: farwritetext UnknownText_0x6717a - keeptextopen + buttonsound end UnknownScript_0xa017a: @@ -232,87 +232,87 @@ UnknownScript_0xa017a: .Jack: farwritetext UnknownText_0x174106 - keeptextopen + buttonsound end .Gaven: farwritetext UnknownText_0x174a80 - keeptextopen + buttonsound end .Jose: farwritetext UnknownText_0x174f90 - keeptextopen + buttonsound end .Joey: farwritetext UnknownText_0x175591 - keeptextopen + buttonsound end .Wade: farwritetext UnknownText_0x175869 - keeptextopen + buttonsound end .Ralph: farwritetext UnknownText_0x175c24 - keeptextopen + buttonsound end .Anthony: farwritetext UnknownText_0x176aef - keeptextopen + buttonsound end .Todd: farwritetext UnknownText_0x176e9c - keeptextopen + buttonsound end .Arnie: farwritetext UnknownText_0x64a13 - keeptextopen + buttonsound end .Alan: farwritetext UnknownText_0x64cf3 - keeptextopen + buttonsound end .Chad: farwritetext UnknownText_0x65318 - keeptextopen + buttonsound end .Derek: farwritetext UnknownText_0x65b29 - keeptextopen + buttonsound end .Tully: farwritetext UnknownText_0x65e42 - keeptextopen + buttonsound end .Brent: farwritetext UnknownText_0x6613c - keeptextopen + buttonsound end .Vance: farwritetext UnknownText_0x669b2 - keeptextopen + buttonsound end .Wilton: farwritetext UnknownText_0x66b3e - keeptextopen + buttonsound end .Parry: farwritetext UnknownText_0x66fc0 - keeptextopen + buttonsound end UnknownScript_0xa0226: @@ -328,42 +328,42 @@ UnknownScript_0xa0226: .Beverly: farwritetext UnknownText_0x1746c3 - keeptextopen + buttonsound end .Beth: farwritetext UnknownText_0x174cf6 - keeptextopen + buttonsound end .Reena: farwritetext UnknownText_0x17536b - keeptextopen + buttonsound end .Liz: farwritetext UnknownText_0x17602d - keeptextopen + buttonsound end .Gina: farwritetext UnknownText_0x177237 - keeptextopen + buttonsound end .Dana: farwritetext UnknownText_0x64fb2 - keeptextopen + buttonsound end .Tiffany: farwritetext UnknownText_0x66605 - keeptextopen + buttonsound end .Erin: farwritetext UnknownText_0x671a4 - keeptextopen + buttonsound end UnknownScript_0xa0278: @@ -388,87 +388,87 @@ UnknownScript_0xa0278: .Jack: farwritetext UnknownText_0x174165 - keeptextopen + buttonsound end .Gaven: farwritetext UnknownText_0x174b2d - keeptextopen + buttonsound end .Jose: farwritetext UnknownText_0x174ffd - keeptextopen + buttonsound end .Joey: farwritetext UnknownText_0x175611 - keeptextopen + buttonsound end .Wade: farwritetext UnknownText_0x1758e4 - keeptextopen + buttonsound end .Ralph: farwritetext UnknownText_0x175c9f - keeptextopen + buttonsound end .Anthony: farwritetext UnknownText_0x176b45 - keeptextopen + buttonsound end .Todd: farwritetext UnknownText_0x176eee - keeptextopen + buttonsound end .Arnie: farwritetext UnknownText_0x64a71 - keeptextopen + buttonsound end .Alan: farwritetext UnknownText_0x64d4f - keeptextopen + buttonsound end .Chad: farwritetext UnknownText_0x65399 - keeptextopen + buttonsound end .Derek: farwritetext UnknownText_0x65bc8 - keeptextopen + buttonsound end .Tully: farwritetext UnknownText_0x65eac - keeptextopen + buttonsound end .Brent: farwritetext UnknownText_0x6618c - keeptextopen + buttonsound end .Vance: farwritetext UnknownText_0x669ed - keeptextopen + buttonsound end .Wilton: farwritetext UnknownText_0x66b8f - keeptextopen + buttonsound end .Parry: farwritetext UnknownText_0x67001 - keeptextopen + buttonsound end UnknownScript_0xa0324: @@ -484,42 +484,42 @@ UnknownScript_0xa0324: .Beverly: farwritetext UnknownText_0x174734 - keeptextopen + buttonsound end .Beth: farwritetext UnknownText_0x174d86 - keeptextopen + buttonsound end .Reena: farwritetext UnknownText_0x1753c5 - keeptextopen + buttonsound end .Liz: farwritetext UnknownText_0x176095 - keeptextopen + buttonsound end .Gina: farwritetext UnknownText_0x177297 - keeptextopen + buttonsound end .Dana: farwritetext UnknownText_0x6501c - keeptextopen + buttonsound end .Tiffany: farwritetext UnknownText_0x66688 - keeptextopen + buttonsound end .Erin: farwritetext UnknownText_0x671eb - keeptextopen + buttonsound end UnknownScript_0xa0376: @@ -552,87 +552,87 @@ UnknownScript_0xa0386: .Jack: farwritetext UnknownText_0x1741e1 - keeptextopen + buttonsound end .Huey: farwritetext UnknownText_0x1748ea - keeptextopen + buttonsound end .Gaven: farwritetext UnknownText_0x174bc5 - keeptextopen + buttonsound end .Jose: farwritetext UnknownText_0x17507d - keeptextopen + buttonsound end .Joey: farwritetext UnknownText_0x175693 - keeptextopen + buttonsound end .Wade: farwritetext UnknownText_0x175976 - keeptextopen + buttonsound end .Ralph: farwritetext UnknownText_0x175d40 - keeptextopen + buttonsound end .Anthony: farwritetext UnknownText_0x176bee - keeptextopen + buttonsound end .Todd: farwritetext UnknownText_0x176f60 - keeptextopen + buttonsound end .Arnie: farwritetext UnknownText_0x64ada - keeptextopen + buttonsound end .Alan: farwritetext UnknownText_0x64da4 - keeptextopen + buttonsound end .Chad: farwritetext UnknownText_0x65419 - keeptextopen + buttonsound end .Tully: farwritetext UnknownText_0x65f17 - keeptextopen + buttonsound end .Brent: farwritetext UnknownText_0x66214 - keeptextopen + buttonsound end .Vance: farwritetext UnknownText_0x66a3a - keeptextopen + buttonsound end .Wilton: farwritetext UnknownText_0x66bf3 - keeptextopen + buttonsound end .Parry: farwritetext UnknownText_0x67096 - keeptextopen + buttonsound end UnknownScript_0xa0432: @@ -647,37 +647,37 @@ UnknownScript_0xa0432: .Beth: farwritetext UnknownText_0x174e4e - keeptextopen + buttonsound end .Reena: farwritetext UnknownText_0x17543a - keeptextopen + buttonsound end .Liz: farwritetext UnknownText_0x17610a - keeptextopen + buttonsound end .Gina: farwritetext UnknownText_0x1772e2 - keeptextopen + buttonsound end .Dana: farwritetext UnknownText_0x65091 - keeptextopen + buttonsound end .Tiffany: farwritetext UnknownText_0x66730 - keeptextopen + buttonsound end .Erin: farwritetext UnknownText_0x6722e - keeptextopen + buttonsound end UnknownScript_0xa047a: @@ -861,37 +861,37 @@ UnknownScript_0xa05a4: .Wade: farwritetext UnknownText_0x1759f7 - keeptextopen + buttonsound jump UnknownScript_0xa0484 .Derek: farwritetext UnknownText_0x65c66 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa05be: farwritetext UnknownText_0x64032 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa05c6: farwritetext UnknownText_0x177378 - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa05ce: farwritetext UnknownText_0x64b5f - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa05d6: farwritetext UnknownText_0x175dd9 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa05de: farwritetext UnknownText_0x176c61 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa05e6: @@ -952,12 +952,12 @@ UnknownScript_0xa061e: UnknownScript_0xa0644: farwritetext UnknownText_0x176feb - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa064c: farwritetext UnknownText_0x66dc5 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0654: @@ -976,57 +976,57 @@ UnknownScript_0xa0654: UnknownScript_0xa0682: farwritetext UnknownText_0x174261 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa068a: farwritetext UnknownText_0x17429d - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0692: farwritetext UnknownText_0x1742ee - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa069a: farwritetext UnknownText_0x174340 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa06a2: farwritetext UnknownText_0x174391 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa06aa: farwritetext UnknownText_0x1743e3 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa06b2: farwritetext UnknownText_0x174433 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa06ba: farwritetext UnknownText_0x174485 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa06c2: farwritetext UnknownText_0x1744d6 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa06ca: farwritetext UnknownText_0x174522 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa06d2: farwritetext UnknownText_0x174571 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa06da: @@ -1044,52 +1044,52 @@ UnknownScript_0xa06da: UnknownScript_0xa0704: farwritetext UnknownText_0x176223 - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa070c: farwritetext UnknownText_0x1762c3 - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa0714: farwritetext UnknownText_0x17638a - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa071c: farwritetext UnknownText_0x176424 - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa0724: farwritetext UnknownText_0x1764eb - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa072c: farwritetext UnknownText_0x176599 - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa0734: farwritetext UnknownText_0x1766ac - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa073c: farwritetext UnknownText_0x17674f - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa0744: farwritetext UnknownText_0x176816 - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa074c: farwritetext UnknownText_0x17686d - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa0754: @@ -1107,52 +1107,52 @@ UnknownScript_0xa0754: UnknownScript_0xa077e: farwritetext UnknownText_0x65481 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0786: farwritetext UnknownText_0x654ea - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa078e: farwritetext UnknownText_0x65555 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0796: farwritetext UnknownText_0x655c7 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa079e: farwritetext UnknownText_0x65628 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa07a6: farwritetext UnknownText_0x6569b - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa07ae: farwritetext UnknownText_0x6574a - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa07b6: farwritetext UnknownText_0x65810 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa07be: farwritetext UnknownText_0x658c6 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa07c6: farwritetext UnknownText_0x65969 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa07ce: @@ -1170,52 +1170,52 @@ UnknownScript_0xa07ce: UnknownScript_0xa07f8: farwritetext UnknownText_0x662bc - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0800: farwritetext UnknownText_0x662fc - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0808: farwritetext UnknownText_0x66335 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0810: farwritetext UnknownText_0x66366 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0818: farwritetext UnknownText_0x663a1 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0820: farwritetext UnknownText_0x663e6 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0828: farwritetext UnknownText_0x66421 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0830: farwritetext UnknownText_0x6645f - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0838: farwritetext UnknownText_0x6649b - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0840: farwritetext UnknownText_0x664dd - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0848: @@ -1244,197 +1244,197 @@ UnknownScript_0xa0848: checkflag ENGINE_PLAINBADGE iftrue UnknownScript_0xa0898 farwritetext UnknownText_0x646a3 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0898: farwritetext UnknownText_0x64099 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa08a0: farwritetext UnknownText_0x640e6 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa08a8: farwritetext UnknownText_0x6416d - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa08b0: farwritetext UnknownText_0x641e8 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa08b8: farwritetext UnknownText_0x64247 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa08c0: farwritetext UnknownText_0x642bb - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa08c8: farwritetext UnknownText_0x643d4 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa08d0: farwritetext UnknownText_0x64448 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa08d8: farwritetext UnknownText_0x6455b - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa08e0: farwritetext UnknownText_0x645ff - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa08e8: farwritetext UnknownText_0x646df - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa08f0: farwritetext UnknownText_0x647d8 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa08f8: farwritetext UnknownText_0x1745c2 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0900: farwritetext UnknownText_0x17485b - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa0908: farwritetext UnknownText_0x17496b - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0910: farwritetext UnknownText_0x174c29 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0918: farwritetext UnknownText_0x174ec5 - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa0920: farwritetext UnknownText_0x17519b - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0928: farwritetext UnknownText_0x17549b - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa0930: farwritetext UnknownText_0x17571d - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0938: farwritetext UnknownText_0x175abe - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0940: farwritetext UnknownText_0x175eaf - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0948: farwritetext UnknownText_0x1768b0 - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa0950: farwritetext UnknownText_0x176d32 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0958: farwritetext UnknownText_0x1770fb - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0960: farwritetext UnknownText_0x177465 - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa0968: farwritetext UnknownText_0x64bc6 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0970: farwritetext UnknownText_0x64e90 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0978: farwritetext UnknownText_0x65161 - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa0980: farwritetext UnknownText_0x65a23 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0988: farwritetext UnknownText_0x65d5c - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0990: farwritetext UnknownText_0x65ff2 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0998: farwritetext UnknownText_0x6651e - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa09a0: farwritetext UnknownText_0x66882 - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa09a8: farwritetext UnknownText_0x66aa5 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa09b0: farwritetext UnknownText_0x66ca7 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa09b8: farwritetext UnknownText_0x67106 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa09c0: farwritetext UnknownText_0x67294 - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa09c8: @@ -1445,17 +1445,17 @@ UnknownScript_0xa09c8: UnknownScript_0xa09d6: farwritetext UnknownText_0x64846 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa09de: farwritetext UnknownText_0x64881 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa09e6: farwritetext UnknownText_0x648dc - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa09ee: @@ -1463,12 +1463,12 @@ UnknownScript_0xa09ee: if_equal $2, UnknownScript_0xa0a00 if_equal $1, UnknownScript_0xa0a08 farwritetext UnknownText_0x66e17 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0a00: farwritetext UnknownText_0x66e67 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0a08: @@ -1478,17 +1478,17 @@ UnknownScript_0xa0a08: iftrue UnknownScript_0xa0a25 setevent EVENT_KENJI_ON_BREAK farwritetext UnknownText_0x66f11 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0a1d: farwritetext UnknownText_0x66ed3 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0a25: farwritetext UnknownText_0x66f52 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0a2d: @@ -1589,52 +1589,52 @@ UnknownScript_0xa0aa0: UnknownScript_0xa0aa5: farwritetext UnknownText_0x174895 - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa0aad: farwritetext UnknownText_0x17529c - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0ab5: farwritetext UnknownText_0x175b6d - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0abd: farwritetext UnknownText_0x17750e - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa0ac5: farwritetext UnknownText_0x64f1a - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0acd: farwritetext UnknownText_0x6520f - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa0ad5: farwritetext UnknownText_0x65da6 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0add: farwritetext UnknownText_0x66087 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0ae5: farwritetext UnknownText_0x6691d - keeptextopen + buttonsound jump UnknownScript_0xa053a UnknownScript_0xa0aed: farwritetext UnknownText_0x66d45 - keeptextopen + buttonsound jump UnknownScript_0xa0484 UnknownScript_0xa0af5: diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 0ce4f017b..156cf670b 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -19,7 +19,7 @@ MomPhoneScript: ; 0xbceaa checkevent EVENT_IN_YOUR_ROOM iftrue MomPhoneHangUpScript farwritetext MomPhoneGreetingText - keeptextopen + buttonsound mapnametotext $0 checkcode VAR_ROOFPALETTE if_equal $1, UnknownScript_0xbcee7 @@ -28,7 +28,7 @@ MomPhoneScript: ; 0xbceaa UnknownScript_0xbcedf: ; 0xbcedf farwritetext UnknownText_0x1b4021 - keeptextopen + buttonsound jump UnknownScript_0xbcf37 UnknownScript_0xbcee7: ; 0xbcee7 @@ -39,17 +39,17 @@ UnknownScript_0xbcee7: ; 0xbcee7 if_equal GROUP_AZALEA_TOWN, .azalea if_equal GROUP_GOLDENROD_CITY, .goldenrod farwritetext MomPhoneGenericAreaText - keeptextopen + buttonsound jump UnknownScript_0xbcf37 .newbark ; 0xbcf05 farwritetext MomPhoneNewBarkText - keeptextopen + buttonsound jump UnknownScript_0xbcf37 .cherrygrove ; 0xbcf0d farwritetext MomPhoneCherrygroveText - keeptextopen + buttonsound jump UnknownScript_0xbcf37 .violet ; 0xbcf15 @@ -64,12 +64,12 @@ UnknownScript_0xbcee7: ; 0xbcee7 UnknownScript_0xbcf27: ; 0xbcf27 farwritetext UnknownText_0x1b411c - keeptextopen + buttonsound jump UnknownScript_0xbcf37 UnknownScript_0xbcf2f: ; 0xbcf2f farwritetext UnknownText_0x1b4150 - keeptextopen + buttonsound jump UnknownScript_0xbcf37 UnknownScript_0xbcf37: ; 0xbcf37 @@ -113,13 +113,13 @@ UnknownScript_0xbcf79: ; 0xbcf79 MomPhoneSaveMoneyScript: ; 0xbcf87 setflag ENGINE_MOM_SAVING_MONEY farwritetext UnknownText_0x1b4289 - keeptextopen + buttonsound jump MomPhoneHangUpScript MomPhoneWontSaveMoneyScript: ; 0xbcf92 clearflag ENGINE_MOM_SAVING_MONEY farwritetext MomPhoneWontSaveMoneyText - keeptextopen + buttonsound jump MomPhoneHangUpScript MomPhoneHangUpScript: ; 0xbcf9d @@ -155,22 +155,22 @@ BillPhoneScript1: ; 0xbcfc5 checknite iftrue .nitegreet farwritetext BillPhoneMornGreetingText - keeptextopen + buttonsound jump .main .daygreet ; 0xbcfd7 farwritetext BillPhoneDayGreetingText - keeptextopen + buttonsound jump .main .nitegreet ; 0xbcfdf farwritetext BillPhoneNiteGreetingText - keeptextopen + buttonsound jump .main .main ; 0xbcfe7 farwritetext BillPhoneGeneriText - keeptextopen + buttonsound checkcode VAR_BOXSPACE RAM2MEM $0 if_equal $0, .full @@ -1937,102 +1937,102 @@ UnknownScript_0xbde4e: .Jack: farwritetext UnknownText_0x1b4dc5 - keeptextopen + buttonsound end .Huey: farwritetext UnknownText_0x1b5073 - keeptextopen + buttonsound end .Gaven: farwritetext UnknownText_0x1b5270 - keeptextopen + buttonsound end .Jose: farwritetext UnknownText_0x1b55ae - keeptextopen + buttonsound end .Joey: farwritetext UnknownText_0x1b589a - keeptextopen + buttonsound end .Wade: farwritetext UnknownText_0x1b5a3b - keeptextopen + buttonsound end .Ralph: farwritetext UnknownText_0x1b5c10 - keeptextopen + buttonsound end .Anthony: farwritetext UnknownText_0x1b5f7a - keeptextopen + buttonsound end .Todd: farwritetext UnknownText_0x1b60f5 - keeptextopen + buttonsound end .Irwin: farwritetext UnknownText_0x1b638c - keeptextopen + buttonsound end .Arnie: farwritetext UnknownText_0x1b6454 - keeptextopen + buttonsound end .Alan: farwritetext UnknownText_0x1b659d - keeptextopen + buttonsound end .Chad: farwritetext UnknownText_0x1b67e2 - keeptextopen + buttonsound end .Derek: farwritetext UnknownText_0x1b69a8 - keeptextopen + buttonsound end .Tully: farwritetext UnknownText_0x1b6b39 - keeptextopen + buttonsound end .Brent: farwritetext UnknownText_0x1b6c96 - keeptextopen + buttonsound end .Vance: farwritetext UnknownText_0x1b7019 - keeptextopen + buttonsound end .Wilton: farwritetext UnknownText_0x1b71d5 - keeptextopen + buttonsound end .Kenji: farwritetext UnknownText_0x1b730b - keeptextopen + buttonsound end .Parry: farwritetext UnknownText_0x1b73c7 - keeptextopen + buttonsound end UnknownScript_0xbdf22: @@ -2060,102 +2060,102 @@ UnknownScript_0xbdf22: .Jack: farwritetext UnknownText_0x1b4ded - keeptextopen + buttonsound end .Huey: farwritetext UnknownText_0x1b509b - keeptextopen + buttonsound end .Gaven: farwritetext UnknownText_0x1b52a5 - keeptextopen + buttonsound end .Jose: farwritetext UnknownText_0x1b55da - keeptextopen + buttonsound end .Joey: farwritetext UnknownText_0x1b58c2 - keeptextopen + buttonsound end .Wade: farwritetext UnknownText_0x1b5a74 - keeptextopen + buttonsound end .Ralph: farwritetext UnknownText_0x1b5c63 - keeptextopen + buttonsound end .Anthony: farwritetext UnknownText_0x1b5f9e - keeptextopen + buttonsound end .Todd: farwritetext UnknownText_0x1b611b - keeptextopen + buttonsound end .Irwin: farwritetext UnknownText_0x1b63a8 - keeptextopen + buttonsound end .Arnie: farwritetext UnknownText_0x1b647e - keeptextopen + buttonsound end .Alan: farwritetext UnknownText_0x1b65c7 - keeptextopen + buttonsound end .Chad: farwritetext UnknownText_0x1b680e - keeptextopen + buttonsound end .Derek: farwritetext UnknownText_0x1b69d2 - keeptextopen + buttonsound end .Tully: farwritetext UnknownText_0x1b6b65 - keeptextopen + buttonsound end .Brent: farwritetext UnknownText_0x1b6cc6 - keeptextopen + buttonsound end .Vance: farwritetext UnknownText_0x1b7057 - keeptextopen + buttonsound end .Wilton: farwritetext UnknownText_0x1b71fc - keeptextopen + buttonsound end .Kenji: farwritetext UnknownText_0x1b7331 - keeptextopen + buttonsound end .Parry: farwritetext UnknownText_0x1b73ef - keeptextopen + buttonsound end UnknownScript_0xbdfec: @@ -2183,102 +2183,102 @@ UnknownScript_0xbdfec: .Jack: farwritetext UnknownText_0x1b4e16 - keeptextopen + buttonsound end .Huey: farwritetext UnknownText_0x1b50c2 - keeptextopen + buttonsound end .Gaven: farwritetext UnknownText_0x1b52cc - keeptextopen + buttonsound end .Jose: farwritetext UnknownText_0x1b55fc - keeptextopen + buttonsound end .Joey: farwritetext UnknownText_0x1b58ea - keeptextopen + buttonsound end .Wade: farwritetext UnknownText_0x1b5a9f - keeptextopen + buttonsound end .Ralph: farwritetext UnknownText_0x1b5cb6 - keeptextopen + buttonsound end .Anthony: farwritetext UnknownText_0x1b5fc9 - keeptextopen + buttonsound end .Todd: farwritetext UnknownText_0x1b6149 - keeptextopen + buttonsound end .Irwin: farwritetext UnknownText_0x1b63c4 - keeptextopen + buttonsound end .Arnie: farwritetext UnknownText_0x1b64a8 - keeptextopen + buttonsound end .Alan: farwritetext UnknownText_0x1b65e3 - keeptextopen + buttonsound end .Chad: farwritetext UnknownText_0x1b6836 - keeptextopen + buttonsound end .Derek: farwritetext UnknownText_0x1b69f8 - keeptextopen + buttonsound end .Tully: farwritetext UnknownText_0x1b6b92 - keeptextopen + buttonsound end .Brent: farwritetext UnknownText_0x1b6cf6 - keeptextopen + buttonsound end .Vance: farwritetext UnknownText_0x1b7092 - keeptextopen + buttonsound end .Wilton: farwritetext UnknownText_0x1b722a - keeptextopen + buttonsound end .Kenji: farwritetext UnknownText_0x1b7357 - keeptextopen + buttonsound end .Parry: farwritetext UnknownText_0x1b7417 - keeptextopen + buttonsound end UnknownScript_0xbe0b6: @@ -2298,42 +2298,42 @@ UnknownScript_0xbe0b6: .Beverly: farwritetext UnknownText_0x1b4f21 - keeptextopen + buttonsound end .Beth: farwritetext UnknownText_0x1b53f7 - keeptextopen + buttonsound end .Reena: farwritetext UnknownText_0x1b5702 - keeptextopen + buttonsound end .Liz: farwritetext UnknownText_0x1b5d9f - keeptextopen + buttonsound end .Gina: farwritetext UnknownText_0x1b626a - keeptextopen + buttonsound end .Dana: farwritetext UnknownText_0x1b66c8 - keeptextopen + buttonsound end .Tiffany: farwritetext UnknownText_0x1b6e7c - keeptextopen + buttonsound end .Erin: farwritetext UnknownText_0x1b751a - keeptextopen + buttonsound end UnknownScript_0xbe112: @@ -2349,42 +2349,42 @@ UnknownScript_0xbe112: .Beverly: farwritetext UnknownText_0x1b4f4d - keeptextopen + buttonsound end .Beth: farwritetext UnknownText_0x1b5424 - keeptextopen + buttonsound end .Reena: farwritetext UnknownText_0x1b572e - keeptextopen + buttonsound end .Liz: farwritetext UnknownText_0x1b5dcc - keeptextopen + buttonsound end .Gina: farwritetext UnknownText_0x1b6296 - keeptextopen + buttonsound end .Dana: farwritetext UnknownText_0x1b66ec - keeptextopen + buttonsound end .Tiffany: farwritetext UnknownText_0x1b6ea6 - keeptextopen + buttonsound end .Erin: farwritetext UnknownText_0x1b7548 - keeptextopen + buttonsound end UnknownScript_0xbe164: @@ -2400,42 +2400,42 @@ UnknownScript_0xbe164: .Beverly: farwritetext UnknownText_0x1b4f75 - keeptextopen + buttonsound end .Beth: farwritetext UnknownText_0x1b5446 - keeptextopen + buttonsound end .Reena: farwritetext UnknownText_0x1b575a - keeptextopen + buttonsound end .Liz: farwritetext UnknownText_0x1b5df8 - keeptextopen + buttonsound end .Gina: farwritetext UnknownText_0x1b62c5 - keeptextopen + buttonsound end .Dana: farwritetext UnknownText_0x1b6713 - keeptextopen + buttonsound end .Tiffany: farwritetext UnknownText_0x1b6ec9 - keeptextopen + buttonsound end .Erin: farwritetext UnknownText_0x1b756f - keeptextopen + buttonsound end UnknownScript_0xbe1b6: @@ -2467,102 +2467,102 @@ UnknownScript_0xbe1b6: .Jack: farwritetext UnknownText_0x1b4e3e - keeptextopen + buttonsound end .Huey: farwritetext UnknownText_0x1b50e9 - keeptextopen + buttonsound end .Gaven: farwritetext UnknownText_0x1b5301 - keeptextopen + buttonsound end .Jose: farwritetext UnknownText_0x1b5628 - keeptextopen + buttonsound end .Joey: farwritetext UnknownText_0x1b5912 - keeptextopen + buttonsound end .Wade: farwritetext UnknownText_0x1b5ad8 - keeptextopen + buttonsound end .Ralph: farwritetext UnknownText_0x1b5d09 - keeptextopen + buttonsound end .Anthony: farwritetext UnknownText_0x1b5ff6 - keeptextopen + buttonsound end .Todd: farwritetext UnknownText_0x1b616e - keeptextopen + buttonsound end .Irwin: farwritetext UnknownText_0x1b63e3 - keeptextopen + buttonsound end .Arnie: farwritetext UnknownText_0x1b64d2 - keeptextopen + buttonsound end .Alan: farwritetext UnknownText_0x1b660d - keeptextopen + buttonsound end .Chad: farwritetext UnknownText_0x1b6862 - keeptextopen + buttonsound end .Derek: farwritetext UnknownText_0x1b6a22 - keeptextopen + buttonsound end .Tully: farwritetext UnknownText_0x1b6bb9 - keeptextopen + buttonsound end .Brent: farwritetext UnknownText_0x1b6d26 - keeptextopen + buttonsound end .Vance: farwritetext UnknownText_0x1b70e7 - keeptextopen + buttonsound end .Wilton: farwritetext UnknownText_0x1b725c - keeptextopen + buttonsound end .Kenji: farwritetext UnknownText_0x1b737f - keeptextopen + buttonsound end .Parry: farwritetext UnknownText_0x1b743f - keeptextopen + buttonsound end UnknownScript_0xbe28a: @@ -2590,102 +2590,102 @@ UnknownScript_0xbe28a: .Jack: farwritetext UnknownText_0x1b4e72 - keeptextopen + buttonsound end .Huey: farwritetext UnknownText_0x1b511a - keeptextopen + buttonsound end .Gaven: farwritetext UnknownText_0x1b5335 - keeptextopen + buttonsound end .Jose: farwritetext UnknownText_0x1b564c - keeptextopen + buttonsound end .Joey: farwritetext UnknownText_0x1b5948 - keeptextopen + buttonsound end .Wade: farwritetext UnknownText_0x1b5b0b - keeptextopen + buttonsound end .Ralph: farwritetext UnknownText_0x1b5d21 - keeptextopen + buttonsound end .Anthony: farwritetext UnknownText_0x1b6017 - keeptextopen + buttonsound end .Todd: farwritetext UnknownText_0x1b618f - keeptextopen + buttonsound end .Irwin: farwritetext UnknownText_0x1b6407 - keeptextopen + buttonsound end .Arnie: farwritetext UnknownText_0x1b6506 - keeptextopen + buttonsound end .Alan: farwritetext UnknownText_0x1b6624 - keeptextopen + buttonsound end .Chad: farwritetext UnknownText_0x1b6890 - keeptextopen + buttonsound end .Derek: farwritetext UnknownText_0x1b6a56 - keeptextopen + buttonsound end .Tully: farwritetext UnknownText_0x1b6bef - keeptextopen + buttonsound end .Brent: farwritetext UnknownText_0x1b6d57 - keeptextopen + buttonsound end .Vance: farwritetext UnknownText_0x1b7112 - keeptextopen + buttonsound end .Wilton: farwritetext UnknownText_0x1b7283 - keeptextopen + buttonsound end .Kenji: farwritetext UnknownText_0x1b7397 - keeptextopen + buttonsound end .Parry: farwritetext UnknownText_0x1b746f - keeptextopen + buttonsound end UnknownScript_0xbe354: @@ -2713,102 +2713,102 @@ UnknownScript_0xbe354: .Jack: farwritetext UnknownText_0x1b4e9e - keeptextopen + buttonsound end .Huey: farwritetext UnknownText_0x1b5154 - keeptextopen + buttonsound end .Gaven: farwritetext UnknownText_0x1b535f - keeptextopen + buttonsound end .Jose: farwritetext UnknownText_0x1b5670 - keeptextopen + buttonsound end .Joey: farwritetext UnknownText_0x1b597c - keeptextopen + buttonsound end .Wade: farwritetext UnknownText_0x1b5b37 - keeptextopen + buttonsound end .Ralph: farwritetext UnknownText_0x1b5d39 - keeptextopen + buttonsound end .Anthony: farwritetext UnknownText_0x1b6041 - keeptextopen + buttonsound end .Todd: farwritetext UnknownText_0x1b61bd - keeptextopen + buttonsound end .Irwin: farwritetext UnknownText_0x1b642c - keeptextopen + buttonsound end .Arnie: farwritetext UnknownText_0x1b6539 - keeptextopen + buttonsound end .Alan: farwritetext UnknownText_0x1b663b - keeptextopen + buttonsound end .Chad: farwritetext UnknownText_0x1b68ba - keeptextopen + buttonsound end .Derek: farwritetext UnknownText_0x1b6a8b - keeptextopen + buttonsound end .Tully: farwritetext UnknownText_0x1b6c23 - keeptextopen + buttonsound end .Brent: farwritetext UnknownText_0x1b6d88 - keeptextopen + buttonsound end .Vance: farwritetext UnknownText_0x1b7132 - keeptextopen + buttonsound end .Wilton: farwritetext UnknownText_0x1b72a5 - keeptextopen + buttonsound end .Kenji: farwritetext UnknownText_0x1b73af - keeptextopen + buttonsound end .Parry: farwritetext UnknownText_0x1b749b - keeptextopen + buttonsound end UnknownScript_0xbe41e: @@ -2828,42 +2828,42 @@ UnknownScript_0xbe41e: .Beverly: farwritetext UnknownText_0x1b4fa1 - keeptextopen + buttonsound end .Beth: farwritetext UnknownText_0x1b5472 - keeptextopen + buttonsound end .Reena: farwritetext UnknownText_0x1b5786 - keeptextopen + buttonsound end .Liz: farwritetext UnknownText_0x1b5e25 - keeptextopen + buttonsound end .Gina: farwritetext UnknownText_0x1b62f1 - keeptextopen + buttonsound end .Dana: farwritetext UnknownText_0x1b6738 - keeptextopen + buttonsound end .Tiffany: farwritetext UnknownText_0x1b6ef3 - keeptextopen + buttonsound end .Erin: farwritetext UnknownText_0x1b758f - keeptextopen + buttonsound end UnknownScript_0xbe47a: @@ -2879,42 +2879,42 @@ UnknownScript_0xbe47a: .Beverly: farwritetext UnknownText_0x1b4fda - keeptextopen + buttonsound end .Beth: farwritetext UnknownText_0x1b54a6 - keeptextopen + buttonsound end .Reena: farwritetext UnknownText_0x1b57b7 - keeptextopen + buttonsound end .Liz: farwritetext UnknownText_0x1b5e59 - keeptextopen + buttonsound end .Gina: farwritetext UnknownText_0x1b630e - keeptextopen + buttonsound end .Dana: farwritetext UnknownText_0x1b6757 - keeptextopen + buttonsound end .Tiffany: farwritetext UnknownText_0x1b6f1c - keeptextopen + buttonsound end .Erin: farwritetext UnknownText_0x1b75ac - keeptextopen + buttonsound end UnknownScript_0xbe4cc: @@ -2930,42 +2930,42 @@ UnknownScript_0xbe4cc: .Beverly: farwritetext UnknownText_0x1b5004 - keeptextopen + buttonsound end .Beth: farwritetext UnknownText_0x1b54d4 - keeptextopen + buttonsound end .Reena: farwritetext UnknownText_0x1b57e8 - keeptextopen + buttonsound end .Liz: farwritetext UnknownText_0x1b5e8e - keeptextopen + buttonsound end .Gina: farwritetext UnknownText_0x1b6331 - keeptextopen + buttonsound end .Dana: farwritetext UnknownText_0x1b6776 - keeptextopen + buttonsound end .Tiffany: farwritetext UnknownText_0x1b6f37 - keeptextopen + buttonsound end .Erin: farwritetext UnknownText_0x1b75c9 - keeptextopen + buttonsound end UnknownScript_0xbe51e: @@ -2990,92 +2990,92 @@ UnknownScript_0xbe51e: .Jack: farwritetext UnknownText_0x1b4ecd - keeptextopen + buttonsound end .Unknown: farwritetext UnknownText_0x1b518b - keeptextopen + buttonsound end .Gaven: farwritetext UnknownText_0x1b5393 - keeptextopen + buttonsound end .Jose: farwritetext UnknownText_0x1b5694 - keeptextopen + buttonsound end .Joey: farwritetext UnknownText_0x1b59b2 - keeptextopen + buttonsound end .Wade: farwritetext UnknownText_0x1b5b68 - keeptextopen + buttonsound end .Ralph: farwritetext UnknownText_0x1b5d51 - keeptextopen + buttonsound end .Anthony: farwritetext UnknownText_0x1b606f - keeptextopen + buttonsound end .Todd: farwritetext UnknownText_0x1b61f2 - keeptextopen + buttonsound end .Arnie: farwritetext UnknownText_0x1b656c - keeptextopen + buttonsound end .Alan: farwritetext UnknownText_0x1b6652 - keeptextopen + buttonsound end .Chad: farwritetext UnknownText_0x1b68e8 - keeptextopen + buttonsound end .Derek: farwritetext UnknownText_0x1b6ac2 - keeptextopen + buttonsound end .Tully: farwritetext UnknownText_0x1b6c56 - keeptextopen + buttonsound end .Brent: farwritetext UnknownText_0x1b6db9 - keeptextopen + buttonsound end .Vance: farwritetext UnknownText_0x1b7161 - keeptextopen + buttonsound end .Wilton: farwritetext UnknownText_0x1b72d0 - keeptextopen + buttonsound end .Parry: farwritetext UnknownText_0x1b74c8 - keeptextopen + buttonsound end UnknownScript_0xbe5d0: @@ -3091,42 +3091,42 @@ UnknownScript_0xbe5d0: .Beverly: farwritetext UnknownText_0x1b502b - keeptextopen + buttonsound end .Beth: farwritetext UnknownText_0x1b5510 - keeptextopen + buttonsound end .Reena: farwritetext UnknownText_0x1b5819 - keeptextopen + buttonsound end .Liz: farwritetext UnknownText_0x1b5ebe - keeptextopen + buttonsound end .Gina: farwritetext UnknownText_0x1b6352 - keeptextopen + buttonsound end .Dana: farwritetext UnknownText_0x1b6795 - keeptextopen + buttonsound end .Tiffany: farwritetext UnknownText_0x1b6f60 - keeptextopen + buttonsound end .Erin: farwritetext UnknownText_0x1b75e5 - keeptextopen + buttonsound end UnknownScript_0xbe622: @@ -3134,7 +3134,7 @@ UnknownScript_0xbe622: farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbe636 farwritetext UnknownText_0x1b518b - keeptextopen + buttonsound farjump UnknownScript_0xa0484 UnknownScript_0xbe636: @@ -3142,7 +3142,7 @@ UnknownScript_0xbe636: UnknownScript_0xbe63a: farwritetext UnknownText_0x1b522b - keeptextopen + buttonsound farjump UnknownScript_0xa0484 ; be643 diff --git a/engine/scripting.asm b/engine/scripting.asm index 698508cf4..b6042a04a 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -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 diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 93a5ec2f5..b9515b8aa 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -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 |