From fce6c3221ce89242df64165af2f13c15593ba1ca Mon Sep 17 00:00:00 2001 From: May Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sun, 16 Oct 2022 12:10:50 +0100 Subject: [PATCH] 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. --- constants/map_constants.asm | 2 +- data/maps/headers/PokemonMansionB2F.asm | 2 ++ data/maps/map_header_banks.asm | 2 +- data/maps/map_header_pointers.asm | 2 +- data/maps/objects/PokemonMansionB2F.asm | 10 ++++++++++ maps.asm | 7 ++++++- maps/PokemonMansionB2F.blk | 4 ++++ scan_includes.exe.stackdump | 10 +++++----- scripts/PokemonMansionB2F.asm | 6 ++++++ text/PokemonMansionB2F.asm | 0 10 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 data/maps/headers/PokemonMansionB2F.asm create mode 100644 data/maps/objects/PokemonMansionB2F.asm create mode 100644 maps/PokemonMansionB2F.blk create mode 100644 scripts/PokemonMansionB2F.asm create mode 100644 text/PokemonMansionB2F.asm diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 87606fcb..130d13b4 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -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 diff --git a/data/maps/headers/PokemonMansionB2F.asm b/data/maps/headers/PokemonMansionB2F.asm new file mode 100644 index 00000000..e9ba31a5 --- /dev/null +++ b/data/maps/headers/PokemonMansionB2F.asm @@ -0,0 +1,2 @@ + map_header PokemonMansionB2F, POKEMON_MANSION_B2F, INTERIOR, 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 574b6f23..d48aa276 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -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) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 4693a8ca..7cf9e909 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -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 diff --git a/data/maps/objects/PokemonMansionB2F.asm b/data/maps/objects/PokemonMansionB2F.asm new file mode 100644 index 00000000..46b24665 --- /dev/null +++ b/data/maps/objects/PokemonMansionB2F.asm @@ -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 \ No newline at end of file diff --git a/maps.asm b/maps.asm index 2eba3740..04736958 100644 --- a/maps.asm +++ b/maps.asm @@ -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" \ No newline at end of file +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" \ No newline at end of file diff --git a/maps/PokemonMansionB2F.blk b/maps/PokemonMansionB2F.blk new file mode 100644 index 00000000..ca7002db --- /dev/null +++ b/maps/PokemonMansionB2F.blk @@ -0,0 +1,4 @@ + + + + 88, /$*$9*  \ No newline at end of file diff --git a/scan_includes.exe.stackdump b/scan_includes.exe.stackdump index 9bda7f17..0aa195e5 100644 --- a/scan_includes.exe.stackdump +++ b/scan_includes.exe.stackdump @@ -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) diff --git a/scripts/PokemonMansionB2F.asm b/scripts/PokemonMansionB2F.asm new file mode 100644 index 00000000..3a60394e --- /dev/null +++ b/scripts/PokemonMansionB2F.asm @@ -0,0 +1,6 @@ +PokemonMansionB2F_Script: + jp EnableAutoTextBoxDrawing + +PokemonMansionB2F_TextPointers: + + text_end ; unused diff --git a/text/PokemonMansionB2F.asm b/text/PokemonMansionB2F.asm new file mode 100644 index 00000000..e69de29b