thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up text commands

Browse source
This commit is contained in:
dannye 2016-07-18 01:17:03 -05:00
parent a51037eeee
commit 80bae03975
79 changed files with 293 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/bikeshop.asm
View file

@ -103,7 +103,8 @@ BikeShopText_1d81f:
BikeShopText_1d824:
TX_FAR _BikeShopText_1d824
db $11, "@"
TX_SFX_KEY_ITEM
db "@"
BikeShopComeAgainText:
TX_FAR _BikeShopComeAgainText

2
scripts/billshouse.asm
View file

@ -192,7 +192,7 @@ BillThankYouText:
SSTicketReceivedText:
TX_FAR _SSTicketReceivedText
TX_SFX_KEY_ITEM
TX_BUTTON_SOUND
TX_BLINK
db "@"
SSTicketNoRoomText:

3
scripts/celadoncity.asm
View file

@ -69,7 +69,8 @@ TM41PreText:
ReceivedTM41Text:
TX_FAR _ReceivedTM41Text
db $0B, "@"
TX_SFX_ITEM_1
db "@"
TM41ExplanationText:
TX_FAR _TM41ExplanationText

3
scripts/celadondiner.asm
View file

@ -54,7 +54,8 @@ CeladonDinerText_491a7:
ReceivedCoinCaseText:
TX_FAR _ReceivedCoinCaseText
db $11, "@"
TX_SFX_KEY_ITEM
db "@"
CoinCaseNoRoomText:
TX_FAR _CoinCaseNoRoomText

6
scripts/celadongamecorner.asm
View file

@ -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:

2
scripts/celadongym.asm
View file

@ -201,7 +201,7 @@ CeladonGymText9:
TM21Text:
TX_FAR _ReceivedTM21Text
db $0B
TX_SFX_ITEM_1
TX_FAR _TM21ExplanationText
db "@"

2
scripts/celadonmansion3.asm
View file

@ -47,7 +47,7 @@ DirectorText:
.CompletedDexText
TX_FAR _CompletedDexText
db $6
TX_BLINK
TX_ASM
callab DisplayDiploma
ld a, $1

3
scripts/celadonmart3.asm
View file

@ -47,7 +47,8 @@ TM18PreReceiveText:
ReceivedTM18Text:
TX_FAR _ReceivedTM18Text
db $0B, "@"
TX_SFX_ITEM_1
db "@"
TM18ExplanationText:
TX_FAR _TM18ExplanationText

22
scripts/celadonmartroof.asm
View file

@ -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:

15
scripts/ceruleancity.asm
View file

@ -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

7
scripts/ceruleangym.asm
View file

@ -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

6
scripts/cinnabargym.asm
View file

@ -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 "@"

8
scripts/copycatshouse2f.asm
View file

@ -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

2
scripts/fanclub.asm
View file

@ -144,7 +144,7 @@ FanClubText5:
.receivedvouchertext
TX_FAR ReceivedBikeVoucherText
db $11
TX_SFX_KEY_ITEM
TX_FAR ExplainBikeVoucherText
db "@"

2
scripts/fuchsiagym.asm
View file

@ -193,7 +193,7 @@ FuchsiaGymText9:
FuchsiaGymText10:
TX_FAR _ReceivedTM06Text
db $11
TX_SFX_KEY_ITEM
TM06ExplanationText:
TX_FAR _TM06ExplanationText

5
scripts/fuchsiahouse2.asm
View file

@ -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

2
scripts/fuchsiahouse3.asm
View file

@ -49,7 +49,7 @@ FuchsiaHouse3Text_561bd:
FuchsiaHouse3Text_561c2:
TX_FAR _FuchsiaHouse3Text_561c2
db $0B
TX_SFX_ITEM_1
db "@"
UnusedText_561c8:

3
scripts/lab3.asm
View file

@ -37,7 +37,8 @@ TM35PreReceiveText:
ReceivedTM35Text:
TX_FAR _ReceivedTM35Text
db $0B, "@"
TX_SFX_ITEM_1
db "@"
TM35ExplanationText:
TX_FAR _TM35ExplanationText

2
scripts/lavenderhouse1.asm
View file

@ -95,7 +95,7 @@ LavenderHouse1Text_1d94c:
ReceivedFluteText:
TX_FAR _ReceivedFluteText
db $11
TX_SFX_KEY_ITEM
TX_FAR _FluteExplanationText
db "@"

10
scripts/mtmoon3.asm
View file

@ -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

3
scripts/museum1f.asm
View file

@ -215,7 +215,8 @@ Museum1FText_5c28e:
ReceivedOldAmberText:
TX_FAR _ReceivedOldAmberText
db $0B, "@"
TX_SFX_ITEM_1
db "@"
Museum1FText_5c299:
TX_FAR _Museum1FText_5c299

4
scripts/pewtergym.asm
View file

@ -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 "@"

3
scripts/rockethideout1.asm
View file

@ -130,7 +130,8 @@ RocketHideout1EndBattleText6:
ret
RocketHideout1Text_44c9f:
db $6, "@"
TX_BLINK
db "@"
RocketHideout1BattleText2:
TX_FAR _RocketHideout1BattleText2

3
scripts/rockethideoutelevator.asm
View file

@ -81,4 +81,5 @@ RocketHideoutElevatorText1:
RocketHideoutElevatorText_4578b:
TX_FAR _RocketElevatorText_4578b
db $d, "@"
TX_WAIT
db "@"

3
scripts/route1.asm
View file

@ -32,7 +32,8 @@ Route1ViridianMartSampleText:
Route1Text_1cae8:
TX_FAR _Route1Text_1cae8
db $0b,"@"
TX_SFX_ITEM_1
db "@"
Route1Text_1caee:
TX_FAR _Route1Text_1caee

3
scripts/route12gateupstairs.asm
View file

@ -35,7 +35,8 @@ TM39PreReceiveText:
ReceivedTM39Text:
TX_FAR _ReceivedTM39Text
db $0B, "@"
TX_SFX_ITEM_1
db "@"
TM39ExplanationText:
TX_FAR _TM39ExplanationText

2
scripts/route12house.asm
View file

@ -40,7 +40,7 @@ Route12HouseText_564c0:
Route12HouseText_564c5:
TX_FAR _Route12HouseText_564c5
db $0B
TX_SFX_ITEM_1
TX_FAR _Route12HouseText_564ca
db "@"

3
scripts/route16house.asm
View file

@ -30,7 +30,8 @@ Route16HouseText3:
ReceivedHM02Text:
TX_FAR _ReceivedHM02Text
db $11, "@"
TX_SFX_KEY_ITEM
db "@"
HM02ExplanationText:
TX_FAR _HM02ExplanationText

3
scripts/route22gate.asm
View file

@ -89,4 +89,5 @@ Route22GateText_1e715:
Route22GateText_1e71a:
TX_FAR _Route22GateText_1e71a
db $0B, "@"
TX_SFX_ITEM_1
db "@"

2
scripts/route23.asm
View file

@ -227,7 +227,7 @@ VictoryRoadGuardText1:
VictoryRoadGuardText2:
TX_FAR _VictoryRoadGuardText2
db $b
TX_SFX_ITEM_1
TX_FAR _VictoryRoadGuardText_513a3
db "@"

6
scripts/route24.asm
View file

@ -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

2
scripts/route5gate.asm
View file

@ -106,7 +106,7 @@ Route7GateText3:
Route6GateText3:
Route5GateText3:
TX_FAR _SaffronGateText_8aaa9
db $11
TX_SFX_KEY_ITEM
TX_FAR _SaffronGateText_1dff1
db "@"

2
scripts/safarizoneentrance.asm
View file

@ -209,7 +209,7 @@ SafariZoneEntranceTextPointers:
.MakePaymentText
TX_FAR SafariZoneEntranceText_9e747
db $b
TX_SFX_ITEM_1
TX_FAR _SafariZoneEntranceText_75360
db "@"

3
scripts/safarizonesecrethouse.asm
View file

@ -33,7 +33,8 @@ SafariZoneSecretHouseText_4a350:
ReceivedHM03Text:
TX_FAR _ReceivedHM03Text
db $0B, "@"
TX_SFX_ITEM_1
db "@"
HM03ExplanationText:
TX_FAR _HM03ExplanationText

3
scripts/saffroncity.asm
View file

@ -74,7 +74,8 @@ SaffronCityText11:
SaffronCityText12:
TX_FAR _SaffronCityText12
db $15, "@" ; play PIDGEOT cry from TextCommandSounds
TX_CRY_PIDGEOT
db "@"
SaffronCityText13:
TX_FAR _SaffronCityText13

6
scripts/saffrongym.asm
View file

@ -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 "@"

3
scripts/saffronhouse2.asm
View file

@ -33,7 +33,8 @@ TM29PreReceiveText:
ReceivedTM29Text:
TX_FAR _ReceivedTM29Text
db $0B, "@"
TX_SFX_ITEM_1
db "@"
TM29ExplanationText:
TX_FAR _TM29ExplanationText

3
scripts/silphco11.asm
View file

@ -330,7 +330,8 @@ SilphCoPresidentText:
ReceivedSilphCoMasterBallText:
TX_FAR _ReceivedSilphCoMasterBallText
db $11, "@"
TX_SFX_KEY_ITEM
db "@"
SilphCo10Text_6231c:
TX_FAR _SilphCo10Text_6231c

3
scripts/silphco2.asm
View file

@ -162,7 +162,8 @@ SilphCo2Text_59ded:
ReceivedTM36Text:
TX_FAR _ReceivedTM36Text
db $0B, "@"
TX_SFX_ITEM_1
db "@"
TM36ExplanationText:
TX_FAR _TM36ExplanationText

3
scripts/ssanne7.asm
View file

@ -73,7 +73,8 @@ ReceivingHM01Text:
ReceivedHM01Text:
TX_FAR _ReceivedHM01Text
db $11, "@"
TX_SFX_KEY_ITEM
db "@"
SSAnne7Text_61932:
TX_FAR _SSAnne7Text_61932

2
scripts/vermiliongym.asm
View file

@ -179,7 +179,7 @@ VermilionGymText6:
VermilionGymText7:
TX_FAR _ReceivedTM24Text
db $11
TX_SFX_KEY_ITEM
TX_FAR _TM24ExplanationText
db "@"

2
scripts/vermilionhouse2.asm
View file

@ -40,7 +40,7 @@ VermilionHouse2Text_560b1:
VermilionHouse2Text_560b6:
TX_FAR _VermilionHouse2Text_560b6
db $0B
TX_SFX_ITEM_1
TX_FAR _VermilionHouse2Text_560bb
db "@"

3
scripts/viridiancity.asm
View file

@ -258,7 +258,8 @@ ViridianCityText_191ca:
ReceivedTM42Text:
TX_FAR _ReceivedTM42Text
db $10, "@"
TX_SFX_ITEM_2
db "@"
TM42Explanation:
TX_FAR _TM42Explanation

8
scripts/viridiangym.asm
View file

@ -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

2
scripts/viridianmart.asm
View file

@ -81,7 +81,7 @@ ViridianMartText4:
ViridianMartText5:
TX_FAR ViridianMartParcelQuestText
db $11
TX_SFX_KEY_ITEM
db "@"
ViridianMartText2: