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

Merge branch 'mistress' into renewables

Browse source
This commit is contained in:
Thorn Avery 2024-01-29 10:12:19 +13:00
commit 1bef80b2c8
41 changed files with 115 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/CeladonGym.asm
View file

@ -184,6 +184,8 @@ ErikaPreBattleText:
ReceivedRainbowBadgeText:
text_far _ReceivedRainbowBadgeText
sound_get_key_item
text_promptbutton
text_end
ErikaPostBattleAdviceText:

2
scripts/CeladonUniversityPokecenter.asm
View file

@ -42,7 +42,7 @@ CuboneSalesmanText:
ld hl, .NoMoneyText
jr .printText
.enoughMoney
lb bc, CUBONE, 17
lb bc, CUBONE, 23
call GivePokemon
jr nc, .done
xor a

2
scripts/CeruleanGym.asm
View file

@ -191,7 +191,7 @@ TM11NoRoomText:
ReceivedCascadeBadgeText:
text_far _ReceivedCascadeBadgeText
sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
sound_get_key_item
text_promptbutton
text_end

4
scripts/CinnabarGym.asm
View file

@ -291,8 +291,8 @@ BlainePreBattleText:
ReceivedVolcanoBadgeText:
text_far _ReceivedVolcanoBadgeText
sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
text_waitbutton
sound_get_key_item
text_promptbutton
text_end
BlainePostBattleAdviceText:

2
scripts/CinnabarLabFossilRoom.asm
View file

@ -76,7 +76,7 @@ Lab4Text1:
SetEvent EVENT_LAB_HANDING_OVER_FOSSIL_MON
ld a, [wFossilMon]
ld b, a
ld c, 44
ld c, 35
call GivePokemon
jr nc, .asm_75d93
ResetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL, EVENT_LAB_HANDING_OVER_FOSSIL_MON

4
scripts/FuchsiaGym.asm
View file

@ -185,6 +185,8 @@ KogaBeforeBattleText:
ReceivedSoulBadgeText:
text_far _ReceivedSoulBadgeText
sound_get_key_item
text_promptbutton
text_end
KogaPostBattleAdviceText:
@ -197,7 +199,7 @@ KogaSoulBadgeInfoText:
ReceivedTM06Text:
text_far _ReceivedTM06Text
sound_get_key_item
sound_get_item_1
TM06ExplanationText:
text_far _TM06ExplanationText

2
scripts/PewterGym.asm
View file

@ -196,7 +196,7 @@ TM34NoRoomText:
ReceivedBoulderBadgeText:
text_far _ReceivedBoulderBadgeText
sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded
sound_get_key_item
text_far _BrockBoulerBadgeInfoText ; Text to tell that the flash technique can be used
text_end

2
scripts/SaffronGym.asm
View file

@ -185,7 +185,7 @@ SabrinaPreBattleText:
ReceivedMarshBadgeText:
text_far _ReceivedMarshBadgeText
sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
sound_get_key_item
text_promptbutton
text_end

2
scripts/SilphGauntlet3F.asm
View file

@ -31,7 +31,7 @@ SilphGauntlet3FTrainerHeader2:
SilphGauntlet3FTrainerHeader3:
trainer EVENT_BEAT_GAUNTLET_ENGINEER, 1, SilphGauntlet3FBattleText4, SilphGauntlet3FEndBattleText4, SilphGauntlet3FAfterBattleText4
SilphGauntlet3FTrainerHeader4:
trainer EVENT_BEAT_GAUNTLET_ROCKER, 1, SilphGauntlet3FBattleText5, SilphGauntlet3FEndBattleText5, SilphGauntlet3FAfterBattleText5
trainer EVENT_BEAT_GAUNTLET_ROCKER, 2, SilphGauntlet3FBattleText5, SilphGauntlet3FEndBattleText5, SilphGauntlet3FAfterBattleText5
SilphGauntlet3FTrainerHeader5:
trainer EVENT_BEAT_GAUNTLET_FISHER, 2, SilphGauntlet3FBattleText6, SilphGauntlet3FEndBattleText6, SilphGauntlet3FAfterBattleText6
db -1 ; end

4
scripts/VermilionGym.asm
View file

@ -202,7 +202,7 @@ LTSurgeThunderBadgeInfoText:
ReceivedTM24Text:
text_far _ReceivedTM24Text
sound_get_key_item
sound_get_item_1
text_far _TM24ExplanationText
text_end
@ -212,6 +212,8 @@ TM24NoRoomText:
ReceivedThunderBadgeText:
text_far _ReceivedThunderBadgeText
sound_get_key_item
text_promptbutton
text_end
VermilionGymTrainerText1:

23
scripts/VictoryRoad2F.asm
View file

@ -222,18 +222,16 @@ DoubleEdgeGuy:
TM10PreReceiveText:
text "You should be"
line "proud of"
cont "yourself,"
cont "having battled"
cont "your way through"
cont "VICTORY ROAD so"
cont "courageously."
line "proud of your-"
cont "self, having"
cont "battled your way"
cont "through VICTORY"
cont "ROAD so bravely."
para "In recognition"
line "of your feat,"
cont "I can teach your"
cont "#MON"
cont "DOUBLE-EDGE."
para "In recognition of"
line "your feat, I can"
cont "teach your #-"
cont "MON DOUBLE-EDGE."
prompt
ReceivedTM10Text:
@ -253,7 +251,8 @@ TM10ExplanationText:
TM10Refused:
text "I'll teach your"
line "#MON anytime."
line "#MON at any"
cont "time."
done
DoubleEdgeNoRoomText:

3
scripts/ViridianGym.asm
View file

@ -274,7 +274,8 @@ GiovanniPreBattleText:
ReceivedEarthBadgeText:
text_far _ReceivedEarthBadgeText
sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded
sound_get_key_item
text_promptbutton
text_end
GiovanniPostBattleAdviceText: