thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'mistress' into renewables

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

4
data/maps/dungeon_maps.asm
View file

@ -28,8 +28,8 @@ DungeonMaps1:
DungeonMaps2:
; all MT_MOON maps
db MT_MOON_1F, MT_MOON_B2F
; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME
db SS_ANNE_1F, HALL_OF_FAME
; all SS_ANNE and SILPH_GAUNTLET maps
db SS_ANNE_1F, SILPH_GAUNTLET_7F
; all POKEMON_TOWER maps and Lavender Town buildings
db LAVENDER_POKECENTER, LAVENDER_CUBONE_HOUSE
; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and

16
data/maps/objects/CinnabarVolcano.asm
View file

@ -3,17 +3,17 @@ CinnabarVolcano_Object:
def_warp_events
warp_event 15, 21, CINNABAR_VOLCANO_FLOORS, 9
warp_event 16, 5, CINNABAR_VOLCANO_FLOORS, 10
warp_event 16, 3, CINNABAR_VOLCANO_FLOORS, 10
def_bg_events
def_object_events
object_event 15, 5, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON
object_event 13, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
object_event 14, 13, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
object_event 14, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person
object_event 15, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
object_event 14, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
object_event 15, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
object_event 14, 5, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON
object_event 13, 16, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
object_event 14, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
object_event 14, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person
object_event 15, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
object_event 14, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
object_event 15, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
def_warps_to CINNABAR_VOLCANO

7
data/pokemon/base_stats/arcanineh.asm
View file

@ -15,9 +15,10 @@
; tm/hm learnset
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \
RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \
REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \
REST, ROCK_SLIDE, SUBSTITUTE
RAGE, DRAGON_RAGE, EARTHQUAKE, FISSURE, DIG, \
TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \
FIRE_BLAST, SWIFT, SKULL_BASH, REST, ROCK_SLIDE, \
SUBSTITUTE
; end
db BANK(ArcanineHPicFront)

10
data/pokemon/base_stats/raichua.asm
View file

@ -15,11 +15,11 @@
; tm/hm learnset
tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \
DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \
SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, \
TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \
SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \
SUBSTITUTE, FLY, SURF, FLASH
DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, SEISMIC_TOSS, \
RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \
MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \
SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, SUBSTITUTE, \
FLY, SURF, FLASH
; end
db BANK(RaichuAPicFront)

4
data/pokemon/base_stats/raticatea.asm
View file

@ -16,8 +16,8 @@
; tm/hm learnset
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \
WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \
DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \
SKULL_BASH, REST, SUBSTITUTE
THUNDERBOLT, THUNDER, DIG, MIMIC, DOUBLE_TEAM, \
BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE
; end
db BANK(RaticateAPicFront)

2
data/pokemon/base_stats/scizor.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/scizor.pic", 0, 1 ; sprite dimensions
dw ScizorPicFront, ScizorPicBack
db QUICK_ATTACK, IRON_HEAD, NO_MOVE, NO_MOVE ; level 1 learnset
db QUICK_ATTACK, BULLET_PUNCH, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

6
data/pokemon/base_stats/wiglett.asm
View file

@ -15,9 +15,9 @@
; tm/hm learnset
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \
WATER_GUN, RAGE, EARTHQUAKE, FISSURE, DIG, \
MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, \
CUT, SURF
WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, EARTHQUAKE, \
FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \
REST, SUBSTITUTE, CUT, SURF
; end
db BANK(WiglettPicFront)

6
data/pokemon/base_stats/wugtrio.asm
View file

@ -15,9 +15,9 @@
; tm/hm learnset
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \
WATER_GUN, HYPER_BEAM, RAGE, EARTHQUAKE, FISSURE, \
DIG, MIMIC, DOUBLE_TEAM, BIDE, REST, \
SUBSTITUTE, CUT, SURF
WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \
EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \
BIDE, REST, SUBSTITUTE, CUT, SURF
; end
db BANK(WugtrioPicFront)

14
data/pokemon/evos_moves.asm
View file

@ -1018,6 +1018,7 @@ SeelEvosMoves:
db EV_LEVEL, 34, DEWGONG
db 0
; Learnset
db 10, WATER_GUN
db 15, POWDER_SNOW
db 20, GROWL
db 25, AURORA_BEAM
@ -1516,8 +1517,8 @@ OmanyteEvosMoves:
db 21, ROCK_THROW
db 34, HORN_ATTACK
db 39, LEER
db 46, SPIKE_CANNON
db 53, HYDRO_PUMP
db 44, SPIKE_CANNON
db 49, HYDRO_PUMP
db 0
OmastarEvosMoves:
@ -1527,8 +1528,8 @@ OmastarEvosMoves:
db 21, ROCK_THROW
db 34, HORN_ATTACK
db 39, LEER
db 44, SPIKE_CANNON
db 49, HYDRO_PUMP
db 46, SPIKE_CANNON
db 53, HYDRO_PUMP
db 0
JigglypuffEvosMoves:
@ -1566,7 +1567,7 @@ EeveeEvosMoves:
; Learnset
db 8, SAND_ATTACK
db 16, GROWL
db 27, QUICK_ATTACK
db 23, QUICK_ATTACK
db 30, BITE
db 36, FOCUS_ENERGY
db 42, TAKE_DOWN
@ -1794,6 +1795,7 @@ DewgongEvosMoves:
; Evolutions
db 0
; Learnset
DB 10, WATER_GUN
db 15, POWDER_SNOW
db 20, GROWL
db 25, AURORA_BEAM
@ -2734,7 +2736,7 @@ ScizorEvosMoves:
db 29, SLASH
db 35, SWORDS_DANCE
db 42, AGILITY
db 50, BULLET_PUNCH
db 50, IRON_HEAD
db 0
RhyperiorEvosMoves:

4
data/pokemon/new_dex_text.asm
View file

@ -899,7 +899,7 @@ _RapidashGDexEntry::
dex
_SlowbroGDexEntry::
text "The DISTUBAN that"
text "The DISTURBAN that"
next "bit SLOWBRO has"
next "made it poisonous."
@ -915,7 +915,7 @@ _SlowkingGDexEntry::
page "Mumbling eerie"
next "spells, it makes"
next "strange POTIONs"
next "strange potions"
dex
_MukADexEntry::

1
data/pokemon/tradeback_moves.asm
View file

@ -1824,6 +1824,7 @@ EspeonTradebackMoves:
db 0
UmbreonTradebackMoves:
db 1, PSYCHIC_M
db 1, HEADBUTT
db 1, GROWTH
db 1, ROAR

4
data/text/text_7.asm
View file

@ -216,8 +216,8 @@ _AfterTrade6Text::
text "Isn't the Combat"
line "Breed amazing?"
para "HI JUMP KICK is"
line "so worth it!"
para "JUMP KICK is so"
line "worth it!"
done
_WannaTrade7Text::

2
data/trainers/ai_pointers.asm
View file

@ -37,7 +37,7 @@ TrainerAIPointers:
dbw 1, CooltrainerFAI ; cooltrainerf
dbw 1, BrunoAI ; bruno
dbw 5, BrockAI ; brock
dbw 2, MistyAI ; misty
dbw 1, MistyAI ; misty
dbw 1, LtSurgeAI ; surge
dbw 1, ErikaAI ; erika
dbw 2, KogaAI ; koga

23
data/trainers/special_moves.asm
View file

@ -163,8 +163,9 @@ SpecialTrainerMoves:
db BROCK, 7 ; Brock 6 badges
db 1, 1, SELFDESTRUCT
db 2, 2, SURF
db 2, 3, ICE_BEAM
db 2, 1, SPIKE_CANNON
db 2, 3, SURF
db 2, 4, ICE_BEAM
db 3, 1, SURF
db 3, 2, ROCK_THROW
db 3, 3, SWORDS_DANCE
@ -357,7 +358,7 @@ SpecialTrainerMoves:
db 3, 3, EMBER
db 4, 1, CUT
db 4, 4, DIG
db 5, 4, BODY_SLAM
db 5, 3, BODY_SLAM
db 0
db RIVAL2, 10 ; Pokemon Tower Rival w/Raichu
@ -1370,12 +1371,10 @@ SpecialTrainerMoves:
db 2, 1, BLIZZARD
db 2, 2, THUNDERBOLT
db 2, 3, SING
db 2, 4, HYPER_BEAM
db 3, 1, IRON_HEAD
db 3, 3, HYPER_BEAM
db 4, 1, EXPLOSION
db 2, 4, SURF
db 3, 3, BULLET_PUNCH
db 4, 1, FIRE_PUNCH
db 4, 2, THUNDERBOLT
db 4, 4, ICE_PUNCH
db 5, 1, THUNDERBOLT
db 5, 2, ICE_BEAM
db 5, 3, RECOVER
@ -1391,12 +1390,10 @@ SpecialTrainerMoves:
db 2, 1, BLIZZARD
db 2, 2, THUNDERBOLT
db 2, 3, SING
db 2, 4, HYPER_BEAM
db 3, 1, IRON_HEAD
db 3, 3, HYPER_BEAM
db 4, 1, EXPLOSION
db 2, 4, SURF
db 3, 3, BULLET_PUNCH
db 4, 1, FIRE_PUNCH
db 4, 2, THUNDERBOLT
db 4, 4, ICE_PUNCH
db 5, 1, THUNDERBOLT
db 5, 2, ICE_BEAM
db 5, 3, RECOVER

1
data/types/type_matchups.asm
View file

@ -110,4 +110,5 @@ TypeEffects:
db POISON, FAIRY, SUPER_EFFECTIVE
db STEEL, FAIRY, SUPER_EFFECTIVE
db DRAGON, FAIRY, NO_EFFECT
db ROCK, STEEL, NOT_VERY_EFFECTIVE
db -1 ; end

6
data/wild/maps/MtMoonB2F.asm
View file

@ -4,11 +4,11 @@ MtMoonB2FWildMons:
db 9, GEODUDE
db 10, BITTYBAT
db 10, GEODUDE
db 11, ZUBAT
db 10, PARAS
db 10, SANDSHREW
db 10, CLEFAIRY
db 10, PARAS
db 11, SANDSHREW
db 10, CLEFAIRY
db 12, SANDSHREW
db 12, ZUBAT
end_grass_wildmons

2
data/wild/maps/SilphGauntlet4F.asm
View file

@ -1,7 +1,7 @@
Gauntlet4FWildMons:
def_grass_wildmons 10 ; encounter rate
db 48, HAUNTER
db 48, MAROWAK
db 48, GUARDIA
db 49, NINETALES
db 49, BALUMBA
db 49, HAUNTER

5
engine/battle/trainer_ai.asm
View file

@ -763,10 +763,7 @@ BrockAI:
MistyAI:
cp 25 percent + 1
ret nc
ld a, 5
call AICheckIfHPBelowFraction
ret nc
jp AIUsePotion ; Replicates Starmie using Recover. Unlike other trainers that heal, Misty will do this 26% of the time instead of 51%.
jp AIUseXSpecial
LtSurgeAI:
cp 20 percent + 1

1
flake.nix
View file

@ -50,6 +50,7 @@
kep-hack = final.callPackage kepDerivation {
files = [
["kep.gbc" "kanto-expansion-pak.gbc"]
["kep.sym" "kanto-expansion-pak.sym"]
];
};
};

2
maps/CinnabarVolcano.blk
View file

@ -1 +1 @@
..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvv3vvvvvvvvv45vvvvvvvv+67,vvvv8-%88vvNvvvvv vvvvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN
..............}vvvvvvvvv}Qvvvvvvvvv}vvvvvvvvvvvvvvvvv3vvvvvvvvv45vvvvvvvv+67,vNvv8-%88vR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN

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:

2
text/SafariZoneGate.asm
View file

@ -55,7 +55,7 @@ _SafariZoneEntranceText_753bb::
done
_SafariZoneEntranceText_753c0::
text "Good Luck!"
text "Good luck!"
done
_SafariZoneEntranceText_753c5::

4
text/SilphGauntlet1F.asm
View file

@ -89,8 +89,8 @@ _SilphGauntlet1FEndBattleText5::
_SilphGauntlet1FAfterBattleText5::
text "BELLIGNAN loves"
line "eating bugs, so"
cont "it's perfect"
cont "for me!"
cont "it's a perfect"
cont "#MON for me!"
done
_SilphGauntlet1FBattleText6::

4
text/SilphGauntlet2F.asm
View file

@ -69,8 +69,8 @@ _SilphGauntlet2FEndBattleText4::
_SilphGauntlet2FAfterBattleText4::
text "The second I heard"
line "of the #MON"
cont "I could meet here,"
line "of the #MON I"
cont "could meet here,"
cont "I was stoked!"
para "I could never have"

10
text/SilphGauntlet3F.asm
View file

@ -71,12 +71,10 @@ _SilphGauntlet3FEndBattleText4::
_SilphGauntlet3FAfterBattleText4::
text "CHIEF called me"
line "here to fix some"
cont "lights."
para "But..."
para "They're working"
line "just fine..?"
cont "lights, but they"
cont "don't seem to be"
cont "malfunctioning"
cont "at all..."
done
_SilphGauntlet3FBattleText5:: ; Rolling Stones reference, Jumpin' Jack Flash (1968).

8
text/SilphGauntlet5F.asm
View file

@ -13,7 +13,7 @@ _SilphGauntlet5FAfterBattleText1::
text "You have what it"
line "takes to beat"
cont "the strongest of"
cont "TRAINERs."
cont "trainers."
para "You have my"
line "support!"
@ -93,7 +93,7 @@ _SilphGauntlet5FAfterBattleText5::
_SilphGauntlet5FBattleText6::
text "Once, I was the"
line "CHAMPION!"
line "champion!"
done
_SilphGauntlet5FEndBattleText6::
@ -102,9 +102,9 @@ _SilphGauntlet5FEndBattleText6::
prompt
_SilphGauntlet5FAfterBattleText6::
text "Many TRAINERs have"
text "Many trainers have"
line "held the title of"
cont "CHAMPION!"
cont "champion before!"
para "In fact, I've"
line "recognised a few"

24
text/SilphGauntlet6F.asm
View file

@ -139,23 +139,6 @@ _SilphGauntlet6FAfterBattleText4::
cont "on it!"
done
; An alternate quote.
; It's a bit too fanficy and I think Erika getting zooted off Vileplume violates her lore a bit.
; Maybe it could be used somewhere else?
; text "Hmm? Why am I"
; line "always asleep?"
;
; para "VILEPLUME'S"
; line "SLEEP POWDER..."
;
; para "Before I drift"
; line "off, it gives"
; cont "a euphoric"
; cont "feeling..."
;
; para "Zzz..."
_SilphGauntlet6FBattleText5::
text "Fwahahaha!"
@ -188,9 +171,10 @@ _SilphGauntlet6FAfterBattleText5::
done
_SilphGauntlet6FBattleText6::
text "After defeating"
line "the KARATE KING,"
cont "I felt nigh-"
text "When the DOJO's"
line "MASTER fell to"
cont "my #MON, I"
cont "felt nearly"
cont "unstoppable..."
para "But you humbled"

2
text/SilphGauntlet7F.asm
View file

@ -181,7 +181,7 @@ _ChiefPainting2::
_ChiefMonologueRematch::
text "CHIEF: What?"
line "you're back?"
line "You're back?"
para "Hmm...you're"
line "looking for a"

13
text/VermilionGym.asm
View file

@ -24,16 +24,15 @@ _LTSurgePreBattleText:: ; Yellow text, which works better with his rematch text.
_SurgeRematchPreBattleText::
text "Hey there, kid!"
line "Pretty shocking"
cont "you made it"
cont "that you made it"
cont "through the"
cont "#MON LEAGUE!"
para "I can't think"
line "of a stronger"
cont "TRAINER I've"
cont "battled since"
cont "first arriving"
cont "in KANTO..."
para "I can't think of"
line "anyone stronger"
cont "since I first"
cont "arrived here in"
cont "KANTO..."
para "Let's have a"
line "rematch, eh?"

4
text/VermilionGym_2.asm
View file

@ -152,6 +152,6 @@ _VermilionGymGuidePostBattleText::
done
_SurgeRematchDefeatedText::
text "Absolutely"
line "shocking!"
text "Hah!"
line "Shocking!"
prompt