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-11-28 10:08:13 +11:00
commit 02536e80ac
65 changed files with 3761 additions and 394 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scripts/ChampionsRoom.asm
View file

@ -40,8 +40,8 @@ GaryScript1:
ret
GaryEntrance_RLEMovement:
db D_UP, 1
db D_RIGHT, 1
db D_UP, 2
db D_UP, 2
db D_UP, 3
db -1 ; end
@ -159,14 +159,13 @@ OakEntranceAfterVictoryMovement:
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db -1 ; end
GaryScript5:
ld a, [wd730]
bit 0, a
ret nz
ld a, PLAYER_DIR_LEFT
ld [wPlayerMovingDirection], a
ld a, $1
ldh [hSpriteIndex], a
ld a, SPRITE_FACING_LEFT
@ -244,7 +243,7 @@ GaryScript9:
ret
WalkToHallOfFame_RLEMovment:
db D_UP, 4
db D_UP, 5
db D_LEFT, 1
db -1 ; end

62
scripts/FishingGuruHouse.asm Normal file
View file

@ -0,0 +1,62 @@
FishingGuruHouse_Script:
jp EnableAutoTextBoxDrawing
FishingGuruHouse_TextPointers:
dw FishingGuruHouseText1
dw JumpText
FishingGuruHouseText1:
text_asm
ld a, [wd728]
bit 5, a ; received fishing rod?
jr nz, .got_item
ld hl, FishingGuruHouseText_564c0
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
jr nz, .refused
lb bc, FISHING_ROD, 1
call GiveItem
jr nc, .bag_full
ld hl, wd728
set 5, [hl] ; received fishing rod
ld hl, FishingGuruHouseText_564c5
jr .done
.bag_full
ld hl, FishingGuruHouseText_564d9
jr .done
.refused
ld hl, FishingGuruHouseText_564cf
jr .done
.got_item
ld hl, FishingGuruHouseText_564d4
.done
call PrintText
jp TextScriptEnd
FishingGuruHouseText_564c0:
text_far _FishingGuruHouseText_564c0
text_end
FishingGuruHouseText_564c5:
text_far _FishingGuruHouseText_564c5
sound_get_item_1
text_far _FishingGuruHouseText_564ca
text_end
FishingGuruHouseText_564cf:
text_far _FishingGuruHouseText_564cf
text_end
FishingGuruHouseText_564d4:
text_far _FishingGuruHouseText_564d4
text_end
FishingGuruHouseText_564d9:
text_far _FishingGuruHouseText_564d9
text_end
JumpText:
text_far _JumpText
text_end

4
scripts/OaksLab.asm
View file

@ -365,6 +365,8 @@ OaksLabScript9: ; This is where Blue picks up the ball and removes the sprite.
cp $7
jr nz, .rivalDidNotChoseBall4
ld a, HS_STARTER_BALL_4
ld [wMissableObjectIndex], a
predef HideObject
ld a, HS_DAMIEN ; This makes the starter gifts show up if you and your rival picked Pikachu and Eevee. It used to be coded differently but for some reason they still showed up if you picked Charmander or Squirtle, so I had to change it.
ld [wMissableObjectIndex], a
predef ShowObject
@ -374,6 +376,8 @@ OaksLabScript9: ; This is where Blue picks up the ball and removes the sprite.
jr .hideBallAndContinue
.rivalDidNotChoseBall4
ld a, HS_STARTER_BALL_5
ld [wMissableObjectIndex], a
predef HideObject
ld a, HS_DAMIEN
ld [wMissableObjectIndex], a
predef ShowObject

62
scripts/Route12SuperRodHouse.asm
View file

@ -1,62 +0,0 @@
Route12SuperRodHouse_Script:
jp EnableAutoTextBoxDrawing
Route12SuperRodHouse_TextPointers:
dw Route12HouseText1
dw JumpText
Route12HouseText1:
text_asm
ld a, [wd728]
bit 5, a ; received super rod?
jr nz, .got_item
ld hl, Route12HouseText_564c0
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
jr nz, .refused
lb bc, SUPER_ROD, 1
call GiveItem
jr nc, .bag_full
ld hl, wd728
set 5, [hl] ; received super rod
ld hl, Route12HouseText_564c5
jr .done
.bag_full
ld hl, Route12HouseText_564d9
jr .done
.refused
ld hl, Route12HouseText_564cf
jr .done
.got_item
ld hl, Route12HouseText_564d4
.done
call PrintText
jp TextScriptEnd
Route12HouseText_564c0:
text_far _Route12HouseText_564c0
text_end
Route12HouseText_564c5:
text_far _Route12HouseText_564c5
sound_get_item_1
text_far _Route12HouseText_564ca
text_end
Route12HouseText_564cf:
text_far _Route12HouseText_564cf
text_end
Route12HouseText_564d4:
text_far _Route12HouseText_564d4
text_end
Route12HouseText_564d9:
text_far _Route12HouseText_564d9
text_end
JumpText:
text_far _JumpText
text_end

2
scripts/SilphGauntlet7F.asm
View file

@ -107,7 +107,7 @@ ChiefScript4:
ld [wMissableObjectIndex], a
predef HideObject
SetEvent EVENT_MEWTWO_UNLOCKED
ResetEventRange SILPH_GAUNTLET_EVENTS_START, SILPH_GAUNTLET_EVENTS_END, 1
ResetEventRange EVENT_BEAT_GAUNTLET_YOUNGSTER, EVENT_BEAT_GAUNTLET_BLAINE
ld a, $0
ld [wSilphGauntlet7FCurScript], a