thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-05 02:54:32 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Faraway Island maps

Browse source 
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.
This commit is contained in:
May Evans 2022-10-15 23:00:57 +01:00
parent 471ed19477
commit aa32cfec8d
14 changed files with 66 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
constants/map_constants.asm
View file

@ -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

2
data/maps/headers/FarawayIslandInside.asm Normal file
View file

@ -0,0 +1,2 @@
map_header FarawayIslandInside, FARAWAY_ISLAND_INSIDE, FOREST, 0
end_map_header

2
data/maps/headers/FarawayIslandOutside.asm Normal file
View file

@ -0,0 +1,2 @@
map_header FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, FOREST, 0
end_map_header

4
data/maps/map_header_banks.asm
View file

@ -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)

4
data/maps/map_header_pointers.asm
View file

@ -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

12
data/maps/objects/FarawayIslandInside.asm Normal file
View file

@ -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

12
data/maps/objects/FarawayIslandOutside.asm Normal file
View file

@ -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

4
data/maps/songs.asm
View file

@ -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

12
maps.asm
View file

@ -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"
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"

1
maps/FarawayIslandInside.blk Normal file
View file

@ -0,0 +1 @@
Z[  ((b (bb((b \R (% \RZ[((%b(Z[02 (((Z[((( 02Y

1
maps/FarawayIslandOutside.blk Normal file
View file

@ -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------------

10
scan_includes.exe.stackdump
View file

@ -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)

6
scripts/FarawayIslandInside.asm Normal file
View file

@ -0,0 +1,6 @@
FarawayIslandInside_Script:
jp EnableAutoTextBoxDrawing
FarawayIslandInside_TextPointers:
text_end ; unused

6
scripts/FarawayIslandOutside.asm Normal file
View file

@ -0,0 +1,6 @@
FarawayIslandOutside_Script:
jp EnableAutoTextBoxDrawing
FarawayIslandOutside_TextPointers:
text_end ; unused