diff options
Diffstat (limited to 'scripts')
45 files changed, 111 insertions, 77 deletions
diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index 866c04b0..4d6853be 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -103,7 +103,8 @@ BikeShopText_1d81f: BikeShopText_1d824: TX_FAR _BikeShopText_1d824 - db $11, "@" + TX_SFX_KEY_ITEM + db "@" BikeShopComeAgainText: TX_FAR _BikeShopComeAgainText diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index c2d10f0e..2b60ef8c 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -192,7 +192,7 @@ BillThankYouText: SSTicketReceivedText: TX_FAR _SSTicketReceivedText TX_SFX_KEY_ITEM - TX_BUTTON_SOUND + TX_BLINK db "@" SSTicketNoRoomText: diff --git a/scripts/celadoncity.asm b/scripts/celadoncity.asm index d904f484..6ef679dc 100755 --- a/scripts/celadoncity.asm +++ b/scripts/celadoncity.asm @@ -69,7 +69,8 @@ TM41PreText: ReceivedTM41Text: TX_FAR _ReceivedTM41Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" TM41ExplanationText: TX_FAR _TM41ExplanationText diff --git a/scripts/celadondiner.asm b/scripts/celadondiner.asm index 55263560..6fd594f7 100755 --- a/scripts/celadondiner.asm +++ b/scripts/celadondiner.asm @@ -54,7 +54,8 @@ CeladonDinerText_491a7: ReceivedCoinCaseText: TX_FAR _ReceivedCoinCaseText - db $11, "@" + TX_SFX_KEY_ITEM + db "@" CoinCaseNoRoomText: TX_FAR _CoinCaseNoRoomText diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 0c4fd963..09d2df37 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -267,7 +267,7 @@ CeladonGameCornerText_48d9c: Received10CoinsText: TX_FAR _Received10CoinsText - TX_SFX_ITEM + TX_SFX_ITEM_1 db "@" CeladonGameCornerText_48da7: @@ -345,7 +345,7 @@ CeladonGameCornerText_48e26: Received20CoinsText: TX_FAR _Received20CoinsText - TX_SFX_ITEM + TX_SFX_ITEM_1 db "@" CeladonGameCornerText_48e31: @@ -397,7 +397,7 @@ CeladonGameCornerText_48e88: CeladonGameCornerText_48e8d: TX_FAR _CeladonGameCornerText_48e8d - TX_SFX_ITEM + TX_SFX_ITEM_1 db "@" CeladonGameCornerText_48e93: diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 903ef508..8f6e9e53 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -201,7 +201,7 @@ CeladonGymText9: TM21Text: TX_FAR _ReceivedTM21Text - db $0B + TX_SFX_ITEM_1 TX_FAR _TM21ExplanationText db "@" diff --git a/scripts/celadonmansion3.asm b/scripts/celadonmansion3.asm index 7b5d5294..a1fe048b 100755 --- a/scripts/celadonmansion3.asm +++ b/scripts/celadonmansion3.asm @@ -47,7 +47,7 @@ DirectorText: .CompletedDexText TX_FAR _CompletedDexText - db $6 + TX_BLINK TX_ASM callab DisplayDiploma ld a, $1 diff --git a/scripts/celadonmart3.asm b/scripts/celadonmart3.asm index 7b9940fa..6af58f21 100755 --- a/scripts/celadonmart3.asm +++ b/scripts/celadonmart3.asm @@ -47,7 +47,8 @@ TM18PreReceiveText: ReceivedTM18Text: TX_FAR _ReceivedTM18Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" TM18ExplanationText: TX_FAR _TM18ExplanationText diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index 1f3bcb64..9034e8fc 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -139,48 +139,48 @@ CeladonMartRoofText_484ee: CeladonMartRoofText_484f3: TX_FAR _CeladonMartRoofText_484f3 - TX_WAIT_BUTTON + TX_WAIT db "@" CeladonMartRoofText_484f9: TX_FAR _CeladonMartRoofText_484f9 - TX_SFX_ITEM + TX_SFX_ITEM_1 TX_FAR _CeladonMartRoofText_484fe - TX_WAIT_BUTTON + TX_WAIT db "@" CeladonMartRoofText_48504: TX_FAR _CeladonMartRoofText_48504 - TX_WAIT_BUTTON + TX_WAIT db "@" CeladonMartRoofText_4850a: TX_FAR _CeladonMartRoofText_4850a - TX_SFX_ITEM + TX_SFX_ITEM_1 TX_FAR _CeladonMartRoofText_4850f - TX_WAIT_BUTTON + TX_WAIT db "@" CeladonMartRoofText_48515: TX_FAR _CeladonMartRoofText_48515 - TX_WAIT_BUTTON + TX_WAIT db "@" ReceivedTM49Text: TX_FAR _ReceivedTM49Text - TX_SFX_ITEM + TX_SFX_ITEM_1 TX_FAR _CeladonMartRoofText_48520 - TX_WAIT_BUTTON + TX_WAIT db "@" CeladonMartRoofText_48526: TX_FAR _CeladonMartRoofText_48526 - TX_WAIT_BUTTON + TX_WAIT db "@" CeladonMartRoofText_4852c: TX_FAR _CeladonMartRoofText_4852c - TX_WAIT_BUTTON + TX_WAIT db "@" CeladonMartRoofScript_PrintDrinksInBag: diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 94f90f2b..d6269a64 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -320,9 +320,10 @@ CeruleanCityText_196d9: ReceivedTM28Text: TX_FAR _ReceivedTM28Text - db $0B + TX_SFX_ITEM_1 TX_FAR _ReceivedTM28Text2 - db $0D, "@" + TX_WAIT + db "@" TM28NoRoomText: TX_FAR _TM28NoRoomText @@ -356,13 +357,13 @@ CeruleanCityText6: CeruleanCityText7: TX_ASM ld a, [hRandomAdd] - cp $b4 + cp 180 jr c, .asm_e9fc9 ld hl, CeruleanCityText_19730 call PrintText jr .asm_d486e .asm_e9fc9 - cp $64 + cp 100 jr c, .asm_df99b ld hl, CeruleanCityText_19735 call PrintText @@ -388,19 +389,19 @@ CeruleanCityText_1973a: CeruleanCityText8: TX_ASM ld a, [hRandomAdd] - cp $b4 + cp 180 jr c, .asm_e28da ld hl, CeruleanCityText_1976f call PrintText jr .asm_f2f38 .asm_e28da - cp $78 + cp 120 jr c, .asm_15d08 ld hl, CeruleanCityText_19774 call PrintText jr .asm_f2f38 .asm_15d08 - cp $3c + cp 60 jr c, .asm_d7fea ld hl, CeruleanCityText_19779 call PrintText diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index ee71595f..fe6a163e 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -150,7 +150,8 @@ CeruleanGymText5: CeruleanGymText6: ReceivedTM11Text: TX_FAR _ReceivedTM11Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" CeruleanGymText7: TX_FAR _CeruleanGymText_5c7d3 @@ -158,7 +159,9 @@ CeruleanGymText7: CeruleanGymText_5c7d8: TX_FAR _CeruleanGymText_5c7d8 - db $11, $6, "@" + TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded + TX_BLINK + db "@" CeruleanGymText2: TX_ASM diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 4cae9989..8af7bbd3 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -233,8 +233,8 @@ BlaineBattleText: BlaineEndBattleText: TX_FAR _BlaineEndBattleText - db $11 - db $d + TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded + TX_WAIT db "@" BlaineFireBlastText: @@ -247,7 +247,7 @@ BlaineBadgeText: ReceivedTM38Text: TX_FAR _ReceivedTM38Text - db $0B + TX_SFX_ITEM_1 TX_FAR _TM38ExplanationText db "@" diff --git a/scripts/copycatshouse2f.asm b/scripts/copycatshouse2f.asm index 830bad50..87946b8f 100755 --- a/scripts/copycatshouse2f.asm +++ b/scripts/copycatshouse2f.asm @@ -53,10 +53,11 @@ TM31PreReceiveText: ReceivedTM31Text: TX_FAR _ReceivedTM31Text - db $0B + TX_SFX_ITEM_1 TM31ExplanationText1: TX_FAR _TM31ExplanationText1 - db $d, "@" + TX_WAIT + db "@" TM31ExplanationText2: TX_FAR _TM31ExplanationText2 @@ -64,7 +65,8 @@ TM31ExplanationText2: TM31NoRoomText: TX_FAR _TM31NoRoomText - db $d, "@" + TX_WAIT + db "@" CopycatsHouse2FText2: TX_FAR _CopycatsHouse2FText2 diff --git a/scripts/fanclub.asm b/scripts/fanclub.asm index f4244e46..b6d65586 100755 --- a/scripts/fanclub.asm +++ b/scripts/fanclub.asm @@ -144,7 +144,7 @@ FanClubText5: .receivedvouchertext TX_FAR ReceivedBikeVoucherText - db $11 + TX_SFX_KEY_ITEM TX_FAR ExplainBikeVoucherText db "@" diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index 8268930d..5f9823ad 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -193,7 +193,7 @@ FuchsiaGymText9: FuchsiaGymText10: TX_FAR _ReceivedTM06Text - db $11 + TX_SFX_KEY_ITEM TM06ExplanationText: TX_FAR _TM06ExplanationText diff --git a/scripts/fuchsiahouse2.asm b/scripts/fuchsiahouse2.asm index 7e90aa84..f9307c04 100755 --- a/scripts/fuchsiahouse2.asm +++ b/scripts/fuchsiahouse2.asm @@ -69,7 +69,7 @@ WardenGibberishText3: WardenTeethText1: TX_FAR _WardenTeethText1 - db $0b + TX_SFX_ITEM_1 WardenTeethText2: TX_FAR _WardenTeethText2 @@ -81,7 +81,8 @@ WardenThankYouText: ReceivedHM04Text: TX_FAR _ReceivedHM04Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" HM04ExplanationText: TX_FAR _HM04ExplanationText diff --git a/scripts/fuchsiahouse3.asm b/scripts/fuchsiahouse3.asm index fe1da024..586d62f5 100755 --- a/scripts/fuchsiahouse3.asm +++ b/scripts/fuchsiahouse3.asm @@ -49,7 +49,7 @@ FuchsiaHouse3Text_561bd: FuchsiaHouse3Text_561c2: TX_FAR _FuchsiaHouse3Text_561c2 - db $0B + TX_SFX_ITEM_1 db "@" UnusedText_561c8: diff --git a/scripts/lab3.asm b/scripts/lab3.asm index dbd0913d..b533d162 100755 --- a/scripts/lab3.asm +++ b/scripts/lab3.asm @@ -37,7 +37,8 @@ TM35PreReceiveText: ReceivedTM35Text: TX_FAR _ReceivedTM35Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" TM35ExplanationText: TX_FAR _TM35ExplanationText diff --git a/scripts/lavenderhouse1.asm b/scripts/lavenderhouse1.asm index 65637018..91b9286b 100755 --- a/scripts/lavenderhouse1.asm +++ b/scripts/lavenderhouse1.asm @@ -95,7 +95,7 @@ LavenderHouse1Text_1d94c: ReceivedFluteText: TX_FAR _ReceivedFluteText - db $11 + TX_SFX_KEY_ITEM TX_FAR _FluteExplanationText db "@" diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index 27651ef9..de36db4f 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -323,7 +323,9 @@ MtMoon3Script_49f69: MtMoon3Text_49f6f: TX_FAR _MtMoon3Text_49f6f - db $11, $d, "@" + TX_SFX_KEY_ITEM + TX_WAIT + db "@" MtMoon3Script_49f76: ld hl, MtMoon3Text_49f7f @@ -332,7 +334,8 @@ MtMoon3Script_49f76: MtMoon3Text_49f7f: TX_FAR _MtMoon3Text_49f7f - db $d, "@" + TX_WAIT + db "@" MtMoon3Text_49f85: TX_FAR _MtMoon3Text_49f85 @@ -352,7 +355,8 @@ MtMoon3Text_49f94: MtMoon3Text_49f99: TX_FAR _MtMoon3Text_49f99 - db $11, "@" + TX_SFX_KEY_ITEM + db "@" MtMoon3BattleText2: TX_FAR _MtMoon3BattleText2 diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index f24cc2c3..35bfb446 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -215,7 +215,8 @@ Museum1FText_5c28e: ReceivedOldAmberText: TX_FAR _ReceivedOldAmberText - db $0B, "@" + TX_SFX_ITEM_1 + db "@" Museum1FText_5c299: TX_FAR _Museum1FText_5c299 diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 7e5becf2..ac035550 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -149,7 +149,7 @@ PewterGymText4: PewterGymText5: TX_FAR _ReceivedTM34Text - db $0B + TX_SFX_ITEM_1 TX_FAR _TM34ExplanationText db "@" @@ -159,7 +159,7 @@ PewterGymText6: PewterGymText_5c4bc: TX_FAR _PewterGymText_5c4bc - db $0B + TX_SFX_LEVEL_UP ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded TX_FAR _PewterGymText_5c4c1 db "@" diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index 35c9026a..6aa7c813 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -130,7 +130,8 @@ RocketHideout1EndBattleText6: ret RocketHideout1Text_44c9f: - db $6, "@" + TX_BLINK + db "@" RocketHideout1BattleText2: TX_FAR _RocketHideout1BattleText2 diff --git a/scripts/rockethideoutelevator.asm b/scripts/rockethideoutelevator.asm index 526ac3cc..aed0f0cf 100755 --- a/scripts/rockethideoutelevator.asm +++ b/scripts/rockethideoutelevator.asm @@ -81,4 +81,5 @@ RocketHideoutElevatorText1: RocketHideoutElevatorText_4578b: TX_FAR _RocketElevatorText_4578b - db $d, "@" + TX_WAIT + db "@" diff --git a/scripts/route1.asm b/scripts/route1.asm index a4d6cde5..7f988fab 100755 --- a/scripts/route1.asm +++ b/scripts/route1.asm @@ -32,7 +32,8 @@ Route1ViridianMartSampleText: Route1Text_1cae8: TX_FAR _Route1Text_1cae8 - db $0b,"@" + TX_SFX_ITEM_1 + db "@" Route1Text_1caee: TX_FAR _Route1Text_1caee diff --git a/scripts/route12gateupstairs.asm b/scripts/route12gateupstairs.asm index 3c6c6231..cd355265 100755 --- a/scripts/route12gateupstairs.asm +++ b/scripts/route12gateupstairs.asm @@ -35,7 +35,8 @@ TM39PreReceiveText: ReceivedTM39Text: TX_FAR _ReceivedTM39Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" TM39ExplanationText: TX_FAR _TM39ExplanationText diff --git a/scripts/route12house.asm b/scripts/route12house.asm index 7ee86731..4b93395f 100755 --- a/scripts/route12house.asm +++ b/scripts/route12house.asm @@ -40,7 +40,7 @@ Route12HouseText_564c0: Route12HouseText_564c5: TX_FAR _Route12HouseText_564c5 - db $0B + TX_SFX_ITEM_1 TX_FAR _Route12HouseText_564ca db "@" diff --git a/scripts/route16house.asm b/scripts/route16house.asm index d8c9d5ed..5359248c 100755 --- a/scripts/route16house.asm +++ b/scripts/route16house.asm @@ -30,7 +30,8 @@ Route16HouseText3: ReceivedHM02Text: TX_FAR _ReceivedHM02Text - db $11, "@" + TX_SFX_KEY_ITEM + db "@" HM02ExplanationText: TX_FAR _HM02ExplanationText diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index ae9952a5..ee2e5b6b 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -89,4 +89,5 @@ Route22GateText_1e715: Route22GateText_1e71a: TX_FAR _Route22GateText_1e71a - db $0B, "@" + TX_SFX_ITEM_1 + db "@" diff --git a/scripts/route23.asm b/scripts/route23.asm index ed94d95c..4eb6b5f7 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -227,7 +227,7 @@ VictoryRoadGuardText1: VictoryRoadGuardText2: TX_FAR _VictoryRoadGuardText2 - db $b + TX_SFX_ITEM_1 TX_FAR _VictoryRoadGuardText_513a3 db "@" diff --git a/scripts/route24.asm b/scripts/route24.asm index 711fb1ea..7f1400f2 100755 --- a/scripts/route24.asm +++ b/scripts/route24.asm @@ -185,13 +185,15 @@ Route24Text1: Route24Text_51510: TX_FAR _Route24Text_51510 - db $0B + TX_SFX_ITEM_1 TX_FAR _Route24Text_51515 db "@" Route24Text_5151a: TX_FAR _Route24Text_5151a - db $0B, $6, "@" + TX_SFX_ITEM_1 + TX_BLINK + db "@" Route24Text_51521: TX_FAR _Route24Text_51521 diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index ae75aff2..6072f943 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -106,7 +106,7 @@ Route7GateText3: Route6GateText3: Route5GateText3: TX_FAR _SaffronGateText_8aaa9 - db $11 + TX_SFX_KEY_ITEM TX_FAR _SaffronGateText_1dff1 db "@" diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index 5f800987..80551e69 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -209,7 +209,7 @@ SafariZoneEntranceTextPointers: .MakePaymentText TX_FAR SafariZoneEntranceText_9e747 - db $b + TX_SFX_ITEM_1 TX_FAR _SafariZoneEntranceText_75360 db "@" diff --git a/scripts/safarizonesecrethouse.asm b/scripts/safarizonesecrethouse.asm index 37013b3b..44c89281 100755 --- a/scripts/safarizonesecrethouse.asm +++ b/scripts/safarizonesecrethouse.asm @@ -33,7 +33,8 @@ SafariZoneSecretHouseText_4a350: ReceivedHM03Text: TX_FAR _ReceivedHM03Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" HM03ExplanationText: TX_FAR _HM03ExplanationText diff --git a/scripts/saffroncity.asm b/scripts/saffroncity.asm index 4653f150..57a1a3a5 100755 --- a/scripts/saffroncity.asm +++ b/scripts/saffroncity.asm @@ -74,7 +74,8 @@ SaffronCityText11: SaffronCityText12: TX_FAR _SaffronCityText12 - db $15, "@" ; play PIDGEOT cry from TextCommandSounds + TX_CRY_PIDGEOT + db "@" SaffronCityText13: TX_FAR _SaffronCityText13 diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 146d31f9..6adb6d52 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -189,8 +189,8 @@ SaffronGymText_5d162: SaffronGymText_5d167: TX_FAR _SaffronGymText_5d167 - db $11 ; play same sound as red giving oak parcel - db $6 ; wait for keypress + TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded + TX_BLINK db "@" SaffronGymText_5d16e: @@ -203,7 +203,7 @@ SaffronGymText10: SaffronGymText11: TX_FAR ReceivedTM46Text - db $b + TX_SFX_ITEM_1 TX_FAR _TM46ExplanationText db "@" diff --git a/scripts/saffronhouse2.asm b/scripts/saffronhouse2.asm index b4f6e31c..10c3d29e 100755 --- a/scripts/saffronhouse2.asm +++ b/scripts/saffronhouse2.asm @@ -33,7 +33,8 @@ TM29PreReceiveText: ReceivedTM29Text: TX_FAR _ReceivedTM29Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" TM29ExplanationText: TX_FAR _TM29ExplanationText diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 994cd215..5f924bfc 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -330,7 +330,8 @@ SilphCoPresidentText: ReceivedSilphCoMasterBallText: TX_FAR _ReceivedSilphCoMasterBallText - db $11, "@" + TX_SFX_KEY_ITEM + db "@" SilphCo10Text_6231c: TX_FAR _SilphCo10Text_6231c diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm index 3a5d3650..c8d72689 100755 --- a/scripts/silphco2.asm +++ b/scripts/silphco2.asm @@ -162,7 +162,8 @@ SilphCo2Text_59ded: ReceivedTM36Text: TX_FAR _ReceivedTM36Text - db $0B, "@" + TX_SFX_ITEM_1 + db "@" TM36ExplanationText: TX_FAR _TM36ExplanationText diff --git a/scripts/ssanne7.asm b/scripts/ssanne7.asm index a2fb1387..0df842c2 100755 --- a/scripts/ssanne7.asm +++ b/scripts/ssanne7.asm @@ -73,7 +73,8 @@ ReceivingHM01Text: ReceivedHM01Text: TX_FAR _ReceivedHM01Text - db $11, "@" + TX_SFX_KEY_ITEM + db "@" SSAnne7Text_61932: TX_FAR _SSAnne7Text_61932 diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index eb726831..99bd4008 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -179,7 +179,7 @@ VermilionGymText6: VermilionGymText7: TX_FAR _ReceivedTM24Text - db $11 + TX_SFX_KEY_ITEM TX_FAR _TM24ExplanationText db "@" diff --git a/scripts/vermilionhouse2.asm b/scripts/vermilionhouse2.asm index 007df5ec..c0735f32 100755 --- a/scripts/vermilionhouse2.asm +++ b/scripts/vermilionhouse2.asm @@ -40,7 +40,7 @@ VermilionHouse2Text_560b1: VermilionHouse2Text_560b6: TX_FAR _VermilionHouse2Text_560b6 - db $0B + TX_SFX_ITEM_1 TX_FAR _VermilionHouse2Text_560bb db "@" diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm index cd629d7e..3ccdc509 100755 --- a/scripts/viridiancity.asm +++ b/scripts/viridiancity.asm @@ -258,7 +258,8 @@ ViridianCityText_191ca: ReceivedTM42Text: TX_FAR _ReceivedTM42Text - db $10, "@" + TX_SFX_ITEM_2 + db "@" TM42Explanation: TX_FAR _TM42Explanation diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 1557f68a..3d845c2a 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -307,11 +307,13 @@ ViridianGymText_74ace: ViridianGymText_74ad3: TX_FAR _ViridianGymText_74ad3 - db $0b, "@" + TX_SFX_LEVEL_UP ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded + db "@" ViridianGymText_74ad9: TX_FAR _ViridianGymText_74ad9 - db $0d, "@" + TX_WAIT + db "@" ViridianGymText12: TX_FAR _ViridianGymText12 @@ -319,7 +321,7 @@ ViridianGymText12: ViridianGymText13: TX_FAR _ReceivedTM27Text - db $0b + TX_SFX_ITEM_1 TM27ExplanationText: TX_FAR _TM27ExplanationText diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index 542040a6..451ab989 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -81,7 +81,7 @@ ViridianMartText4: ViridianMartText5: TX_FAR ViridianMartParcelQuestText - db $11 + TX_SFX_KEY_ITEM db "@" ViridianMartText2: |