diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 8bcc3fed..749e0e23 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -136,7 +136,7 @@ DEF FIRST_INDOOR_MAP EQU const_value mapconst FARAWAY_ISLAND_OUTSIDE, 18, 15 ; $72 - Was UNUSED_MAP_72 mapconst FARAWAY_ISLAND_INSIDE, 11, 15 ; $73 - Was UNUSED_MAP_73 mapconst POKEMON_MANSION_B2F, 12, 15 ; $74 - Was UNUSED_MAP_74 - mapconst UNUSED_MAP_75, 0, 0 ; $75 - Unused + mapconst MT_MOON_CRATER, 25, 25 ; $75 - Was UNUSED_MAP_75 mapconst HALL_OF_FAME, 4, 5 ; $76 mapconst UNDERGROUND_PATH_NORTH_SOUTH, 24, 4 ; $77 mapconst CHAMPIONS_ROOM, 4, 4 ; $78 diff --git a/data/maps/headers/MtMoonCrater.asm b/data/maps/headers/MtMoonCrater.asm new file mode 100644 index 00000000..c569e1e4 --- /dev/null +++ b/data/maps/headers/MtMoonCrater.asm @@ -0,0 +1,2 @@ + map_header MtMoonCrater, MT_MOON_CRATER, 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 d48aa276..3b8408dc 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -118,7 +118,7 @@ MapHeaderBanks:: db BANK(FarawayIslandOutside_h) ; UNUSED_MAP_72 db BANK(FarawayIslandInside_h) ; UNUSED_MAP_73 db BANK(PokemonMansionB2F_h) ; UNUSED_MAP_74 - db $1D ; UNUSED_MAP_75 + db BANK(MtMoonCrater_h) ; UNUSED_MAP_75 db BANK(HallOfFame_h) db BANK(UndergroundPathNorthSouth_h) db BANK(ChampionsRoom_h) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index c444e23e..92240f9c 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -118,7 +118,7 @@ MapHeaderPointers:: dw FarawayIslandOutside_h ; UNUSED_MAP_72 dw FarawayIslandInside_h ; UNUSED_MAP_73 dw PokemonMansionB2F_h ; UNUSED_MAP_74 - dw LancesRoom_h ; UNUSED_MAP_75 + dw MtMoonCrater_h ; UNUSED_MAP_75 dw HallOfFame_h dw UndergroundPathNorthSouth_h dw ChampionsRoom_h diff --git a/data/maps/objects/MtMoonCrater.asm b/data/maps/objects/MtMoonCrater.asm new file mode 100644 index 00000000..350d5990 --- /dev/null +++ b/data/maps/objects/MtMoonCrater.asm @@ -0,0 +1,12 @@ +MtMoonCrater_Object: + db $0 ; border block + + def_warp_events + warp_event 23, 49, 0, LAST_MAP + warp_event 22, 49, 0, LAST_MAP + + def_bg_events + + def_object_events + + def_warps_to MT_MOON_CRATER \ No newline at end of file diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 4b9e62d6..f512d4c1 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -117,7 +117,7 @@ MapSongBanks:: 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_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; UNUSED_MAP_74 / POKEMON MANSION B2F - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_75 + db MUSIC_SS_ANNE, BANK(Music_Dungeon1) ; UNUSED_MAP_75 / MT. MOON CRATER db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; HALL_OF_FAME db MUSIC_ROUTES1, BANK(Music_Routes1) ; UNDERGROUND_PATH_NORTH_SOUTH db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; CHAMPIONS_ROOM diff --git a/maps.asm b/maps.asm index 04736958..155a856c 100644 --- a/maps.asm +++ b/maps.asm @@ -1291,4 +1291,9 @@ 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 +PokemonMansionB2F_Blocks: INCBIN "maps/PokemonMansionB2F.blk" + +INCLUDE "data/maps/headers/MtMoonCrater.asm" +INCLUDE "scripts/MtMoonCrater.asm" +INCLUDE "data/maps/objects/MtMoonCrater.asm" +MtMoonCrater_Blocks: INCBIN "maps/MtMoonCrater.blk" \ No newline at end of file diff --git a/maps/MtMoonCrater.blk b/maps/MtMoonCrater.blk new file mode 100644 index 00000000..18908b8b Binary files /dev/null and b/maps/MtMoonCrater.blk differ diff --git a/scan_includes.exe.stackdump b/scan_includes.exe.stackdump index 0aa195e5..265acfc3 100644 --- a/scan_includes.exe.stackdump +++ b/scan_includes.exe.stackdump @@ -1,15 +1,15 @@ Exception: STATUS_ACCESS_VIOLATION at rip=00100401246 -rax=FFFFFFF7FFF8CE01 rbx=0000000000000070 rcx=0000000800000010 -rdx=0000000000000000 rsi=0000000800063102 rdi=0000000000000000 +rax=FFFFFFF7FFF8CD51 rbx=0000000000000066 rcx=0000000800000010 +rdx=0000000000000000 rsi=00000008000631C8 rdi=0000000000000000 r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000 -r11=0000000100401282 r12=0000000800073200 r13=0000000100403148 +r11=0000000100401282 r12=00000008000732B0 r13=0000000100403148 r14=0000000000000000 r15=0000000000000001 rbp=0000000100403156 rsp=00000000FFFFCA60 -program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 1563, thread main +program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 42, thread main cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B Stack trace: Frame Function Args -00100403156 00100401246 (00800063102, 00000000022, 00100403166, 000FFFFCB90) +00100403156 00100401246 (008000631C8, 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/MtMoonCrater.asm b/scripts/MtMoonCrater.asm new file mode 100644 index 00000000..18fb6fa7 --- /dev/null +++ b/scripts/MtMoonCrater.asm @@ -0,0 +1,6 @@ +MtMoonCrater_Script: + jp EnableAutoTextBoxDrawing + +MtMoonCrater_TextPointers: + + text_end ; unused