diff --git a/data/maps/objects/CeladonUniversityInside.asm b/data/maps/objects/CeladonUniversityInside.asm index 35ad2bf2..483100ce 100644 --- a/data/maps/objects/CeladonUniversityInside.asm +++ b/data/maps/objects/CeladonUniversityInside.asm @@ -11,8 +11,11 @@ CeladonUniversityInside_Object: def_object_events 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 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 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 \ No newline at end of file diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 8dc9ab45..a85fa459 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -1878,8 +1878,8 @@ AnimationWavyScreen: ld c, $ff ld hl, WavyScreenLineOffsets .loop - ld a, [hl] ; this fixes the wavy screen - PvK - ldh [hSCX], a + ; ld a, [hl] ; this fixes the wavy screen, but causes a bank overflow + ; ldh [hSCX], a push hl .innerLoop call WavyScreen_SetSCX @@ -1896,7 +1896,7 @@ AnimationWavyScreen: dec c jr nz, .loop xor a - ldh [hSCX], a ; also fixing the wavy screen - PvK + ; ldh [hSCX], a ; also fixing the wavy screen ldh [hWY], a call SaveScreenTilesToBuffer2 call ClearScreen diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 900209b8..14cc65c2 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2405,11 +2405,7 @@ PartyMenuOrRockOrRun: ld [wd0b5], a call GetMonHeader ld de, vFrontPic - call IsGhostBattle ; this prevents ghosts from being identified without the silph scope - PvK - push af - call nz, LoadMonFrontSprite - pop af - call z, LoadGhostPic ; fix ends here, just make it "call LoadMonFrontSprite on line 2408 to revert. + 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 jr .enemyMonPicReloaded .doEnemyMonAnimation ld b, BANK(AnimationSubstitute) ; BANK(AnimationMinimizeMon) diff --git a/scripts/CeladonUniversityInside.asm b/scripts/CeladonUniversityInside.asm index c4d1e38c..c300ffe9 100644 --- a/scripts/CeladonUniversityInside.asm +++ b/scripts/CeladonUniversityInside.asm @@ -8,6 +8,9 @@ CeladonUniversityInside_TextPointers: dw CeladonUniversityInsideText3 dw CeladonUniversityInsideText4 dw CeladonUniversityInsideText5 + dw CeladonUniversityInsideBookcaseText1 + dw CeladonUniversityInsideBookcaseText2 + dw CeladonUniversityInsideBookcaseText3 CeladonUniversityInsideText1: text_far _CeladonUniversityInsideText1 @@ -44,4 +47,16 @@ CeladonUniversityInsideText5: call DisplayPokedex jp TextScriptEnd +CeladonUniversityInsideBookcaseText1: + text_far _BookcaseText1 + text_end + +CeladonUniversityInsideBookcaseText2: + text_far _BookcaseText2 + text_end + +CeladonUniversityInsideBookcaseText3: + text_far _BookcaseText3 + text_end + text_end ; unused diff --git a/text/CeladonUniversityInside.asm b/text/CeladonUniversityInside.asm index 4c032572..beb810cd 100644 --- a/text/CeladonUniversityInside.asm +++ b/text/CeladonUniversityInside.asm @@ -59,4 +59,66 @@ _CeladonUniversityInsideMagikarpText:: cont "ancestors, it" cont "can use DRAGON" cont "RAGE." - prompt \ No newline at end of file + 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." + \ No newline at end of file