Add Pokemon Mansion B2F

Very dissatisfied with the map as-is. Needs a lot of work, possibly another tileset based on the `interior` one. I tried adding one but came across constant problems and the one I came up with kind of sucked. No events or warps yet.
This commit is contained in:
May Evans 2022-10-16 12:10:50 +01:00
parent 8454d2fb02
commit fce6c3221c
10 changed files with 36 additions and 9 deletions

View file

@ -135,7 +135,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
mapconst LANCES_ROOM, 13, 13 ; $71
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 POKEMON_MANSION_B2F, 8, 8 ; $74 ; Unused UNUSED_MAP_74
mapconst UNUSED_MAP_75, 0, 0 ; $75 ; Unused
mapconst HALL_OF_FAME, 4, 5 ; $76
mapconst UNDERGROUND_PATH_NORTH_SOUTH, 24, 4 ; $77

View file

@ -0,0 +1,2 @@
map_header PokemonMansionB2F, POKEMON_MANSION_B2F, INTERIOR, 0
end_map_header

View file

@ -117,7 +117,7 @@ MapHeaderBanks::
db BANK(LancesRoom_h)
db BANK(FarawayIslandOutside_h) ; UNUSED_MAP_72
db BANK(FarawayIslandInside_h) ; UNUSED_MAP_73
db $1D ; UNUSED_MAP_74
db BANK(PokemonMansionB2F_h) ; UNUSED_MAP_74
db $1D ; UNUSED_MAP_75
db BANK(HallOfFame_h)
db BANK(UndergroundPathNorthSouth_h)

View file

@ -117,7 +117,7 @@ MapHeaderPointers::
dw LancesRoom_h
dw FarawayIslandInside_h ; UNUSED_MAP_72
dw FarawayIslandOutside_h ; UNUSED_MAP_73
dw LancesRoom_h ; UNUSED_MAP_74
dw PokemonMansionB2F_h ; UNUSED_MAP_74
dw LancesRoom_h ; UNUSED_MAP_75
dw HallOfFame_h
dw UndergroundPathNorthSouth_h

View file

@ -0,0 +1,10 @@
PokemonMansionB2F_Object:
db $01 ; border block
def_warp_events
def_bg_events
def_object_events
def_warps_to POKEMON_MANSION_B2F

View file

@ -1286,4 +1286,9 @@ 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"
FarawayIslandInside_Blocks: INCBIN "maps/FarawayIslandInside.blk"
INCLUDE "data/maps/headers/PokemonMansionB2F.asm"
INCLUDE "scripts/PokemonMansionB2F.asm"
INCLUDE "data/maps/objects/PokemonMansionB2F.asm"
PokemonMansionB2F_Blocks: INCBIN "maps/PokemonMansionB2F.blk"

View file

@ -0,0 +1,4 @@

88, /$*$9* 

View file

@ -1,15 +1,15 @@
Exception: STATUS_ACCESS_VIOLATION at rip=00100401246
rax=FFFFFFF7FFF8CED1 rbx=000000000000006A rcx=0000000800000010
rdx=0000000000000000 rsi=0000000800062F56 rdi=0000000000000000
rax=FFFFFFF7FFF8CE01 rbx=0000000000000070 rcx=0000000800000010
rdx=0000000000000000 rsi=0000000800063102 rdi=0000000000000000
r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000
r11=0000000100401282 r12=0000000800073130 r13=0000000100403148
r11=0000000100401282 r12=0000000800073200 r13=0000000100403148
r14=0000000000000000 r15=0000000000000001
rbp=0000000100403156 rsp=00000000FFFFCA60
program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 71, thread main
program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 1563, thread main
cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B
Stack trace:
Frame Function Args
00100403156 00100401246 (00800062F56, 00000000022, 00100403166, 000FFFFCB90)
00100403156 00100401246 (00800063102, 00000000022, 00100403166, 000FFFFCB90)
00100403156 00100401409 (00000000000, 00100000001, 00180227860, 00100407000)
00100403178 00100401C87 (00000000020, 00000000000, 00180049B11, 00180048A70)
000FFFFCD30 00180049B7D (00000000000, 00000000000, 00000000000, 00000000000)

View file

@ -0,0 +1,6 @@
PokemonMansionB2F_Script:
jp EnableAutoTextBoxDrawing
PokemonMansionB2F_TextPointers:
text_end ; unused

View file