diff --git a/data/maps/objects/CeladonUniversityInside.asm b/data/maps/objects/CeladonUniversityInside.asm index 483100ce..1e39bae8 100644 --- a/data/maps/objects/CeladonUniversityInside.asm +++ b/data/maps/objects/CeladonUniversityInside.asm @@ -6,7 +6,8 @@ CeladonUniversityInside_Object: warp_event 11, 19, CELADON_UNIVERSITY_OUTSIDE, 1 def_bg_events - bg_event 9, 3, 6 ; Magikarp + bg_event 9, 3, 10 ; Magikarp + bg_event 19, 4, 11 ; PC Screen def_object_events object_event 18, 5, SPRITE_MIDDLE_AGED_MAN, STAY, ANY_DIR, 1 ; person @@ -14,8 +15,9 @@ CeladonUniversityInside_Object: 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 + object_event 3, 8, SPRITE_PAPER, STAY, NONE, 6 ; Book 1 + object_event 5, 4, SPRITE_PAPER, STAY, NONE, 7 ; Book 2 + object_event 1, 4, SPRITE_PAPER, STAY, NONE, 8 ; Book 3 + object_event 20, 7, SPRITE_MONSTER, STAY, NONE, 9 ; Slowbro def_warps_to CELADON_UNIVERSITY_INSIDE \ No newline at end of file diff --git a/scan_includes.exe.stackdump b/scan_includes.exe.stackdump index 03d68360..ae8f00ad 100644 --- a/scan_includes.exe.stackdump +++ b/scan_includes.exe.stackdump @@ -1,15 +1,15 @@ Exception: STATUS_ACCESS_VIOLATION at rip=00100401246 -rax=FFFFFFF7FFF8D781 rbx=000000000000007C rcx=0000000800000010 -rdx=0000000000000000 rsi=000000080006276B rdi=0000000000000000 +rax=FFFFFFF7FFF958F1 rbx=0000000000000908 rcx=0000000800000010 +rdx=0000000000000000 rsi=000000080005A5AA rdi=0000000000000000 r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000 -r11=0000000100401282 r12=0000000800072880 r13=0000000100403148 +r11=00000001004013C6 r12=000000080006A710 r13=0000000100403148 r14=0000000000000000 r15=0000000000000001 rbp=0000000100403156 rsp=00000000FFFFCA60 -program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 1487, thread main +program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 794, thread main cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B Stack trace: Frame Function Args -00100403156 00100401246 (0080006276B, 00000000022, 00100403166, 000FFFFCB90) +00100403156 00100401246 (0080005A5AA, 00000000022, 00100403166, 000FFFFCB90) 00100403156 00100401409 (00000000000, 00100000001, 00180227860, 00100407000) 00100403178 00100401C87 (00000000020, 00000000000, 00180049B11, 00180048A70) 000FFFFCD30 00180049B7D (00000000000, 00000000000, 00000000000, 00000000000) diff --git a/scripts/CeladonUniversityInside.asm b/scripts/CeladonUniversityInside.asm index c300ffe9..ac0ca441 100644 --- a/scripts/CeladonUniversityInside.asm +++ b/scripts/CeladonUniversityInside.asm @@ -7,10 +7,12 @@ CeladonUniversityInside_TextPointers: dw CeladonUniversityInsideText2 dw CeladonUniversityInsideText3 dw CeladonUniversityInsideText4 - dw CeladonUniversityInsideText5 dw CeladonUniversityInsideBookcaseText1 dw CeladonUniversityInsideBookcaseText2 dw CeladonUniversityInsideBookcaseText3 + dw SlowbroCry + dw CeladonUniversityInsideText5 + dw CeladonUniversityPCScreen CeladonUniversityInsideText1: text_far _CeladonUniversityInsideText1 @@ -35,18 +37,6 @@ CeladonUniversityInsideText4: text_far _CeladonUniversityInsideText4 text_end -CeladonUniversityInsideMagikarpText: - text_far _CeladonUniversityInsideMagikarpText - text_end - -CeladonUniversityInsideText5: - text_asm - ld hl, CeladonUniversityInsideMagikarpText - call PrintText - ld a, MAGIKARP - call DisplayPokedex - jp TextScriptEnd - CeladonUniversityInsideBookcaseText1: text_far _BookcaseText1 text_end @@ -59,4 +49,28 @@ CeladonUniversityInsideBookcaseText3: text_far _BookcaseText3 text_end +SlowbroCry: + text_far _SlowbroCry + text_asm + ld a, SLOWBRO + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd + +CeladonUniversityInsideMagikarpText: + text_far _CeladonUniversityInsideMagikarpText + text_end + +CeladonUniversityInsideText5: + text_asm + ld hl, CeladonUniversityInsideMagikarpText + call PrintText + ld a, MAGIKARP + call DisplayPokedex + jp TextScriptEnd + +CeladonUniversityPCScreen: + text_far _ComputerScreen + text_end + text_end ; unused diff --git a/text/CeladonUniversityInside.asm b/text/CeladonUniversityInside.asm index beb810cd..7289a21b 100644 --- a/text/CeladonUniversityInside.asm +++ b/text/CeladonUniversityInside.asm @@ -5,7 +5,7 @@ _CeladonUniversityInsideText1:: para "My name is PROF." line "WESTWOOD V!" - para "My grandfather" + para "My ancestors" line "created the" cont "# BALL!" @@ -44,10 +44,6 @@ _CeladonUniversityInsideText4:: line "TRAINERs in" cont "VERMILLION!" - para "So far, nobody" - line "has come up" - cont "with a reason." - done _CeladonUniversityInsideMagikarpText:: @@ -72,8 +68,8 @@ _BookcaseText1:: cont "their biology was" cont "conducted by" cont "BARON TAJIRIN of" - cont "France in the 18th" - cont "century." + cont "France in the" + cont "18th century." para "At the time, only" line "30 species were" @@ -84,36 +80,39 @@ _BookcaseText1:: _BookcaseText2:: text "In 1899, PROF." line "WESTWOOD of Japan" - cont "released a study" - cont "on the observation" - cont "on the evolution" - cont "of PIKACHU." + cont "released a book" + cont "observing the" + cont "evolution of a" + cont "PIKACHU." para "Japan became the" - line "global leader" - cont "in #MON study," + line "global leader in" + cont "#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 "efforts have led" + cont "to 150 #MON" + cont "species being" cont "recognised." done _BookcaseText3:: - text "#BALL technology" - line "was discovered by" + text "The idea of the" + line "# BALL was" + cont "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 "PRIMEAPE." + + para "This was part" + line "of an experiment" cont "to extract its" cont "angry energy." @@ -121,4 +120,30 @@ _BookcaseText3:: line "curled into a" cont "ball and fit into" cont "his glasses case." - \ No newline at end of file + + para "The modern #" + line "BALL was made by" + cont "researchers at" + cont "CELADON" + cont "UNIVERSITY" + cont "in 1925, and" + cont "mass production" + cont "began at SILPH" + cont "CO. soon after." + + done + +_SlowbroCry:: + text "..." + para "..." + para "..." + para "...BRO?" + + done + +_ComputerScreen:: + text "Chaotic graphs are" + line "visible on the PC" + cont "screen." + + done \ No newline at end of file