mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-17 02:40:50 +12:00
revert 2 bug fixes due to issues, add to celadon U
the ghost without silph scope fix doesn't work due to a codebase change, and the night shade wiggly animation causes a bank overflow celadon university has 3 more books detailing lore from one of the old pokedex books
This commit is contained in:
parent
23106d3417
commit
5bb215ec23
|
@ -11,8 +11,11 @@ CeladonUniversityInside_Object:
|
||||||
def_object_events
|
def_object_events
|
||||||
object_event 18, 5, SPRITE_MIDDLE_AGED_MAN, STAY, ANY_DIR, 1 ; person
|
object_event 18, 5, SPRITE_MIDDLE_AGED_MAN, STAY, ANY_DIR, 1 ; person
|
||||||
object_event 4, 17, SPRITE_GAMEBOY_KID, STAY, DOWN, 2 ; person
|
object_event 4, 17, SPRITE_GAMEBOY_KID, STAY, DOWN, 2 ; person
|
||||||
object_event 3, 15, SPRITE_POKEDEX, STAY, NONE, 3 ; person
|
object_event 3, 15, SPRITE_PAPER, STAY, NONE, 3 ; person
|
||||||
object_event 17, 5, SPRITE_POKEDEX, STAY, NONE, 4 ; person
|
object_event 17, 5, SPRITE_POKEDEX, STAY, NONE, 4 ; person
|
||||||
object_event 10, 5, SPRITE_SCIENTIST, STAY, NONE, 5 ; person
|
object_event 10, 5, SPRITE_SCIENTIST, STAY, NONE, 5 ; person
|
||||||
|
object_event 3, 8, SPRITE_PAPER, STAY, NONE, 6 ; person
|
||||||
|
object_event 5, 4, SPRITE_PAPER, STAY, NONE, 7 ; person
|
||||||
|
object_event 1, 4, SPRITE_PAPER, STAY, NONE, 8 ; person
|
||||||
|
|
||||||
def_warps_to CELADON_UNIVERSITY_INSIDE
|
def_warps_to CELADON_UNIVERSITY_INSIDE
|
|
@ -1878,8 +1878,8 @@ AnimationWavyScreen:
|
||||||
ld c, $ff
|
ld c, $ff
|
||||||
ld hl, WavyScreenLineOffsets
|
ld hl, WavyScreenLineOffsets
|
||||||
.loop
|
.loop
|
||||||
ld a, [hl] ; this fixes the wavy screen - PvK
|
; ld a, [hl] ; this fixes the wavy screen, but causes a bank overflow
|
||||||
ldh [hSCX], a
|
; ldh [hSCX], a
|
||||||
push hl
|
push hl
|
||||||
.innerLoop
|
.innerLoop
|
||||||
call WavyScreen_SetSCX
|
call WavyScreen_SetSCX
|
||||||
|
@ -1896,7 +1896,7 @@ AnimationWavyScreen:
|
||||||
dec c
|
dec c
|
||||||
jr nz, .loop
|
jr nz, .loop
|
||||||
xor a
|
xor a
|
||||||
ldh [hSCX], a ; also fixing the wavy screen - PvK
|
; ldh [hSCX], a ; also fixing the wavy screen
|
||||||
ldh [hWY], a
|
ldh [hWY], a
|
||||||
call SaveScreenTilesToBuffer2
|
call SaveScreenTilesToBuffer2
|
||||||
call ClearScreen
|
call ClearScreen
|
||||||
|
|
|
@ -2405,11 +2405,7 @@ PartyMenuOrRockOrRun:
|
||||||
ld [wd0b5], a
|
ld [wd0b5], a
|
||||||
call GetMonHeader
|
call GetMonHeader
|
||||||
ld de, vFrontPic
|
ld de, vFrontPic
|
||||||
call IsGhostBattle ; this prevents ghosts from being identified without the silph scope - PvK
|
call LoadMonFrontSprite ; want to implement https://github.com/pret/pokered/wiki/Bugs-and-Glitches#the-pok%C3%A9mon-behind-the-ghost-is-identified-as-seen-in-the-pok%C3%A9dex-even-if-you-didnt-use-the-silph-scope-on-it but the codebase was changed since the time of writing
|
||||||
push af
|
|
||||||
call nz, LoadMonFrontSprite
|
|
||||||
pop af
|
|
||||||
call z, LoadGhostPic ; fix ends here, just make it "call LoadMonFrontSprite on line 2408 to revert.
|
|
||||||
jr .enemyMonPicReloaded
|
jr .enemyMonPicReloaded
|
||||||
.doEnemyMonAnimation
|
.doEnemyMonAnimation
|
||||||
ld b, BANK(AnimationSubstitute) ; BANK(AnimationMinimizeMon)
|
ld b, BANK(AnimationSubstitute) ; BANK(AnimationMinimizeMon)
|
||||||
|
|
|
@ -8,6 +8,9 @@ CeladonUniversityInside_TextPointers:
|
||||||
dw CeladonUniversityInsideText3
|
dw CeladonUniversityInsideText3
|
||||||
dw CeladonUniversityInsideText4
|
dw CeladonUniversityInsideText4
|
||||||
dw CeladonUniversityInsideText5
|
dw CeladonUniversityInsideText5
|
||||||
|
dw CeladonUniversityInsideBookcaseText1
|
||||||
|
dw CeladonUniversityInsideBookcaseText2
|
||||||
|
dw CeladonUniversityInsideBookcaseText3
|
||||||
|
|
||||||
CeladonUniversityInsideText1:
|
CeladonUniversityInsideText1:
|
||||||
text_far _CeladonUniversityInsideText1
|
text_far _CeladonUniversityInsideText1
|
||||||
|
@ -44,4 +47,16 @@ CeladonUniversityInsideText5:
|
||||||
call DisplayPokedex
|
call DisplayPokedex
|
||||||
jp TextScriptEnd
|
jp TextScriptEnd
|
||||||
|
|
||||||
|
CeladonUniversityInsideBookcaseText1:
|
||||||
|
text_far _BookcaseText1
|
||||||
|
text_end
|
||||||
|
|
||||||
|
CeladonUniversityInsideBookcaseText2:
|
||||||
|
text_far _BookcaseText2
|
||||||
|
text_end
|
||||||
|
|
||||||
|
CeladonUniversityInsideBookcaseText3:
|
||||||
|
text_far _BookcaseText3
|
||||||
|
text_end
|
||||||
|
|
||||||
text_end ; unused
|
text_end ; unused
|
||||||
|
|
|
@ -60,3 +60,65 @@ _CeladonUniversityInsideMagikarpText::
|
||||||
cont "can use DRAGON"
|
cont "can use DRAGON"
|
||||||
cont "RAGE."
|
cont "RAGE."
|
||||||
prompt
|
prompt
|
||||||
|
|
||||||
|
_BookcaseText1::
|
||||||
|
text "The fossil record"
|
||||||
|
line "of #MON dates"
|
||||||
|
cont "back around 2"
|
||||||
|
cont "million years."
|
||||||
|
|
||||||
|
para "However, the first"
|
||||||
|
line "proper study into"
|
||||||
|
cont "their biology was"
|
||||||
|
cont "conducted by"
|
||||||
|
cont "BARON TAJIRIN of"
|
||||||
|
cont "France in the 18th"
|
||||||
|
cont "century."
|
||||||
|
|
||||||
|
para "At the time, only"
|
||||||
|
line "30 species were"
|
||||||
|
cont "recognised."
|
||||||
|
|
||||||
|
done
|
||||||
|
|
||||||
|
_BookcaseText2::
|
||||||
|
text "In 1899, PROF."
|
||||||
|
line "WESTWOOD of Japan"
|
||||||
|
cont "released a study"
|
||||||
|
cont "on the observation"
|
||||||
|
cont "on the evolution"
|
||||||
|
cont "of PIKACHU."
|
||||||
|
|
||||||
|
para "Japan became the"
|
||||||
|
line "global leader"
|
||||||
|
cont "in #MON study,"
|
||||||
|
cont "discovering 80"
|
||||||
|
cont "#MON at the"
|
||||||
|
cont "time."
|
||||||
|
|
||||||
|
para "As of today,"
|
||||||
|
line "PROF. OAK's"
|
||||||
|
cont "efforts have"
|
||||||
|
cont "led to 150"
|
||||||
|
cont "#MON being"
|
||||||
|
cont "recognised."
|
||||||
|
|
||||||
|
done
|
||||||
|
|
||||||
|
_BookcaseText3::
|
||||||
|
text "#BALL technology"
|
||||||
|
line "was discovered by"
|
||||||
|
cont "PROF. WESTWOOD,"
|
||||||
|
cont "who accidentally"
|
||||||
|
cont "administered too"
|
||||||
|
cont "many drugs to a"
|
||||||
|
cont "PRIMEAPE, as part"
|
||||||
|
cont "of an experiment"
|
||||||
|
cont "to extract its"
|
||||||
|
cont "angry energy."
|
||||||
|
|
||||||
|
para "Weakened, it"
|
||||||
|
line "curled into a"
|
||||||
|
cont "ball and fit into"
|
||||||
|
cont "his glasses case."
|
||||||
|
|
Loading…
Reference in a new issue