From aa32cfec8d3d06daaa459b025fbb916d49dba505 Mon Sep 17 00:00:00 2001 From: May Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sat, 15 Oct 2022 23:00:57 +0100 Subject: [PATCH] Add Faraway Island maps This adds the maps on their own with fully functional warps between each other. Music has been set to Viridian Forest. Mew, wild data, and a way to get there have not been added. --- constants/map_constants.asm | 4 ++-- data/maps/headers/FarawayIslandInside.asm | 2 ++ data/maps/headers/FarawayIslandOutside.asm | 2 ++ data/maps/map_header_banks.asm | 4 ++-- data/maps/map_header_pointers.asm | 4 ++-- data/maps/objects/FarawayIslandInside.asm | 12 ++++++++++++ data/maps/objects/FarawayIslandOutside.asm | 12 ++++++++++++ data/maps/songs.asm | 4 ++-- maps.asm | 12 +++++++++++- maps/FarawayIslandInside.blk | 1 + maps/FarawayIslandOutside.blk | 1 + scan_includes.exe.stackdump | 10 +++++----- scripts/FarawayIslandInside.asm | 6 ++++++ scripts/FarawayIslandOutside.asm | 6 ++++++ 14 files changed, 66 insertions(+), 14 deletions(-) create mode 100644 data/maps/headers/FarawayIslandInside.asm create mode 100644 data/maps/headers/FarawayIslandOutside.asm create mode 100644 data/maps/objects/FarawayIslandInside.asm create mode 100644 data/maps/objects/FarawayIslandOutside.asm create mode 100644 maps/FarawayIslandInside.blk create mode 100644 maps/FarawayIslandOutside.blk create mode 100644 scripts/FarawayIslandInside.asm create mode 100644 scripts/FarawayIslandOutside.asm diff --git a/constants/map_constants.asm b/constants/map_constants.asm index ad8d5e95..87606fcb 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -133,8 +133,8 @@ DEF FIRST_INDOOR_MAP EQU const_value mapconst SILPH_GAUNTLET_6F, 12, 12 ; $6F ; Gauntlet Floor 6: Pokemon Mansion mapconst SILPH_GAUNTLET_7F, 5, 6 ; $70 ; Gauntlet Floor 7: Chief's Office mapconst LANCES_ROOM, 13, 13 ; $71 - mapconst UNUSED_MAP_72, 0, 0 ; $72 ; Unused - mapconst UNUSED_MAP_73, 0, 0 ; $73 ; Unused + mapconst FARAWAY_ISLAND_OUTSIDE, 18, 15 ; $72 ; Unused UNUSED_MAP_72 + mapconst FARAWAY_ISLAND_INSIDE, 11, 15 ; $73 ; Unused UNUSED_MAP_73 mapconst UNUSED_MAP_74, 0, 0 ; $74 ; Unused mapconst UNUSED_MAP_75, 0, 0 ; $75 ; Unused mapconst HALL_OF_FAME, 4, 5 ; $76 diff --git a/data/maps/headers/FarawayIslandInside.asm b/data/maps/headers/FarawayIslandInside.asm new file mode 100644 index 00000000..b60263ce --- /dev/null +++ b/data/maps/headers/FarawayIslandInside.asm @@ -0,0 +1,2 @@ + map_header FarawayIslandInside, FARAWAY_ISLAND_INSIDE, FOREST, 0 + end_map_header \ No newline at end of file diff --git a/data/maps/headers/FarawayIslandOutside.asm b/data/maps/headers/FarawayIslandOutside.asm new file mode 100644 index 00000000..a9f14384 --- /dev/null +++ b/data/maps/headers/FarawayIslandOutside.asm @@ -0,0 +1,2 @@ + map_header FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, FOREST, 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 a3d5b395..574b6f23 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -115,8 +115,8 @@ MapHeaderBanks:: db BANK(SilphGauntlet6F_h) db BANK(SilphGauntlet7F_h) db BANK(LancesRoom_h) - db $1D ; UNUSED_MAP_72 - db $1D ; UNUSED_MAP_73 + db BANK(FarawayIslandOutside_h) ; UNUSED_MAP_72 + db BANK(FarawayIslandInside_h) ; UNUSED_MAP_73 db $1D ; UNUSED_MAP_74 db $1D ; UNUSED_MAP_75 db BANK(HallOfFame_h) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index f32fc552..4693a8ca 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -115,8 +115,8 @@ MapHeaderPointers:: dw SilphGauntlet6F_h dw SilphGauntlet7F_h dw LancesRoom_h - dw LancesRoom_h ; UNUSED_MAP_72 - dw LancesRoom_h ; UNUSED_MAP_73 + dw FarawayIslandInside_h ; UNUSED_MAP_72 + dw FarawayIslandOutside_h ; UNUSED_MAP_73 dw LancesRoom_h ; UNUSED_MAP_74 dw LancesRoom_h ; UNUSED_MAP_75 dw HallOfFame_h diff --git a/data/maps/objects/FarawayIslandInside.asm b/data/maps/objects/FarawayIslandInside.asm new file mode 100644 index 00000000..38adbcc4 --- /dev/null +++ b/data/maps/objects/FarawayIslandInside.asm @@ -0,0 +1,12 @@ +FarawayIslandInside_Object: + db $02 ; border block + + def_warp_events + warp_event 14, 21, 0, FARAWAY_ISLAND_OUTSIDE + warp_event 15, 21, 0, FARAWAY_ISLAND_OUTSIDE + + def_bg_events + + def_object_events + + def_warps_to FARAWAY_ISLAND_INSIDE \ No newline at end of file diff --git a/data/maps/objects/FarawayIslandOutside.asm b/data/maps/objects/FarawayIslandOutside.asm new file mode 100644 index 00000000..09622811 --- /dev/null +++ b/data/maps/objects/FarawayIslandOutside.asm @@ -0,0 +1,12 @@ +FarawayIslandOutside_Object: + db $02 ; border block + + def_warp_events + warp_event 14, 6, 0, FARAWAY_ISLAND_INSIDE + warp_event 15, 6, 0, FARAWAY_ISLAND_INSIDE + + def_bg_events + + def_object_events + + def_warps_to FARAWAY_ISLAND_OUTSIDE \ No newline at end of file diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 65a4b80b..0e49f2e5 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -114,8 +114,8 @@ MapSongBanks:: db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; UNUSED_MAP_6F / Gauntlet 6F db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_70 / Gauntlet 7F db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; LANCES_ROOM - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_72 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_73 + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_72 / FARAWAY ISLAND INSIDE + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_73 / FARAWAY ISLAND OUTSIDE db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_74 db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_75 db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; HALL_OF_FAME diff --git a/maps.asm b/maps.asm index c3f1b55f..2eba3740 100644 --- a/maps.asm +++ b/maps.asm @@ -1276,4 +1276,14 @@ CinnabarVolcano_Blocks: INCBIN "maps/CinnabarVolcano.blk" INCLUDE "data/maps/headers/CeladonUniversityPokecenter.asm" INCLUDE "scripts/CeladonUniversityPokecenter.asm" INCLUDE "data/maps/objects/CeladonUniversityPokecenter.asm" -CeladonUniversityPokecenter_Blocks: INCBIN "maps/CeladonUniversityPokecenter.blk" \ No newline at end of file +CeladonUniversityPokecenter_Blocks: INCBIN "maps/CeladonUniversityPokecenter.blk" + +INCLUDE "data/maps/headers/FarawayIslandOutside.asm" +INCLUDE "scripts/FarawayIslandOutside.asm" +INCLUDE "data/maps/objects/FarawayIslandOutside.asm" +FarawayIslandOutside_Blocks: INCBIN "maps/FarawayIslandOutside.blk" + +INCLUDE "data/maps/headers/FarawayIslandInside.asm" +INCLUDE "scripts/FarawayIslandInside.asm" +INCLUDE "data/maps/objects/FarawayIslandInside.asm" +FarawayIslandInside_Blocks: INCBIN "maps/FarawayIslandInside.blk" \ No newline at end of file diff --git a/maps/FarawayIslandInside.blk b/maps/FarawayIslandInside.blk new file mode 100644 index 00000000..5e156b81 --- /dev/null +++ b/maps/FarawayIslandInside.blk @@ -0,0 +1 @@ +Z[  ((b (bb((b \R (% \RZ[((%b(Z[02 (((Z[((( 02Y \ No newline at end of file diff --git a/maps/FarawayIslandOutside.blk b/maps/FarawayIslandOutside.blk new file mode 100644 index 00000000..bd7467fb --- /dev/null +++ b/maps/FarawayIslandOutside.blk @@ -0,0 +1 @@ +@BB-@BB-@BB-@ XBB-@CEFB-@CEFcCF-@BbAAB--@AC?BACEF--DGF@CG?BAB----@AB@BA@CFCF-c--@AB@BA@BCF---<=@aF@BA@BB----@@BADFADFB-c--@DFEEEEGEF----@Y&----c-DEc----c-------c-----c------------c------------ \ No newline at end of file diff --git a/scan_includes.exe.stackdump b/scan_includes.exe.stackdump index ae8f00ad..9bda7f17 100644 --- a/scan_includes.exe.stackdump +++ b/scan_includes.exe.stackdump @@ -1,15 +1,15 @@ Exception: STATUS_ACCESS_VIOLATION at rip=00100401246 -rax=FFFFFFF7FFF958F1 rbx=0000000000000908 rcx=0000000800000010 -rdx=0000000000000000 rsi=000000080005A5AA rdi=0000000000000000 +rax=FFFFFFF7FFF8CED1 rbx=000000000000006A rcx=0000000800000010 +rdx=0000000000000000 rsi=0000000800062F56 rdi=0000000000000000 r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000 -r11=00000001004013C6 r12=000000080006A710 r13=0000000100403148 +r11=0000000100401282 r12=0000000800073130 r13=0000000100403148 r14=0000000000000000 r15=0000000000000001 rbp=0000000100403156 rsp=00000000FFFFCA60 -program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 794, thread main +program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 71, thread main cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B Stack trace: Frame Function Args -00100403156 00100401246 (0080005A5AA, 00000000022, 00100403166, 000FFFFCB90) +00100403156 00100401246 (00800062F56, 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/FarawayIslandInside.asm b/scripts/FarawayIslandInside.asm new file mode 100644 index 00000000..028f5202 --- /dev/null +++ b/scripts/FarawayIslandInside.asm @@ -0,0 +1,6 @@ +FarawayIslandInside_Script: + jp EnableAutoTextBoxDrawing + +FarawayIslandInside_TextPointers: + + text_end ; unused diff --git a/scripts/FarawayIslandOutside.asm b/scripts/FarawayIslandOutside.asm new file mode 100644 index 00000000..842fe408 --- /dev/null +++ b/scripts/FarawayIslandOutside.asm @@ -0,0 +1,6 @@ +FarawayIslandOutside_Script: + jp EnableAutoTextBoxDrawing + +FarawayIslandOutside_TextPointers: + + text_end ; unused