mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-16 18:30:50 +12:00
508a4e790e
Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you. - Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them - Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy. - Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later. - Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8. - Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively - Restructured the Pokedex a little. Don't worry, Lickitung's still number 108! - All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones - Removed Blastyke as a Game Corner prize, replacing it with Squeamata. - Garnet Cavern is now properly listed as a dungeon map - Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden - Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent - Finished Gauntlet 6F except for the trainer text (PvK please help) - Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage. - Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit - Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke. - New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone! - Fixed a bug preventing the trade for Haunter from being accessed.
88 lines
1.6 KiB
NASM
88 lines
1.6 KiB
NASM
SilphCoElevator_Script:
|
|
ld hl, wCurrentMapScriptFlags
|
|
bit 5, [hl]
|
|
res 5, [hl]
|
|
push hl
|
|
call nz, SilphCoElevatorScript_457dc
|
|
pop hl
|
|
bit 7, [hl]
|
|
res 7, [hl]
|
|
call nz, SilphCoElevatorScript_45827
|
|
xor a
|
|
ld [wAutoTextBoxDrawingControl], a
|
|
inc a
|
|
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
|
|
ret
|
|
|
|
SilphCoElevatorScript_457dc:
|
|
ld hl, wWarpEntries
|
|
ld a, [wWarpedFromWhichWarp]
|
|
ld b, a
|
|
ld a, [wWarpedFromWhichMap]
|
|
ld c, a
|
|
call SilphCoElevatorScript_457ea
|
|
|
|
SilphCoElevatorScript_457ea:
|
|
inc hl
|
|
inc hl
|
|
ld a, b
|
|
ld [hli], a
|
|
ld a, c
|
|
ld [hli], a
|
|
ret
|
|
|
|
SilphCoElevatorScript_457f1:
|
|
ld hl, SilphCoElevatorFloors
|
|
call LoadItemList
|
|
ld hl, SilphCoElevatorWarpMaps
|
|
ld de, wElevatorWarpMaps
|
|
ld bc, SilphCoElevatorWarpMapsEnd - SilphCoElevatorWarpMaps
|
|
call CopyData
|
|
ret
|
|
|
|
SilphCoElevatorFloors:
|
|
db 11 ; #
|
|
db FLOOR_1F
|
|
db FLOOR_2F
|
|
db FLOOR_3F
|
|
db FLOOR_4F
|
|
db FLOOR_5F
|
|
db FLOOR_6F
|
|
db FLOOR_7F
|
|
db FLOOR_8F
|
|
db FLOOR_9F
|
|
db FLOOR_10F
|
|
db FLOOR_11F
|
|
db -1 ; end
|
|
|
|
; These specify where the player goes after getting out of the elevator.
|
|
SilphCoElevatorWarpMaps:
|
|
; warp number, map id
|
|
db 3, SILPH_CO_1F
|
|
;db 2, SILPH_CO_2F
|
|
db 2, SILPH_CO_3F
|
|
;db 2, SILPH_CO_4F
|
|
db 2, SILPH_CO_5F
|
|
;db 2, SILPH_CO_6F
|
|
db 2, SILPH_CO_7F
|
|
;db 2, SILPH_CO_8F
|
|
db 2, SILPH_CO_9F
|
|
db 2, SILPH_CO_10F
|
|
db 1, SILPH_CO_11F
|
|
SilphCoElevatorWarpMapsEnd:
|
|
|
|
SilphCoElevatorScript_45827:
|
|
call Delay3
|
|
farcall ShakeElevator
|
|
ret
|
|
|
|
SilphCoElevator_TextPointers:
|
|
dw SilphCoElevatorText1
|
|
|
|
SilphCoElevatorText1:
|
|
text_asm
|
|
call SilphCoElevatorScript_457f1
|
|
ld hl, SilphCoElevatorWarpMaps
|
|
predef DisplayElevatorFloorMenu
|
|
jp TextScriptEnd
|