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-08 08:35:22 +11:00
commit 5604c332f7
96 changed files with 2805 additions and 498 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/BrunswickTrail.asm
View file

@ -22,6 +22,7 @@ BrunswickTrail_TextPointers:
dw Lover1
dw Lover2
dw PickUpItemText
dw TrailDirections
BrunswickTrailTrainerHeaders:
def_trainers
@ -101,6 +102,10 @@ CaveGuy:
text_far _CaveGuy
text_end
TrailDirections:
text_far _TrailDirections
text_end
FakeTreeNoCut:
text_far _FakeTreeNoCut
text_end

10
scripts/CelesteHillOutside.asm
View file

@ -16,6 +16,8 @@ CelesteHillOutside_TextPointers:
dw CelesteHillOutsideTrainer1
dw CelesteHillOutsideTrainer2
dw CelesteHillOutsideTrainer3
dw HikerNPC
dw CelesteSign
CelesteHillOutsideTrainerHeaders:
def_trainers
@ -79,4 +81,12 @@ CelesteHillOutsideEndBattleText3:
CelesteHillOutsideAfterBattleText3:
text_far _CelesteHillOutsideAfterBattleText3
text_end
HikerNPC:
text_far _HikerNPC
text_end
CelesteSign:
text_far _CelesteSign
text_end

20
scripts/ChampionsRoom.asm
View file

@ -276,9 +276,25 @@ ChampionsRoom_TextPointers:
GaryText1:
text_asm
CheckEvent EVENT_BEAT_CHAMPION_RIVAL
jr nz, .championBeaten
ld hl, GaryChampionIntroText
call PrintText
ld a, 5
ld [wMusicFade], a
xor a
ld [wMusicFadeID], a
.waitloop
ld a, [wMusicFade]
and a
jr nz, .waitloop
ld a, SFX_STOP_ALL_MUSIC
call PlaySound
ld hl, GaryChampionIntroTextPart2
jr z, .printText
.championBeaten
ld hl, GaryText_76103
jr z, .printText
.printText
call PrintText
jp TextScriptEnd
@ -287,6 +303,10 @@ GaryChampionIntroText:
text_far _GaryChampionIntroText
text_end
GaryChampionIntroTextPart2:
text_far _GaryChampionIntroTextPart2
text_end
GaryDefeatedText:
text_far _GaryDefeatedText
text_end

8
scripts/CinnabarLabFossilRoom.asm
View file

@ -3,7 +3,6 @@ CinnabarLabFossilRoom_Script:
CinnabarLabFossilRoom_TextPointers:
dw Lab4Text1
dw Lab4Text2
Lab4Script_GetFossilsInBag:
; construct a list of all fossils in the player's bag
@ -99,12 +98,5 @@ Lab4Text_75dd5:
text_far _Lab4Text_75dd5
text_end
Lab4Text2:
text_asm
ld a, TRADE_FOR_MICHELLE
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd
LoadFossilItemAndMonNameBank1D:
farjp LoadFossilItemAndMonName

12
scripts/CitrineRocketHouse.asm
View file

@ -4,6 +4,8 @@ CitrineRocketHouse_Script:
CitrineRocketHouse_TextPointers:
dw MartGuy1Text
dw MartGuy2Text
dw MartGuy3Text
dw MartGuy4Text
dw RocketText1
dw RocketText2
dw MeowthText
@ -11,10 +13,16 @@ CitrineRocketHouse_TextPointers:
dw JessieFight
MartGuy1Text:
script_mart TM_SWORDS_DANCE, TM_TOXIC, TM_BODY_SLAM, TM_DOUBLE_EDGE, TM_BUBBLEBEAM, TM_ICE_BEAM, TM_BLIZZARD, TM_PAY_DAY, TM_COUNTER, TM_SEISMIC_TOSS, TM_MEGA_DRAIN, TM_THUNDERBOLT, TM_EARTHQUAKE, TM_DIG,
script_mart TM_SWORDS_DANCE, TM_WHIRLWIND, TM_TOXIC, TM_BODY_SLAM, TM_DOUBLE_EDGE, TM_BUBBLEBEAM, TM_WATER_GUN, TM_ICE_BEAM, TM_BLIZZARD, TM_HYPER_BEAM, TM_PAY_DAY, TM_COUNTER, TM_SEISMIC_TOSS, TM_RAGE
MartGuy2Text:
script_mart TM_PSYCHIC_M, TM_FIRE_BLAST, TM_THUNDER_WAVE, TM_EXPLOSION, TM_ROCK_SLIDE, PROTECTOR, UP_GRADE, DUBIOUS_DISC, METAL_COAT, BLK_AUGURITE, DOME_FOSSIL, HELIX_FOSSIL, WING_FOSSIL, OLD_AMBER
script_mart TM_MEGA_DRAIN, TM_SOLARBEAM, TM_DRAGON_RAGE, TM_THUNDERBOLT, TM_THUNDER, TM_EARTHQUAKE, TM_DIG, TM_PSYCHIC_M, TM_TELEPORT, TM_MIMIC, TM_BIDE, TM_METRONOME, TM_SELFDESTRUCT, TM_FIRE_BLAST
MartGuy3Text:
script_mart TM_SWIFT, TM_SKULL_BASH, TM_SOFTBOILED, TM_DREAM_EATER, TM_SKY_ATTACK, TM_REST, TM_THUNDER_WAVE, TM_PSYWAVE, TM_EXPLOSION, TM_ROCK_SLIDE, TM_TRI_ATTACK, TM_SUBSTITUTE
MartGuy4Text:
script_mart PROTECTOR, UP_GRADE, DUBIOUS_DISC, METAL_COAT, BLK_AUGURITE, DOME_FOSSIL, HELIX_FOSSIL, WING_FOSSIL, OLD_AMBER
RocketText1:
text_far _RocketText1

17
scripts/LancesRoom.asm
View file

@ -61,6 +61,7 @@ LanceScript0:
ld a, [wCoordIndex]
cp $3 ; Is player standing next to Lance's sprite?
jr nc, .notStandingNextToLance
call DoFacings
ld a, $1
ldh [hSpriteIndexOrTextID], a
jp DisplayTextID
@ -179,3 +180,19 @@ LanceRematchAfterBattleText:
text_asm
SetEvent EVENT_BEAT_LANCE
jp TextScriptEnd
DoFacings: ; PureRGBnote: ADDED: when about to fight Lance, lance and the player will face each other properly to talk.
ld a, [wYCoord]
cp 1
jr z, .leftOfLance
ld a, PLAYER_DIR_UP
ld [wPlayerMovingDirection], a
ret
.leftOfLance
ld a, PLAYER_DIR_RIGHT
ld [wPlayerMovingDirection], a
ld a, 1
ldh [hSpriteIndex], a
ld a, SPRITE_FACING_LEFT
ldh [hSpriteFacingDirection], a
jp SetSpriteFacingDirection

2
scripts/Route11Gate2F.asm
View file

@ -9,7 +9,7 @@ Route11Gate2F_TextPointers:
Route11GateUpstairsText1:
text_asm
ld a, TRADE_FOR_CHIKUCHIKU
ld a, TRADE_FOR_MICHELLE
ld [wWhichTrade], a
predef DoInGameTradeDialogue
Route11GateUpstairsScriptEnd:

8
scripts/ViridianForestNorthGate.asm
View file

@ -4,6 +4,7 @@ ViridianForestNorthGate_Script:
ViridianForestNorthGate_TextPointers:
dw ViridianForestExitText1
dw ViridianForestExitText2
dw ViridianForestExitText3
ViridianForestExitText1:
text_far _ViridianForestExitText1
@ -12,3 +13,10 @@ ViridianForestExitText1:
ViridianForestExitText2:
text_far _ViridianForestExitText2
text_end
ViridianForestExitText3:
text_asm
ld a, TRADE_FOR_CHIKUCHIKU
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

4
scripts/ViridianGym.asm
View file

@ -15,7 +15,7 @@ ViridianGym_Script:
db "VIRIDIAN CITY@"
.LeaderName:
db "GIOVANNI@"
db "????????@"
ViridianGymDoorCallbackScript:
ld hl, wCurrentMapScriptFlags
@ -263,8 +263,6 @@ GiovanniText:
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters ; giovanni is deliberately not scaled as he is always fought last
ld a, $8
ld [wGymLeaderNo], a
ld a, $3
ld [wViridianGymCurScript], a
.done