diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 1c967d8b..d944b1bc 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -260,8 +260,8 @@ DEF FIRST_INDOOR_MAP EQU const_value mapconst UNUSED_MAP_EE, 0, 0 ; $EE mapconst TRADE_CENTER, 4, 5 ; $EF mapconst COLOSSEUM, 4, 5 ; $F0 - mapconst UNUSED_MAP_F1, 0, 0 ; $F1 - mapconst UNUSED_MAP_F2, 0, 0 ; $F2 + mapconst CELADON_UNIVERSITY_OUTSIDE, 20, 21 ; $F1 - was UNUSED_MAP_F1 + mapconst CELADON_UNIVERSITY_INSIDE, 10, 11 ; $F2 - was UNUSED_MAP_F2 mapconst UNUSED_MAP_F3, 0, 0 ; $F3 mapconst UNUSED_MAP_F4, 0, 0 ; $F4 mapconst LORELEIS_ROOM, 6, 5 ; $F5 diff --git a/data/maps/headers/CeladonCity.asm b/data/maps/headers/CeladonCity.asm index afd93c62..e001b876 100644 --- a/data/maps/headers/CeladonCity.asm +++ b/data/maps/headers/CeladonCity.asm @@ -1,4 +1,5 @@ - map_header CeladonCity, CELADON_CITY, OVERWORLD, WEST | EAST + map_header CeladonCity, CELADON_CITY, OVERWORLD, NORTH | WEST | EAST + connection north, CeladonUniversityOutside, CELADON_UNIVERSITY_OUTSIDE, 0 connection west, Route16, ROUTE_16, 4 connection east, Route7, ROUTE_7, 4 end_map_header diff --git a/data/maps/headers/CeladonUniversityInside.asm b/data/maps/headers/CeladonUniversityInside.asm new file mode 100644 index 00000000..15f6e328 --- /dev/null +++ b/data/maps/headers/CeladonUniversityInside.asm @@ -0,0 +1,2 @@ + map_header CeladonUniversityInside, CELADON_UNIVERSITY_INSIDE, LAB, 0 + end_map_header diff --git a/data/maps/headers/CeladonUniversityOutside.asm b/data/maps/headers/CeladonUniversityOutside.asm new file mode 100644 index 00000000..b08dff72 --- /dev/null +++ b/data/maps/headers/CeladonUniversityOutside.asm @@ -0,0 +1,3 @@ + map_header CeladonUniversityOutside, CELADON_UNIVERSITY_OUTSIDE, OVERWORLD, SOUTH + connection south, CeladonCity, CELADON_CITY, 0 + end_map_header \ No newline at end of file diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index 87ec01cf..5a2fe3a2 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -242,8 +242,8 @@ MapHeaderBanks:: db $11 ; UNUSED_MAP_EE db BANK(TradeCenter_h) db BANK(Colosseum_h) - db $11 ; UNUSED_MAP_F1 - db $11 ; UNUSED_MAP_F2 + db BANK(CeladonUniversityOutside_h) ; $11 UNUSED_MAP_F1 + db BANK(CeladonUniversityInside_h) ; $11 UNUSED_MAP_F2 db $11 ; UNUSED_MAP_F3 db $11 ; UNUSED_MAP_F4 db BANK(LoreleisRoom_h) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 44457ce6..348dbd5c 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -242,8 +242,8 @@ MapHeaderPointers:: dw SilphCo2F_h ; UNUSED_MAP_EE dw TradeCenter_h dw Colosseum_h - dw SilphCo2F_h ; UNUSED_MAP_F1 - dw SilphCo2F_h ; UNUSED_MAP_F2 + dw CeladonUniversityOutside_h ; UNUSED_MAP_F1 + dw CeladonUniversityInside_h ; UNUSED_MAP_F2 dw SilphCo2F_h ; UNUSED_MAP_F3 dw SilphCo2F_h ; UNUSED_MAP_F4 dw LoreleisRoom_h diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index 1644335b..e265da08 100644 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm @@ -38,4 +38,4 @@ CeladonCity_Object: object_event 32, 29, SPRITE_ROCKET, WALK, LEFT_RIGHT, 8 ; person object_event 42, 14, SPRITE_ROCKET, WALK, LEFT_RIGHT, 9 ; person - def_warps_to CELADON_CITY + def_warps_to CELADON_CITY \ No newline at end of file diff --git a/data/maps/objects/CeladonUniversityInside.asm b/data/maps/objects/CeladonUniversityInside.asm new file mode 100644 index 00000000..30edeb59 --- /dev/null +++ b/data/maps/objects/CeladonUniversityInside.asm @@ -0,0 +1,13 @@ +CeladonUniversityInside_Object: + db $17 ; border block + + def_warp_events + warp_event 10, 19, CELADON_UNIVERSITY_OUTSIDE, 1 + warp_event 11, 19, CELADON_UNIVERSITY_OUTSIDE, 1 + + def_bg_events + + def_object_events + object_event 8, 17, SPRITE_MIDDLE_AGED_MAN, STAY, ANY_DIR, 1 ; person + + def_warps_to CELADON_UNIVERSITY_INSIDE \ No newline at end of file diff --git a/data/maps/objects/CeladonUniversityOutside.asm b/data/maps/objects/CeladonUniversityOutside.asm new file mode 100644 index 00000000..d22c218d --- /dev/null +++ b/data/maps/objects/CeladonUniversityOutside.asm @@ -0,0 +1,11 @@ +CeladonUniversityOutside_Object: + db $f ; border block + + def_warp_events + warp_event 20, 13, CELADON_UNIVERSITY_INSIDE, 1 + + def_bg_events + + def_object_events + + def_warps_to CELADON_UNIVERSITY_OUTSIDE \ No newline at end of file diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 6c67114f..3100606c 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -241,8 +241,8 @@ MapSongBanks:: db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_EE db MUSIC_CELADON, BANK(Music_Celadon) ; TRADE_CENTER db MUSIC_CELADON, BANK(Music_Celadon) ; COLOSSEUM - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F1 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F2 + db MUSIC_CELADON, BANK(Music_Celadon) ; UNUSED_MAP_F1 / Celadon University Outside + db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; UNUSED_MAP_F2 / Celadon University Outside db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F3 db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F4 db MUSIC_GYM, BANK(Music_Gym) ; LORELEIS_ROOM diff --git a/maps.asm b/maps.asm index 4f00f451..e7f0bbb7 100644 --- a/maps.asm +++ b/maps.asm @@ -1222,3 +1222,13 @@ INCLUDE "data/maps/headers/AgathasRoom.asm" INCLUDE "scripts/AgathasRoom.asm" INCLUDE "data/maps/objects/AgathasRoom.asm" AgathasRoom_Blocks: INCBIN "maps/AgathasRoom.blk" + +INCLUDE "data/maps/headers/CeladonUniversityOutside.asm" +INCLUDE "scripts/CeladonUniversityOutside.asm" +INCLUDE "data/maps/objects/CeladonUniversityOutside.asm" +CeladonUniversityOutside_Blocks: INCBIN "maps/CeladonUniversityOutside.blk" + +INCLUDE "data/maps/headers/CeladonUniversityInside.asm" +INCLUDE "scripts/CeladonUniversityInside.asm" +INCLUDE "data/maps/objects/CeladonUniversityInside.asm" +CeladonUniversityInside_Blocks: INCBIN "maps/CeladonUniversityInside.blk" \ No newline at end of file diff --git a/maps/CeladonCity.blk b/maps/CeladonCity.blk index d99e84e3..11e6e4a9 100644 --- a/maps/CeladonCity.blk +++ b/maps/CeladonCity.blk @@ -1,8 +1,13 @@ -lllllllllllllllllllllooooooooo +llllllll +U +lllllllllllloooooooooUo ooo oooooo -n !UUUU !U !UUUUUUUUUmnhi !hiUhi ! ! ! !Umn7~hi7}~y7:~7~7~7~|rUUUhiUUUUUUUUUUUUUUUUUUUU7::sUUUUUUUUUUUUUUUUUUUUUUUUy0 VwwwwUwwwwUUUUUUUUUNTM ! !U ! !nwUUUUUUUgj7:~|~U7~7~nUUUUUUUCVwwVwUVwwwLnUUUUUUUUUUUUUUUUUUUUUUmn !  ! !UU ! ! ! ! !mn7~7~7~UU7~|~|~7~|~mnUUUUUyUU !UUUUUUUUUUUU -n/7~UUUUUUUUUUUUmn +n ! !U !UUUUUUUUUmnhi !hiUhi ! ! ! !Umn7~hi7}~y7:~7~7~7~|rUUUhiUUUUUUUUUUUUUUUUUUUU7::sUUUUUUUUUUUUUUUUUUUUUUUUy0 VwwwwUwwwwUUUUUUUUUNTM ! !U ! !nwUUUUUUUUUgj7:~|~U7~7~nUUUUUUUUUCVwwVwUVwww5nUUUUUUUUUUUUUUUUUUUUUUmn !  ! !UU ! ! ! ! ! +n7~7~7~UU7~|~|~7~|~ +nUUUUUyUU !UUUUUUUUUUUU +n/7~UUUUUUUUUUUU +n @@ -12,5 +17,5 @@ n/7~UUUUUUUUUUUUmn -llllllmnllll -nooooooooooooooooooooooo \ No newline at end of file +llllll26llll +nooooooooooooooooo6ooooo \ No newline at end of file diff --git a/maps/CeladonUniversityInside.blk b/maps/CeladonUniversityInside.blk new file mode 100644 index 00000000..c14abdb9 --- /dev/null +++ b/maps/CeladonUniversityInside.blk @@ -0,0 +1,3 @@ +,-../02113)))( )))7777467777 +  +    \ No newline at end of file diff --git a/maps/CeladonUniversityInterior.blk b/maps/CeladonUniversityInterior.blk deleted file mode 100644 index 2d576337..00000000 --- a/maps/CeladonUniversityInterior.blk +++ /dev/null @@ -1,2 +0,0 @@ -,-../02113))) )))7777467777  -  \ No newline at end of file diff --git a/maps/CeladonUniversity.blk b/maps/CeladonUniversityOutside.blk similarity index 61% rename from maps/CeladonUniversity.blk rename to maps/CeladonUniversityOutside.blk index 07a15a0b..d2a6dd3c 100644 Binary files a/maps/CeladonUniversity.blk and b/maps/CeladonUniversityOutside.blk differ diff --git a/scan_includes.exe.stackdump b/scan_includes.exe.stackdump new file mode 100644 index 00000000..03d68360 --- /dev/null +++ b/scan_includes.exe.stackdump @@ -0,0 +1,18 @@ +Exception: STATUS_ACCESS_VIOLATION at rip=00100401246 +rax=FFFFFFF7FFF8D781 rbx=000000000000007C rcx=0000000800000010 +rdx=0000000000000000 rsi=000000080006276B rdi=0000000000000000 +r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000 +r11=0000000100401282 r12=0000000800072880 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 +cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B +Stack trace: +Frame Function Args +00100403156 00100401246 (0080006276B, 00000000022, 00100403166, 000FFFFCB90) +00100403156 00100401409 (00000000000, 00100000001, 00180227860, 00100407000) +00100403178 00100401C87 (00000000020, 00000000000, 00180049B11, 00180048A70) +000FFFFCD30 00180049B7D (00000000000, 00000000000, 00000000000, 00000000000) +000FFFFFFF0 00180047746 (00000000000, 00000000000, 00000000000, 00000000000) +000FFFFFFF0 001800477F4 (00000000000, 00000000000, 00000000000, 00000000000) +End of stack trace diff --git a/scripts/CeladonUniversityInside.asm b/scripts/CeladonUniversityInside.asm new file mode 100644 index 00000000..431cc394 --- /dev/null +++ b/scripts/CeladonUniversityInside.asm @@ -0,0 +1,11 @@ +CeladonUniversityInside_Script: + jp EnableAutoTextBoxDrawing + +CeladonUniversityInside_TextPointers: + dw CeladonUniversityInsideText1 + +CeladonUniversityInsideText1: + text_far _CeladonUniversityInsideText1 + text_end + + text_end ; unused diff --git a/scripts/CeladonUniversityOutside.asm b/scripts/CeladonUniversityOutside.asm new file mode 100644 index 00000000..17b36351 --- /dev/null +++ b/scripts/CeladonUniversityOutside.asm @@ -0,0 +1,6 @@ +CeladonUniversityOutside_Script: + jp EnableAutoTextBoxDrawing + +CeladonUniversityOutside_TextPointers: + + text_end ; unused diff --git a/text.asm b/text.asm index 94dc33de..8c208973 100644 --- a/text.asm +++ b/text.asm @@ -271,7 +271,7 @@ SECTION "Text 11", ROMX INCLUDE "data/text/text_7.asm" INCLUDE "data/pokemon/new_dex_text.asm" - +INCLUDE "text/CeladonUniversityInside.asm" SECTION "Pokédex Text", ROMX diff --git a/text/CeladonUniversityInside.asm b/text/CeladonUniversityInside.asm new file mode 100644 index 00000000..8ddac679 --- /dev/null +++ b/text/CeladonUniversityInside.asm @@ -0,0 +1,12 @@ +_CeladonUniversityInsideText1:: + text "Hello! I haven't" + line "seen you before!" + + para "My name is PROF." + line "WESTWOOD V!" + + para "My grandfather" + line "created the" + cont "#BALL!" + + done \ No newline at end of file