diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index c4ad7659..daaf2a3e 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -247,4 +247,5 @@ DEF SHOW EQU $15 const HS_ROUTE_1_OAK ; EB const HS_MT_MOON_CRATER_GUARD ; EC const HS_MANSION_GUARD ; ED + const HS_BILLS_NIDORINO ; EE DEF NUM_HS_OBJECTS EQU const_value diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 0455600f..e99fe5c2 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -263,7 +263,7 @@ DEF FIRST_INDOOR_MAP EQU const_value mapconst CELADON_UNIVERSITY_OUTSIDE, 20, 21 ; $F1 - Was UNUSED_MAP_F1 mapconst CELADON_UNIVERSITY_INSIDE, 10, 11 ; $F2 - Was UNUSED_MAP_F2 mapconst CELADON_UNIVERSITY_POKECENTER, 4, 7 ; $F3 - Was UNUSED_MAP_F3 - mapconst UNUSED_MAP_F4, 0, 0 ; $F4 - Unused, will be Bill's Garden + mapconst BILLS_GARDEN, 9, 8 ; $F4 - Was UNUSED_MAP_F4 mapconst LORELEIS_ROOM, 6, 5 ; $F5 mapconst BRUNOS_ROOM, 6, 5 ; $F6 mapconst AGATHAS_ROOM, 6, 5 ; $F7 - Maps F8 - FE currently have no data diff --git a/data/maps/headers/BillsGarden.asm b/data/maps/headers/BillsGarden.asm new file mode 100644 index 00000000..ad810196 --- /dev/null +++ b/data/maps/headers/BillsGarden.asm @@ -0,0 +1,2 @@ + map_header BillsGarden, BILLS_GARDEN, FOREST, 0 + end_map_header \ No newline at end of file diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 018878fc..3ef64e34 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -247,7 +247,7 @@ MapHSPointers: dw NoHS dw NoHS dw NoHS - dw UnusedMapF4HS + dw BillsGardenHS dw NoHS dw NoHS dw NoHS @@ -397,6 +397,7 @@ BillsHouseHS: db BILLS_HOUSE, $01, SHOW db BILLS_HOUSE, $02, HIDE db BILLS_HOUSE, $03, HIDE + db BILLS_HOUSE, $04, SHOW ViridianForestHS: db VIRIDIAN_FOREST, $05, SHOW db VIRIDIAN_FOREST, $06, SHOW @@ -507,8 +508,8 @@ SilphCo11FHS: db SILPH_CO_11F, $03, SHOW db SILPH_CO_11F, $04, SHOW db SILPH_CO_11F, $05, SHOW -UnusedMapF4HS: - db UNUSED_MAP_F4, $02, SHOW +BillsGardenHS: ; could be used for the dragonite boss fight, so not removing this part of UNUSED_MAP_F4 + db BILLS_GARDEN, $02, SHOW CinnabarVolcanoHS: db CINNABAR_VOLCANO, $01, SHOW PokemonMansion2FHS: diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index 3b8408dc..d9d44d6a 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -245,7 +245,7 @@ MapHeaderBanks:: db BANK(CeladonUniversityOutside_h) ; $11 UNUSED_MAP_F1 db BANK(CeladonUniversityInside_h) ; $11 UNUSED_MAP_F2 db BANK(CeladonUniversityPokecenter_h) ; UNUSED_MAP_F3 - db $11 ; UNUSED_MAP_F4 + db BANK(BillsGarden_h) ; UNUSED_MAP_F4, $11 db BANK(LoreleisRoom_h) db BANK(BrunosRoom_h) db BANK(AgathasRoom_h) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 92240f9c..e5ec617b 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -245,7 +245,7 @@ MapHeaderPointers:: dw CeladonUniversityOutside_h ; UNUSED_MAP_F1 dw CeladonUniversityInside_h ; UNUSED_MAP_F2 dw CeladonUniversityPokecenter_h ; UNUSED_MAP_F3 - dw SilphCo2F_h ; UNUSED_MAP_F4 + dw BillsGarden_h ; UNUSED_MAP_F4, used to use SilphCo2F_h dw LoreleisRoom_h dw BrunosRoom_h dw AgathasRoom_h diff --git a/data/maps/objects/BillsGarden.asm b/data/maps/objects/BillsGarden.asm new file mode 100644 index 00000000..5e8e11a2 --- /dev/null +++ b/data/maps/objects/BillsGarden.asm @@ -0,0 +1,12 @@ +BillsGarden_Object: + db $03 ; border block + + def_warp_events + warp_event 6, 17, BILLS_HOUSE, 1 + warp_event 7, 17, BILLS_HOUSE, 1 + + def_bg_events + + def_object_events + + def_warps_to BILLS_GARDEN \ No newline at end of file diff --git a/data/maps/objects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm index db8f8433..a934e26a 100644 --- a/data/maps/objects/BillsHouse.asm +++ b/data/maps/objects/BillsHouse.asm @@ -2,8 +2,9 @@ BillsHouse_Object: db $d ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 1 - warp_event 3, 7, LAST_MAP, 1 + warp_event 2, 9, LAST_MAP, 1 + warp_event 3, 9, LAST_MAP, 1 + warp_event 11, 0, BILLS_GARDEN, 1 def_bg_events @@ -11,5 +12,6 @@ BillsHouse_Object: object_event 6, 5, SPRITE_MONSTER, STAY, NONE, 1 ; person object_event 4, 4, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person object_event 6, 5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person + object_event 11, 1, SPRITE_MONSTER, STAY, NONE, 4 ; nidorino def_warps_to BILLS_HOUSE diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm index 3737843c..8c03035b 100644 --- a/data/maps/objects/CinnabarLab.asm +++ b/data/maps/objects/CinnabarLab.asm @@ -16,5 +16,6 @@ CinnabarLab_Object: def_object_events object_event 1, 3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person + object_event 11, 6, SPRITE_SCIENTIST, WALK, ANY_DIR, 2 ; person def_warps_to CINNABAR_LAB diff --git a/data/wild/maps/BillsGarden.asm b/data/wild/maps/BillsGarden.asm new file mode 100644 index 00000000..4e55c202 --- /dev/null +++ b/data/wild/maps/BillsGarden.asm @@ -0,0 +1,26 @@ +BillsGardenWildMons: ; wild mons are definitely edit-able + def_grass_wildmons 10 ; encounter rate + db 46, EEVEE + db 46, EEVEE + db 46, CHARMANDER + db 49, BULBASAUR + db 49, HITMONTOP + db 52, HITMONCHAN + db 49, HITMONLEE + db 52, KABUTO + db 53, OMANYTE + db 53, AERODACTYL + end_grass_wildmons + + def_water_wildmons 10 ; encounter rate + db 40, SQUIRTLE + db 40, SQUIRTLE + db 40, SQUIRTLE + db 40, SQUIRTLE + db 40, SQUIRTLE + db 40, SQUIRTLE + db 40, SQUIRTLE + db 40, BLASTOISE + db 40, BLASTOISE + db 40, TOTARTLE + end_water_wildmons \ No newline at end of file diff --git a/maps.asm b/maps.asm index 155a856c..cfcf3c49 100644 --- a/maps.asm +++ b/maps.asm @@ -1296,4 +1296,9 @@ 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 +MtMoonCrater_Blocks: INCBIN "maps/MtMoonCrater.blk" + +INCLUDE "data/maps/headers/BillsGarden.asm" +INCLUDE "scripts/BillsGarden.asm" +INCLUDE "data/maps/objects/BillsGarden.asm" +BillsGarden_Blocks: INCBIN "maps/BillsGarden.blk" \ No newline at end of file diff --git a/maps/BillsGarden.blk b/maps/BillsGarden.blk index 88018c86..1d582e1c 100644 --- a/maps/BillsGarden.blk +++ b/maps/BillsGarden.blk @@ -1,9 +1 @@ -,,;QQQQ>,,,+%tt -t$*,,) - (,,)eCd (,,) -t (,,)t - (,,) -t - (,,,?;tt>?,,WWW% - -$WWW \ No newline at end of file +ACEEEE?ACF((((D?B\QR @BZ-[@B( @B (@B( (@K=> @AABY<==J \ No newline at end of file diff --git a/maps/BillsHouse.blk b/maps/BillsHouse.blk index 112a2e81..5b647a89 100644 --- a/maps/BillsHouse.blk +++ b/maps/BillsHouse.blk @@ -1,2 +1,2 @@ - -   \ No newline at end of file +!" + $8%+  \ No newline at end of file diff --git a/scan_includes.exe.stackdump b/scan_includes.exe.stackdump index 1a2f55b0..ac77dda3 100644 --- a/scan_includes.exe.stackdump +++ b/scan_includes.exe.stackdump @@ -1,16 +1,15 @@ Exception: STATUS_ACCESS_VIOLATION at rip=00100401246 -rax=FFFFFFF7FFF91B01 rbx=0000000000006048 rcx=0000000800000010 -rdx=0000000000000000 rsi=000000080006C835 rdi=0000000000000000 -r8 =00000000FFFFC744 r9 =0000000000000000 r10=0000000100000000 -r11=0000000100401282 r12=000000080006E500 r13=0000000100403148 +rax=FFFFFFF7FFF8CCA1 rbx=0000000000000064 rcx=0000000800000010 +rdx=0000000000000000 rsi=0000000800063279 rdi=0000000000000000 +r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000 +r11=0000000100401282 r12=0000000800073360 r13=0000000100403148 r14=0000000000000000 r15=0000000000000001 -rbp=0000000100403156 rsp=00000000FFFFC9E0 -program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 1692, thread main +rbp=0000000100403156 rsp=00000000FFFFCA60 +program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 1444, thread main cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B Stack trace: Frame Function Args -00100403156 00100401246 (0080006C835, 00000000022, 00100403166, 00100403148) -00100403156 00100401409 (0080005A44B, 00000000022, 00100403166, 000FFFFCB90) +00100403156 00100401246 (00800063279, 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/BillsGarden.asm b/scripts/BillsGarden.asm new file mode 100644 index 00000000..e1f8632c --- /dev/null +++ b/scripts/BillsGarden.asm @@ -0,0 +1,6 @@ +BillsGarden_Script: + jp EnableAutoTextBoxDrawing + +BillsGarden_TextPointers: + + text_end ; unused diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm index 2085f417..b536e1de 100644 --- a/scripts/BillsHouse.asm +++ b/scripts/BillsHouse.asm @@ -11,6 +11,7 @@ BillsHouse_ScriptPointers: dw BillsHouseScript3 dw BillsHouseScript4 dw BillsHouseScript5 + dw BillsHouseNidorino BillsHouseScript0: ret @@ -212,3 +213,11 @@ BillsHouseText3: BillsHouseText_1e8da: text_far _BillsHouseText_1e8da text_end + +BillsHouseNidorino: + text_far _BillsHouseNidorino + text_asm + ld a, NIDORINO + call PlayCry + text_far _BillWarning + jp TextScriptEnd diff --git a/scripts/CinnabarLab.asm b/scripts/CinnabarLab.asm index 2f4be7f2..e8866da0 100644 --- a/scripts/CinnabarLab.asm +++ b/scripts/CinnabarLab.asm @@ -8,6 +8,7 @@ CinnabarLab_TextPointers: dw Lab1Text3 dw Lab1Text4 dw Lab1Text5 + dw Lab1Text6 ; rowan Lab1Text1: text_far _Lab1Text1 @@ -28,3 +29,7 @@ Lab1Text4: Lab1Text5: text_far _Lab1Text5 text_end + +Lab1Text6: + text_far _Lab1Text6 + text_end diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 718fb415..66b35979 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -103,6 +103,9 @@ HallofFameRoomScript1: ld a, HS_ROUTE_1_OAK ld [wMissableObjectIndex], a predef ShowObject + ld a, HS_BILLS_NIDORINO + ld [wMissableObjectIndex], a + predef HideObject ld a, HS_MANSION_GUARD ld [wMissableObjectIndex], a predef HideObject diff --git a/text/BillsHouse.asm b/text/BillsHouse.asm index 9bbea9d7..0b8f16d5 100644 --- a/text/BillsHouse.asm +++ b/text/BillsHouse.asm @@ -86,3 +86,17 @@ _BillsHouseText_1e8da:: cont "some of my rare" cont "#MON on my PC!" done + +_BillsHouseNidorino:: + text "NIDORINO stares" + line "you down..." + done + +_BillWarning:: + text "BILL: Hey, bud!" + line "Stay away from" + cont "there, would ya?" + + para "My prized #MON" + line "are in there!" + done diff --git a/text/CinnabarLab.asm b/text/CinnabarLab.asm index a93a484d..e758ab8b 100644 --- a/text/CinnabarLab.asm +++ b/text/CinnabarLab.asm @@ -27,3 +27,10 @@ _Lab1Text5:: text "#MON LAB" line "Testing Room" done + +_Lab1Text6:: + text "I came here from" + line "afar to research" + cont "the myths of" + cont "KANTO." + done